@no22/dison 1.4.0 → 1.6.0

package/dist/generated-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generated-runtime.d.ts","sourceRoot":"","sources":["../src/generated-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,KAAK,cAAc,GAAG,MAAM,GAAG,CAAC;AAChC,KAAK,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAC;AAC7C,UAAU,YAAY;IACpB,KAAK,EAAE,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACvC,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAC7D,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;CAClC;AACD,eAAO,MAAM,WAAW,6CAAoD,CAAC;AAE7E,wBAAgB,mBAAmB,IAAI,YAAY,GAAG,SAAS,CAAmC;AAwBlG,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,KAAK,IAAI,GAClJ,YAAY,CAWd;AAKD,eAAO,MAAM,WAAW,mDAA0D,CAAC;AAEnF,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAI3F;AA2BD,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAWnF;AAID,eAAO,MAAM,aAAa,iCAAwC,CAAC;AAKnE,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,IAAI,CAEvE;AAoBD,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,CAS9E;AASD,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,GAAG,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAY9H;AAMD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,KAAK,IAAI,GAClJ;IAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;CAAE,CAa9B"}
+{"version":3,"file":"generated-runtime.d.ts","sourceRoot":"","sources":["../src/generated-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAcrD,KAAK,cAAc,GAAG,MAAM,GAAG,CAAC;AAChC,KAAK,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,QAAQ,CAAC;AAC7C,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,cAAc,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AACtD,KAAK,mBAAmB,GACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,UAAU,CAAC;IAAC,CAAC,EAAE,cAAc,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GACvE;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,cAAc,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5F,UAAU,YAAY;IACpB,KAAK,EAAE,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAC1D,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC;AACD,UAAU,YAAa,SAAQ,YAAY;IACzC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;CAClC;AAmCD,eAAO,MAAM,WAAW,6CAAoD,CAAC;AAE7E,wBAAgB,mBAAmB,IAAI,YAAY,GAAG,SAAS,CAAmC;AAkClG,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,UAAU,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,KAAK,IAAI,GAC9J,YAAY,CAOd;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,KAAK,IAAI,GAClJ,YAAY,CAOd;AAKD,eAAO,MAAM,WAAW,gDAAuD,CAAC;AAGhF,eAAO,MAAM,aAAa,8BAAqC,CAAC;AAOhE,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,IAAI,CAE7E;AACD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,IAAI,CAEvE;AACD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAErG;AACD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,CAE3F;AA2BD,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAcnF;AA0BD,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,CAS9E;AASD,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,GAAG,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAY9H;AAYD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,UAAU,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,KAAK,IAAI,GAC9J;IAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;CAAE,CAO9B;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,IAAI,KAAK,IAAI,GAClJ;IAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;CAAE,CAO9B"}

package/dist/generated-runtime.js

@@ -1,4 +1,48 @@
 import { AsyncLocalStorage } from "node:async_hooks";
+let __dison_seq = 0;
+function __disonPendBind(store, key, f) {
+    store.pending.push({ kind: "bind", key, f, seq: __dison_seq++ });
+}
+function __disonPendOverride(store, cls, prop, f) {
+    store.pending.push({ kind: "override", cls, prop, f, seq: __dison_seq++ });
+}
+// Drain a store's queue. Entries whose key thunk still hits the TDZ are kept and
+// retried later; everything else is applied, newest-seq-wins per key.
+function __disonApplyPending(store) {
+    if (store.pending.length === 0)
+        return;
+    const remaining = [];
+    for (const e of store.pending) {
+        let key;
+        try {
+            key = e.kind === "bind" ? e.key() : e.cls();
+        }
+        catch (err) {
+            if (err instanceof ReferenceError) {
+                remaining.push(e);
+                continue;
+            }
+            throw err;
+        }
+        if (e.kind === "bind") {
+            const cur = store.binds.get(key);
+            if (cur === undefined || cur.seq < e.seq)
+                store.binds.set(key, { f: e.f, seq: e.seq });
+        }
+        else {
+            let rec = store.overrides.get(key);
+            if (rec === undefined) {
+                rec = {};
+                store.overrides.set(key, rec);
+            }
+            const cur = rec[e.prop];
+            if (cur === undefined || cur.seq < e.seq)
+                rec[e.prop] = { f: e.f, seq: e.seq };
+        }
+    }
+    store.pending = remaining;
+}
+// --- scope infrastructure (docs/scoped-configuration.md) ---
 export const __dison_als = new AsyncLocalStorage();
 // Current scope frame (undefined = global only). Captured by injectable at construction.
 export function __disonCurrentScope() { return __dison_als.getStore(); }
@@ -13,41 +57,63 @@ let __dison_classScopeCtx;
 // A class-body configuration is placed as a static __dison_classScope_N field. Walk
 // this.constructor's prototype chain (child -> parent) and collect the fields each class
 // owns (inheritance: a subclass inherits its parent's class scope and can override just
-// the delta).
+// the delta). Within one class the frames are collected in reverse definition order,
+// so when the same class body has several configurations for the same key, the LAST
+// one wins (matching the last-assignment-wins intuition, and the behavior of
+// sequential global registrations and nested local scopes).
 function __disonClassScopes(cls) {
     const out = [];
     for (let c = cls; c && c !== Function.prototype && c !== Object; c = Object.getPrototypeOf(c)) {
+        const own = [];
         for (const key of Object.getOwnPropertyNames(c)) {
             if (key.indexOf('__dison_classScope') === 0)
-                out.push(c[key]);
+                own.push(c[key]);
         }
+        for (let i = own.length - 1; i >= 0; i--)
+            out.push(own[i]);
     }
     return out;
 }
+function __disonNewFrame(parent) {
+    return { binds: new Map(), overrides: new WeakMap(), pending: [], parent };
+}
 // Build a frame without entering it (used to initialize a class body static field).
+// The setup callback receives key THUNKS, so a class-body configuration may reference
+// classes declared later in the file (evaluated at the first lookup on the frame).
+export function __disonBuildFrameLazy(setup) {
+    const frame = __disonNewFrame(undefined);
+    setup((key, factory) => { __disonPendBind(frame, key, factory); }, (cls, prop, factory) => { __disonPendOverride(frame, cls, prop, factory); });
+    return frame;
+}
+// Backward-compatible variant taking eager key values (generated by older CLI versions).
 export function __disonBuildFrame(setup) {
-    const frame = { binds: new Map(), overrides: new WeakMap(), parent: undefined };
-    setup((key, factory) => { frame.binds.set(key, factory); }, (cls, prop, factory) => {
-        let e = frame.overrides.get(cls);
-        if (!e) {
-            e = {};
-            frame.overrides.set(cls, e);
-        }
-        e[prop] = factory;
-    });
+    const frame = __disonNewFrame(undefined);
+    setup((key, factory) => { __disonPendBind(frame, () => key, factory); }, (cls, prop, factory) => { __disonPendOverride(frame, () => cls, prop, factory); });
     return frame;
 }
 // --- global registries ---
 // Global dependency registry (per-property override). Keyed by the class itself
 // so tsc catches a typo in the override target class name.
 export const DI_REGISTRY = new WeakMap();
+// Global type-replacement registry (bind). Key: class value (concrete class),
+// companion/token Symbol, or type-name string. See docs/type-identity-matching.md.
+export const TYPE_BINDINGS = new Map();
+const __DISON_GLOBAL = { binds: TYPE_BINDINGS, overrides: DI_REGISTRY, pending: [] };
+// The Lazy variants take the key as a thunk (forward-reference safe); the plain
+// variants keep the old eager-key signature for code generated by older CLI versions.
+// bindTypeLazy<T> takes T as an explicit type argument, so tsc raises a compile error
+// if the replacement factory isn't compatible with the original type.
+export function bindTypeLazy(key, factory) {
+    __disonPendBind(__DISON_GLOBAL, key, factory);
+}
+export function bindType(typeKey, factory) {
+    __disonPendBind(__DISON_GLOBAL, () => typeKey, factory);
+}
+export function registerOverrideLazy(cls, prop, factory) {
+    __disonPendOverride(__DISON_GLOBAL, cls, prop, factory);
+}
 export function registerOverride(cls, prop, factory) {
-    let entry = DI_REGISTRY.get(cls);
-    if (!entry) {
-        entry = {};
-        DI_REGISTRY.set(cls, entry);
-    }
-    entry[prop] = factory;
+    __disonPendOverride(__DISON_GLOBAL, () => cls, prop, factory);
 }
 // Override target matching walks the prototype chain of the receiver's class
 // (child -> parent, child-wins): an override targeting a base class applies to
@@ -65,54 +131,53 @@ function __disonChainLookup(map, chain, prop) {
     for (const c of chain) {
         const o = map.get(c);
         if (o && Object.prototype.hasOwnProperty.call(o, prop))
-            return o[prop];
+            return o[prop].f;
     }
     return undefined;
 }
 // Look up an override in order: local frame chain (inner->outer) -> class scopes
 // (child->parent) -> global (priority: local > class > global). Scope-major: each
 // layer checks the whole class chain, so a nearer scope targeting a base class
-// beats a farther scope targeting the subclass.
+// beats a farther scope targeting the subclass. Each store drains its queue first.
 export function getOverride(cls, prop) {
     const chain = __disonClassChain(cls);
     for (let f = __dison_als.getStore(); f; f = f.parent) {
+        __disonApplyPending(f);
         const hit = __disonChainLookup(f.overrides, chain, prop);
         if (hit)
             return hit;
     }
     if (__dison_classScopeCtx)
         for (const f of __dison_classScopeCtx) {
+            __disonApplyPending(f);
             const hit = __disonChainLookup(f.overrides, chain, prop);
             if (hit)
                 return hit;
         }
+    __disonApplyPending(__DISON_GLOBAL);
     return __disonChainLookup(DI_REGISTRY, chain, prop);
 }
-// Global type-replacement registry (bind). Key: class value (concrete class),
-// companion/token Symbol, or type-name string. See docs/type-identity-matching.md.
-export const TYPE_BINDINGS = new Map();
 const _resolvingTypeBindings = new Set();
-// bindType<T> takes T as an explicit type argument, so tsc raises a compile error
-// if the replacement factory isn't compatible with the original type.
-export function bindType(typeKey, factory) {
-    TYPE_BINDINGS.set(typeKey, factory);
-}
 // Look up a bind in order: local frame chain (inner->outer) -> class scopes (child->parent)
 // -> global. __dison_classScopeCtx stays set throughout a resolution, so a bind chain inside
 // a class scope (the recursion in resolveType) follows the class scope too.
+// Each store drains its queue first.
 function __disonLookupBind(typeKey) {
     for (let f = __dison_als.getStore(); f; f = f.parent) {
+        __disonApplyPending(f);
         const b = f.binds.get(typeKey);
         if (b)
-            return b;
+            return b.f;
     }
     if (__dison_classScopeCtx)
         for (const f of __dison_classScopeCtx) {
+            __disonApplyPending(f);
             const b = f.binds.get(typeKey);
             if (b)
-                return b;
+                return b.f;
         }
-    return TYPE_BINDINGS.get(typeKey);
+    __disonApplyPending(__DISON_GLOBAL);
+    return TYPE_BINDINGS.get(typeKey)?.f;
 }
 // Scope-aware bind resolution. bind chains (bind A = B; bind B = C; resolves A to C).
 // Each hop of the chain also consults the current frame chain -> class -> global.
@@ -158,18 +223,21 @@ export function __disonResolveInjectable(scope, cls, prop, fallback) {
 // current frame, populate its bind/override via setup, and enter it (enterWith). The return
 // value has Symbol.dispose, so a `using` declaration restores the previous frame at the end
 // of the enclosing block. setup uses the bind/override helpers to add the deltas.
-export function __disonEnterScope(setup) {
-    const frame = { binds: new Map(), overrides: new WeakMap(), parent: __dison_als.getStore() };
-    setup((key, factory) => { frame.binds.set(key, factory); }, (cls, prop, factory) => {
-        let e = frame.overrides.get(cls);
-        if (!e) {
-            e = {};
-            frame.overrides.set(cls, e);
-        }
-        e[prop] = factory;
-    });
+function __disonEnterFrame(frame) {
     const prev = __dison_als.getStore();
     __dison_als.enterWith(frame);
     return { [Symbol.dispose]() { __dison_als.enterWith(prev); } };
 }
+// The setup callback receives key THUNKS (forward-reference safe within the block).
+export function __disonEnterScopeLazy(setup) {
+    const frame = __disonNewFrame(__dison_als.getStore());
+    setup((key, factory) => { __disonPendBind(frame, key, factory); }, (cls, prop, factory) => { __disonPendOverride(frame, cls, prop, factory); });
+    return __disonEnterFrame(frame);
+}
+// Backward-compatible variant taking eager key values (generated by older CLI versions).
+export function __disonEnterScope(setup) {
+    const frame = __disonNewFrame(__dison_als.getStore());
+    setup((key, factory) => { __disonPendBind(frame, () => key, factory); }, (cls, prop, factory) => { __disonPendOverride(frame, () => cls, prop, factory); });
+    return __disonEnterFrame(frame);
+}
 //# sourceMappingURL=generated-runtime.js.map

package/dist/generated-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"generated-runtime.js","sourceRoot":"","sources":["../src/generated-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generated-runtime.js","sourceRoot":"","sources":["../src/generated-runtime.ts"],"names":[],"mappings":"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"}

package/dist/runtime.d.ts

@@ -1,4 +1,4 @@
 export declare const DISON_RUNTIME_IMPORTS = "import { AsyncLocalStorage } from \"node:async_hooks\";\n";
-export declare function generateRuntimeDeclarations(exportKeyword: "" | "export "): string;
+export declare function generateRuntimeDeclarations(exportKeyword: "" | "export ", alsMode?: "node" | "stub"): string;
 export declare const DISON_RUNTIME_MODULE_SOURCE: string;
 //# sourceMappingURL=runtime.d.ts.map

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAwBA,eAAO,MAAM,qBAAqB,8DAA4D,CAAC;AAE/F,wBAAgB,2BAA2B,CAAC,aAAa,EAAE,EAAE,GAAG,SAAS,GAAG,MAAM,CA6KjF;AAMD,eAAO,MAAM,2BAA2B,EAAE,MAMF,CAAC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AA+BA,eAAO,MAAM,qBAAqB,8DAA4D,CAAC;AAQ/F,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,EAAE,GAAG,SAAS,EAC7B,OAAO,GAAE,MAAM,GAAG,MAAe,GAChC,MAAM,CAmRR;AAMD,eAAO,MAAM,2BAA2B,EAAE,MAMF,CAAC"}

package/dist/runtime.js

@@ -18,21 +18,93 @@
 // 現在のフレームを捕捉し、解決時にそのフレームへ再突入する（遅延構築される依存グラフ
 // 全体が root の構築スコープに一貫して従う）。ローカルスコープは `using` 宣言で入り、
 // 囲みブロックの終端で自動的に元に戻る（Symbol.dispose）。
+//
+// 前方参照対応（docs/config-forward-reference.md）: 登録はFIFOキューに積まれ、
+// レジストリを読むたびにドレインされる。キー式はサンクで渡され初回参照時まで
+// 評価が遅延されるため、同一ファイル内で後方宣言されたクラスをconfigurationが
+// 前方参照できる（TDZを踏まない）。seq比較により同一キーへの複数登録の最終状態は
+// 常にソース実行順どおりになる。旧シグネチャ（bindType/registerOverride/
+// __disonEnterScope/__disonBuildFrame）は互換のため残し、内部でキュー経由になる。
 // スコープ対応に必要な import（AsyncLocalStorage）。生成物のファイル先頭に置く必要が
 // あるため、宣言本体（generateRuntimeDeclarations）とは分けて提供する。単一ファイル
 // モードでは core.ts が、複数ファイルモードでは共有ランタイムモジュールが先頭に付ける。
 export const DISON_RUNTIME_IMPORTS = `import { AsyncLocalStorage } from "node:async_hooks";\n`;
-export function generateRuntimeDeclarations(exportKeyword) {
+// alsMode（docs/spec-audit-2026-07.md #7）:
+//   - "node": 本物の AsyncLocalStorage を使う（要 node:async_hooks import）。ローカル
+//     スコープを使うファイル・共有ランタイムモジュールはこちら。
+//   - "stub": 同期変数によるスタブ。ローカルスコープを使わないファイルでは、alsの
+//     ストアは__disonResolveInjectableの同期的なenter/restoreペアでしか触られないため
+//     ただの変数と等価。node:async_hooks への依存が消え、ブラウザ等でも動く。
+export function generateRuntimeDeclarations(exportKeyword, alsMode = "node") {
     const E = exportKeyword;
-    return (`// --- scope infrastructure (docs/scoped-configuration.md) ---\n` +
+    const alsDecl = alsMode === "node"
+        ? `${E}const __dison_als = new AsyncLocalStorage<__DisonFrame | undefined>();\n`
+        : `// AsyncLocalStorage stub: this file uses no local scopes, so the store is only\n` +
+            `// touched synchronously (enter/restore pairs inside __disonResolveInjectable).\n` +
+            `// A plain variable is equivalent, and it avoids importing the Node-only\n` +
+            `// async-hooks module (the generated file also runs outside Node).\n` +
+            `${E}const __dison_als = {\n` +
+            `  _store: undefined as __DisonFrame | undefined,\n` +
+            `  getStore(): __DisonFrame | undefined { return this._store; },\n` +
+            `  enterWith(store: __DisonFrame | undefined): void { this._store = store; },\n` +
+            `};\n`;
+    return (`// --- registration queue (docs/config-forward-reference.md) ---\n` +
+        `// Registrations are queued (with a global sequence number) and applied lazily the\n` +
+        `// first time a registry is read. Key expressions are passed as thunks, so a\n` +
+        `// configuration may forward-reference a class declared later in the same file\n` +
+        `// without hitting the temporal dead zone. A thunk that still throws ReferenceError\n` +
+        `// stays queued and is retried on the next read; seq comparison guarantees that the\n` +
+        `// final state for a key always follows source execution order, and that a blocked\n` +
+        `// entry never delays unrelated keys.\n` +
         `type __DisonFactory = () => any;\n` +
         `type __DisonKey = string | symbol | Function;\n` +
-        `interface __DisonFrame {\n` +
-        `  binds: Map<__DisonKey, __DisonFactory>;\n` +
-        `  overrides: WeakMap<Function, Record<string, __DisonFactory>>;\n` +
+        `type __DisonSlot = { f: __DisonFactory; seq: number };\n` +
+        `type __DisonPendingEntry =\n` +
+        `  | { kind: "bind"; key: () => __DisonKey; f: __DisonFactory; seq: number }\n` +
+        `  | { kind: "override"; cls: () => Function; prop: string; f: __DisonFactory; seq: number };\n` +
+        `// One store shape shared by the global registries and every scope frame.\n` +
+        `interface __DisonStore {\n` +
+        `  binds: Map<__DisonKey, __DisonSlot>;\n` +
+        `  overrides: WeakMap<Function, Record<string, __DisonSlot>>;\n` +
+        `  pending: __DisonPendingEntry[];\n` +
+        `}\n` +
+        `interface __DisonFrame extends __DisonStore {\n` +
         `  parent: __DisonFrame | undefined;\n` +
         `}\n` +
-        `${E}const __dison_als = new AsyncLocalStorage<__DisonFrame | undefined>();\n` +
+        `let __dison_seq = 0;\n` +
+        `function __disonPendBind(store: __DisonStore, key: () => __DisonKey, f: __DisonFactory): void {\n` +
+        `  store.pending.push({ kind: "bind", key, f, seq: __dison_seq++ });\n` +
+        `}\n` +
+        `function __disonPendOverride(store: __DisonStore, cls: () => Function, prop: string, f: __DisonFactory): void {\n` +
+        `  store.pending.push({ kind: "override", cls, prop, f, seq: __dison_seq++ });\n` +
+        `}\n` +
+        `// Drain a store's queue. Entries whose key thunk still hits the TDZ are kept and\n` +
+        `// retried later; everything else is applied, newest-seq-wins per key.\n` +
+        `function __disonApplyPending(store: __DisonStore): void {\n` +
+        `  if (store.pending.length === 0) return;\n` +
+        `  const remaining: __DisonPendingEntry[] = [];\n` +
+        `  for (const e of store.pending) {\n` +
+        `    let key: any;\n` +
+        `    try {\n` +
+        `      key = e.kind === "bind" ? e.key() : e.cls();\n` +
+        `    } catch (err) {\n` +
+        `      if (err instanceof ReferenceError) { remaining.push(e); continue; }\n` +
+        `      throw err;\n` +
+        `    }\n` +
+        `    if (e.kind === "bind") {\n` +
+        `      const cur = store.binds.get(key);\n` +
+        `      if (cur === undefined || cur.seq < e.seq) store.binds.set(key, { f: e.f, seq: e.seq });\n` +
+        `    } else {\n` +
+        `      let rec = store.overrides.get(key);\n` +
+        `      if (rec === undefined) { rec = {}; store.overrides.set(key, rec); }\n` +
+        `      const cur = rec[e.prop];\n` +
+        `      if (cur === undefined || cur.seq < e.seq) rec[e.prop] = { f: e.f, seq: e.seq };\n` +
+        `    }\n` +
+        `  }\n` +
+        `  store.pending = remaining;\n` +
+        `}\n\n` +
+        `// --- scope infrastructure (docs/scoped-configuration.md) ---\n` +
+        alsDecl +
         `// Current scope frame (undefined = global only). Captured by injectable at construction.\n` +
         `${E}function __disonCurrentScope(): __DisonFrame | undefined { return __dison_als.getStore(); }\n\n` +
         `// Class scopes (an anonymous configuration directly inside a class body).\n` +
@@ -46,39 +118,71 @@ export function generateRuntimeDeclarations(exportKeyword) {
         `// A class-body configuration is placed as a static __dison_classScope_N field. Walk\n` +
         `// this.constructor's prototype chain (child -> parent) and collect the fields each class\n` +
         `// owns (inheritance: a subclass inherits its parent's class scope and can override just\n` +
-        `// the delta).\n` +
+        `// the delta). Within one class the frames are collected in reverse definition order,\n` +
+        `// so when the same class body has several configurations for the same key, the LAST\n` +
+        `// one wins (matching the last-assignment-wins intuition, and the behavior of\n` +
+        `// sequential global registrations and nested local scopes).\n` +
         `function __disonClassScopes(cls: Function): __DisonFrame[] {\n` +
         `  const out: __DisonFrame[] = [];\n` +
         `  for (let c: any = cls; c && c !== Function.prototype && c !== Object; c = Object.getPrototypeOf(c)) {\n` +
+        `    const own: __DisonFrame[] = [];\n` +
         `    for (const key of Object.getOwnPropertyNames(c)) {\n` +
-        `      if (key.indexOf('__dison_classScope') === 0) out.push(c[key]);\n` +
+        `      if (key.indexOf('__dison_classScope') === 0) own.push(c[key]);\n` +
         `    }\n` +
+        `    for (let i = own.length - 1; i >= 0; i--) out.push(own[i]);\n` +
         `  }\n` +
         `  return out;\n` +
         `}\n` +
+        `function __disonNewFrame(parent: __DisonFrame | undefined): __DisonFrame {\n` +
+        `  return { binds: new Map(), overrides: new WeakMap(), pending: [], parent };\n` +
+        `}\n` +
         `// Build a frame without entering it (used to initialize a class body static field).\n` +
+        `// The setup callback receives key THUNKS, so a class-body configuration may reference\n` +
+        `// classes declared later in the file (evaluated at the first lookup on the frame).\n` +
+        `${E}function __disonBuildFrameLazy(\n` +
+        `  setup: (bind: (key: () => __DisonKey, factory: __DisonFactory) => void, override: (cls: () => Function, prop: string, factory: __DisonFactory) => void) => void\n` +
+        `): __DisonFrame {\n` +
+        `  const frame = __disonNewFrame(undefined);\n` +
+        `  setup(\n` +
+        `    (key, factory) => { __disonPendBind(frame, key, factory); },\n` +
+        `    (cls, prop, factory) => { __disonPendOverride(frame, cls, prop, factory); }\n` +
+        `  );\n` +
+        `  return frame;\n` +
+        `}\n` +
+        `// Backward-compatible variant taking eager key values (generated by older CLI versions).\n` +
         `${E}function __disonBuildFrame(\n` +
         `  setup: (bind: (key: __DisonKey, factory: __DisonFactory) => void, override: (cls: Function, prop: string, factory: __DisonFactory) => void) => void\n` +
         `): __DisonFrame {\n` +
-        `  const frame: __DisonFrame = { binds: new Map(), overrides: new WeakMap(), parent: undefined };\n` +
+        `  const frame = __disonNewFrame(undefined);\n` +
         `  setup(\n` +
-        `    (key, factory) => { frame.binds.set(key, factory); },\n` +
-        `    (cls, prop, factory) => {\n` +
-        `      let e = frame.overrides.get(cls);\n` +
-        `      if (!e) { e = {}; frame.overrides.set(cls, e); }\n` +
-        `      e[prop] = factory;\n` +
-        `    }\n` +
+        `    (key, factory) => { __disonPendBind(frame, () => key, factory); },\n` +
+        `    (cls, prop, factory) => { __disonPendOverride(frame, () => cls, prop, factory); }\n` +
         `  );\n` +
         `  return frame;\n` +
         `}\n\n` +
         `// --- global registries ---\n` +
         `// Global dependency registry (per-property override). Keyed by the class itself\n` +
         `// so tsc catches a typo in the override target class name.\n` +
-        `${E}const DI_REGISTRY = new WeakMap<Function, Record<string, __DisonFactory>>();\n\n` +
+        `${E}const DI_REGISTRY = new WeakMap<Function, Record<string, __DisonSlot>>();\n` +
+        `// Global type-replacement registry (bind). Key: class value (concrete class),\n` +
+        `// companion/token Symbol, or type-name string. See docs/type-identity-matching.md.\n` +
+        `${E}const TYPE_BINDINGS = new Map<__DisonKey, __DisonSlot>();\n` +
+        `const __DISON_GLOBAL: __DisonStore = { binds: TYPE_BINDINGS, overrides: DI_REGISTRY, pending: [] };\n\n` +
+        `// The Lazy variants take the key as a thunk (forward-reference safe); the plain\n` +
+        `// variants keep the old eager-key signature for code generated by older CLI versions.\n` +
+        `// bindTypeLazy<T> takes T as an explicit type argument, so tsc raises a compile error\n` +
+        `// if the replacement factory isn't compatible with the original type.\n` +
+        `${E}function bindTypeLazy<T>(key: () => __DisonKey, factory: () => T): void {\n` +
+        `  __disonPendBind(__DISON_GLOBAL, key, factory);\n` +
+        `}\n` +
+        `${E}function bindType<T>(typeKey: __DisonKey, factory: () => T): void {\n` +
+        `  __disonPendBind(__DISON_GLOBAL, () => typeKey, factory);\n` +
+        `}\n` +
+        `${E}function registerOverrideLazy(cls: () => Function, prop: string, factory: __DisonFactory): void {\n` +
+        `  __disonPendOverride(__DISON_GLOBAL, cls, prop, factory);\n` +
+        `}\n` +
         `${E}function registerOverride(cls: Function, prop: string, factory: __DisonFactory): void {\n` +
-        `  let entry = DI_REGISTRY.get(cls);\n` +
-        `  if (!entry) { entry = {}; DI_REGISTRY.set(cls, entry); }\n` +
-        `  entry[prop] = factory;\n` +
+        `  __disonPendOverride(__DISON_GLOBAL, () => cls, prop, factory);\n` +
         `}\n\n` +
         `// Override target matching walks the prototype chain of the receiver's class\n` +
         `// (child -> parent, child-wins): an override targeting a base class applies to\n` +
@@ -92,53 +196,52 @@ export function generateRuntimeDeclarations(exportKeyword) {
         `}\n` +
         `// Match one override table against the class chain (child-wins).\n` +
         `function __disonChainLookup(\n` +
-        `  map: { get(k: Function): Record<string, __DisonFactory> | undefined },\n` +
+        `  map: { get(k: Function): Record<string, __DisonSlot> | undefined },\n` +
         `  chain: Function[], prop: string\n` +
         `): __DisonFactory | undefined {\n` +
         `  for (const c of chain) {\n` +
         `    const o = map.get(c);\n` +
-        `    if (o && Object.prototype.hasOwnProperty.call(o, prop)) return o[prop];\n` +
+        `    if (o && Object.prototype.hasOwnProperty.call(o, prop)) return o[prop].f;\n` +
         `  }\n` +
         `  return undefined;\n` +
         `}\n` +
         `// Look up an override in order: local frame chain (inner->outer) -> class scopes\n` +
         `// (child->parent) -> global (priority: local > class > global). Scope-major: each\n` +
         `// layer checks the whole class chain, so a nearer scope targeting a base class\n` +
-        `// beats a farther scope targeting the subclass.\n` +
+        `// beats a farther scope targeting the subclass. Each store drains its queue first.\n` +
         `${E}function getOverride(cls: Function, prop: string): __DisonFactory | undefined {\n` +
         `  const chain = __disonClassChain(cls);\n` +
         `  for (let f = __dison_als.getStore(); f; f = f.parent) {\n` +
+        `    __disonApplyPending(f);\n` +
         `    const hit = __disonChainLookup(f.overrides, chain, prop);\n` +
         `    if (hit) return hit;\n` +
         `  }\n` +
         `  if (__dison_classScopeCtx) for (const f of __dison_classScopeCtx) {\n` +
+        `    __disonApplyPending(f);\n` +
         `    const hit = __disonChainLookup(f.overrides, chain, prop);\n` +
         `    if (hit) return hit;\n` +
         `  }\n` +
+        `  __disonApplyPending(__DISON_GLOBAL);\n` +
         `  return __disonChainLookup(DI_REGISTRY, chain, prop);\n` +
         `}\n\n` +
-        `// Global type-replacement registry (bind). Key: class value (concrete class),\n` +
-        `// companion/token Symbol, or type-name string. See docs/type-identity-matching.md.\n` +
-        `${E}const TYPE_BINDINGS = new Map<__DisonKey, __DisonFactory>();\n` +
         `const _resolvingTypeBindings = new Set<__DisonKey>();\n\n` +
-        `// bindType<T> takes T as an explicit type argument, so tsc raises a compile error\n` +
-        `// if the replacement factory isn't compatible with the original type.\n` +
-        `${E}function bindType<T>(typeKey: __DisonKey, factory: () => T): void {\n` +
-        `  TYPE_BINDINGS.set(typeKey, factory);\n` +
-        `}\n\n` +
         `// Look up a bind in order: local frame chain (inner->outer) -> class scopes (child->parent)\n` +
         `// -> global. __dison_classScopeCtx stays set throughout a resolution, so a bind chain inside\n` +
         `// a class scope (the recursion in resolveType) follows the class scope too.\n` +
+        `// Each store drains its queue first.\n` +
         `function __disonLookupBind(typeKey: __DisonKey): __DisonFactory | undefined {\n` +
         `  for (let f = __dison_als.getStore(); f; f = f.parent) {\n` +
+        `    __disonApplyPending(f);\n` +
         `    const b = f.binds.get(typeKey);\n` +
-        `    if (b) return b;\n` +
+        `    if (b) return b.f;\n` +
         `  }\n` +
         `  if (__dison_classScopeCtx) for (const f of __dison_classScopeCtx) {\n` +
+        `    __disonApplyPending(f);\n` +
         `    const b = f.binds.get(typeKey);\n` +
-        `    if (b) return b;\n` +
+        `    if (b) return b.f;\n` +
         `  }\n` +
-        `  return TYPE_BINDINGS.get(typeKey);\n` +
+        `  __disonApplyPending(__DISON_GLOBAL);\n` +
+        `  return TYPE_BINDINGS.get(typeKey)?.f;\n` +
         `}\n\n` +
         `// Scope-aware bind resolution. bind chains (bind A = B; bind B = C; resolves A to C).\n` +
         `// Each hop of the chain also consults the current frame chain -> class -> global.\n` +
@@ -177,21 +280,32 @@ export function generateRuntimeDeclarations(exportKeyword) {
         `// current frame, populate its bind/override via setup, and enter it (enterWith). The return\n` +
         `// value has Symbol.dispose, so a \`using\` declaration restores the previous frame at the end\n` +
         `// of the enclosing block. setup uses the bind/override helpers to add the deltas.\n` +
+        `function __disonEnterFrame(frame: __DisonFrame): { [Symbol.dispose](): void } {\n` +
+        `  const prev = __dison_als.getStore();\n` +
+        `  __dison_als.enterWith(frame);\n` +
+        `  return { [Symbol.dispose]() { __dison_als.enterWith(prev); } };\n` +
+        `}\n` +
+        `// The setup callback receives key THUNKS (forward-reference safe within the block).\n` +
+        `${E}function __disonEnterScopeLazy(\n` +
+        `  setup: (bind: (key: () => __DisonKey, factory: __DisonFactory) => void, override: (cls: () => Function, prop: string, factory: __DisonFactory) => void) => void\n` +
+        `): { [Symbol.dispose](): void } {\n` +
+        `  const frame = __disonNewFrame(__dison_als.getStore());\n` +
+        `  setup(\n` +
+        `    (key, factory) => { __disonPendBind(frame, key, factory); },\n` +
+        `    (cls, prop, factory) => { __disonPendOverride(frame, cls, prop, factory); }\n` +
+        `  );\n` +
+        `  return __disonEnterFrame(frame);\n` +
+        `}\n` +
+        `// Backward-compatible variant taking eager key values (generated by older CLI versions).\n` +
         `${E}function __disonEnterScope(\n` +
         `  setup: (bind: (key: __DisonKey, factory: __DisonFactory) => void, override: (cls: Function, prop: string, factory: __DisonFactory) => void) => void\n` +
         `): { [Symbol.dispose](): void } {\n` +
-        `  const frame: __DisonFrame = { binds: new Map(), overrides: new WeakMap(), parent: __dison_als.getStore() };\n` +
+        `  const frame = __disonNewFrame(__dison_als.getStore());\n` +
         `  setup(\n` +
-        `    (key, factory) => { frame.binds.set(key, factory); },\n` +
-        `    (cls, prop, factory) => {\n` +
-        `      let e = frame.overrides.get(cls);\n` +
-        `      if (!e) { e = {}; frame.overrides.set(cls, e); }\n` +
-        `      e[prop] = factory;\n` +
-        `    }\n` +
+        `    (key, factory) => { __disonPendBind(frame, () => key, factory); },\n` +
+        `    (cls, prop, factory) => { __disonPendOverride(frame, () => cls, prop, factory); }\n` +
         `  );\n` +
-        `  const prev = __dison_als.getStore();\n` +
-        `  __dison_als.enterWith(frame);\n` +
-        `  return { [Symbol.dispose]() { __dison_als.enterWith(prev); } };\n` +
+        `  return __disonEnterFrame(frame);\n` +
         `}\n`);
 }
 // 複数ファイルでランタイム状態を共有するための共有ランタイムモジュールのソース。

package/dist/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@no22/dison",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "type": "module",
   "description": "An experimental DSL that transpiles to TypeScript, with property injection built into the language itself.",
   "main": "./dist/core.js",