@dereekb/dbx-cli 13.11.5 → 13.11.6

package/firebase-api-manifest/main.js

@@ -386,6 +386,7 @@ function readJsDocSummary(node) {
 
 // packages/dbx-cli/manifest-extract/src/lib/extract-models.ts
 import { Node as Node3, Project as Project3 } from "ts-morph";
+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";
@@ -456,7 +457,7 @@ function readInterfaces(sourceFile) {
 function buildInterface(decl) {
   const jsDocs = decl.getJsDocs();
   const hasDbxModelTag = jsDocsHaveTag(jsDocs, "dbxModel");
-  const extendsNames = decl.getExtends().map((e) => e.getExpression().getText());
+  const extendsNames = decl.getExtends().map(resolveExtendsName);
   const props = [];
   for (const prop of decl.getProperties()) {
     const propJsDocs = prop.getJsDocs();
@@ -481,6 +482,39 @@ function buildInterface(decl) {
     props
   };
 }
+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()) {
@@ -1088,7 +1122,7 @@ function escapeRegExp(value) {
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/emit.ts
 import { format, resolveConfig } from "prettier";
 async function renderManifest(input) {
-  const { outputFile, entries, projectName, namespace, modelEntries, modelNamespace } = input;
+  const { outputFile, entries, projectName, namespace, modelEntries, modelNamespace, emitConverters = false } = input;
   const importsByPackage = /* @__PURE__ */ new Map();
   for (const entry of entries) {
     if (!entry.packageName || !entry.validatorName) continue;
@@ -1106,7 +1140,7 @@ async function renderManifest(input) {
   const modelSection = emitModels ? `
 
 export const ${modelNamespace}: CliModelManifest = [
-${(modelEntries ?? []).map((m) => renderModelEntry(m)).join(",\n")}
+${(modelEntries ?? []).map((m) => renderModelEntry(m, emitConverters)).join(",\n")}
 ];
 ` : "";
   const source = `/* eslint-disable @nx/enforce-module-boundaries */
@@ -1152,7 +1186,7 @@ async function formatWithPrettier(source, outputFile) {
   const config = await resolveConfig(outputFile);
   return format(source, { ...config, filepath: outputFile });
 }
-function renderModelEntry(entry) {
+function renderModelEntry(entry, emitConverters) {
   const fields = [
     `modelType: ${JSON.stringify(entry.modelType)}`,
     `modelName: ${JSON.stringify(entry.modelName)}`,
@@ -1163,26 +1197,26 @@ function renderModelEntry(entry) {
     entry.description ? `description: ${JSON.stringify(entry.description)}` : void 0,
     `sourcePackage: ${JSON.stringify(entry.sourcePackage)}`,
     `sourceFile: ${JSON.stringify(entry.sourceFile)}`,
-    `fields: ${renderModelFields(entry.fields)}`
+    `fields: ${renderModelFields(entry.fields, emitConverters)}`
   ];
   return `  { ${fields.filter((v) => Boolean(v)).join(", ")} }`;
 }
-function renderModelFields(fields) {
+function renderModelFields(fields, emitConverters) {
   if (fields.length === 0) return "[]";
-  const items = fields.map((field) => renderModelField(field));
+  const items = fields.map((field) => renderModelField(field, emitConverters));
   return `[${items.join(", ")}]`;
 }
-function renderModelField(field) {
+function renderModelField(field, emitConverters) {
   const parts = [
     `name: ${JSON.stringify(field.name)}`,
     `longName: ${JSON.stringify(field.longName)}`,
-    `converter: ${JSON.stringify(field.converter)}`,
+    emitConverters && field.converter !== void 0 ? `converter: ${JSON.stringify(field.converter)}` : void 0,
     field.tsType ? `tsType: ${JSON.stringify(field.tsType)}` : void 0,
     `optional: ${field.optional ? "true" : "false"}`,
     field.description ? `description: ${JSON.stringify(field.description)}` : void 0,
     field.enumRef ? `enumRef: ${JSON.stringify(field.enumRef)}` : void 0,
     field.syncFlag ? `syncFlag: ${JSON.stringify(field.syncFlag)}` : void 0,
-    field.nestedFields ? `nestedFields: ${renderModelFields(field.nestedFields)}` : void 0,
+    field.nestedFields ? `nestedFields: ${renderModelFields(field.nestedFields, emitConverters)}` : void 0,
     field.nestedFields ? `nestedIsArray: ${field.nestedIsArray ? "true" : "false"}` : void 0
   ];
   return `{ ${parts.filter((v) => Boolean(v)).join(", ")} }`;
@@ -1271,7 +1305,7 @@ async function main() {
   const modelEntries = flags.emitModels ? assembleModels({ extractions: modelSources }) : [];
   const filteredModelEntries = flags.only ? modelEntries.filter((m) => flags.only?.has(m.modelType)) : modelEntries;
   ensureOutputDir(outputDir);
-  const formatted = await renderManifest({ outputFile, entries: collected, projectName, namespace, modelEntries: filteredModelEntries, modelNamespace: deriveModelNamespace(flags.project) });
+  const formatted = await renderManifest({ outputFile, entries: collected, projectName, namespace, modelEntries: filteredModelEntries, modelNamespace: deriveModelNamespace(flags.project), emitConverters: flags.emitModelConverters });
   if (existsSync3(outputFile) && readFileSync6(outputFile, "utf8") === formatted) {
     console.log(`[unchanged] ${relative2(WORKSPACE_ROOT, outputFile)}`);
   } else {
@@ -1312,11 +1346,14 @@ function parseFlags(argv) {
   let output;
   let project;
   let emitModels = false;
+  let emitModelConverters = false;
   for (const arg of argv) {
     if (arg === "--strict") {
       strict = true;
     } else if (arg === "--emit-models") {
       emitModels = true;
+    } else if (arg === "--emit-model-converters") {
+      emitModelConverters = true;
     } else if (arg.startsWith("--only=")) {
       const list = arg.slice("--only=".length).split(",").map((s) => s.trim()).filter(Boolean);
       if (list.length > 0) only = new Set(list);
@@ -1328,7 +1365,7 @@ function parseFlags(argv) {
       project = arg.slice("--project=".length);
     }
   }
-  return { only, strict, functionsConfig, output, project, emitModels };
+  return { only, strict, functionsConfig, output, project, emitModels, emitModelConverters };
 }
 function printUsageAndExit() {
   console.error(String.raw`generate-api-manifest
@@ -1350,7 +1387,10 @@ Optional:
   --strict                   Fail when any validator binding is missing.
   --emit-models              Opt in to emitting <NAMESPACE>_MODEL_MANIFEST. Off by default —
                              pair with the runtime \`modelManifest\` option on \`runCli\` to
-                             enable the built-in \`model-info\` command.`);
+                             enable the built-in \`model-info\` command.
+  --emit-model-converters    Opt in to including each field's converter expression text inside
+                             the model manifest. Off by default — useful for downstream tooling
+                             (e.g. dbx-components MCP) but unused by the CLI.`);
   process.exit(1);
 }
 try {

package/firebase-api-manifest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli-firebase-api-manifest",
-  "version": "13.11.5",
+  "version": "13.11.6",
   "private": true,
   "type": "module",
   "devDependencies": {

package/index.cjs.js

@@ -5616,27 +5616,37 @@ function _unsupported_iterable_to_array$2(o, minLen) {
 }
 function renderFieldsTree(fields, indent) {
     var out = [];
+    var includeConverter = fields.some(function(f) {
+        return f.converter !== undefined;
+    });
+    var header = includeConverter ? [
+        'NAME',
+        'LONG NAME',
+        'TYPE',
+        'OPTIONAL',
+        'CONVERTER'
+    ] : [
+        'NAME',
+        'LONG NAME',
+        'TYPE',
+        'OPTIONAL'
+    ];
     var rows = [
-        [
-            'NAME',
-            'LONG NAME',
-            'TYPE',
-            'OPTIONAL',
-            'CONVERTER'
-        ]
+        header
     ];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = fields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var field = _step.value;
             var _field_tsType;
-            rows.push([
+            var row = [
                 field.name,
                 field.longName,
                 (_field_tsType = field.tsType) !== null && _field_tsType !== void 0 ? _field_tsType : '',
-                field.optional ? 'yes' : 'no',
-                truncate(field.converter, 60)
-            ]);
+                field.optional ? 'yes' : 'no'
+            ];
+            if (includeConverter) row.push(field.converter ? truncate(field.converter, 60) : '');
+            rows.push(row);
         }
     } catch (err) {
         _didIteratorError = true;

package/index.esm.js

@@ -5614,27 +5614,37 @@ function _unsupported_iterable_to_array$2(o, minLen) {
 }
 function renderFieldsTree(fields, indent) {
     var out = [];
+    var includeConverter = fields.some(function(f) {
+        return f.converter !== undefined;
+    });
+    var header = includeConverter ? [
+        'NAME',
+        'LONG NAME',
+        'TYPE',
+        'OPTIONAL',
+        'CONVERTER'
+    ] : [
+        'NAME',
+        'LONG NAME',
+        'TYPE',
+        'OPTIONAL'
+    ];
     var rows = [
-        [
-            'NAME',
-            'LONG NAME',
-            'TYPE',
-            'OPTIONAL',
-            'CONVERTER'
-        ]
+        header
     ];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = fields[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var field = _step.value;
             var _field_tsType;
-            rows.push([
+            var row = [
                 field.name,
                 field.longName,
                 (_field_tsType = field.tsType) !== null && _field_tsType !== void 0 ? _field_tsType : '',
-                field.optional ? 'yes' : 'no',
-                truncate(field.converter, 60)
-            ]);
+                field.optional ? 'yes' : 'no'
+            ];
+            if (includeConverter) row.push(field.converter ? truncate(field.converter, 60) : '');
+            rows.push(row);
         }
     } catch (err) {
         _didIteratorError = true;

package/manifest-extract/index.cjs.js

@@ -484,6 +484,25 @@ function _object_spread(target) {
     }
     return target;
 }
+/**
+ * TS utility/structural wrappers that don't change the field surface for
+ * inheritance walks — `Partial<T>`, `Required<T>`, `Readonly<T>`,
+ * `NonNullable<T>` preserve every property, and `Pick<T, K>` / `Omit<T, K>`
+ * leave the original `T` reachable for long-name resolution. `MaybeMap<T>` is
+ * the workspace's own pass-through that decorates each prop with `Maybe<…>`
+ * without renaming. `extends` walks need to see through these to find the
+ * concrete ancestor interface — `getExpression()` alone returns just the
+ * leftmost identifier (`Partial`, `Pick`, …) and silently drops the inner
+ * model, leaving every inherited `@dbxModelVariable` tag unreachable.
+ */ var PASSTHROUGH_TYPE_WRAPPERS = new Set([
+    'Partial',
+    'Required',
+    'Readonly',
+    'NonNullable',
+    'MaybeMap',
+    'Pick',
+    'Omit'
+]);
 var IDENTITY_FN = 'firestoreModelIdentity';
 var CONVERTER_FN_NAMES = [
     'snapshotConverterFunctions',
@@ -647,9 +666,7 @@ function readInterfaces(sourceFile) {
 function buildInterface(decl) {
     var jsDocs = decl.getJsDocs();
     var hasDbxModelTag = jsDocsHaveTag(jsDocs, 'dbxModel');
-    var extendsNames = decl.getExtends().map(function(e) {
-        return e.getExpression().getText();
-    });
+    var extendsNames = decl.getExtends().map(resolveExtendsName);
     var props = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
@@ -693,6 +710,48 @@ function buildInterface(decl) {
         props: props
     };
 }
+/**
+ * Resolves an `extends` clause to the concrete ancestor interface name,
+ * peeling any leading {@link PASSTHROUGH_TYPE_WRAPPERS}. Returns the leftmost
+ * identifier of the unwrapped expression so the inheritance walker can chain
+ * through utility-wrapped declarations like
+ * `extends Partial<MaybeMap<Omit<Base, '…'>>>`.
+ *
+ * @param expr - the `ExpressionWithTypeArguments` produced by `getExtends()`
+ * @returns the resolved interface name, or the original leftmost identifier when no inner reference is reachable
+ */ function resolveExtendsName(expr) {
+    var head = expr.getExpression().getText();
+    var result = head;
+    if (PASSTHROUGH_TYPE_WRAPPERS.has(head)) {
+        var typeArgs = expr.getTypeArguments();
+        if (typeArgs.length > 0) {
+            var peeled = peelTypeNode(typeArgs[0]);
+            if (peeled !== undefined) {
+                result = peeled;
+            }
+        }
+    }
+    return result;
+}
+function peelTypeNode(node) {
+    var current = node;
+    while(tsMorph.Node.isParenthesizedTypeNode(current)){
+        current = current.getTypeNode();
+    }
+    var result;
+    if (tsMorph.Node.isTypeReference(current)) {
+        var name = current.getTypeName().getText();
+        if (PASSTHROUGH_TYPE_WRAPPERS.has(name)) {
+            var inner = current.getTypeArguments();
+            if (inner.length > 0) {
+                result = peelTypeNode(inner[0]);
+            }
+        } else {
+            result = name;
+        }
+    }
+    return result;
+}
 function readConverters(sourceFile) {
     var out = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/manifest-extract/index.esm.js

@@ -482,6 +482,25 @@ function _object_spread(target) {
     }
     return target;
 }
+/**
+ * TS utility/structural wrappers that don't change the field surface for
+ * inheritance walks — `Partial<T>`, `Required<T>`, `Readonly<T>`,
+ * `NonNullable<T>` preserve every property, and `Pick<T, K>` / `Omit<T, K>`
+ * leave the original `T` reachable for long-name resolution. `MaybeMap<T>` is
+ * the workspace's own pass-through that decorates each prop with `Maybe<…>`
+ * without renaming. `extends` walks need to see through these to find the
+ * concrete ancestor interface — `getExpression()` alone returns just the
+ * leftmost identifier (`Partial`, `Pick`, …) and silently drops the inner
+ * model, leaving every inherited `@dbxModelVariable` tag unreachable.
+ */ var PASSTHROUGH_TYPE_WRAPPERS = new Set([
+    'Partial',
+    'Required',
+    'Readonly',
+    'NonNullable',
+    'MaybeMap',
+    'Pick',
+    'Omit'
+]);
 var IDENTITY_FN = 'firestoreModelIdentity';
 var CONVERTER_FN_NAMES = [
     'snapshotConverterFunctions',
@@ -645,9 +664,7 @@ function readInterfaces(sourceFile) {
 function buildInterface(decl) {
     var jsDocs = decl.getJsDocs();
     var hasDbxModelTag = jsDocsHaveTag(jsDocs, 'dbxModel');
-    var extendsNames = decl.getExtends().map(function(e) {
-        return e.getExpression().getText();
-    });
+    var extendsNames = decl.getExtends().map(resolveExtendsName);
     var props = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
@@ -691,6 +708,48 @@ function buildInterface(decl) {
         props: props
     };
 }
+/**
+ * Resolves an `extends` clause to the concrete ancestor interface name,
+ * peeling any leading {@link PASSTHROUGH_TYPE_WRAPPERS}. Returns the leftmost
+ * identifier of the unwrapped expression so the inheritance walker can chain
+ * through utility-wrapped declarations like
+ * `extends Partial<MaybeMap<Omit<Base, '…'>>>`.
+ *
+ * @param expr - the `ExpressionWithTypeArguments` produced by `getExtends()`
+ * @returns the resolved interface name, or the original leftmost identifier when no inner reference is reachable
+ */ function resolveExtendsName(expr) {
+    var head = expr.getExpression().getText();
+    var result = head;
+    if (PASSTHROUGH_TYPE_WRAPPERS.has(head)) {
+        var typeArgs = expr.getTypeArguments();
+        if (typeArgs.length > 0) {
+            var peeled = peelTypeNode(typeArgs[0]);
+            if (peeled !== undefined) {
+                result = peeled;
+            }
+        }
+    }
+    return result;
+}
+function peelTypeNode(node) {
+    var current = node;
+    while(Node.isParenthesizedTypeNode(current)){
+        current = current.getTypeNode();
+    }
+    var result;
+    if (Node.isTypeReference(current)) {
+        var name = current.getTypeName().getText();
+        if (PASSTHROUGH_TYPE_WRAPPERS.has(name)) {
+            var inner = current.getTypeArguments();
+            if (inner.length > 0) {
+                result = peelTypeNode(inner[0]);
+            }
+        } else {
+            result = name;
+        }
+    }
+    return result;
+}
 function readConverters(sourceFile) {
     var out = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/manifest-extract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli/manifest-extract",
-  "version": "13.11.5",
+  "version": "13.11.6",
   "sideEffects": false,
   "peerDependencies": {
     "ts-morph": "^21.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli",
-  "version": "13.11.5",
+  "version": "13.11.6",
   "sideEffects": false,
   "bin": {
     "dbx-cli-generate-firebase-api-manifest": "firebase-api-manifest/main.js"
@@ -24,10 +24,10 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/date": "13.11.5",
-    "@dereekb/firebase": "13.11.5",
-    "@dereekb/nestjs": "13.11.5",
-    "@dereekb/util": "13.11.5",
+    "@dereekb/date": "13.11.6",
+    "@dereekb/firebase": "13.11.6",
+    "@dereekb/nestjs": "13.11.6",
+    "@dereekb/util": "13.11.6",
     "arktype": "^2.2.0",
     "yargs": "^18.0.0"
   },

package/src/lib/manifest/types.d.ts

@@ -22,8 +22,12 @@ export interface CliModelField {
     /**
      * Verbatim converter expression text from the converter's `fields` literal
      * (e.g. `firestoreDate()`, `firestoreObjectArray({ objectField: foo })`).
+     *
+     * Opt-in. Only emitted when the manifest is generated with
+     * `--emit-model-converters`; downstream tooling (e.g. the dbx-components MCP)
+     * uses this text, while the CLI itself does not need it.
      */
-    readonly converter: string;
+    readonly converter?: string;
     /**
      * TypeScript type text from the interface property declaration, when the
      * field's interface property could be located (e.g. `Date`, `Maybe<NotificationUserState>`).