@prisma-next/sql-contract 0.12.0-dev.78 → 0.12.0-dev.79

package/dist/resolve-storage-table.d.mts

@@ -6,12 +6,15 @@ interface ResolvedStorageTable {
   readonly table: StorageTable;
 }
 /**
- * Resolve a bare storage table name to its namespace coordinate and table IR by
- * scanning the contract's namespaces. For the single-namespace contracts in
- * scope the scan is exact; cross-namespace bare-name collisions are selected
- * explicitly (TML-2550).
+ * Resolve a bare storage table name to its namespace coordinate and table IR.
+ *
+ * When `namespaceId` is supplied, the table is resolved strictly within that
+ * namespace (no scan). When omitted, a bare name unique across namespaces
+ * resolves to its sole namespace; a bare name declared in more than one
+ * namespace throws a fail-fast diagnostic naming the candidate namespaces
+ * rather than silently selecting the first match.
  */
-declare function resolveStorageTable(storage: SqlStorage, tableName: string): ResolvedStorageTable | undefined;
+declare function resolveStorageTable(storage: SqlStorage, tableName: string, namespaceId?: string): ResolvedStorageTable | undefined;
 //#endregion
 export { type ResolvedStorageTable, resolveStorageTable };
 //# sourceMappingURL=resolve-storage-table.d.mts.map

package/dist/resolve-storage-table.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-storage-table.d.mts","names":[],"sources":["../src/resolve-storage-table.ts"],"mappings":";;;UAGiB,oBAAA;EAAA,SACN,WAAA;EAAA,SACA,KAAA,EAAO,YAAY;AAAA;;;;;;AAAA;iBAuBd,mBAAA,CACd,OAAA,EAAS,UAAA,EACT,SAAA,WACC,oBAAoB"}
+{"version":3,"file":"resolve-storage-table.d.mts","names":[],"sources":["../src/resolve-storage-table.ts"],"mappings":";;;UAGiB,oBAAA;EAAA,SACN,WAAA;EAAA,SACA,KAAA,EAAO,YAAY;AAAA;;;;;;AAAA;AA0B9B;;;iBAAgB,mBAAA,CACd,OAAA,EAAS,UAAA,EACT,SAAA,UACA,WAAA,YACC,oBAAoB"}

package/dist/resolve-storage-table.mjs

@@ -6,19 +6,35 @@ function tableInNamespace(namespace, tableName) {
 	return tables[tableName];
 }
 /**
-* Resolve a bare storage table name to its namespace coordinate and table IR by
-* scanning the contract's namespaces. For the single-namespace contracts in
-* scope the scan is exact; cross-namespace bare-name collisions are selected
-* explicitly (TML-2550).
+* Resolve a bare storage table name to its namespace coordinate and table IR.
+*
+* When `namespaceId` is supplied, the table is resolved strictly within that
+* namespace (no scan). When omitted, a bare name unique across namespaces
+* resolves to its sole namespace; a bare name declared in more than one
+* namespace throws a fail-fast diagnostic naming the candidate namespaces
+* rather than silently selecting the first match.
 */
-function resolveStorageTable(storage, tableName) {
-	for (const namespaceId of Object.keys(storage.namespaces)) {
+function resolveStorageTable(storage, tableName, namespaceId) {
+	if (namespaceId !== void 0) {
 		const table = tableInNamespace(storage.namespaces[namespaceId], tableName);
-		if (table !== void 0) return {
+		return table === void 0 ? void 0 : {
 			namespaceId,
 			table
 		};
 	}
+	const matches = [];
+	for (const candidateNamespaceId of Object.keys(storage.namespaces)) {
+		const table = tableInNamespace(storage.namespaces[candidateNamespaceId], tableName);
+		if (table !== void 0) matches.push({
+			namespaceId: candidateNamespaceId,
+			table
+		});
+	}
+	if (matches.length > 1) {
+		const candidates = matches.map((match) => match.namespaceId).sort().join(", ");
+		throw new Error(`Storage table "${tableName}" is ambiguous across namespaces [${candidates}]; qualify it with a namespace coordinate.`);
+	}
+	return matches[0];
 }
 //#endregion
 export { resolveStorageTable };

package/dist/resolve-storage-table.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-storage-table.mjs","names":[],"sources":["../src/resolve-storage-table.ts"],"sourcesContent":["import type { SqlNamespace, SqlStorage } from './ir/sql-storage';\nimport type { StorageTable } from './ir/storage-table';\n\nexport interface ResolvedStorageTable {\n  readonly namespaceId: string;\n  readonly table: StorageTable;\n}\n\nfunction tableInNamespace(\n  namespace: SqlNamespace | undefined,\n  tableName: string,\n): StorageTable | undefined {\n  if (namespace === undefined) {\n    return undefined;\n  }\n  const tables = namespace.entries.table;\n  if (!Object.hasOwn(tables, tableName)) {\n    return undefined;\n  }\n  return tables[tableName];\n}\n\n/**\n * Resolve a bare storage table name to its namespace coordinate and table IR by\n * scanning the contract's namespaces. For the single-namespace contracts in\n * scope the scan is exact; cross-namespace bare-name collisions are selected\n * explicitly (TML-2550).\n */\nexport function resolveStorageTable(\n  storage: SqlStorage,\n  tableName: string,\n): ResolvedStorageTable | undefined {\n  for (const namespaceId of Object.keys(storage.namespaces)) {\n    const table = tableInNamespace(storage.namespaces[namespaceId], tableName);\n    if (table !== undefined) {\n      return { namespaceId, table };\n    }\n  }\n\n  return undefined;\n}\n"],"mappings":";AAQA,SAAS,iBACP,WACA,WAC0B;CAC1B,IAAI,cAAc,KAAA,GAChB;CAEF,MAAM,SAAS,UAAU,QAAQ;CACjC,IAAI,CAAC,OAAO,OAAO,QAAQ,SAAS,GAClC;CAEF,OAAO,OAAO;AAChB;;;;;;;AAQA,SAAgB,oBACd,SACA,WACkC;CAClC,KAAK,MAAM,eAAe,OAAO,KAAK,QAAQ,UAAU,GAAG;EACzD,MAAM,QAAQ,iBAAiB,QAAQ,WAAW,cAAc,SAAS;EACzE,IAAI,UAAU,KAAA,GACZ,OAAO;GAAE;GAAa;EAAM;CAEhC;AAGF"}
+{"version":3,"file":"resolve-storage-table.mjs","names":[],"sources":["../src/resolve-storage-table.ts"],"sourcesContent":["import type { SqlNamespace, SqlStorage } from './ir/sql-storage';\nimport type { StorageTable } from './ir/storage-table';\n\nexport interface ResolvedStorageTable {\n  readonly namespaceId: string;\n  readonly table: StorageTable;\n}\n\nfunction tableInNamespace(\n  namespace: SqlNamespace | undefined,\n  tableName: string,\n): StorageTable | undefined {\n  if (namespace === undefined) {\n    return undefined;\n  }\n  const tables = namespace.entries.table;\n  if (!Object.hasOwn(tables, tableName)) {\n    return undefined;\n  }\n  return tables[tableName];\n}\n\n/**\n * Resolve a bare storage table name to its namespace coordinate and table IR.\n *\n * When `namespaceId` is supplied, the table is resolved strictly within that\n * namespace (no scan). When omitted, a bare name unique across namespaces\n * resolves to its sole namespace; a bare name declared in more than one\n * namespace throws a fail-fast diagnostic naming the candidate namespaces\n * rather than silently selecting the first match.\n */\nexport function resolveStorageTable(\n  storage: SqlStorage,\n  tableName: string,\n  namespaceId?: string,\n): ResolvedStorageTable | undefined {\n  if (namespaceId !== undefined) {\n    const table = tableInNamespace(storage.namespaces[namespaceId], tableName);\n    return table === undefined ? undefined : { namespaceId, table };\n  }\n\n  const matches: ResolvedStorageTable[] = [];\n  for (const candidateNamespaceId of Object.keys(storage.namespaces)) {\n    const table = tableInNamespace(storage.namespaces[candidateNamespaceId], tableName);\n    if (table !== undefined) {\n      matches.push({ namespaceId: candidateNamespaceId, table });\n    }\n  }\n\n  if (matches.length > 1) {\n    const candidates = matches\n      .map((match) => match.namespaceId)\n      .sort()\n      .join(', ');\n    throw new Error(\n      `Storage table \"${tableName}\" is ambiguous across namespaces [${candidates}]; qualify it with a namespace coordinate.`,\n    );\n  }\n\n  return matches[0];\n}\n"],"mappings":";AAQA,SAAS,iBACP,WACA,WAC0B;CAC1B,IAAI,cAAc,KAAA,GAChB;CAEF,MAAM,SAAS,UAAU,QAAQ;CACjC,IAAI,CAAC,OAAO,OAAO,QAAQ,SAAS,GAClC;CAEF,OAAO,OAAO;AAChB;;;;;;;;;;AAWA,SAAgB,oBACd,SACA,WACA,aACkC;CAClC,IAAI,gBAAgB,KAAA,GAAW;EAC7B,MAAM,QAAQ,iBAAiB,QAAQ,WAAW,cAAc,SAAS;EACzE,OAAO,UAAU,KAAA,IAAY,KAAA,IAAY;GAAE;GAAa;EAAM;CAChE;CAEA,MAAM,UAAkC,CAAC;CACzC,KAAK,MAAM,wBAAwB,OAAO,KAAK,QAAQ,UAAU,GAAG;EAClE,MAAM,QAAQ,iBAAiB,QAAQ,WAAW,uBAAuB,SAAS;EAClF,IAAI,UAAU,KAAA,GACZ,QAAQ,KAAK;GAAE,aAAa;GAAsB;EAAM,CAAC;CAE7D;CAEA,IAAI,QAAQ,SAAS,GAAG;EACtB,MAAM,aAAa,QAChB,KAAK,UAAU,MAAM,WAAW,CAAC,CACjC,KAAK,CAAC,CACN,KAAK,IAAI;EACZ,MAAM,IAAI,MACR,kBAAkB,UAAU,oCAAoC,WAAW,2CAC7E;CACF;CAEA,OAAO,QAAQ;AACjB"}

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@prisma-next/sql-contract",
-  "version": "0.12.0-dev.78",
+  "version": "0.12.0-dev.79",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "description": "SQL contract types, validators, and IR factories for Prisma Next",
   "dependencies": {
-    "@prisma-next/contract": "0.12.0-dev.78",
-    "@prisma-next/framework-components": "0.12.0-dev.78",
-    "@prisma-next/utils": "0.12.0-dev.78",
+    "@prisma-next/contract": "0.12.0-dev.79",
+    "@prisma-next/framework-components": "0.12.0-dev.79",
+    "@prisma-next/utils": "0.12.0-dev.79",
     "arktype": "^2.2.0"
   },
   "devDependencies": {
-    "@prisma-next/test-utils": "0.12.0-dev.78",
-    "@prisma-next/tsconfig": "0.12.0-dev.78",
-    "@prisma-next/tsdown": "0.12.0-dev.78",
+    "@prisma-next/test-utils": "0.12.0-dev.79",
+    "@prisma-next/tsconfig": "0.12.0-dev.79",
+    "@prisma-next/tsdown": "0.12.0-dev.79",
     "tsdown": "0.22.1",
     "typescript": "5.9.3",
     "vitest": "4.1.8"

package/src/resolve-storage-table.ts

@@ -21,21 +21,41 @@ function tableInNamespace(
 }
 
 /**
- * Resolve a bare storage table name to its namespace coordinate and table IR by
- * scanning the contract's namespaces. For the single-namespace contracts in
- * scope the scan is exact; cross-namespace bare-name collisions are selected
- * explicitly (TML-2550).
+ * Resolve a bare storage table name to its namespace coordinate and table IR.
+ *
+ * When `namespaceId` is supplied, the table is resolved strictly within that
+ * namespace (no scan). When omitted, a bare name unique across namespaces
+ * resolves to its sole namespace; a bare name declared in more than one
+ * namespace throws a fail-fast diagnostic naming the candidate namespaces
+ * rather than silently selecting the first match.
  */
 export function resolveStorageTable(
   storage: SqlStorage,
   tableName: string,
+  namespaceId?: string,
 ): ResolvedStorageTable | undefined {
-  for (const namespaceId of Object.keys(storage.namespaces)) {
+  if (namespaceId !== undefined) {
     const table = tableInNamespace(storage.namespaces[namespaceId], tableName);
+    return table === undefined ? undefined : { namespaceId, table };
+  }
+
+  const matches: ResolvedStorageTable[] = [];
+  for (const candidateNamespaceId of Object.keys(storage.namespaces)) {
+    const table = tableInNamespace(storage.namespaces[candidateNamespaceId], tableName);
     if (table !== undefined) {
-      return { namespaceId, table };
+      matches.push({ namespaceId: candidateNamespaceId, table });
     }
   }
 
-  return undefined;
+  if (matches.length > 1) {
+    const candidates = matches
+      .map((match) => match.namespaceId)
+      .sort()
+      .join(', ');
+    throw new Error(
+      `Storage table "${tableName}" is ambiguous across namespaces [${candidates}]; qualify it with a namespace coordinate.`,
+    );
+  }
+
+  return matches[0];
 }