@prisma-next/sql-contract-psl 0.12.0 → 0.13.0-dev.2

package/src/provider.ts

@@ -1,8 +1,12 @@
 import { readFile } from 'node:fs/promises';
 import type { ContractConfig } from '@prisma-next/config/config-types';
+import { applySpecifierDefaultControlPolicy } from '@prisma-next/contract/apply-specifier-default-control-policy';
+import type { ControlPolicy } from '@prisma-next/contract/types';
 import type { CodecLookup } from '@prisma-next/framework-components/codec';
 import type { ExtensionPackRef, TargetPackRef } from '@prisma-next/framework-components/components';
+import type { Namespace } from '@prisma-next/framework-components/ir';
 import { parsePslDocument } from '@prisma-next/psl-parser';
+import type { SqlNamespaceTablesInput } from '@prisma-next/sql-contract/types';
 import { ifDefined } from '@prisma-next/utils/defined';
 import { notOk, ok } from '@prisma-next/utils/result';
 import { basename, extname } from 'pathe';
@@ -13,6 +17,8 @@ export interface PrismaContractOptions {
   readonly output?: string;
   readonly target: TargetPackRef<'sql', string>;
   readonly composedExtensionPackRefs?: readonly ExtensionPackRef<'sql', string>[];
+  readonly createNamespace?: (input: SqlNamespaceTablesInput) => Namespace;
+  readonly defaultControlPolicy?: ControlPolicy;
 }
 
 /**
@@ -99,6 +105,7 @@ export function prismaContract(schemaPath: string, options: PrismaContractOption
               ? [...context.composedExtensionPacks]
               : undefined,
           ),
+          composedExtensionContracts: context.composedExtensionContracts,
           ...ifDefined(
             'composedExtensionPackRefs',
             options.composedExtensionPackRefs?.length
@@ -106,12 +113,15 @@ export function prismaContract(schemaPath: string, options: PrismaContractOption
               : undefined,
           ),
           controlMutationDefaults: context.controlMutationDefaults,
+          ...ifDefined('createNamespace', options.createNamespace),
         });
         if (!interpreted.ok) {
           return interpreted;
         }
 
-        return ok(interpreted.value);
+        return ok(
+          applySpecifierDefaultControlPolicy(interpreted.value, options.defaultControlPolicy),
+        );
       },
     },
     output: options.output ?? defaultOutputFromSchemaPath(schemaPath),

package/src/psl-attribute-parsing.ts

@@ -1,4 +1,5 @@
 import type { ContractSourceDiagnostic } from '@prisma-next/config/config-types';
+import type { ControlPolicy } from '@prisma-next/contract/types';
 import type { PslAttribute, PslSpan } from '@prisma-next/psl-parser';
 import { getPositionalArgument, parseQuotedStringLiteral } from '@prisma-next/psl-parser';
 
@@ -411,6 +412,71 @@ export function findDuplicateFieldName(fieldNames: readonly string[]): string |
   return undefined;
 }
 
+const CONTROL_POLICY_LITERALS = [
+  'managed',
+  'tolerated',
+  'external',
+  'observed',
+] as const satisfies readonly ControlPolicy[];
+
+const CONTROL_POLICY_LITERAL_SET = new Set<string>(CONTROL_POLICY_LITERALS);
+
+function isControlPolicyLiteral(value: string): value is ControlPolicy {
+  return CONTROL_POLICY_LITERAL_SET.has(value);
+}
+
+export function parseControlPolicyAttribute(input: {
+  readonly attribute: PslAttribute;
+  readonly sourceId: string;
+  readonly diagnostics: ContractSourceDiagnostic[];
+}): ControlPolicy | undefined {
+  const namedArgs = input.attribute.args.filter((arg) => arg.kind === 'named');
+  if (namedArgs.length > 0) {
+    input.diagnostics.push({
+      code: 'PSL_INVALID_ATTRIBUTE_ARGUMENT',
+      message:
+        '`@@control` does not accept named arguments; pass the policy positionally as `@@control(external)`.',
+      sourceId: input.sourceId,
+      span: input.attribute.span,
+    });
+    return undefined;
+  }
+
+  const positionalArgs = getPositionalArguments(input.attribute);
+  if (positionalArgs.length === 0) {
+    input.diagnostics.push({
+      code: 'PSL_INVALID_ATTRIBUTE_ARGUMENT',
+      message:
+        '`@@control` requires exactly one positional argument: `managed`, `tolerated`, `external`, or `observed`.',
+      sourceId: input.sourceId,
+      span: input.attribute.span,
+    });
+    return undefined;
+  }
+  if (positionalArgs.length > 1) {
+    input.diagnostics.push({
+      code: 'PSL_INVALID_ATTRIBUTE_ARGUMENT',
+      message: `\`@@control\` accepts exactly one positional argument; got ${positionalArgs.length}.`,
+      sourceId: input.sourceId,
+      span: input.attribute.span,
+    });
+    return undefined;
+  }
+
+  const token = unquoteStringLiteral(positionalArgs[0] ?? '').trim();
+  if (!isControlPolicyLiteral(token)) {
+    input.diagnostics.push({
+      code: 'PSL_INVALID_ATTRIBUTE_ARGUMENT',
+      message: `\`@@control\` argument \`${token}\` is not a known policy. Allowed: \`managed\`, \`tolerated\`, \`external\`, \`observed\`.`,
+      sourceId: input.sourceId,
+      span: input.attribute.span,
+    });
+    return undefined;
+  }
+
+  return token;
+}
+
 export function mapFieldNamesToColumns(input: {
   readonly modelName: string;
   readonly fieldNames: readonly string[];

package/src/psl-column-resolution.ts

@@ -25,6 +25,7 @@ import type {
   PslSpan,
   PslTypeConstructorCall,
 } from '@prisma-next/psl-parser';
+import { blindCast } from '@prisma-next/utils/casts';
 import {
   lowerDefaultFunctionWithRegistry,
   parseDefaultFunctionCall,
@@ -67,7 +68,9 @@ export function getAuthoringTypeConstructor(
     if (typeof current !== 'object' || current === null || Array.isArray(current)) {
       return undefined;
     }
-    current = (current as Record<string, unknown>)[segment];
+    current = blindCast<Record<string, unknown>, 'narrowed by preceding typeof/null/array guards'>(
+      current,
+    )[segment];
   }
 
   return isAuthoringTypeConstructorDescriptor(current) ? current : undefined;
@@ -94,7 +97,9 @@ export function getAuthoringEntity(
     if (typeof current !== 'object' || current === null || Array.isArray(current)) {
       return undefined;
     }
-    current = (current as Record<string, unknown>)[segment];
+    current = blindCast<Record<string, unknown>, 'narrowed by preceding typeof/null/array guards'>(
+      current,
+    )[segment];
   }
 
   return isAuthoringEntityTypeDescriptor(current) ? current : undefined;
@@ -115,7 +120,9 @@ export function getAuthoringFieldPreset(
     if (typeof current !== 'object' || current === null || Array.isArray(current)) {
       return undefined;
     }
-    current = (current as Record<string, unknown>)[segment];
+    current = blindCast<Record<string, unknown>, 'narrowed by preceding typeof/null/array guards'>(
+      current,
+    )[segment];
   }
 
   return isAuthoringFieldPresetDescriptor(current) ? current : undefined;

package/src/psl-field-resolution.ts

@@ -42,6 +42,24 @@ export type ModelNameMapping = {
   readonly fieldColumns: Map<string, string>;
 };
 
+/**
+ * A PSL model paired with its resolved namespace coordinate (undefined when
+ * the target leaves the model late-bound). Two models may share a bare name
+ * across namespaces, so structures that must distinguish them are keyed by
+ * the `(namespaceId, modelName)` coordinate produced by
+ * {@link modelCoordinateKey} rather than the bare model name.
+ */
+export type ModelNamespaceEntry = {
+  readonly model: PslModel;
+  readonly namespaceId: string | undefined;
+};
+
+const MODEL_COORDINATE_SEPARATOR = '\u0000';
+
+export function modelCoordinateKey(namespaceId: string, modelName: string): string {
+  return `${namespaceId}${MODEL_COORDINATE_SEPARATOR}${modelName}`;
+}
+
 export interface CollectResolvedFieldsInput {
   readonly model: PslModel;
   readonly mapping: ModelNameMapping;
@@ -232,6 +250,12 @@ export function collectResolvedFields(input: CollectResolvedFieldsInput): Resolv
     if (isModelField && relationAttribute) {
       continue;
     }
+    // Cross-contract-space relation fields (e.g. `supabase:auth.User @relation(...)`) are not
+    // local model fields, but they carry a @relation attribute and should be skipped here.
+    // Their FK and RelationNode lowering is handled separately in the interpreter.
+    if (field.typeContractSpaceId !== undefined && relationAttribute) {
+      continue;
+    }
 
     const isValueObjectField = compositeTypeNames.has(field.typeName);
     const isListField = field.list;
@@ -418,12 +442,13 @@ export function collectResolvedFields(input: CollectResolvedFieldsInput): Resolv
 }
 
 export function buildModelMappings(
-  models: readonly PslModel[],
+  modelEntries: readonly ModelNamespaceEntry[],
+  defaultNamespaceId: string,
   diagnostics: ContractSourceDiagnostic[],
   sourceId: string,
 ): Map<string, ModelNameMapping> {
   const result = new Map<string, ModelNameMapping>();
-  for (const model of models) {
+  for (const { model, namespaceId } of modelEntries) {
     const mapAttribute = getAttribute(model.attributes, 'map');
     const tableName = parseMapName({
       attribute: mapAttribute,
@@ -446,7 +471,7 @@ export function buildModelMappings(
       });
       fieldColumns.set(field.name, columnName);
     }
-    result.set(model.name, {
+    result.set(modelCoordinateKey(namespaceId ?? defaultNamespaceId, model.name), {
       model,
       tableName,
       fieldColumns,

package/src/psl-relation-resolution.ts

@@ -14,7 +14,7 @@ import {
 } from './psl-attribute-parsing';
 import { checkUncomposedNamespace, reportUncomposedNamespace } from './psl-column-resolution';
 
-export const REFERENTIAL_ACTION_MAP = {
+export const REFERENTIAL_ACTION_MAP: Record<string, ReferentialAction | undefined> = {
   NoAction: 'noAction',
   Restrict: 'restrict',
   Cascade: 'cascade',
@@ -25,7 +25,7 @@ export const REFERENTIAL_ACTION_MAP = {
   cascade: 'cascade',
   setNull: 'setNull',
   setDefault: 'setDefault',
-} as const;
+};
 
 export type ParsedRelationAttribute = {
   readonly relationName?: string;
@@ -42,6 +42,8 @@ export type FkRelationMetadata = {
   readonly declaringTableName: string;
   readonly targetModelName: string;
   readonly targetTableName: string;
+  /** Resolved namespace coordinate of the related model, when known. */
+  readonly targetNamespaceId?: string;
   readonly relationName?: string;
   readonly localColumns: readonly string[];
   readonly referencedColumns: readonly string[];
@@ -71,8 +73,7 @@ export function normalizeReferentialAction(input: {
   readonly span: PslSpan;
   readonly diagnostics: ContractSourceDiagnostic[];
 }): ReferentialAction | undefined {
-  const normalized =
-    REFERENTIAL_ACTION_MAP[input.actionToken as keyof typeof REFERENTIAL_ACTION_MAP];
+  const normalized = REFERENTIAL_ACTION_MAP[input.actionToken];
   if (normalized) {
     return normalized;
   }
@@ -252,6 +253,7 @@ export function indexFkRelations(input: {
       fieldName: relation.declaringFieldName,
       toModel: relation.targetModelName,
       toTable: relation.targetTableName,
+      ...ifDefined('toNamespaceId', relation.targetNamespaceId),
       cardinality: 'N:1',
       on: {
         parentTable: relation.declaringTableName,