@saasicat/cli 1.0.0-rc.2 → 1.0.0-rc.20

package/dist/index.cjs

@@ -51,6 +51,7 @@ __export(index_exports, {
   DiscoverySnapshotDoctorCheck: () => DiscoverySnapshotDoctorCheck,
   DoctorCommands: () => DoctorCommands,
   DoctorFlow: () => DoctorFlow,
+  IssuerIdentityDoctorCheck: () => IssuerIdentityDoctorCheck,
   LIMIT_FILTER_IMPORTS: () => LIMIT_FILTER_IMPORTS,
   LIMIT_FILTER_PROVIDER: () => LIMIT_FILTER_PROVIDER,
   MANIFEST_ACCESS_PORT_TOKEN: () => MANIFEST_ACCESS_PORT_TOKEN,
@@ -64,17 +65,23 @@ __export(index_exports, {
   MfaSetupFlow: () => MfaSetupFlow,
   PLATFORM_DOCTOR_CHECK_PROVIDERS: () => PLATFORM_DOCTOR_CHECK_PROVIDERS,
   PlanCatalogDoctorCheck: () => PlanCatalogDoctorCheck,
+  SCANNED_FOR_DB_CATALOG: () => SCANNED_FOR_DB_CATALOG,
+  SCANNED_FOR_MOVED_SETTINGS: () => SCANNED_FOR_MOVED_SETTINGS,
+  SETTINGS_THAT_MOVED: () => SETTINGS_THAT_MOVED,
   UI_VUE_SPECIFIER: () => UI_VUE_SPECIFIER,
   USER_MANAGEMENT_PORT_TOKEN: () => USER_MANAGEMENT_PORT_TOKEN,
   USER_PORT_TOKEN: () => USER_PORT_TOKEN,
   UserCommands: () => UserCommands,
   UserPortDoctorCheck: () => UserPortDoctorCheck,
+  WHERE_DB_CATALOG_GOES: () => WHERE_DB_CATALOG_GOES,
+  WHERE_IT_GOES: () => WHERE_IT_GOES,
   WhoAmIFlow: () => WhoAmIFlow,
+  appKeyPattern: () => appKeyPattern,
   appendConstraints: () => appendConstraints,
   applyFragmentBlocks: () => applyFragmentBlocks,
   applyTokens: () => applyTokens,
   assertModelsExist: () => assertModelsExist,
-  assertValidProjectKey: () => assertValidProjectKey,
+  assertValidAppKey: () => assertValidAppKey,
   assertValidQuotaKey: () => assertValidQuotaKey,
   blankStringLiterals: () => blankStringLiterals,
   blockBodyLines: () => blockBodyLines,
@@ -82,6 +89,7 @@ __export(index_exports, {
   buildImportMap: () => buildImportMap,
   checkSchema: () => checkSchema,
   constraintsFor: () => constraintsFor,
+  describeDbCatalogOccurrence: () => describeDbCatalogOccurrence,
   enableFkPointers: () => enableFkPointers,
   extractBlockNames: () => extractBlockNames,
   extractBlocks: () => extractBlocks,
@@ -90,7 +98,9 @@ __export(index_exports, {
   extractFragmentBlocks: () => extractFragmentBlocks,
   extractModelBlocks: () => extractModelBlocks,
   extractModelNames: () => extractModelNames,
+  findDbCatalogBlocks: () => findDbCatalogBlocks,
   findFkPointers: () => findFkPointers,
+  findMovedSettings: () => findMovedSettings,
   foreignKeyOf: () => foreignKeyOf,
   hasBackRelation: () => hasBackRelation,
   hasConstraints: () => hasConstraints,
@@ -100,6 +110,7 @@ __export(index_exports, {
   kebabCase: () => kebabCase,
   migrationCreatedBy: () => migrationCreatedBy,
   minimumQuotasPerPlan: () => minimumQuotasPerPlan,
+  modelsKeptPastTheTenant: () => modelsKeptPastTheTenant,
   namedImports: () => namedImports,
   parseBlockAttributes: () => parseBlockAttributes,
   parseEnumValues: () => parseEnumValues,
@@ -110,15 +121,16 @@ __export(index_exports, {
   patchAppModule: () => patchAppModule,
   patchOptionsFor: () => patchOptionsFor,
   planInit: () => planInit,
-  projectKeyPattern: () => projectKeyPattern,
   quotaKeyPattern: () => quotaKeyPattern,
   readEffectiveModuleResolution: () => readEffectiveModuleResolution,
   relationNameOf: () => relationNameOf,
+  removeProjectKey: () => removeProjectKey,
   reportConstraints: () => reportConstraints,
   rewriteImports: () => rewriteImports,
   rewriteManifest: () => rewriteManifest,
   rewriteNames: () => rewriteNames,
   rewriteSubpath: () => rewriteSubpath,
+  settingsWrittenTo: () => settingsWrittenTo,
   stripLineComment: () => stripLineComment,
   structuralOnly: () => structuralOnly,
   tablesAddressedBy: () => tablesAddressedBy
@@ -1033,7 +1045,7 @@ var PlanCatalogDoctorCheck = class {
       severity: "ok",
       message: `${plans.length} plan(s), ${this.catalog.features?.length ?? 0} feature(s) loaded.`,
       details: {
-        projectKey: this.catalog.projectKey,
+        app: this.catalog.app.name,
         planIds: plans.map((p) => p.id)
       }
     };
@@ -1145,11 +1157,85 @@ AdminManifestDoctorCheck = _ts_decorate7([
     typeof import_nest4.AdminManifestService === "undefined" ? Object : import_nest4.AdminManifestService
   ])
 ], AdminManifestDoctorCheck);
+var IssuerIdentityDoctorCheck = class {
+  static {
+    __name(this, "IssuerIdentityDoctorCheck");
+  }
+  issuer;
+  id = "platform.issuer-identity";
+  label = "Issuer identity against the recorded one";
+  constructor(issuer) {
+    this.issuer = issuer;
+  }
+  async run() {
+    const verdict = await this.issuer.inspect();
+    if (verdict.kind === "refused") {
+      return {
+        severity: "error",
+        message: verdict.refusal,
+        // The number and the identifiers, not the rows: `DoctorReport`
+        // is serialised as JSON, and the dates on a row would come out
+        // as timestamps beside the same dates already written as days in
+        // the message above.
+        // One unknown answered once: `null` for both where the
+        // contracts could not be read, rather than a null count beside
+        // an empty list that reads as "none".
+        details: verdict.running ? {
+          runningContracts: verdict.running.total,
+          named: verdict.running.contracts.map((row) => row.id)
+        } : {
+          runningContracts: null,
+          named: null
+        }
+      };
+    }
+    if (verdict.kind === "not-compared") {
+      return {
+        severity: "warning",
+        message: `The issuer in the file is compared with nothing \u2014 ${verdict.why} \u2014 so a start that names another legal entity than the last one is not refused.`
+      };
+    }
+    const change = verdict.change;
+    switch (change.kind) {
+      case "none-named":
+        return {
+          severity: "ok",
+          message: "No issuer is named, and none was recorded."
+        };
+      case "first-naming":
+        return {
+          severity: "ok",
+          message: `'${change.identity.legalName}' is named for the first time; no contract can name another.`
+        };
+      case "corrected":
+        return {
+          severity: "ok",
+          message: `A correction of '${change.recorded.legalName}' is declared: ${change.reason}. This is what the start found; whether it has been recorded is what \`GET /admin/settings\` shows, and \`issuer.correctionOf\` may be dropped once it does.`
+        };
+      case "unchanged": {
+        const running = await this.issuer.runningContractCount();
+        const weighedAgainst = running === null ? "" : ` ${running} contract(s) are running, and their issuer copies do not follow a change.`;
+        return {
+          severity: "ok",
+          message: `'${change.identity.legalName}' is what the installation recorded.` + weighedAgainst + " Changing the legal name or a tax identifier needs `issuer.correctionOf` beside the values it replaces; the address and the contact details do not."
+        };
+      }
+    }
+  }
+};
+IssuerIdentityDoctorCheck = _ts_decorate7([
+  (0, import_common7.Injectable)(),
+  _ts_metadata7("design:type", Function),
+  _ts_metadata7("design:paramtypes", [
+    typeof import_nest4.IssuerIdentityInspector === "undefined" ? Object : import_nest4.IssuerIdentityInspector
+  ])
+], IssuerIdentityDoctorCheck);
 var PLATFORM_DOCTOR_CHECK_PROVIDERS = [
   PlanCatalogDoctorCheck,
   DiscoverySnapshotDoctorCheck,
   UserPortDoctorCheck,
-  AdminManifestDoctorCheck
+  AdminManifestDoctorCheck,
+  IssuerIdentityDoctorCheck
 ];
 
 // src/prisma-blocks.ts
@@ -1325,6 +1411,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 ? "?" : ""}`;
@@ -1396,10 +1593,11 @@ function isDocumentedTypeSubstitution(spec, app, appEnums) {
   return spec.type === "String" && appEnums.has(app.type);
 }
 __name(isDocumentedTypeSubstitution, "isDocumentedTypeSubstitution");
-function compareFields(model, specFields, appFields, appEnums, missingFields, fieldMismatches) {
+function compareFields(model, specFields, appFields, appEnums, notAdopted, missingFields, fieldMismatches) {
   for (const [name, spec] of specFields) {
     const app = appFields.get(name);
     if (!app) {
+      if (notAdopted.has(spec.type)) continue;
       missingFields.push({
         model,
         field: name,
@@ -1457,34 +1655,62 @@ function breaksContract(attribute) {
   return attribute.kind !== "index";
 }
 __name(breaksContract, "breaksContract");
-function checkSchema(specSchema, appSchema) {
+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, knownModels) {
   const spec = parseSchema(specSchema);
   const app = parseSchema(appSchema);
-  const absentModels = [];
   const missingFields = [];
   const fieldMismatches = [];
   const missingBlockAttributes = [];
+  const absentModels = [
+    ...spec.models.keys()
+  ].filter((name) => !app.models.has(name));
+  const absentEnums = [
+    ...spec.enums.keys()
+  ].filter((name) => !app.enums.has(name));
+  const shipped = knownModels ?? new Set(spec.models.keys());
+  const notAdopted = new Set([
+    ...shipped
+  ].filter((name) => !app.models.has(name)));
   for (const [model, specFields] of spec.models) {
     const appFields = app.models.get(model);
-    if (!appFields) {
-      absentModels.push(model);
-      continue;
-    }
-    compareFields(model, specFields, appFields, app.enums, missingFields, fieldMismatches);
+    if (!appFields) continue;
+    compareFields(model, specFields, appFields, app.enums, notAdopted, missingFields, fieldMismatches);
     const specAttrs = spec.modelAttributes.get(model);
     const appAttrs = app.modelAttributes.get(model);
     if (specAttrs && appAttrs) {
       compareBlockAttributes(model, specAttrs, appAttrs, missingBlockAttributes);
     }
   }
-  const absentEnums = [];
+  const appBlocks = extractBlocks(appSchema, "model");
+  const tenantCascades = modelsKeptPastTheTenant(specSchema).flatMap((model) => {
+    const block = appBlocks.get(model);
+    return block ? cascadesFromTenant(model, block) : [];
+  });
   const missingEnumValues = [];
   for (const [name, specValues] of spec.enums) {
     const appValues = app.enums.get(name);
-    if (!appValues) {
-      absentEnums.push(name);
-      continue;
-    }
+    if (!appValues) continue;
     for (const value of specValues) {
       if (!appValues.includes(value)) {
         missingEnumValues.push({
@@ -1501,9 +1727,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");
@@ -1584,117 +1811,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;
@@ -1705,10 +1821,11 @@ function required(value, what) {
   return value;
 }
 __name(required, "required");
-function projectKeyPattern() {
-  return new RegExp(required(schema.properties?.projectKey?.pattern, "pattern for projectKey"));
+var APP_KEY_PATTERN = /^[a-z][a-z0-9-]{1,30}$/;
+function appKeyPattern() {
+  return APP_KEY_PATTERN;
 }
-__name(projectKeyPattern, "projectKeyPattern");
+__name(appKeyPattern, "appKeyPattern");
 function quotaKeyPattern() {
   const patterns = Object.keys(required(schema.$defs?.PlanDef?.properties?.quotas?.patternProperties, "quota key pattern"));
   if (patterns.length !== 1) {
@@ -1721,12 +1838,12 @@ function minimumQuotasPerPlan() {
   return required(schema.$defs?.PlanDef?.properties?.quotas?.minProperties, "minProperties");
 }
 __name(minimumQuotasPerPlan, "minimumQuotasPerPlan");
-function assertValidProjectKey(projectKey) {
-  const pattern = projectKeyPattern();
-  if (pattern.test(projectKey)) return;
-  throw new Error(`--project-key=${projectKey} is not a valid project key. It has to match ${pattern.source} \u2014 lower case, starting with a letter, at least two characters. The platform validates config/saas.yaml against the same pattern at boot, so this would fail after every file was written.`);
+function assertValidAppKey(appKey) {
+  const pattern = appKeyPattern();
+  if (pattern.test(appKey)) return;
+  throw new Error(`--app-key=${appKey} is not a valid app key. It has to match ${pattern.source} \u2014 lower case, starting with a letter, at least two characters. It becomes an npm package name and a browser storage prefix, so this would fail after every file was written.`);
 }
-__name(assertValidProjectKey, "assertValidProjectKey");
+__name(assertValidAppKey, "assertValidAppKey");
 function assertValidQuotaKey(quotaKey) {
   const pattern = quotaKeyPattern();
   if (pattern.test(quotaKey)) return;
@@ -1758,24 +1875,24 @@ function pascalCase(value) {
 __name(pascalCase, "pascalCase");
 var quotaFileName = /* @__PURE__ */ __name((key) => `${key.replace(/[^A-Za-z0-9]+/g, "-").toLowerCase()}-quota.provider.ts`, "quotaFileName");
 function planInit(options) {
-  const projectKey = options.projectKey;
-  if (!projectKey) throw new Error("init needs a --project-key.");
-  assertValidProjectKey(projectKey);
-  const appLabel = options.appName ?? pascalCase(projectKey);
+  const appKey = options.appKey;
+  if (!appKey) throw new Error("init needs an --app-key.");
+  assertValidAppKey(appKey);
+  const appLabel = options.appName ?? pascalCase(appKey);
   const appName = pascalCase(appLabel);
   const apiBase = options.apiBase ?? "/api/v1/admin";
   const quotas = (options.quotas ?? []).map(parseQuota);
   assertEnoughQuotas(quotas);
   const hasherClass = options.skipHasher ? null : `${appName}PasswordHasher`;
-  const featureKey = `${projectKey.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase()}_CORE`;
+  const featureKey = `${appKey.replace(/[^A-Za-z0-9]+/g, "_").toUpperCase()}_CORE`;
   const shared = {
-    PROJECT_KEY: projectKey,
+    APP_KEY: appKey,
     APP_NAME: appName,
     APP_LABEL: appLabel,
     API_BASE: apiBase,
     FEATURE_KEY: featureKey,
-    REGISTRY_CONST: `${constantCase(projectKey)}_FEATURE_UI_REGISTRY`,
-    MANIFEST_CONST: `${constantCase(projectKey)}_MANIFEST_CONTRIBUTION`,
+    REGISTRY_CONST: `${constantCase(appKey)}_FEATURE_UI_REGISTRY`,
+    MANIFEST_CONST: `${constantCase(appKey)}_MANIFEST_CONTRIBUTION`,
     ADMIN_MODULE_CLASS: `${appName}AdminModule`,
     HASHER_CLASS: hasherClass ?? "",
     HASHER_FILE: hasherClass ? `${kebabCase(appName)}-password.hasher` : "",
@@ -1906,6 +2023,31 @@ function readEffectiveModuleResolution(root, ts) {
 }
 __name(readEffectiveModuleResolution, "readEffectiveModuleResolution");
 
+// src/init/settings-written.ts
+var import_billing = require("@saasicat/nest/billing");
+function flatten(prefix, value, into) {
+  if (value !== null && typeof value === "object" && !Array.isArray(value)) {
+    for (const [key, child] of Object.entries(value)) {
+      flatten(`${prefix}.${key}`, child, into);
+    }
+    return;
+  }
+  into.push({
+    key: prefix,
+    value: JSON.stringify(value)
+  });
+}
+__name(flatten, "flatten");
+function settingsWrittenTo(catalogYaml, source = "config/saas.yaml") {
+  const catalog = (0, import_billing.loadPlanCatalogFromString)(catalogYaml, {
+    source
+  });
+  const settings = [];
+  flatten("tenantBilling", catalog.tenantBilling, settings);
+  return settings;
+}
+__name(settingsWrittenTo, "settingsWrittenTo");
+
 // src/codemods/v1-imports.ts
 var PUBLIC_PREFIXES = [
   "ui/",
@@ -2169,6 +2311,327 @@ function rewriteManifest(text, table, options) {
 }
 __name(rewriteManifest, "rewriteManifest");
 
+// src/codemods/v1-project-key.ts
+function stripQueryParameter(text) {
+  const NEEDLE = "projectKey=";
+  let out = "";
+  let index = 0;
+  const taken = /* @__PURE__ */ new Set();
+  for (; ; ) {
+    const at = text.indexOf(NEEDLE, index);
+    if (at < 0) break;
+    const separator = at === 0 ? "" : text[at - 1];
+    const value = separator === "?" || separator === "&" ? simpleValueEnd(text, at + NEEDLE.length) : null;
+    if (value === null || !servesTheCatalogue(text, at)) {
+      out += text.slice(index, at + NEEDLE.length);
+      index = at + NEEDLE.length;
+      continue;
+    }
+    out += text.slice(index, at - 1);
+    if (separator === "?" && text[value] === "&") {
+      out += "?";
+      index = value + 1;
+    } else {
+      index = value;
+    }
+    taken.add(at);
+  }
+  return {
+    text: out + text.slice(index),
+    taken
+  };
+}
+__name(stripQueryParameter, "stripQueryParameter");
+var HIDES_A_BRACE = /[`'"{}/\\]/;
+function simpleValueEnd(text, from) {
+  let i = from;
+  while (i < text.length) {
+    const ch = text[i];
+    if (ch === "&" || ch === "#" || ch === "'" || ch === '"' || ch === "`" || ch === "\n" || ch === " ") {
+      return i;
+    }
+    if (ch !== "$" || text[i + 1] !== "{") {
+      if (ch === "{" || ch === "}") return null;
+      i += 1;
+      continue;
+    }
+    const close = text.indexOf("}", i + 2);
+    if (close < 0) return null;
+    if (HIDES_A_BRACE.test(text.slice(i + 2, close))) return null;
+    i = close + 1;
+  }
+  return null;
+}
+__name(simpleValueEnd, "simpleValueEnd");
+function servesTheCatalogue(text, at) {
+  let start = at;
+  while (start > 0) {
+    const ch = text[start - 1];
+    if (ch === "`" || ch === "'" || ch === '"' || ch === "\n") break;
+    start -= 1;
+  }
+  const url = text.slice(start, at);
+  const query = url.indexOf("?");
+  return (query < 0 ? url : url.slice(0, query)).includes("/catalog/");
+}
+__name(servesTheCatalogue, "servesTheCatalogue");
+function isIdentifierChar(ch) {
+  return ch !== void 0 && /[A-Za-z0-9_$]/.test(ch);
+}
+__name(isIdentifierChar, "isIdentifierChar");
+function lineAt(text, at) {
+  let line = 1;
+  for (let i = 0; i < at; i += 1) if (text[i] === "\n") line += 1;
+  return line;
+}
+__name(lineAt, "lineAt");
+function removeProjectKey(text, kind = "source") {
+  if (kind === "yaml") return removeFromYaml(text);
+  const query = stripQueryParameter(text);
+  const reported = /* @__PURE__ */ new Set();
+  for (let at = text.indexOf("projectKey"); at >= 0; at = text.indexOf("projectKey", at + 1)) {
+    if (query.taken.has(at)) continue;
+    if (isIdentifierChar(text[at - 1])) continue;
+    if (isIdentifierChar(text[at + "projectKey".length])) continue;
+    reported.add(lineAt(text, at));
+  }
+  return {
+    text: query.text,
+    rewritten: query.taken.size,
+    undecided: [
+      ...reported
+    ].sort((a, b) => a - b)
+  };
+}
+__name(removeProjectKey, "removeProjectKey");
+function removeFromYaml(text) {
+  const lines = text.split("\n");
+  const kept = [];
+  let rewritten = 0;
+  for (const line of lines) {
+    if (line.startsWith("projectKey:")) {
+      rewritten += 1;
+      continue;
+    }
+    kept.push(line);
+  }
+  return {
+    text: kept.join("\n"),
+    rewritten,
+    undecided: []
+  };
+}
+__name(removeFromYaml, "removeFromYaml");
+
+// src/codemods/v1-moved-settings.ts
+var import_spec2 = require("@saasicat/spec");
+var SETTINGS_THAT_MOVED = Object.keys(import_spec2.planCatalogSchema.properties?.tenantBilling?.properties ?? (() => {
+  throw new Error("plan-catalog.schema.json declares no tenantBilling properties \u2014 @saasicat/spec and @saasicat/cli are out of step.");
+})());
+var isIdentifierChar2 = /* @__PURE__ */ __name((ch) => ch !== void 0 && /[A-Za-z0-9_$]/.test(ch), "isIdentifierChar");
+function lineAt2(text, index) {
+  let line = 1;
+  for (let at = 0; at < index; at += 1) {
+    if (text[at] === "\n") line += 1;
+  }
+  return line;
+}
+__name(lineAt2, "lineAt");
+var SCANNED_FOR_MOVED_SETTINGS = /\.(ts|tsx|mts|cts|js|jsx|mjs|cjs|vue)$/;
+function findMovedSettings(text) {
+  const occurrences = [];
+  for (const setting of SETTINGS_THAT_MOVED) {
+    for (let at = text.indexOf(setting); at >= 0; at = text.indexOf(setting, at + 1)) {
+      if (isIdentifierChar2(text[at - 1])) continue;
+      if (isIdentifierChar2(text[at + setting.length])) continue;
+      occurrences.push({
+        setting,
+        line: lineAt2(text, at)
+      });
+    }
+  }
+  return {
+    occurrences: occurrences.sort((a, b) => a.line - b.line || a.setting.localeCompare(b.setting))
+  };
+}
+__name(findMovedSettings, "findMovedSettings");
+var WHERE_IT_GOES = {
+  cancellationNoticeDays: "config/saas.yaml \u2192 tenantBilling.cancellationNoticeDays \u2014 both `monthly` and `yearly` are required, so write the number you are running today rather than leaving one out.",
+  selfServiceBlockedPlans: 'config/saas.yaml \u2192 tenantBilling.selfServiceBlockedPlans \u2014 both `asTarget` and `asSource` are required, and `[]` is the way to say "nothing is blocked".'
+};
+
+// src/codemods/v1-db-catalog.ts
+var import_platform = require("@saasicat/nest/platform");
+var SCANNED_FOR_DB_CATALOG = SCANNED_FOR_MOVED_SETTINGS;
+var PROPERTY = "dbCatalog";
+var TAKEN = new Set(import_platform.DB_CATALOG_MEMBERS);
+var isIdentifierStart = /* @__PURE__ */ __name((ch) => ch !== void 0 && /[A-Za-z_$]/.test(ch), "isIdentifierStart");
+var isIdentifierChar3 = /* @__PURE__ */ __name((ch) => ch !== void 0 && /[A-Za-z0-9_$]/.test(ch), "isIdentifierChar");
+var isBlank = /* @__PURE__ */ __name((ch) => ch === " " || ch === "	" || ch === "\n" || ch === "\r", "isBlank");
+function lineAt3(text, index) {
+  let line = 1;
+  for (let at = 0; at < index; at += 1) {
+    if (text[at] === "\n") line += 1;
+  }
+  return line;
+}
+__name(lineAt3, "lineAt");
+function skipBlanks(text, from) {
+  let at = from;
+  while (isBlank(text[at])) at += 1;
+  return at;
+}
+__name(skipBlanks, "skipBlanks");
+function closingQuote(text, open) {
+  const quote = text[open];
+  for (let at = open + 1; at < text.length; at += 1) {
+    if (text[at] === "\\") {
+      at += 1;
+      continue;
+    }
+    if (text[at] === quote) return at;
+  }
+  return text.length;
+}
+__name(closingQuote, "closingQuote");
+function skipCommentOrString(text, at) {
+  const ch = text[at];
+  if (ch === "/" && text[at + 1] === "/") {
+    const end = text.indexOf("\n", at);
+    return end === -1 ? text.length : end;
+  }
+  if (ch === "/" && text[at + 1] === "*") {
+    const end = text.indexOf("*/", at + 2);
+    return end === -1 ? text.length : end + 2;
+  }
+  if (ch === "'" || ch === '"' || ch === "`") return closingQuote(text, at) + 1;
+  return at;
+}
+__name(skipCommentOrString, "skipCommentOrString");
+function objectLiteralAt(text, open) {
+  const members = [];
+  let depth = 0;
+  let expectingKey = true;
+  let at = open + 1;
+  while (at < text.length) {
+    const ch = text[at];
+    if (ch === "'" || ch === '"' || ch === "`") {
+      const end = closingQuote(text, at);
+      if (depth === 0 && expectingKey && text[skipBlanks(text, end + 1)] === ":") {
+        members.push(text.slice(at + 1, end));
+      }
+      at = end + 1;
+      continue;
+    }
+    const skipped = skipCommentOrString(text, at);
+    if (skipped > at) {
+      at = skipped;
+      continue;
+    }
+    if (ch === "{" || ch === "[" || ch === "(") {
+      depth += 1;
+      at += 1;
+      continue;
+    }
+    if (ch === "}" || ch === "]" || ch === ")") {
+      if (depth === 0) return {
+        members,
+        end: at + 1
+      };
+      depth -= 1;
+      at += 1;
+      continue;
+    }
+    if (depth === 0 && ch === ":") expectingKey = false;
+    if (depth === 0 && ch === ",") expectingKey = true;
+    if (depth === 0 && expectingKey && ch === "." && text.startsWith("...", at)) {
+      let end = at + 3;
+      while (isIdentifierChar3(text[end])) end += 1;
+      members.push(text.slice(at, end));
+      at = end;
+      continue;
+    }
+    if (depth === 0 && expectingKey && isIdentifierStart(ch)) {
+      let end = at;
+      while (isIdentifierChar3(text[end])) end += 1;
+      const next = text[skipBlanks(text, end)];
+      if (next === ":" || next === "," || next === "}") members.push(text.slice(at, end));
+      at = end;
+      continue;
+    }
+    at += 1;
+  }
+  return {
+    members,
+    end: text.length
+  };
+}
+__name(objectLiteralAt, "objectLiteralAt");
+function findDbCatalogBlocks(text) {
+  const occurrences = [];
+  let at = 0;
+  while (at < text.length) {
+    const skipped = skipCommentOrString(text, at);
+    if (skipped > at) {
+      at = skipped;
+      continue;
+    }
+    if (!text.startsWith(PROPERTY, at) || isIdentifierChar3(text[at - 1])) {
+      at += 1;
+      continue;
+    }
+    const afterName = at + PROPERTY.length;
+    if (isIdentifierChar3(text[afterName])) {
+      at = afterName;
+      continue;
+    }
+    const colon = skipBlanks(text, afterName);
+    if (text[colon] !== ":") {
+      at = afterName;
+      continue;
+    }
+    const value = skipBlanks(text, colon + 1);
+    const line = lineAt3(text, at);
+    if (text[value] !== "{") {
+      occurrences.push({
+        line,
+        shape: "reference",
+        leftovers: []
+      });
+      at = value;
+      continue;
+    }
+    const { members, end } = objectLiteralAt(text, value);
+    const leftovers = members.filter((member) => !TAKEN.has(member));
+    if (!members.includes("path")) {
+      occurrences.push({
+        line,
+        shape: "values",
+        leftovers
+      });
+    } else if (leftovers.length > 0) {
+      occurrences.push({
+        line,
+        shape: "mixed",
+        leftovers
+      });
+    }
+    at = end;
+  }
+  return {
+    occurrences
+  };
+}
+__name(findDbCatalogBlocks, "findDbCatalogBlocks");
+function describeDbCatalogOccurrence(occurrence) {
+  const { shape, leftovers } = occurrence;
+  if (shape === "reference") return "carries something this cannot see into";
+  if (shape === "mixed") return `names the path but still carries ${leftovers.join(", ")}`;
+  return leftovers.length > 0 ? `carries the values: ${leftovers.join(", ")}` : "names no path";
+}
+__name(describeDbCatalogOccurrence, "describeDbCatalogOccurrence");
+var WHERE_DB_CATALOG_GOES = "dbCatalog: { path: 'config/saas.yaml' } \u2014 the file the values were forwarded from. Delete the values; the platform reads app, currency, vatRate, tenantBilling, marketing and notifications from the file it names, and the plans from the read sink as before.";
+
 // src/init/patch-app-module.ts
 var MARKER = "SaaSiCatModule.forRoot";
 function patchAppModule(source, options) {
@@ -2268,7 +2731,7 @@ function renderForRootBlock(options) {
     "SaaSiCatModule.forRoot(",
     "    defineSaaSiCat({",
     "        // Plans straight from the YAML. Apps that manage plans in the",
-    "        // SuperAdmin UI pass `dbCatalog` instead.",
+    "        // SuperAdmin UI pass `dbCatalog: { path: 'config/saas.yaml' }` instead.",
     "        planCatalog: loadPlanCatalogFromFile({ path: 'config/saas.yaml' }),",
     "        // Your authentication guard. This does NOT compile until you",
     "        // name one, and that is deliberate: an empty array is how the",
@@ -3373,6 +3836,7 @@ UserCommands = _ts_decorate14([
   DiscoverySnapshotDoctorCheck,
   DoctorCommands,
   DoctorFlow,
+  IssuerIdentityDoctorCheck,
   LIMIT_FILTER_IMPORTS,
   LIMIT_FILTER_PROVIDER,
   MANIFEST_ACCESS_PORT_TOKEN,
@@ -3386,17 +3850,23 @@ UserCommands = _ts_decorate14([
   MfaSetupFlow,
   PLATFORM_DOCTOR_CHECK_PROVIDERS,
   PlanCatalogDoctorCheck,
+  SCANNED_FOR_DB_CATALOG,
+  SCANNED_FOR_MOVED_SETTINGS,
+  SETTINGS_THAT_MOVED,
   UI_VUE_SPECIFIER,
   USER_MANAGEMENT_PORT_TOKEN,
   USER_PORT_TOKEN,
   UserCommands,
   UserPortDoctorCheck,
+  WHERE_DB_CATALOG_GOES,
+  WHERE_IT_GOES,
   WhoAmIFlow,
+  appKeyPattern,
   appendConstraints,
   applyFragmentBlocks,
   applyTokens,
   assertModelsExist,
-  assertValidProjectKey,
+  assertValidAppKey,
   assertValidQuotaKey,
   blankStringLiterals,
   blockBodyLines,
@@ -3404,6 +3874,7 @@ UserCommands = _ts_decorate14([
   buildImportMap,
   checkSchema,
   constraintsFor,
+  describeDbCatalogOccurrence,
   enableFkPointers,
   extractBlockNames,
   extractBlocks,
@@ -3412,7 +3883,9 @@ UserCommands = _ts_decorate14([
   extractFragmentBlocks,
   extractModelBlocks,
   extractModelNames,
+  findDbCatalogBlocks,
   findFkPointers,
+  findMovedSettings,
   foreignKeyOf,
   hasBackRelation,
   hasConstraints,
@@ -3422,6 +3895,7 @@ UserCommands = _ts_decorate14([
   kebabCase,
   migrationCreatedBy,
   minimumQuotasPerPlan,
+  modelsKeptPastTheTenant,
   namedImports,
   parseBlockAttributes,
   parseEnumValues,
@@ -3432,15 +3906,16 @@ UserCommands = _ts_decorate14([
   patchAppModule,
   patchOptionsFor,
   planInit,
-  projectKeyPattern,
   quotaKeyPattern,
   readEffectiveModuleResolution,
   relationNameOf,
+  removeProjectKey,
   reportConstraints,
   rewriteImports,
   rewriteManifest,
   rewriteNames,
   rewriteSubpath,
+  settingsWrittenTo,
   stripLineComment,
   structuralOnly,
   tablesAddressedBy