Tests passing again! Onto Next.js

js/plugins/firebase/jest.config.ts

@@ -41,6 +41,10 @@ const config: Config = {
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   transformIgnorePatterns: ['/node_modules/'],
+
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
 };
 
 export default config;

js/plugins/firebase/src/context.ts

@@ -17,7 +17,7 @@
 import { ContextProvider, RequestData, UserFacingError } from '@genkit-ai/core';
 import { DecodedAppCheckToken, getAppCheck } from 'firebase-admin/app-check';
 import { DecodedIdToken, getAuth } from 'firebase-admin/auth';
-import { initializeAppIfNecessary } from './helpers';
+import { initializeAppIfNecessary } from './helpers.js';
 
 /**
  * Debug features that can be enabled to simplify testing.
@@ -131,14 +131,14 @@ export interface DeclarativePolicy {
 }
 
 /**
- * Calling firebaseAuth() without any parameters merely parses firebase context data.
+ * Calling firebaseContext() without any parameters merely parses firebase context data.
  * It does not do any validation on the data found. To do automatic validation,
  * pass either an options object or function for freeform validation.
  */
 export function firebaseContext<I = any>(): FirebaseContextProvider<I>;
 
 /**
- * Calling firebaseAuth() with a declarative policy both parses and enforces context.
+ * Calling firebaseContext() with a declarative policy both parses and enforces context.
  * Honors the same environment variables that Cloud Functions for Firebase does to
  * mock token validation in preproduction environmets.
  */
@@ -147,8 +147,8 @@ export function firebaseContext<I = any>(
 ): FirebaseContextProvider<I>;
 
 /**
- * Calling firebaseAuth() with a policy context parses context but delegates enforcement.
- * To control the message sent to a user, throw UserFacingError from genkit/requestMiddleware.
+ * Calling firebaseContext() with a policy callback parses context but delegates enforcement.
+ * To control the message sent to a user, throw UserFacingError.
  * For security reasons, other error types will be returned as a 500 "internal error".
  */
 export function firebaseContext<I = any>(

js/testapps/esm/package.json

@@ -18,9 +18,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@genkit-ai/api-key": "workspace:*",
     "@genkit-ai/checks": "workspace:*",
     "@genkit-ai/dev-local-vectorstore": "workspace:*",
     "@genkit-ai/evaluator": "workspace:*",
+    "@genkit-ai/express": "workspace:*",
     "@genkit-ai/firebase": "workspace:*",
     "@genkit-ai/google-cloud": "workspace:*",
     "@genkit-ai/googleai": "workspace:*",

js/testapps/esm/src/index.ts

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+import { apiKey } from '@genkit-ai/api-key';
 import { checks } from '@genkit-ai/checks';
 import { devLocalVectorstore } from '@genkit-ai/dev-local-vectorstore';
 import { genkitEval } from '@genkit-ai/evaluator';
+import { expressHandler } from '@genkit-ai/express';
 import { enableFirebaseTelemetry } from '@genkit-ai/firebase';
+import { firebaseContext } from '@genkit-ai/firebase/context';
 import { enableGoogleCloudTelemetry } from '@genkit-ai/google-cloud';
 import { googleAI } from '@genkit-ai/googleai';
 import { vertexAI } from '@genkit-ai/vertexai';
@@ -29,6 +32,8 @@ import { chroma } from 'genkitx-chromadb';
 import { ollama } from 'genkitx-ollama';
 import { pinecone } from 'genkitx-pinecone';
 
+apiKey();
+firebaseContext();
 enableFirebaseTelemetry;
 enableGoogleCloudTelemetry;
 checks;
@@ -44,3 +49,5 @@ devLocalVectorstore;
 genkitEval;
 
 export const ai = genkit({});
+const hello = ai.defineFlow('hello', () => 'hello');
+expressHandler(hello, { context: apiKey() });