@dereekb/dbx-cli 13.15.0 → 13.17.0

package/firebase-api-manifest/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dereekb/dbx-cli-firebase-api-manifest",
-  "version": "13.15.0",
+  "version": "13.17.0",
   "private": true,
   "type": "module",
   "devDependencies": {
     "ts-morph": "^21.0.0"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "13.15.0",
-    "@dereekb/util": "13.15.0",
+    "@dereekb/dbx-cli": "13.17.0",
+    "@dereekb/util": "13.17.0",
     "prettier": "3.8.3"
   }
 }

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.15.0",
+  version: "13.17.0",
   private: true,
   type: "module",
   devDependencies: {
     eslint: "10.4.0"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "13.15.0"
+    "@dereekb/dbx-cli": "13.17.0"
   }
 };
 
@@ -2109,38 +2109,51 @@ function parseArgv(argv) {
   return { component, output, check, json, help, error };
 }
 async function readExistingIndexes(input) {
+  const text = await readExistingIndexesText(input);
+  let result2;
+  if (text !== void 0) {
+    result2 = parseExistingIndexesJson(text, input.outputAbs, input.stderr);
+  }
+  return result2;
+}
+async function readExistingIndexesText(input) {
   const { outputAbs, readFile, stderr } = input;
-  let text = null;
-  let readFailed = false;
+  let text;
   try {
     text = await readFile(outputAbs);
   } catch (err) {
-    readFailed = true;
     const code = err.code;
     if (code !== "ENOENT") {
       stderr(`generate-firestore-indexes: could not read existing ${outputAbs}: ${err instanceof Error ? err.message : String(err)}`);
     }
+    text = void 0;
   }
+  return text;
+}
+function parseExistingIndexesJson(text, outputAbs, stderr) {
   let result2;
-  if (!readFailed && text !== null) {
-    let parsed;
-    let parseFailed = false;
-    try {
-      parsed = JSON.parse(text);
-    } catch (err) {
-      parseFailed = true;
-      stderr(`generate-firestore-indexes: existing ${outputAbs} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
-    }
-    if (!parseFailed) {
-      if (parsed === null || typeof parsed !== "object") {
-        stderr(`generate-firestore-indexes: existing ${outputAbs} top-level value is not an object`);
-      } else {
-        const raw = parsed;
-        const indexes = Array.isArray(raw.indexes) ? raw.indexes : [];
-        const fieldOverrides = Array.isArray(raw.fieldOverrides) ? raw.fieldOverrides : [];
-        result2 = { indexes, fieldOverrides };
-      }
-    }
+  let parsed;
+  let parseFailed = false;
+  try {
+    parsed = JSON.parse(text);
+  } catch (err) {
+    parseFailed = true;
+    stderr(`generate-firestore-indexes: existing ${outputAbs} is not valid JSON: ${err instanceof Error ? err.message : String(err)}`);
+  }
+  if (!parseFailed) {
+    result2 = coerceFirestoreIndexesJson(parsed, outputAbs, stderr);
+  }
+  return result2;
+}
+function coerceFirestoreIndexesJson(parsed, outputAbs, stderr) {
+  let result2;
+  if (parsed === null || typeof parsed !== "object") {
+    stderr(`generate-firestore-indexes: existing ${outputAbs} top-level value is not an object`);
+  } else {
+    const raw = parsed;
+    const indexes = Array.isArray(raw.indexes) ? raw.indexes : [];
+    const fieldOverrides = Array.isArray(raw.fieldOverrides) ? raw.fieldOverrides : [];
+    result2 = { indexes, fieldOverrides };
   }
   return result2;
 }

package/generate-firestore-indexes/package.json

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

package/generate-mcp-manifest/main.js

@@ -725,9 +725,7 @@ var EMPTY_ROLE_CONST_RESOLUTION = { roles: [], unresolved: [] };
 function resolveRoleConstByName(name, ctx) {
   let result;
   const scalar = ctx.knownRoles.get(name);
-  if (scalar !== void 0) {
-    result = { roles: [scalar], unresolved: [] };
-  } else {
+  if (scalar === void 0) {
     const arrayExpr = ctx.localArrayRoles.get(name);
     if (arrayExpr === void 0) {
       result = { roles: [], unresolved: [name] };
@@ -738,6 +736,8 @@ function resolveRoleConstByName(name, ctx) {
       nextSeen.add(name);
       result = resolveRoleArrayLiteral(arrayExpr, { ...ctx, seen: nextSeen });
     }
+  } else {
+    result = { roles: [scalar], unresolved: [] };
   }
   return result;
 }
@@ -1015,53 +1015,67 @@ function renderMcpManifest(input, now = /* @__PURE__ */ new Date()) {
   const warnings = [];
   const errors = [];
   const seenNames = /* @__PURE__ */ new Map();
+  const segments = buildSegmentMap(input.modelManifest);
+  const toolEntries = input.apiManifest.filter((entry) => entry.verb !== "standalone");
+  const nameCounts = countToolNames(toolEntries, segments);
+  for (const entry of toolEntries) {
+    registerToolEntry({ entry, segments, nameCounts, tools, seenNames, warnings, errors });
+  }
+  const models = input.modelManifest != null && input.modelManifest.length > 0 ? input.modelManifest.map(projectModelEntry) : void 0;
+  const enums = input.enumManifest != null && Object.keys(input.enumManifest).length > 0 ? input.enumManifest : void 0;
+  const auth = input.auth == null ? void 0 : projectAuthSection(input.auth.registry, input.auth.app);
+  const base = { version: MCP_MANIFEST_VERSION, generatedAt: now.toISOString(), tools };
+  const manifest = {
+    ...base,
+    ...models == null ? {} : { models },
+    ...enums == null ? {} : { enums },
+    ...auth == null ? {} : { auth }
+  };
+  return { manifest, warnings, errors };
+}
+function buildSegmentMap(modelManifest) {
   const segments = /* @__PURE__ */ new Map();
-  if (input.modelManifest != null) {
-    for (const model of input.modelManifest) {
+  if (modelManifest != null) {
+    for (const model of modelManifest) {
       if (model.mcpToolNameSegment != null && model.mcpToolNameSegment.length > 0) {
         segments.set(model.modelType, model.mcpToolNameSegment);
       }
     }
   }
-  const toolEntries = input.apiManifest.filter((entry) => entry.verb !== "standalone");
+  return segments;
+}
+function countToolNames(toolEntries, segments) {
   const nameCounts = /* @__PURE__ */ new Map();
   for (const entry of toolEntries) {
     const segment = segments.get(entry.model) ?? entry.model;
     const baseName = buildMcpToolName(segment, entry.verb, entry.specifier);
     nameCounts.set(baseName, (nameCounts.get(baseName) ?? 0) + 1);
   }
-  for (const entry of toolEntries) {
-    const key = mcpManifestKey(entry.model, entry.verb, entry.specifier);
-    tools[key] = buildToolEntry(entry);
-    const segment = segments.get(entry.model) ?? entry.model;
-    const baseName = buildMcpToolName(segment, entry.verb, entry.specifier);
-    const clashes = (nameCounts.get(baseName) ?? 0) > 1;
-    const toolName = clashes ? buildDisambiguatedMcpToolName(segment, entry.verb, entry.specifier) : baseName;
-    if (toolName !== baseName) {
-      warnings.push(`Tool name "${baseName}" is produced by more than one entry; re-derived as "${toolName}" (${key}) with the abbreviated call type to disambiguate.`);
-    }
-    const validation = validateMcpToolName(toolName);
-    if (validation.level === "error") {
-      errors.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_MAX_LENGTH}-char MCP cap (${key}). Shorten the model/specifier, set a per-model mcpToolNameSegment, or hide the tool.`);
-    } else if (validation.level === "warn") {
-      warnings.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_WARN_LENGTH}-char soft limit (${key}).`);
-    }
-    const priorKey = seenNames.get(toolName);
-    if (priorKey != null) {
-      warnings.push(`Tool name "${toolName}" is still produced by more than one entry (${priorKey} and ${key}) after disambiguation; one shadows the other unless hidden or renamed at runtime.`);
-    } else {
-      seenNames.set(toolName, key);
-    }
+  return nameCounts;
+}
+function registerToolEntry(input) {
+  const { entry, segments, nameCounts, tools, seenNames, warnings, errors } = input;
+  const key = mcpManifestKey(entry.model, entry.verb, entry.specifier);
+  tools[key] = buildToolEntry(entry);
+  const segment = segments.get(entry.model) ?? entry.model;
+  const baseName = buildMcpToolName(segment, entry.verb, entry.specifier);
+  const clashes = (nameCounts.get(baseName) ?? 0) > 1;
+  const toolName = clashes ? buildDisambiguatedMcpToolName(segment, entry.verb, entry.specifier) : baseName;
+  if (toolName !== baseName) {
+    warnings.push(`Tool name "${baseName}" is produced by more than one entry; re-derived as "${toolName}" (${key}) with the abbreviated call type to disambiguate.`);
+  }
+  const validation = validateMcpToolName(toolName);
+  if (validation.level === "error") {
+    errors.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_MAX_LENGTH}-char MCP cap (${key}). Shorten the model/specifier, set a per-model mcpToolNameSegment, or hide the tool.`);
+  } else if (validation.level === "warn") {
+    warnings.push(`Tool name "${toolName}" is ${validation.length} chars, over the ${MCP_TOOL_NAME_WARN_LENGTH}-char soft limit (${key}).`);
+  }
+  const priorKey = seenNames.get(toolName);
+  if (priorKey == null) {
+    seenNames.set(toolName, key);
+  } else {
+    warnings.push(`Tool name "${toolName}" is still produced by more than one entry (${priorKey} and ${key}) after disambiguation; one shadows the other unless hidden or renamed at runtime.`);
   }
-  const models = input.modelManifest != null && input.modelManifest.length > 0 ? input.modelManifest.map(projectModelEntry) : void 0;
-  const auth = input.auth == null ? void 0 : projectAuthSection(input.auth.registry, input.auth.app);
-  const base = { version: MCP_MANIFEST_VERSION, generatedAt: now.toISOString(), tools };
-  const manifest = {
-    ...base,
-    ...models == null ? {} : { models },
-    ...auth == null ? {} : { auth }
-  };
-  return { manifest, warnings, errors };
 }
 function projectAuthSection(registry, appSlug) {
   const primary = registry.findApp(appSlug);
@@ -1300,8 +1314,9 @@ Expected output of \`nx run <cli>:generate-api-manifest\`.`);
   writeFileSync(tmpPath, serialized);
   renameSync(tmpPath, outputPath);
   const modelCount = manifest.models?.length ?? 0;
+  const enumCount = manifest.enums == null ? 0 : Object.keys(manifest.enums).length;
   const authCount = manifest.auth?.claims.length ?? 0;
-  console.log(`[wrote] ${relative2(WORKSPACE_ROOT, outputPath)} \u2014 ${Object.keys(manifest.tools).length} tools, ${modelCount} models, ${authCount} auth claims`);
+  console.log(`[wrote] ${relative2(WORKSPACE_ROOT, outputPath)} \u2014 ${Object.keys(manifest.tools).length} tools, ${modelCount} models, ${enumCount} enums, ${authCount} auth claims`);
 }
 async function maybeLoadAuth(flags) {
   if (flags.app == null || flags.claimsInputs.length === 0) {
@@ -1330,7 +1345,10 @@ async function loadManifest(path) {
   const namedModel = Object.entries(loaded).find(([key]) => key.endsWith("_MODEL_MANIFEST"));
   const modelManifestValue = namedModel?.[1];
   const modelManifest = Array.isArray(modelManifestValue) ? modelManifestValue : void 0;
-  return { apiManifest, modelManifest };
+  const namedEnum = Object.entries(loaded).find(([key]) => key.endsWith("_ENUM_MANIFEST"));
+  const enumManifestValue = namedEnum?.[1];
+  const enumManifest = enumManifestValue != null && typeof enumManifestValue === "object" && !Array.isArray(enumManifestValue) ? enumManifestValue : void 0;
+  return { apiManifest, modelManifest, enumManifest };
 }
 function loadTsconfigPathAliases() {
   const tsconfigPath = resolve(WORKSPACE_ROOT, "tsconfig.base.json");

package/generate-mcp-manifest/package.json

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