@dereekb/firebase-server 13.15.0 → 13.16.0

package/index.cjs.js

@@ -18,7 +18,7 @@ var model = require('@dereekb/model');
 var admin = require('firebase-admin');
 var storage = require('@google-cloud/storage');
 var dateFns = require('date-fns');
-var types = require('util/types');
+var types = require('node:util/types');
 var rxjs$1 = require('@dereekb/rxjs');
 var platformExpress = require('@nestjs/platform-express');
 var express = require('express');
@@ -1335,7 +1335,7 @@ function _ts_generator$g(thisArg, body) {
                                 ];
                             case 1:
                                 claims = _state.sent();
-                                result = claims.resetPassword != null ? claims : undefined;
+                                result = claims.resetPassword == null ? undefined : claims;
                                 return [
                                     2,
                                     result
@@ -1746,15 +1746,21 @@ function _ts_generator$g(thisArg, body) {
                             case 1:
                                 userRecord = _state.sent();
                                 createdUser = false;
-                                if (!!userRecord) return [
+                                if (!userRecord) return [
                                     3,
-                                    5
+                                    2
+                                ];
+                                userRecordId = userRecord.uid;
+                                return [
+                                    3,
+                                    6
                                 ];
+                            case 2:
                                 return [
                                     4,
                                     this.createNewUser(input)
                                 ];
-                            case 2:
+                            case 3:
                                 createResult = _state.sent();
                                 // add the setup password to the user's credentials
                                 userContext = this.authService.userContext(createResult.user.uid);
@@ -1762,7 +1768,7 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     this.addNewUserSetupClaims(userContext, createResult.password)
                                 ];
-                            case 3:
+                            case 4:
                                 _state.sent();
                                 createdUser = true;
                                 userRecordId = userContext.uid;
@@ -1770,14 +1776,8 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     userContext.loadRecord()
                                 ];
-                            case 4:
-                                userRecord = _state.sent();
-                                return [
-                                    3,
-                                    6
-                                ];
                             case 5:
-                                userRecordId = userRecord.uid;
+                                userRecord = _state.sent();
                                 _state.label = 6;
                             case 6:
                                 if (!(createdUser && sendSetupContent === true || sendSetupContentIfUserExists)) return [
@@ -3611,10 +3611,10 @@ function _define_property$v(obj, key, value) {
         {
             key: "update",
             value: function update(data, params) {
-                if ((params === null || params === void 0 ? void 0 : params.precondition) != null) {
-                    this.batch.update(this.documentRef, data, params.precondition);
-                } else {
+                if ((params === null || params === void 0 ? void 0 : params.precondition) == null) {
                     this.batch.update(this.documentRef, data);
+                } else {
+                    this.batch.update(this.documentRef, data, params.precondition);
                 }
                 return Promise.resolve();
             }
@@ -9577,7 +9577,7 @@ function _object_spread_props$7(target, source) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function makeBlockingFunctionWithHandler(blockingFunctionBuilder, handler, opts) {
-    var blockingFn = opts != null ? blockingFunctionBuilder(opts, handler) : blockingFunctionBuilder(handler);
+    var blockingFn = opts == null ? blockingFunctionBuilder(handler) : blockingFunctionBuilder(opts, handler);
     blockingFn.__handler = handler;
     return blockingFn;
 }
@@ -10244,7 +10244,7 @@ function _ts_generator$5(thisArg, body) {
  * @__NO_SIDE_EFFECTS__
  */ function firebaseServerActionsTransformFactory(options) {
     var logError = (options !== null && options !== void 0 ? options : {}).logError;
-    var logErrorFunction = logError !== false ? typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction : util.mapIdentityFunction;
+    var logErrorFunction = logError === false ? util.mapIdentityFunction : typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction;
     return model.transformAndValidateObjectFactory({
         handleValidationError: function handleValidationError(validationErrors) {
             return _async_to_generator$5(function() {
@@ -10556,15 +10556,11 @@ exports.FirebaseAppCheckMiddleware = __decorate([
             switch(_state.label){
                 case 0:
                     appCheckToken = req.header('X-Firebase-AppCheck');
-                    if (!!appCheckToken) return [
-                        3,
-                        1
-                    ];
-                    error = new common.ForbiddenException();
-                    return [
+                    if (!appCheckToken) return [
                         3,
-                        4
+                        5
                     ];
+                    _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
@@ -10590,6 +10586,14 @@ exports.FirebaseAppCheckMiddleware = __decorate([
                         4
                     ];
                 case 4:
+                    return [
+                        3,
+                        6
+                    ];
+                case 5:
+                    error = new common.ForbiddenException();
+                    _state.label = 6;
+                case 6:
                     return [
                         2,
                         error
@@ -11239,7 +11243,7 @@ function _ts_generator$2(thisArg, body) {
             contentEncoding: (_options_metadata3 = options.metadata) === null || _options_metadata3 === void 0 ? void 0 : _options_metadata3.contentEncoding,
             contentLanguage: (_options_metadata4 = options.metadata) === null || _options_metadata4 === void 0 ? void 0 : _options_metadata4.contentLanguage,
             contentType: (_options_metadata5 = options.metadata) === null || _options_metadata5 === void 0 ? void 0 : _options_metadata5.contentType,
-            metadata: !util.objectHasNoKeys(customMetadata) ? customMetadata : undefined
+            metadata: util.objectHasNoKeys(customMetadata) ? undefined : customMetadata
         });
     }
     function makeUploadOptions(options) {
@@ -11335,8 +11339,8 @@ function _ts_generator$2(thisArg, body) {
             return _async_to_generator$2(function() {
                 var _ref, _ref1, expires, config;
                 return _ts_generator$2(this, function(_state) {
-                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) != null ? dateFns.addMilliseconds(new Date(), input.expiresIn) // use expiresIn if provided
-                     : dateFns.addHours(new Date(), 1); // default expiration in 1 hour
+                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) == null ? dateFns.addHours(new Date(), 1) // use expiresIn if provided
+                     : dateFns.addMilliseconds(new Date(), input.expiresIn); // default expiration in 1 hour
                     config = _object_spread_props$3(_object_spread$3({}, input), {
                         action: (_ref1 = input === null || input === void 0 ? void 0 : input.action) !== null && _ref1 !== void 0 ? _ref1 : 'read',
                         expires: expires,
@@ -11502,9 +11506,9 @@ function _ts_generator$2(thisArg, body) {
             });
         },
         makePublic: function makePublic(setPublic) {
-            return (setPublic !== false ? file.acl.add(PUBLIC_ACL) : file.acl.delete({
+            return (setPublic === false ? file.acl.delete({
                 entity: PUBLIC_ACL.entity
-            })).then(function() {
+            }) : file.acl.add(PUBLIC_ACL)).then(function() {
                 return undefined;
             });
         },

package/index.esm.js

@@ -15,8 +15,8 @@ import { https, scheduler } from 'firebase-functions/v2';
 import { toTransformAndValidateFunctionResultFactory, transformAndValidateObjectFactory } from '@dereekb/model';
 import admin from 'firebase-admin';
 import { ApiError } from '@google-cloud/storage';
-import { addMilliseconds, addHours } from 'date-fns';
-import { isUint8Array, isArrayBuffer } from 'util/types';
+import { addHours, addMilliseconds } from 'date-fns';
+import { isUint8Array, isArrayBuffer } from 'node:util/types';
 import { fetchAssetLoader, delegatedAssetLoader, AssetLoader } from '@dereekb/rxjs';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import express from 'express';
@@ -1333,7 +1333,7 @@ function _ts_generator$g(thisArg, body) {
                                 ];
                             case 1:
                                 claims = _state.sent();
-                                result = claims.resetPassword != null ? claims : undefined;
+                                result = claims.resetPassword == null ? undefined : claims;
                                 return [
                                     2,
                                     result
@@ -1744,15 +1744,21 @@ function _ts_generator$g(thisArg, body) {
                             case 1:
                                 userRecord = _state.sent();
                                 createdUser = false;
-                                if (!!userRecord) return [
+                                if (!userRecord) return [
                                     3,
-                                    5
+                                    2
+                                ];
+                                userRecordId = userRecord.uid;
+                                return [
+                                    3,
+                                    6
                                 ];
+                            case 2:
                                 return [
                                     4,
                                     this.createNewUser(input)
                                 ];
-                            case 2:
+                            case 3:
                                 createResult = _state.sent();
                                 // add the setup password to the user's credentials
                                 userContext = this.authService.userContext(createResult.user.uid);
@@ -1760,7 +1766,7 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     this.addNewUserSetupClaims(userContext, createResult.password)
                                 ];
-                            case 3:
+                            case 4:
                                 _state.sent();
                                 createdUser = true;
                                 userRecordId = userContext.uid;
@@ -1768,14 +1774,8 @@ function _ts_generator$g(thisArg, body) {
                                     4,
                                     userContext.loadRecord()
                                 ];
-                            case 4:
-                                userRecord = _state.sent();
-                                return [
-                                    3,
-                                    6
-                                ];
                             case 5:
-                                userRecordId = userRecord.uid;
+                                userRecord = _state.sent();
                                 _state.label = 6;
                             case 6:
                                 if (!(createdUser && sendSetupContent === true || sendSetupContentIfUserExists)) return [
@@ -3609,10 +3609,10 @@ function _define_property$v(obj, key, value) {
         {
             key: "update",
             value: function update(data, params) {
-                if ((params === null || params === void 0 ? void 0 : params.precondition) != null) {
-                    this.batch.update(this.documentRef, data, params.precondition);
-                } else {
+                if ((params === null || params === void 0 ? void 0 : params.precondition) == null) {
                     this.batch.update(this.documentRef, data);
+                } else {
+                    this.batch.update(this.documentRef, data, params.precondition);
                 }
                 return Promise.resolve();
             }
@@ -9575,7 +9575,7 @@ function _object_spread_props$7(target, source) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function makeBlockingFunctionWithHandler(blockingFunctionBuilder, handler, opts) {
-    var blockingFn = opts != null ? blockingFunctionBuilder(opts, handler) : blockingFunctionBuilder(handler);
+    var blockingFn = opts == null ? blockingFunctionBuilder(handler) : blockingFunctionBuilder(opts, handler);
     blockingFn.__handler = handler;
     return blockingFn;
 }
@@ -10242,7 +10242,7 @@ function _ts_generator$5(thisArg, body) {
  * @__NO_SIDE_EFFECTS__
  */ function firebaseServerActionsTransformFactory(options) {
     var logError = (options !== null && options !== void 0 ? options : {}).logError;
-    var logErrorFunction = logError !== false ? typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction : mapIdentityFunction;
+    var logErrorFunction = logError === false ? mapIdentityFunction : typeof logError === 'function' ? logError : defaultFirebaseServerActionsTransformFactoryLogErrorFunction;
     return transformAndValidateObjectFactory({
         handleValidationError: function handleValidationError(validationErrors) {
             return _async_to_generator$5(function() {
@@ -10554,15 +10554,11 @@ FirebaseAppCheckMiddleware = __decorate([
             switch(_state.label){
                 case 0:
                     appCheckToken = req.header('X-Firebase-AppCheck');
-                    if (!!appCheckToken) return [
-                        3,
-                        1
-                    ];
-                    error = new ForbiddenException();
-                    return [
+                    if (!appCheckToken) return [
                         3,
-                        4
+                        5
                     ];
+                    _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
@@ -10588,6 +10584,14 @@ FirebaseAppCheckMiddleware = __decorate([
                         4
                     ];
                 case 4:
+                    return [
+                        3,
+                        6
+                    ];
+                case 5:
+                    error = new ForbiddenException();
+                    _state.label = 6;
+                case 6:
                     return [
                         2,
                         error
@@ -11237,7 +11241,7 @@ function _ts_generator$2(thisArg, body) {
             contentEncoding: (_options_metadata3 = options.metadata) === null || _options_metadata3 === void 0 ? void 0 : _options_metadata3.contentEncoding,
             contentLanguage: (_options_metadata4 = options.metadata) === null || _options_metadata4 === void 0 ? void 0 : _options_metadata4.contentLanguage,
             contentType: (_options_metadata5 = options.metadata) === null || _options_metadata5 === void 0 ? void 0 : _options_metadata5.contentType,
-            metadata: !objectHasNoKeys(customMetadata) ? customMetadata : undefined
+            metadata: objectHasNoKeys(customMetadata) ? undefined : customMetadata
         });
     }
     function makeUploadOptions(options) {
@@ -11333,8 +11337,8 @@ function _ts_generator$2(thisArg, body) {
             return _async_to_generator$2(function() {
                 var _ref, _ref1, expires, config;
                 return _ts_generator$2(this, function(_state) {
-                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) != null ? addMilliseconds(new Date(), input.expiresIn) // use expiresIn if provided
-                     : addHours(new Date(), 1); // default expiration in 1 hour
+                    expires = (_ref = input === null || input === void 0 ? void 0 : input.expiresAt) !== null && _ref !== void 0 ? _ref : (input === null || input === void 0 ? void 0 : input.expiresIn) == null ? addHours(new Date(), 1) // use expiresIn if provided
+                     : addMilliseconds(new Date(), input.expiresIn); // default expiration in 1 hour
                     config = _object_spread_props$3(_object_spread$3({}, input), {
                         action: (_ref1 = input === null || input === void 0 ? void 0 : input.action) !== null && _ref1 !== void 0 ? _ref1 : 'read',
                         expires: expires,
@@ -11500,9 +11504,9 @@ function _ts_generator$2(thisArg, body) {
             });
         },
         makePublic: function makePublic(setPublic) {
-            return (setPublic !== false ? file.acl.add(PUBLIC_ACL) : file.acl.delete({
+            return (setPublic === false ? file.acl.delete({
                 entity: PUBLIC_ACL.entity
-            })).then(function() {
+            }) : file.acl.add(PUBLIC_ACL)).then(function() {
                 return undefined;
             });
         },

package/mailgun/package.json

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

package/mcp/index.cjs.js

@@ -1994,11 +1994,11 @@ function findGroupCount(query, manifest) {
 function buildModelNotFoundMessage(query, manifest) {
     var groupMatch = findGroupCount(query, manifest);
     var message;
-    if (groupMatch != null) {
+    if (groupMatch == null) {
+        message = 'model-info: no exact match for "'.concat(query, '". Call `model-info` with no arguments to list groups, or pass all:true for the full catalog.');
+    } else {
         var plural = groupMatch.modelCount === 1 ? '' : 's';
         message = 'model-info: no exact match for "'.concat(query, '" — did you mean group:"').concat(groupMatch.modelGroup, '" (').concat(groupMatch.modelCount, " model").concat(plural, ')? Use modelGroup:"').concat(groupMatch.modelGroup, '", or all:true for everything.');
-    } else {
-        message = 'model-info: no exact match for "'.concat(query, '". Call `model-info` with no arguments to list groups, or pass all:true for the full catalog.');
     }
     return message;
 }
@@ -3437,7 +3437,7 @@ function parseJsonArrayOperations(fileText) {
         });
     }
     if (!Array.isArray(parsed)) {
-        throw new Error('batch-execute: with format "json" the file must contain a top-level array of operations.');
+        throw new TypeError('batch-execute: with format "json" the file must contain a top-level array of operations.');
     }
     return parsed;
 }
@@ -3719,10 +3719,10 @@ function maybeDeleteUpload(input) {
  * @param bucketId - The bucket id, or `undefined` for the default bucket.
  * @returns The resolved storage path input.
  */ function toStoragePathInput(pathString, bucketId) {
-    return bucketId != null ? {
-        bucketId: bucketId,
+    return bucketId == null ? {
         pathString: pathString
     } : {
+        bucketId: bucketId,
         pathString: pathString
     };
 }
@@ -5669,7 +5669,7 @@ var FirebaseServerMcpAnalyticsService_1;
             value: function handleMcpAnalyticsEvent(event) {
                 if (this._logEvents) {
                     var uidSuffix = event.uid ? " uid=".concat(event.uid) : '';
-                    var durationSuffix = event.durationMs != null ? " (".concat(event.durationMs, "ms)") : '';
+                    var durationSuffix = event.durationMs == null ? '' : " (".concat(event.durationMs, "ms)");
                     var outcome = event.isSuccessful ? 'Succeeded' : 'Failed';
                     this._logger.log("MCP ".concat(event.toolName, " [").concat(event.toolKind, "] ").concat(outcome).concat(uidSuffix).concat(durationSuffix));
                 }

package/mcp/index.esm.js

@@ -1992,11 +1992,11 @@ function findGroupCount(query, manifest) {
 function buildModelNotFoundMessage(query, manifest) {
     var groupMatch = findGroupCount(query, manifest);
     var message;
-    if (groupMatch != null) {
+    if (groupMatch == null) {
+        message = 'model-info: no exact match for "'.concat(query, '". Call `model-info` with no arguments to list groups, or pass all:true for the full catalog.');
+    } else {
         var plural = groupMatch.modelCount === 1 ? '' : 's';
         message = 'model-info: no exact match for "'.concat(query, '" — did you mean group:"').concat(groupMatch.modelGroup, '" (').concat(groupMatch.modelCount, " model").concat(plural, ')? Use modelGroup:"').concat(groupMatch.modelGroup, '", or all:true for everything.');
-    } else {
-        message = 'model-info: no exact match for "'.concat(query, '". Call `model-info` with no arguments to list groups, or pass all:true for the full catalog.');
     }
     return message;
 }
@@ -3435,7 +3435,7 @@ function parseJsonArrayOperations(fileText) {
         });
     }
     if (!Array.isArray(parsed)) {
-        throw new Error('batch-execute: with format "json" the file must contain a top-level array of operations.');
+        throw new TypeError('batch-execute: with format "json" the file must contain a top-level array of operations.');
     }
     return parsed;
 }
@@ -3717,10 +3717,10 @@ function maybeDeleteUpload(input) {
  * @param bucketId - The bucket id, or `undefined` for the default bucket.
  * @returns The resolved storage path input.
  */ function toStoragePathInput(pathString, bucketId) {
-    return bucketId != null ? {
-        bucketId: bucketId,
+    return bucketId == null ? {
         pathString: pathString
     } : {
+        bucketId: bucketId,
         pathString: pathString
     };
 }
@@ -5667,7 +5667,7 @@ var FirebaseServerMcpAnalyticsService_1;
             value: function handleMcpAnalyticsEvent(event) {
                 if (this._logEvents) {
                     var uidSuffix = event.uid ? " uid=".concat(event.uid) : '';
-                    var durationSuffix = event.durationMs != null ? " (".concat(event.durationMs, "ms)") : '';
+                    var durationSuffix = event.durationMs == null ? '' : " (".concat(event.durationMs, "ms)");
                     var outcome = event.isSuccessful ? 'Succeeded' : 'Failed';
                     this._logger.log("MCP ".concat(event.toolName, " [").concat(event.toolKind, "] ").concat(outcome).concat(uidSuffix).concat(durationSuffix));
                 }

package/mcp/package.json

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