Skip to content

Commit 1e7a0e9

Browse files
committed
refactor(objectql): import the registration module where engine.ts imported metadata-core
Keeps the evaluation order of every external package as it was in the ESM bundles (the module brings the only metadata-core import engine.ts had). Claude-Session: https://claude.ai/code/session_01FEkQ5psvNaMgx2AgmL3NgA Co-authored-by: Claude <noreply@anthropic.com>
1 parent 34f827d commit 1e7a0e9

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

‎packages/objectql/src/engine.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,13 @@ import { resolveAllowDriverConnectFailure } from '@objectstack/types';
235235
// vocabulary of "benign driver error" is the exact debt that module exists to
236236
// retire, and `check:durability-log-level` exempts only this declared name.
237237
import { isMissingTableError } from '@objectstack/metadata/errors';
238+
// [#25522 cut 17] The registration door's forward conversion, the
239+
// nested-plugin registration and its navigation resolution; the methods of the
240+
// same names below hand each body the members it reads
241+
// (`PackageRegistrationHost`). Imported where this file imported
242+
// `@objectstack/metadata-core`, which only those bodies read, so the
243+
// evaluation order of every module and external package is what it was.
244+
import { convertPackageBodyForward, registerPlugin, resolveNavObjectNames } from './engine-package-registration.js';
238245
// [#6806] The ONE shared "is this driver error a unique-constraint violation?"
239246
// predicate, and its narrower companion "which column conflicted" (#6250 /
240247
// #6544, both landed in `@objectstack/types`). The engine's autonumber
@@ -392,12 +399,6 @@ import {
392399
// members it reads (`ValidateHost`). Imported after every module that body
393400
// imports, so the engine's module evaluation order is what it was.
394401
import { validate } from './engine-validate.js';
395-
// [#25522 cut 17] The registration door's forward conversion, the
396-
// nested-plugin registration and its navigation resolution; the methods of the
397-
// same names below hand each body the members it reads
398-
// (`PackageRegistrationHost`). Imported after every module those bodies
399-
// import, so the engine's module evaluation order is what it was.
400-
import { convertPackageBodyForward, registerPlugin, resolveNavObjectNames } from './engine-package-registration.js';
401402
import {
402403
applyHaving,
403404
aggregatedRowColumns,

0 commit comments

Comments
 (0)