@dereekb/dbx-cli 14.0.0 → 14.1.0

package/eslint/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dereekb/dbx-cli/eslint",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.0.0",
-    "@dereekb/util": "14.0.0",
+    "@dereekb/dbx-cli": "14.1.0",
+    "@dereekb/util": "14.1.0",
     "@typescript-eslint/utils": "8.69.0",
     "typescript": "6.0.3"
   },

package/firebase-api-manifest/main.js

@@ -11,8 +11,8 @@ var compareStrings = (a, b) => a.localeCompare(b);
 
 // packages/dbx-cli/src/lib/scan-helpers/emit-generated-ts.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
-import { format, resolveConfig } from "prettier";
+import { dirname, join, parse } from "node:path";
+import { format } from "oxfmt";
 // @__NO_SIDE_EFFECTS__
 function renderGroupedImportLines(imports) {
   const importsByPackage = /* @__PURE__ */ new Map();
@@ -27,9 +27,36 @@ function renderGroupedImportLines(imports) {
     return `import { ${sortedNames} } from '${pkg}';`;
   });
 }
+var OXFMT_CONFIG_FILENAME = ".oxfmtrc.json";
+var OXFMT_NON_FORMAT_CONFIG_KEYS = ["$schema", "ignorePatterns"];
+function resolveOxfmtConfig(fromFile) {
+  const { root } = parse(fromFile);
+  let directory = dirname(fromFile);
+  let config = {};
+  for (; ; ) {
+    const candidate = join(directory, OXFMT_CONFIG_FILENAME);
+    if (existsSync(candidate)) {
+      const parsed = JSON.parse(readFileSync(candidate, "utf8"));
+      for (const key of OXFMT_NON_FORMAT_CONFIG_KEYS) {
+        delete parsed[key];
+      }
+      config = parsed;
+      break;
+    }
+    if (directory === root) {
+      break;
+    }
+    directory = dirname(directory);
+  }
+  return config;
+}
 async function formatGeneratedTs(source, outputFile) {
-  const config = await resolveConfig(outputFile);
-  return format(source, { ...config, filepath: outputFile });
+  const config = resolveOxfmtConfig(outputFile);
+  const { code, errors } = await format(outputFile, source, config);
+  if (errors.length > 0) {
+    throw new Error(`formatGeneratedTs(): oxfmt failed to format "${outputFile}": ${errors.map((x) => x.message).join(", ")}`);
+  }
+  return code;
 }
 function writeGeneratedTsFile(input) {
   const { outputFile, contents } = input;
@@ -111,14 +138,14 @@ function collectImportSpecifierMap(sourceFile) {
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/resolve-package.ts
 import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
-import { dirname as dirname2, isAbsolute, join, relative, resolve } from "node:path";
+import { dirname as dirname2, isAbsolute, join as join2, relative, resolve } from "node:path";
 var _pathsCache;
 function loadTsconfigPaths(workspaceRoot) {
   let result;
   if (_pathsCache) {
     result = _pathsCache;
   } else {
-    const tsconfigPath = join(workspaceRoot, "tsconfig.base.json");
+    const tsconfigPath = join2(workspaceRoot, "tsconfig.base.json");
     const raw = readFileSync3(tsconfigPath, "utf8");
     const cleaned = stripJsonComments(raw);
     const tsconfig = JSON.parse(cleaned);
@@ -157,8 +184,8 @@ function locatePackageInNodeModules(input) {
   let current = dirname2(importingFile);
   let result;
   while (!result && current && current !== dirname2(current)) {
-    const candidateRoot = join(current, "node_modules", moduleSpecifier);
-    const pkgJson = join(candidateRoot, "package.json");
+    const candidateRoot = join2(current, "node_modules", moduleSpecifier);
+    const pkgJson = join2(candidateRoot, "package.json");
     if (existsSync2(pkgJson)) {
       try {
         const pkg = JSON.parse(readFileSync3(pkgJson, "utf8"));
@@ -176,9 +203,9 @@ function locatePackageForPath(workspaceRoot, startPath) {
   let current = startPath;
   let result;
   while (!result && current && current !== workspaceRoot && current !== dirname2(current)) {
-    if (existsSync2(join(current, "package.json"))) {
+    if (existsSync2(join2(current, "package.json"))) {
       try {
-        const pkg = JSON.parse(readFileSync3(join(current, "package.json"), "utf8"));
+        const pkg = JSON.parse(readFileSync3(join2(current, "package.json"), "utf8"));
         if (pkg.name) {
           result = { packageName: pkg.name, packageRoot: current };
         }
@@ -198,7 +225,7 @@ function stripJsonComments(text) {
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/find-api-files.ts
 import { readdirSync, readFileSync as readFileSync5, statSync as statSync2 } from "node:fs";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 
 // packages/dbx-cli/manifest-extract/src/lib/extract-crud.ts
 import { Node as Node2, Project as Project2 } from "ts-morph";
@@ -588,14 +615,14 @@ function identifierName(node) {
 
 // packages/dbx-cli/src/lib/scan-helpers/exported-from-package.ts
 import { existsSync as existsSync3, readFileSync as readFileSync4, statSync } from "node:fs";
-import { dirname as dirname3, isAbsolute as isAbsolute2, join as join2, resolve as resolve2 } from "node:path";
+import { dirname as dirname3, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "node:path";
 function isExportedFromPackage(input) {
   const { packageRoot, identifier } = input;
   const indexPath = locateBarrelEntry(packageRoot);
   return indexPath ? findIdentifierInBarrelChain(indexPath, identifier, /* @__PURE__ */ new Set()) : false;
 }
 function locateBarrelEntry(packageRoot) {
-  const candidates = [join2(packageRoot, "src", "index.ts"), join2(packageRoot, "src", "index.d.ts"), join2(packageRoot, "index.d.ts"), join2(packageRoot, "index.ts")];
+  const candidates = [join3(packageRoot, "src", "index.ts"), join3(packageRoot, "src", "index.d.ts"), join3(packageRoot, "index.d.ts"), join3(packageRoot, "index.ts")];
   return candidates.find((candidate) => existsSync3(candidate));
 }
 var EXPORT_DECL_PATTERNS = [/export\s+(?:declare\s+)?const\s+IDENT\b/, /export\s+(?:declare\s+)?function\s+IDENT\b/, /export\s*\{[^}]*\bIDENT\b[^}]*\}/];
@@ -677,11 +704,11 @@ function resolveExistingTsPath(probe) {
     if (stat.isFile()) {
       result = probe;
     } else if (stat.isDirectory()) {
-      const sourceIndex = join2(probe, "index.ts");
+      const sourceIndex = join3(probe, "index.ts");
       if (existsSync3(sourceIndex)) {
         result = sourceIndex;
       } else {
-        const declarationIndex = join2(probe, "index.d.ts");
+        const declarationIndex = join3(probe, "index.d.ts");
         if (existsSync3(declarationIndex)) {
           result = declarationIndex;
         }
@@ -1148,7 +1175,7 @@ function firstParagraph(text) {
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/find-api-files.ts
 function findApiFiles(packageRoot) {
-  const libRoot = join3(packageRoot, "src", "lib");
+  const libRoot = join4(packageRoot, "src", "lib");
   const out = [];
   if (safeIsDirectory(libRoot)) {
     const seenClassNames = /* @__PURE__ */ new Set();
@@ -1166,7 +1193,7 @@ function findApiFiles(packageRoot) {
 function* walkApiFiles(dir) {
   for (const entry of readdirSync(dir).sort()) {
     if (entry === "node_modules" || entry === "dist") continue;
-    const p = join3(dir, entry);
+    const p = join4(dir, entry);
     const stat = statSync2(p);
     if (stat.isDirectory()) {
       yield* walkApiFiles(p);
@@ -1191,9 +1218,9 @@ function safeIsDirectory(p) {
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/find-model-files.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync6, statSync as statSync3 } from "node:fs";
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 function findModelFiles(packageRoot) {
-  const libRoot = join4(packageRoot, "src", "lib");
+  const libRoot = join5(packageRoot, "src", "lib");
   const out = [];
   if (safeIsDirectory2(libRoot)) {
     for (const filePath of walkSourceFiles(libRoot)) {
@@ -1215,7 +1242,7 @@ function hasExtractedArtifact(extraction) {
 function* walkSourceFiles(dir) {
   for (const entry of readdirSync2(dir).sort()) {
     if (entry === "node_modules" || entry === "dist") continue;
-    const p = join4(dir, entry);
+    const p = join5(dir, entry);
     const stat = statSync3(p);
     if (stat.isDirectory()) {
       yield* walkSourceFiles(p);
@@ -1723,16 +1750,16 @@ function renderModelField(field, emitConverters) {
 // packages/dbx-cli/firebase-api-manifest/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-firebase-api-manifest",
-  version: "14.0.0",
+  version: "14.1.0",
   private: true,
   type: "module",
   devDependencies: {
     "ts-morph": "^28.0.0"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.0.0",
-    "@dereekb/util": "14.0.0",
-    prettier: "3.9.6"
+    "@dereekb/dbx-cli": "14.1.0",
+    "@dereekb/util": "14.1.0",
+    oxfmt: "^0.66.0"
   }
 };
 
@@ -1826,7 +1853,18 @@ async function main() {
   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 }) : {};
-  const formatted = await renderManifest({ outputFile, entries: collected, projectName, namespace, modelEntries: filteredModelEntries, modelNamespace: deriveModelNamespace(flags.project), enumEntries, enumNamespace: deriveEnumNamespace(flags.project), emitConverters: flags.emitModelConverters, generatorVersion: package_default.version });
+  const formatted = await renderManifest({
+    outputFile,
+    entries: collected,
+    projectName,
+    namespace,
+    modelEntries: filteredModelEntries,
+    modelNamespace: deriveModelNamespace(flags.project),
+    enumEntries,
+    enumNamespace: deriveEnumNamespace(flags.project),
+    emitConverters: flags.emitModelConverters,
+    generatorVersion: package_default.version
+  });
   const outcome = writeGeneratedTsFile({ outputFile, contents: formatted });
   console.log(`[${outcome}] ${relative2(WORKSPACE_ROOT, outputFile)}`);
   const groupCount = packageCache.size === 0 ? 0 : new Set(collected.map((c) => c.entry.groupName)).size;

package/firebase-api-manifest/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dereekb/dbx-cli-firebase-api-manifest",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "private": true,
   "type": "module",
   "devDependencies": {
     "ts-morph": "^28.0.0"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.0.0",
-    "@dereekb/util": "14.0.0",
-    "prettier": "3.9.6"
+    "@dereekb/dbx-cli": "14.1.0",
+    "@dereekb/util": "14.1.0",
+    "oxfmt": "^0.66.0"
   }
 }

package/firestore-query-manifest/main.js

@@ -9,15 +9,15 @@ import { isAbsolute as isAbsolute2, relative as relative2, resolve as resolve3 }
 // packages/dbx-cli/firestore-query-manifest/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-firestore-query-manifest",
-  version: "14.0.0",
+  version: "14.1.0",
   private: true,
   type: "module",
   devDependencies: {
     eslint: "10.9.1"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.0.0",
-    "@dereekb/util": "14.0.0"
+    "@dereekb/dbx-cli": "14.1.0",
+    "@dereekb/util": "14.1.0"
   }
 };
 
@@ -26,8 +26,8 @@ var compareStrings = (a, b) => a.localeCompare(b);
 
 // packages/dbx-cli/src/lib/scan-helpers/emit-generated-ts.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname } from "node:path";
-import { format, resolveConfig } from "prettier";
+import { dirname, join, parse } from "node:path";
+import { format } from "oxfmt";
 // @__NO_SIDE_EFFECTS__
 function renderGroupedImportLines(imports) {
   const importsByPackage = /* @__PURE__ */ new Map();
@@ -42,9 +42,36 @@ function renderGroupedImportLines(imports) {
     return `import { ${sortedNames} } from '${pkg}';`;
   });
 }
+var OXFMT_CONFIG_FILENAME = ".oxfmtrc.json";
+var OXFMT_NON_FORMAT_CONFIG_KEYS = ["$schema", "ignorePatterns"];
+function resolveOxfmtConfig(fromFile) {
+  const { root } = parse(fromFile);
+  let directory = dirname(fromFile);
+  let config = {};
+  for (; ; ) {
+    const candidate = join(directory, OXFMT_CONFIG_FILENAME);
+    if (existsSync(candidate)) {
+      const parsed = JSON.parse(readFileSync(candidate, "utf8"));
+      for (const key of OXFMT_NON_FORMAT_CONFIG_KEYS) {
+        delete parsed[key];
+      }
+      config = parsed;
+      break;
+    }
+    if (directory === root) {
+      break;
+    }
+    directory = dirname(directory);
+  }
+  return config;
+}
 async function formatGeneratedTs(source, outputFile) {
-  const config = await resolveConfig(outputFile);
-  return format(source, { ...config, filepath: outputFile });
+  const config = resolveOxfmtConfig(outputFile);
+  const { code, errors } = await format(outputFile, source, config);
+  if (errors.length > 0) {
+    throw new Error(`formatGeneratedTs(): oxfmt failed to format "${outputFile}": ${errors.map((x) => x.message).join(", ")}`);
+  }
+  return code;
 }
 function writeGeneratedTsFile(input) {
   const { outputFile, contents } = input;
@@ -299,14 +326,14 @@ function parentPathsForCollection(scan, collection) {
 
 // packages/dbx-cli/src/lib/scan-helpers/exported-from-package.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, statSync } from "node:fs";
-import { dirname as dirname2, isAbsolute, join, resolve } from "node:path";
+import { dirname as dirname2, isAbsolute, join as join2, resolve } from "node:path";
 function isExportedFromPackage(input) {
   const { packageRoot, identifier } = input;
   const indexPath = locateBarrelEntry(packageRoot);
   return indexPath ? findIdentifierInBarrelChain(indexPath, identifier, /* @__PURE__ */ new Set()) : false;
 }
 function locateBarrelEntry(packageRoot) {
-  const candidates = [join(packageRoot, "src", "index.ts"), join(packageRoot, "src", "index.d.ts"), join(packageRoot, "index.d.ts"), join(packageRoot, "index.ts")];
+  const candidates = [join2(packageRoot, "src", "index.ts"), join2(packageRoot, "src", "index.d.ts"), join2(packageRoot, "index.d.ts"), join2(packageRoot, "index.ts")];
   return candidates.find((candidate) => existsSync2(candidate));
 }
 var EXPORT_DECL_PATTERNS = [/export\s+(?:declare\s+)?const\s+IDENT\b/, /export\s+(?:declare\s+)?function\s+IDENT\b/, /export\s*\{[^}]*\bIDENT\b[^}]*\}/];
@@ -388,11 +415,11 @@ function resolveExistingTsPath(probe) {
     if (stat.isFile()) {
       result = probe;
     } else if (stat.isDirectory()) {
-      const sourceIndex = join(probe, "index.ts");
+      const sourceIndex = join2(probe, "index.ts");
       if (existsSync2(sourceIndex)) {
         result = sourceIndex;
       } else {
-        const declarationIndex = join(probe, "index.d.ts");
+        const declarationIndex = join2(probe, "index.d.ts");
         if (existsSync2(declarationIndex)) {
           result = declarationIndex;
         }
@@ -469,7 +496,12 @@ function renderEntry({ entry, bound }) {
   return `  { ${fields.filter(Boolean).join(", ")} }`;
 }
 function renderRules(rules) {
-  const parts = [`list: ${JSON.stringify(rules.list)}`, `collectionGroup: ${rules.collectionGroup ? "true" : "false"}`, rules.reason ? `reason: ${JSON.stringify(rules.reason)}` : void 0, rules.parentPaths && rules.parentPaths.length > 0 ? `parentPaths: ${JSON.stringify(rules.parentPaths)}` : void 0];
+  const parts = [
+    `list: ${JSON.stringify(rules.list)}`,
+    `collectionGroup: ${rules.collectionGroup ? "true" : "false"}`,
+    rules.reason ? `reason: ${JSON.stringify(rules.reason)}` : void 0,
+    rules.parentPaths && rules.parentPaths.length > 0 ? `parentPaths: ${JSON.stringify(rules.parentPaths)}` : void 0
+  ];
   return `{ ${parts.filter(Boolean).join(", ")} }`;
 }
 function renderParams(params) {
@@ -1532,7 +1564,7 @@ function tryTransitiveResolution(input) {
     const calleeLine = resolved.decl.getStartLineNumber();
     warnings.push({ kind: "unannotated-query-helper", severity: "warning", name: factoryName, callee: calleeName, calleeFilePath, calleeLine, filePath, line: call.getStartLineNumber() });
   }
-  const nextVisited = /* @__PURE__ */ new Set([...visited, calleeKey]);
+  const nextVisited = new Set(visited).add(calleeKey);
   walkBodyInto({
     decl: resolved.decl,
     factoryName,

package/firestore-query-manifest/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dereekb/dbx-cli-firestore-query-manifest",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "private": true,
   "type": "module",
   "devDependencies": {
     "eslint": "10.9.1"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.0.0",
-    "@dereekb/util": "14.0.0"
+    "@dereekb/dbx-cli": "14.1.0",
+    "@dereekb/util": "14.1.0"
   }
 }

package/generate-firestore-indexes/main.js

@@ -5,14 +5,14 @@ const require = __createRequire(import.meta.url);
 // packages/dbx-cli/generate-firestore-indexes/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-generate-firestore-indexes",
-  version: "14.0.0",
+  version: "14.1.0",
   private: true,
   type: "module",
   devDependencies: {
     eslint: "10.9.1"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.0.0"
+    "@dereekb/dbx-cli": "14.1.0"
   }
 };
 
@@ -1298,7 +1298,7 @@ function tryTransitiveResolution(input) {
     const calleeLine = resolved.decl.getStartLineNumber();
     warnings.push({ kind: "unannotated-query-helper", severity: "warning", name: factoryName, callee: calleeName, calleeFilePath, calleeLine, filePath, line: call.getStartLineNumber() });
   }
-  const nextVisited = /* @__PURE__ */ new Set([...visited, calleeKey]);
+  const nextVisited = new Set(visited).add(calleeKey);
   walkBodyInto({
     decl: resolved.decl,
     factoryName,
@@ -2278,13 +2278,21 @@ function formatBuildFailure(outcome) {
 }
 function formatWriteSummary(input) {
   const { outputPath, diff, generatedComposites, generatedFieldOverrides } = input;
-  const lines = [`generate-firestore-indexes: wrote ${outputPath}`, `  composites: ${generatedComposites} (added ${diff.added.length}, removed ${diff.removed.length}, unchanged ${diff.unchanged.length})`, `  fieldOverrides: ${generatedFieldOverrides} (added ${diff.fieldOverridesAdded.length}, removed ${diff.fieldOverridesRemoved.length}, unchanged ${diff.fieldOverridesUnchanged.length})`];
+  const lines = [
+    `generate-firestore-indexes: wrote ${outputPath}`,
+    `  composites: ${generatedComposites} (added ${diff.added.length}, removed ${diff.removed.length}, unchanged ${diff.unchanged.length})`,
+    `  fieldOverrides: ${generatedFieldOverrides} (added ${diff.fieldOverridesAdded.length}, removed ${diff.fieldOverridesRemoved.length}, unchanged ${diff.fieldOverridesUnchanged.length})`
+  ];
   return appendDiffSection(lines, diff).join("\n");
 }
 function formatCheckSummary(input) {
   const { drift, outputPath, diff, generatedComposites, generatedFieldOverrides } = input;
   const headline = drift ? `generate-firestore-indexes: drift detected against ${outputPath}` : `generate-firestore-indexes: in sync (${outputPath})`;
-  const lines = [headline, `  composites: ${generatedComposites} (added ${diff.added.length}, removed ${diff.removed.length}, unchanged ${diff.unchanged.length})`, `  fieldOverrides: ${generatedFieldOverrides} (added ${diff.fieldOverridesAdded.length}, removed ${diff.fieldOverridesRemoved.length}, unchanged ${diff.fieldOverridesUnchanged.length})`];
+  const lines = [
+    headline,
+    `  composites: ${generatedComposites} (added ${diff.added.length}, removed ${diff.removed.length}, unchanged ${diff.unchanged.length})`,
+    `  fieldOverrides: ${generatedFieldOverrides} (added ${diff.fieldOverridesAdded.length}, removed ${diff.fieldOverridesRemoved.length}, unchanged ${diff.fieldOverridesUnchanged.length})`
+  ];
   return appendDiffSection(lines, diff).join("\n");
 }
 function appendDiffSection(lines, diff) {

package/generate-firestore-indexes/package.json

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

package/generate-mcp-manifest/package.json

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

package/generate-route-manifest/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dereekb/dbx-cli-generate-route-manifest",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.0.0",
+    "@dereekb/dbx-cli": "14.1.0",
     "ts-morph": "^28.0.0"
   }
 }