@dereekb/dbx-cli 13.15.0 → 13.17.0

package/lint-cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli-lint-cache",
-  "version": "13.15.0",
+  "version": "13.17.0",
   "private": true,
   "type": "module",
   "devDependencies": {
@@ -8,7 +8,7 @@
     "eslint": "10.4.0"
   },
   "peerDependencies": {
-    "@dereekb/util": "13.15.0",
+    "@dereekb/util": "13.17.0",
     "yargs": "^18.0.0"
   }
 }

package/manifest-extract/index.cjs.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var tsMorph = require('ts-morph');
+var dbxCli = require('@dereekb/dbx-cli');
 
 function _define_property$1(obj, key, value) {
     if (key in obj) {
@@ -30,7 +31,7 @@ function _object_spread$1(target) {
     }
     return target;
 }
-function ownKeys(object, enumerableOnly) {
+function ownKeys$1(object, enumerableOnly) {
     var keys = Object.keys(object);
     if (Object.getOwnPropertySymbols) {
         var symbols = Object.getOwnPropertySymbols(object);
@@ -38,12 +39,12 @@ function ownKeys(object, enumerableOnly) {
     }
     return keys;
 }
-function _object_spread_props(target, source) {
+function _object_spread_props$1(target, source) {
     source = source != null ? source : {};
     if (Object.getOwnPropertyDescriptors) {
         Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
     } else {
-        ownKeys(Object(source)).forEach(function(key) {
+        ownKeys$1(Object(source)).forEach(function(key) {
             Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
         });
     }
@@ -295,14 +296,25 @@ function findFunctionsClassName(sourceFile) {
     return result;
 }
 function inferGroupName(sourceFile) {
+    var _findTypeAliasStem;
+    return (_findTypeAliasStem = findTypeAliasStem(sourceFile, 'ModelCrudFunctionsConfig')) !== null && _findTypeAliasStem !== void 0 ? _findTypeAliasStem : findTypeAliasStem(sourceFile, 'FunctionTypeMap');
+}
+/**
+ * Finds the first type alias whose name ends with `ending` and returns the
+ * non-empty stem (the name with `ending` stripped).
+ *
+ * @param sourceFile - The parsed `<model>.api.ts` source.
+ * @param ending - The type-alias name suffix to match.
+ * @returns The stem preceding `ending`, or `undefined` when no alias matches with a non-empty stem.
+ */ function findTypeAliasStem(sourceFile, ending) {
     var result;
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
         for(var _iterator = sourceFile.getTypeAliases()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var alias = _step.value;
             var name = alias.getName();
-            if (name.endsWith('ModelCrudFunctionsConfig')) {
-                var stem = name.slice(0, -'ModelCrudFunctionsConfig'.length);
+            if (name.endsWith(ending)) {
+                var stem = name.slice(0, -ending.length);
                 if (stem.length > 0) {
                     result = stem;
                     break;
@@ -323,35 +335,6 @@ function inferGroupName(sourceFile) {
             }
         }
     }
-    if (result === undefined) {
-        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
-        try {
-            for(var _iterator1 = sourceFile.getTypeAliases()[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                var alias1 = _step1.value;
-                var name1 = alias1.getName();
-                if (name1.endsWith('FunctionTypeMap')) {
-                    var stem1 = name1.slice(0, -'FunctionTypeMap'.length);
-                    if (stem1.length > 0) {
-                        result = stem1;
-                        break;
-                    }
-                }
-            }
-        } catch (err) {
-            _didIteratorError1 = true;
-            _iteratorError1 = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                    _iterator1.return();
-                }
-            } finally{
-                if (_didIteratorError1) {
-                    throw _iteratorError1;
-                }
-            }
-        }
-    }
     return result;
 }
 function isNullLiteralType(node) {
@@ -473,68 +456,71 @@ function typeNodeName(node) {
     return result;
 }
 function readTypeDocs(sourceFile, typeName) {
-    var result;
     var interfaceDecl = sourceFile.getInterface(typeName);
+    var result;
     if (interfaceDecl) {
-        var typeDescription = readJsDocSummary(interfaceDecl);
-        var hasApiParamsTag = hasJsDocFlag(interfaceDecl, 'dbxModelApiParams');
-        var fields = [];
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for(var _iterator = interfaceDecl.getProperties()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var property = _step.value;
-                var _ref;
-                var fieldName = property.getName();
-                var description = readJsDocSummary(property);
-                var typeNode = property.getTypeNode();
-                var typeText = (_ref = typeNode === null || typeNode === void 0 ? void 0 : typeNode.getText().trim()) !== null && _ref !== void 0 ? _ref : '';
-                var adminOnly = hasJsDocFlag(property, 'dbxModelApiAdminOnly');
-                var field = _object_spread$1({
-                    name: fieldName,
-                    typeText: typeText
-                }, description ? {
-                    description: description
-                } : {}, adminOnly ? {
-                    accessLevel: 'adminOnly'
-                } : {});
-                fields.push(field);
-            }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
-            }
-        }
-        if (typeDescription || fields.length > 0 || hasApiParamsTag) {
-            result = _object_spread_props(_object_spread$1({}, typeDescription ? {
-                typeDescription: typeDescription
-            } : {}, fields.length > 0 ? {
-                fields: fields
-            } : {}), {
-                hasApiParamsTag: hasApiParamsTag
-            });
-        }
+        result = readInterfaceTypeDocs(interfaceDecl);
     } else {
         var typeAlias = sourceFile.getTypeAlias(typeName);
-        if (typeAlias) {
-            var typeDescription1 = readJsDocSummary(typeAlias);
-            if (typeDescription1) {
-                result = {
-                    typeDescription: typeDescription1
-                };
-            }
-        }
+        result = typeAlias ? readTypeAliasDocs(typeAlias) : undefined;
+    }
+    return result;
+}
+/**
+ * Reads the type-level JSDoc (summary, fields, `@dbxModelApiParams` flag) of a
+ * resolved interface declaration.
+ *
+ * @param interfaceDecl - The interface naming a params/result type.
+ * @returns The collected docs, or `undefined` when the interface has no description, fields, or marker.
+ */ function readInterfaceTypeDocs(interfaceDecl) {
+    var typeDescription = readJsDocSummary(interfaceDecl);
+    var hasApiParamsTag = hasJsDocFlag(interfaceDecl, 'dbxModelApiParams');
+    var fields = interfaceDecl.getProperties().map(function(property) {
+        return readInterfaceField(property);
+    });
+    var result;
+    if (typeDescription || fields.length > 0 || hasApiParamsTag) {
+        result = _object_spread_props$1(_object_spread$1({}, typeDescription ? {
+            typeDescription: typeDescription
+        } : {}, fields.length > 0 ? {
+            fields: fields
+        } : {}), {
+            hasApiParamsTag: hasApiParamsTag
+        });
     }
     return result;
 }
+/**
+ * Reads one interface property into a {@link CrudEntryDocField}, capturing its
+ * type text, JSDoc summary, and `@dbxModelApiAdminOnly` access level.
+ *
+ * @param property - The interface property signature.
+ * @returns The doc field for the property.
+ */ function readInterfaceField(property) {
+    var _ref;
+    var _property_getTypeNode;
+    var description = readJsDocSummary(property);
+    var adminOnly = hasJsDocFlag(property, 'dbxModelApiAdminOnly');
+    return _object_spread$1({
+        name: property.getName(),
+        typeText: (_ref = (_property_getTypeNode = property.getTypeNode()) === null || _property_getTypeNode === void 0 ? void 0 : _property_getTypeNode.getText().trim()) !== null && _ref !== void 0 ? _ref : ''
+    }, description ? {
+        description: description
+    } : {}, adminOnly ? {
+        accessLevel: 'adminOnly'
+    } : {});
+}
+/**
+ * Reads the type-level JSDoc summary of a resolved type alias.
+ *
+ * @param typeAlias - The type alias naming a params/result type.
+ * @returns The collected docs, or `undefined` when the alias has no description.
+ */ function readTypeAliasDocs(typeAlias) {
+    var typeDescription = readJsDocSummary(typeAlias);
+    return typeDescription ? {
+        typeDescription: typeDescription
+    } : undefined;
+}
 /**
  * Returns `true` when any JSDoc block on `node` carries the bare `@<tagName>` flag.
  *
@@ -650,8 +636,8 @@ function readTypeDocs(sourceFile, typeName) {
 function readJsDocSummary(node) {
     var result;
     var docs = node.getJsDocs();
-    if (docs.length > 0) {
-        var last = docs[docs.length - 1];
+    var last = docs.at(-1);
+    if (last) {
         var description = last.getDescription().trim();
         if (description.length > 0) {
             result = description;
@@ -688,6 +674,25 @@ function _object_spread(target) {
     }
     return target;
 }
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 var READ_LEVEL_VALUES = new Set([
     'system',
     'owner',
@@ -698,25 +703,6 @@ 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_$]*$/;
-/**
- * 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',
@@ -728,6 +714,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';
 /**
  * Walks a single source file and reports raw model-extraction artifacts.
  * Best-effort: a malformed call shape leaves the corresponding entry out
@@ -774,7 +761,7 @@ function readIdentities(sourceFile) {
                     var initializer = decl.getInitializer();
                     if (!initializer || !tsMorph.Node.isCallExpression(initializer)) continue;
                     if (initializer.getExpression().getText() !== IDENTITY_FN) continue;
-                    var parsed = parseIdentityArgs(initializer);
+                    var parsed = dbxCli.parseFirestoreModelIdentityArgs(initializer.getArguments());
                     if (parsed) {
                         out.push(_object_spread({
                             identityConst: decl.getName()
@@ -812,48 +799,6 @@ function readIdentities(sourceFile) {
     }
     return out;
 }
-function parseIdentityArgs(call) {
-    var args = call.getArguments();
-    var result;
-    if (args.length === 1) {
-        var modelType = stringLiteralValue(args[0]);
-        if (modelType !== undefined) {
-            result = {
-                modelType: modelType,
-                collectionPrefix: undefined,
-                parentIdentityConst: undefined
-            };
-        }
-    } else if (args.length === 2) {
-        var first = stringLiteralValue(args[0]);
-        if (first === undefined) {
-            var modelType1 = stringLiteralValue(args[1]);
-            if (modelType1 !== undefined) {
-                result = {
-                    modelType: modelType1,
-                    collectionPrefix: undefined,
-                    parentIdentityConst: identifierName(args[0])
-                };
-            }
-        } else {
-            result = {
-                modelType: first,
-                collectionPrefix: stringLiteralValue(args[1]),
-                parentIdentityConst: undefined
-            };
-        }
-    } else if (args.length >= 3) {
-        var modelType2 = stringLiteralValue(args[1]);
-        if (modelType2 !== undefined) {
-            result = {
-                modelType: modelType2,
-                collectionPrefix: stringLiteralValue(args[2]),
-                parentIdentityConst: identifierName(args[0])
-            };
-        }
-    }
-    return result;
-}
 function readInterfaces(sourceFile) {
     var out = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -884,7 +829,7 @@ function buildInterface(decl) {
     var hasDbxModelTag = jsDocsHaveTag(jsDocs, 'dbxModel');
     var dbxModelRead = readDbxModelReadTag(jsDocs);
     var mcpToolNameSegment = readMcpToolNameSegmentTag(jsDocs);
-    var extendsNames = decl.getExtends().map(resolveExtendsName);
+    var extendsNames = decl.getExtends().map(dbxCli.resolveExtendsName);
     var props = [];
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
@@ -1134,48 +1079,6 @@ function readServiceFactoryModelType(jsDocs) {
     }
     return result;
 }
-/**
- * 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;
@@ -1313,41 +1216,87 @@ function readNestedFromExpression(expr) {
     if (tsMorph.Node.isCallExpression(expr)) {
         var fnName = expr.getExpression().getText();
         if (fnName === SUB_OBJECT_FN || fnName === OBJECT_ARRAY_FN) {
-            var args = expr.getArguments();
-            if (args.length > 0) {
-                var config = args[0];
-                if (tsMorph.Node.isObjectLiteralExpression(config)) {
-                    var objectField = readPropertyValue(config, OBJECT_FIELD_KEY);
-                    if (objectField) {
-                        var isArray = fnName === OBJECT_ARRAY_FN;
-                        if (tsMorph.Node.isIdentifier(objectField)) {
-                            result = {
-                                ref: objectField.getText(),
-                                isArray: isArray
-                            };
-                        } else if (tsMorph.Node.isObjectLiteralExpression(objectField)) {
-                            var fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
-                            if (fieldsLiteral) {
-                                var inlineFields = readFieldEntries(fieldsLiteral);
-                                result = {
-                                    inline: {
-                                        converterConst: undefined,
-                                        factory: fnName,
-                                        interfaceName: readGenericInterfaceName(expr),
-                                        fields: inlineFields,
-                                        line: expr.getStartLineNumber()
-                                    },
-                                    isArray: isArray
-                                };
-                            }
-                        }
-                    }
-                }
+            result = readNestedConverterCall(expr, fnName);
+        }
+    }
+    return result;
+}
+/**
+ * Reads the `objectField` (or `firestoreField`) argument of a
+ * `firestoreSubObject` / `firestoreObjectArray` call into a
+ * {@link NestedConverterMatch}.
+ *
+ * `firestoreObjectArray`'s config is a union: `{ objectField }` describes the
+ * element shape directly, while `{ firestoreField }` points the element decode
+ * at another field converter (a sub-object const or an inline
+ * `firestoreSubObject(...)`). Both carriers resolve through the same nested path
+ * — the `firestoreField` variant is what the timesheet day-level form uses.
+ *
+ * @param call - The nested-converter call expression.
+ * @param fnName - The resolved factory name (`firestoreSubObject` or `firestoreObjectArray`).
+ * @returns The nested-converter match, or `undefined` when the call shape is malformed.
+ */ function readNestedConverterCall(call, fnName) {
+    var result;
+    var args = call.getArguments();
+    if (args.length > 0) {
+        var config = args[0];
+        if (tsMorph.Node.isObjectLiteralExpression(config)) {
+            var _readPropertyValue;
+            var valueNode = (_readPropertyValue = readPropertyValue(config, OBJECT_FIELD_KEY)) !== null && _readPropertyValue !== void 0 ? _readPropertyValue : readPropertyValue(config, FIRESTORE_FIELD_KEY);
+            if (valueNode) {
+                result = buildNestedConverterMatch({
+                    objectField: valueNode,
+                    call: call,
+                    fnName: fnName
+                });
             }
         }
     }
     return result;
 }
+/**
+ * Builds a {@link NestedConverterMatch} from a resolved value node:
+ * an identifier yields a converter `ref`, an object literal yields an `inline`
+ * converter parsed from its `fields`, and a nested
+ * `firestoreSubObject(...)` / `firestoreObjectArray(...)` call (the inline
+ * `firestoreField: firestoreSubObject<T>({...})` form) is resolved recursively —
+ * the outer factory still decides array-ness.
+ *
+ * @param input - The resolved value node, owning call expression, and factory name.
+ * @returns The nested-converter match, or `undefined` when no shape applies.
+ */ function buildNestedConverterMatch(input) {
+    var objectField = input.objectField, call = input.call, fnName = input.fnName;
+    var isArray = fnName === OBJECT_ARRAY_FN;
+    var result;
+    if (tsMorph.Node.isIdentifier(objectField)) {
+        result = {
+            ref: objectField.getText(),
+            isArray: isArray
+        };
+    } else if (tsMorph.Node.isObjectLiteralExpression(objectField)) {
+        var fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
+        if (fieldsLiteral) {
+            result = {
+                inline: {
+                    converterConst: undefined,
+                    factory: fnName,
+                    interfaceName: readGenericInterfaceName(call),
+                    fields: readFieldEntries(fieldsLiteral),
+                    line: call.getStartLineNumber()
+                },
+                isArray: isArray
+            };
+        }
+    } else if (tsMorph.Node.isCallExpression(objectField)) {
+        var nested = readNestedFromExpression(objectField);
+        if (nested) {
+            result = _object_spread_props(_object_spread({}, nested), {
+                isArray: isArray
+            });
+        }
+    }
+    return result;
+}
 function readPropertyValue(literal, key) {
     var property = literal.getProperty(key);
     var result;
@@ -1638,20 +1587,6 @@ function firstParagraph(text) {
     }
     return collected.join(' ').trim();
 }
-function stringLiteralValue(node) {
-    var result;
-    if (tsMorph.Node.isStringLiteral(node) || tsMorph.Node.isNoSubstitutionTemplateLiteral(node)) {
-        result = node.getLiteralText();
-    }
-    return result;
-}
-function identifierName(node) {
-    var result;
-    if (tsMorph.Node.isIdentifier(node)) {
-        result = node.getText();
-    }
-    return result;
-}
 
 exports.extractCrudEntries = extractCrudEntries;
 exports.extractModelsFromSource = extractModelsFromSource;