@dereekb/dbx-cli 13.11.10 → 13.11.11

package/firebase-api-manifest/main.js

@@ -857,21 +857,30 @@ function buildGlobalRegistries(extractions) {
   const interfaceRegistry = /* @__PURE__ */ new Map();
   const groupByModelName = /* @__PURE__ */ new Map();
   for (const { extraction } of extractions) {
-    for (const converter of extraction.converters) {
-      if (converter.converterConst && !converterRegistry.has(converter.converterConst)) {
-        converterRegistry.set(converter.converterConst, converter);
-      }
-    }
-    for (const iface of extraction.interfaces) {
-      if (!interfaceRegistry.has(iface.name)) interfaceRegistry.set(iface.name, iface);
+    registerConverters(extraction.converters, converterRegistry);
+    registerInterfaces(extraction.interfaces, interfaceRegistry);
+    registerModelGroups(extraction.modelGroups, groupByModelName);
+  }
+  return { converterRegistry, interfaceRegistry, groupByModelName };
+}
+function registerConverters(converters, registry) {
+  for (const converter of converters) {
+    if (converter.converterConst && !registry.has(converter.converterConst)) {
+      registry.set(converter.converterConst, converter);
     }
-    for (const group of extraction.modelGroups) {
-      for (const modelName of group.modelNames) {
-        if (!groupByModelName.has(modelName)) groupByModelName.set(modelName, group.name);
-      }
+  }
+}
+function registerInterfaces(interfaces, registry) {
+  for (const iface of interfaces) {
+    if (!registry.has(iface.name)) registry.set(iface.name, iface);
+  }
+}
+function registerModelGroups(modelGroups, registry) {
+  for (const group of modelGroups) {
+    for (const modelName of group.modelNames) {
+      if (!registry.has(modelName)) registry.set(modelName, group.name);
     }
   }
-  return { converterRegistry, interfaceRegistry, groupByModelName };
 }
 function appendEntriesFromSource(source, registries, accumulator) {
   const enumNames = new Set(source.extraction.enums.map((e) => e.name));
@@ -1121,6 +1130,11 @@ function escapeRegExp(value) {
 
 // packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/emit.ts
 import { format, resolveConfig } from "prettier";
+
+// packages/util/src/lib/string/sort.ts
+var compareStrings = (a, b) => a.localeCompare(b);
+
+// packages/dbx-cli/firebase-api-manifest/src/generate-api-manifest/emit.ts
 async function renderManifest(input) {
   const { outputFile, entries, projectName, namespace, modelEntries, modelNamespace, emitConverters = false } = input;
   const importsByPackage = /* @__PURE__ */ new Map();
@@ -1131,7 +1145,7 @@ async function renderManifest(input) {
     importsByPackage.set(entry.packageName, set);
   }
   const importLines = [...importsByPackage.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([pkg, names]) => {
-    const sortedNames = [...names].sort((a, b) => a.localeCompare(b)).join(", ");
+    const sortedNames = [...names].sort(compareStrings).join(", ");
     return `import { ${sortedNames} } from '${pkg}';`;
   });
   const entryLines = entries.map((e) => renderEntry(e));
@@ -1207,6 +1221,7 @@ function renderModelFields(fields, emitConverters) {
   return `[${items.join(", ")}]`;
 }
 function renderModelField(field, emitConverters) {
+  const nestedIsArrayLiteral = field.nestedIsArray ? "true" : "false";
   const parts = [
     `name: ${JSON.stringify(field.name)}`,
     `longName: ${JSON.stringify(field.longName)}`,
@@ -1217,7 +1232,7 @@ function renderModelField(field, emitConverters) {
     field.enumRef ? `enumRef: ${JSON.stringify(field.enumRef)}` : void 0,
     field.syncFlag ? `syncFlag: ${JSON.stringify(field.syncFlag)}` : void 0,
     field.nestedFields ? `nestedFields: ${renderModelFields(field.nestedFields, emitConverters)}` : void 0,
-    field.nestedFields ? `nestedIsArray: ${field.nestedIsArray ? "true" : "false"}` : void 0
+    field.nestedFields ? `nestedIsArray: ${nestedIsArrayLiteral}` : void 0
   ];
   return `{ ${parts.filter((v) => Boolean(v)).join(", ")} }`;
 }

package/firebase-api-manifest/package.json

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