@dereekb/dbx-cli 13.41.0 → 13.43.0

package/generate-firestore-indexes/main.js

@@ -5,14 +5,14 @@ const require = __createRequire(import.meta.url);
 // packages/dbx-cli/generate-firestore-indexes/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-generate-firestore-indexes",
-  version: "13.41.0",
+  version: "13.43.0",
   private: true,
   type: "module",
   devDependencies: {
     eslint: "10.4.0"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "13.41.0"
+    "@dereekb/dbx-cli": "13.43.0"
   }
 };
 
@@ -438,11 +438,18 @@ function analyzeSequence(input) {
   if (isSingleFieldQuery(buckets)) {
     return analyzeSingleField({ buckets, collection, scope, warnings });
   }
+  if (scope === "COLLECTION" && isEqualityOnlySequence(buckets)) {
+    warnings.push({ kind: "equality-only-composite-skipped", factoryName, fields: buckets.equalities.map((e) => e.fieldPath) });
+    return { kind: "auto", warnings };
+  }
   return analyzeMultiField({ buckets, sequenceEntries: sequence.entries, collection, scope, factoryName, warnings });
 }
 function isSingleFieldQuery(buckets) {
   return buckets.distinctFieldCount === 1;
 }
+function isEqualityOnlySequence(buckets) {
+  return buckets.ranges.length === 0 && buckets.arrays.length === 0 && buckets.orderBys.length === 0 && buckets.equalities.length > 0 && buckets.equalities.every((e) => (e.operator ?? "==") === "==");
+}
 function analyzeSingleField(input) {
   const { buckets, collection, scope, warnings } = input;
   if (scope === "COLLECTION") {
@@ -537,7 +544,7 @@ function collectOrderByDirections(input) {
     }
   }
   for (const [field, dirs] of conflicts) {
-    warnings.push({ kind: "orderby-conflict", factoryName, field, directions: [...dirs] });
+    warnings.push({ kind: "orderby-conflict", factoryName, field, directions: Array.from(dirs) });
   }
   return out;
 }
@@ -1018,7 +1025,7 @@ function composeEntry(input) {
 }
 function resolveConstraintSequences(input) {
   const { candidate, tags, name, line, filePath, warnings } = input;
-  const bodyResult = extractConstraintsFromBody({ decl: candidate.decl, factoryName: name, filePath, dispatcher: tags.dispatcher });
+  const bodyResult = extractConstraintsFromBody({ decl: candidate.decl, factoryName: name, filePath, dispatcher: tags.dispatcher, suppressed: tags.skip || tags.specOnly });
   for (const warning of bodyResult.warnings) {
     warnings.push(warning);
   }
@@ -1099,11 +1106,14 @@ function buildConstraintSequences(input) {
   return sequences;
 }
 function extractConstraintsFromBody(input) {
-  const { decl, factoryName, filePath, dispatcher } = input;
+  const { decl, factoryName, filePath, dispatcher, suppressed } = input;
   const entries = [];
   const conditionalFieldSet = /* @__PURE__ */ new Set();
   const warnings = [];
   const body = decl.getBody();
+  if (suppressed) {
+    return { entries, conditionalFields: [], warnings, skipped: true, dispatcherDelegates: [] };
+  }
   if (dispatcher) {
     const violation = body === void 0 ? void 0 : findFirstConstraintCall(body);
     if (violation !== void 0) {
@@ -1901,6 +1911,76 @@ function assembleEntry(input) {
   };
   return out;
 }
+function formatModelFirebaseIndexBuildWarning(warning) {
+  let result2;
+  if (warning.stage === "extract") {
+    const w = warning.warning;
+    switch (w.kind) {
+      case "missing-name":
+        result2 = `(anonymous) (${w.filePath}:${w.line}) tagged export has no resolvable name`;
+        break;
+      case "missing-model-tag":
+        result2 = `${w.name} (${w.filePath}:${w.line}) missing required @dbxModelFirebaseIndexModel tag`;
+        break;
+      case "unresolved-model":
+        result2 = `${w.name} (${w.filePath}:${w.line}) could not resolve model "${w.model}" to a Firestore identity`;
+        break;
+      case "unsupported-scope":
+        result2 = `${w.name} (${w.filePath}:${w.line}) unsupported @dbxModelFirebaseIndexScope value "${w.scope}"`;
+        break;
+      case "duplicate-slug":
+        result2 = `${w.name} (${w.filePath}:${w.line}) duplicate slug "${w.slug}" \u2014 already used by ${w.previousName}`;
+        break;
+      case "unknown-helper":
+        result2 = `${w.name} (${w.filePath}:${w.line}) unknown constraint helper "${w.helper}"`;
+        break;
+      case "unresolved-field":
+        result2 = `${w.name} (${w.filePath}:${w.line}) could not resolve field-path argument to "${w.callee}"`;
+        break;
+      case "missing-paths":
+        result2 = `${w.name} (${w.filePath}:${w.line}) missing path coverage for conditional fields [${w.conditionalFields.join(", ")}]`;
+        break;
+      case "unknown-path-field":
+        result2 = `${w.name} (${w.filePath}:${w.line}) @dbxModelFirebaseIndexPath references unknown field "${w.field}"`;
+        break;
+      case "unannotated-query-helper":
+        result2 = `${w.name} (${w.filePath}:${w.line}) calls query helper "${w.callee}" (${w.calleeFilePath}:${w.calleeLine}) that is not tagged with @dbxModelFirebaseIndexHelper`;
+        break;
+      case "transitive-cycle":
+        result2 = `${w.name} (${w.filePath}:${w.line}) transitive constraint resolution hit a cycle through "${w.callee}"`;
+        break;
+      case "unresolvable-transitive-callee":
+        result2 = `${w.name} (${w.filePath}:${w.line}) could not resolve transitive callee "${w.callee}"`;
+        break;
+      case "complex-query-body":
+        result2 = `${w.name} (${w.filePath}:${w.line}) tagged query body contains a "${w.branchKind}" construct \u2014 split into one factory per target index or mark as @dbxModelFirebaseIndexDispatcher`;
+        break;
+      case "non-delegating-dispatcher":
+        result2 = `${w.name} (${w.filePath}:${w.line}) @dbxModelFirebaseIndexDispatcher calls "${w.callee}" directly \u2014 dispatchers must only delegate to other tagged query functions`;
+        break;
+      case "excluded-factory":
+        result2 = `${w.name} (${w.filePath}:${w.line}) tagged @dbxModelFirebaseIndexExclude \u2014 analyzer is suppressing composites + fieldOverrides for this factory`;
+        break;
+    }
+  } else {
+    const w = warning.warning;
+    switch (w.kind) {
+      case "multiple-range-fields":
+        result2 = `${w.factoryName} multiple range-field constraints on [${w.fields.join(", ")}] \u2014 Firestore allows only one range field per query`;
+        break;
+      case "orderby-conflict":
+        result2 = `${w.factoryName} field "${w.field}" has conflicting orderBy directions [${w.directions.join(", ")}]`;
+        break;
+      case "unsupported-array-contains-any":
+        result2 = `${w.factoryName} field "${w.field}" uses array-contains-any \u2014 index support is partial`;
+        break;
+      case "equality-only-composite-skipped":
+        result2 = `${w.factoryName} is equality-only on [${w.fields.join(", ")}] \u2014 no composite emitted, Firestore serves this by merging the automatic single-field indexes`;
+        break;
+    }
+  }
+  return result2;
+}
 
 // packages/dbx-cli/firestore-indexes/src/model-firebase-index-runtime.ts
 // @__NO_SIDE_EFFECTS__
@@ -2000,12 +2080,13 @@ function pushInto(map, key, entry) {
 var DEFAULT_BIN_NAME = "dbx-cli-generate-firestore-indexes";
 function buildUsage(binName) {
   return [
-    `Usage: ${binName} --component <dir> [--output <path>] [--check] [--json] [--help]`,
+    `Usage: ${binName} --component <dir> [--component <dir> ...] [--output <path>] [--check] [--json] [--help]`,
     "",
     "Generates `firestore.indexes.json` from `@dbxModelFirebaseIndex`-tagged factories.",
     "",
     "Options:",
-    "  --component <dir>  Required. Relative path to the `-firebase` component package.",
+    "  --component <dir>  Required, repeatable. Relative path to a `-firebase` component or package.",
+    "                     Repeat to derive one indexes file from several packages at once.",
     "  --output <path>    Output path. Defaults to `firestore.indexes.json` at the cwd.",
     "  --check            Compare against the on-disk file; exit 1 on drift, do not write.",
     "  --json             Print the diff summary as JSON instead of human-readable text.",
@@ -2025,23 +2106,40 @@ async function runGenerateFirestoreIndexesCli(input) {
     stderr(usage);
     return { exitCode: 2 };
   }
-  if (parsed.component === void 0) {
+  if (parsed.components.length === 0) {
     stderr("generate-firestore-indexes: --component is required");
     stderr(usage);
     return { exitCode: 2 };
   }
-  const componentAbs = resolve2(cwd, parsed.component);
   const outputAbs = resolve2(cwd, parsed.output);
-  const buildOutcome = await buildModelFirebaseIndexManifest({
-    projectRoot: componentAbs,
-    generator
-  });
-  if (buildOutcome.kind !== "success") {
-    stderr(formatBuildFailure(buildOutcome));
+  const entries = [];
+  const loadedSources = [];
+  let sawUnresolvedModel = false;
+  for (const component of parsed.components) {
+    const buildOutcome = await buildModelFirebaseIndexManifest({
+      projectRoot: resolve2(cwd, component),
+      generator
+    });
+    if (buildOutcome.kind !== "success") {
+      stderr(formatBuildFailure(buildOutcome));
+      return { exitCode: 1 };
+    }
+    for (const warning of buildOutcome.extractWarnings) {
+      stderr(`${warning.stage}-warning: ${formatModelFirebaseIndexBuildWarning(warning)}`);
+      if (warning.stage === "extract" && warning.warning.kind === "unresolved-model") {
+        sawUnresolvedModel = true;
+      }
+    }
+    for (const entry of buildOutcome.manifest.entries) {
+      entries.push(toModelFirebaseIndexEntryInfo(entry));
+    }
+    loadedSources.push(buildOutcome.manifest.source);
+  }
+  if (sawUnresolvedModel) {
+    stderr("generate-firestore-indexes: one or more @dbxModelFirebaseIndexModel tags could not be resolved, so their indexes were dropped. Add the missing identity file to the component\u2019s `dbx-mcp.scan.json` include globs.");
     return { exitCode: 1 };
   }
-  const entries = buildOutcome.manifest.entries.map(toModelFirebaseIndexEntryInfo);
-  const registry = createModelFirebaseIndexRegistryFromEntries({ entries, loadedSources: [buildOutcome.manifest.source] });
+  const registry = createModelFirebaseIndexRegistryFromEntries({ entries, loadedSources });
   const existingJson = await readExistingIndexes({ outputAbs, readFile, stderr });
   const { json, diff } = generateFirestoreIndexesJson({ entries: registry.all, existingJson });
   const serialized = serializeFirestoreIndexesJson(json);
@@ -2064,7 +2162,7 @@ async function runGenerateFirestoreIndexesCli(input) {
   return { exitCode: 0 };
 }
 function parseArgv(argv) {
-  let component;
+  const components = [];
   let output = "firestore.indexes.json";
   let check = false;
   let json = false;
@@ -2079,7 +2177,7 @@ function parseArgv(argv) {
         if (i >= argv.length) {
           error = "generate-firestore-indexes: --component requires a value";
         } else {
-          component = argv[i];
+          components.push(argv[i]);
         }
         break;
       case "--output":
@@ -2106,7 +2204,7 @@ function parseArgv(argv) {
     }
     i += 1;
   }
-  return { component, output, check, json, help, error };
+  return { components, output, check, json, help, error };
 }
 async function readExistingIndexes(input) {
   const text = await readExistingIndexesText(input);

package/generate-firestore-indexes/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/dbx-cli-generate-firestore-indexes",
-  "version": "13.41.0",
+  "version": "13.43.0",
   "private": true,
   "type": "module",
   "devDependencies": {
     "eslint": "10.4.0"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "13.41.0"
+    "@dereekb/dbx-cli": "13.43.0"
   }
 }

package/generate-mcp-manifest/main.js

@@ -909,13 +909,13 @@ async function discoverClaimsFiles(cwd) {
     } catch {
     }
   }
-  return [...found].sort((a, b) => a.localeCompare(b));
+  return Array.from(found).sort((a, b) => a.localeCompare(b));
 }
 function mergeAndNormalisePaths(discovered, extra) {
   const out = /* @__PURE__ */ new Set();
   for (const p of discovered) out.add(p);
   for (const p of extra) out.add(toPosix(p));
-  return [...out].sort((a, b) => a.localeCompare(b));
+  return Array.from(out).sort((a, b) => a.localeCompare(b));
 }
 function toPosix(value) {
   return value.split(sep).join("/");
@@ -1131,6 +1131,9 @@ function projectModelEntry(entry) {
     fields: entry.fields.map(projectModelField),
     ...entry.modelGroup == null ? {} : { modelGroup: entry.modelGroup },
     ...entry.parentIdentityConst == null ? {} : { parentIdentityConst: entry.parentIdentityConst },
+    ...entry.singleton == null ? {} : { singleton: entry.singleton },
+    ...entry.singleItemIdentifier == null ? {} : { singleItemIdentifier: entry.singleItemIdentifier },
+    ...entry.exampleKey == null ? {} : { exampleKey: entry.exampleKey },
     ...entry.description == null ? {} : { description: entry.description },
     ...entry.mcpToolNameSegment == null ? {} : { mcpToolNameSegment: entry.mcpToolNameSegment },
     ...entry.read == null ? {} : { read: entry.read },

package/generate-mcp-manifest/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/dbx-cli-generate-mcp-manifest",
-  "version": "13.41.0",
+  "version": "13.43.0",
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "13.41.0",
-    "@dereekb/model": "13.41.0",
+    "@dereekb/dbx-cli": "13.43.0",
+    "@dereekb/model": "13.43.0",
     "arktype": "^2.2.0",
     "jiti": "2.6.1"
   }

package/generate-route-manifest/main.js

@@ -845,7 +845,7 @@ function warnDroppedFutureStates(tree, realNames, warnings) {
       continue;
     }
     const prefix = node.data.name.slice(0, -3);
-    const hasRealSubtree = realNames.has(prefix) || [...realNames].some((name) => name.startsWith(`${prefix}.`));
+    const hasRealSubtree = realNames.has(prefix) || Array.from(realNames).some((name) => name.startsWith(`${prefix}.`));
     if (!hasRealSubtree) {
       warnings.push({ kind: "dropped-future-state", severity: "warning", message: `Future state \`${node.data.name}\` was dropped and has no real subtree under \`${prefix}\`; its page will not match any URL.`, stateName: node.data.name });
     }

package/generate-route-manifest/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dereekb/dbx-cli-generate-route-manifest",
-  "version": "13.41.0",
+  "version": "13.43.0",
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "13.41.0",
+    "@dereekb/dbx-cli": "13.43.0",
     "ts-morph": "^21.0.0"
   }
 }