@prisma-next/sql-contract-psl 0.11.0-dev.7 → 0.11.0-dev.70

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@prisma-next/sql-contract-psl",
-  "version": "0.11.0-dev.7",
+  "version": "0.11.0-dev.70",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "description": "PSL-to-SQL ContractIR interpreter for Prisma Next",
   "dependencies": {
-    "@prisma-next/config": "0.11.0-dev.7",
-    "@prisma-next/contract": "0.11.0-dev.7",
-    "@prisma-next/framework-components": "0.11.0-dev.7",
-    "@prisma-next/psl-parser": "0.11.0-dev.7",
-    "@prisma-next/sql-contract": "0.11.0-dev.7",
-    "@prisma-next/sql-contract-ts": "0.11.0-dev.7",
-    "@prisma-next/utils": "0.11.0-dev.7",
+    "@prisma-next/config": "0.11.0-dev.70",
+    "@prisma-next/contract": "0.11.0-dev.70",
+    "@prisma-next/framework-components": "0.11.0-dev.70",
+    "@prisma-next/psl-parser": "0.11.0-dev.70",
+    "@prisma-next/sql-contract": "0.11.0-dev.70",
+    "@prisma-next/sql-contract-ts": "0.11.0-dev.70",
+    "@prisma-next/utils": "0.11.0-dev.70",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@prisma-next/contract-authoring": "0.11.0-dev.7",
-    "@prisma-next/test-utils": "0.11.0-dev.7",
-    "@prisma-next/tsconfig": "0.11.0-dev.7",
-    "@prisma-next/tsdown": "0.11.0-dev.7",
+    "@prisma-next/contract-authoring": "0.11.0-dev.70",
+    "@prisma-next/test-utils": "0.11.0-dev.70",
+    "@prisma-next/tsconfig": "0.11.0-dev.70",
+    "@prisma-next/tsdown": "0.11.0-dev.70",
     "arktype": "^2.2.0",
     "tsdown": "0.22.0",
     "typescript": "5.9.3",

package/src/interpreter.ts

@@ -9,6 +9,7 @@ import type {
   ContractModel,
   ContractValueObject,
 } from '@prisma-next/contract/types';
+import { crossRef } from '@prisma-next/contract/types';
 import type {
   AuthoringContributions,
   AuthoringEntityContext,
@@ -22,6 +23,7 @@ import type {
   MutationDefaultGeneratorDescriptor,
 } from '@prisma-next/framework-components/control';
 import type { Namespace } from '@prisma-next/framework-components/ir';
+import { UNBOUND_NAMESPACE_ID } from '@prisma-next/framework-components/ir';
 import type {
   ParsePslDocumentResult,
   PslAttribute,
@@ -1303,6 +1305,7 @@ function resolvePolymorphism(
   baseDeclarations: Map<string, BaseDeclaration>,
   modelNames: Set<string>,
   modelMappings: ReadonlyMap<string, ModelNameMapping>,
+  modelNamespaceIds: ReadonlyMap<string, string>,
   sourceId: string,
   diagnostics: ContractSourceDiagnostic[],
 ): Record<string, ContractModel> {
@@ -1406,7 +1409,10 @@ function resolvePolymorphism(
       ...patched,
       [variantName]: {
         ...variantModel,
-        base: baseDecl.baseName,
+        base: crossRef(
+          baseDecl.baseName,
+          modelNamespaceIds.get(baseDecl.baseName) ?? UNBOUND_NAMESPACE_ID,
+        ),
         ...(resolvedTable ? { storage: { ...variantModel.storage, table: resolvedTable } } : {}),
       },
     };
@@ -1668,10 +1674,18 @@ export function interpretPslDocumentToSqlContract(
     })),
   });
 
-  let patchedModels = patchModelDomainFields(
-    contract.models as Record<string, ContractModel>,
-    modelResolvedFields,
-  );
+  const modelsForPatch: Record<string, ContractModel> = {};
+  for (const namespaceSlice of Object.values(contract.domain.namespaces)) {
+    for (const [modelName, model] of Object.entries(namespaceSlice.models)) {
+      if (Object.hasOwn(modelsForPatch, modelName)) {
+        throw new Error(
+          `duplicate model name "${modelName}" across domain namespaces during PSL interpretation`,
+        );
+      }
+      modelsForPatch[modelName] = model as ContractModel;
+    }
+  }
+  let patchedModels = patchModelDomainFields(modelsForPatch, modelResolvedFields);
 
   const polyDiagnostics: ContractSourceDiagnostic[] = [];
   patchedModels = resolvePolymorphism(
@@ -1680,6 +1694,7 @@ export function interpretPslDocumentToSqlContract(
     baseDeclarations,
     modelNames,
     modelMappings,
+    modelNamespaceIds,
     sourceId,
     polyDiagnostics,
   );
@@ -1693,14 +1708,35 @@ export function interpretPslDocumentToSqlContract(
 
   const variantModelNames = new Set(baseDeclarations.keys());
   const filteredRoots = Object.fromEntries(
-    Object.entries(contract.roots).filter(([, modelName]) => !variantModelNames.has(modelName)),
+    Object.entries(contract.roots).filter(
+      ([, crossReference]) => !variantModelNames.has(crossReference.model),
+    ),
   );
 
   const patchedContract: Contract = {
     ...contract,
     roots: filteredRoots,
-    models: patchedModels,
-    ...(Object.keys(valueObjects).length > 0 ? { valueObjects } : {}),
+    domain: {
+      namespaces: Object.fromEntries(
+        Object.entries(contract.domain.namespaces).map(([namespaceId, namespaceSlice]) => [
+          namespaceId,
+          {
+            models: Object.fromEntries(
+              Object.entries(namespaceSlice.models).map(([modelName, model]) => [
+                modelName,
+                patchedModels[modelName] ?? model,
+              ]),
+            ),
+            ...(namespaceSlice.valueObjects !== undefined
+              ? { valueObjects: namespaceSlice.valueObjects }
+              : {}),
+            ...(namespaceId === UNBOUND_NAMESPACE_ID && Object.keys(valueObjects).length > 0
+              ? { valueObjects }
+              : {}),
+          },
+        ]),
+      ),
+    },
   };
 
   return ok(patchedContract);