@saasicat/cli 1.0.0-rc.5 → 1.0.0-rc.7

package/README.md

@@ -43,7 +43,7 @@ import { PrismaUserPortAdapter } from './adapters/prisma-user-port';
     imports: [
         PrismaModule,
         PlanCatalogModule.forRoot({
-            projectKey: 'myapp',
+            app: { name: 'MyApp' },
             currency: 'EUR',
             vatRate: 19,
             // The catalogue is read from the database, not from a file — the

package/bin/saasicat.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 // `saasicat` — bootstrap CLI for the SaaSiCat framework.
 // naming-history: the codemod help below names the pre-1.0 spellings it rewrites.
+// project-key-history: `codemod v1-project-key` is named after what it removes.
 //
 // Sub-commands:
 //   schema apply [--prisma-schema=PATH] [--fragments=01,02,03]
@@ -16,10 +17,11 @@
 //       apply --all, then `prisma migrate dev`, then append the constraints
 //       Prisma's DSL cannot express to the migration it just wrote.
 //
-//   init --project-key=X --quota=key:Model [--quota=…]... [--app-name=X] [--api-base=X]
+//   init --app-key=X --quota=key:Model [--quota=…]... [--app-name=X] [--api-base=X]
 //   codemod v1-imports [--dir=X] [--dry-run]
 //   codemod v1-rename  [--dir=X] [--dry-run]
-//   codemod v1         [--dir=X] [--dry-run]   — both, in that order
+//   codemod v1-project-key [--dir=X] [--dry-run]
+//   codemod v1         [--dir=X] [--dry-run]   — all three, in that order
 //        [--skip-hasher] [--dry-run] [--dir=.]
 //       Writes the platform wiring — config, persistence, manifest
 //       contribution, admin module, one provider per quota — and adds
@@ -27,7 +29,7 @@
 
 import { readFile, writeFile, readdir, mkdir } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
-import { basename, dirname, join, resolve } from 'node:path';
+import { basename, dirname, join, relative, resolve } from 'node:path';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
@@ -46,7 +48,7 @@ import {
     extractFragmentBlocks,
     findFkPointers,
     hasConstraints,
-    assertValidProjectKey,
+    assertValidAppKey,
     judgeModuleResolution,
     readEffectiveModuleResolution,
     buildImportMap,
@@ -54,6 +56,7 @@ import {
     rewriteImports,
     rewriteManifest,
     rewriteNames,
+    removeProjectKey,
     reportConstraints,
     patchAppModule,
     patchOptionsFor,
@@ -71,7 +74,7 @@ const require_ = createRequire(import.meta.url);
 // `pascalCase` and came back as `value.replace is not a function` with exit 99
 // — an internal error for what is an ordinary typo.
 const VALUE_FLAGS = new Set([
-    'project-key',
+    'app-key',
     'app-name',
     'api-base',
     'quota',
@@ -678,11 +681,32 @@ function codemodTable(name) {
 const CODEMOD_SKIP = new Set(['node_modules', '.git', '.output', 'coverage']);
 const isBuildOutput = (name) => name === 'dist' || name.startsWith('dist-');
 const CODEMOD_EXTENSIONS = /\.(ts|tsx|mts|cts|js|jsx|mjs|cjs|vue|md)$/;
+/**
+ * Widens the walk for `v1-project-key` alone — see `walkSources`.
+ *
+ * `.prisma` belongs here for the reason `.yaml` does: a consumer copies the
+ * platform's models into their own `schema.prisma`, which is the documented
+ * integration path, so that file carries `projectKey` fields and composite
+ * indexes of its own. Left out of the walk they were neither rewritten nor
+ * reported — and after the SQL migration drops the columns, a schema still
+ * declaring them generates a client that queries them, while the next
+ * `db push` tries to put them back.
+ *
+ * Reported rather than rewritten, like every other declaration: a `.prisma`
+ * model is a schema, and which of its fields a consumer still needs is theirs.
+ */
+const CODEMOD_CONFIG_EXTENSIONS = /\.(yaml|yml|prisma)$/;
 /** Walked for the package renames alone; see `rewriteManifest`. */
 const CODEMOD_MANIFEST = 'package.json';
 
-/** Every source file under `root` a codemod may touch, with its text. */
-async function walkSources(root, visit) {
+/**
+ * Every source file under `root` a codemod may touch, with its text.
+ *
+ * `extra` widens the set for one codemod. Only `v1-project-key` passes it, and
+ * only for `.yaml`: the other two rewrite identifiers and import specifiers,
+ * and letting them loose on a configuration file would corrupt it.
+ */
+async function walkSources(root, visit, extra = null) {
     const walk = async (dir) => {
         for (const entry of await readdir(dir, { withFileTypes: true })) {
             if (CODEMOD_SKIP.has(entry.name) || isBuildOutput(entry.name)) continue;
@@ -691,13 +715,70 @@ async function walkSources(root, visit) {
                 await walk(full);
                 continue;
             }
-            if (!CODEMOD_EXTENSIONS.test(entry.name) && entry.name !== CODEMOD_MANIFEST) continue;
+            const included =
+                CODEMOD_EXTENSIONS.test(entry.name) ||
+                entry.name === CODEMOD_MANIFEST ||
+                (extra !== null && extra.test(entry.name));
+            if (!included) continue;
             await visit(full, await readFile(full, 'utf8'));
         }
     };
     await walk(root);
 }
 
+/**
+ * Takes `projectKey` out of a consumer's code, and names what it will not.
+ *
+ * A removal is not a rename: the word is an ordinary property name. Two forms
+ * need no grammar to decide — a `?projectKey=` on a `/catalog/` URL, and the
+ * top-level key of a `saas.yaml` — and those are rewritten. An object member is
+ * reported: an object literal and a type literal are lexically identical in
+ * TypeScript, so removing one would sometimes delete a member of the consumer's
+ * own type. The migration guide's table says what each shape becomes.
+ */
+async function cmdCodemodV1ProjectKey(args) {
+    const root = resolve(args.dir ?? '.');
+    const dryRun = args['dry-run'] === true;
+
+    const undecided = [];
+    let rewritten = 0;
+    let touched = 0;
+    await walkSources(
+        root,
+        async (full, source) => {
+            if (basename(full) === CODEMOD_MANIFEST) return;
+            const result = removeProjectKey(source, isCatalogConfig(full) ? 'yaml' : 'source');
+            for (const line of result.undecided) undecided.push(`${relative(root, full)}:${line}`);
+            if (result.rewritten === 0) return;
+            if (!dryRun) await writeFile(full, result.text);
+            rewritten += result.rewritten;
+            touched += 1;
+        },
+        CODEMOD_CONFIG_EXTENSIONS,
+    );
+
+    console.log(
+        `${dryRun ? 'Would remove' : 'Removed'} ${rewritten} occurrence(s) in ${touched} file(s).`,
+    );
+    if (undecided.length === 0) return;
+
+    console.log('');
+    console.log(`${undecided.length} occurrence(s) are yours to look at:`);
+    for (const where of undecided) console.log(`  ${where}`);
+    console.log('');
+    console.log('  Two kinds of file end up here. In TypeScript an object literal and a type');
+    console.log('  literal are the same tokens, so this cannot tell a payload member from one');
+    console.log('  of your own declarations without parsing. And a `.prisma` model is a schema:');
+    console.log("  which of its fields you still need is yours to say, not this tool's.");
+    console.log('  It reports rather than guesses — docs/guides/upgrade-to-1.0.md has a table');
+    console.log('  of what each shape becomes.');
+}
+
+/** A `saas.yaml`, whose top-level `projectKey:` needs no anchor. */
+function isCatalogConfig(full) {
+    return basename(full) === 'saas.yaml' || basename(full) === 'saas.yml';
+}
+
 /** Reads a repeated flag (`--quota=a --quota=b`) off argv. */
 function repeatedFlag(argv, name) {
     return argv
@@ -706,17 +787,17 @@ function repeatedFlag(argv, name) {
 }
 
 async function cmdInit(args, argv) {
-    if (!args['project-key']) {
-        console.error('✗ --project-key=<key> is required.');
-        console.error('  It names the catalogue this app administers.');
+    if (!args['app-key']) {
+        console.error('✗ --app-key=<key> is required.');
+        console.error('  It is the slug of this application: npm package name, storage prefix.');
         process.exit(1);
     }
 
     // A usage error, so it exits 1 like every other one here rather than
-    // through the top-level handler's 99. The rule itself comes from the
-    // catalogue schema — see src/init/project-key.ts.
+    // through the top-level handler's 99. The rule itself is in
+    // src/init/catalog-keys.ts.
     try {
-        assertValidProjectKey(args['project-key']);
+        assertValidAppKey(args['app-key']);
     } catch (err) {
         console.error(`✗ ${err.message}`);
         process.exit(1);
@@ -741,7 +822,7 @@ async function cmdInit(args, argv) {
     }
 
     const plan = planInit({
-        projectKey: args['project-key'],
+        appKey: args['app-key'],
         appName: args['app-name'],
         apiBase: args['api-base'],
         quotas: repeatedFlag(argv, 'quota'),
@@ -881,11 +962,15 @@ async function main() {
     if (cmd === 'codemod' && sub === 'v1-rename') {
         return cmdCodemodV1Rename(parseArgs(rest));
     }
+    if (cmd === 'codemod' && sub === 'v1-project-key') {
+        return cmdCodemodV1ProjectKey(parseArgs(rest));
+    }
     if (cmd === 'codemod' && sub === 'v1') {
         // Imports first: the rename table keys its per-entry tokens by the
         // specifier they are imported from, which the import rewrite settles.
         await cmdCodemodV1Imports(parseArgs(rest));
-        return cmdCodemodV1Rename(parseArgs(rest));
+        await cmdCodemodV1Rename(parseArgs(rest));
+        return cmdCodemodV1ProjectKey(parseArgs(rest));
     }
     if (cmd === 'init') {
         return cmdInit(parseArgs([sub, ...rest].filter(Boolean)), process.argv.slice(3));
@@ -914,13 +999,13 @@ async function main() {
             '  schema migrate --name=<name>             apply --all + migrate dev + constraints',
         );
         console.log('');
-        console.log('  init --project-key=<key> --quota=<key>:<Model>');
+        console.log('  init --app-key=<key> --quota=<key>:<Model>');
         console.log('          scaffold the platform wiring. At least one --quota:');
         console.log('          every plan must declare one, or the catalogue does not load.');
-        console.log('  init --project-key=myapp --quota=notes:Note --quota=seats:Seat');
+        console.log('  init --app-key=myapp --quota=notes:Note --quota=seats:Seat');
         console.log('');
         console.log('  codemod v1 [--dir=.] [--dry-run]');
-        console.log('          the whole 1.0 migration: v1-imports, then v1-rename');
+        console.log('          the whole 1.0 migration: imports, names, then projectKey');
         console.log('  codemod v1-imports [--dir=.] [--dry-run]');
         console.log('          rewrite @saasicat/ui-vue imports to the 1.0 export map');
         console.log('  codemod v1-rename [--dir=.] [--dry-run]');

package/dist/.build-stamp

@@ -1 +1 @@
-e8c9a1b5bfe7882ded7efee3939be9243fb7879cc0b605afe9e29c1a77630c3e
+e08122ad3833db9d96fed2edad527604182ab8047a8d8afefec4239ec29fe8f8

package/dist/index.cjs

@@ -70,11 +70,12 @@ __export(index_exports, {
   UserCommands: () => UserCommands,
   UserPortDoctorCheck: () => UserPortDoctorCheck,
   WhoAmIFlow: () => WhoAmIFlow,
+  appKeyPattern: () => appKeyPattern,
   appendConstraints: () => appendConstraints,
   applyFragmentBlocks: () => applyFragmentBlocks,
   applyTokens: () => applyTokens,
   assertModelsExist: () => assertModelsExist,
-  assertValidProjectKey: () => assertValidProjectKey,
+  assertValidAppKey: () => assertValidAppKey,
   assertValidQuotaKey: () => assertValidQuotaKey,
   blankStringLiterals: () => blankStringLiterals,
   blockBodyLines: () => blockBodyLines,
@@ -110,10 +111,10 @@ __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,
@@ -1033,7 +1034,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)
       }
     };
@@ -1705,10 +1706,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 +1723,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 +1760,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` : "",
@@ -2169,6 +2171,118 @@ 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/init/patch-app-module.ts
 var MARKER = "SaaSiCatModule.forRoot";
 function patchAppModule(source, options) {
@@ -3392,11 +3506,12 @@ UserCommands = _ts_decorate14([
   UserCommands,
   UserPortDoctorCheck,
   WhoAmIFlow,
+  appKeyPattern,
   appendConstraints,
   applyFragmentBlocks,
   applyTokens,
   assertModelsExist,
-  assertValidProjectKey,
+  assertValidAppKey,
   assertValidQuotaKey,
   blankStringLiterals,
   blockBodyLines,
@@ -3432,10 +3547,10 @@ UserCommands = _ts_decorate14([
   patchAppModule,
   patchOptionsFor,
   planInit,
-  projectKeyPattern,
   quotaKeyPattern,
   readEffectiveModuleResolution,
   relationNameOf,
+  removeProjectKey,
   reportConstraints,
   rewriteImports,
   rewriteManifest,

package/dist/index.d.cts

@@ -719,9 +719,9 @@ declare function assertModelsExist(declaredModels: readonly string[], models: Fk
 
 /** What the caller asked for. */
 interface InitOptions {
-    /** The catalogue this app administers. Also the storage-key prefix. */
-    projectKey: string;
-    /** Human name in the manifest and the YAML. Defaults to `projectKey`. */
+    /** Slug of the application: npm package name, storage-key prefix, id prefix. */
+    appKey: string;
+    /** Human name in the manifest and the YAML. Defaults to `appKey`. */
     appName?: string;
     /** Admin API prefix, e.g. `/api/v1/admin`. */
     apiBase?: string;
@@ -854,8 +854,7 @@ declare function judgeModuleResolution(value: string | null): ModuleResolutionVe
  */
 declare function readEffectiveModuleResolution(root: string, ts: typeof TypeScript): string | null;
 
-/** The pattern `plan-catalog.schema.json` puts on `projectKey`. */
-declare function projectKeyPattern(): RegExp;
+declare function appKeyPattern(): RegExp;
 /** The pattern it puts on the keys inside a plan's `quotas` object. */
 declare function quotaKeyPattern(): RegExp;
 /** How many quotas a plan must declare — 1 today, and read rather than assumed. */
@@ -866,7 +865,7 @@ declare function minimumQuotasPerPlan(): number;
  * The message carries the pattern rather than a prose paraphrase, because the
  * paraphrase is what goes stale.
  */
-declare function assertValidProjectKey(projectKey: string): void;
+declare function assertValidAppKey(appKey: string): void;
 /** The same, for a quota key. `additionalProperties: false` makes it a hard rule. */
 declare function assertValidQuotaKey(quotaKey: string): void;
 
@@ -981,6 +980,26 @@ interface ManifestRewriteOptions {
 }
 declare function rewriteManifest(text: string, table: RenameTable, options: ManifestRewriteOptions): RenameResult;
 
+interface ProjectKeyResult {
+    readonly text: string;
+    /** How many occurrences were taken out. */
+    readonly rewritten: number;
+    /**
+     * 1-based line numbers of the occurrences left in place.
+     *
+     * Reported rather than removed: the codemod could not tell them from a
+     * consumer's own field, and a wrong deletion is worse than a named one.
+     */
+    readonly undecided: readonly number[];
+}
+/**
+ * Rewrites one source file.
+ *
+ * `yaml` switches to the config form: there the field is a top-level key in a
+ * file the platform owns the schema of, so it is decidable without an anchor.
+ */
+declare function removeProjectKey(text: string, kind?: 'source' | 'yaml'): ProjectKeyResult;
+
 interface PatchAppModuleOptions {
     /** Import specifier for the persistence bundle, or null when not generated. */
     persistenceImport: string | null;
@@ -1224,4 +1243,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, 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, PLATFORM_DOCTOR_CHECK_PROVIDERS, type ParsedSchema, type PatchAppModuleOptions, type PatchOptionsFromPlan, type PatchResult, PlanCatalogDoctorCheck, type PlannedFile, type QuotaProviderFile, type QuotaSpec, type RenameResult, type RenameTable, type RewriteResult, type SchemaCheckReport, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WhoAmIFlow, type WhoAmIResult, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidProjectKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findFkPointers, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, judgeModuleResolution, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, projectKeyPattern, quotaKeyPattern, readEffectiveModuleResolution, relationNameOf, reportConstraints, rewriteImports, rewriteManifest, rewriteNames, rewriteSubpath, 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, 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, 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, type SchemaCheckReport, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WhoAmIFlow, type WhoAmIResult, appKeyPattern, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidAppKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findFkPointers, 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, stripLineComment, structuralOnly, tablesAddressedBy };

package/dist/index.d.ts

@@ -719,9 +719,9 @@ declare function assertModelsExist(declaredModels: readonly string[], models: Fk
 
 /** What the caller asked for. */
 interface InitOptions {
-    /** The catalogue this app administers. Also the storage-key prefix. */
-    projectKey: string;
-    /** Human name in the manifest and the YAML. Defaults to `projectKey`. */
+    /** Slug of the application: npm package name, storage-key prefix, id prefix. */
+    appKey: string;
+    /** Human name in the manifest and the YAML. Defaults to `appKey`. */
     appName?: string;
     /** Admin API prefix, e.g. `/api/v1/admin`. */
     apiBase?: string;
@@ -854,8 +854,7 @@ declare function judgeModuleResolution(value: string | null): ModuleResolutionVe
  */
 declare function readEffectiveModuleResolution(root: string, ts: typeof TypeScript): string | null;
 
-/** The pattern `plan-catalog.schema.json` puts on `projectKey`. */
-declare function projectKeyPattern(): RegExp;
+declare function appKeyPattern(): RegExp;
 /** The pattern it puts on the keys inside a plan's `quotas` object. */
 declare function quotaKeyPattern(): RegExp;
 /** How many quotas a plan must declare — 1 today, and read rather than assumed. */
@@ -866,7 +865,7 @@ declare function minimumQuotasPerPlan(): number;
  * The message carries the pattern rather than a prose paraphrase, because the
  * paraphrase is what goes stale.
  */
-declare function assertValidProjectKey(projectKey: string): void;
+declare function assertValidAppKey(appKey: string): void;
 /** The same, for a quota key. `additionalProperties: false` makes it a hard rule. */
 declare function assertValidQuotaKey(quotaKey: string): void;
 
@@ -981,6 +980,26 @@ interface ManifestRewriteOptions {
 }
 declare function rewriteManifest(text: string, table: RenameTable, options: ManifestRewriteOptions): RenameResult;
 
+interface ProjectKeyResult {
+    readonly text: string;
+    /** How many occurrences were taken out. */
+    readonly rewritten: number;
+    /**
+     * 1-based line numbers of the occurrences left in place.
+     *
+     * Reported rather than removed: the codemod could not tell them from a
+     * consumer's own field, and a wrong deletion is worse than a named one.
+     */
+    readonly undecided: readonly number[];
+}
+/**
+ * Rewrites one source file.
+ *
+ * `yaml` switches to the config form: there the field is a top-level key in a
+ * file the platform owns the schema of, so it is decidable without an anchor.
+ */
+declare function removeProjectKey(text: string, kind?: 'source' | 'yaml'): ProjectKeyResult;
+
 interface PatchAppModuleOptions {
     /** Import specifier for the persistence bundle, or null when not generated. */
     persistenceImport: string | null;
@@ -1224,4 +1243,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, 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, PLATFORM_DOCTOR_CHECK_PROVIDERS, type ParsedSchema, type PatchAppModuleOptions, type PatchOptionsFromPlan, type PatchResult, PlanCatalogDoctorCheck, type PlannedFile, type QuotaProviderFile, type QuotaSpec, type RenameResult, type RenameTable, type RewriteResult, type SchemaCheckReport, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WhoAmIFlow, type WhoAmIResult, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidProjectKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findFkPointers, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, judgeModuleResolution, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, projectKeyPattern, quotaKeyPattern, readEffectiveModuleResolution, relationNameOf, reportConstraints, rewriteImports, rewriteManifest, rewriteNames, rewriteSubpath, 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, 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, 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, type SchemaCheckReport, UI_VUE_SPECIFIER, USER_MANAGEMENT_PORT_TOKEN, USER_PORT_TOKEN, UserCommands, UserPortDoctorCheck, WhoAmIFlow, type WhoAmIResult, appKeyPattern, appendConstraints, applyFragmentBlocks, applyTokens, assertModelsExist, assertValidAppKey, assertValidQuotaKey, blankStringLiterals, blockBodyLines, breaksContract, buildImportMap, checkSchema, constraintsFor, enableFkPointers, extractBlockNames, extractBlocks, extractEnumBlocks, extractEnumNames, extractFragmentBlocks, extractModelBlocks, extractModelNames, findFkPointers, 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, stripLineComment, structuralOnly, tablesAddressedBy };

package/dist/index.js

@@ -909,7 +909,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)
       }
     };
@@ -1581,10 +1581,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) {
@@ -1597,12 +1598,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;
@@ -1634,24 +1635,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` : "",
@@ -2045,6 +2046,118 @@ 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/init/patch-app-module.ts
 var MARKER = "SaaSiCatModule.forRoot";
 function patchAppModule(source, options) {
@@ -3267,11 +3380,12 @@ export {
   UserCommands,
   UserPortDoctorCheck,
   WhoAmIFlow,
+  appKeyPattern,
   appendConstraints,
   applyFragmentBlocks,
   applyTokens,
   assertModelsExist,
-  assertValidProjectKey,
+  assertValidAppKey,
   assertValidQuotaKey,
   blankStringLiterals,
   blockBodyLines,
@@ -3307,10 +3421,10 @@ export {
   patchAppModule,
   patchOptionsFor,
   planInit,
-  projectKeyPattern,
   quotaKeyPattern,
   readEffectiveModuleResolution,
   relationNameOf,
+  removeProjectKey,
   reportConstraints,
   rewriteImports,
   rewriteManifest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasicat/cli",
-  "version": "1.0.0-rc.5",
+  "version": "1.0.0-rc.7",
   "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.5",
-    "@saasicat/spec": "^1.0.0-rc.5",
-    "@saasicat/core": "^1.0.0-rc.5"
+    "@saasicat/nest": "^1.0.0-rc.7",
+    "@saasicat/spec": "^1.0.0-rc.7",
+    "@saasicat/core": "^1.0.0-rc.7"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",

package/templates/init/config/saas.yaml.tpl

@@ -1,5 +1,4 @@
 schemaVersion: 1
-projectKey: __PROJECT_KEY__
 
 app:
     name: __APP_LABEL__

package/templates/init/src/saas/admin-manifest.contribution.ts.tpl

@@ -19,7 +19,7 @@ export const __MANIFEST_CONST__: ManifestContribution = {
     dashboard: {
         kpiCards: [
             {
-                id: '__PROJECT_KEY__.tenants',
+                id: '__APP_KEY__.tenants',
                 label: 'Tenants',
                 // Served by your own controller — the platform does not know
                 // what your KPIs count.