@dereekb/firebase-server 6.0.0 → 7.0.0

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+# [7.0.0](https://github.com/dereekb/dbx-components/compare/v6.0.0-dev...v7.0.0) (2022-06-05)
+
+
+### Code Refactoring
+
+* updated OnCallWithNestContextRequest to use single object ([2ef4002](https://github.com/dereekb/dbx-components/commit/2ef4002153d3e4b7efb012e31b2739378ac49789))
+
+
+### Features
+
+* added FirestoreDocumentStore crud functions ([7786a40](https://github.com/dereekb/dbx-components/commit/7786a40f6033c2a1d5161805cde283dca7323db5))
+* added onCallCreateModel ([84f7e72](https://github.com/dereekb/dbx-components/commit/84f7e72af20c1d0071feec3e46bae406d7fd5a26))
+* added useModel to AbstractFirebaseNestContext ([29c1940](https://github.com/dereekb/dbx-components/commit/29c19402bff78d743d28ef88093757844f8ee5f7))
+
+
+### BREAKING CHANGES
+
+* updated all onCall and functions to now use a single request object instead of multiple parameters
+
+
+
 # [6.0.0](https://github.com/dereekb/dbx-components/compare/v5.3.0-dev...v6.0.0) (2022-06-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase-server",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "devDependencies": {
     "firebase-functions-test": "2.0.2"
   },
@@ -19,26 +19,26 @@
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@dereekb/firebase": "6.0.0",
+    "@dereekb/firebase": "7.0.0",
     "rxjs": "^7.0.0",
     "rxfire": "^6.0.3",
     "firebase": "^9.8.0",
-    "@dereekb/util": "6.0.0",
+    "@dereekb/util": "7.0.0",
     "make-error": "^1.3.0",
     "extra-set": "^2.2.11",
-    "@dereekb/rxjs": "6.0.0",
+    "@dereekb/rxjs": "7.0.0",
     "ms": "^3.0.0-canary.1",
-    "@dereekb/date": "6.0.0",
+    "@dereekb/date": "7.0.0",
     "class-transformer": "^0.5.1",
     "date-fns": "^2.28.0",
     "class-validator": "^0.13.2",
     "date-fns-tz": "^1.3.0",
     "rrule": "git+https://git@github.com/dereekb/rrule.git#17adf5708d6567b4d01a3a8afd106261421ea492",
-    "@dereekb/model": "6.0.0",
+    "@dereekb/model": "7.0.0",
     "firebase-functions": "^3.21.2",
     "firebase-admin": "^10.2.0",
     "@nestjs/common": "^8.4.0",
-    "@dereekb/nestjs": "6.0.0",
+    "@dereekb/nestjs": "7.0.0",
     "@nestjs/config": "^2.0.1",
     "@google-cloud/firestore": "^5.0.2",
     "@nestjs/core": "^8.4.0",

package/src/lib/function/context.d.ts

@@ -1,4 +1,4 @@
 import * as functions from 'firebase-functions';
-export declare type CallableContextWithAuthData = Omit<functions.https.CallableContext, 'auth'> & Required<Pick<functions.https.CallableContext, 'auth'>>;
-export declare function isContextWithAuthData(context: functions.https.CallableContext): context is CallableContextWithAuthData;
-export declare function assertIsContextWithAuthData(context: functions.https.CallableContext): asserts context is CallableContextWithAuthData;
+export declare type CallableContextWithAuthData<R extends functions.https.CallableContext = functions.https.CallableContext> = Omit<R, 'auth'> & Required<Pick<R, 'auth'>>;
+export declare function isContextWithAuthData<R extends functions.https.CallableContext>(context: functions.https.CallableContext): context is CallableContextWithAuthData<R>;
+export declare function assertIsContextWithAuthData<R extends functions.https.CallableContext>(context: functions.https.CallableContext): asserts context is CallableContextWithAuthData<R>;

package/src/lib/function/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/function/context.ts"],"names":[],"mappings":";;;AACA,mCAA8D;AAI9D,SAAgB,qBAAqB,CAAC,OAAwC;;IAC5E,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,KAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,GAAG,CAAA,CAAC,CAAC;AAC7D,CAAC;AAFD,sDAEC;AAED,SAAgB,2BAA2B,CAAC,OAAwC;IAClF,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,IAAA,2CAAmC,GAAE,CAAC;KAC7C;AACH,CAAC;AAJD,kEAIC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../packages/firebase-server/src/lib/function/context.ts"],"names":[],"mappings":";;;AACA,mCAA8D;AAI9D,SAAgB,qBAAqB,CAA4C,OAAwC;;IACvH,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,KAAI,MAAA,OAAO,CAAC,IAAI,0CAAE,GAAG,CAAA,CAAC,CAAC;AAC7D,CAAC;AAFD,sDAEC;AAED,SAAgB,2BAA2B,CAA4C,OAAwC;IAC7H,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,IAAA,2CAAmC,GAAE,CAAC;KAC7C;AACH,CAAC;AAJD,kEAIC"}

package/src/lib/nest/function/call.d.ts

@@ -0,0 +1,23 @@
+import { PromiseOrValue } from '@dereekb/util';
+import { CallableRequest } from 'firebase-functions/lib/common/providers/https';
+import { NestApplicationContextRequest, NestContextCallableRequest, NestContextCallableRequestWithAuth } from './nest';
+import { MakeNestContext } from '../nest.provider';
+export declare type OnCallWithNestApplicationRequest<I> = NestApplicationContextRequest<CallableRequest<I>>;
+/**
+ * Runnable function that is passed an INestApplicationContext in addition to the usual data/context provided by firebase.
+ */
+export declare type OnCallWithNestApplication<I = unknown, O = unknown> = (request: OnCallWithNestApplicationRequest<I>) => PromiseOrValue<O>;
+export declare type OnCallWithNestContextRequest<N, I> = NestContextCallableRequest<N, I>;
+/**
+ * Runnable function that is passed an arbitrary nest context object in addition to the usual data/context provided by firebase.
+ */
+export declare type OnCallWithNestContext<N, I = unknown, O = unknown> = (request: OnCallWithNestContextRequest<N, I>) => PromiseOrValue<O>;
+export declare function setNestContextOnRequest<N, I>(makeNestContext: MakeNestContext<N>, request: OnCallWithNestApplicationRequest<I>): OnCallWithNestContextRequest<N, I>;
+export declare type OnCallWithAuthorizedNestContext<N, I = unknown, O = unknown> = (request: NestContextCallableRequestWithAuth<N, I>) => PromiseOrValue<O>;
+/**
+ * Creates an OnCallWithNestContext wrapper that validates the input CallableContext to assert the context has auth data before entering the function.
+ *
+ * @param fn
+ * @returns
+ */
+export declare function inAuthContext<N, I, O>(fn: OnCallWithAuthorizedNestContext<N, I, O>): OnCallWithNestContext<N, I, O>;

package/src/lib/nest/function/call.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.inAuthContext = exports.setNestContextOnRequest = void 0;
+const context_1 = require("../../function/context");
+const error_1 = require("../../function/error");
+function setNestContextOnRequest(makeNestContext, request) {
+    request.nest = makeNestContext(request.nestApplication);
+    return request;
+}
+exports.setNestContextOnRequest = setNestContextOnRequest;
+/**
+ * Creates an OnCallWithNestContext wrapper that validates the input CallableContext to assert the context has auth data before entering the function.
+ *
+ * @param fn
+ * @returns
+ */
+function inAuthContext(fn) {
+    return (request) => {
+        if ((0, context_1.isContextWithAuthData)(request)) {
+            return fn(request);
+        }
+        else {
+            throw (0, error_1.unauthenticatedContextHasNoUidError)();
+        }
+    };
+}
+exports.inAuthContext = inAuthContext;
+//# sourceMappingURL=call.js.map

package/src/lib/nest/function/call.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/function/call.ts"],"names":[],"mappings":";;;AAGA,oDAA+D;AAC/D,gDAA2E;AAmB3E,SAAgB,uBAAuB,CAAO,eAAmC,EAAE,OAA4C;IAC5H,OAAuE,CAAC,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACzH,OAAO,OAAwD,CAAC;AAClE,CAAC;AAHD,0DAGC;AAKD;;;;;GAKG;AACH,SAAgB,aAAa,CAAU,EAA4C;IACjF,OAAO,CAAC,OAAO,EAAE,EAAE;QACjB,IAAI,IAAA,+BAAqB,EAAC,OAAO,CAAC,EAAE;YAClC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;SACpB;aAAM;YACL,MAAM,IAAA,2CAAmC,GAAE,CAAC;SAC7C;IACH,CAAC,CAAC;AACJ,CAAC;AARD,sCAQC"}

package/src/lib/nest/function/context.d.ts

@@ -1,5 +1,13 @@
 import { TransformAndValidateFunctionResultFactory, TransformAndValidateObjectFactory } from '@dereekb/model';
-import { FirebaseServerActionsTransformContext } from './transform';
+/**
+ * Context used for transforming content.
+ */
+export interface FirebaseServerActionsTransformContext {
+    readonly firebaseServerActionTransformFactory: TransformAndValidateObjectFactory;
+    readonly firebaseServerActionTransformFunctionFactory: TransformAndValidateFunctionResultFactory;
+}
+export declare function firebaseServerActionsTransformContext(): FirebaseServerActionsTransformContext;
+export declare function firebaseServerActionsTransformFactory(): TransformAndValidateObjectFactory;
 /**
  * Context used for building FirebaseServerActions. It contains references to reusable factories.
  */

package/src/lib/nest/function/context.js

@@ -1,12 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firebaseServerActionsContext = exports.AbstractFirebaseServerActionsContext = void 0;
-const transform_1 = require("./transform");
+exports.firebaseServerActionsContext = exports.AbstractFirebaseServerActionsContext = exports.firebaseServerActionsTransformFactory = exports.firebaseServerActionsTransformContext = void 0;
+const model_1 = require("@dereekb/model");
+const common_1 = require("@nestjs/common");
+const firebase_functions_1 = require("firebase-functions");
+function firebaseServerActionsTransformContext() {
+    const firebaseServerActionTransformFactory = firebaseServerActionsTransformFactory();
+    const firebaseServerActionTransformFunctionFactory = (0, model_1.toTransformAndValidateFunctionResultFactory)(firebaseServerActionTransformFactory);
+    return {
+        firebaseServerActionTransformFactory,
+        firebaseServerActionTransformFunctionFactory
+    };
+}
+exports.firebaseServerActionsTransformContext = firebaseServerActionsTransformContext;
+function firebaseServerActionsTransformFactory() {
+    const nestValidationExceptionFactory = new common_1.ValidationPipe().createExceptionFactory();
+    return (0, model_1.transformAndValidateObjectFactory)({
+        handleValidationError: (validationError) => {
+            const nestError = nestValidationExceptionFactory(validationError);
+            const details = nestError.getResponse();
+            throw new firebase_functions_1.https.HttpsError('invalid-argument', 'Parameters validation check failed.', details);
+        }
+    });
+}
+exports.firebaseServerActionsTransformFactory = firebaseServerActionsTransformFactory;
 class AbstractFirebaseServerActionsContext {
 }
 exports.AbstractFirebaseServerActionsContext = AbstractFirebaseServerActionsContext;
 function firebaseServerActionsContext() {
-    return Object.assign({}, (0, transform_1.firebaseServerActionsTransformContext)());
+    return Object.assign({}, firebaseServerActionsTransformContext());
 }
 exports.firebaseServerActionsContext = firebaseServerActionsContext;
 //# sourceMappingURL=context.js.map

package/src/lib/nest/function/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/function/context.ts"],"names":[],"mappings":";;;AACA,2CAA2G;AAO3G,MAAsB,oCAAoC;CAGzD;AAHD,oFAGC;AAED,SAAgB,4BAA4B;IAC1C,yBACK,IAAA,iDAAqC,GAAE,EAC1C;AACJ,CAAC;AAJD,oEAIC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/function/context.ts"],"names":[],"mappings":";;;AACA,0CAA8L;AAC9L,2CAA+D;AAC/D,2DAA2C;AAW3C,SAAgB,qCAAqC;IACnD,MAAM,oCAAoC,GAAG,qCAAqC,EAAE,CAAC;IACrF,MAAM,4CAA4C,GAAG,IAAA,mDAA2C,EAAC,oCAAoC,CAAC,CAAC;IAEvI,OAAO;QACL,oCAAoC;QACpC,4CAA4C;KAC7C,CAAC;AACJ,CAAC;AARD,sFAQC;AAED,SAAgB,qCAAqC;IACnD,MAAM,8BAA8B,GAAG,IAAI,uBAAc,EAAE,CAAC,sBAAsB,EAAE,CAAC;IAErF,OAAO,IAAA,yCAAiC,EAAC;QACvC,qBAAqB,EAAE,CAAC,eAAkC,EAAE,EAAE;YAC5D,MAAM,SAAS,GAAG,8BAA8B,CAAC,eAAe,CAAC,CAAC;YAClE,MAAM,OAAO,GAAI,SAA2B,CAAC,WAAW,EAAE,CAAC;YAC3D,MAAM,IAAI,0BAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,qCAAqC,EAAE,OAAO,CAAC,CAAC;QACjG,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAVD,sFAUC;AAQD,MAAsB,oCAAoC;CAGzD;AAHD,oFAGC;AAED,SAAgB,4BAA4B;IAC1C,yBACK,qCAAqC,EAAE,EAC1C;AACJ,CAAC;AAJD,oEAIC"}

package/src/lib/nest/function/index.d.ts

@@ -1,4 +1,5 @@
 export * from './v1';
 export * from './v2';
 export * from './context';
-export * from './transform';
+export * from './call';
+export * from './nest';

package/src/lib/nest/function/index.js

@@ -4,5 +4,6 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./v1"), exports);
 tslib_1.__exportStar(require("./v2"), exports);
 tslib_1.__exportStar(require("./context"), exports);
-tslib_1.__exportStar(require("./transform"), exports);
+tslib_1.__exportStar(require("./call"), exports);
+tslib_1.__exportStar(require("./nest"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/nest/function/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/function/index.ts"],"names":[],"mappings":";;;AAAA,+CAAqB;AACrB,+CAAqB;AACrB,oDAA0B;AAC1B,sDAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/function/index.ts"],"names":[],"mappings":";;;AAAA,+CAAqB;AACrB,+CAAqB;AACrB,oDAA0B;AAC1B,iDAAuB;AACvB,iDAAuB"}

package/src/lib/nest/function/nest.d.ts

@@ -0,0 +1,19 @@
+import { INestApplicationContext } from '@nestjs/common';
+import { CallableRequest } from 'firebase-functions/lib/common/providers/https';
+import { CallableContextWithAuthData } from '../../function/context';
+export declare type NestApplicationContextRequest<R> = R & {
+    readonly nestApplication: INestApplicationContext;
+};
+export declare type NestRef<N> = {
+    readonly nest: N;
+};
+export declare type NestContextRequest<N, R> = R & {
+    readonly nest: N;
+};
+export declare function injectNestIntoRequest<N, R>(nest: N, request: R): NestContextRequest<N, R>;
+export declare function injectNestApplicationContextIntoRequest<R>(nestContext: INestApplicationContext, request: R): NestApplicationContextRequest<R>;
+export declare type NestContextCallableRequest<N, I> = NestContextRequest<N, CallableRequest<I>>;
+/**
+ * NestContextCallableRequest that has valid auth attached to it.
+ */
+export declare type NestContextCallableRequestWithAuth<N, I> = CallableContextWithAuthData<NestContextCallableRequest<N, I>>;

package/src/lib/nest/function/nest.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectNestApplicationContextIntoRequest = exports.injectNestIntoRequest = void 0;
+function injectNestIntoRequest(nest, request) {
+    return Object.assign(Object.assign({}, request), { nest });
+}
+exports.injectNestIntoRequest = injectNestIntoRequest;
+function injectNestApplicationContextIntoRequest(nestContext, request) {
+    return Object.assign(Object.assign({}, request), { nestApplication: nestContext });
+}
+exports.injectNestApplicationContextIntoRequest = injectNestApplicationContextIntoRequest;
+//# sourceMappingURL=nest.js.map

package/src/lib/nest/function/nest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nest.js","sourceRoot":"","sources":["../../../../../../../packages/firebase-server/src/lib/nest/function/nest.ts"],"names":[],"mappings":";;;AAgBA,SAAgB,qBAAqB,CAAO,IAAO,EAAE,OAAU;IAC7D,uCACK,OAAO,KACV,IAAI,IACJ;AACJ,CAAC;AALD,sDAKC;AAED,SAAgB,uCAAuC,CAAI,WAAoC,EAAE,OAAU;IACzG,uCACK,OAAO,KACV,eAAe,EAAE,WAAW,IAC5B;AACJ,CAAC;AALD,0FAKC"}

package/src/lib/nest/function/v1/call.d.ts

@@ -2,15 +2,13 @@ import * as functions from 'firebase-functions';
 import { INestApplicationContext } from '@nestjs/common';
 import { RunnableHttpFunction } from '../../../function/type';
 import { MakeNestContext, NestApplicationFunctionFactory } from '../../nest.provider';
+import { OnCallWithNestApplication, OnCallWithNestApplicationRequest, OnCallWithNestContext } from '../call';
+export declare function makeOnCallWithNestApplicationRequest<I>(nestApplication: INestApplicationContext, data: I, context: functions.https.CallableContext): OnCallWithNestApplicationRequest<I>;
 export declare type NestApplicationRunnableHttpFunctionFactory<I> = NestApplicationFunctionFactory<RunnableHttpFunction<I>>;
-/**
- * Runnable function that is passed an INestApplicationContext in addition to the usual data/context provided by firebase.
- */
-export declare type OnCallWithNestApplication<I = unknown, O = unknown> = (nest: INestApplicationContext, data: I, context: functions.https.CallableContext) => O;
 /**
  * Factory function for generating a NestApplicationFunctionFactory for a HttpsFunctions/Runnable firebase function.
  */
-export declare type OnCallWithNestApplicationFactory = <I, O>(fn: OnCallWithNestApplication<I, O>) => NestApplicationRunnableHttpFunctionFactory<I>;
+export declare type OnCallWithNestApplicationFactory = <I = unknown, O = unknown>(fn: OnCallWithNestApplication<I, O>) => NestApplicationRunnableHttpFunctionFactory<I>;
 /**
  * Creates a factory for generating OnCallWithNestApplication functions.
  *
@@ -18,14 +16,10 @@ export declare type OnCallWithNestApplicationFactory = <I, O>(fn: OnCallWithNest
  * @returns
  */
 export declare function onCallWithNestApplicationFactory(): OnCallWithNestApplicationFactory;
-/**
- * Runnable function that is passed an arbitrary nest context object in addition to the usual data/context provided by firebase.
- */
-export declare type OnCallWithNestContext<C, I = unknown, O = unknown> = (nestContext: C, data: I, context: functions.https.CallableContext) => O;
 /**
  * Factory function for generating HttpsFunctions/Runnable firebase function that returns the value from the input OnCallWithNestContext function.
  */
-export declare type OnCallWithNestContextFactory<C> = <I, O>(fn: OnCallWithNestContext<C, I, O>) => NestApplicationRunnableHttpFunctionFactory<I>;
+export declare type OnCallWithNestContextFactory<N> = <I = unknown, O = unknown>(fn: OnCallWithNestContext<N, I, O>) => NestApplicationRunnableHttpFunctionFactory<I>;
 /**
  * Creates a factory for generating OnCallWithNestContext functions with a nest context object that is generated by the input function.
  *
@@ -33,4 +27,4 @@ export declare type OnCallWithNestContextFactory<C> = <I, O>(fn: OnCallWithNestC
  * @param makeNestContext
  * @returns
  */
-export declare function onCallWithNestContextFactory<C>(appFactory: OnCallWithNestApplicationFactory, makeNestContext: MakeNestContext<C>): OnCallWithNestContextFactory<C>;
+export declare function onCallWithNestContextFactory<N>(appFactory: OnCallWithNestApplicationFactory, makeNestContext: MakeNestContext<N>): OnCallWithNestContextFactory<N>;

package/src/lib/nest/function/v1/call.js

@@ -1,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onCallWithNestContextFactory = exports.onCallWithNestApplicationFactory = void 0;
+exports.onCallWithNestContextFactory = exports.onCallWithNestApplicationFactory = exports.makeOnCallWithNestApplicationRequest = void 0;
 const functions = require("firebase-functions");
+const call_1 = require("../call");
+function makeOnCallWithNestApplicationRequest(nestApplication, data, context) {
+    return Object.assign(Object.assign({}, context), { nestApplication,
+        data });
+}
+exports.makeOnCallWithNestApplicationRequest = makeOnCallWithNestApplicationRequest;
 /**
  * Creates a factory for generating OnCallWithNestApplication functions.
  *
@@ -10,7 +16,7 @@ const functions = require("firebase-functions");
  */
 function onCallWithNestApplicationFactory() {
     return (fn) => {
-        return (nestAppPromiseGetter) => functions.https.onCall((data, context) => nestAppPromiseGetter().then((x) => fn(x, data, context)));
+        return (nestAppPromiseGetter) => functions.https.onCall((data, context) => nestAppPromiseGetter().then((x) => fn(makeOnCallWithNestApplicationRequest(x, data, context))));
     };
 }
 exports.onCallWithNestApplicationFactory = onCallWithNestApplicationFactory;
@@ -22,7 +28,7 @@ exports.onCallWithNestApplicationFactory = onCallWithNestApplicationFactory;
  * @returns
  */
 function onCallWithNestContextFactory(appFactory, makeNestContext) {
-    return (fn) => appFactory((nest, data, context) => fn(makeNestContext(nest), data, context));
+    return (fn) => appFactory((request) => fn((0, call_1.setNestContextOnRequest)(makeNestContext, request)));
 }
 exports.onCallWithNestContextFactory = onCallWithNestContextFactory;
 //# sourceMappingURL=call.js.map

package/src/lib/nest/function/v1/call.js.map

@@ -1 +1 @@
-{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v1/call.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAkBhD;;;;;GAKG;AACH,SAAgB,gCAAgC;IAC9C,OAAO,CAAO,EAAmC,EAAE,EAAE;QACnD,OAAO,CAAC,oBAAkD,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAO,EAAE,OAAwC,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACzM,CAAC,CAAC;AACJ,CAAC;AAJD,4EAIC;AAYD;;;;;;GAMG;AACH,SAAgB,4BAA4B,CAAI,UAA4C,EAAE,eAAmC;IAC/H,OAAO,CAAO,EAAkC,EAAE,EAAE,CAAC,UAAU,CAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3I,CAAC;AAFD,oEAEC"}
+{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v1/call.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAIhD,kCAAsI;AAEtI,SAAgB,oCAAoC,CAAI,eAAwC,EAAE,IAAO,EAAE,OAAwC;IACjJ,uCACK,OAAO,KACV,eAAe;QACf,IAAI,IACJ;AACJ,CAAC;AAND,oFAMC;AAUD;;;;;GAKG;AACH,SAAgB,gCAAgC;IAC9C,OAAO,CAAO,EAAmC,EAAE,EAAE;QACnD,OAAO,CAAC,oBAAkD,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAO,EAAE,OAAwC,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,oCAAoC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/O,CAAC,CAAC;AACJ,CAAC;AAJD,4EAIC;AAOD;;;;;;GAMG;AACH,SAAgB,4BAA4B,CAAI,UAA4C,EAAE,eAAmC;IAC/H,OAAO,CAAO,EAAkC,EAAE,EAAE,CAAC,UAAU,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,IAAA,8BAAuB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAC5I,CAAC;AAFD,oEAEC"}

package/src/lib/nest/function/v1/event.d.ts

@@ -1,11 +1,16 @@
 import { PromiseOrValue } from '@dereekb/util';
-import { INestApplicationContext } from '@nestjs/common';
 import * as functions from 'firebase-functions';
 import { EventContext } from 'firebase-functions';
 import { MakeNestContext, NestApplicationFunctionFactory } from '../../nest.provider';
-export declare type FirestoreEventHandler<I = unknown, O = unknown> = (data: I, context: EventContext) => PromiseOrValue<O>;
-export declare type NestApplicationEventHandler<I = unknown, O = unknown> = (nest: INestApplicationContext, data: I, context: EventContext) => PromiseOrValue<O>;
-export declare type NestApplicationEventHandlerBuilder<I = unknown, O = unknown> = (handler: NestApplicationEventHandler<I, O>) => FirestoreEventHandler<I, O>;
+import { NestApplicationContextRequest, NestContextRequest } from '../nest';
+export declare type EventContextWithData<I> = EventContext & {
+    data: I;
+};
+export declare type FirebaseEventNestApplicationRequest<I> = NestApplicationContextRequest<EventContextWithData<I>>;
+export declare type FirebaseEventNestContextRequest<N, I> = NestContextRequest<N, EventContextWithData<I>>;
+export declare type FirebaseEventContextHandler<I = unknown, O = unknown> = (data: I, context: EventContext) => PromiseOrValue<O>;
+export declare type NestApplicationEventHandler<I = unknown, O = unknown> = (event: FirebaseEventNestApplicationRequest<I>) => PromiseOrValue<O>;
+export declare type NestApplicationEventHandlerBuilder<I = unknown, O = unknown> = (handler: NestApplicationEventHandler<I, O>) => FirebaseEventContextHandler<I, O>;
 export declare type OnEventWithNestApplicationBuilder<I = unknown, O = unknown> = (nest: NestApplicationEventHandlerBuilder<I, O>) => functions.CloudFunction<I>;
 /**
  * Factory function for generating a CloudFunctionHandler via a NestApplicationCloudFunctionHandler.
@@ -18,16 +23,16 @@ export declare type OnEventWithNestApplicationFactory = <I, O>(fn: OnEventWithNe
  * @returns
  */
 export declare function onEventWithNestApplicationFactory(): OnEventWithNestApplicationFactory;
-export declare type NestContextEventHandler<C, I = unknown, O = unknown> = (nest: C, data: I, context: EventContext) => Promise<O>;
-export declare type NestContextEventHandlerBuilder<C, I = unknown, O = unknown> = (handler: NestContextEventHandler<C, I, O>) => FirestoreEventHandler<I, O>;
+export declare type NestContextEventHandler<N, I = unknown, O = unknown> = (request: FirebaseEventNestContextRequest<N, I>) => Promise<O>;
+export declare type NestContextEventHandlerBuilder<N, I = unknown, O = unknown> = (handler: NestContextEventHandler<N, I, O>) => FirebaseEventContextHandler<I, O>;
 /**
  * Runnable function that is passed an arbitrary nest context object in addition to the usual data/context provided by firebase.
  */
-export declare type OnEventWithNestContextBuilder<C, I = unknown, O = unknown> = (nest: NestContextEventHandlerBuilder<C, I, O>) => functions.CloudFunction<I>;
+export declare type OnEventWithNestContextBuilder<N, I = unknown, O = unknown> = (nest: NestContextEventHandlerBuilder<N, I, O>) => functions.CloudFunction<I>;
 /**
  * Factory function for generating a firebase CloudFunction for a specific event.
  */
-export declare type OnEventWithNestContextFactory<C> = <I, O = unknown>(fn: OnEventWithNestContextBuilder<C, I, O>) => NestApplicationFunctionFactory<functions.CloudFunction<I>>;
+export declare type OnEventWithNestContextFactory<N> = <I, O = unknown>(fn: OnEventWithNestContextBuilder<N, I, O>) => NestApplicationFunctionFactory<functions.CloudFunction<I>>;
 /**
  * Creates a factory for generating OnCallWithNestContext functions with a nest context object that is generated by the input function.
  *
@@ -35,4 +40,4 @@ export declare type OnEventWithNestContextFactory<C> = <I, O = unknown>(fn: OnEv
  * @param makeNestContext
  * @returns
  */
-export declare function onEventWithNestContextFactory<C>(makeNestContext: MakeNestContext<C>): OnEventWithNestContextFactory<C>;
+export declare function onEventWithNestContextFactory<N>(makeNestContext: MakeNestContext<N>): OnEventWithNestContextFactory<N>;

package/src/lib/nest/function/v1/event.js

@@ -11,7 +11,8 @@ function onEventWithNestApplicationFactory() {
     return (fn) => {
         return (nestAppPromiseGetter) => {
             const handlerBuilder = (handler) => {
-                const fnHandler = (data, context) => nestAppPromiseGetter().then((nest) => handler(nest, data, context));
+                const fnHandler = (data, context) => nestAppPromiseGetter().then((nestApplication) => handler(Object.assign(Object.assign({}, context), { data,
+                    nestApplication })));
                 return fnHandler;
             };
             return fn(handlerBuilder);
@@ -30,7 +31,7 @@ function onEventWithNestContextFactory(makeNestContext) {
     return (fn) => {
         return (nestAppPromiseGetter) => {
             const handlerBuilder = (handler) => {
-                const fnHandler = (data, context) => nestAppPromiseGetter().then((nest) => handler(makeNestContext(nest), data, context));
+                const fnHandler = (data, context) => nestAppPromiseGetter().then((nestApplication) => handler(Object.assign(Object.assign({}, context), { data, nest: makeNestContext(nestApplication) })));
                 return fnHandler;
             };
             return fn(handlerBuilder);

package/src/lib/nest/function/v1/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v1/event.ts"],"names":[],"mappings":";;;AAkBA;;;;;GAKG;AACH,SAAgB,iCAAiC;IAC/C,OAAO,CAAO,EAA2C,EAAE,EAAE;QAC3D,OAAO,CAAC,oBAAkD,EAAE,EAAE;YAC5D,MAAM,cAAc,GAA6C,CAAC,OAAO,EAAE,EAAE;gBAC3E,MAAM,SAAS,GAAgC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBACtI,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;YAEF,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAXD,8EAWC;AAeD;;;;;;GAMG;AACH,SAAgB,6BAA6B,CAAI,eAAmC;IAClF,OAAO,CAAiB,EAA0C,EAAE,EAAE;QACpE,OAAO,CAAC,oBAAkD,EAAE,EAAE;YAC5D,MAAM,cAAc,GAA4C,CAAC,OAAO,EAAE,EAAE;gBAC1E,MAAM,SAAS,GAAgC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBACvJ,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;YAEF,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAXD,sEAWC"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v1/event.ts"],"names":[],"mappings":";;;AAwBA;;;;;GAKG;AACH,SAAgB,iCAAiC;IAC/C,OAAO,CAAO,EAA2C,EAAE,EAAE;QAC3D,OAAO,CAAC,oBAAkD,EAAE,EAAE;YAC5D,MAAM,cAAc,GAA6C,CAAC,OAAO,EAAE,EAAE;gBAC3E,MAAM,SAAS,GAAsC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CACrE,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE,CAC9C,OAAO,iCACF,OAAO,KACV,IAAI;oBACJ,eAAe,IACf,CACH,CAAC;gBACJ,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;YAEF,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAlBD,8EAkBC;AAeD;;;;;;GAMG;AACH,SAAgB,6BAA6B,CAAI,eAAmC;IAClF,OAAO,CAAiB,EAA0C,EAAE,EAAE;QACpE,OAAO,CAAC,oBAAkD,EAAE,EAAE;YAC5D,MAAM,cAAc,GAA4C,CAAC,OAAO,EAAE,EAAE;gBAC1E,MAAM,SAAS,GAAsC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CACrE,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE,CAC9C,OAAO,iCACF,OAAO,KACV,IAAI,EACJ,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC,IACtC,CACH,CAAC;gBAEJ,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;YAEF,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAnBD,sEAmBC"}

package/src/lib/nest/function/v1/index.d.ts

@@ -1,3 +1,2 @@
 export * from './call';
-export * from './call.utility';
 export * from './event';

package/src/lib/nest/function/v1/index.js

@@ -2,6 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./call"), exports);
-tslib_1.__exportStar(require("./call.utility"), exports);
 tslib_1.__exportStar(require("./event"), exports);
 //# sourceMappingURL=index.js.map

package/src/lib/nest/function/v1/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v1/index.ts"],"names":[],"mappings":";;;AAAA,iDAAuB;AACvB,yDAA+B;AAC/B,kDAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v1/index.ts"],"names":[],"mappings":";;;AAAA,iDAAuB;AACvB,kDAAwB"}

package/src/lib/nest/function/v2/blocking.d.ts

@@ -1,14 +1,16 @@
 import { PromiseOrValue } from '@dereekb/util';
 import { BlockingFunction } from 'firebase-functions';
 import { MakeNestContext, NestApplicationFunctionFactory } from '../../nest.provider';
-export declare type BlockingFunctionHandler<E, O = unknown> = (event: E) => PromiseOrValue<O>;
-export declare type NestContextBlockingFunctionHandler<C, E, O = unknown> = (nest: C, event: E) => PromiseOrValue<O>;
-export declare type NestContextBlockingFunctionHandlerBuilder<C, E, O = unknown> = (handler: NestContextBlockingFunctionHandler<C, E, O>) => BlockingFunctionHandler<E, O>;
-export declare type BlockingFunctionHandlerWithNestContextBuilder<C, E, O = unknown> = (nest: NestContextBlockingFunctionHandlerBuilder<C, E, O>) => BlockingFunction;
+import { NestContextRequest } from '../nest';
+export declare type BlockingFunctionNestContextRequest<N, E extends object> = NestContextRequest<N, E>;
+export declare type BlockingFunctionHandler<E extends object, O = unknown> = (event: E) => PromiseOrValue<O>;
+export declare type NestContextBlockingFunctionHandler<N, E extends object, O = unknown> = (request: BlockingFunctionNestContextRequest<N, E>) => PromiseOrValue<O>;
+export declare type NestContextBlockingFunctionHandlerBuilder<N, E extends object, O = unknown> = (handler: NestContextBlockingFunctionHandler<N, E, O>) => BlockingFunctionHandler<E, O>;
+export declare type BlockingFunctionHandlerWithNestContextBuilder<N, E extends object, O = unknown> = (nest: NestContextBlockingFunctionHandlerBuilder<N, E, O>) => BlockingFunction;
 /**
  * Factory function for generating a firebase BlockingFunction for a specific event.
  */
-export declare type BlockingFunctionHandlerWithNestContextFactory<C> = <E, O = unknown>(fn: BlockingFunctionHandlerWithNestContextBuilder<C, E, O>) => NestApplicationFunctionFactory<BlockingFunction>;
+export declare type BlockingFunctionHandlerWithNestContextFactory<N> = <E extends object, O = unknown>(fn: BlockingFunctionHandlerWithNestContextBuilder<N, E, O>) => NestApplicationFunctionFactory<BlockingFunction>;
 /**
  * Creates a BlockingFunctionHandlerWithNestContextFactory.
  *
@@ -16,4 +18,4 @@ export declare type BlockingFunctionHandlerWithNestContextFactory<C> = <E, O = u
  * @param makeNestContext
  * @returns
  */
-export declare function blockingFunctionHandlerWithNestContextFactory<C>(makeNestContext: MakeNestContext<C>): BlockingFunctionHandlerWithNestContextFactory<C>;
+export declare function blockingFunctionHandlerWithNestContextFactory<N>(makeNestContext: MakeNestContext<N>): BlockingFunctionHandlerWithNestContextFactory<N>;

package/src/lib/nest/function/v2/blocking.js

@@ -12,7 +12,7 @@ function blockingFunctionHandlerWithNestContextFactory(makeNestContext) {
     return (fn) => {
         return (nestAppPromiseGetter) => {
             const handlerBuilder = (handler) => {
-                const fnHandler = (event) => nestAppPromiseGetter().then((nest) => handler(makeNestContext(nest), event));
+                const fnHandler = (event) => nestAppPromiseGetter().then((nestApplication) => handler(Object.assign(Object.assign({}, event), { nest: makeNestContext(nestApplication) })));
                 return fnHandler;
             };
             return fn(handlerBuilder);

package/src/lib/nest/function/v2/blocking.js.map

@@ -1 +1 @@
-{"version":3,"file":"blocking.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v2/blocking.ts"],"names":[],"mappings":";;;AAeA;;;;;;GAMG;AACH,SAAgB,6CAA6C,CAAI,eAAmC;IAClG,OAAO,CAAO,EAA0D,EAAE,EAAE;QAC1E,OAAO,CAAC,oBAAkD,EAAE,EAAE;YAC5D,MAAM,cAAc,GAAuD,CAAC,OAAoD,EAAE,EAAE;gBAClI,MAAM,SAAS,GAAkC,CAAC,KAAQ,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;gBAC5I,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;YAEF,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAXD,sGAWC"}
+{"version":3,"file":"blocking.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v2/blocking.ts"],"names":[],"mappings":";;;AAoBA;;;;;;GAMG;AACH,SAAgB,6CAA6C,CAAI,eAAmC;IAClG,OAAO,CAAsB,EAA0D,EAAE,EAAE;QACzF,OAAO,CAAC,oBAAkD,EAAE,EAAE;YAC5D,MAAM,cAAc,GAAuD,CAAC,OAAoD,EAAE,EAAE;gBAClI,MAAM,SAAS,GAAkC,CAAC,KAAQ,EAAE,EAAE,CAC5D,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE,CAC9C,OAAO,iCACF,KAAK,KACR,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC,IACtC,CACH,CAAC;gBACJ,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC;YAEF,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjBD,sGAiBC"}

package/src/lib/nest/function/v2/call.d.ts

@@ -1,16 +1,11 @@
-import { INestApplicationContext } from '@nestjs/common';
-import { CallableRequest } from 'firebase-functions/v2/https';
 import { CallableHttpFunction } from '../../../function/type';
 import { MakeNestContext, NestApplicationFunctionFactory } from '../../nest.provider';
+import { OnCallWithNestApplication, OnCallWithNestContext } from '../call';
 export declare type NestApplicationCallableHttpFunctionFactory<I, O = unknown> = NestApplicationFunctionFactory<CallableHttpFunction<I, O>>;
-/**
- * Runnable function that is passed an INestApplicationContext in addition to the usual data/context provided by firebase.
- */
-export declare type OnCallHandlerWithNestApplication<I = unknown, O = unknown> = (nest: INestApplicationContext, request: CallableRequest<I>) => O;
 /**
  * Factory function for generating a NestApplicationFunctionFactory for a HttpsFunctions/Runnable firebase function.
  */
-export declare type OnCallHandlerWithNestApplicationFactory = <I, O>(fn: OnCallHandlerWithNestApplication<I, O>) => NestApplicationCallableHttpFunctionFactory<I, O>;
+export declare type OnCallHandlerWithNestApplicationFactory = <I, O>(fn: OnCallWithNestApplication<I, O>) => NestApplicationCallableHttpFunctionFactory<I, O>;
 /**
  * Creates a factory for generating OnCallWithNestApplication functions.
  *
@@ -18,14 +13,10 @@ export declare type OnCallHandlerWithNestApplicationFactory = <I, O>(fn: OnCallH
  * @returns
  */
 export declare function onCallHandlerWithNestApplicationFactory(): OnCallHandlerWithNestApplicationFactory;
-/**
- * Runnable function that is passed an arbitrary nest context object in addition to the usual data/context provided by firebase.
- */
-export declare type OnCallHandlerWithNestContext<C, I = unknown, O = unknown> = (nestContext: C, request: CallableRequest<I>) => O;
 /**
  * Factory function for generating HttpsFunctions/Runnable firebase function that returns the value from the input OnCallWithNestContext function.
  */
-export declare type OnCallHandlerWithNestContextFactory<C> = <I, O>(fn: OnCallHandlerWithNestContext<C, I, O>) => NestApplicationCallableHttpFunctionFactory<I>;
+export declare type OnCallHandlerWithNestContextFactory<C> = <I, O>(fn: OnCallWithNestContext<C, I, O>) => NestApplicationCallableHttpFunctionFactory<I>;
 /**
  * Creates a factory for generating OnCallWithNestContext functions with a nest context object that is generated by the input function.
  *

package/src/lib/nest/function/v2/call.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onCallHandlerWithNestContextFactory = exports.onCallHandlerWithNestApplicationFactory = void 0;
 const v2_1 = require("firebase-functions/v2");
+const call_1 = require("../call");
 /**
  * Creates a factory for generating OnCallWithNestApplication functions.
  *
@@ -10,7 +11,7 @@ const v2_1 = require("firebase-functions/v2");
  */
 function onCallHandlerWithNestApplicationFactory() {
     return (fn) => {
-        return (nestAppPromiseGetter) => v2_1.https.onCall((request) => nestAppPromiseGetter().then((x) => fn(x, request)));
+        return (nestAppPromiseGetter) => v2_1.https.onCall((request) => nestAppPromiseGetter().then((nestApplication) => fn(Object.assign(Object.assign({}, request), { nestApplication }))));
     };
 }
 exports.onCallHandlerWithNestApplicationFactory = onCallHandlerWithNestApplicationFactory;
@@ -22,7 +23,7 @@ exports.onCallHandlerWithNestApplicationFactory = onCallHandlerWithNestApplicati
  * @returns
  */
 function onCallHandlerWithNestContextFactory(appFactory, makeNestContext) {
-    return (fn) => appFactory((nest, request) => fn(makeNestContext(nest), request));
+    return (fn) => appFactory((request) => fn((0, call_1.setNestContextOnRequest)(makeNestContext, request)));
 }
 exports.onCallHandlerWithNestContextFactory = onCallHandlerWithNestContextFactory;
 //# sourceMappingURL=call.js.map

package/src/lib/nest/function/v2/call.js.map

@@ -1 +1 @@
-{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v2/call.ts"],"names":[],"mappings":";;;AAEA,8CAA8C;AAmB9C;;;;;GAKG;AACH,SAAgB,uCAAuC;IACrD,OAAO,CAAO,EAA0C,EAAE,EAAE;QAC1D,OAAO,CAAC,oBAAkD,EAAE,EAAE,CAAC,UAAK,CAAC,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACnK,CAAC,CAAC;AACJ,CAAC;AAJD,0FAIC;AAYD;;;;;;GAMG;AACH,SAAgB,mCAAmC,CAAI,UAAmD,EAAE,eAAmC;IAC7I,OAAO,CAAO,EAAyC,EAAE,EAAE,CAAC,UAAU,CAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AACtI,CAAC;AAFD,kFAEC"}
+{"version":3,"file":"call.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase-server/src/lib/nest/function/v2/call.ts"],"names":[],"mappings":";;;AACA,8CAA8C;AAG9C,kCAAoG;AAYpG;;;;;GAKG;AACH,SAAgB,uCAAuC;IACrD,OAAO,CAAO,EAAmC,EAAE,EAAE;QACnD,OAAO,CAAC,oBAAkD,EAAE,EAAE,CAC5D,UAAK,CAAC,MAAM,CAAC,CAAC,OAA2B,EAAE,EAAE,CAC3C,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE,CAC9C,EAAE,iCACG,OAAO,KACV,eAAe,IACf,CACH,CACF,CAAC;IACN,CAAC,CAAC;AACJ,CAAC;AAZD,0FAYC;AAMD;;;;;;GAMG;AACH,SAAgB,mCAAmC,CAAI,UAAmD,EAAE,eAAmC;IAC7I,OAAO,CAAO,EAAkC,EAAE,EAAE,CAAC,UAAU,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,IAAA,8BAAuB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;AAC5I,CAAC;AAFD,kFAEC"}

package/src/lib/nest/function/v2/event.d.ts

@@ -1,15 +1,17 @@
 import { PromiseOrValue } from '@dereekb/util';
 import { CloudEvent, CloudFunction } from 'firebase-functions/v2';
 import { MakeNestContext, NestApplicationFunctionFactory } from '../../nest.provider';
+import { NestContextRequest } from '../nest';
+export declare type CloudEventNestContextRequest<N, E extends CloudEvent<unknown>> = NestContextRequest<N, E>;
 export declare type CloudEventHandler<E extends CloudEvent<unknown>, O = unknown> = (event: E) => PromiseOrValue<O>;
-export declare type NestContextCloudEventHandler<C, E extends CloudEvent<unknown>, O = unknown> = (nest: C, event: E) => PromiseOrValue<O>;
-export declare type NestContextCloudEventHandlerBuilder<C, E extends CloudEvent<unknown>, O = unknown> = (handler: NestContextCloudEventHandler<C, E, O>) => CloudEventHandler<E, O>;
-export declare type NestContextCloudEventHandlerWithData<C, I, O = unknown> = NestContextCloudEventHandler<C, CloudEvent<I>, O>;
-export declare type CloudEventHandlerWithNestContextBuilder<C, E extends CloudEvent<unknown>, O = unknown> = (nest: NestContextCloudEventHandlerBuilder<C, E, O>) => CloudFunction<E>;
+export declare type NestContextCloudEventHandler<N, E extends CloudEvent<unknown>, O = unknown> = (request: CloudEventNestContextRequest<N, E>) => PromiseOrValue<O>;
+export declare type NestContextCloudEventHandlerBuilder<N, E extends CloudEvent<unknown>, O = unknown> = (handler: NestContextCloudEventHandler<N, E, O>) => CloudEventHandler<E, O>;
+export declare type NestContextCloudEventHandlerWithData<N, I, O = unknown> = NestContextCloudEventHandler<N, CloudEvent<I>, O>;
+export declare type CloudEventHandlerWithNestContextBuilder<N, E extends CloudEvent<unknown>, O = unknown> = (nest: NestContextCloudEventHandlerBuilder<N, E, O>) => CloudFunction<E>;
 /**
  * Factory function for generating a firebase CloudFunction for a specific event.
  */
-export declare type CloudEventHandlerWithNestContextFactory<C> = <E extends CloudEvent<unknown>, O = unknown>(fn: CloudEventHandlerWithNestContextBuilder<C, E, O>) => NestApplicationFunctionFactory<CloudFunction<E>>;
+export declare type CloudEventHandlerWithNestContextFactory<N> = <E extends CloudEvent<unknown>, O = unknown>(fn: CloudEventHandlerWithNestContextBuilder<N, E, O>) => NestApplicationFunctionFactory<CloudFunction<E>>;
 /**
  * Creates a CloudEventHandlerWithNestContextFactory.
  *
@@ -17,4 +19,4 @@ export declare type CloudEventHandlerWithNestContextFactory<C> = <E extends Clou
  * @param makeNestContext
  * @returns
  */
-export declare function cloudEventHandlerWithNestContextFactory<C>(makeNestContext: MakeNestContext<C>): CloudEventHandlerWithNestContextFactory<C>;
+export declare function cloudEventHandlerWithNestContextFactory<N>(makeNestContext: MakeNestContext<N>): CloudEventHandlerWithNestContextFactory<N>;