@dereekb/dbx-cli 13.11.14 → 13.11.16

package/firebase-api-manifest/main.js

@@ -36,15 +36,21 @@ function collectGroupsFromConfig(initializer, importIdentToModule, sink) {
   }
 }
 function readGroupFromProperty(property, importIdentToModule) {
-  if (!Node.isPropertyAssignment(property)) return void 0;
-  const valueExpr = property.getInitializer();
-  if (!valueExpr || !Node.isArrayLiteralExpression(valueExpr)) return void 0;
-  const first = valueExpr.getElements()[0];
-  if (!first || !Node.isIdentifier(first)) return void 0;
-  const className = first.getText();
-  const importedFromModule = importIdentToModule.get(className);
-  if (!importedFromModule) return void 0;
-  return { groupKey: property.getName(), className, importedFromModule };
+  let result;
+  if (Node.isPropertyAssignment(property)) {
+    const valueExpr = property.getInitializer();
+    if (valueExpr && Node.isArrayLiteralExpression(valueExpr)) {
+      const first = valueExpr.getElements()[0];
+      if (first && Node.isIdentifier(first)) {
+        const className = first.getText();
+        const importedFromModule = importIdentToModule.get(className);
+        if (importedFromModule) {
+          result = { groupKey: property.getName(), className, importedFromModule };
+        }
+      }
+    }
+  }
+  return result;
 }
 function isFunctionsConfigVariable(variable) {
   const name = variable.getName();
@@ -67,63 +73,80 @@ import { existsSync, readFileSync as readFileSync2 } from "node:fs";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 var _pathsCache;
 function loadTsconfigPaths(workspaceRoot) {
-  if (_pathsCache) return _pathsCache;
-  const tsconfigPath = join(workspaceRoot, "tsconfig.base.json");
-  const raw = readFileSync2(tsconfigPath, "utf8");
-  const cleaned = stripJsonComments(raw);
-  const tsconfig = JSON.parse(cleaned);
-  const paths = tsconfig.compilerOptions?.paths ?? {};
-  const map = /* @__PURE__ */ new Map();
-  for (const [key, value] of Object.entries(paths)) {
-    if (Array.isArray(value) && value[0]) {
-      map.set(key, resolve(workspaceRoot, value[0]));
+  let result;
+  if (_pathsCache) {
+    result = _pathsCache;
+  } else {
+    const tsconfigPath = join(workspaceRoot, "tsconfig.base.json");
+    const raw = readFileSync2(tsconfigPath, "utf8");
+    const cleaned = stripJsonComments(raw);
+    const tsconfig = JSON.parse(cleaned);
+    const paths = tsconfig.compilerOptions?.paths ?? {};
+    const map = /* @__PURE__ */ new Map();
+    for (const [key, value] of Object.entries(paths)) {
+      if (Array.isArray(value) && value[0]) {
+        map.set(key, resolve(workspaceRoot, value[0]));
+      }
     }
+    _pathsCache = map;
+    result = map;
   }
-  _pathsCache = map;
-  return map;
+  return result;
 }
 function resolveModuleToPackage(input) {
   const { workspaceRoot, importingFile, moduleSpecifier } = input;
+  let result;
   if (moduleSpecifier.startsWith(".")) {
     const importingDir = dirname(importingFile);
     const candidatePath = resolve(importingDir, moduleSpecifier);
-    return locatePackageForPath(workspaceRoot, candidatePath);
+    result = locatePackageForPath(workspaceRoot, candidatePath);
+  } else {
+    const paths = loadTsconfigPaths(workspaceRoot);
+    const indexFile = paths.get(moduleSpecifier);
+    if (indexFile) {
+      result = locatePackageForPath(workspaceRoot, indexFile);
+    } else {
+      result = locatePackageInNodeModules({ workspaceRoot, importingFile, moduleSpecifier });
+    }
   }
-  const paths = loadTsconfigPaths(workspaceRoot);
-  const indexFile = paths.get(moduleSpecifier);
-  if (indexFile) return locatePackageForPath(workspaceRoot, indexFile);
-  return locatePackageInNodeModules({ workspaceRoot, importingFile, moduleSpecifier });
+  return result;
 }
 function locatePackageInNodeModules(input) {
   const { importingFile, moduleSpecifier } = input;
   let current = dirname(importingFile);
-  while (current && current !== dirname(current)) {
+  let result;
+  while (!result && current && current !== dirname(current)) {
     const candidateRoot = join(current, "node_modules", moduleSpecifier);
     const pkgJson = join(candidateRoot, "package.json");
     if (existsSync(pkgJson)) {
       try {
         const pkg = JSON.parse(readFileSync2(pkgJson, "utf8"));
-        if (pkg.name) return { packageName: pkg.name, packageRoot: candidateRoot };
+        if (pkg.name) {
+          result = { packageName: pkg.name, packageRoot: candidateRoot };
+        }
       } catch {
       }
     }
-    current = dirname(current);
+    if (!result) current = dirname(current);
   }
-  return void 0;
+  return result;
 }
 function locatePackageForPath(workspaceRoot, startPath) {
   let current = startPath;
-  while (current && current !== workspaceRoot && current !== dirname(current)) {
+  let result;
+  while (!result && current && current !== workspaceRoot && current !== dirname(current)) {
     if (existsSync(join(current, "package.json"))) {
       try {
         const pkg = JSON.parse(readFileSync2(join(current, "package.json"), "utf8"));
-        if (pkg.name) return { packageName: pkg.name, packageRoot: current };
+        if (pkg.name) {
+          result = { packageName: pkg.name, packageRoot: current };
+        }
       } catch {
       }
     }
-    current = dirname(current);
+    if (!result) current = dirname(current);
   }
-  return void 0;
+  return result;
 }
 function relPath(workspaceRoot, absolutePath) {
   return relative(workspaceRoot, absolutePath).split("\\").join("/");
@@ -149,17 +172,18 @@ function extractCrudEntries(source) {
   const functionsClassName = findFunctionsClassName(sourceFile);
   const typeDocsCache = /* @__PURE__ */ new Map();
   const resolveTypeDocs = (typeName) => {
-    if (!typeName) {
-      return void 0;
-    }
-    if (typeDocsCache.has(typeName)) {
-      return typeDocsCache.get(typeName);
-    }
-    const docs = readTypeDocs(sourceFile, typeName);
-    if (docs) {
-      typeDocsCache.set(typeName, docs);
+    let result;
+    if (typeName) {
+      if (typeDocsCache.has(typeName)) {
+        result = typeDocsCache.get(typeName);
+      } else {
+        result = readTypeDocs(sourceFile, typeName);
+        if (result) {
+          typeDocsCache.set(typeName, result);
+        }
+      }
     }
-    return docs;
+    return result;
   };
   if (crudConfigType) {
     const literal = crudConfigType.getTypeNode();
@@ -229,54 +253,64 @@ function extractCrudEntries(source) {
   return { groupName, modelKeys, entries, functionsClassName };
 }
 function findTypeAliasByEnding(sourceFile, ending) {
+  let result;
   for (const alias of sourceFile.getTypeAliases()) {
     if (alias.getName().endsWith(ending) && alias.getTypeNode()) {
-      return alias;
+      result = alias;
+      break;
     }
   }
-  return void 0;
+  return result;
 }
 function findFunctionsClassName(sourceFile) {
+  let result;
   for (const cls of sourceFile.getClasses()) {
     if (!cls.isAbstract()) {
       continue;
     }
     const name = cls.getName();
     if (name?.endsWith("Functions")) {
-      return name;
+      result = name;
+      break;
     }
   }
-  return void 0;
+  return result;
 }
 function inferGroupName(sourceFile) {
+  let result;
   for (const alias of sourceFile.getTypeAliases()) {
     const name = alias.getName();
     if (name.endsWith("ModelCrudFunctionsConfig")) {
       const stem = name.slice(0, -"ModelCrudFunctionsConfig".length);
       if (stem.length > 0) {
-        return stem;
+        result = stem;
+        break;
       }
     }
   }
-  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) {
-        return stem;
+  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 void 0;
+  return result;
 }
 function isNullLiteralType(node) {
+  let result = false;
   if (Node2.isLiteralTypeNode(node)) {
     const literal = node.getLiteral();
     if (Node2.isNullLiteral(literal)) {
-      return true;
+      result = true;
     }
   }
-  return false;
+  return result;
 }
 function collectVerbEntries(input) {
   const { modelName, verb, valueNode, entries, fallbackDescription, resolveTypeDocs } = input;
@@ -324,32 +358,33 @@ function collectVerbEntries(input) {
   });
 }
 function readTupleParamsResult(node) {
-  if (!Node2.isTupleTypeNode(node)) {
-    return void 0;
-  }
-  const elements = node.getElements();
-  if (elements.length === 0) {
-    return void 0;
+  let pair;
+  if (Node2.isTupleTypeNode(node)) {
+    const elements = node.getElements();
+    if (elements.length > 0) {
+      const params = elements[0] ? typeNodeName(elements[0]) : void 0;
+      const result = elements[1] ? typeNodeName(elements[1]) : void 0;
+      pair = { params, result };
+    }
   }
-  const params = elements[0] ? typeNodeName(elements[0]) : void 0;
-  const result = elements[1] ? typeNodeName(elements[1]) : void 0;
-  return { params, result };
+  return pair;
 }
 function readBareParams(node) {
   const params = typeNodeName(node);
-  if (!params) {
-    return void 0;
-  }
-  return { params, result: void 0 };
+  return params ? { params, result: void 0 } : void 0;
 }
 function typeNodeName(node) {
+  let result;
   if (Node2.isTypeReference(node)) {
-    return node.getTypeName().getText();
+    result = node.getTypeName().getText();
+  } else {
+    const text = node.getText().trim();
+    result = text.length > 0 ? text : void 0;
   }
-  const text = node.getText().trim();
-  return text.length > 0 ? text : void 0;
+  return result;
 }
 function readTypeDocs(sourceFile, typeName) {
+  let result;
   const interfaceDecl = sourceFile.getInterface(typeName);
   if (interfaceDecl) {
     const typeDescription = readJsDocSummary(interfaceDecl);
@@ -362,26 +397,31 @@ function readTypeDocs(sourceFile, typeName) {
       const field = description ? { name: fieldName, typeText, description } : { name: fieldName, typeText };
       fields.push(field);
     }
-    if (!typeDescription && fields.length === 0) {
-      return void 0;
+    if (typeDescription || fields.length > 0) {
+      result = { typeDescription, fields: fields.length > 0 ? fields : void 0 };
+    }
+  } else {
+    const typeAlias = sourceFile.getTypeAlias(typeName);
+    if (typeAlias) {
+      const typeDescription = readJsDocSummary(typeAlias);
+      if (typeDescription) {
+        result = { typeDescription };
+      }
     }
-    return { typeDescription, fields: fields.length > 0 ? fields : void 0 };
-  }
-  const typeAlias = sourceFile.getTypeAlias(typeName);
-  if (typeAlias) {
-    const typeDescription = readJsDocSummary(typeAlias);
-    return typeDescription ? { typeDescription } : void 0;
   }
-  return void 0;
+  return result;
 }
 function readJsDocSummary(node) {
+  let result;
   const docs = node.getJsDocs();
-  if (docs.length === 0) {
-    return void 0;
+  if (docs.length > 0) {
+    const last = docs[docs.length - 1];
+    const description = last.getDescription().trim();
+    if (description.length > 0) {
+      result = description;
+    }
   }
-  const last = docs[docs.length - 1];
-  const description = last.getDescription().trim();
-  return description.length > 0 ? description : void 0;
+  return result;
 }
 
 // packages/dbx-cli/manifest-extract/src/lib/extract-models.ts
@@ -552,20 +592,25 @@ function readGenericInterfaceName(call) {
 function readConverterFields(call) {
   const fnName = call.getExpression().getText();
   const args = call.getArguments();
-  if (args.length === 0) return void 0;
-  const config = args[0];
-  if (!Node3.isObjectLiteralExpression(config)) return void 0;
-  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)) {
-      fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
+  let result;
+  if (args.length > 0) {
+    const config = args[0];
+    if (Node3.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)) {
+          fieldsLiteral = readObjectProperty(objectField, FIELDS_LITERAL_KEY);
+        }
+      }
+      if (fieldsLiteral) {
+        result = readFieldEntries(fieldsLiteral);
+      }
     }
   }
-  if (!fieldsLiteral) return void 0;
-  return readFieldEntries(fieldsLiteral);
+  return result;
 }
 function readFieldEntries(fields) {
   const out = [];
@@ -589,33 +634,38 @@ function readFieldEntries(fields) {
   return out;
 }
 function readNestedFromExpression(expr) {
-  if (!Node3.isCallExpression(expr)) return void 0;
-  const fnName = expr.getExpression().getText();
-  if (fnName !== SUB_OBJECT_FN && fnName !== OBJECT_ARRAY_FN) return void 0;
-  const args = expr.getArguments();
-  if (args.length === 0) return void 0;
-  const config = args[0];
-  if (!Node3.isObjectLiteralExpression(config)) return void 0;
-  const objectField = readPropertyValue(config, OBJECT_FIELD_KEY);
-  if (!objectField) return void 0;
-  const isArray = fnName === OBJECT_ARRAY_FN;
   let result;
-  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
-      };
+  if (Node3.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
+                };
+              }
+            }
+          }
+        }
+      }
     }
   }
   return result;
@@ -749,16 +799,17 @@ function identifierName(node) {
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/find-api-files.ts
 function findApiFiles(packageRoot) {
   const libRoot = join2(packageRoot, "src", "lib");
-  if (!safeIsDirectory(libRoot)) return [];
   const out = [];
-  const seenClassNames = /* @__PURE__ */ new Set();
-  for (const file of walkApiFiles(libRoot)) {
-    const text = readFileSync3(file, "utf8");
-    const extraction = extractCrudEntries({ name: file, text });
-    if (!extraction.functionsClassName) continue;
-    if (seenClassNames.has(extraction.functionsClassName)) continue;
-    seenClassNames.add(extraction.functionsClassName);
-    out.push({ filePath: file, className: extraction.functionsClassName, extraction });
+  if (safeIsDirectory(libRoot)) {
+    const seenClassNames = /* @__PURE__ */ new Set();
+    for (const file of walkApiFiles(libRoot)) {
+      const text = readFileSync3(file, "utf8");
+      const extraction = extractCrudEntries({ name: file, text });
+      if (!extraction.functionsClassName) continue;
+      if (seenClassNames.has(extraction.functionsClassName)) continue;
+      seenClassNames.add(extraction.functionsClassName);
+      out.push({ filePath: file, className: extraction.functionsClassName, extraction });
+    }
   }
   return out;
 }
@@ -775,15 +826,17 @@ function* walkApiFiles(dir) {
   }
 }
 function isApiFile(name) {
-  if (name.endsWith(".spec.ts") || name.endsWith(".test.ts")) return false;
-  return name.endsWith(".api.ts") || name.endsWith(".api.d.ts");
+  const isSpec = name.endsWith(".spec.ts") || name.endsWith(".test.ts");
+  return !isSpec && (name.endsWith(".api.ts") || name.endsWith(".api.d.ts"));
 }
 function safeIsDirectory(p) {
+  let result;
   try {
-    return statSync(p).isDirectory();
+    result = statSync(p).isDirectory();
   } catch {
-    return false;
+    result = false;
   }
+  return result;
 }
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/find-model-files.ts
@@ -791,24 +844,20 @@ import { readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as
 import { join as join3 } from "node:path";
 function findModelFiles(packageRoot) {
   const libRoot = join3(packageRoot, "src", "lib");
-  if (!safeIsDirectory2(libRoot)) return [];
   const out = [];
-  for (const filePath of walkSourceFiles(libRoot)) {
-    const text = readFileSync4(filePath, "utf8");
-    if (!textHasModelMarker(text)) continue;
-    const extraction = extractModelsFromSource({ name: filePath, text });
-    if (extraction.identities.length === 0 && extraction.modelGroups.length === 0 && extraction.converters.length === 0) continue;
-    out.push({ filePath, extraction });
+  if (safeIsDirectory2(libRoot)) {
+    for (const filePath of walkSourceFiles(libRoot)) {
+      const text = readFileSync4(filePath, "utf8");
+      if (!textHasModelMarker(text)) continue;
+      const extraction = extractModelsFromSource({ name: filePath, text });
+      if (extraction.identities.length === 0 && extraction.modelGroups.length === 0 && extraction.converters.length === 0) continue;
+      out.push({ filePath, extraction });
+    }
   }
   return out;
 }
 function textHasModelMarker(text) {
-  if (text.includes("firestoreModelIdentity(")) return true;
-  if (text.includes("@dbxModelGroup")) return true;
-  if (text.includes("snapshotConverterFunctions")) return true;
-  if (text.includes("firestoreSubObject")) return true;
-  if (text.includes("firestoreObjectArray")) return true;
-  return false;
+  return text.includes("firestoreModelIdentity(") || text.includes("@dbxModelGroup") || text.includes("snapshotConverterFunctions") || text.includes("firestoreSubObject") || text.includes("firestoreObjectArray");
 }
 function* walkSourceFiles(dir) {
   for (const entry of readdirSync2(dir).sort()) {
@@ -823,20 +872,16 @@ function* walkSourceFiles(dir) {
   }
 }
 function isCandidateSourceFile(name) {
-  if (!name.endsWith(".ts")) return false;
-  if (name.endsWith(".api.ts")) return false;
-  if (name.endsWith(".spec.ts")) return false;
-  if (name.endsWith(".test.ts")) return false;
-  if (name.endsWith(".id.ts")) return false;
-  if (name.endsWith(".d.ts")) return false;
-  return true;
+  return name.endsWith(".ts") && !name.endsWith(".api.ts") && !name.endsWith(".spec.ts") && !name.endsWith(".test.ts") && !name.endsWith(".id.ts") && !name.endsWith(".d.ts");
 }
 function safeIsDirectory2(p) {
+  let result;
   try {
-    return statSync2(p).isDirectory();
+    result = statSync2(p).isDirectory();
   } catch {
-    return false;
+    result = false;
   }
+  return result;
 }
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/assemble-models.ts
@@ -895,34 +940,39 @@ function appendEntriesFromSource(source, registries, accumulator) {
 }
 function buildEntryForIdentity(input) {
   const { identity, source, registries, enumNames } = input;
-  if (identity.collectionPrefix === void 0) return void 0;
-  const modelName = capitalize(identity.modelType);
-  const iface = registries.interfaceRegistry.get(modelName);
-  if (!iface?.hasDbxModelTag) return void 0;
-  const converter = findConverterForInterface(source.extraction, modelName) ?? findConverterFromRegistry(registries.converterRegistry, modelName);
-  if (!converter) return void 0;
-  const fields = buildFields({
-    converter,
-    iface,
-    interfaceRegistry: registries.interfaceRegistry,
-    converterRegistry: registries.converterRegistry,
-    enumNames,
-    depth: 0,
-    visitedConverters: /* @__PURE__ */ new Set()
-  });
-  const modelGroup = registries.groupByModelName.get(modelName);
-  return {
-    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
-  };
+  let result;
+  if (identity.collectionPrefix !== void 0) {
+    const modelName = capitalize(identity.modelType);
+    const iface = registries.interfaceRegistry.get(modelName);
+    if (iface?.hasDbxModelTag) {
+      const converter = findConverterForInterface(source.extraction, modelName) ?? findConverterFromRegistry(registries.converterRegistry, modelName);
+      if (converter) {
+        const fields = buildFields({
+          converter,
+          iface,
+          interfaceRegistry: registries.interfaceRegistry,
+          converterRegistry: registries.converterRegistry,
+          enumNames,
+          depth: 0,
+          visitedConverters: /* @__PURE__ */ new Set()
+        });
+        const modelGroup = registries.groupByModelName.get(modelName);
+        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
+        };
+      }
+    }
+  }
+  return result;
 }
 function findConverterForInterface(extraction, interfaceName) {
   return extraction.converters.find((c) => c.interfaceName === interfaceName);
@@ -975,28 +1025,36 @@ function buildField(input) {
 }
 function resolveNestedFields(input) {
   const { field } = input;
-  if (input.depth >= MAX_NESTED_DEPTH) return void 0;
-  let nestedConverter;
-  if (field.nestedConverterInline) {
-    nestedConverter = field.nestedConverterInline;
-  } else if (field.nestedConverterRef) {
-    if (input.visitedConverters.has(field.nestedConverterRef)) return void 0;
-    nestedConverter = input.converterRegistry.get(field.nestedConverterRef);
-  }
-  if (!nestedConverter) return void 0;
-  const nextVisited = new Set(input.visitedConverters);
-  if (nestedConverter.converterConst) nextVisited.add(nestedConverter.converterConst);
-  const nestedIface = nestedConverter.interfaceName ? input.interfaceRegistry.get(nestedConverter.interfaceName) : void 0;
-  const fields = buildFields({
-    converter: nestedConverter,
-    iface: nestedIface,
-    interfaceRegistry: input.interfaceRegistry,
-    converterRegistry: input.converterRegistry,
-    enumNames: input.enumNames,
-    depth: input.depth + 1,
-    visitedConverters: nextVisited
-  });
-  return { fields, isArray: field.nestedIsArray ?? false };
+  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 nextVisited = new Set(input.visitedConverters);
+      if (nestedConverter.converterConst) nextVisited.add(nestedConverter.converterConst);
+      const nestedIface = nestedConverter.interfaceName ? input.interfaceRegistry.get(nestedConverter.interfaceName) : void 0;
+      const fields = buildFields({
+        converter: nestedConverter,
+        iface: nestedIface,
+        interfaceRegistry: input.interfaceRegistry,
+        converterRegistry: input.converterRegistry,
+        enumNames: input.enumNames,
+        depth: input.depth + 1,
+        visitedConverters: nextVisited
+      });
+      result = { fields, isArray: field.nestedIsArray ?? false };
+    }
+  }
+  return result;
 }
 function collectAncestors(iface, registry) {
   const out = [];
@@ -1053,14 +1111,12 @@ function capitalize(s) {
 import { existsSync as existsSync2, readdirSync as readdirSync3, readFileSync as readFileSync5, statSync as statSync3 } from "node:fs";
 import { dirname as dirname2, isAbsolute as isAbsolute2, join as join4, resolve as resolve2 } from "node:path";
 function deriveValidatorName(paramsTypeName) {
-  if (!paramsTypeName) return "";
-  return paramsTypeName.charAt(0).toLowerCase() + paramsTypeName.slice(1) + "Type";
+  return paramsTypeName ? paramsTypeName.charAt(0).toLowerCase() + paramsTypeName.slice(1) + "Type" : "";
 }
 function isExportedFromPackage(input) {
   const { packageRoot, identifier } = input;
   const indexPath = locateBarrelEntry(packageRoot);
-  if (!indexPath) return false;
-  return findIdentifierInBarrelChain(indexPath, identifier, /* @__PURE__ */ new Set());
+  return indexPath ? findIdentifierInBarrelChain(indexPath, identifier, /* @__PURE__ */ new Set()) : false;
 }
 function locateBarrelEntry(packageRoot) {
   const candidates = [join4(packageRoot, "src", "index.ts"), join4(packageRoot, "src", "index.d.ts"), join4(packageRoot, "index.d.ts"), join4(packageRoot, "index.ts")];
@@ -1068,25 +1124,37 @@ function locateBarrelEntry(packageRoot) {
 }
 var EXPORT_DECL_PATTERNS = [/export\s+(?:declare\s+)?const\s+IDENT\b/, /export\s+(?:declare\s+)?function\s+IDENT\b/, /export\s*\{[^}]*\bIDENT\b[^}]*\}/];
 function findIdentifierInBarrelChain(filePath, identifier, visited) {
-  if (visited.has(filePath)) return false;
-  visited.add(filePath);
-  let text;
-  try {
-    text = readFileSync5(filePath, "utf8");
-  } catch {
-    return false;
-  }
-  for (const pattern of EXPORT_DECL_PATTERNS) {
-    const re = new RegExp(pattern.source.replace("IDENT", escapeRegExp(identifier)));
-    if (re.test(text)) return true;
-  }
-  const dir = dirname2(filePath);
-  for (const reExportTarget of collectReExportTargets(text)) {
-    const resolved = resolveReExport(dir, reExportTarget);
-    if (!resolved) continue;
-    if (findIdentifierInBarrelChain(resolved, identifier, visited)) return true;
+  let result = false;
+  if (!visited.has(filePath)) {
+    visited.add(filePath);
+    let text;
+    try {
+      text = readFileSync5(filePath, "utf8");
+    } catch {
+      text = void 0;
+    }
+    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;
+          }
+        }
+      }
+    }
   }
-  return false;
+  return result;
 }
 function collectReExportTargets(text) {
   const out = [];
@@ -1098,15 +1166,16 @@ function collectReExportTargets(text) {
   return out;
 }
 function resolveReExport(fromDir, target) {
-  if (!target.startsWith(".")) return void 0;
-  const candidate = isAbsolute2(target) ? target : resolve2(fromDir, target);
   let result;
-  for (const ext of [".ts", ".mts", ".d.ts", "/index.ts", "/index.mts", "/index.d.ts"]) {
-    const probe = hasTsModuleExtension(candidate) ? candidate : candidate + ext;
-    const resolved = resolveExistingTsPath(probe);
-    if (resolved) {
-      result = resolved;
-      break;
+  if (target.startsWith(".")) {
+    const candidate = isAbsolute2(target) ? target : resolve2(fromDir, target);
+    for (const ext of [".ts", ".mts", ".d.ts", "/index.ts", "/index.mts", "/index.d.ts"]) {
+      const probe = hasTsModuleExtension(candidate) ? candidate : candidate + ext;
+      const resolved = resolveExistingTsPath(probe);
+      if (resolved) {
+        result = resolved;
+        break;
+      }
     }
   }
   return result;
@@ -1115,14 +1184,24 @@ function hasTsModuleExtension(value) {
   return value.endsWith(".ts") || value.endsWith(".mts");
 }
 function resolveExistingTsPath(probe) {
-  if (!existsSync2(probe)) return void 0;
-  const stat = statSync3(probe);
-  if (stat.isFile()) return probe;
-  if (!stat.isDirectory()) return void 0;
-  const sourceIndex = join4(probe, "index.ts");
-  if (existsSync2(sourceIndex)) return sourceIndex;
-  const declarationIndex = join4(probe, "index.d.ts");
-  return existsSync2(declarationIndex) ? declarationIndex : void 0;
+  let result;
+  if (existsSync2(probe)) {
+    const stat = statSync3(probe);
+    if (stat.isFile()) {
+      result = probe;
+    } else if (stat.isDirectory()) {
+      const sourceIndex = join4(probe, "index.ts");
+      if (existsSync2(sourceIndex)) {
+        result = sourceIndex;
+      } else {
+        const declarationIndex = join4(probe, "index.d.ts");
+        if (existsSync2(declarationIndex)) {
+          result = declarationIndex;
+        }
+      }
+    }
+  }
+  return result;
 }
 function escapeRegExp(value) {
   return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
@@ -1216,9 +1295,14 @@ function renderModelEntry(entry, emitConverters) {
   return `  { ${fields.filter((v) => Boolean(v)).join(", ")} }`;
 }
 function renderModelFields(fields, emitConverters) {
-  if (fields.length === 0) return "[]";
-  const items = fields.map((field) => renderModelField(field, emitConverters));
-  return `[${items.join(", ")}]`;
+  let result;
+  if (fields.length === 0) {
+    result = "[]";
+  } else {
+    const items = fields.map((field) => renderModelField(field, emitConverters));
+    result = `[${items.join(", ")}]`;
+  }
+  return result;
 }
 function renderModelField(field, emitConverters) {
   const nestedIsArrayLiteral = field.nestedIsArray ? "true" : "false";
@@ -1336,9 +1420,15 @@ async function main() {
   }
 }
 function compareEntries(a, b) {
-  if (a.entry.model !== b.entry.model) return a.entry.model.localeCompare(b.entry.model);
-  if (a.entry.verb !== b.entry.verb) return a.entry.verb.localeCompare(b.entry.verb);
-  return (a.entry.specifier ?? "").localeCompare(b.entry.specifier ?? "");
+  let result;
+  if (a.entry.model !== b.entry.model) {
+    result = a.entry.model.localeCompare(b.entry.model);
+  } else if (a.entry.verb === b.entry.verb) {
+    result = (a.entry.specifier ?? "").localeCompare(b.entry.specifier ?? "");
+  } else {
+    result = a.entry.verb.localeCompare(b.entry.verb);
+  }
+  return result;
 }
 function ensureOutputDir(outputDir) {
   if (!existsSync3(outputDir)) mkdirSync(outputDir, { recursive: true });