@dereekb/dbx-cli 14.8.0 → 14.10.0

package/eslint/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/dbx-cli/eslint",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/util": "14.8.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/util": "14.10.0",
     "@typescript-eslint/utils": "8.69.0",
     "typescript": "6.0.3"
   },

package/firebase-api-manifest/main.js

@@ -1902,13 +1902,13 @@ function renderModelField(field, emitConverters) {
 // packages/dbx-cli/firebase-api-manifest/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-firebase-api-manifest",
-  version: "14.8.0",
+  version: "14.10.0",
   sideEffects: false,
   private: true,
   type: "module",
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/util": "14.8.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/util": "14.10.0",
     oxfmt: "^0.66.0",
     "ts-morph": "^28.0.0"
   }

package/firebase-api-manifest/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/dbx-cli-firebase-api-manifest",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/util": "14.8.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/util": "14.10.0",
     "oxfmt": "^0.66.0",
     "ts-morph": "^28.0.0"
   }

package/firestore-query-manifest/main.js

@@ -4,12 +4,12 @@ const require = __createRequire(import.meta.url);
 
 // packages/dbx-cli/firestore-query-manifest/src/main.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
-import { isAbsolute as isAbsolute2, relative as relative2, resolve as resolve3 } from "node:path";
+import { isAbsolute as isAbsolute2, relative as relative2, resolve as resolve5 } from "node:path";
 
 // packages/dbx-cli/firestore-query-manifest/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-firestore-query-manifest",
-  version: "14.8.0",
+  version: "14.10.0",
   sideEffects: false,
   private: true,
   type: "module",
@@ -17,8 +17,8 @@ var package_default = {
     eslint: "10.9.1"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/util": "14.8.0"
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/util": "14.10.0"
   }
 };
 
@@ -325,6 +325,10 @@ function parentPathsForCollection(scan, collection) {
   return Array.from(parents);
 }
 
+// packages/dbx-cli/firestore-query-manifest/src/bind-factories.ts
+import { createRequire } from "node:module";
+import { dirname as dirname3, resolve as resolve2 } from "node:path";
+
 // packages/dbx-cli/src/lib/scan-helpers/exported-from-package.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, statSync } from "node:fs";
 import { dirname as dirname2, isAbsolute, join as join2, resolve } from "node:path";
@@ -447,6 +451,34 @@ function bindQueryFactories(input) {
   }
   return { bound, warnings };
 }
+var defaultQueryFactoryPackageRootResolver = ({ cwd, module }) => {
+  let result;
+  try {
+    result = dirname3(createRequire(resolve2(cwd, "noop.js")).resolve(module));
+  } catch {
+    result = null;
+  }
+  return result;
+};
+function bindPackageQueryFactories(input) {
+  const { cwd, entries, resolvePackageRoot = defaultQueryFactoryPackageRootResolver, isExported = isExportedFromPackage } = input;
+  const packageRoots = /* @__PURE__ */ new Map();
+  const bound = [];
+  const warnings = [];
+  for (const entry of entries) {
+    let packageRoot = packageRoots.get(entry.module);
+    if (packageRoot === void 0) {
+      packageRoot = resolvePackageRoot({ cwd, module: entry.module });
+      packageRoots.set(entry.module, packageRoot);
+    }
+    const found = packageRoot != null && isExported({ packageRoot, identifier: entry.name });
+    if (!found) {
+      warnings.push(packageRoot == null ? `[no-factory] ${entry.module} \xB7 ${entry.slug} \u2192 ${entry.module} is not installed` : `[no-factory] ${entry.module} \xB7 ${entry.slug} \u2192 ${entry.name} not exported`);
+    }
+    bound.push({ entry, bound: found });
+  }
+  return { bound, warnings };
+}
 
 // packages/dbx-cli/firestore-query-manifest/src/emit.ts
 async function renderQueryManifest(input) {
@@ -513,9 +545,155 @@ function renderParams(params) {
   return `[${items.join(", ")}]`;
 }
 
-// packages/dbx-cli/firestore-indexes/src/model-firebase-index-build-manifest.ts
-import { relative, resolve as resolve2 } from "node:path";
-import { type as type3 } from "arktype";
+// packages/dbx-cli/firestore-indexes/src/model-firebase-index-package-manifests.ts
+import { type as type2 } from "arktype";
+import { readdir as nodeReadDir } from "node:fs/promises";
+import { createRequire as createRequire2 } from "node:module";
+import { dirname as dirname4, resolve as resolve3 } from "node:path";
+
+// packages/dbx-cli/src/lib/scan-helpers/scan-io.ts
+import { glob as fsGlob, readFile as nodeReadFile } from "node:fs/promises";
+import { resolve as resolvePath } from "node:path";
+import { Project } from "ts-morph";
+var defaultReadFile = (path) => nodeReadFile(path, "utf-8");
+var defaultGlobber = async (input) => {
+  const { projectRoot, include, exclude } = input;
+  const excludeMatchers = exclude.map(globToRegex);
+  const seen = /* @__PURE__ */ new Set();
+  const matches = [];
+  for (const pattern of include) {
+    for await (const match of fsGlob(pattern, { cwd: projectRoot })) {
+      if (excludeMatchers.some((rx) => rx.test(match))) {
+        continue;
+      }
+      if (!seen.has(match)) {
+        seen.add(match);
+        matches.push(match);
+      }
+    }
+  }
+  return matches;
+};
+async function loadPackageName(packagePath, readFile) {
+  let raw = null;
+  try {
+    raw = await readFile(packagePath);
+  } catch {
+    raw = null;
+  }
+  let result;
+  if (raw === null) {
+    result = { kind: "fail", outcome: { kind: "no-package", packagePath } };
+  } else {
+    let parsed;
+    let parseError = null;
+    try {
+      parsed = JSON.parse(raw);
+    } catch (err) {
+      parseError = err instanceof Error ? err.message : String(err);
+    }
+    if (parseError === null) {
+      const name = parsed?.name;
+      if (typeof name !== "string" || name.length === 0) {
+        result = { kind: "fail", outcome: { kind: "invalid-package", packagePath, error: "package.json is missing a non-empty `name` field" } };
+      } else {
+        result = { kind: "ok", packageName: name };
+      }
+    } else {
+      result = { kind: "fail", outcome: { kind: "invalid-package", packagePath, error: parseError } };
+    }
+  }
+  return result;
+}
+async function loadScanSection(input) {
+  const { configPath, readFile, parseSection } = input;
+  const readResult = await readScanConfigRaw(configPath, readFile);
+  let result;
+  if (readResult.kind === "error") {
+    result = { kind: "fail", outcome: { kind: "invalid-scan-config", configPath, error: `failed to read config: ${readResult.error}` } };
+  } else if (readResult.kind === "enoent") {
+    result = { kind: "fail", outcome: { kind: "no-config", configPath } };
+  } else {
+    result = parseScanSectionFromRaw(readResult.raw, configPath, parseSection);
+  }
+  return result;
+}
+async function readScanConfigRaw(configPath, readFile) {
+  let result;
+  try {
+    const raw = await readFile(configPath);
+    result = { kind: "ok", raw };
+  } catch (err) {
+    const code = err?.code;
+    if (code === "ENOENT") {
+      result = { kind: "enoent" };
+    } else {
+      result = { kind: "error", error: err instanceof Error ? err.message : String(err) };
+    }
+  }
+  return result;
+}
+function parseScanSectionFromRaw(raw, configPath, parseSection) {
+  const jsonResult = parseJsonString(raw);
+  let result;
+  if (jsonResult.ok) {
+    const sectionResult = parseSection(jsonResult.value);
+    if (sectionResult.ok) {
+      result = { kind: "ok", section: sectionResult.section };
+    } else {
+      result = { kind: "fail", outcome: { kind: "invalid-scan-config", configPath, error: sectionResult.error } };
+    }
+  } else {
+    result = { kind: "fail", outcome: { kind: "invalid-scan-config", configPath, error: jsonResult.error } };
+  }
+  return result;
+}
+function parseJsonString(raw) {
+  let result;
+  try {
+    result = { ok: true, value: JSON.parse(raw) };
+  } catch (err) {
+    result = { ok: false, error: err instanceof Error ? err.message : String(err) };
+  }
+  return result;
+}
+async function buildScanProject(input) {
+  const { projectRoot, filePaths, readFile } = input;
+  const project = new Project({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
+  for (const relPath of filePaths) {
+    const absolute = resolvePath(projectRoot, relPath);
+    const text = await readFile(absolute);
+    project.createSourceFile(absolute, text, { overwrite: true });
+  }
+  return project;
+}
+function globToRegex(pattern) {
+  let body = "";
+  let index = 0;
+  while (index < pattern.length) {
+    const char = pattern[index];
+    if (char === "*" && pattern[index + 1] === "*") {
+      body += ".*";
+      index += 2;
+      if (pattern[index] === "/") {
+        index += 1;
+      }
+    } else if (char === "*") {
+      body += "[^/]*";
+      index += 1;
+    } else if (char === "?") {
+      body += "[^/]";
+      index += 1;
+    } else if (".+^${}()|[]\\".includes(char)) {
+      body += `\\${char}`;
+      index += 1;
+    } else {
+      body += char;
+      index += 1;
+    }
+  }
+  return new RegExp(`^${body}$`);
+}
 
 // packages/dbx-cli/firestore-indexes/src/model-firebase-index-schema.ts
 import { type } from "arktype";
@@ -596,6 +774,110 @@ var ModelFirebaseIndexManifest = type({
   entries: ModelFirebaseIndexEntry.array()
 });
 
+// packages/dbx-cli/firestore-indexes/src/model-firebase-index-package-manifests.ts
+var MODEL_FIREBASE_INDEX_MANIFEST_FILENAME_SUFFIX = ".model-firebase-index.mcp.generated.json";
+var BUNDLED_MODEL_FIREBASE_INDEX_MANIFEST_PACKAGE = "@dereekb/dbx-components-mcp";
+var BUNDLED_MANIFEST_DIRECTORY_NAME = "generated";
+var defaultBundledManifestDirectoryResolver = (cwd) => {
+  let result;
+  try {
+    const requireFromCwd = createRequire2(resolve3(cwd, "noop.js"));
+    const packageJsonPath = requireFromCwd.resolve(`${BUNDLED_MODEL_FIREBASE_INDEX_MANIFEST_PACKAGE}/package.json`);
+    result = resolve3(dirname4(packageJsonPath), BUNDLED_MANIFEST_DIRECTORY_NAME);
+  } catch {
+    result = null;
+  }
+  return result;
+};
+var defaultReadDir = (path) => nodeReadDir(path);
+async function loadModelFirebaseIndexPackageManifests(input) {
+  const { cwd, manifestPaths = [], discoverBundled = false, readFile = defaultReadFile, readDir = defaultReadDir, resolveBundledDirectory = defaultBundledManifestDirectoryResolver } = input;
+  const paths = manifestPaths.map((path) => resolve3(cwd, path));
+  let failure = null;
+  if (discoverBundled) {
+    const bundledDirectory = resolveBundledDirectory(cwd);
+    if (bundledDirectory == null) {
+      failure = { kind: "no-bundled-package", packageName: BUNDLED_MODEL_FIREBASE_INDEX_MANIFEST_PACKAGE };
+    } else {
+      paths.push(...await readBundledManifestPaths(bundledDirectory, readDir));
+    }
+  }
+  const loaded = [];
+  for (const path of paths) {
+    if (failure != null) {
+      break;
+    }
+    const readResult = await readManifestFile(path, readFile);
+    if (readResult.kind === "ok") {
+      loaded.push({ path, manifest: readResult.manifest });
+    } else {
+      failure = readResult.outcome;
+    }
+  }
+  return failure ?? { kind: "success", loaded };
+}
+function formatModelFirebaseIndexPackageManifestFailure(outcome) {
+  let result;
+  switch (outcome.kind) {
+    case "unreadable-manifest":
+      result = `could not read manifest at ${outcome.path} \u2014 ${outcome.error}`;
+      break;
+    case "invalid-manifest":
+      result = `manifest at ${outcome.path} failed validation \u2014 ${outcome.error}`;
+      break;
+    default:
+      result = `${outcome.packageName} is not installed, so no bundled index manifests could be discovered. Install it, or pass --manifest <path> explicitly.`;
+      break;
+  }
+  return result;
+}
+async function readBundledManifestPaths(directory, readDir) {
+  let result;
+  try {
+    const names = await readDir(directory);
+    result = names.filter((name) => name.endsWith(MODEL_FIREBASE_INDEX_MANIFEST_FILENAME_SUFFIX)).toSorted().map((name) => resolve3(directory, name));
+  } catch {
+    result = [];
+  }
+  return result;
+}
+async function readManifestFile(path, readFile) {
+  let raw = null;
+  let readError = null;
+  try {
+    raw = await readFile(path);
+  } catch (err) {
+    readError = err instanceof Error ? err.message : String(err);
+  }
+  let result;
+  if (raw == null) {
+    result = { kind: "fail", outcome: { kind: "unreadable-manifest", path, error: readError ?? "unknown error" } };
+  } else {
+    let parsed;
+    let parseError = null;
+    try {
+      parsed = JSON.parse(raw);
+    } catch (err) {
+      parseError = err instanceof Error ? err.message : String(err);
+    }
+    if (parseError == null) {
+      const validated = ModelFirebaseIndexManifest(parsed);
+      if (validated instanceof type2.errors) {
+        result = { kind: "fail", outcome: { kind: "invalid-manifest", path, error: validated.summary } };
+      } else {
+        result = { kind: "ok", manifest: validated };
+      }
+    } else {
+      result = { kind: "fail", outcome: { kind: "invalid-manifest", path, error: parseError } };
+    }
+  }
+  return result;
+}
+
+// packages/dbx-cli/firestore-indexes/src/model-firebase-index-build-manifest.ts
+import { relative, resolve as resolve4 } from "node:path";
+import { type as type4 } from "arktype";
+
 // packages/dbx-cli/firestore-indexes/src/model-firebase-index-analyze.ts
 var EQUALITY_OPERATORS = /* @__PURE__ */ new Set(["==", "in"]);
 var RANGE_OPERATORS = /* @__PURE__ */ new Set(["<", "<=", ">", ">=", "!=", "not-in"]);
@@ -1329,10 +1611,10 @@ function collectParams(decl, descriptions) {
   for (const param of params) {
     const name = param.getName();
     const typeNode = param.getTypeNode()?.getText();
-    const type4 = typeNode ?? param.getType().getText() ?? "unknown";
+    const type5 = typeNode ?? param.getType().getText() ?? "unknown";
     const description = descriptions.get(name) ?? "";
     const optional = param.isOptional() || param.hasInitializer();
-    out.push({ name, type: type4, description, optional });
+    out.push({ name, type: type5, description, optional });
   }
   return out;
 }
@@ -1879,178 +2161,34 @@ function toCamelCase(typeName) {
 }
 
 // packages/dbx-cli/firestore-indexes/src/model-firebase-index-scan-config-schema.ts
-import { type as type2 } from "arktype";
-var ModelFirebaseIndexScanSection = type2({
+import { type as type3 } from "arktype";
+var ModelFirebaseIndexScanSection = type3({
   "source?": "string",
   "module?": "string",
   include: "string[] >= 1",
   "exclude?": "string[]",
   "out?": "string"
 });
-var ModelFirebaseIndexScanConfig = type2({
+var ModelFirebaseIndexScanConfig = type3({
   version: "1",
   modelFirebaseIndex: ModelFirebaseIndexScanSection
 });
 var DEFAULT_MODEL_FIREBASE_INDEX_SCAN_OUT_PATH = "model-firebase-index.mcp.generated.json";
 var MODEL_FIREBASE_INDEX_SCAN_CONFIG_FILENAME = "dbx-mcp.scan.json";
 
-// packages/dbx-cli/src/lib/scan-helpers/scan-io.ts
-import { glob as fsGlob, readFile as nodeReadFile } from "node:fs/promises";
-import { resolve as resolvePath } from "node:path";
-import { Project } from "ts-morph";
-var defaultReadFile = (path) => nodeReadFile(path, "utf-8");
-var defaultGlobber = async (input) => {
-  const { projectRoot, include, exclude } = input;
-  const excludeMatchers = exclude.map(globToRegex);
-  const seen = /* @__PURE__ */ new Set();
-  const matches = [];
-  for (const pattern of include) {
-    for await (const match of fsGlob(pattern, { cwd: projectRoot })) {
-      if (excludeMatchers.some((rx) => rx.test(match))) {
-        continue;
-      }
-      if (!seen.has(match)) {
-        seen.add(match);
-        matches.push(match);
-      }
-    }
-  }
-  return matches;
-};
-async function loadPackageName(packagePath, readFile) {
-  let raw = null;
-  try {
-    raw = await readFile(packagePath);
-  } catch {
-    raw = null;
-  }
-  let result;
-  if (raw === null) {
-    result = { kind: "fail", outcome: { kind: "no-package", packagePath } };
-  } else {
-    let parsed;
-    let parseError = null;
-    try {
-      parsed = JSON.parse(raw);
-    } catch (err) {
-      parseError = err instanceof Error ? err.message : String(err);
-    }
-    if (parseError === null) {
-      const name = parsed?.name;
-      if (typeof name !== "string" || name.length === 0) {
-        result = { kind: "fail", outcome: { kind: "invalid-package", packagePath, error: "package.json is missing a non-empty `name` field" } };
-      } else {
-        result = { kind: "ok", packageName: name };
-      }
-    } else {
-      result = { kind: "fail", outcome: { kind: "invalid-package", packagePath, error: parseError } };
-    }
-  }
-  return result;
-}
-async function loadScanSection(input) {
-  const { configPath, readFile, parseSection } = input;
-  const readResult = await readScanConfigRaw(configPath, readFile);
-  let result;
-  if (readResult.kind === "error") {
-    result = { kind: "fail", outcome: { kind: "invalid-scan-config", configPath, error: `failed to read config: ${readResult.error}` } };
-  } else if (readResult.kind === "enoent") {
-    result = { kind: "fail", outcome: { kind: "no-config", configPath } };
-  } else {
-    result = parseScanSectionFromRaw(readResult.raw, configPath, parseSection);
-  }
-  return result;
-}
-async function readScanConfigRaw(configPath, readFile) {
-  let result;
-  try {
-    const raw = await readFile(configPath);
-    result = { kind: "ok", raw };
-  } catch (err) {
-    const code = err?.code;
-    if (code === "ENOENT") {
-      result = { kind: "enoent" };
-    } else {
-      result = { kind: "error", error: err instanceof Error ? err.message : String(err) };
-    }
-  }
-  return result;
-}
-function parseScanSectionFromRaw(raw, configPath, parseSection) {
-  const jsonResult = parseJsonString(raw);
-  let result;
-  if (jsonResult.ok) {
-    const sectionResult = parseSection(jsonResult.value);
-    if (sectionResult.ok) {
-      result = { kind: "ok", section: sectionResult.section };
-    } else {
-      result = { kind: "fail", outcome: { kind: "invalid-scan-config", configPath, error: sectionResult.error } };
-    }
-  } else {
-    result = { kind: "fail", outcome: { kind: "invalid-scan-config", configPath, error: jsonResult.error } };
-  }
-  return result;
-}
-function parseJsonString(raw) {
-  let result;
-  try {
-    result = { ok: true, value: JSON.parse(raw) };
-  } catch (err) {
-    result = { ok: false, error: err instanceof Error ? err.message : String(err) };
-  }
-  return result;
-}
-async function buildScanProject(input) {
-  const { projectRoot, filePaths, readFile } = input;
-  const project = new Project({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
-  for (const relPath of filePaths) {
-    const absolute = resolvePath(projectRoot, relPath);
-    const text = await readFile(absolute);
-    project.createSourceFile(absolute, text, { overwrite: true });
-  }
-  return project;
-}
-function globToRegex(pattern) {
-  let body = "";
-  let index = 0;
-  while (index < pattern.length) {
-    const char = pattern[index];
-    if (char === "*" && pattern[index + 1] === "*") {
-      body += ".*";
-      index += 2;
-      if (pattern[index] === "/") {
-        index += 1;
-      }
-    } else if (char === "*") {
-      body += "[^/]*";
-      index += 1;
-    } else if (char === "?") {
-      body += "[^/]";
-      index += 1;
-    } else if (".+^${}()|[]\\".includes(char)) {
-      body += `\\${char}`;
-      index += 1;
-    } else {
-      body += char;
-      index += 1;
-    }
-  }
-  return new RegExp(`^${body}$`);
-}
-
 // packages/dbx-cli/firestore-indexes/src/model-firebase-index-build-manifest.ts
 var DEFAULT_READ_FILE = defaultReadFile;
 var DEFAULT_GLOBBER = defaultGlobber;
 async function buildModelFirebaseIndexManifest(input) {
   const { projectRoot, generator, readFile = DEFAULT_READ_FILE, globber = DEFAULT_GLOBBER, now = () => /* @__PURE__ */ new Date() } = input;
-  const configPath = resolve2(projectRoot, MODEL_FIREBASE_INDEX_SCAN_CONFIG_FILENAME);
-  const packagePath = resolve2(projectRoot, "package.json");
+  const configPath = resolve4(projectRoot, MODEL_FIREBASE_INDEX_SCAN_CONFIG_FILENAME);
+  const packagePath = resolve4(projectRoot, "package.json");
   const configOutcome = await loadScanSection({
     configPath,
     readFile,
     parseSection: (parsed) => {
       const validated2 = ModelFirebaseIndexScanConfig(parsed);
-      if (validated2 instanceof type3.errors) {
+      if (validated2 instanceof type4.errors) {
         return { ok: false, error: validated2.summary };
       }
       return { ok: true, section: validated2.modelFirebaseIndex };
@@ -2096,10 +2234,10 @@ async function buildModelFirebaseIndexManifest(input) {
   };
   const validated = ModelFirebaseIndexManifest(manifest);
   let outcome;
-  if (validated instanceof type3.errors) {
+  if (validated instanceof type4.errors) {
     outcome = { kind: "invalid-manifest", error: validated.summary };
   } else {
-    const outPath = resolve2(projectRoot, scanSection.out ?? DEFAULT_MODEL_FIREBASE_INDEX_SCAN_OUT_PATH);
+    const outPath = resolve4(projectRoot, scanSection.out ?? DEFAULT_MODEL_FIREBASE_INDEX_SCAN_OUT_PATH);
     const entryFilePathsBySlug = /* @__PURE__ */ new Map();
     const dispatcherSummaries = [];
     for (const analyzedEntry of analyzed) {
@@ -2186,38 +2324,40 @@ async function findQueryEntries(input) {
   let result;
   if (outcome.kind === "success") {
     const dispatcherNames = new Set(outcome.dispatcherSummaries.map((x) => x.name));
-    const all = outcome.manifest.entries;
-    const kept = all.filter((x) => x.specOnly !== true);
-    result = {
-      kind: "success",
-      droppedSpecOnly: all.length - kept.length,
-      entries: kept.map((entry) => ({
-        slug: entry.slug,
-        name: entry.name,
-        module: entry.module,
-        subpath: entry.subpath,
-        model: entry.model,
-        collection: entry.collection,
-        isNested: entry.isNested,
-        scope: entry.scope,
-        signature: entry.signature,
-        params: entry.params.map((p) => ({ name: p.name, type: p.type, optional: p.optional, ...p.description ? { description: p.description } : {} })),
-        ...entry.description ? { description: entry.description } : {},
-        ...entry.category ? { category: entry.category } : {},
-        ...entry.tags.length > 0 ? { tags: entry.tags } : {},
-        ...entry.example ? { example: entry.example } : {},
-        ...entry.relatedSlugs && entry.relatedSlugs.length > 0 ? { relatedSlugs: entry.relatedSlugs } : {},
-        ...entry.manual ? { manual: true } : {},
-        ...entry.skip ? { skip: true } : {},
-        ...entry.excluded ? { excluded: true } : {},
-        ...dispatcherNames.has(entry.name) ? { dispatcher: true } : {}
-      }))
-    };
+    result = { kind: "success", ...collectQueryEntries({ entries: outcome.manifest.entries, dispatcherNames }) };
   } else {
     result = { kind: "failure", message: describeFailure(componentRoot, outcome) };
   }
   return result;
 }
+function collectQueryEntries(input) {
+  const { entries: all, dispatcherNames = /* @__PURE__ */ new Set() } = input;
+  const kept = all.filter((x) => x.specOnly !== true);
+  return {
+    droppedSpecOnly: all.length - kept.length,
+    entries: kept.map((entry) => ({
+      slug: entry.slug,
+      name: entry.name,
+      module: entry.module,
+      subpath: entry.subpath,
+      model: entry.model,
+      collection: entry.collection,
+      isNested: entry.isNested,
+      scope: entry.scope,
+      signature: entry.signature,
+      params: entry.params.map((p) => ({ name: p.name, type: p.type, optional: p.optional, ...p.description ? { description: p.description } : {} })),
+      ...entry.description ? { description: entry.description } : {},
+      ...entry.category ? { category: entry.category } : {},
+      ...entry.tags.length > 0 ? { tags: entry.tags } : {},
+      ...entry.example ? { example: entry.example } : {},
+      ...entry.relatedSlugs && entry.relatedSlugs.length > 0 ? { relatedSlugs: entry.relatedSlugs } : {},
+      ...entry.manual ? { manual: true } : {},
+      ...entry.skip ? { skip: true } : {},
+      ...entry.excluded ? { excluded: true } : {},
+      ...dispatcherNames.has(entry.name) ? { dispatcher: true } : {}
+    }))
+  };
+}
 function describeFailure(componentRoot, outcome) {
   let result;
   switch (outcome.kind) {
@@ -2240,12 +2380,32 @@ function describeFailure(componentRoot, outcome) {
   return result;
 }
 
+// packages/dbx-cli/firestore-query-manifest/src/find-package-query-entries.ts
+async function findPackageQueryEntries(input) {
+  const { cwd, loadManifests = loadModelFirebaseIndexPackageManifests } = input;
+  const outcome = await loadManifests({ cwd, discoverBundled: true });
+  let result;
+  if (outcome.kind === "success") {
+    const entries = [];
+    let droppedSpecOnly = 0;
+    for (const loaded of outcome.loaded) {
+      const collected = collectQueryEntries({ entries: loaded.manifest.entries });
+      entries.push(...collected.entries);
+      droppedSpecOnly += collected.droppedSpecOnly;
+    }
+    result = { kind: "success", entries, droppedSpecOnly, manifestPaths: outcome.loaded.map((x) => x.path) };
+  } else {
+    result = { kind: "failure", message: `[packages] ${formatModelFirebaseIndexPackageManifestFailure(outcome)}` };
+  }
+  return result;
+}
+
 // packages/dbx-cli/firestore-query-manifest/src/main.ts
 var WORKSPACE_ROOT = process.cwd();
 var GENERATOR = `@dereekb/dbx-cli-firestore-query-manifest@${package_default.version}`;
 async function main() {
   const flags = parseFlags(process.argv.slice(2));
-  if (flags.components.length === 0 || !flags.output) {
+  if (flags.components.length === 0 && !flags.packages || !flags.output) {
     printUsageAndExit();
     return;
   }
@@ -2268,6 +2428,22 @@ async function main() {
     collected.push(...bound.bound);
     warnings.push(...bound.warnings);
   }
+  let packageEntryCount = 0;
+  if (flags.packages) {
+    const found = await findPackageQueryEntries({ cwd: WORKSPACE_ROOT });
+    if (found.kind === "failure") {
+      console.error(found.message);
+      process.exit(1);
+      return;
+    }
+    droppedSpecOnly += found.droppedSpecOnly;
+    const collectedKeys = new Set(collected.map((x) => queryEntryKey(x.entry)));
+    const packageEntries = found.entries.filter((x) => !collectedKeys.has(queryEntryKey(x)));
+    const bound = bindPackageQueryFactories({ cwd: WORKSPACE_ROOT, entries: packageEntries });
+    collected.push(...bound.bound);
+    warnings.push(...bound.warnings);
+    packageEntryCount = packageEntries.length;
+  }
   for (const warning of warnings) {
     console.warn(warning);
   }
@@ -2295,7 +2471,7 @@ async function main() {
     console.log(`[${outcome}] ${relOutput}`);
   }
   const boundCount = collected.filter((x) => x.bound).length;
-  console.log(`Summary: ${flags.components.length} component(s) \xB7 ${collected.length} entries \xB7 ${boundCount} bound \xB7 ${collected.length - boundCount} unbound \xB7 ${droppedSpecOnly} spec-only dropped \xB7 rules: ${queryModes.summary}`);
+  console.log(`Summary: ${flags.components.length} component(s) \xB7 ${flags.packages ? `${packageEntryCount} package entries \xB7 ` : ""}${collected.length} entries \xB7 ${boundCount} bound \xB7 ${collected.length - boundCount} unbound \xB7 ${droppedSpecOnly} spec-only dropped \xB7 rules: ${queryModes.summary}`);
   if (flags.strict && boundCount < collected.length) {
     console.error(`[strict] ${collected.length - boundCount} factor(y|ies) failed to bind \u2014 failing build.`);
     process.exit(1);
@@ -2327,8 +2503,11 @@ function applyQueryModes(input) {
   }
   return result;
 }
+function queryEntryKey(entry) {
+  return `${entry.module}#${entry.name}`;
+}
 function resolveWorkspacePath(value) {
-  return isAbsolute2(value) ? value : resolve3(WORKSPACE_ROOT, value);
+  return isAbsolute2(value) ? value : resolve5(WORKSPACE_ROOT, value);
 }
 function deriveNamespace(projectName) {
   const base = (projectName ?? "cli").replaceAll(/[^a-zA-Z0-9]+/g, "_");
@@ -2339,10 +2518,13 @@ function parseFlags(argv) {
   let output;
   let project;
   let rules;
+  let packages = false;
   let strict = false;
   let check = false;
   for (const arg of argv) {
-    if (arg === "--strict") {
+    if (arg === "--packages") {
+      packages = true;
+    } else if (arg === "--strict") {
       strict = true;
     } else if (arg === "--check") {
       check = true;
@@ -2358,7 +2540,7 @@ function parseFlags(argv) {
       if (value) rules = value;
     }
   }
-  return { components, output, project, rules, strict, check };
+  return { components, packages, output, project, rules, strict, check };
 }
 function printUsageAndExit() {
   console.error(String.raw`generate-firestore-query-manifest
@@ -2366,12 +2548,16 @@ function printUsageAndExit() {
 Usage:
   node dist/packages/dbx-cli/firestore-query-manifest/main.js \
     --project=<name> \
-    --component=<component-dir> [--component=<component-dir> ...] \
+    [--component=<component-dir> ...] [--packages] \
     --output=<path-to-query.manifest.generated.ts> \
     [--rules=<path-to-firestore.rules>] [--strict] [--check]
 
 Required flags:
   --component=<dir>  A "-firebase" component root to scan. Repeatable.
+  --packages         Also merge the framework query manifests bundled in the installed
+                     @dereekb/dbx-components-mcp (e.g. the @dereekb/firebase notification queries),
+                     which a published package ships no scannable source for.
+                     At least one of --component / --packages is required.
   --output=<path>    Path to the manifest TS file to write (workspace-relative ok).
 
 Optional:

package/firestore-query-manifest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli-firestore-query-manifest",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
@@ -8,7 +8,7 @@
     "eslint": "10.9.1"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/util": "14.8.0"
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/util": "14.10.0"
   }
 }

package/generate-firestore-indexes/main.js

@@ -5,7 +5,7 @@ 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: "14.8.0",
+  version: "14.10.0",
   sideEffects: false,
   private: true,
   type: "module",
@@ -13,7 +13,7 @@ var package_default = {
     eslint: "10.9.1"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.8.0"
+    "@dereekb/dbx-cli": "14.10.0"
   }
 };
 

package/generate-firestore-indexes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli-generate-firestore-indexes",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
@@ -8,6 +8,6 @@
     "eslint": "10.9.1"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.8.0"
+    "@dereekb/dbx-cli": "14.10.0"
   }
 }

package/generate-mcp-manifest/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/dbx-cli-generate-mcp-manifest",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/model": "14.8.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/model": "14.10.0",
     "arktype": "^2.2.0",
     "jiti": "2.7.0"
   }

package/generate-route-manifest/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/dbx-cli-generate-route-manifest",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.8.0",
+    "@dereekb/dbx-cli": "14.10.0",
     "ts-morph": "^28.0.0"
   }
 }

package/lint-cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli-lint-cache",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
@@ -9,7 +9,7 @@
     "eslint": "10.9.1"
   },
   "peerDependencies": {
-    "@dereekb/util": "14.8.0",
+    "@dereekb/util": "14.10.0",
     "yargs": "^18.0.0"
   }
 }

package/manifest-extract/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@dereekb/dbx-cli/manifest-extract",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "type": "module",
   "sideEffects": false,
   "peerDependencies": {
-    "@dereekb/date": "14.8.0",
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/firebase": "14.8.0",
-    "@dereekb/model": "14.8.0",
-    "@dereekb/nestjs": "14.8.0",
-    "@dereekb/oauth-resource": "14.8.0",
-    "@dereekb/rxjs": "14.8.0",
-    "@dereekb/util": "14.8.0",
+    "@dereekb/date": "14.10.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/firebase": "14.10.0",
+    "@dereekb/model": "14.10.0",
+    "@dereekb/nestjs": "14.10.0",
+    "@dereekb/oauth-resource": "14.10.0",
+    "@dereekb/rxjs": "14.10.0",
+    "@dereekb/util": "14.10.0",
     "ts-morph": "^28.0.0"
   },
   "devDependencies": {
-    "@dereekb/firebase": "14.8.0"
+    "@dereekb/firebase": "14.10.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/model-test/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dereekb/dbx-cli/model-test",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "type": "module",
   "sideEffects": false,
   "peerDependencies": {
-    "@dereekb/util": "14.8.0",
+    "@dereekb/util": "14.10.0",
     "ts-morph": "^28.0.0"
   },
   "exports": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "type": "module",
   "sideEffects": false,
   "bin": {
@@ -66,12 +66,12 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/date": "14.8.0",
-    "@dereekb/firebase": "14.8.0",
-    "@dereekb/model": "14.8.0",
-    "@dereekb/nestjs": "14.8.0",
-    "@dereekb/oauth-resource": "14.8.0",
-    "@dereekb/util": "14.8.0",
+    "@dereekb/date": "14.10.0",
+    "@dereekb/firebase": "14.10.0",
+    "@dereekb/model": "14.10.0",
+    "@dereekb/nestjs": "14.10.0",
+    "@dereekb/oauth-resource": "14.10.0",
+    "@dereekb/util": "14.10.0",
     "@nestjs/common": "^12.0.1",
     "arktype": "^2.2.0",
     "firebase": "^12.18.0",

package/route/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@dereekb/dbx-cli/route",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "type": "module",
   "sideEffects": false,
   "peerDependencies": {
-    "@dereekb/date": "14.8.0",
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/firebase": "14.8.0",
-    "@dereekb/model": "14.8.0",
-    "@dereekb/nestjs": "14.8.0",
-    "@dereekb/oauth-resource": "14.8.0",
-    "@dereekb/util": "14.8.0"
+    "@dereekb/date": "14.10.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/firebase": "14.10.0",
+    "@dereekb/model": "14.10.0",
+    "@dereekb/nestjs": "14.10.0",
+    "@dereekb/oauth-resource": "14.10.0",
+    "@dereekb/util": "14.10.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/test/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@dereekb/dbx-cli/test",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "sideEffects": false,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/date": "14.8.0",
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/firebase": "14.8.0",
-    "@dereekb/firebase-server/test": "14.7.0",
-    "@dereekb/model": "14.8.0",
-    "@dereekb/nestjs": "14.8.0",
-    "@dereekb/oauth-resource": "14.8.0",
-    "@dereekb/rxjs": "14.8.0",
-    "@dereekb/util": "14.8.0",
+    "@dereekb/date": "14.10.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/firebase": "14.10.0",
+    "@dereekb/firebase-server/test": "14.9.0",
+    "@dereekb/model": "14.10.0",
+    "@dereekb/nestjs": "14.10.0",
+    "@dereekb/oauth-resource": "14.10.0",
+    "@dereekb/rxjs": "14.10.0",
+    "@dereekb/util": "14.10.0",
     "@nestjs/common": "^12.0.1",
     "arktype": "^2.2.0",
     "vitest": "4.1.11",

package/validate/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/dbx-cli/validate",
-  "version": "14.8.0",
+  "version": "14.10.0",
   "type": "module",
   "sideEffects": false,
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.8.0",
-    "@dereekb/util": "14.8.0",
+    "@dereekb/dbx-cli": "14.10.0",
+    "@dereekb/util": "14.10.0",
     "ts-morph": "^28.0.0"
   }
 }