@prisma-next/sql-contract-psl 0.11.0-dev.5 → 0.11.0-dev.50

package/dist/provider.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"provider.mjs","names":[],"sources":["../src/provider.ts"],"sourcesContent":["import { readFile } from 'node:fs/promises';\nimport type { ContractConfig } from '@prisma-next/config/config-types';\nimport type { CodecLookup } from '@prisma-next/framework-components/codec';\nimport type { ExtensionPackRef, TargetPackRef } from '@prisma-next/framework-components/components';\nimport { parsePslDocument } from '@prisma-next/psl-parser';\nimport { ifDefined } from '@prisma-next/utils/defined';\nimport { notOk, ok } from '@prisma-next/utils/result';\nimport { basename, extname } from 'pathe';\nimport { interpretPslDocumentToSqlContract } from './interpreter';\nimport type { ColumnDescriptor } from './psl-column-resolution';\n\nexport interface PrismaContractOptions {\n  readonly output?: string;\n  readonly target: TargetPackRef<'sql', string>;\n  readonly composedExtensionPackRefs?: readonly ExtensionPackRef<'sql', string>[];\n}\n\n/**\n * Derives the emit output path from the schema input path so artefacts land\n * colocated with the source (e.g. `src/contract/schema.prisma` →\n * `src/contract/contract.json`). The provider owns this because it is the\n * only layer that knows the input path; the upstream `normalizeContractConfig`\n * default is a last-resort fallback for providers that don't carry one.\n */\nfunction defaultOutputFromSchemaPath(schemaPath: string): string {\n  const ext = extname(schemaPath);\n  if (ext.length === 0) return `${schemaPath}.json`;\n  const base = schemaPath.slice(0, -ext.length);\n  // PSL schemas commonly use `schema.prisma`; the emitted JSON is called\n  // `contract.json` to mirror the rest of the toolchain, not `schema.json`.\n  // Match only the exact basename `schema` so files like `my-schema.prisma`\n  // are not silently rewritten to `my-contract.json`.\n  if (basename(base) === 'schema') {\n    return `${base.slice(0, -'schema'.length)}contract.json`;\n  }\n  return `${base}.json`;\n}\n\nfunction buildColumnDescriptorMap(\n  scalarTypeDescriptors: ReadonlyMap<string, string>,\n  codecLookup: CodecLookup,\n): ReadonlyMap<string, ColumnDescriptor> {\n  const result = new Map<string, ColumnDescriptor>();\n  for (const [typeName, codecId] of scalarTypeDescriptors) {\n    const nativeType = codecLookup.targetTypesFor(codecId)?.[0];\n    if (nativeType === undefined) continue;\n    result.set(typeName, { codecId, nativeType });\n  }\n  return result;\n}\n\nexport function prismaContract(schemaPath: string, options: PrismaContractOptions): ContractConfig {\n  return {\n    source: {\n      inputs: [schemaPath],\n      load: async (context) => {\n        const [absoluteSchemaPath] = context.resolvedInputs;\n        if (absoluteSchemaPath === undefined) {\n          throw new Error(\n            'prismaContract: context.resolvedInputs is empty. The CLI config loader should populate it positional-matched with source.inputs.',\n          );\n        }\n        let schema: string;\n        try {\n          schema = await readFile(absoluteSchemaPath, 'utf-8');\n        } catch (error) {\n          const message = String(error);\n          return notOk({\n            summary: `Failed to read Prisma schema at \"${schemaPath}\"`,\n            diagnostics: [\n              {\n                code: 'PSL_SCHEMA_READ_FAILED',\n                message,\n                sourceId: schemaPath,\n              },\n            ],\n            meta: { schemaPath, absoluteSchemaPath, cause: message },\n          });\n        }\n\n        const document = parsePslDocument({\n          schema,\n          sourceId: schemaPath,\n        });\n\n        const scalarTypeDescriptors = buildColumnDescriptorMap(\n          context.scalarTypeDescriptors,\n          context.codecLookup,\n        );\n\n        const interpreted = interpretPslDocumentToSqlContract({\n          document,\n          target: options.target,\n          authoringContributions: context.authoringContributions,\n          scalarTypeDescriptors,\n          ...ifDefined(\n            'composedExtensionPacks',\n            context.composedExtensionPacks.length > 0\n              ? [...context.composedExtensionPacks]\n              : undefined,\n          ),\n          ...ifDefined(\n            'composedExtensionPackRefs',\n            options.composedExtensionPackRefs?.length\n              ? options.composedExtensionPackRefs\n              : undefined,\n          ),\n          controlMutationDefaults: context.controlMutationDefaults,\n        });\n        if (!interpreted.ok) {\n          return interpreted;\n        }\n\n        return ok(interpreted.value);\n      },\n    },\n    output: options.output ?? defaultOutputFromSchemaPath(schemaPath),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;AAwBA,SAAS,4BAA4B,YAA4B;CAC/D,MAAM,MAAM,QAAQ,WAAW;CAC/B,IAAI,IAAI,WAAW,GAAG,OAAO,GAAG,WAAW;CAC3C,MAAM,OAAO,WAAW,MAAM,GAAG,CAAC,IAAI,OAAO;CAK7C,IAAI,SAAS,KAAK,KAAK,UACrB,OAAO,GAAG,KAAK,MAAM,GAAG,GAAiB,CAAC;CAE5C,OAAO,GAAG,KAAK;;AAGjB,SAAS,yBACP,uBACA,aACuC;CACvC,MAAM,yBAAS,IAAI,KAA+B;CAClD,KAAK,MAAM,CAAC,UAAU,YAAY,uBAAuB;EACvD,MAAM,aAAa,YAAY,eAAe,QAAQ,GAAG;EACzD,IAAI,eAAe,KAAA,GAAW;EAC9B,OAAO,IAAI,UAAU;GAAE;GAAS;GAAY,CAAC;;CAE/C,OAAO;;AAGT,SAAgB,eAAe,YAAoB,SAAgD;CACjG,OAAO;EACL,QAAQ;GACN,QAAQ,CAAC,WAAW;GACpB,MAAM,OAAO,YAAY;IACvB,MAAM,CAAC,sBAAsB,QAAQ;IACrC,IAAI,uBAAuB,KAAA,GACzB,MAAM,IAAI,MACR,mIACD;IAEH,IAAI;IACJ,IAAI;KACF,SAAS,MAAM,SAAS,oBAAoB,QAAQ;aAC7C,OAAO;KACd,MAAM,UAAU,OAAO,MAAM;KAC7B,OAAO,MAAM;MACX,SAAS,oCAAoC,WAAW;MACxD,aAAa,CACX;OACE,MAAM;OACN;OACA,UAAU;OACX,CACF;MACD,MAAM;OAAE;OAAY;OAAoB,OAAO;OAAS;MACzD,CAAC;;IAGJ,MAAM,WAAW,iBAAiB;KAChC;KACA,UAAU;KACX,CAAC;IAEF,MAAM,wBAAwB,yBAC5B,QAAQ,uBACR,QAAQ,YACT;IAED,MAAM,cAAc,kCAAkC;KACpD;KACA,QAAQ,QAAQ;KAChB,wBAAwB,QAAQ;KAChC;KACA,GAAG,UACD,0BACA,QAAQ,uBAAuB,SAAS,IACpC,CAAC,GAAG,QAAQ,uBAAuB,GACnC,KAAA,EACL;KACD,GAAG,UACD,6BACA,QAAQ,2BAA2B,SAC/B,QAAQ,4BACR,KAAA,EACL;KACD,yBAAyB,QAAQ;KAClC,CAAC;IACF,IAAI,CAAC,YAAY,IACf,OAAO;IAGT,OAAO,GAAG,YAAY,MAAM;;GAE/B;EACD,QAAQ,QAAQ,UAAU,4BAA4B,WAAW;EAClE"}
+{"version":3,"file":"provider.mjs","names":[],"sources":["../src/provider.ts"],"sourcesContent":["import { readFile } from 'node:fs/promises';\nimport type { ContractConfig } from '@prisma-next/config/config-types';\nimport type { CodecLookup } from '@prisma-next/framework-components/codec';\nimport type { ExtensionPackRef, TargetPackRef } from '@prisma-next/framework-components/components';\nimport { parsePslDocument } from '@prisma-next/psl-parser';\nimport { ifDefined } from '@prisma-next/utils/defined';\nimport { notOk, ok } from '@prisma-next/utils/result';\nimport { basename, extname } from 'pathe';\nimport { interpretPslDocumentToSqlContract } from './interpreter';\nimport type { ColumnDescriptor } from './psl-column-resolution';\n\nexport interface PrismaContractOptions {\n  readonly output?: string;\n  readonly target: TargetPackRef<'sql', string>;\n  readonly composedExtensionPackRefs?: readonly ExtensionPackRef<'sql', string>[];\n}\n\n/**\n * Derives the emit output path from the schema input path so artefacts land\n * colocated with the source (e.g. `src/contract/schema.prisma` →\n * `src/contract/contract.json`). The provider owns this because it is the\n * only layer that knows the input path; the upstream `normalizeContractConfig`\n * default is a last-resort fallback for providers that don't carry one.\n */\nfunction defaultOutputFromSchemaPath(schemaPath: string): string {\n  const ext = extname(schemaPath);\n  if (ext.length === 0) return `${schemaPath}.json`;\n  const base = schemaPath.slice(0, -ext.length);\n  // PSL schemas commonly use `schema.prisma`; the emitted JSON is called\n  // `contract.json` to mirror the rest of the toolchain, not `schema.json`.\n  // Match only the exact basename `schema` so files like `my-schema.prisma`\n  // are not silently rewritten to `my-contract.json`.\n  if (basename(base) === 'schema') {\n    return `${base.slice(0, -'schema'.length)}contract.json`;\n  }\n  return `${base}.json`;\n}\n\nfunction buildColumnDescriptorMap(\n  scalarTypeDescriptors: ReadonlyMap<string, string>,\n  codecLookup: CodecLookup,\n): ReadonlyMap<string, ColumnDescriptor> {\n  const result = new Map<string, ColumnDescriptor>();\n  for (const [typeName, codecId] of scalarTypeDescriptors) {\n    const nativeType = codecLookup.targetTypesFor(codecId)?.[0];\n    if (nativeType === undefined) continue;\n    result.set(typeName, { codecId, nativeType });\n  }\n  return result;\n}\n\nexport function prismaContract(schemaPath: string, options: PrismaContractOptions): ContractConfig {\n  return {\n    source: {\n      inputs: [schemaPath],\n      load: async (context) => {\n        const [absoluteSchemaPath] = context.resolvedInputs;\n        if (absoluteSchemaPath === undefined) {\n          throw new Error(\n            'prismaContract: context.resolvedInputs is empty. The CLI config loader should populate it positional-matched with source.inputs.',\n          );\n        }\n        let schema: string;\n        try {\n          schema = await readFile(absoluteSchemaPath, 'utf-8');\n        } catch (error) {\n          const message = String(error);\n          return notOk({\n            summary: `Failed to read Prisma schema at \"${schemaPath}\"`,\n            diagnostics: [\n              {\n                code: 'PSL_SCHEMA_READ_FAILED',\n                message,\n                sourceId: schemaPath,\n              },\n            ],\n            meta: { schemaPath, absoluteSchemaPath, cause: message },\n          });\n        }\n\n        const document = parsePslDocument({\n          schema,\n          sourceId: schemaPath,\n        });\n\n        const scalarTypeDescriptors = buildColumnDescriptorMap(\n          context.scalarTypeDescriptors,\n          context.codecLookup,\n        );\n\n        const interpreted = interpretPslDocumentToSqlContract({\n          document,\n          target: options.target,\n          authoringContributions: context.authoringContributions,\n          scalarTypeDescriptors,\n          ...ifDefined(\n            'composedExtensionPacks',\n            context.composedExtensionPacks.length > 0\n              ? [...context.composedExtensionPacks]\n              : undefined,\n          ),\n          ...ifDefined(\n            'composedExtensionPackRefs',\n            options.composedExtensionPackRefs?.length\n              ? options.composedExtensionPackRefs\n              : undefined,\n          ),\n          controlMutationDefaults: context.controlMutationDefaults,\n        });\n        if (!interpreted.ok) {\n          return interpreted;\n        }\n\n        return ok(interpreted.value);\n      },\n    },\n    output: options.output ?? defaultOutputFromSchemaPath(schemaPath),\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;AAwBA,SAAS,4BAA4B,YAA4B;CAC/D,MAAM,MAAM,QAAQ,UAAU;CAC9B,IAAI,IAAI,WAAW,GAAG,OAAO,GAAG,WAAW;CAC3C,MAAM,OAAO,WAAW,MAAM,GAAG,CAAC,IAAI,MAAM;CAK5C,IAAI,SAAS,IAAI,MAAM,UACrB,OAAO,GAAG,KAAK,MAAM,GAAG,EAAgB,EAAE;CAE5C,OAAO,GAAG,KAAK;AACjB;AAEA,SAAS,yBACP,uBACA,aACuC;CACvC,MAAM,yBAAS,IAAI,IAA8B;CACjD,KAAK,MAAM,CAAC,UAAU,YAAY,uBAAuB;EACvD,MAAM,aAAa,YAAY,eAAe,OAAO,IAAI;EACzD,IAAI,eAAe,KAAA,GAAW;EAC9B,OAAO,IAAI,UAAU;GAAE;GAAS;EAAW,CAAC;CAC9C;CACA,OAAO;AACT;AAEA,SAAgB,eAAe,YAAoB,SAAgD;CACjG,OAAO;EACL,QAAQ;GACN,QAAQ,CAAC,UAAU;GACnB,MAAM,OAAO,YAAY;IACvB,MAAM,CAAC,sBAAsB,QAAQ;IACrC,IAAI,uBAAuB,KAAA,GACzB,MAAM,IAAI,MACR,kIACF;IAEF,IAAI;IACJ,IAAI;KACF,SAAS,MAAM,SAAS,oBAAoB,OAAO;IACrD,SAAS,OAAO;KACd,MAAM,UAAU,OAAO,KAAK;KAC5B,OAAO,MAAM;MACX,SAAS,oCAAoC,WAAW;MACxD,aAAa,CACX;OACE,MAAM;OACN;OACA,UAAU;MACZ,CACF;MACA,MAAM;OAAE;OAAY;OAAoB,OAAO;MAAQ;KACzD,CAAC;IACH;IAEA,MAAM,WAAW,iBAAiB;KAChC;KACA,UAAU;IACZ,CAAC;IAED,MAAM,wBAAwB,yBAC5B,QAAQ,uBACR,QAAQ,WACV;IAEA,MAAM,cAAc,kCAAkC;KACpD;KACA,QAAQ,QAAQ;KAChB,wBAAwB,QAAQ;KAChC;KACA,GAAG,UACD,0BACA,QAAQ,uBAAuB,SAAS,IACpC,CAAC,GAAG,QAAQ,sBAAsB,IAClC,KAAA,CACN;KACA,GAAG,UACD,6BACA,QAAQ,2BAA2B,SAC/B,QAAQ,4BACR,KAAA,CACN;KACA,yBAAyB,QAAQ;IACnC,CAAC;IACD,IAAI,CAAC,YAAY,IACf,OAAO;IAGT,OAAO,GAAG,YAAY,KAAK;GAC7B;EACF;EACA,QAAQ,QAAQ,UAAU,4BAA4B,UAAU;CAClE;AACF"}

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@prisma-next/sql-contract-psl",
-  "version": "0.11.0-dev.5",
+  "version": "0.11.0-dev.50",
   "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.5",
-    "@prisma-next/contract": "0.11.0-dev.5",
-    "@prisma-next/framework-components": "0.11.0-dev.5",
-    "@prisma-next/psl-parser": "0.11.0-dev.5",
-    "@prisma-next/sql-contract": "0.11.0-dev.5",
-    "@prisma-next/sql-contract-ts": "0.11.0-dev.5",
-    "@prisma-next/utils": "0.11.0-dev.5",
+    "@prisma-next/config": "0.11.0-dev.50",
+    "@prisma-next/contract": "0.11.0-dev.50",
+    "@prisma-next/framework-components": "0.11.0-dev.50",
+    "@prisma-next/psl-parser": "0.11.0-dev.50",
+    "@prisma-next/sql-contract": "0.11.0-dev.50",
+    "@prisma-next/sql-contract-ts": "0.11.0-dev.50",
+    "@prisma-next/utils": "0.11.0-dev.50",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@prisma-next/contract-authoring": "0.11.0-dev.5",
-    "@prisma-next/test-utils": "0.11.0-dev.5",
-    "@prisma-next/tsconfig": "0.11.0-dev.5",
-    "@prisma-next/tsdown": "0.11.0-dev.5",
+    "@prisma-next/contract-authoring": "0.11.0-dev.50",
+    "@prisma-next/test-utils": "0.11.0-dev.50",
+    "@prisma-next/tsconfig": "0.11.0-dev.50",
+    "@prisma-next/tsdown": "0.11.0-dev.50",
     "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 } } : {}),
       },
     };
@@ -1680,6 +1686,7 @@ export function interpretPslDocumentToSqlContract(
     baseDeclarations,
     modelNames,
     modelMappings,
+    modelNamespaceIds,
     sourceId,
     polyDiagnostics,
   );
@@ -1693,7 +1700,9 @@ 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 = {