@dereekb/dbx-cli 14.5.1 → 14.6.0

package/eslint/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/dbx-cli/eslint",
-  "version": "14.5.1",
+  "version": "14.6.0",
   "sideEffects": false,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.5.1",
-    "@dereekb/util": "14.5.1",
+    "@dereekb/dbx-cli": "14.6.0",
+    "@dereekb/util": "14.6.0",
     "@typescript-eslint/utils": "8.69.0",
     "typescript": "6.0.3"
   },

package/firebase-api-manifest/main.js

@@ -728,6 +728,7 @@ 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_$]*$/;
+var COMPOSITE_KEY_MODEL_NAME_PATTERN = /^[A-Za-z][A-Za-z0-9_$]*$/;
 var IDENTITY_FN = "firestoreModelIdentity";
 var IDENTITY_TYPE = "FirestoreModelIdentity";
 var ROOT_IDENTITY_TYPE = "RootFirestoreModelIdentity";
@@ -844,6 +845,7 @@ function buildInterface(decl) {
   const dbxModelRead = readDbxModelReadTag(jsDocs);
   const dbxModelServerOnly = jsDocsHaveTag(jsDocs, "dbxModelServerOnly");
   const mcpToolNameSegment = readMcpToolNameSegmentTag(jsDocs);
+  const compositeKey = readDbxModelCompositeKeyTag(jsDocs);
   const extendsNames = decl.getExtends().map(resolveExtendsName);
   const props = [];
   for (const prop of decl.getProperties()) {
@@ -869,7 +871,8 @@ function buildInterface(decl) {
     props,
     ...dbxModelRead === void 0 ? {} : { dbxModelRead },
     ...dbxModelServerOnly ? { dbxModelServerOnly: true } : {},
-    ...mcpToolNameSegment === void 0 ? {} : { mcpToolNameSegment }
+    ...mcpToolNameSegment === void 0 ? {} : { mcpToolNameSegment },
+    ...compositeKey === void 0 ? {} : { compositeKey }
   };
 }
 function readMcpToolNameSegmentTag(jsDocs) {
@@ -904,6 +907,43 @@ function readDbxModelReadTag(jsDocs) {
   }
   return result;
 }
+function readDbxModelCompositeKeyTag(jsDocs) {
+  let result;
+  for (const doc of jsDocs) {
+    for (const tag of doc.getTags()) {
+      if (tag.getTagName() !== "dbxModelCompositeKey") continue;
+      if (result !== void 0) continue;
+      result = parseCompositeKeyTagValue(tag.getCommentText() ?? "");
+    }
+  }
+  return result;
+}
+function parseCompositeKeyTagValue(raw) {
+  let from;
+  let encoding;
+  for (const token of raw.trim().split(/\s+/)) {
+    const eq = token.indexOf("=");
+    if (eq <= 0) continue;
+    const key = token.slice(0, eq);
+    const value = token.slice(eq + 1);
+    if (key === "from") {
+      from = parseCompositeKeyFromValue(value);
+    } else if (key === "encoding" && (value === "one-way" || value === "two-way")) {
+      encoding = value;
+    }
+  }
+  return from !== void 0 && encoding !== void 0 ? { from, encoding } : void 0;
+}
+function parseCompositeKeyFromValue(value) {
+  let result;
+  if (value === "*") {
+    result = "*";
+  } else {
+    const names = value.split(",").map((x) => x.trim()).filter((x) => COMPOSITE_KEY_MODEL_NAME_PATTERN.test(x));
+    result = names.length > 0 ? names : void 0;
+  }
+  return result;
+}
 function readServiceFactories(sourceFile) {
   const out = [];
   for (const statement of sourceFile.getVariableStatements()) {
@@ -1541,7 +1581,8 @@ function buildManifestEntry(input) {
     ...iface.mcpToolNameSegment ? { mcpToolNameSegment: iface.mcpToolNameSegment } : {},
     ...iface.dbxModelRead ? { read: iface.dbxModelRead } : {},
     ...iface.dbxModelServerOnly ? { serverOnly: true } : {},
-    ...serviceFactory ? { serviceFactory } : {}
+    ...serviceFactory ? { serviceFactory } : {},
+    ...iface.compositeKey ? { compositeKey: iface.compositeKey } : {}
   };
 }
 function resolveSingleItemDocumentId(single, registries) {
@@ -1809,7 +1850,8 @@ function renderModelEntry(entry, emitConverters) {
     entry.mcpToolNameSegment ? `mcpToolNameSegment: ${JSON.stringify(entry.mcpToolNameSegment)}` : void 0,
     entry.read ? `read: ${JSON.stringify(entry.read)}` : void 0,
     entry.serverOnly ? "serverOnly: true" : void 0,
-    entry.serviceFactory ? `serviceFactory: { exportName: ${JSON.stringify(entry.serviceFactory.exportName)}, sourceFile: ${JSON.stringify(entry.serviceFactory.sourceFile)} }` : void 0
+    entry.serviceFactory ? `serviceFactory: { exportName: ${JSON.stringify(entry.serviceFactory.exportName)}, sourceFile: ${JSON.stringify(entry.serviceFactory.sourceFile)} }` : void 0,
+    entry.compositeKey ? `compositeKey: { from: ${JSON.stringify(entry.compositeKey.from)}, encoding: ${JSON.stringify(entry.compositeKey.encoding)} }` : void 0
   ];
   return `  { ${fields.filter(Boolean).join(", ")} }`;
 }
@@ -1860,13 +1902,13 @@ function renderModelField(field, emitConverters) {
 // packages/dbx-cli/firebase-api-manifest/package.json
 var package_default = {
   name: "@dereekb/dbx-cli-firebase-api-manifest",
-  version: "14.5.1",
+  version: "14.6.0",
   sideEffects: false,
   private: true,
   type: "module",
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.5.1",
-    "@dereekb/util": "14.5.1",
+    "@dereekb/dbx-cli": "14.6.0",
+    "@dereekb/util": "14.6.0",
     oxfmt: "^0.66.0",
     "ts-morph": "^28.0.0"
   }

package/firebase-api-manifest/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/dbx-cli-firebase-api-manifest",
-  "version": "14.5.1",
+  "version": "14.6.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.5.1",
-    "@dereekb/util": "14.5.1",
+    "@dereekb/dbx-cli": "14.6.0",
+    "@dereekb/util": "14.6.0",
     "oxfmt": "^0.66.0",
     "ts-morph": "^28.0.0"
   }

package/firestore-query-manifest/main.js

@@ -9,7 +9,7 @@ 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.5.1",
+  version: "14.6.0",
   sideEffects: false,
   private: true,
   type: "module",
@@ -17,8 +17,8 @@ var package_default = {
     eslint: "10.9.1"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.5.1",
-    "@dereekb/util": "14.5.1"
+    "@dereekb/dbx-cli": "14.6.0",
+    "@dereekb/util": "14.6.0"
   }
 };
 

package/firestore-query-manifest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli-firestore-query-manifest",
-  "version": "14.5.1",
+  "version": "14.6.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
@@ -8,7 +8,7 @@
     "eslint": "10.9.1"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.5.1",
-    "@dereekb/util": "14.5.1"
+    "@dereekb/dbx-cli": "14.6.0",
+    "@dereekb/util": "14.6.0"
   }
 }

package/generate-firestore-indexes/main.js

@@ -5,7 +5,7 @@ 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.5.1",
+  version: "14.6.0",
   sideEffects: false,
   private: true,
   type: "module",
@@ -13,7 +13,7 @@ var package_default = {
     eslint: "10.9.1"
   },
   peerDependencies: {
-    "@dereekb/dbx-cli": "14.5.1"
+    "@dereekb/dbx-cli": "14.6.0"
   }
 };
 

package/generate-firestore-indexes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/dbx-cli-generate-firestore-indexes",
-  "version": "14.5.1",
+  "version": "14.6.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
@@ -8,6 +8,6 @@
     "eslint": "10.9.1"
   },
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.5.1"
+    "@dereekb/dbx-cli": "14.6.0"
   }
 }

package/generate-mcp-manifest/main.js

@@ -1138,7 +1138,8 @@ function projectModelEntry(entry) {
     ...entry.mcpToolNameSegment == null ? {} : { mcpToolNameSegment: entry.mcpToolNameSegment },
     ...entry.read == null ? {} : { read: entry.read },
     ...entry.serverOnly == null ? {} : { serverOnly: entry.serverOnly },
-    ...entry.serviceFactory == null ? {} : { serviceFactory: entry.serviceFactory }
+    ...entry.serviceFactory == null ? {} : { serviceFactory: entry.serviceFactory },
+    ...entry.compositeKey == null ? {} : { compositeKey: entry.compositeKey }
   };
   return projected;
 }

package/generate-mcp-manifest/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/dbx-cli-generate-mcp-manifest",
-  "version": "14.5.1",
+  "version": "14.6.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.5.1",
-    "@dereekb/model": "14.5.1",
+    "@dereekb/dbx-cli": "14.6.0",
+    "@dereekb/model": "14.6.0",
     "arktype": "^2.2.0",
     "jiti": "2.7.0"
   }

package/generate-route-manifest/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@dereekb/dbx-cli-generate-route-manifest",
-  "version": "14.5.1",
+  "version": "14.6.0",
   "sideEffects": false,
   "private": true,
   "type": "module",
   "peerDependencies": {
-    "@dereekb/dbx-cli": "14.5.1",
+    "@dereekb/dbx-cli": "14.6.0",
     "ts-morph": "^28.0.0"
   }
 }