@no22/dison 1.0.0 → 1.1.0

package/dist/runtime.js

@@ -16,11 +16,15 @@
 //   - 複数ファイルにまたがって同名クラスが存在しても、参照そのものが
 //     キーになるため衝突しない（docs/multi-file-support.md参照）。
 //
-// TYPE_BINDINGS（bind用）は従来通り型名の文字列でキー化する。bindの左辺は
-// interface/型エイリアスもあり得るが、これらは実行時に値を持たないため
-// DI_REGISTRYと同じ手法（実体参照でのキー化）が使えない。複数ファイルに
-// またがるinterface/型エイリアスの名前衝突は未解決の課題として残る
-// （docs/multi-file-support.md 3.4節）。
+// TYPE_BINDINGS（bind用）のキーは、型が具象クラスなら実体参照（Function）、
+// それ以外（interface/型エイリアス/ジェネリクス）なら型名の文字列を使う。
+// 具象クラスの実体キー化はDI_REGISTRYと同じ発想で、複数ファイルにまたがる
+// 同名クラスが衝突しなくなる（手動tokenなしで自動的に別の実体として区別される。
+// どの型を実体キーにするかの判定はcodegen/collisionsが担う。
+// docs/type-identity-matching.md）。bindの左辺がinterface/型エイリアスの場合は
+// 実行時に値が無いため実体参照できず、文字列キーのまま。複数ファイルに
+// またがる同名interface/型エイリアスの衝突は "as <トークン>" で回避する
+// （docs/bind-interface-token.md）。
 export function generateRuntimeDeclarations(exportKeyword) {
     return (`// Global dependency registry (per-property override).\n` +
         `// Keying on the class itself (not its name) lets tsc catch a typo in the\n` +
@@ -38,26 +42,34 @@ export function generateRuntimeDeclarations(exportKeyword) {
         `  return DI_REGISTRY.get(cls)?.[prop];\n` +
         `}\n\n` +
         `// Global type-replacement registry (bind).\n` +
-        `// The key is either a type-name string (class, interface, or type alias name)\n` +
-        `// or a Symbol explicitly given via an "as <token>" clause (used to avoid\n` +
-        `// name collisions between same-named interfaces/type aliases across files).\n` +
-        `${exportKeyword}const TYPE_BINDINGS = new Map<string | symbol, () => any>();\n` +
-        `const _resolvingTypeBindings = new Set<string | symbol>();\n\n` +
+        `// The key is one of:\n` +
+        `//   - The class itself (Function). When a bind/injectable type is a concrete\n` +
+        `//     class, the class value (not its name string) is used as the key (same\n` +
+        `//     idea as DI_REGISTRY). Same-named classes across files no longer collide\n` +
+        `//     as a result (no manual token needed; with string keys, unrelated\n` +
+        `//     same-named classes used to pollute each other).\n` +
+        `//   - A type-name string. Used for interfaces/type aliases (no runtime value)\n` +
+        `//     and generics with concrete type arguments (Repository<User>).\n` +
+        `//   - A Symbol explicitly given via an "as <token>" clause (to avoid collisions\n` +
+        `//     between same-named interfaces/type aliases across files. docs/bind-interface-token.md).\n` +
+        `${exportKeyword}const TYPE_BINDINGS = new Map<string | symbol | Function, () => any>();\n` +
+        `const _resolvingTypeBindings = new Set<string | symbol | Function>();\n\n` +
         `// bindType<T> takes T as an explicit type argument, so tsc raises a\n` +
         `// compile error if the replacement factory isn't compatible with the\n` +
         `// original type. T may be an interface or type alias (used only as a\n` +
         `// type argument).\n` +
-        `${exportKeyword}function bindType<T>(typeKey: string | symbol, factory: () => T): void {\n` +
+        `${exportKeyword}function bindType<T>(typeKey: string | symbol | Function, factory: () => T): void {\n` +
         `  TYPE_BINDINGS.set(typeKey, factory);\n` +
         `}\n\n` +
         `// Resolves a value by recursively walking TYPE_BINDINGS. bind chains\n` +
         `// (e.g. bind A = B; bind B = C; makes resolving A eventually reach C).\n` +
         `// A cycle (A -> B -> A) raises a clear error instead of a stack overflow.\n` +
-        `${exportKeyword}function resolveType<T>(typeKey: string | symbol, defaultFactory: () => T): T {\n` +
+        `${exportKeyword}function resolveType<T>(typeKey: string | symbol | Function, defaultFactory: () => T): T {\n` +
         `  const bound = TYPE_BINDINGS.get(typeKey);\n` +
         `  if (!bound) return defaultFactory();\n` +
         `  if (_resolvingTypeBindings.has(typeKey)) {\n` +
-        `    throw new Error('Detected a circular "bind" reference ("' + String(typeKey) + '"). The bind chain loops back on itself.');\n` +
+        `    const label = typeof typeKey === 'function' ? (typeKey.name || '<anonymous class>') : String(typeKey);\n` +
+        `    throw new Error('Detected a circular "bind" reference ("' + label + '"). The bind chain loops back on itself.');\n` +
         `  }\n` +
         `  _resolvingTypeBindings.add(typeKey);\n` +
         `  try {\n` +

package/dist/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,gBAAgB;AAChB,wEAAwE;AAExE,6DAA6D;AAC7D,oEAAoE;AACpE,2CAA2C;AAC3C,sCAAsC;AACtC,EAAE;AACF,kDAAkD;AAClD,oCAAoC;AACpC,gDAAgD;AAChD,yCAAyC;AACzC,wCAAwC;AACxC,gDAAgD;AAChD,mBAAmB;AACnB,sCAAsC;AACtC,kDAAkD;AAClD,EAAE;AACF,iDAAiD;AACjD,0CAA0C;AAC1C,2CAA2C;AAC3C,wCAAwC;AACxC,qCAAqC;AACrC,MAAM,UAAU,2BAA2B,CAAC,aAA6B;IACvE,OAAO,CACL,0DAA0D;QAC1D,6EAA6E;QAC7E,gEAAgE;QAChE,GAAG,aAAa,6EAA6E;QAC7F,GAAG,aAAa,sFAAsF;QACtG,uCAAuC;QACvC,mBAAmB;QACnB,mBAAmB;QACnB,oCAAoC;QACpC,OAAO;QACP,4BAA4B;QAC5B,OAAO;QACP,GAAG,aAAa,gFAAgF;QAChG,0CAA0C;QAC1C,OAAO;QACP,+CAA+C;QAC/C,kFAAkF;QAClF,6EAA6E;QAC7E,gFAAgF;QAChF,GAAG,aAAa,gEAAgE;QAChF,gEAAgE;QAChE,wEAAwE;QACxE,yEAAyE;QACzE,yEAAyE;QACzE,sBAAsB;QACtB,GAAG,aAAa,4EAA4E;QAC5F,0CAA0C;QAC1C,OAAO;QACP,yEAAyE;QACzE,2EAA2E;QAC3E,8EAA8E;QAC9E,GAAG,aAAa,mFAAmF;QACnG,+CAA+C;QAC/C,0CAA0C;QAC1C,gDAAgD;QAChD,kIAAkI;QAClI,OAAO;QACP,0CAA0C;QAC1C,WAAW;QACX,uBAAuB;QACvB,iBAAiB;QACjB,+CAA+C;QAC/C,OAAO;QACP,KAAK,CACN,CAAC;AACJ,CAAC;AAED,oDAAoD;AACpD,uDAAuD;AACvD,uDAAuD;AACvD,yDAAyD;AACzD,MAAM,CAAC,MAAM,2BAA2B,GACtC,0CAA0C;IAC1C,yEAAyE;IACzE,yCAAyC;IACzC,6FAA6F;IAC7F,2BAA2B,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,gBAAgB;AAChB,wEAAwE;AAExE,6DAA6D;AAC7D,oEAAoE;AACpE,2CAA2C;AAC3C,sCAAsC;AACtC,EAAE;AACF,kDAAkD;AAClD,oCAAoC;AACpC,gDAAgD;AAChD,yCAAyC;AACzC,wCAAwC;AACxC,gDAAgD;AAChD,mBAAmB;AACnB,sCAAsC;AACtC,kDAAkD;AAClD,EAAE;AACF,oDAAoD;AACpD,4CAA4C;AAC5C,4CAA4C;AAC5C,4CAA4C;AAC5C,yCAAyC;AACzC,+DAA+D;AAC/D,qCAAqC;AACrC,+CAA+C;AAC/C,kCAAkC;AAClC,MAAM,UAAU,2BAA2B,CAAC,aAA6B;IACvE,OAAO,CACL,0DAA0D;QAC1D,6EAA6E;QAC7E,gEAAgE;QAChE,GAAG,aAAa,6EAA6E;QAC7F,GAAG,aAAa,sFAAsF;QACtG,uCAAuC;QACvC,mBAAmB;QACnB,mBAAmB;QACnB,oCAAoC;QACpC,OAAO;QACP,4BAA4B;QAC5B,OAAO;QACP,GAAG,aAAa,gFAAgF;QAChG,0CAA0C;QAC1C,OAAO;QACP,+CAA+C;QAC/C,yBAAyB;QACzB,iFAAiF;QACjF,gFAAgF;QAChF,kFAAkF;QAClF,2EAA2E;QAC3E,0DAA0D;QAC1D,kFAAkF;QAClF,wEAAwE;QACxE,oFAAoF;QACpF,kGAAkG;QAClG,GAAG,aAAa,2EAA2E;QAC3F,2EAA2E;QAC3E,wEAAwE;QACxE,yEAAyE;QACzE,yEAAyE;QACzE,sBAAsB;QACtB,GAAG,aAAa,uFAAuF;QACvG,0CAA0C;QAC1C,OAAO;QACP,yEAAyE;QACzE,2EAA2E;QAC3E,8EAA8E;QAC9E,GAAG,aAAa,8FAA8F;QAC9G,+CAA+C;QAC/C,0CAA0C;QAC1C,gDAAgD;QAChD,8GAA8G;QAC9G,wHAAwH;QACxH,OAAO;QACP,0CAA0C;QAC1C,WAAW;QACX,uBAAuB;QACvB,iBAAiB;QACjB,+CAA+C;QAC/C,OAAO;QACP,KAAK,CACN,CAAC;AACJ,CAAC;AAED,oDAAoD;AACpD,uDAAuD;AACvD,uDAAuD;AACvD,yDAAyD;AACzD,MAAM,CAAC,MAAM,2BAA2B,GACtC,0CAA0C;IAC1C,yEAAyE;IACzE,yCAAyC;IACzC,6FAA6F;IAC7F,2BAA2B,CAAC,SAAS,CAAC,CAAC"}

package/package.json

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