@dereekb/firebase-server 13.19.0 → 13.21.0

package/mailgun/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dereekb/firebase-server/mailgun",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "peerDependencies": {
-    "@dereekb/analytics": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/firebase-server": "13.19.0",
-    "@dereekb/date": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/util": "13.19.0"
+    "@dereekb/analytics": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/firebase-server": "13.21.0",
+    "@dereekb/date": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/util": "13.21.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/mcp/index.cjs.js

@@ -487,7 +487,7 @@ function _unsupported_iterable_to_array$9(o, minLen) {
  * Version stamp embedded in `route.manifest.json`. Runtime loaders refuse
  * manifests whose `version` does not match. Mirror in `@dereekb/dbx-cli`'s
  * `ROUTE_MANIFEST_VERSION` — bump both together.
- */ var ROUTE_MANIFEST_VERSION = 1;
+ */ var ROUTE_MANIFEST_VERSION = 2;
 /**
  * Extracts the normalized pathname from a full URL or a bare path. Strips the
  * scheme/host/port, query string, and hash; collapses an empty path to `/` and
@@ -4171,6 +4171,11 @@ function _ts_generator$4(thisArg, body) {
 /**
  * Placeholder segment standing for the caller's authenticated uid.
  */ var AUTH_UID_PLACEHOLDER = '{authUid}';
+/**
+ * Matches a `{flatKey:<param>}` key template, capturing the route param whose
+ * URL value is a whole two-way-flat FirestoreModelKey. Mirror of the build-time
+ * `FLAT_KEY_TOKEN_RE` in `@dereekb/dbx-cli`'s route-model-tag parser.
+ */ var FLAT_KEY_TEMPLATE_RE = RegExp("^\\{flatKey:([a-zA-Z_][a-zA-Z0-9_]*)\\}$", "u");
 // MARK: Factory
 /**
  * Builds the built-in `url-models` MCP tool definition.
@@ -4449,6 +4454,8 @@ function resolveModelEntry(input) {
         result = base;
     } else if (entry.kind === 'id') {
         result = _object_spread$1({}, base, resolveIdKey(input));
+    } else if (entry.kind === 'flatKey') {
+        result = _object_spread$1({}, base, resolveFlatKey(input));
     } else {
         result = _object_spread$1({}, base, resolveFullKey(input));
     }
@@ -4487,6 +4494,57 @@ function resolveIdKey(input) {
     }
     return result;
 }
+function resolveFlatKey(input) {
+    var _entry_keyTemplate;
+    var entry = input.entry, params = input.params;
+    var match = FLAT_KEY_TEMPLATE_RE.exec((_entry_keyTemplate = entry.keyTemplate) !== null && _entry_keyTemplate !== void 0 ? _entry_keyTemplate : '');
+    var result;
+    if (match === null) {
+        var _entry_keyTemplate1;
+        // Defensive: a flatKey entry whose template is not `{flatKey:<param>}` (a malformed manifest).
+        result = {
+            unresolved: {
+                reason: 'invalid-flat-key',
+                message: "Model `".concat(entry.modelType, "` is a flatKey binding but its key template `").concat((_entry_keyTemplate1 = entry.keyTemplate) !== null && _entry_keyTemplate1 !== void 0 ? _entry_keyTemplate1 : '', "` is not `{flatKey:<param>}`.")
+            }
+        };
+    } else {
+        var paramName = match[1];
+        var value = params[paramName];
+        if (value === undefined || value.length === 0) {
+            result = {
+                unresolved: {
+                    reason: 'missing-param',
+                    message: "Route param `:".concat(paramName, "` (the flattened model key) was not captured from the URL.")
+                }
+            };
+        } else {
+            // The param value IS a two-way-flat key (`r_<id>_cs_<id>`); un-flatten it back to `r/<id>/cs/<id>`.
+            var key = firebase.inferKeyFromTwoWayFlatFirestoreModelKey(value);
+            result = isEvenSegmentKey(key) ? {
+                key: key
+            } : {
+                unresolved: {
+                    reason: 'invalid-flat-key',
+                    message: "Route param `:".concat(paramName, "` did not decode to a valid FirestoreModelKey (got `").concat(key, "`).")
+                }
+            };
+        }
+    }
+    return result;
+}
+/**
+ * Whether a decoded key has the shape of a FirestoreModelKey: a non-empty,
+ * even number of `/`-separated segments (collection/id pairs).
+ *
+ * @param key - The decoded (un-flattened) key.
+ * @returns True when the key has an even, non-zero segment count.
+ */ function isEvenSegmentKey(key) {
+    var segments = key.split('/').filter(function(s) {
+        return s.length > 0;
+    });
+    return segments.length >= 2 && segments.length % 2 === 0;
+}
 function resolveFullKey(input) {
     var _entry_keyTemplate;
     var entry = input.entry, params = input.params, uid = input.uid;

package/mcp/index.esm.js

@@ -7,7 +7,7 @@ import { makeValuesGroupMap, performAsyncTasks, authRolesSetHasRoles } from '@de
 import { ModelApiCallModelDispatchService, ModelApiGetService, FirebaseServerStorageService, FirebaseServerEnvService, FirebaseServerAnalyticsService } from '@dereekb/firebase-server';
 import { inspect } from 'node:util';
 import { arktypeToJsonSchemaForExport } from '@dereekb/model';
-import { callModelOidcScopeForCallType } from '@dereekb/firebase';
+import { callModelOidcScopeForCallType, inferKeyFromTwoWayFlatFirestoreModelKey } from '@dereekb/firebase';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 
 function _class_call_check$5(instance, Constructor) {
@@ -485,7 +485,7 @@ function _unsupported_iterable_to_array$9(o, minLen) {
  * Version stamp embedded in `route.manifest.json`. Runtime loaders refuse
  * manifests whose `version` does not match. Mirror in `@dereekb/dbx-cli`'s
  * `ROUTE_MANIFEST_VERSION` — bump both together.
- */ var ROUTE_MANIFEST_VERSION = 1;
+ */ var ROUTE_MANIFEST_VERSION = 2;
 /**
  * Extracts the normalized pathname from a full URL or a bare path. Strips the
  * scheme/host/port, query string, and hash; collapses an empty path to `/` and
@@ -4169,6 +4169,11 @@ function _ts_generator$4(thisArg, body) {
 /**
  * Placeholder segment standing for the caller's authenticated uid.
  */ var AUTH_UID_PLACEHOLDER = '{authUid}';
+/**
+ * Matches a `{flatKey:<param>}` key template, capturing the route param whose
+ * URL value is a whole two-way-flat FirestoreModelKey. Mirror of the build-time
+ * `FLAT_KEY_TOKEN_RE` in `@dereekb/dbx-cli`'s route-model-tag parser.
+ */ var FLAT_KEY_TEMPLATE_RE = RegExp("^\\{flatKey:([a-zA-Z_][a-zA-Z0-9_]*)\\}$", "u");
 // MARK: Factory
 /**
  * Builds the built-in `url-models` MCP tool definition.
@@ -4447,6 +4452,8 @@ function resolveModelEntry(input) {
         result = base;
     } else if (entry.kind === 'id') {
         result = _object_spread$1({}, base, resolveIdKey(input));
+    } else if (entry.kind === 'flatKey') {
+        result = _object_spread$1({}, base, resolveFlatKey(input));
     } else {
         result = _object_spread$1({}, base, resolveFullKey(input));
     }
@@ -4485,6 +4492,57 @@ function resolveIdKey(input) {
     }
     return result;
 }
+function resolveFlatKey(input) {
+    var _entry_keyTemplate;
+    var entry = input.entry, params = input.params;
+    var match = FLAT_KEY_TEMPLATE_RE.exec((_entry_keyTemplate = entry.keyTemplate) !== null && _entry_keyTemplate !== void 0 ? _entry_keyTemplate : '');
+    var result;
+    if (match === null) {
+        var _entry_keyTemplate1;
+        // Defensive: a flatKey entry whose template is not `{flatKey:<param>}` (a malformed manifest).
+        result = {
+            unresolved: {
+                reason: 'invalid-flat-key',
+                message: "Model `".concat(entry.modelType, "` is a flatKey binding but its key template `").concat((_entry_keyTemplate1 = entry.keyTemplate) !== null && _entry_keyTemplate1 !== void 0 ? _entry_keyTemplate1 : '', "` is not `{flatKey:<param>}`.")
+            }
+        };
+    } else {
+        var paramName = match[1];
+        var value = params[paramName];
+        if (value === undefined || value.length === 0) {
+            result = {
+                unresolved: {
+                    reason: 'missing-param',
+                    message: "Route param `:".concat(paramName, "` (the flattened model key) was not captured from the URL.")
+                }
+            };
+        } else {
+            // The param value IS a two-way-flat key (`r_<id>_cs_<id>`); un-flatten it back to `r/<id>/cs/<id>`.
+            var key = inferKeyFromTwoWayFlatFirestoreModelKey(value);
+            result = isEvenSegmentKey(key) ? {
+                key: key
+            } : {
+                unresolved: {
+                    reason: 'invalid-flat-key',
+                    message: "Route param `:".concat(paramName, "` did not decode to a valid FirestoreModelKey (got `").concat(key, "`).")
+                }
+            };
+        }
+    }
+    return result;
+}
+/**
+ * Whether a decoded key has the shape of a FirestoreModelKey: a non-empty,
+ * even number of `/`-separated segments (collection/id pairs).
+ *
+ * @param key - The decoded (un-flattened) key.
+ * @returns True when the key has an even, non-zero segment count.
+ */ function isEvenSegmentKey(key) {
+    var segments = key.split('/').filter(function(s) {
+        return s.length > 0;
+    });
+    return segments.length >= 2 && segments.length % 2 === 0;
+}
 function resolveFullKey(input) {
     var _entry_keyTemplate;
     var entry = input.entry, params = input.params, uid = input.uid;

package/mcp/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@dereekb/firebase-server/mcp",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "peerDependencies": {
-    "@dereekb/analytics": "13.19.0",
-    "@dereekb/date": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/firebase-server": "13.19.0",
-    "@dereekb/firebase-server/oidc": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/util": "13.19.0",
-    "@dereekb/zoho": "13.19.0",
+    "@dereekb/analytics": "13.21.0",
+    "@dereekb/date": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/firebase-server": "13.21.0",
+    "@dereekb/firebase-server/oidc": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/util": "13.21.0",
+    "@dereekb/zoho": "13.21.0",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@nestjs/common": "^11.1.19",
     "@nestjs/core": "^11.1.19",

package/mcp/src/index.d.ts

@@ -1 +1,19 @@
+/**
+ * Public entry for `@dereekb/firebase-server/mcp`.
+ *
+ * Packaging note: the published `exports["./mcp"]` maps the `import` condition to
+ * the real ESM build (`./mcp/index.esm.js`), NOT the `.cjs.mjs` CJS re-export
+ * shim, so a downstream `import { matchRouteManifestUrl, ROUTE_MANIFEST_VERSION }
+ * from '@dereekb/firebase-server/mcp'` exposes statically-analyzable named
+ * exports under vitest. The shim (`export * from './index.cjs.js'`) resolved to
+ * `undefined` for this subpath under vitest's externalized SSR resolution, while
+ * plain Node and the root `@dereekb/firebase-server` entry were unaffected.
+ * `require` / the `default` condition still resolves to the CJS build for CJS
+ * consumers (the NestJS server runtime).
+ *
+ * Fallback: if a downstream still sees undefined named imports (e.g. consuming a
+ * build that predates this fix), inline the package in its vitest config so Vite
+ * transforms it through the `module` (ESM) condition:
+ * `test: { server: { deps: { inline: [/@dereekb\/firebase-server/] } } }`.
+ */
 export * from './lib';

package/mcp/src/lib/service/mcp.route-manifest.d.ts

@@ -12,12 +12,13 @@
  * manifests whose `version` does not match. Mirror in `@dereekb/dbx-cli`'s
  * `ROUTE_MANIFEST_VERSION` — bump both together.
  */
-export declare const ROUTE_MANIFEST_VERSION: 1;
+export declare const ROUTE_MANIFEST_VERSION: 2;
 /**
- * Whether a route-model entry resolves to a promoted id, a full key, or a
- * keyless list. Mirror of `@dereekb/dbx-cli`'s `RouteModelKind`.
+ * Whether a route-model entry resolves to a promoted id, a full key, a
+ * single-param flattened key, or a keyless list. Mirror of `@dereekb/dbx-cli`'s
+ * `RouteModelKind`.
  */
-export type RouteModelKind = 'id' | 'key' | 'list';
+export type RouteModelKind = 'id' | 'key' | 'flatKey' | 'list';
 /**
  * One model an app page renders. Structural mirror of `@dereekb/dbx-cli`'s
  * `RouteManifestModelEntry`.

package/mcp/src/lib/service/tools/mcp.tool.url-models.d.ts

@@ -19,7 +19,7 @@ export declare const URL_MODELS_DISPATCH_MODEL_TYPE = "route";
 /**
  * Why a model binding could not be resolved into a concrete key.
  */
-export type UrlModelUnresolvedReason = 'missing-param' | 'subcollection-requires-key-template' | 'unknown-model-type' | 'auth-required';
+export type UrlModelUnresolvedReason = 'missing-param' | 'subcollection-requires-key-template' | 'unknown-model-type' | 'auth-required' | 'invalid-flat-key';
 /**
  * One resolved model binding for a matched page.
  */

package/model/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dereekb/firebase-server/model",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "peerDependencies": {
-    "@dereekb/analytics": "13.19.0",
-    "@dereekb/date": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/firebase-server": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/util": "13.19.0",
+    "@dereekb/analytics": "13.21.0",
+    "@dereekb/date": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/firebase-server": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/util": "13.21.0",
     "@nestjs/common": "^11.1.19",
     "@nestjs/config": "^4.0.4",
     "archiver": "^7.0.1",
@@ -17,7 +17,7 @@
     "firebase-functions": "^7.2.5",
     "make-error": "^1.3.6",
     "@cantoo/pdf-lib": "^2.6.5",
-    "sharp": "0.34.5"
+    "sharp": "0.35.2"
   },
   "exports": {
     "./package.json": "./package.json",

package/oidc/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@dereekb/firebase-server/oidc",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "peerDependencies": {
-    "@dereekb/analytics": "13.19.0",
-    "@dereekb/date": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/firebase-server": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/util": "13.19.0",
-    "@dereekb/zoho": "13.19.0",
+    "@dereekb/analytics": "13.21.0",
+    "@dereekb/date": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/firebase-server": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/util": "13.21.0",
+    "@dereekb/zoho": "13.21.0",
     "@nestjs/common": "^11.1.19",
     "@nestjs/config": "^4.0.4",
     "express": "^5.2.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase-server",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "sideEffects": false,
   "exports": {
     "./test": {
@@ -42,7 +42,7 @@
     "./mcp": {
       "module": "./mcp/index.esm.js",
       "types": "./mcp/index.d.ts",
-      "import": "./mcp/index.cjs.mjs",
+      "import": "./mcp/index.esm.js",
       "default": "./mcp/index.cjs.js"
     },
     "./package.json": "./package.json",
@@ -57,15 +57,15 @@
   "types": "./src/index.d.ts",
   "peerDependencies": {
     "@cantoo/pdf-lib": "^2.6.5",
-    "@dereekb/analytics": "13.19.0",
-    "@dereekb/date": "13.19.0",
-    "@dereekb/dbx-core": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/util": "13.19.0",
-    "@dereekb/zoho": "13.19.0",
+    "@dereekb/analytics": "13.21.0",
+    "@dereekb/date": "13.21.0",
+    "@dereekb/dbx-core": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/util": "13.21.0",
+    "@dereekb/zoho": "13.21.0",
     "@google-cloud/firestore": "^7.11.6",
     "@google-cloud/storage": "^7.19.0",
     "@modelcontextprotocol/sdk": "1.29.0",
@@ -86,7 +86,7 @@
     "nanoid": "^5.1.9",
     "oidc-provider": "^9.8.2",
     "rxjs": "^7.8.2",
-    "sharp": "0.34.5",
+    "sharp": "0.35.2",
     "supertest": "^7.2.2",
     "ts-essentials": "^10.2.0"
   },

package/test/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@dereekb/firebase-server/test",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "peerDependencies": {
-    "@dereekb/analytics": "13.19.0",
-    "@dereekb/date": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/firebase-server": "13.19.0",
-    "@dereekb/firebase-server/oidc": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/util": "13.19.0",
+    "@dereekb/analytics": "13.21.0",
+    "@dereekb/date": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/firebase-server": "13.21.0",
+    "@dereekb/firebase-server/oidc": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/util": "13.21.0",
     "@google-cloud/firestore": "^7.11.6",
     "@google-cloud/storage": "^7.19.0",
     "@nestjs/common": "^11.1.19",
@@ -23,7 +23,7 @@
     "supertest": "^7.2.2"
   },
   "devDependencies": {
-    "@dereekb/nestjs": "13.19.0"
+    "@dereekb/nestjs": "13.21.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/twilio/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dereekb/firebase-server/twilio",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "peerDependencies": {
-    "@dereekb/date": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/firebase-server": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/util": "13.19.0"
+    "@dereekb/date": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/firebase-server": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/util": "13.21.0"
   },
   "exports": {
     "./package.json": "./package.json",

package/zoho/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@dereekb/firebase-server/zoho",
-  "version": "13.19.0",
+  "version": "13.21.0",
   "peerDependencies": {
-    "@dereekb/analytics": "13.19.0",
-    "@dereekb/date": "13.19.0",
-    "@dereekb/model": "13.19.0",
-    "@dereekb/nestjs": "13.19.0",
-    "@dereekb/rxjs": "13.19.0",
-    "@dereekb/firebase": "13.19.0",
-    "@dereekb/util": "13.19.0",
-    "@dereekb/zoho": "13.19.0"
+    "@dereekb/analytics": "13.21.0",
+    "@dereekb/date": "13.21.0",
+    "@dereekb/model": "13.21.0",
+    "@dereekb/nestjs": "13.21.0",
+    "@dereekb/rxjs": "13.21.0",
+    "@dereekb/firebase": "13.21.0",
+    "@dereekb/util": "13.21.0",
+    "@dereekb/zoho": "13.21.0"
   },
   "exports": {
     "./package.json": "./package.json",