@dereekb/dbx-cli 13.15.0 → 13.17.0

package/firebase-api-manifest/main.js

@@ -284,29 +284,20 @@ function findFunctionsClassName(sourceFile) {
   return result;
 }
 function inferGroupName(sourceFile) {
+  return findTypeAliasStem(sourceFile, "ModelCrudFunctionsConfig") ?? findTypeAliasStem(sourceFile, "FunctionTypeMap");
+}
+function findTypeAliasStem(sourceFile, ending) {
   let result;
   for (const alias of sourceFile.getTypeAliases()) {
     const name = alias.getName();
-    if (name.endsWith("ModelCrudFunctionsConfig")) {
-      const stem = name.slice(0, -"ModelCrudFunctionsConfig".length);
+    if (name.endsWith(ending)) {
+      const stem = name.slice(0, -ending.length);
       if (stem.length > 0) {
         result = stem;
         break;
       }
     }
   }
-  if (result === void 0) {
-    for (const alias of sourceFile.getTypeAliases()) {
-      const name = alias.getName();
-      if (name.endsWith("FunctionTypeMap")) {
-        const stem = name.slice(0, -"FunctionTypeMap".length);
-        if (stem.length > 0) {
-          result = stem;
-          break;
-        }
-      }
-    }
-  }
   return result;
 }
 function isNullLiteralType(node) {
@@ -402,44 +393,44 @@ function typeNodeName(node) {
   return result;
 }
 function readTypeDocs(sourceFile, typeName) {
-  let result;
   const interfaceDecl = sourceFile.getInterface(typeName);
+  let result;
   if (interfaceDecl) {
-    const typeDescription = readJsDocSummary(interfaceDecl);
-    const hasApiParamsTag = hasJsDocFlag(interfaceDecl, "dbxModelApiParams");
-    const fields = [];
-    for (const property of interfaceDecl.getProperties()) {
-      const fieldName = property.getName();
-      const description = readJsDocSummary(property);
-      const typeNode = property.getTypeNode();
-      const typeText = typeNode?.getText().trim() ?? "";
-      const adminOnly = hasJsDocFlag(property, "dbxModelApiAdminOnly");
-      const field = {
-        name: fieldName,
-        typeText,
-        ...description ? { description } : {},
-        ...adminOnly ? { accessLevel: "adminOnly" } : {}
-      };
-      fields.push(field);
-    }
-    if (typeDescription || fields.length > 0 || hasApiParamsTag) {
-      result = {
-        ...typeDescription ? { typeDescription } : {},
-        ...fields.length > 0 ? { fields } : {},
-        hasApiParamsTag
-      };
-    }
+    result = readInterfaceTypeDocs(interfaceDecl);
   } else {
     const typeAlias = sourceFile.getTypeAlias(typeName);
-    if (typeAlias) {
-      const typeDescription = readJsDocSummary(typeAlias);
-      if (typeDescription) {
-        result = { typeDescription };
-      }
-    }
+    result = typeAlias ? readTypeAliasDocs(typeAlias) : void 0;
+  }
+  return result;
+}
+function readInterfaceTypeDocs(interfaceDecl) {
+  const typeDescription = readJsDocSummary(interfaceDecl);
+  const hasApiParamsTag = hasJsDocFlag(interfaceDecl, "dbxModelApiParams");
+  const fields = interfaceDecl.getProperties().map((property) => readInterfaceField(property));
+  let result;
+  if (typeDescription || fields.length > 0 || hasApiParamsTag) {
+    result = {
+      ...typeDescription ? { typeDescription } : {},
+      ...fields.length > 0 ? { fields } : {},
+      hasApiParamsTag
+    };
   }
   return result;
 }
+function readInterfaceField(property) {
+  const description = readJsDocSummary(property);
+  const adminOnly = hasJsDocFlag(property, "dbxModelApiAdminOnly");
+  return {
+    name: property.getName(),
+    typeText: property.getTypeNode()?.getText().trim() ?? "",
+    ...description ? { description } : {},
+    ...adminOnly ? { accessLevel: "adminOnly" } : {}
+  };
+}
+function readTypeAliasDocs(typeAlias) {
+  const typeDescription = readJsDocSummary(typeAlias);
+  return typeDescription ? { typeDescription } : void 0;
+}
 function hasJsDocFlag(node, tagName) {
   let result = false;
   for (const doc of node.getJsDocs()) {
@@ -468,8 +459,8 @@ function readJsDocTagValue(node, tagName) {
 function readJsDocSummary(node) {
   let result;
   const docs = node.getJsDocs();
-  if (docs.length > 0) {
-    const last = docs[docs.length - 1];
+  const last = docs.at(-1);
+  if (last) {
     const description = last.getDescription().trim();
     if (description.length > 0) {
       result = description;
@@ -478,14 +469,92 @@ function readJsDocSummary(node) {
   return result;
 }
 
+// packages/util/src/lib/string/sort.ts
+var compareStrings = (a, b) => a.localeCompare(b);
+
+// packages/dbx-cli/src/lib/scan-helpers/firestore-model-extract-utils.ts
+import { Node as Node3 } from "ts-morph";
+var PASSTHROUGH_TYPE_WRAPPERS = /* @__PURE__ */ new Set(["Partial", "Required", "Readonly", "NonNullable", "MaybeMap", "Pick", "Omit"]);
+function parseFirestoreModelIdentityArgs(args) {
+  let result;
+  if (args.length === 1) {
+    const modelType = stringLiteralValue(args[0]);
+    if (modelType !== void 0) {
+      result = { modelType, collectionPrefix: void 0, parentIdentityConst: void 0 };
+    }
+  } else if (args.length === 2) {
+    const first = stringLiteralValue(args[0]);
+    if (first === void 0) {
+      const modelType = stringLiteralValue(args[1]);
+      if (modelType !== void 0) {
+        result = { modelType, collectionPrefix: void 0, parentIdentityConst: identifierName(args[0]) };
+      }
+    } else {
+      result = { modelType: first, collectionPrefix: stringLiteralValue(args[1]), parentIdentityConst: void 0 };
+    }
+  } else if (args.length >= 3) {
+    const modelType = stringLiteralValue(args[1]);
+    if (modelType !== void 0) {
+      result = { modelType, collectionPrefix: stringLiteralValue(args[2]), parentIdentityConst: identifierName(args[0]) };
+    }
+  }
+  return result;
+}
+function resolveExtendsName(expr) {
+  const head = expr.getExpression().getText();
+  let result = head;
+  if (PASSTHROUGH_TYPE_WRAPPERS.has(head)) {
+    const typeArgs = expr.getTypeArguments();
+    if (typeArgs.length > 0) {
+      const peeled = peelTypeNode(typeArgs[0]);
+      if (peeled !== void 0) {
+        result = peeled;
+      }
+    }
+  }
+  return result;
+}
+function peelTypeNode(node) {
+  let current = node;
+  while (Node3.isParenthesizedTypeNode(current)) {
+    current = current.getTypeNode();
+  }
+  let result;
+  if (Node3.isTypeReference(current)) {
+    const name = current.getTypeName().getText();
+    if (PASSTHROUGH_TYPE_WRAPPERS.has(name)) {
+      const inner = current.getTypeArguments();
+      if (inner.length > 0) {
+        result = peelTypeNode(inner[0]);
+      }
+    } else {
+      result = name;
+    }
+  }
+  return result;
+}
+function stringLiteralValue(node) {
+  let result;
+  if (Node3.isStringLiteral(node) || Node3.isNoSubstitutionTemplateLiteral(node)) {
+    result = node.getLiteralText();
+  }
+  return result;
+}
+function identifierName(node) {
+  let result;
+  if (Node3.isIdentifier(node)) {
+    result = node.getText();
+  }
+  return result;
+}
+
 // packages/dbx-cli/manifest-extract/src/lib/extract-models.ts
-import { Node as Node3, Project as Project3 } from "ts-morph";
+import { Node as Node4, Project as Project3 } from "ts-morph";
 var READ_LEVEL_VALUES = /* @__PURE__ */ new Set(["system", "owner", "admin-only", "permissions"]);
 var SERVICE_FACTORY_TAG = "dbxModelServiceFactory";
 var MCP_TOOL_NAME_SEGMENT_TAG = "dbxModelMcpToolNameSegment";
 var MODEL_TYPE_VALUE_PATTERN = /^[a-z][A-Za-z0-9_$]*$/;
 var TOOL_NAME_SEGMENT_PATTERN = /^[A-Za-z][A-Za-z0-9_$]*$/;
-var PASSTHROUGH_TYPE_WRAPPERS = /* @__PURE__ */ new Set(["Partial", "Required", "Readonly", "NonNullable", "MaybeMap", "Pick", "Omit"]);
 var IDENTITY_FN = "firestoreModelIdentity";
 var CONVERTER_FN_NAMES = ["snapshotConverterFunctions", "firestoreSubObject", "firestoreObjectArray"];
 var SUB_OBJECT_FN = "firestoreSubObject";
@@ -493,6 +562,7 @@ var OBJECT_ARRAY_FN = "firestoreObjectArray";
 var SNAPSHOT_FN = "snapshotConverterFunctions";
 var FIELDS_LITERAL_KEY = "fields";
 var OBJECT_FIELD_KEY = "objectField";
+var FIRESTORE_FIELD_KEY = "firestoreField";
 function extractModelsFromSource(input) {
   const project = new Project3({ useInMemoryFileSystem: true, skipAddingFilesFromTsConfig: true });
   const sourceFile = project.createSourceFile(input.name, input.text, { overwrite: true });
@@ -510,9 +580,9 @@ function readIdentities(sourceFile) {
     if (!statement.isExported()) continue;
     for (const decl of statement.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node3.isCallExpression(initializer)) continue;
+      if (!initializer || !Node4.isCallExpression(initializer)) continue;
       if (initializer.getExpression().getText() !== IDENTITY_FN) continue;
-      const parsed = parseIdentityArgs(initializer);
+      const parsed = parseFirestoreModelIdentityArgs(initializer.getArguments());
       if (parsed) {
         out.push({ identityConst: decl.getName(), ...parsed });
       }
@@ -520,32 +590,6 @@ function readIdentities(sourceFile) {
   }
   return out;
 }
-function parseIdentityArgs(call) {
-  const args = call.getArguments();
-  let result;
-  if (args.length === 1) {
-    const modelType = stringLiteralValue(args[0]);
-    if (modelType !== void 0) {
-      result = { modelType, collectionPrefix: void 0, parentIdentityConst: void 0 };
-    }
-  } else if (args.length === 2) {
-    const first = stringLiteralValue(args[0]);
-    if (first === void 0) {
-      const modelType = stringLiteralValue(args[1]);
-      if (modelType !== void 0) {
-        result = { modelType, collectionPrefix: void 0, parentIdentityConst: identifierName(args[0]) };
-      }
-    } else {
-      result = { modelType: first, collectionPrefix: stringLiteralValue(args[1]), parentIdentityConst: void 0 };
-    }
-  } else if (args.length >= 3) {
-    const modelType = stringLiteralValue(args[1]);
-    if (modelType !== void 0) {
-      result = { modelType, collectionPrefix: stringLiteralValue(args[2]), parentIdentityConst: identifierName(args[0]) };
-    }
-  }
-  return result;
-}
 function readInterfaces(sourceFile) {
   const out = [];
   for (const decl of sourceFile.getInterfaces()) {
@@ -646,46 +690,13 @@ function readServiceFactoryModelType(jsDocs) {
   }
   return result;
 }
-function resolveExtendsName(expr) {
-  const head = expr.getExpression().getText();
-  let result = head;
-  if (PASSTHROUGH_TYPE_WRAPPERS.has(head)) {
-    const typeArgs = expr.getTypeArguments();
-    if (typeArgs.length > 0) {
-      const peeled = peelTypeNode(typeArgs[0]);
-      if (peeled !== void 0) {
-        result = peeled;
-      }
-    }
-  }
-  return result;
-}
-function peelTypeNode(node) {
-  let current = node;
-  while (Node3.isParenthesizedTypeNode(current)) {
-    current = current.getTypeNode();
-  }
-  let result;
-  if (Node3.isTypeReference(current)) {
-    const name = current.getTypeName().getText();
-    if (PASSTHROUGH_TYPE_WRAPPERS.has(name)) {
-      const inner = current.getTypeArguments();
-      if (inner.length > 0) {
-        result = peelTypeNode(inner[0]);
-      }
-    } else {
-      result = name;
-    }
-  }
-  return result;
-}
 function readConverters(sourceFile) {
   const out = [];
   for (const statement of sourceFile.getVariableStatements()) {
     if (!statement.isExported()) continue;
     for (const decl of statement.getDeclarations()) {
       const initializer = decl.getInitializer();
-      if (!initializer || !Node3.isCallExpression(initializer)) continue;
+      if (!initializer || !Node4.isCallExpression(initializer)) continue;
       const factory = initializer.getExpression().getText();
       if (!isConverterFactoryName(factory)) continue;
       const interfaceName = readGenericInterfaceName(initializer);
@@ -719,13 +730,13 @@ function readConverterFields(call) {
   let result;
   if (args.length > 0) {
     const config = args[0];
-    if (Node3.isObjectLiteralExpression(config)) {
+    if (Node4.isObjectLiteralExpression(config)) {
       let fieldsLiteral;
       if (fnName === SNAPSHOT_FN) {
         fieldsLiteral = readObjectProperty(config, FIELDS_LITERAL_KEY);
       } else {
         const objectField = readPropertyValue(config, OBJECT_FIELD_KEY);
-        if (objectField && Node3.isObjectLiteralExpression(objectField)) {
+        if (objectField && Node4.isObjectLiteralExpression(objectField)) {
           fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
         }
       }
@@ -739,7 +750,7 @@ function readConverterFields(call) {
 function readFieldEntries(fields) {
   const out = [];
   for (const property of fields.getProperties()) {
-    if (Node3.isPropertyAssignment(property)) {
+    if (Node4.isPropertyAssignment(property)) {
       const initializer = property.getInitializer();
       const converterText = initializer ? initializer.getText().replaceAll(/\s+/g, " ").trim() : "";
       const nested = initializer ? readNestedFromExpression(initializer) : void 0;
@@ -750,7 +761,7 @@ function readFieldEntries(fields) {
         nestedConverterInline: nested?.inline,
         nestedIsArray: nested?.isArray
       });
-    } else if (Node3.isShorthandPropertyAssignment(property)) {
+    } else if (Node4.isShorthandPropertyAssignment(property)) {
       const name = property.getName();
       out.push({ key: name, converter: name });
     }
@@ -759,54 +770,69 @@ function readFieldEntries(fields) {
 }
 function readNestedFromExpression(expr) {
   let result;
-  if (Node3.isCallExpression(expr)) {
+  if (Node4.isCallExpression(expr)) {
     const fnName = expr.getExpression().getText();
     if (fnName === SUB_OBJECT_FN || fnName === OBJECT_ARRAY_FN) {
-      const args = expr.getArguments();
-      if (args.length > 0) {
-        const config = args[0];
-        if (Node3.isObjectLiteralExpression(config)) {
-          const objectField = readPropertyValue(config, OBJECT_FIELD_KEY);
-          if (objectField) {
-            const isArray = fnName === OBJECT_ARRAY_FN;
-            if (Node3.isIdentifier(objectField)) {
-              result = { ref: objectField.getText(), isArray };
-            } else if (Node3.isObjectLiteralExpression(objectField)) {
-              const fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
-              if (fieldsLiteral) {
-                const inlineFields = readFieldEntries(fieldsLiteral);
-                result = {
-                  inline: {
-                    converterConst: void 0,
-                    factory: fnName,
-                    interfaceName: readGenericInterfaceName(expr),
-                    fields: inlineFields,
-                    line: expr.getStartLineNumber()
-                  },
-                  isArray
-                };
-              }
-            }
-          }
-        }
+      result = readNestedConverterCall(expr, fnName);
+    }
+  }
+  return result;
+}
+function readNestedConverterCall(call, fnName) {
+  let result;
+  const args = call.getArguments();
+  if (args.length > 0) {
+    const config = args[0];
+    if (Node4.isObjectLiteralExpression(config)) {
+      const valueNode = readPropertyValue(config, OBJECT_FIELD_KEY) ?? readPropertyValue(config, FIRESTORE_FIELD_KEY);
+      if (valueNode) {
+        result = buildNestedConverterMatch({ objectField: valueNode, call, fnName });
       }
     }
   }
   return result;
 }
+function buildNestedConverterMatch(input) {
+  const { objectField, call, fnName } = input;
+  const isArray = fnName === OBJECT_ARRAY_FN;
+  let result;
+  if (Node4.isIdentifier(objectField)) {
+    result = { ref: objectField.getText(), isArray };
+  } else if (Node4.isObjectLiteralExpression(objectField)) {
+    const fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
+    if (fieldsLiteral) {
+      result = {
+        inline: {
+          converterConst: void 0,
+          factory: fnName,
+          interfaceName: readGenericInterfaceName(call),
+          fields: readFieldEntries(fieldsLiteral),
+          line: call.getStartLineNumber()
+        },
+        isArray
+      };
+    }
+  } else if (Node4.isCallExpression(objectField)) {
+    const nested = readNestedFromExpression(objectField);
+    if (nested) {
+      result = { ...nested, isArray };
+    }
+  }
+  return result;
+}
 function readPropertyValue(literal, key) {
   const property = literal.getProperty(key);
   let result;
-  if (property && Node3.isPropertyAssignment(property)) {
+  if (property && Node4.isPropertyAssignment(property)) {
     result = property.getInitializer();
-  } else if (property && Node3.isShorthandPropertyAssignment(property)) {
+  } else if (property && Node4.isShorthandPropertyAssignment(property)) {
     result = property.getNameNode();
   }
   return result;
 }
 function readObjectProperty(literal, key) {
   const value = readPropertyValue(literal, key);
-  return value && Node3.isObjectLiteralExpression(value) ? value : void 0;
+  return value && Node4.isObjectLiteralExpression(value) ? value : void 0;
 }
 function readEnums(sourceFile) {
   const out = [];
@@ -905,20 +931,6 @@ function firstParagraph(text) {
   }
   return collected.join(" ").trim();
 }
-function stringLiteralValue(node) {
-  let result;
-  if (Node3.isStringLiteral(node) || Node3.isNoSubstitutionTemplateLiteral(node)) {
-    result = node.getLiteralText();
-  }
-  return result;
-}
-function identifierName(node) {
-  let result;
-  if (Node3.isIdentifier(node)) {
-    result = node.getText();
-  }
-  return result;
-}
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/find-api-files.ts
 function findApiFiles(packageRoot) {
@@ -1021,6 +1033,47 @@ function assembleModels(input) {
   accumulator.entries.sort((a, b) => a.modelType.localeCompare(b.modelType));
   return accumulator.entries;
 }
+function collectModelEnums(input) {
+  const registry = buildEnumRegistry(input.extractions);
+  const referenced = collectReferencedEnumNames(input.models);
+  const out = {};
+  for (const name of [...referenced].sort((a, b) => a.localeCompare(b))) {
+    const extracted = registry.get(name);
+    if (extracted) {
+      out[name] = buildModelEnumEntry(extracted);
+    }
+  }
+  return out;
+}
+function buildEnumRegistry(extractions) {
+  const registry = /* @__PURE__ */ new Map();
+  for (const { extraction } of extractions) {
+    for (const e of extraction.enums) {
+      if (!registry.has(e.name)) registry.set(e.name, e);
+    }
+  }
+  return registry;
+}
+function collectReferencedEnumNames(models) {
+  const referenced = /* @__PURE__ */ new Set();
+  for (const model of models) {
+    addReferencedEnumNames(model.fields, referenced);
+  }
+  return referenced;
+}
+function addReferencedEnumNames(fields, referenced) {
+  for (const field of fields) {
+    if (field.enumRef) referenced.add(field.enumRef);
+    if (field.nestedFields) addReferencedEnumNames(field.nestedFields, referenced);
+  }
+}
+function buildModelEnumEntry(e) {
+  return {
+    name: e.name,
+    values: e.values.map((v) => v.description ? { name: v.name, value: v.value, description: v.description } : { name: v.name, value: v.value }),
+    ...e.description ? { description: e.description } : {}
+  };
+}
 function buildGlobalRegistries(extractions) {
   const converterRegistry = /* @__PURE__ */ new Map();
   const interfaceRegistry = /* @__PURE__ */ new Map();
@@ -1086,28 +1139,32 @@ function buildEntryForIdentity(input) {
           depth: 0,
           visitedConverters: /* @__PURE__ */ new Set()
         });
-        const modelGroup = registries.groupByModelName.get(modelName);
-        const serviceFactory = registries.serviceFactoryByModelType.get(identity.modelType);
-        result = {
-          modelType: identity.modelType,
-          modelName,
-          ...modelGroup ? { modelGroup } : {},
-          identityConst: identity.identityConst,
-          collectionPrefix: identity.collectionPrefix,
-          ...identity.parentIdentityConst ? { parentIdentityConst: identity.parentIdentityConst } : {},
-          ...iface.description ? { description: iface.description } : {},
-          sourcePackage: source.sourcePackage,
-          sourceFile: source.sourceFile,
-          fields,
-          ...iface.mcpToolNameSegment ? { mcpToolNameSegment: iface.mcpToolNameSegment } : {},
-          ...iface.dbxModelRead ? { read: iface.dbxModelRead } : {},
-          ...serviceFactory ? { serviceFactory } : {}
-        };
+        result = buildManifestEntry({ identity, modelName, collectionPrefix: identity.collectionPrefix, iface, fields, source, registries });
       }
     }
   }
   return result;
 }
+function buildManifestEntry(input) {
+  const { identity, modelName, collectionPrefix, iface, fields, source, registries } = input;
+  const modelGroup = registries.groupByModelName.get(modelName);
+  const serviceFactory = registries.serviceFactoryByModelType.get(identity.modelType);
+  return {
+    modelType: identity.modelType,
+    modelName,
+    ...modelGroup ? { modelGroup } : {},
+    identityConst: identity.identityConst,
+    collectionPrefix,
+    ...identity.parentIdentityConst ? { parentIdentityConst: identity.parentIdentityConst } : {},
+    ...iface.description ? { description: iface.description } : {},
+    sourcePackage: source.sourcePackage,
+    sourceFile: source.sourceFile,
+    fields,
+    ...iface.mcpToolNameSegment ? { mcpToolNameSegment: iface.mcpToolNameSegment } : {},
+    ...iface.dbxModelRead ? { read: iface.dbxModelRead } : {},
+    ...serviceFactory ? { serviceFactory } : {}
+  };
+}
 function findConverterForInterface(extraction, interfaceName) {
   return extraction.converters.find((c) => c.interfaceName === interfaceName);
 }
@@ -1158,21 +1215,10 @@ function buildField(input) {
   return out;
 }
 function resolveNestedFields(input) {
-  const { field } = input;
   let result;
   if (input.depth < MAX_NESTED_DEPTH) {
-    let nestedConverter;
-    let aborted = false;
-    if (field.nestedConverterInline) {
-      nestedConverter = field.nestedConverterInline;
-    } else if (field.nestedConverterRef) {
-      if (input.visitedConverters.has(field.nestedConverterRef)) {
-        aborted = true;
-      } else {
-        nestedConverter = input.converterRegistry.get(field.nestedConverterRef);
-      }
-    }
-    if (!aborted && nestedConverter) {
+    const nestedConverter = selectNestedConverter(input);
+    if (nestedConverter) {
       const nextVisited = new Set(input.visitedConverters);
       if (nestedConverter.converterConst) nextVisited.add(nestedConverter.converterConst);
       const nestedIface = nestedConverter.interfaceName ? input.interfaceRegistry.get(nestedConverter.interfaceName) : void 0;
@@ -1185,11 +1231,21 @@ function resolveNestedFields(input) {
         depth: input.depth + 1,
         visitedConverters: nextVisited
       });
-      result = { fields, isArray: field.nestedIsArray ?? false };
+      result = { fields, isArray: input.field.nestedIsArray ?? false };
     }
   }
   return result;
 }
+function selectNestedConverter(input) {
+  const { field } = input;
+  let result;
+  if (field.nestedConverterInline) {
+    result = field.nestedConverterInline;
+  } else if (field.nestedConverterRef && !input.visitedConverters.has(field.nestedConverterRef)) {
+    result = input.converterRegistry.get(field.nestedConverterRef);
+  }
+  return result;
+}
 function collectAncestors(iface, registry) {
   const out = [];
   const visited = /* @__PURE__ */ new Set([iface.name]);
@@ -1261,31 +1317,42 @@ function findIdentifierInBarrelChain(filePath, identifier, visited) {
   let result = false;
   if (!visited.has(filePath)) {
     visited.add(filePath);
-    let text;
-    try {
-      text = readFileSync5(filePath, "utf8");
-    } catch {
-      text = void 0;
-    }
+    const text = readFileTextSafe(filePath);
     if (text !== void 0) {
-      for (const pattern of EXPORT_DECL_PATTERNS) {
-        const re = new RegExp(pattern.source.replace("IDENT", escapeRegExp(identifier)));
-        if (re.test(text)) {
-          result = true;
-          break;
-        }
-      }
-      if (!result) {
-        const dir = dirname2(filePath);
-        for (const reExportTarget of collectReExportTargets(text)) {
-          const resolved = resolveReExport(dir, reExportTarget);
-          if (!resolved) continue;
-          if (findIdentifierInBarrelChain(resolved, identifier, visited)) {
-            result = true;
-            break;
-          }
-        }
-      }
+      result = barrelTextDeclaresIdentifier(text, identifier) || reExportChainHasIdentifier({ fromFile: filePath, text, identifier, visited });
+    }
+  }
+  return result;
+}
+function readFileTextSafe(filePath) {
+  let text;
+  try {
+    text = readFileSync5(filePath, "utf8");
+  } catch {
+    text = void 0;
+  }
+  return text;
+}
+function barrelTextDeclaresIdentifier(text, identifier) {
+  let result = false;
+  for (const pattern of EXPORT_DECL_PATTERNS) {
+    const re = new RegExp(pattern.source.replace("IDENT", escapeRegExp(identifier)));
+    if (re.test(text)) {
+      result = true;
+      break;
+    }
+  }
+  return result;
+}
+function reExportChainHasIdentifier(input) {
+  const { fromFile, text, identifier, visited } = input;
+  let result = false;
+  const dir = dirname2(fromFile);
+  for (const reExportTarget of collectReExportTargets(text)) {
+    const resolved = resolveReExport(dir, reExportTarget);
+    if (resolved && findIdentifierInBarrelChain(resolved, identifier, visited)) {
+      result = true;
+      break;
     }
   }
   return result;
@@ -1343,13 +1410,8 @@ function escapeRegExp(value) {
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/emit.ts
 import { format, resolveConfig } from "prettier";
-
-// packages/util/src/lib/string/sort.ts
-var compareStrings = (a, b) => a.localeCompare(b);
-
-// packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/emit.ts
 async function renderManifest(input) {
-  const { outputFile, entries, projectName, namespace, modelEntries, modelNamespace, emitConverters = false } = input;
+  const { outputFile, entries, projectName, namespace, modelEntries, modelNamespace, enumEntries, enumNamespace, emitConverters = false } = input;
   const importsByPackage = /* @__PURE__ */ new Map();
   for (const entry of entries) {
     if (!entry.packageName || !entry.validatorName) continue;
@@ -1363,12 +1425,18 @@ async function renderManifest(input) {
   });
   const entryLines = entries.map((e) => renderEntry(e));
   const emitModels = Boolean(modelEntries && modelEntries.length > 0 && modelNamespace);
-  const dbxCliTypeImports = emitModels ? `import { type CliApiManifest, type CliModelManifest } from '@dereekb/dbx-cli';` : `import { type CliApiManifest } from '@dereekb/dbx-cli';`;
+  const emitEnums = Boolean(enumEntries && Object.keys(enumEntries).length > 0 && enumNamespace);
+  const dbxCliTypeNames = ["type CliApiManifest", ...emitModels ? ["type CliModelManifest"] : [], ...emitEnums ? ["type CliEnumManifest"] : []];
+  const dbxCliTypeImports = `import { ${dbxCliTypeNames.join(", ")} } from '@dereekb/dbx-cli';`;
   const modelSection = emitModels ? `
 
 export const ${modelNamespace}: CliModelManifest = [
 ${(modelEntries ?? []).map((m) => renderModelEntry(m, emitConverters)).join(",\n")}
 ];
+` : "";
+  const enumSection = emitEnums ? `
+
+export const ${enumNamespace}: CliEnumManifest = ${renderEnumManifest(enumEntries ?? {})};
 ` : "";
   const source = `/* eslint-disable @nx/enforce-module-boundaries */
 // AUTO-GENERATED \u2014 DO NOT EDIT.
@@ -1379,7 +1447,7 @@ ${dbxCliTypeImports}
 
 export const ${namespace}: CliApiManifest = [
 ${entryLines.join(",\n")}
-];${modelSection}
+];${modelSection}${enumSection}
 `;
   return formatWithPrettier(source, outputFile);
 }
@@ -1402,7 +1470,7 @@ function renderEntry({ entry, validatorName }) {
     entry.mcpResultTypeDescription ? `mcpResultTypeDescription: ${JSON.stringify(entry.mcpResultTypeDescription)}` : void 0,
     entry.mcpResultFields && entry.mcpResultFields.length > 0 ? `mcpResultFields: ${renderDocFields(entry.mcpResultFields)}` : void 0
   ];
-  return `  { ${fields.filter((v) => Boolean(v)).join(", ")} }`;
+  return `  { ${fields.filter(Boolean).join(", ")} }`;
 }
 function renderDocFields(fields) {
   const items = fields.map((field) => {
@@ -1432,7 +1500,7 @@ function renderModelEntry(entry, emitConverters) {
     entry.read ? `read: ${JSON.stringify(entry.read)}` : void 0,
     entry.serviceFactory ? `serviceFactory: { exportName: ${JSON.stringify(entry.serviceFactory.exportName)}, sourceFile: ${JSON.stringify(entry.serviceFactory.sourceFile)} }` : void 0
   ];
-  return `  { ${fields.filter((v) => Boolean(v)).join(", ")} }`;
+  return `  { ${fields.filter(Boolean).join(", ")} }`;
 }
 function renderModelFields(fields, emitConverters) {
   let result;
@@ -1444,6 +1512,23 @@ function renderModelFields(fields, emitConverters) {
   }
   return result;
 }
+function renderEnumManifest(enums) {
+  const names = Object.keys(enums).sort((a, b) => a.localeCompare(b));
+  const items = names.map((name) => `${JSON.stringify(name)}: ${renderEnumEntry(enums[name])}`);
+  return names.length === 0 ? "{}" : `{ ${items.join(", ")} }`;
+}
+function renderEnumEntry(entry) {
+  const parts = [`name: ${JSON.stringify(entry.name)}`, `values: ${renderEnumValues(entry.values)}`, entry.description ? `description: ${JSON.stringify(entry.description)}` : void 0];
+  return `{ ${parts.filter(Boolean).join(", ")} }`;
+}
+function renderEnumValues(values) {
+  const items = values.map((value) => renderEnumValue(value));
+  return `[${items.join(", ")}]`;
+}
+function renderEnumValue(value) {
+  const parts = [`name: ${JSON.stringify(value.name)}`, `value: ${JSON.stringify(value.value)}`, value.description ? `description: ${JSON.stringify(value.description)}` : void 0];
+  return `{ ${parts.filter(Boolean).join(", ")} }`;
+}
 function renderModelField(field, emitConverters) {
   const nestedIsArrayLiteral = field.nestedIsArray ? "true" : "false";
   const parts = [
@@ -1458,7 +1543,7 @@ function renderModelField(field, emitConverters) {
     field.nestedFields ? `nestedFields: ${renderModelFields(field.nestedFields, emitConverters)}` : void 0,
     field.nestedFields ? `nestedIsArray: ${nestedIsArrayLiteral}` : void 0
   ];
-  return `{ ${parts.filter((v) => Boolean(v)).join(", ")} }`;
+  return `{ ${parts.filter(Boolean).join(", ")} }`;
 }
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/main.ts
@@ -1551,8 +1636,9 @@ async function main() {
   collected.sort(compareEntries);
   const modelEntries = flags.emitModels ? assembleModels({ extractions: modelSources }) : [];
   const filteredModelEntries = flags.only ? modelEntries.filter((m) => flags.only?.has(m.modelType)) : modelEntries;
+  const enumEntries = flags.emitModels ? collectModelEnums({ extractions: modelSources, models: filteredModelEntries }) : {};
   ensureOutputDir(outputDir);
-  const formatted = await renderManifest({ outputFile, entries: collected, projectName, namespace, modelEntries: filteredModelEntries, modelNamespace: deriveModelNamespace(flags.project), emitConverters: flags.emitModelConverters });
+  const formatted = await renderManifest({ outputFile, entries: collected, projectName, namespace, modelEntries: filteredModelEntries, modelNamespace: deriveModelNamespace(flags.project), enumEntries, enumNamespace: deriveEnumNamespace(flags.project), emitConverters: flags.emitModelConverters });
   if (existsSync3(outputFile) && readFileSync6(outputFile, "utf8") === formatted) {
     console.log(`[unchanged] ${relative2(WORKSPACE_ROOT, outputFile)}`);
   } else {
@@ -1560,7 +1646,7 @@ async function main() {
     console.log(`[wrote] ${relative2(WORKSPACE_ROOT, outputFile)}`);
   }
   const groupCount = packageCache.size === 0 ? 0 : new Set(collected.map((c) => c.entry.groupName)).size;
-  const modelSummary = flags.emitModels ? ` \xB7 ${filteredModelEntries.length} models` : "";
+  const modelSummary = flags.emitModels ? ` \xB7 ${filteredModelEntries.length} models \xB7 ${Object.keys(enumEntries).length} enums` : "";
   console.log(`Summary: ${groupCount} groups \xB7 ${collected.length} entries \xB7 ${collected.length - missingValidators} validators bound \xB7 ${missingValidators} missing \xB7 ${skippedGroups} skipped${modelSummary}`);
   if (flags.strict && missingValidators > 0) {
     console.error(`[strict] ${missingValidators} validator(s) missing \u2014 failing build.`);
@@ -1592,6 +1678,10 @@ function deriveModelNamespace(projectName) {
   const base = (projectName ?? "cli").replaceAll(/[^a-zA-Z0-9]+/g, "_");
   return `${base.toUpperCase()}_MODEL_MANIFEST`;
 }
+function deriveEnumNamespace(projectName) {
+  const base = (projectName ?? "cli").replaceAll(/[^a-zA-Z0-9]+/g, "_");
+  return `${base.toUpperCase()}_ENUM_MANIFEST`;
+}
 function parseFlags(argv) {
   let only;
   let strict = false;