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

package/bin/saasicat.js

@@ -43,10 +43,12 @@ import {
     applyTokens,
     constraintsFor,
     checkSchema,
-    extractModelBlocks,
+    extractFragmentBlocks,
     findFkPointers,
     hasConstraints,
     assertValidProjectKey,
+    judgeModuleResolution,
+    readEffectiveModuleResolution,
     buildImportMap,
     migrationCreatedBy,
     rewriteImports,
@@ -133,14 +135,15 @@ async function selectFragmentFiles(dir, filter) {
 
 async function loadFragments(dir, filter) {
     const selected = await selectFragmentFiles(dir, filter);
-    const blocks = new Map();
+    const blocks = { enums: new Map(), models: new Map() };
     for (const file of selected) {
         const content = await readFile(join(dir, file), 'utf8');
-        const fileBlocks = extractModelBlocks(content);
-        for (const [name, body] of fileBlocks) {
-            if (!blocks.has(name)) {
-                blocks.set(name, body);
-            }
+        const fileBlocks = extractFragmentBlocks(content);
+        for (const [name, body] of fileBlocks.enums) {
+            if (!blocks.enums.has(name)) blocks.enums.set(name, body);
+        }
+        for (const [name, body] of fileBlocks.models) {
+            if (!blocks.models.has(name)) blocks.models.set(name, body);
         }
     }
     return { files: selected, blocks };
@@ -172,7 +175,7 @@ async function cmdSchemaApply(args) {
     }
 
     const { files, blocks } = await loadFragments(fragmentsDir, filter);
-    if (blocks.size === 0) {
+    if (blocks.models.size === 0) {
         console.error('✗ No models found in the selected fragments.');
         process.exit(1);
     }
@@ -186,13 +189,16 @@ async function cmdSchemaApply(args) {
     // one where the manual step is most likely to have been forgotten.
     const fk = resolveFkPointers(result.schema, args);
 
-    if (result.added.length === 0 && fk.enabled.length === 0) {
+    if (result.added.length === 0 && result.addedEnums.length === 0 && fk.enabled.length === 0) {
         console.log(`→ Nothing to do. Models already present: ${result.skipped.join(', ')}`);
         reportFkPointers(fk, args);
         return;
     }
 
     if (args['dry-run']) {
+        if (result.addedEnums.length) {
+            console.log(`(--dry-run) Would append enums: ${result.addedEnums.join(', ')}`);
+        }
         if (result.added.length) {
             console.log(`(--dry-run) Would append: ${result.added.join(', ')}`);
         }
@@ -210,12 +216,18 @@ async function cmdSchemaApply(args) {
         for (const { line } of fk.enabled) {
             console.log(`  ${line + 1}: ${fk.schema.split('\n')[line]?.trim() ?? ''}`);
         }
-        if (fk.enabled.length > 0 && result.added.length > 0) console.log('');
-        if (result.added.length > 0) console.log(result.schema.slice(schema.length));
+        const appended = result.added.length > 0 || result.addedEnums.length > 0;
+        if (fk.enabled.length > 0 && appended) console.log('');
+        if (appended) console.log(result.schema.slice(schema.length));
         return;
     }
 
     await writeFile(schemaPath, fk.schema, 'utf8');
+    if (result.addedEnums.length) {
+        console.log(
+            `✓ Appended ${result.addedEnums.length} enum(s): ${result.addedEnums.join(', ')}`,
+        );
+    }
     console.log(`✓ Appended ${result.added.length} model(s): ${result.added.join(', ')}`);
     if (result.skipped.length) {
         console.log(`→ Skipped (already present): ${result.skipped.join(', ')}`);
@@ -711,6 +723,23 @@ async function cmdInit(args, argv) {
     }
 
     const root = resolve(args.dir ?? '.');
+
+    // Before anything is written: the files below import subpath exports,
+    // and under `moduleResolution: node` none of them resolves. Found by
+    // running the quickstart against an app that predates `nodenext`.
+    if (existsSync(join(root, 'tsconfig.json'))) {
+        const ts = loadTypeScript(root);
+        if (ts === null) {
+            console.log('! tsconfig.json not checked: no TypeScript resolvable from this project.');
+        } else {
+            const verdict = judgeModuleResolution(readEffectiveModuleResolution(root, ts));
+            if (!verdict.ok) {
+                console.error(`✗ ${verdict.reason}`);
+                process.exit(1);
+            }
+        }
+    }
+
     const plan = planInit({
         projectKey: args['project-key'],
         appName: args['app-name'],
@@ -772,12 +801,33 @@ async function cmdInit(args, argv) {
     console.log('     — the generated app does NOT compile until you do. An empty');
     console.log('       array means "deliberately auth-free" to the platform, and');
     console.log('       would publish GET /admin/discovery to anyone who asks.');
+    console.log('  2. Name the modules in `imports: [YourPrismaModule, YourAuthModule]`');
+    console.log('     — the one exporting PrismaService and the one your guard needs.');
+    console.log('       The platform module resolves its providers from that list;');
+    console.log('       without it the first boot stops at "Nest can\'t resolve');
+    console.log('       dependencies of … (PrismaService)".');
     if (plan.quotaProviders.length > 0) {
-        console.log('  2. Check each quota provider counts the right thing');
-        console.log('  3. saasicat schema migrate --name=add_saasicat');
+        console.log('  3. Check each quota provider counts the right thing');
+        console.log('  4. saasicat schema migrate --name=add_saasicat');
     } else {
-        console.log('  2. saasicat schema migrate --name=add_saasicat');
+        console.log('  3. saasicat schema migrate --name=add_saasicat');
+    }
+}
+
+/**
+ * The TypeScript that will compile the project: the consumer's own, resolved
+ * from the project root, so the tsconfig is read the way the build reads it.
+ * Falls back to the one this CLI was installed with, then to null.
+ */
+function loadTypeScript(root) {
+    for (const from of [join(root, 'package.json'), import.meta.url]) {
+        try {
+            return createRequire(from)('typescript');
+        } catch {
+            // Not resolvable from here — try the next origin.
+        }
     }
+    return null;
 }
 
 /** Adds the platform to `src/app.module.ts`, or says exactly what to paste. */

package/dist/.build-stamp

@@ -1 +1 @@
-97f66acb8ca26c7c9470c1991febbb2f68518f1b3cd364af6d3566249550482a
+d16106f714ce74c061cc0211a2be4ebe01a1cb80b8e4b5da45ff296c861cff71

package/dist/index.cjs

@@ -85,6 +85,9 @@ __export(index_exports, {
   enableFkPointers: () => enableFkPointers,
   extractBlockNames: () => extractBlockNames,
   extractBlocks: () => extractBlocks,
+  extractEnumBlocks: () => extractEnumBlocks,
+  extractEnumNames: () => extractEnumNames,
+  extractFragmentBlocks: () => extractFragmentBlocks,
   extractModelBlocks: () => extractModelBlocks,
   extractModelNames: () => extractModelNames,
   findFkPointers: () => findFkPointers,
@@ -93,6 +96,7 @@ __export(index_exports, {
   hasConstraints: () => hasConstraints,
   isNoLongerPublic: () => isNoLongerPublic,
   isOneToOne: () => isOneToOne,
+  judgeModuleResolution: () => judgeModuleResolution,
   kebabCase: () => kebabCase,
   migrationCreatedBy: () => migrationCreatedBy,
   minimumQuotasPerPlan: () => minimumQuotasPerPlan,
@@ -108,6 +112,7 @@ __export(index_exports, {
   planInit: () => planInit,
   projectKeyPattern: () => projectKeyPattern,
   quotaKeyPattern: () => quotaKeyPattern,
+  readEffectiveModuleResolution: () => readEffectiveModuleResolution,
   relationNameOf: () => relationNameOf,
   reportConstraints: () => reportConstraints,
   rewriteImports: () => rewriteImports,
@@ -1248,13 +1253,43 @@ function extractModelBlocks(fragment) {
   return extractBlocks(fragment, "model");
 }
 __name(extractModelBlocks, "extractModelBlocks");
+function extractEnumBlocks(fragment) {
+  return extractBlocks(fragment, "enum");
+}
+__name(extractEnumBlocks, "extractEnumBlocks");
+function extractEnumNames(schema2) {
+  return extractBlockNames(schema2, "enum");
+}
+__name(extractEnumNames, "extractEnumNames");
+function extractFragmentBlocks(fragment) {
+  return {
+    enums: extractEnumBlocks(fragment),
+    models: extractModelBlocks(fragment)
+  };
+}
+__name(extractFragmentBlocks, "extractFragmentBlocks");
 function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
-  const existing = new Set(extractModelNames(schema2));
+  const blocks = fragmentBlocks instanceof Map ? {
+    enums: /* @__PURE__ */ new Map(),
+    models: fragmentBlocks
+  } : fragmentBlocks;
+  const existingModels = new Set(extractModelNames(schema2));
+  const existingEnums = new Set(extractEnumNames(schema2));
   const added = [];
   const skipped = [];
+  const addedEnums = [];
+  const skippedEnums = [];
   const additions = [];
-  for (const [name, block] of fragmentBlocks) {
-    if (existing.has(name)) {
+  for (const [name, block] of blocks.enums) {
+    if (existingEnums.has(name)) {
+      skippedEnums.push(name);
+    } else {
+      addedEnums.push(name);
+      additions.push(block);
+    }
+  }
+  for (const [name, block] of blocks.models) {
+    if (existingModels.has(name)) {
       skipped.push(name);
     } else {
       added.push(name);
@@ -1265,6 +1300,8 @@ function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
     return {
       added,
       skipped,
+      addedEnums,
+      skippedEnums,
       schema: schema2
     };
   }
@@ -1281,6 +1318,8 @@ function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
   return {
     added,
     skipped,
+    addedEnums,
+    skippedEnums,
     schema: trimmedSchema + header + additions.join("\n\n") + "\n"
   };
 }
@@ -1835,6 +1874,38 @@ function patchOptionsFor(plan) {
 }
 __name(patchOptionsFor, "patchOptionsFor");
 
+// src/init/module-resolution.ts
+var import_node_path = require("path");
+var RESOLVES_SUBPATHS = /* @__PURE__ */ new Set([
+  "node16",
+  "nodenext",
+  "bundler"
+]);
+function judgeModuleResolution(value) {
+  if (value === null || RESOLVES_SUBPATHS.has(value)) {
+    return {
+      ok: true,
+      value
+    };
+  }
+  return {
+    ok: false,
+    value,
+    reason: `tsconfig.json resolves modules with "moduleResolution": "${value}"` + (value === "node10" ? ' (what TypeScript calls the "node" setting)' : "") + '. The files init writes import subpath exports (`@saasicat/nest/platform`, `/billing`, `/discovery`), which TypeScript resolves only under "node16", "nodenext" or "bundler". Set one of those first \u2014 `nest new` has used "nodenext" since NestJS 10.'
+  };
+}
+__name(judgeModuleResolution, "judgeModuleResolution");
+function readEffectiveModuleResolution(root, ts) {
+  const configPath = (0, import_node_path.join)(root, "tsconfig.json");
+  const read = ts.readConfigFile(configPath, ts.sys.readFile);
+  if (read.error || read.config === void 0) return null;
+  const parsed = ts.parseJsonConfigFileContent(read.config, ts.sys, root);
+  const kind = parsed.options.moduleResolution;
+  if (kind === void 0) return null;
+  return ts.ModuleResolutionKind[kind].toLowerCase();
+}
+__name(readEffectiveModuleResolution, "readEffectiveModuleResolution");
+
 // src/codemods/v1-imports.ts
 var PUBLIC_PREFIXES = [
   "ui/",
@@ -2118,7 +2189,7 @@ ${block}`;
     return {
       source,
       status: "declined",
-      reason: "no `@Module({ imports: [ ... ] })` was found in this file, so there is nowhere to add the platform without guessing at the structure",
+      reason: "this file has no `@Module({ ... })` with an `imports:` key on a line of its own \u2014 the shape `nest new` writes \u2014 so there is nowhere to add the platform without guessing at the structure",
       manualBlock
     };
   }
@@ -2206,6 +2277,13 @@ function renderForRootBlock(options) {
     "        // your whole capability inventory \u2014 and the manifest routes to",
     "        // anyone who asks. Import your guard and put it in.",
     "        controller: { guards: [YourAuthGuard] },",
+    "        // The modules whose providers the platform injects: the one",
+    "        // exporting PrismaService, and the one your guard depends on.",
+    "        // `prismaPersistence({ client: PrismaService })` is resolved",
+    "        // inside the platform module, which sees only what is listed",
+    "        // here or declared @Global. Same rule as the guard: this does",
+    "        // not compile until you name them.",
+    "        imports: [YourPrismaModule, YourAuthModule],",
     options.persistenceImport ? "        persistence," : "        // persistence: prismaPersistence({ client: PrismaService }),",
     "        catalog: { featureUiRegistry: " + options.registry.constName + " },",
     "        adminResources: true,",
@@ -2852,7 +2930,7 @@ DoctorCommands = _ts_decorate12([
 
 // src/discovery.command.ts
 var import_node_fs = require("fs");
-var import_node_path = require("path");
+var import_node_path2 = require("path");
 var import_common13 = require("@nestjs/common");
 var import_nest_commander5 = require("nest-commander");
 var import_nest6 = require("@saasicat/nest");
@@ -2890,8 +2968,8 @@ var DiscoveryScanCommand = class extends import_nest_commander5.CommandRunner {
     try {
       const snapshot = this.scanner.rebuildSnapshot();
       if (flags.out) {
-        const outPath = (0, import_node_path.resolve)(flags.out);
-        (0, import_node_fs.mkdirSync)((0, import_node_path.dirname)(outPath), {
+        const outPath = (0, import_node_path2.resolve)(flags.out);
+        (0, import_node_fs.mkdirSync)((0, import_node_path2.dirname)(outPath), {
           recursive: true
         });
         (0, import_node_fs.writeFileSync)(outPath, JSON.stringify(snapshot, null, 2) + "\n", "utf-8");
@@ -2900,7 +2978,7 @@ var DiscoveryScanCommand = class extends import_nest_commander5.CommandRunner {
       process.stdout.write(`Discovery-Scan (${snapshot.app.key} v${snapshot.app.version}): ${snapshot.capabilities.length} Capabilities \xB7 ${snapshot.features.length} Features \xB7 ${snapshot.quotas.length} Quotas \xB7 hash ${snapshot.hash.slice(0, 19)}\u2026
 `);
       if (target) {
-        process.stdout.write(`Snapshot persisted: ${(0, import_node_path.resolve)(target)}
+        process.stdout.write(`Snapshot persisted: ${(0, import_node_path2.resolve)(target)}
 `);
       } else {
         process.stderr.write("WARNING: the snapshot was not persisted \u2014 neither snapshotPath (DiscoveryModule.forRoot) configured nor --out given. The seed gate will find no snapshot this way.\n");
@@ -3329,6 +3407,9 @@ UserCommands = _ts_decorate14([
   enableFkPointers,
   extractBlockNames,
   extractBlocks,
+  extractEnumBlocks,
+  extractEnumNames,
+  extractFragmentBlocks,
   extractModelBlocks,
   extractModelNames,
   findFkPointers,
@@ -3337,6 +3418,7 @@ UserCommands = _ts_decorate14([
   hasConstraints,
   isNoLongerPublic,
   isOneToOne,
+  judgeModuleResolution,
   kebabCase,
   migrationCreatedBy,
   minimumQuotasPerPlan,
@@ -3352,6 +3434,7 @@ UserCommands = _ts_decorate14([
   planInit,
   projectKeyPattern,
   quotaKeyPattern,
+  readEffectiveModuleResolution,
   relationNameOf,
   reportConstraints,
   rewriteImports,

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 import { MfaService, AdminAuditService, AdminManifestService, DiscoverySnapshot, ProviderSpec, DiscoveryScanner } from '@saasicat/nest';
 import { UserPort, PlatformUserDto, AuditQueryPort, AuditEntry, AdminManifest, ManifestAccessPort, PlanCatalog, UserManagementPort } from '@saasicat/core';
 import { Type, DynamicModule } from '@nestjs/common';
+import * as TypeScript from 'typescript';
 import { CommandRunner } from 'nest-commander';
 
 declare const CLI_CONTEXT_CONFIG_TOKEN: unique symbol;
@@ -381,19 +382,41 @@ declare function extractModelNames(schema: string): string[];
  * `name -> complete block text incl. opening/closing braces`.
  */
 declare function extractModelBlocks(fragment: string): Map<string, string>;
+/** Returns all `enum X { ... }` blocks from a fragment, keyed by name. */
+declare function extractEnumBlocks(fragment: string): Map<string, string>;
+/** Names of all top-level `enum X { ... }` blocks in the schema. */
+declare function extractEnumNames(schema: string): string[];
+/**
+ * What a fragment contributes: its enums and its models. Both travel
+ * together, because a model's `BillingCycle` field is a validation error in
+ * a schema that has the model and not the enum — which is what `apply` used
+ * to produce for every consumer whose schema did not already carry the enums
+ * by hand, and what the example app masked by carrying them.
+ */
+interface FragmentBlocks {
+    enums: Map<string, string>;
+    models: Map<string, string>;
+}
+declare function extractFragmentBlocks(fragment: string): FragmentBlocks;
 interface ApplyResult {
-    /** Number of models that were added. */
+    /** Models that were added. */
     added: string[];
-    /** Number of models that were already present (no write). */
+    /** Models that were already present (no write). */
     skipped: string[];
-    /** Resulting schema text. When `added.length === 0` identical to the input. */
+    /** Enums that were added, before the models that use them. */
+    addedEnums: string[];
+    /** Enums that were already present (no write). */
+    skippedEnums: string[];
+    /** Resulting schema text. When nothing was added, identical to the input. */
     schema: string;
 }
 /**
- * Appends missing models from `fragmentBlocks` to the end of `schema`. Existing
- * models (same name) stay unchanged and are listed in `skipped`.
+ * Appends missing enums and models from `fragmentBlocks` to the end of
+ * `schema`. Existing blocks (same name) stay unchanged and are listed as
+ * skipped. A plain map of models is accepted for the callers that only ever
+ * had models; the enums are then `[]`, which is what they were before.
  */
-declare function applyFragmentBlocks(schema: string, fragmentBlocks: Map<string, string>, options?: {
+declare function applyFragmentBlocks(schema: string, fragmentBlocks: FragmentBlocks | Map<string, string>, options?: {
     fragmentLabel?: string;
 }): ApplyResult;
 
@@ -804,6 +827,33 @@ interface PatchOptionsFromPlan {
     };
 }
 
+interface ModuleResolutionVerdict {
+    readonly ok: boolean;
+    /** The effective setting, lower-cased as TypeScript names it, or null when unset. */
+    readonly value: string | null;
+    readonly reason?: string;
+}
+/**
+ * Judges an effective `moduleResolution`, as `readEffectiveModuleResolution`
+ * reports it.
+ *
+ * Unset is `ok`: TypeScript then derives it from `module`, and a `module`
+ * that implies the old resolution is a setup this cannot see from here —
+ * the next build says so, with TypeScript's own message.
+ */
+declare function judgeModuleResolution(value: string | null): ModuleResolutionVerdict;
+/**
+ * The `moduleResolution` a project's `tsconfig.json` resolves to, after
+ * `extends`, lower-cased as TypeScript names the kind (`node10`, `node16`,
+ * `nodenext`, `bundler`, `classic`) — or null when there is no config, the
+ * config cannot be parsed, or the option is not set anywhere in the chain.
+ *
+ * `ts` is whichever TypeScript will compile the project: the consumer's own
+ * when it can be resolved from the project root, so the reading matches the
+ * build that follows.
+ */
+declare function readEffectiveModuleResolution(root: string, ts: typeof TypeScript): string | null;
+
 /** The pattern `plan-catalog.schema.json` puts on `projectKey`. */
 declare function projectKeyPattern(): RegExp;
 /** The pattern it puts on the keys inside a plan's `quotas` object. */
@@ -1174,4 +1224,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 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 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, extractModelBlocks, extractModelNames, findFkPointers, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, projectKeyPattern, quotaKeyPattern, 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 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 };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { MfaService, AdminAuditService, AdminManifestService, DiscoverySnapshot, ProviderSpec, DiscoveryScanner } from '@saasicat/nest';
 import { UserPort, PlatformUserDto, AuditQueryPort, AuditEntry, AdminManifest, ManifestAccessPort, PlanCatalog, UserManagementPort } from '@saasicat/core';
 import { Type, DynamicModule } from '@nestjs/common';
+import * as TypeScript from 'typescript';
 import { CommandRunner } from 'nest-commander';
 
 declare const CLI_CONTEXT_CONFIG_TOKEN: unique symbol;
@@ -381,19 +382,41 @@ declare function extractModelNames(schema: string): string[];
  * `name -> complete block text incl. opening/closing braces`.
  */
 declare function extractModelBlocks(fragment: string): Map<string, string>;
+/** Returns all `enum X { ... }` blocks from a fragment, keyed by name. */
+declare function extractEnumBlocks(fragment: string): Map<string, string>;
+/** Names of all top-level `enum X { ... }` blocks in the schema. */
+declare function extractEnumNames(schema: string): string[];
+/**
+ * What a fragment contributes: its enums and its models. Both travel
+ * together, because a model's `BillingCycle` field is a validation error in
+ * a schema that has the model and not the enum — which is what `apply` used
+ * to produce for every consumer whose schema did not already carry the enums
+ * by hand, and what the example app masked by carrying them.
+ */
+interface FragmentBlocks {
+    enums: Map<string, string>;
+    models: Map<string, string>;
+}
+declare function extractFragmentBlocks(fragment: string): FragmentBlocks;
 interface ApplyResult {
-    /** Number of models that were added. */
+    /** Models that were added. */
     added: string[];
-    /** Number of models that were already present (no write). */
+    /** Models that were already present (no write). */
     skipped: string[];
-    /** Resulting schema text. When `added.length === 0` identical to the input. */
+    /** Enums that were added, before the models that use them. */
+    addedEnums: string[];
+    /** Enums that were already present (no write). */
+    skippedEnums: string[];
+    /** Resulting schema text. When nothing was added, identical to the input. */
     schema: string;
 }
 /**
- * Appends missing models from `fragmentBlocks` to the end of `schema`. Existing
- * models (same name) stay unchanged and are listed in `skipped`.
+ * Appends missing enums and models from `fragmentBlocks` to the end of
+ * `schema`. Existing blocks (same name) stay unchanged and are listed as
+ * skipped. A plain map of models is accepted for the callers that only ever
+ * had models; the enums are then `[]`, which is what they were before.
  */
-declare function applyFragmentBlocks(schema: string, fragmentBlocks: Map<string, string>, options?: {
+declare function applyFragmentBlocks(schema: string, fragmentBlocks: FragmentBlocks | Map<string, string>, options?: {
     fragmentLabel?: string;
 }): ApplyResult;
 
@@ -804,6 +827,33 @@ interface PatchOptionsFromPlan {
     };
 }
 
+interface ModuleResolutionVerdict {
+    readonly ok: boolean;
+    /** The effective setting, lower-cased as TypeScript names it, or null when unset. */
+    readonly value: string | null;
+    readonly reason?: string;
+}
+/**
+ * Judges an effective `moduleResolution`, as `readEffectiveModuleResolution`
+ * reports it.
+ *
+ * Unset is `ok`: TypeScript then derives it from `module`, and a `module`
+ * that implies the old resolution is a setup this cannot see from here —
+ * the next build says so, with TypeScript's own message.
+ */
+declare function judgeModuleResolution(value: string | null): ModuleResolutionVerdict;
+/**
+ * The `moduleResolution` a project's `tsconfig.json` resolves to, after
+ * `extends`, lower-cased as TypeScript names the kind (`node10`, `node16`,
+ * `nodenext`, `bundler`, `classic`) — or null when there is no config, the
+ * config cannot be parsed, or the option is not set anywhere in the chain.
+ *
+ * `ts` is whichever TypeScript will compile the project: the consumer's own
+ * when it can be resolved from the project root, so the reading matches the
+ * build that follows.
+ */
+declare function readEffectiveModuleResolution(root: string, ts: typeof TypeScript): string | null;
+
 /** The pattern `plan-catalog.schema.json` puts on `projectKey`. */
 declare function projectKeyPattern(): RegExp;
 /** The pattern it puts on the keys inside a plan's `quotas` object. */
@@ -1174,4 +1224,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 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 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, extractModelBlocks, extractModelNames, findFkPointers, foreignKeyOf, hasBackRelation, hasConstraints, isNoLongerPublic, isOneToOne, kebabCase, migrationCreatedBy, minimumQuotasPerPlan, namedImports, parseBlockAttributes, parseEnumValues, parseFields, parseQuota, parseSchema, pascalCase, patchAppModule, patchOptionsFor, planInit, projectKeyPattern, quotaKeyPattern, 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 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 };

package/dist/index.js

@@ -1129,13 +1129,43 @@ function extractModelBlocks(fragment) {
   return extractBlocks(fragment, "model");
 }
 __name(extractModelBlocks, "extractModelBlocks");
+function extractEnumBlocks(fragment) {
+  return extractBlocks(fragment, "enum");
+}
+__name(extractEnumBlocks, "extractEnumBlocks");
+function extractEnumNames(schema2) {
+  return extractBlockNames(schema2, "enum");
+}
+__name(extractEnumNames, "extractEnumNames");
+function extractFragmentBlocks(fragment) {
+  return {
+    enums: extractEnumBlocks(fragment),
+    models: extractModelBlocks(fragment)
+  };
+}
+__name(extractFragmentBlocks, "extractFragmentBlocks");
 function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
-  const existing = new Set(extractModelNames(schema2));
+  const blocks = fragmentBlocks instanceof Map ? {
+    enums: /* @__PURE__ */ new Map(),
+    models: fragmentBlocks
+  } : fragmentBlocks;
+  const existingModels = new Set(extractModelNames(schema2));
+  const existingEnums = new Set(extractEnumNames(schema2));
   const added = [];
   const skipped = [];
+  const addedEnums = [];
+  const skippedEnums = [];
   const additions = [];
-  for (const [name, block] of fragmentBlocks) {
-    if (existing.has(name)) {
+  for (const [name, block] of blocks.enums) {
+    if (existingEnums.has(name)) {
+      skippedEnums.push(name);
+    } else {
+      addedEnums.push(name);
+      additions.push(block);
+    }
+  }
+  for (const [name, block] of blocks.models) {
+    if (existingModels.has(name)) {
       skipped.push(name);
     } else {
       added.push(name);
@@ -1146,6 +1176,8 @@ function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
     return {
       added,
       skipped,
+      addedEnums,
+      skippedEnums,
       schema: schema2
     };
   }
@@ -1162,6 +1194,8 @@ function applyFragmentBlocks(schema2, fragmentBlocks, options = {}) {
   return {
     added,
     skipped,
+    addedEnums,
+    skippedEnums,
     schema: trimmedSchema + header + additions.join("\n\n") + "\n"
   };
 }
@@ -1716,6 +1750,38 @@ function patchOptionsFor(plan) {
 }
 __name(patchOptionsFor, "patchOptionsFor");
 
+// src/init/module-resolution.ts
+import { join } from "path";
+var RESOLVES_SUBPATHS = /* @__PURE__ */ new Set([
+  "node16",
+  "nodenext",
+  "bundler"
+]);
+function judgeModuleResolution(value) {
+  if (value === null || RESOLVES_SUBPATHS.has(value)) {
+    return {
+      ok: true,
+      value
+    };
+  }
+  return {
+    ok: false,
+    value,
+    reason: `tsconfig.json resolves modules with "moduleResolution": "${value}"` + (value === "node10" ? ' (what TypeScript calls the "node" setting)' : "") + '. The files init writes import subpath exports (`@saasicat/nest/platform`, `/billing`, `/discovery`), which TypeScript resolves only under "node16", "nodenext" or "bundler". Set one of those first \u2014 `nest new` has used "nodenext" since NestJS 10.'
+  };
+}
+__name(judgeModuleResolution, "judgeModuleResolution");
+function readEffectiveModuleResolution(root, ts) {
+  const configPath = join(root, "tsconfig.json");
+  const read = ts.readConfigFile(configPath, ts.sys.readFile);
+  if (read.error || read.config === void 0) return null;
+  const parsed = ts.parseJsonConfigFileContent(read.config, ts.sys, root);
+  const kind = parsed.options.moduleResolution;
+  if (kind === void 0) return null;
+  return ts.ModuleResolutionKind[kind].toLowerCase();
+}
+__name(readEffectiveModuleResolution, "readEffectiveModuleResolution");
+
 // src/codemods/v1-imports.ts
 var PUBLIC_PREFIXES = [
   "ui/",
@@ -1999,7 +2065,7 @@ ${block}`;
     return {
       source,
       status: "declined",
-      reason: "no `@Module({ imports: [ ... ] })` was found in this file, so there is nowhere to add the platform without guessing at the structure",
+      reason: "this file has no `@Module({ ... })` with an `imports:` key on a line of its own \u2014 the shape `nest new` writes \u2014 so there is nowhere to add the platform without guessing at the structure",
       manualBlock
     };
   }
@@ -2087,6 +2153,13 @@ function renderForRootBlock(options) {
     "        // your whole capability inventory \u2014 and the manifest routes to",
     "        // anyone who asks. Import your guard and put it in.",
     "        controller: { guards: [YourAuthGuard] },",
+    "        // The modules whose providers the platform injects: the one",
+    "        // exporting PrismaService, and the one your guard depends on.",
+    "        // `prismaPersistence({ client: PrismaService })` is resolved",
+    "        // inside the platform module, which sees only what is listed",
+    "        // here or declared @Global. Same rule as the guard: this does",
+    "        // not compile until you name them.",
+    "        imports: [YourPrismaModule, YourAuthModule],",
     options.persistenceImport ? "        persistence," : "        // persistence: prismaPersistence({ client: PrismaService }),",
     "        catalog: { featureUiRegistry: " + options.registry.constName + " },",
     "        adminResources: true,",
@@ -3209,6 +3282,9 @@ export {
   enableFkPointers,
   extractBlockNames,
   extractBlocks,
+  extractEnumBlocks,
+  extractEnumNames,
+  extractFragmentBlocks,
   extractModelBlocks,
   extractModelNames,
   findFkPointers,
@@ -3217,6 +3293,7 @@ export {
   hasConstraints,
   isNoLongerPublic,
   isOneToOne,
+  judgeModuleResolution,
   kebabCase,
   migrationCreatedBy,
   minimumQuotasPerPlan,
@@ -3232,6 +3309,7 @@ export {
   planInit,
   projectKeyPattern,
   quotaKeyPattern,
+  readEffectiveModuleResolution,
   relationNameOf,
   reportConstraints,
   rewriteImports,

package/package.json

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