@saasicat/cli 1.0.0-rc.14 → 1.0.0-rc.16

package/bin/saasicat.js

@@ -290,6 +290,16 @@ function printCheckReport(report) {
         console.log('');
     }
 
+    if (report.tenantCascades.length > 0) {
+        console.log(`✗ Deleted together with the tenant (${report.tenantCascades.length}):`);
+        for (const { model, field } of report.tenantCascades) {
+            console.log(`    ${`${model}.${field}`.padEnd(44)} onDelete: Cascade`);
+        }
+        console.log('  These records outlive their tenant — a contract is kept for tax purposes.');
+        console.log('  Remove the relation; `tenantId` stays as a trace.');
+        console.log('');
+    }
+
     const breaking = report.missingBlockAttributes.filter((a) => a.kind !== 'index');
     if (breaking.length > 0) {
         console.log(`✗ Missing constraints (${breaking.length}):`);

package/dist/.build-stamp

@@ -1 +1 @@
-e5be15ecef9e7070e3a31f68ab42c3a6f1225f21c914a6c55a4b6ed7345809c3
+2c53f8cea2ea7de0b41c9b894cdc45c45c9173c816c239c3afa50d5b9326914e

package/dist/index.cjs

@@ -109,6 +109,7 @@ __export(index_exports, {
   kebabCase: () => kebabCase,
   migrationCreatedBy: () => migrationCreatedBy,
   minimumQuotasPerPlan: () => minimumQuotasPerPlan,
+  modelsKeptPastTheTenant: () => modelsKeptPastTheTenant,
   namedImports: () => namedImports,
   parseBlockAttributes: () => parseBlockAttributes,
   parseEnumValues: () => parseEnumValues,
@@ -1335,6 +1336,117 @@ function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
 }
 __name(applyFragmentBlocks, "applyFragmentBlocks");
 
+// src/fk-pointers.ts
+var POINTER = /^(\s*)\/\/\s*(\w+)(\s+)(Tenant|User)(\??)(\s+)(@relation\(.*\))\s*$/;
+function findFkPointers(schema2) {
+  const found = [];
+  let model = "";
+  schema2.split("\n").forEach((text, line) => {
+    const opening = /^model\s+(\w+)\s*\{/.exec(text);
+    if (opening) model = opening[1];
+    const match = POINTER.exec(text);
+    if (match) found.push({
+      line,
+      target: match[4],
+      model,
+      text
+    });
+  });
+  return found;
+}
+__name(findFkPointers, "findFkPointers");
+function relationNameOf(relationAttribute) {
+  const match = /@relation\(\s*"([^"]+)"/.exec(relationAttribute);
+  return match ? match[1] : null;
+}
+__name(relationNameOf, "relationNameOf");
+function escapeForRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+__name(escapeForRegExp, "escapeForRegExp");
+function modelBody(schema2, model) {
+  const name = escapeForRegExp(model);
+  const block = new RegExp(`(^|\\n)model\\s+${name}\\s*\\{([\\s\\S]*?)\\n\\}`, "m").exec(schema2);
+  return block ? block[2] : null;
+}
+__name(modelBody, "modelBody");
+function isOneToOne(schema2, model, foreignKey) {
+  const body = modelBody(schema2, model);
+  if (!body) return false;
+  return new RegExp(`^\\s*${escapeForRegExp(foreignKey)}\\s+\\S+.*@unique`, "m").test(body);
+}
+__name(isOneToOne, "isOneToOne");
+function hasBackRelation(schema2, model, owner, relationName, singular = false) {
+  const body = modelBody(schema2, owner);
+  if (body === null) return false;
+  const name = escapeForRegExp(model);
+  const shape = singular ? `${name}\\??` : `${name}\\[\\]`;
+  const candidates = [
+    ...body.matchAll(new RegExp(`^\\s*\\w+\\s+${shape}(\\s.*)?$`, "gm"))
+  ];
+  return candidates.some((line) => relationNameOf(line[0]) === relationName);
+}
+__name(hasBackRelation, "hasBackRelation");
+function enableFkPointers(schema2, models) {
+  const lines = schema2.split("\n");
+  const enabled = [];
+  const skipped = [];
+  const needsBackRelation = [];
+  for (const pointer of findFkPointers(schema2)) {
+    const model = pointer.target === "Tenant" ? models.tenant : models.user;
+    if (!model) {
+      skipped.push({
+        line: pointer.line,
+        target: pointer.target
+      });
+      continue;
+    }
+    const match = POINTER.exec(pointer.text);
+    const relationName = relationNameOf(match[7]);
+    const foreignKey = foreignKeyOf(match[7]);
+    const singular = foreignKey !== null && isOneToOne(schema2, pointer.model, foreignKey);
+    if (!hasBackRelation(schema2, pointer.model, model, relationName, singular)) {
+      needsBackRelation.push({
+        line: pointer.line,
+        owner: model,
+        suggestion: backRelationSuggestion(pointer.model, relationName, singular)
+      });
+      continue;
+    }
+    const [, indent, field, gap1, , optional, gap2, relation] = match;
+    lines[pointer.line] = `${indent}${field}${gap1}${model}${optional}${gap2}${relation}`;
+    enabled.push({
+      line: pointer.line,
+      model
+    });
+  }
+  return {
+    schema: lines.join("\n"),
+    enabled,
+    skipped,
+    needsBackRelation
+  };
+}
+__name(enableFkPointers, "enableFkPointers");
+var lowerFirst = /* @__PURE__ */ __name((value) => value.charAt(0).toLowerCase() + value.slice(1), "lowerFirst");
+function foreignKeyOf(relationAttribute) {
+  const match = /fields:\s*\[\s*(\w+)/.exec(relationAttribute);
+  return match ? match[1] : null;
+}
+__name(foreignKeyOf, "foreignKeyOf");
+function backRelationSuggestion(model, relationName, singular) {
+  const field = singular ? lowerFirst(model) : `${lowerFirst(model)}s`;
+  const type = singular ? `${model}?` : `${model}[]`;
+  return `${field} ${type}` + (relationName ? ` @relation("${relationName}")` : "");
+}
+__name(backRelationSuggestion, "backRelationSuggestion");
+function assertModelsExist(declaredModels, models) {
+  const missing = Object.entries(models).filter(([, name]) => name && !declaredModels.includes(name)).map(([role, name]) => `--${role}-model=${name}`);
+  if (missing.length === 0) return;
+  throw new Error(`${missing.join(", ")} \u2014 no such model in this schema. It declares: ${declaredModels.slice().sort().join(", ")}.`);
+}
+__name(assertModelsExist, "assertModelsExist");
+
 // src/schema-check.ts
 function renderType(signature) {
   return `${signature.type}${signature.list ? "[]" : ""}${signature.optional ? "?" : ""}`;
@@ -1467,6 +1579,27 @@ function breaksContract(attribute) {
   return attribute.kind !== "index";
 }
 __name(breaksContract, "breaksContract");
+function modelsKeptPastTheTenant(specSchema) {
+  const pointed = new Set(findFkPointers(specSchema).filter((pointer) => pointer.target === "Tenant").map((pointer) => pointer.model));
+  return [
+    ...parseSchema(specSchema).models
+  ].filter(([model, fields]) => fields.has("tenantId") && !pointed.has(model)).map(([model]) => model);
+}
+__name(modelsKeptPastTheTenant, "modelsKeptPastTheTenant");
+function cascadesFromTenant(model, block) {
+  const found = [];
+  for (const line of block.split("\n")) {
+    const compact = structuralOnly(line).replace(/\s+/g, "");
+    if (compact.includes("@relation(") && compact.includes("fields:[tenantId]") && compact.includes("onDelete:Cascade")) {
+      found.push({
+        model,
+        field: line.trim().split(/\s/)[0]
+      });
+    }
+  }
+  return found;
+}
+__name(cascadesFromTenant, "cascadesFromTenant");
 function checkSchema(specSchema, appSchema) {
   const spec = parseSchema(specSchema);
   const app = parseSchema(appSchema);
@@ -1487,6 +1620,11 @@ function checkSchema(specSchema, appSchema) {
       compareBlockAttributes(model, specAttrs, appAttrs, missingBlockAttributes);
     }
   }
+  const appBlocks = extractBlocks(appSchema, "model");
+  const tenantCascades = modelsKeptPastTheTenant(specSchema).flatMap((model) => {
+    const block = appBlocks.get(model);
+    return block ? cascadesFromTenant(model, block) : [];
+  });
   const absentEnums = [];
   const missingEnumValues = [];
   for (const [name, specValues] of spec.enums) {
@@ -1511,9 +1649,10 @@ function checkSchema(specSchema, appSchema) {
     missingEnumValues,
     fieldMismatches,
     missingBlockAttributes,
+    tenantCascades,
     checkedModelCount: spec.models.size - absentModels.length,
     checkedEnumCount: spec.enums.size - absentEnums.length,
-    ok: missingFields.length === 0 && missingEnumValues.length === 0 && fieldMismatches.length === 0 && !missingBlockAttributes.some(breaksContract)
+    ok: missingFields.length === 0 && missingEnumValues.length === 0 && fieldMismatches.length === 0 && tenantCascades.length === 0 && !missingBlockAttributes.some(breaksContract)
   };
 }
 __name(checkSchema, "checkSchema");
@@ -1594,117 +1733,6 @@ function reportConstraints(outcome, context) {
 }
 __name(reportConstraints, "reportConstraints");
 
-// src/fk-pointers.ts
-var POINTER = /^(\s*)\/\/\s*(\w+)(\s+)(Tenant|User)(\??)(\s+)(@relation\(.*\))\s*$/;
-function findFkPointers(schema2) {
-  const found = [];
-  let model = "";
-  schema2.split("\n").forEach((text, line) => {
-    const opening = /^model\s+(\w+)\s*\{/.exec(text);
-    if (opening) model = opening[1];
-    const match = POINTER.exec(text);
-    if (match) found.push({
-      line,
-      target: match[4],
-      model,
-      text
-    });
-  });
-  return found;
-}
-__name(findFkPointers, "findFkPointers");
-function relationNameOf(relationAttribute) {
-  const match = /@relation\(\s*"([^"]+)"/.exec(relationAttribute);
-  return match ? match[1] : null;
-}
-__name(relationNameOf, "relationNameOf");
-function escapeForRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-__name(escapeForRegExp, "escapeForRegExp");
-function modelBody(schema2, model) {
-  const name = escapeForRegExp(model);
-  const block = new RegExp(`(^|\\n)model\\s+${name}\\s*\\{([\\s\\S]*?)\\n\\}`, "m").exec(schema2);
-  return block ? block[2] : null;
-}
-__name(modelBody, "modelBody");
-function isOneToOne(schema2, model, foreignKey) {
-  const body = modelBody(schema2, model);
-  if (!body) return false;
-  return new RegExp(`^\\s*${escapeForRegExp(foreignKey)}\\s+\\S+.*@unique`, "m").test(body);
-}
-__name(isOneToOne, "isOneToOne");
-function hasBackRelation(schema2, model, owner, relationName, singular = false) {
-  const body = modelBody(schema2, owner);
-  if (body === null) return false;
-  const name = escapeForRegExp(model);
-  const shape = singular ? `${name}\\??` : `${name}\\[\\]`;
-  const candidates = [
-    ...body.matchAll(new RegExp(`^\\s*\\w+\\s+${shape}(\\s.*)?$`, "gm"))
-  ];
-  return candidates.some((line) => relationNameOf(line[0]) === relationName);
-}
-__name(hasBackRelation, "hasBackRelation");
-function enableFkPointers(schema2, models) {
-  const lines = schema2.split("\n");
-  const enabled = [];
-  const skipped = [];
-  const needsBackRelation = [];
-  for (const pointer of findFkPointers(schema2)) {
-    const model = pointer.target === "Tenant" ? models.tenant : models.user;
-    if (!model) {
-      skipped.push({
-        line: pointer.line,
-        target: pointer.target
-      });
-      continue;
-    }
-    const match = POINTER.exec(pointer.text);
-    const relationName = relationNameOf(match[7]);
-    const foreignKey = foreignKeyOf(match[7]);
-    const singular = foreignKey !== null && isOneToOne(schema2, pointer.model, foreignKey);
-    if (!hasBackRelation(schema2, pointer.model, model, relationName, singular)) {
-      needsBackRelation.push({
-        line: pointer.line,
-        owner: model,
-        suggestion: backRelationSuggestion(pointer.model, relationName, singular)
-      });
-      continue;
-    }
-    const [, indent, field, gap1, , optional, gap2, relation] = match;
-    lines[pointer.line] = `${indent}${field}${gap1}${model}${optional}${gap2}${relation}`;
-    enabled.push({
-      line: pointer.line,
-      model
-    });
-  }
-  return {
-    schema: lines.join("\n"),
-    enabled,
-    skipped,
-    needsBackRelation
-  };
-}
-__name(enableFkPointers, "enableFkPointers");
-var lowerFirst = /* @__PURE__ */ __name((value) => value.charAt(0).toLowerCase() + value.slice(1), "lowerFirst");
-function foreignKeyOf(relationAttribute) {
-  const match = /fields:\s*\[\s*(\w+)/.exec(relationAttribute);
-  return match ? match[1] : null;
-}
-__name(foreignKeyOf, "foreignKeyOf");
-function backRelationSuggestion(model, relationName, singular) {
-  const field = singular ? lowerFirst(model) : `${lowerFirst(model)}s`;
-  const type = singular ? `${model}?` : `${model}[]`;
-  return `${field} ${type}` + (relationName ? ` @relation("${relationName}")` : "");
-}
-__name(backRelationSuggestion, "backRelationSuggestion");
-function assertModelsExist(declaredModels, models) {
-  const missing = Object.entries(models).filter(([, name]) => name && !declaredModels.includes(name)).map(([role, name]) => `--${role}-model=${name}`);
-  if (missing.length === 0) return;
-  throw new Error(`${missing.join(", ")} \u2014 no such model in this schema. It declares: ${declaredModels.slice().sort().join(", ")}.`);
-}
-__name(assertModelsExist, "assertModelsExist");
-
 // src/init/catalog-keys.ts
 var import_spec = require("@saasicat/spec");
 var schema = import_spec.planCatalogSchema;
@@ -3788,6 +3816,7 @@ UserCommands = _ts_decorate14([
   kebabCase,
   migrationCreatedBy,
   minimumQuotasPerPlan,
+  modelsKeptPastTheTenant,
   namedImports,
   parseBlockAttributes,
   parseEnumValues,

package/dist/index.d.cts

@@ -467,6 +467,15 @@ interface MissingBlockAttribute {
     /** For `map`: what the consumer maps to instead. */
     actual?: string;
 }
+/**
+ * A relation that deletes a record the platform keeps past its tenant, together
+ * with the tenant.
+ */
+interface TenantCascade {
+    model: string;
+    /** The relation field that cascades, e.g. `tenant`. */
+    field: string;
+}
 interface SchemaCheckReport {
     /** Platform models the consumer does not carry — informational. */
     absentModels: string[];
@@ -480,6 +489,11 @@ interface SchemaCheckReport {
      * `@@index`, `@@unique`, and a diverging `@@map`.
      */
     missingBlockAttributes: MissingBlockAttribute[];
+    /**
+     * Relations that cascade from the tenant onto a model the platform keeps
+     * after the tenant is gone, such as a contract.
+     */
+    tenantCascades: TenantCascade[];
     /** Models present in both schemas, i.e. actually compared. */
     checkedModelCount: number;
     /** Enums present in both schemas, i.e. actually compared. */
@@ -514,6 +528,15 @@ declare function parseSchema(schema: string): ParsedSchema;
  * the check.
  */
 declare function breaksContract(attribute: MissingBlockAttribute): boolean;
+/**
+ * The platform models that outlive their tenant: the ones whose fragment
+ * declares `tenantId` and deliberately comments no relation to `Tenant`.
+ *
+ * Read off the fragments rather than listed, so the next model kept past its
+ * tenant is covered by being written that way. Every other model with a
+ * `tenantId` ships the pointer a consumer enables, cascade and all.
+ */
+declare function modelsKeptPastTheTenant(specSchema: string): string[];
 /**
  * Compares a consumer schema against the canonical fragments. `specSchema` is
  * the concatenation of the fragments the check should cover.
@@ -1379,4 +1402,4 @@ declare class UserCommands extends CommandRunner {
     parsePassword(val: string): string;
 }
 
-export { AUDIT_QUERY_PORT_TOKEN, AdminCommands, AdminManifestDoctorCheck, AdminMfaSetupCommand, AdminWhoamiCommand, type ApplyResult, AuditCommands, AuditTailCommand, AuditTailFlow, type AuditTailOptions, type BlockAttributeKind, type BlockAttributes, CLI_CONTEXT_CONFIG_TOKEN, CONSTRAINTS_MARKER, type CheckSeverity, type CliContextConfig, CliContextModule, type CliContextModuleOptions, CliContextService, CliError, type CliIdentity, type ConstraintsOutcome, type ConstraintsReport, DEFAULT_MANIFEST_CHECKS, DOCTOR_CHECKS_TOKEN, type DbCatalogOccurrence, type DbCatalogResult, type DbCatalogShape, DiscoveryCommands, DiscoveryScanCommand, DiscoverySnapshotDoctorCheck, type DoctorCheck, type DoctorCheckResult, DoctorCommands, DoctorFlow, type DoctorReport, type EnableFkResult, type FieldMismatch, type FieldMismatchReason, type FieldSignature, type FkModelNames, type FkPointer, type FragmentBlocks, type InitOptions, type InitPlan, LIMIT_FILTER_IMPORTS, LIMIT_FILTER_PROVIDER, MANIFEST_ACCESS_PORT_TOKEN, MANIFEST_CHECKS_TOKEN, type ManifestCheck, ManifestCheckCommand, type ManifestCheckReport, type ManifestCheckResult, ManifestCliFlow, ManifestCommands, type ManifestDiff, ManifestDumpCommand, ManifestHashCommand, type ManifestRewriteOptions, ManifestValidateCommand, MfaSetupFlow, type MfaSetupOptions, type MfaSetupResult, type MissingBlockAttribute, type MissingEnumValue, type MissingField, type ModuleResolutionVerdict, type MoveTable, type MovedSetting, type MovedSettingOccurrence, type MovedSettingsResult, PLATFORM_DOCTOR_CHECK_PROVIDERS, type ParsedSchema, type PatchAppModuleOptions, type PatchOptionsFromPlan, type PatchResult, PlanCatalogDoctorCheck, type PlannedFile, type ProjectKeyResult, type QuotaProviderFile, type QuotaSpec, type RenameResult, type RenameTable, type RewriteResult, SCANNED_FOR_DB_CATALOG, SCANNED_FOR_MOVED_SETTINGS, SETTINGS_THAT_MOVED, type SchemaCheckReport, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WHERE_DB_CATALOG_GOES, WHERE_IT_GOES, WhoAmIFlow, type WhoAmIResult, type WrittenSetting, appKeyPattern, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidAppKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, describeDbCatalogOccurrence, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findDbCatalogBlocks, findFkPointers, findMovedSettings, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, judgeModuleResolution, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, quotaKeyPattern, readEffectiveModuleResolution, relationNameOf, removeProjectKey, reportConstraints, rewriteImports, rewriteManifest, rewriteNames, rewriteSubpath, settingsWrittenTo, stripLineComment, structuralOnly, tablesAddressedBy };
+export { AUDIT_QUERY_PORT_TOKEN, AdminCommands, AdminManifestDoctorCheck, AdminMfaSetupCommand, AdminWhoamiCommand, type ApplyResult, AuditCommands, AuditTailCommand, AuditTailFlow, type AuditTailOptions, type BlockAttributeKind, type BlockAttributes, CLI_CONTEXT_CONFIG_TOKEN, CONSTRAINTS_MARKER, type CheckSeverity, type CliContextConfig, CliContextModule, type CliContextModuleOptions, CliContextService, CliError, type CliIdentity, type ConstraintsOutcome, type ConstraintsReport, DEFAULT_MANIFEST_CHECKS, DOCTOR_CHECKS_TOKEN, type DbCatalogOccurrence, type DbCatalogResult, type DbCatalogShape, DiscoveryCommands, DiscoveryScanCommand, DiscoverySnapshotDoctorCheck, type DoctorCheck, type DoctorCheckResult, DoctorCommands, DoctorFlow, type DoctorReport, type EnableFkResult, type FieldMismatch, type FieldMismatchReason, type FieldSignature, type FkModelNames, type FkPointer, type FragmentBlocks, type InitOptions, type InitPlan, LIMIT_FILTER_IMPORTS, LIMIT_FILTER_PROVIDER, MANIFEST_ACCESS_PORT_TOKEN, MANIFEST_CHECKS_TOKEN, type ManifestCheck, ManifestCheckCommand, type ManifestCheckReport, type ManifestCheckResult, ManifestCliFlow, ManifestCommands, type ManifestDiff, ManifestDumpCommand, ManifestHashCommand, type ManifestRewriteOptions, ManifestValidateCommand, MfaSetupFlow, type MfaSetupOptions, type MfaSetupResult, type MissingBlockAttribute, type MissingEnumValue, type MissingField, type ModuleResolutionVerdict, type MoveTable, type MovedSetting, type MovedSettingOccurrence, type MovedSettingsResult, PLATFORM_DOCTOR_CHECK_PROVIDERS, type ParsedSchema, type PatchAppModuleOptions, type PatchOptionsFromPlan, type PatchResult, PlanCatalogDoctorCheck, type PlannedFile, type ProjectKeyResult, type QuotaProviderFile, type QuotaSpec, type RenameResult, type RenameTable, type RewriteResult, SCANNED_FOR_DB_CATALOG, SCANNED_FOR_MOVED_SETTINGS, SETTINGS_THAT_MOVED, type SchemaCheckReport, type TenantCascade, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WHERE_DB_CATALOG_GOES, WHERE_IT_GOES, WhoAmIFlow, type WhoAmIResult, type WrittenSetting, appKeyPattern, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidAppKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, describeDbCatalogOccurrence, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findDbCatalogBlocks, findFkPointers, findMovedSettings, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, judgeModuleResolution, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, modelsKeptPastTheTenant, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, quotaKeyPattern, readEffectiveModuleResolution, relationNameOf, removeProjectKey, reportConstraints, rewriteImports, rewriteManifest, rewriteNames, rewriteSubpath, settingsWrittenTo, stripLineComment, structuralOnly, tablesAddressedBy };

package/dist/index.d.ts

@@ -467,6 +467,15 @@ interface MissingBlockAttribute {
     /** For `map`: what the consumer maps to instead. */
     actual?: string;
 }
+/**
+ * A relation that deletes a record the platform keeps past its tenant, together
+ * with the tenant.
+ */
+interface TenantCascade {
+    model: string;
+    /** The relation field that cascades, e.g. `tenant`. */
+    field: string;
+}
 interface SchemaCheckReport {
     /** Platform models the consumer does not carry — informational. */
     absentModels: string[];
@@ -480,6 +489,11 @@ interface SchemaCheckReport {
      * `@@index`, `@@unique`, and a diverging `@@map`.
      */
     missingBlockAttributes: MissingBlockAttribute[];
+    /**
+     * Relations that cascade from the tenant onto a model the platform keeps
+     * after the tenant is gone, such as a contract.
+     */
+    tenantCascades: TenantCascade[];
     /** Models present in both schemas, i.e. actually compared. */
     checkedModelCount: number;
     /** Enums present in both schemas, i.e. actually compared. */
@@ -514,6 +528,15 @@ declare function parseSchema(schema: string): ParsedSchema;
  * the check.
  */
 declare function breaksContract(attribute: MissingBlockAttribute): boolean;
+/**
+ * The platform models that outlive their tenant: the ones whose fragment
+ * declares `tenantId` and deliberately comments no relation to `Tenant`.
+ *
+ * Read off the fragments rather than listed, so the next model kept past its
+ * tenant is covered by being written that way. Every other model with a
+ * `tenantId` ships the pointer a consumer enables, cascade and all.
+ */
+declare function modelsKeptPastTheTenant(specSchema: string): string[];
 /**
  * Compares a consumer schema against the canonical fragments. `specSchema` is
  * the concatenation of the fragments the check should cover.
@@ -1379,4 +1402,4 @@ declare class UserCommands extends CommandRunner {
     parsePassword(val: string): string;
 }
 
-export { AUDIT_QUERY_PORT_TOKEN, AdminCommands, AdminManifestDoctorCheck, AdminMfaSetupCommand, AdminWhoamiCommand, type ApplyResult, AuditCommands, AuditTailCommand, AuditTailFlow, type AuditTailOptions, type BlockAttributeKind, type BlockAttributes, CLI_CONTEXT_CONFIG_TOKEN, CONSTRAINTS_MARKER, type CheckSeverity, type CliContextConfig, CliContextModule, type CliContextModuleOptions, CliContextService, CliError, type CliIdentity, type ConstraintsOutcome, type ConstraintsReport, DEFAULT_MANIFEST_CHECKS, DOCTOR_CHECKS_TOKEN, type DbCatalogOccurrence, type DbCatalogResult, type DbCatalogShape, DiscoveryCommands, DiscoveryScanCommand, DiscoverySnapshotDoctorCheck, type DoctorCheck, type DoctorCheckResult, DoctorCommands, DoctorFlow, type DoctorReport, type EnableFkResult, type FieldMismatch, type FieldMismatchReason, type FieldSignature, type FkModelNames, type FkPointer, type FragmentBlocks, type InitOptions, type InitPlan, LIMIT_FILTER_IMPORTS, LIMIT_FILTER_PROVIDER, MANIFEST_ACCESS_PORT_TOKEN, MANIFEST_CHECKS_TOKEN, type ManifestCheck, ManifestCheckCommand, type ManifestCheckReport, type ManifestCheckResult, ManifestCliFlow, ManifestCommands, type ManifestDiff, ManifestDumpCommand, ManifestHashCommand, type ManifestRewriteOptions, ManifestValidateCommand, MfaSetupFlow, type MfaSetupOptions, type MfaSetupResult, type MissingBlockAttribute, type MissingEnumValue, type MissingField, type ModuleResolutionVerdict, type MoveTable, type MovedSetting, type MovedSettingOccurrence, type MovedSettingsResult, PLATFORM_DOCTOR_CHECK_PROVIDERS, type ParsedSchema, type PatchAppModuleOptions, type PatchOptionsFromPlan, type PatchResult, PlanCatalogDoctorCheck, type PlannedFile, type ProjectKeyResult, type QuotaProviderFile, type QuotaSpec, type RenameResult, type RenameTable, type RewriteResult, SCANNED_FOR_DB_CATALOG, SCANNED_FOR_MOVED_SETTINGS, SETTINGS_THAT_MOVED, type SchemaCheckReport, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WHERE_DB_CATALOG_GOES, WHERE_IT_GOES, WhoAmIFlow, type WhoAmIResult, type WrittenSetting, appKeyPattern, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidAppKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, describeDbCatalogOccurrence, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findDbCatalogBlocks, findFkPointers, findMovedSettings, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, judgeModuleResolution, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, quotaKeyPattern, readEffectiveModuleResolution, relationNameOf, removeProjectKey, reportConstraints, rewriteImports, rewriteManifest, rewriteNames, rewriteSubpath, settingsWrittenTo, stripLineComment, structuralOnly, tablesAddressedBy };
+export { AUDIT_QUERY_PORT_TOKEN, AdminCommands, AdminManifestDoctorCheck, AdminMfaSetupCommand, AdminWhoamiCommand, type ApplyResult, AuditCommands, AuditTailCommand, AuditTailFlow, type AuditTailOptions, type BlockAttributeKind, type BlockAttributes, CLI_CONTEXT_CONFIG_TOKEN, CONSTRAINTS_MARKER, type CheckSeverity, type CliContextConfig, CliContextModule, type CliContextModuleOptions, CliContextService, CliError, type CliIdentity, type ConstraintsOutcome, type ConstraintsReport, DEFAULT_MANIFEST_CHECKS, DOCTOR_CHECKS_TOKEN, type DbCatalogOccurrence, type DbCatalogResult, type DbCatalogShape, DiscoveryCommands, DiscoveryScanCommand, DiscoverySnapshotDoctorCheck, type DoctorCheck, type DoctorCheckResult, DoctorCommands, DoctorFlow, type DoctorReport, type EnableFkResult, type FieldMismatch, type FieldMismatchReason, type FieldSignature, type FkModelNames, type FkPointer, type FragmentBlocks, type InitOptions, type InitPlan, LIMIT_FILTER_IMPORTS, LIMIT_FILTER_PROVIDER, MANIFEST_ACCESS_PORT_TOKEN, MANIFEST_CHECKS_TOKEN, type ManifestCheck, ManifestCheckCommand, type ManifestCheckReport, type ManifestCheckResult, ManifestCliFlow, ManifestCommands, type ManifestDiff, ManifestDumpCommand, ManifestHashCommand, type ManifestRewriteOptions, ManifestValidateCommand, MfaSetupFlow, type MfaSetupOptions, type MfaSetupResult, type MissingBlockAttribute, type MissingEnumValue, type MissingField, type ModuleResolutionVerdict, type MoveTable, type MovedSetting, type MovedSettingOccurrence, type MovedSettingsResult, PLATFORM_DOCTOR_CHECK_PROVIDERS, type ParsedSchema, type PatchAppModuleOptions, type PatchOptionsFromPlan, type PatchResult, PlanCatalogDoctorCheck, type PlannedFile, type ProjectKeyResult, type QuotaProviderFile, type QuotaSpec, type RenameResult, type RenameTable, type RewriteResult, SCANNED_FOR_DB_CATALOG, SCANNED_FOR_MOVED_SETTINGS, SETTINGS_THAT_MOVED, type SchemaCheckReport, type TenantCascade, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WHERE_DB_CATALOG_GOES, WHERE_IT_GOES, WhoAmIFlow, type WhoAmIResult, type WrittenSetting, appKeyPattern, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidAppKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, describeDbCatalogOccurrence, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findDbCatalogBlocks, findFkPointers, findMovedSettings, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, judgeModuleResolution, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, modelsKeptPastTheTenant, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, quotaKeyPattern, readEffectiveModuleResolution, relationNameOf, removeProjectKey, reportConstraints, rewriteImports, rewriteManifest, rewriteNames, rewriteSubpath, settingsWrittenTo, stripLineComment, structuralOnly, tablesAddressedBy };

package/dist/index.js

@@ -1201,6 +1201,117 @@ function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
 }
 __name(applyFragmentBlocks, "applyFragmentBlocks");
 
+// src/fk-pointers.ts
+var POINTER = /^(\s*)\/\/\s*(\w+)(\s+)(Tenant|User)(\??)(\s+)(@relation\(.*\))\s*$/;
+function findFkPointers(schema2) {
+  const found = [];
+  let model = "";
+  schema2.split("\n").forEach((text, line) => {
+    const opening = /^model\s+(\w+)\s*\{/.exec(text);
+    if (opening) model = opening[1];
+    const match = POINTER.exec(text);
+    if (match) found.push({
+      line,
+      target: match[4],
+      model,
+      text
+    });
+  });
+  return found;
+}
+__name(findFkPointers, "findFkPointers");
+function relationNameOf(relationAttribute) {
+  const match = /@relation\(\s*"([^"]+)"/.exec(relationAttribute);
+  return match ? match[1] : null;
+}
+__name(relationNameOf, "relationNameOf");
+function escapeForRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+__name(escapeForRegExp, "escapeForRegExp");
+function modelBody(schema2, model) {
+  const name = escapeForRegExp(model);
+  const block = new RegExp(`(^|\\n)model\\s+${name}\\s*\\{([\\s\\S]*?)\\n\\}`, "m").exec(schema2);
+  return block ? block[2] : null;
+}
+__name(modelBody, "modelBody");
+function isOneToOne(schema2, model, foreignKey) {
+  const body = modelBody(schema2, model);
+  if (!body) return false;
+  return new RegExp(`^\\s*${escapeForRegExp(foreignKey)}\\s+\\S+.*@unique`, "m").test(body);
+}
+__name(isOneToOne, "isOneToOne");
+function hasBackRelation(schema2, model, owner, relationName, singular = false) {
+  const body = modelBody(schema2, owner);
+  if (body === null) return false;
+  const name = escapeForRegExp(model);
+  const shape = singular ? `${name}\\??` : `${name}\\[\\]`;
+  const candidates = [
+    ...body.matchAll(new RegExp(`^\\s*\\w+\\s+${shape}(\\s.*)?$`, "gm"))
+  ];
+  return candidates.some((line) => relationNameOf(line[0]) === relationName);
+}
+__name(hasBackRelation, "hasBackRelation");
+function enableFkPointers(schema2, models) {
+  const lines = schema2.split("\n");
+  const enabled = [];
+  const skipped = [];
+  const needsBackRelation = [];
+  for (const pointer of findFkPointers(schema2)) {
+    const model = pointer.target === "Tenant" ? models.tenant : models.user;
+    if (!model) {
+      skipped.push({
+        line: pointer.line,
+        target: pointer.target
+      });
+      continue;
+    }
+    const match = POINTER.exec(pointer.text);
+    const relationName = relationNameOf(match[7]);
+    const foreignKey = foreignKeyOf(match[7]);
+    const singular = foreignKey !== null && isOneToOne(schema2, pointer.model, foreignKey);
+    if (!hasBackRelation(schema2, pointer.model, model, relationName, singular)) {
+      needsBackRelation.push({
+        line: pointer.line,
+        owner: model,
+        suggestion: backRelationSuggestion(pointer.model, relationName, singular)
+      });
+      continue;
+    }
+    const [, indent, field, gap1, , optional, gap2, relation] = match;
+    lines[pointer.line] = `${indent}${field}${gap1}${model}${optional}${gap2}${relation}`;
+    enabled.push({
+      line: pointer.line,
+      model
+    });
+  }
+  return {
+    schema: lines.join("\n"),
+    enabled,
+    skipped,
+    needsBackRelation
+  };
+}
+__name(enableFkPointers, "enableFkPointers");
+var lowerFirst = /* @__PURE__ */ __name((value) => value.charAt(0).toLowerCase() + value.slice(1), "lowerFirst");
+function foreignKeyOf(relationAttribute) {
+  const match = /fields:\s*\[\s*(\w+)/.exec(relationAttribute);
+  return match ? match[1] : null;
+}
+__name(foreignKeyOf, "foreignKeyOf");
+function backRelationSuggestion(model, relationName, singular) {
+  const field = singular ? lowerFirst(model) : `${lowerFirst(model)}s`;
+  const type = singular ? `${model}?` : `${model}[]`;
+  return `${field} ${type}` + (relationName ? ` @relation("${relationName}")` : "");
+}
+__name(backRelationSuggestion, "backRelationSuggestion");
+function assertModelsExist(declaredModels, models) {
+  const missing = Object.entries(models).filter(([, name]) => name && !declaredModels.includes(name)).map(([role, name]) => `--${role}-model=${name}`);
+  if (missing.length === 0) return;
+  throw new Error(`${missing.join(", ")} \u2014 no such model in this schema. It declares: ${declaredModels.slice().sort().join(", ")}.`);
+}
+__name(assertModelsExist, "assertModelsExist");
+
 // src/schema-check.ts
 function renderType(signature) {
   return `${signature.type}${signature.list ? "[]" : ""}${signature.optional ? "?" : ""}`;
@@ -1333,6 +1444,27 @@ function breaksContract(attribute) {
   return attribute.kind !== "index";
 }
 __name(breaksContract, "breaksContract");
+function modelsKeptPastTheTenant(specSchema) {
+  const pointed = new Set(findFkPointers(specSchema).filter((pointer) => pointer.target === "Tenant").map((pointer) => pointer.model));
+  return [
+    ...parseSchema(specSchema).models
+  ].filter(([model, fields]) => fields.has("tenantId") && !pointed.has(model)).map(([model]) => model);
+}
+__name(modelsKeptPastTheTenant, "modelsKeptPastTheTenant");
+function cascadesFromTenant(model, block) {
+  const found = [];
+  for (const line of block.split("\n")) {
+    const compact = structuralOnly(line).replace(/\s+/g, "");
+    if (compact.includes("@relation(") && compact.includes("fields:[tenantId]") && compact.includes("onDelete:Cascade")) {
+      found.push({
+        model,
+        field: line.trim().split(/\s/)[0]
+      });
+    }
+  }
+  return found;
+}
+__name(cascadesFromTenant, "cascadesFromTenant");
 function checkSchema(specSchema, appSchema) {
   const spec = parseSchema(specSchema);
   const app = parseSchema(appSchema);
@@ -1353,6 +1485,11 @@ function checkSchema(specSchema, appSchema) {
       compareBlockAttributes(model, specAttrs, appAttrs, missingBlockAttributes);
     }
   }
+  const appBlocks = extractBlocks(appSchema, "model");
+  const tenantCascades = modelsKeptPastTheTenant(specSchema).flatMap((model) => {
+    const block = appBlocks.get(model);
+    return block ? cascadesFromTenant(model, block) : [];
+  });
   const absentEnums = [];
   const missingEnumValues = [];
   for (const [name, specValues] of spec.enums) {
@@ -1377,9 +1514,10 @@ function checkSchema(specSchema, appSchema) {
     missingEnumValues,
     fieldMismatches,
     missingBlockAttributes,
+    tenantCascades,
     checkedModelCount: spec.models.size - absentModels.length,
     checkedEnumCount: spec.enums.size - absentEnums.length,
-    ok: missingFields.length === 0 && missingEnumValues.length === 0 && fieldMismatches.length === 0 && !missingBlockAttributes.some(breaksContract)
+    ok: missingFields.length === 0 && missingEnumValues.length === 0 && fieldMismatches.length === 0 && tenantCascades.length === 0 && !missingBlockAttributes.some(breaksContract)
   };
 }
 __name(checkSchema, "checkSchema");
@@ -1460,117 +1598,6 @@ function reportConstraints(outcome, context) {
 }
 __name(reportConstraints, "reportConstraints");
 
-// src/fk-pointers.ts
-var POINTER = /^(\s*)\/\/\s*(\w+)(\s+)(Tenant|User)(\??)(\s+)(@relation\(.*\))\s*$/;
-function findFkPointers(schema2) {
-  const found = [];
-  let model = "";
-  schema2.split("\n").forEach((text, line) => {
-    const opening = /^model\s+(\w+)\s*\{/.exec(text);
-    if (opening) model = opening[1];
-    const match = POINTER.exec(text);
-    if (match) found.push({
-      line,
-      target: match[4],
-      model,
-      text
-    });
-  });
-  return found;
-}
-__name(findFkPointers, "findFkPointers");
-function relationNameOf(relationAttribute) {
-  const match = /@relation\(\s*"([^"]+)"/.exec(relationAttribute);
-  return match ? match[1] : null;
-}
-__name(relationNameOf, "relationNameOf");
-function escapeForRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-__name(escapeForRegExp, "escapeForRegExp");
-function modelBody(schema2, model) {
-  const name = escapeForRegExp(model);
-  const block = new RegExp(`(^|\\n)model\\s+${name}\\s*\\{([\\s\\S]*?)\\n\\}`, "m").exec(schema2);
-  return block ? block[2] : null;
-}
-__name(modelBody, "modelBody");
-function isOneToOne(schema2, model, foreignKey) {
-  const body = modelBody(schema2, model);
-  if (!body) return false;
-  return new RegExp(`^\\s*${escapeForRegExp(foreignKey)}\\s+\\S+.*@unique`, "m").test(body);
-}
-__name(isOneToOne, "isOneToOne");
-function hasBackRelation(schema2, model, owner, relationName, singular = false) {
-  const body = modelBody(schema2, owner);
-  if (body === null) return false;
-  const name = escapeForRegExp(model);
-  const shape = singular ? `${name}\\??` : `${name}\\[\\]`;
-  const candidates = [
-    ...body.matchAll(new RegExp(`^\\s*\\w+\\s+${shape}(\\s.*)?$`, "gm"))
-  ];
-  return candidates.some((line) => relationNameOf(line[0]) === relationName);
-}
-__name(hasBackRelation, "hasBackRelation");
-function enableFkPointers(schema2, models) {
-  const lines = schema2.split("\n");
-  const enabled = [];
-  const skipped = [];
-  const needsBackRelation = [];
-  for (const pointer of findFkPointers(schema2)) {
-    const model = pointer.target === "Tenant" ? models.tenant : models.user;
-    if (!model) {
-      skipped.push({
-        line: pointer.line,
-        target: pointer.target
-      });
-      continue;
-    }
-    const match = POINTER.exec(pointer.text);
-    const relationName = relationNameOf(match[7]);
-    const foreignKey = foreignKeyOf(match[7]);
-    const singular = foreignKey !== null && isOneToOne(schema2, pointer.model, foreignKey);
-    if (!hasBackRelation(schema2, pointer.model, model, relationName, singular)) {
-      needsBackRelation.push({
-        line: pointer.line,
-        owner: model,
-        suggestion: backRelationSuggestion(pointer.model, relationName, singular)
-      });
-      continue;
-    }
-    const [, indent, field, gap1, , optional, gap2, relation] = match;
-    lines[pointer.line] = `${indent}${field}${gap1}${model}${optional}${gap2}${relation}`;
-    enabled.push({
-      line: pointer.line,
-      model
-    });
-  }
-  return {
-    schema: lines.join("\n"),
-    enabled,
-    skipped,
-    needsBackRelation
-  };
-}
-__name(enableFkPointers, "enableFkPointers");
-var lowerFirst = /* @__PURE__ */ __name((value) => value.charAt(0).toLowerCase() + value.slice(1), "lowerFirst");
-function foreignKeyOf(relationAttribute) {
-  const match = /fields:\s*\[\s*(\w+)/.exec(relationAttribute);
-  return match ? match[1] : null;
-}
-__name(foreignKeyOf, "foreignKeyOf");
-function backRelationSuggestion(model, relationName, singular) {
-  const field = singular ? lowerFirst(model) : `${lowerFirst(model)}s`;
-  const type = singular ? `${model}?` : `${model}[]`;
-  return `${field} ${type}` + (relationName ? ` @relation("${relationName}")` : "");
-}
-__name(backRelationSuggestion, "backRelationSuggestion");
-function assertModelsExist(declaredModels, models) {
-  const missing = Object.entries(models).filter(([, name]) => name && !declaredModels.includes(name)).map(([role, name]) => `--${role}-model=${name}`);
-  if (missing.length === 0) return;
-  throw new Error(`${missing.join(", ")} \u2014 no such model in this schema. It declares: ${declaredModels.slice().sort().join(", ")}.`);
-}
-__name(assertModelsExist, "assertModelsExist");
-
 // src/init/catalog-keys.ts
 import { planCatalogSchema } from "@saasicat/spec";
 var schema = planCatalogSchema;
@@ -3653,6 +3680,7 @@ export {
   kebabCase,
   migrationCreatedBy,
   minimumQuotasPerPlan,
+  modelsKeptPastTheTenant,
   namedImports,
   parseBlockAttributes,
   parseEnumValues,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasicat/cli",
-  "version": "1.0.0-rc.14",
+  "version": "1.0.0-rc.16",
   "description": "CLI helpers for SaaS platform consumers. Provides CliContextService (identity, MFA, production confirm, audit tag).",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "qrcode-terminal": "^0.12.0",
-    "@saasicat/nest": "^1.0.0-rc.14",
-    "@saasicat/spec": "^1.0.0-rc.14",
-    "@saasicat/core": "^1.0.0-rc.14"
+    "@saasicat/nest": "^1.0.0-rc.16",
+    "@saasicat/spec": "^1.0.0-rc.16",
+    "@saasicat/core": "^1.0.0-rc.16"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",