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

package/bin/saasicat.js

@@ -320,7 +320,16 @@ function printCheckReport(report) {
         console.log('');
     }
 
-    const absent = [...report.absentModels, ...report.absentEnums];
+    // An enum a reported field names is not a fragment the app went without: the
+    // field above it is the drift, and copying the enum is what fixes both.
+    // Listing it as "not an error" in the same run would print the contradiction
+    // this check exists to avoid — which is exactly what it used to do for a
+    // relation pointing at an unadopted model.
+    const named = new Set(report.missingFields.map((field) => field.type));
+    const absent = [
+        ...report.absentModels,
+        ...report.absentEnums.filter((name) => !named.has(name)),
+    ];
     if (absent.length > 0) {
         console.log(`→ Not adopted (${absent.length}): ${absent.join(', ')}`);
         console.log('  Not an error — the app does not use these fragments.');
@@ -347,7 +356,21 @@ async function cmdSchemaCheck(args) {
     console.log(`→ Checking ${schemaPath} against ${files.length} fragment(s) from @saasicat/spec`);
     console.log('');
 
-    const report = checkSchema(fragments.join('\n'), schema);
+    // Every model the shipped fragments declare, not only the selected ones: a
+    // relation from a selected fragment can point at a model in one that was
+    // left out, and without this the narrowed run would report that field as
+    // missing — the very contradiction the full run stopped producing. Without
+    // a filter the files in hand are already all of them.
+    const allFragments = filter
+        ? await Promise.all(
+              (await selectFragmentFiles(fragmentsDir, null)).map((file) =>
+                  readFile(join(fragmentsDir, file), 'utf8'),
+              ),
+          )
+        : fragments;
+    const knownModels = new Set(extractModelNames(allFragments.join('\n')));
+
+    const report = checkSchema(fragments.join('\n'), schema, knownModels);
     printCheckReport(report);
 
     const checked = `${report.checkedModelCount} Model(s), ${report.checkedEnumCount} Enum(s)`;

package/dist/.build-stamp

@@ -1 +1 @@
-6d26748d12c2cc8e839f2a13b89df38079e8253fb11933454d69ef20cc6de850
+89cdc61db4ad8f0d8bc18287c0d1fe76e1a7e9410f0797a525db4c9b1bbdc3ab

package/dist/index.cjs

@@ -1593,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,
@@ -1675,20 +1676,26 @@ function cascadesFromTenant(model, block) {
   return found;
 }
 __name(cascadesFromTenant, "cascadesFromTenant");
-function checkSchema(specSchema, appSchema) {
+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) {
@@ -1700,14 +1707,10 @@ function checkSchema(specSchema, appSchema) {
     const block = appBlocks.get(model);
     return block ? cascadesFromTenant(model, block) : [];
   });
-  const absentEnums = [];
   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({

package/dist/index.d.cts

@@ -562,8 +562,12 @@ declare function modelsKeptPastTheTenant(specSchema: string): string[];
 /**
  * Compares a consumer schema against the canonical fragments. `specSchema` is
  * the concatenation of the fragments the check should cover.
+ *
+ * @param knownModels Every model the shipped fragments declare, where the spec
+ * passed in is a narrowed selection of them (`schema check --fragments=…`).
+ * Omitted, the spec is taken to be the whole of it.
  */
-declare function checkSchema(specSchema: string, appSchema: string): SchemaCheckReport;
+declare function checkSchema(specSchema: string, appSchema: string, knownModels?: ReadonlySet<string>): SchemaCheckReport;
 
 /** Marks the block this tool appends, and lets it recognise its own work. */
 declare const CONSTRAINTS_MARKER = "-- saasicat:constraints";

package/dist/index.d.ts

@@ -562,8 +562,12 @@ declare function modelsKeptPastTheTenant(specSchema: string): string[];
 /**
  * Compares a consumer schema against the canonical fragments. `specSchema` is
  * the concatenation of the fragments the check should cover.
+ *
+ * @param knownModels Every model the shipped fragments declare, where the spec
+ * passed in is a narrowed selection of them (`schema check --fragments=…`).
+ * Omitted, the spec is taken to be the whole of it.
  */
-declare function checkSchema(specSchema: string, appSchema: string): SchemaCheckReport;
+declare function checkSchema(specSchema: string, appSchema: string, knownModels?: ReadonlySet<string>): SchemaCheckReport;
 
 /** Marks the block this tool appends, and lets it recognise its own work. */
 declare const CONSTRAINTS_MARKER = "-- saasicat:constraints";

package/dist/index.js

@@ -1457,10 +1457,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,
@@ -1539,20 +1540,26 @@ function cascadesFromTenant(model, block) {
   return found;
 }
 __name(cascadesFromTenant, "cascadesFromTenant");
-function checkSchema(specSchema, appSchema) {
+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) {
@@ -1564,14 +1571,10 @@ function checkSchema(specSchema, appSchema) {
     const block = appBlocks.get(model);
     return block ? cascadesFromTenant(model, block) : [];
   });
-  const absentEnums = [];
   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({

package/package.json

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