@cedarjs/api-server 6.0.0-rc.241 → 6.0.0-rc.260

package/dist/bin.js

@@ -88,7 +88,9 @@ function resolveOptions(options = {}, args) {
       bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
     discoverFunctionsGlob: options.discoverFunctionsGlob ?? defaults.discoverFunctionsGlob,
+    configureServer: options.configureServer ?? defaults.configureServer,
     configureApiServer: options.configureApiServer ?? defaults.configureApiServer,
+    configureGraphQLServer: options.configureGraphQLServer ?? defaults.configureGraphQLServer,
     apiHost: options.apiHost ?? defaults.apiHost,
     apiPort: options.apiPort ?? defaults.apiPort
   };
@@ -153,8 +155,12 @@ var init_createServerHelpers = __esm({
         // 100MB
       },
       discoverFunctionsGlob: "dist/functions/**/*.{ts,js}",
+      configureServer: () => {
+      },
       configureApiServer: () => {
       },
+      configureGraphQLServer: () => {
+      },
       parseArgs: true,
       // `createServer()`'s only callers are `cedarjs-server api` and custom
       // `api/src/server.ts` files — both only ever run with the api side
@@ -595,6 +601,9 @@ async function cedarFastifyGraphQLServer(fastify2, options) {
   fastify2.addHook("onRequest", (_req, _reply, done) => {
     getAsyncStoreInstance3().run(/* @__PURE__ */ new Map(), done);
   });
+  if (cedarOptions.configureServer) {
+    await cedarOptions.configureServer(fastify2);
+  }
   try {
     if (!cedarOptions.graphql) {
       const [graphqlFunctionPath] = await fg2("dist/functions/graphql.{ts,js}", {
@@ -709,7 +718,9 @@ async function createServer(options = {}) {
     apiRootPath,
     fastifyServerOptions,
     discoverFunctionsGlob,
+    configureServer,
     configureApiServer,
+    configureGraphQLServer,
     apiPort,
     apiHost
   } = resolveOptions(options);
@@ -748,6 +759,9 @@ async function createServer(options = {}) {
   server.addHook("onRequest", (_req, _reply, done) => {
     getAsyncStoreInstance4().run(/* @__PURE__ */ new Map(), done);
   });
+  if (configureServer) {
+    await configureServer(server);
+  }
   await server.register(cedarFastifyAPI, {
     cedar: {
       apiRootPath,
@@ -768,7 +782,8 @@ async function createServer(options = {}) {
     await server.register(cedarFastifyGraphQLServer2, {
       cedar: {
         apiRootPath,
-        graphql: __cedar_graphqlOptions
+        graphql: __cedar_graphqlOptions,
+        configureServer: configureGraphQLServer
       }
     });
   }

package/dist/createServer.d.ts

@@ -11,13 +11,29 @@ import type { CreateServerOptions, Server } from './createServerHelpers.js';
  *   const server = await createServer({
  *     logger,
  *     apiRootPath: 'api'
+ *     configureServer: (server) => {
+ *       // Runs before the api functions and GraphQL plugins are
+ *       // registered, i.e. before any routes exist. This is the right
+ *       // place for plugins with a "global" mode that hooks `onRoute`
+ *       // (e.g. `@fastify/compress`), since those only affect routes
+ *       // registered *after* the plugin itself — registering them here
+ *       // applies them to *both* api functions and the GraphQL endpoint:
+ *       server.register(compress, { global: true })
+ *     },
  *     configureApiServer: (server) => {
- *       // Configure the API server fastify instance, e.g. add content type parsers
+ *       // Configure just the api functions' fastify instance, e.g. add
+ *       // content type parsers. Doesn't apply to the GraphQL endpoint.
+ *     },
+ *     configureGraphQLServer: (server) => {
+ *       // Configure just the GraphQL fastify instance. Doesn't apply to
+ *       // api function routes.
  *     },
  *   })
  *
- *   // Configure the returned fastify instance:
- *   server.register(myPlugin)
+ *   // Plain request-lifecycle hooks (onRequest, onSend, etc.) don't depend
+ *   // on registration order, so they can also be added to the returned
+ *   // instance after the fact and will still apply to both:
+ *   server.addHook('onRequest', myHook)
  *
  *   // When ready, start the server:
  *   await server.start()

package/dist/createServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../src/createServer.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EAEP,MAAM,0BAA0B,CAAA;AAsBjC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,YAAY,CAAC,OAAO,GAAE,mBAAwB,mBAqHnE"}
+{"version":3,"file":"createServer.d.ts","sourceRoot":"","sources":["../src/createServer.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,mBAAmB,EACnB,MAAM,EAEP,MAAM,0BAA0B,CAAA;AAsBjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAsB,YAAY,CAAC,OAAO,GAAE,mBAAwB,mBA4InE"}

package/dist/createServer.js

@@ -22,7 +22,9 @@ async function createServer(options = {}) {
     apiRootPath,
     fastifyServerOptions,
     discoverFunctionsGlob,
+    configureServer,
     configureApiServer,
+    configureGraphQLServer,
     apiPort,
     apiHost
   } = resolveOptions(options);
@@ -61,6 +63,9 @@ async function createServer(options = {}) {
   server.addHook("onRequest", (_req, _reply, done) => {
     getAsyncStoreInstance().run(/* @__PURE__ */ new Map(), done);
   });
+  if (configureServer) {
+    await configureServer(server);
+  }
   await server.register(cedarFastifyAPI, {
     cedar: {
       apiRootPath,
@@ -81,7 +86,8 @@ async function createServer(options = {}) {
     await server.register(cedarFastifyGraphQLServer, {
       cedar: {
         apiRootPath,
-        graphql: __cedar_graphqlOptions
+        graphql: __cedar_graphqlOptions,
+        configureServer: configureGraphQLServer
       }
     });
   }

package/dist/createServerHelpers.d.ts

@@ -18,8 +18,21 @@ export interface CreateServerOptions {
      * Defaults to: "dist/functions/**\/*.{ts,js}"
      */
     discoverFunctionsGlob?: string | string[];
-    /** Customise the API server fastify plugin before it is registered */
-    configureApiServer?: (server: Server) => void | Promise<void>;
+    /**
+     * Configure the root fastify instance *before* the api functions and
+     * GraphQL plugins are registered. Use this to register Fastify plugins
+     * that need to run before any routes exist — most notably plugins with a
+     * "global" mode that works by hooking `onRoute` (e.g. `@fastify/compress`),
+     * which only affects routes registered *after* the plugin itself. Simple
+     * request-lifecycle hooks (`onRequest`, `onSend`, etc.) don't have this
+     * restriction and can also be added to the returned server after
+     * `createServer()` resolves.
+     */
+    configureServer?: (server: FastifyInstance) => void | Promise<void>;
+    /** Customise the API functions fastify plugin before it is registered */
+    configureApiServer?: (server: FastifyInstance) => void | Promise<void>;
+    /** Customise the GraphQL fastify plugin before it is registered */
+    configureGraphQLServer?: (server: FastifyInstance) => void | Promise<void>;
     /** Whether to parse args or not. Defaults to `true` */
     parseArgs?: boolean;
     /** The port to listen on. Defaults to what's configured in cedar.toml */

package/dist/createServerHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServerHelpers.d.ts","sourceRoot":"","sources":["../src/createServerHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,SAAS,CAAA;AAMhB,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AAEtE,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;IAGpB,iCAAiC;IACjC,MAAM,CAAC,EACH,oBAAoB,CAAC,QAAQ,CAAC,GAC9B,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IAE1C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;IAE3D;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAEzC,sEAAsE;IACtE,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE7D,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,KAAK,0BAA0B,GAAG,QAAQ,CACxC,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG;IAClD,oBAAoB,EAAE,oBAAoB,CAAA;CAC3C,CACF,CAAA;AAID,eAAO,MAAM,6BAA6B,EAAE,MAAM,0BAqB9C,CAAA;AAgBJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BAdS,oBAAoB;GA4F7C"}
+{"version":3,"file":"createServerHelpers.d.ts","sourceRoot":"","sources":["../src/createServerHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,SAAS,CAAA;AAMhB,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;AAEtE,MAAM,WAAW,MAAO,SAAQ,eAAe;IAC7C,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACnD;AAED,MAAM,WAAW,mBAAmB;IAClC,iDAAiD;IACjD,WAAW,CAAC,EAAE,MAAM,CAAA;IAGpB,iCAAiC;IACjC,MAAM,CAAC,EACH,oBAAoB,CAAC,QAAQ,CAAC,GAC9B,oBAAoB,CAAC,gBAAgB,CAAC,CAAA;IAE1C;;;OAGG;IACH,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;IAE3D;;;OAGG;IACH,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAEzC;;;;;;;;;OASG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEnE,yEAAyE;IACzE,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAEtE,mEAAmE;IACnE,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE1E,uDAAuD;IACvD,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,uEAAuE;IACvE,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,KAAK,0BAA0B,GAAG,QAAQ,CACxC,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG;IAClD,oBAAoB,EAAE,oBAAoB,CAAA;CAC3C,CACF,CAAA;AAID,eAAO,MAAM,6BAA6B,EAAE,MAAM,0BAuB9C,CAAA;AAgBJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BAdS,oBAAoB;GA+F7C"}

package/dist/createServerHelpers.js

@@ -12,8 +12,12 @@ const getDefaultCreateServerOptions = () => ({
     // 100MB
   },
   discoverFunctionsGlob: "dist/functions/**/*.{ts,js}",
+  configureServer: () => {
+  },
   configureApiServer: () => {
   },
+  configureGraphQLServer: () => {
+  },
   parseArgs: true,
   // `createServer()`'s only callers are `cedarjs-server api` and custom
   // `api/src/server.ts` files — both only ever run with the api side
@@ -36,7 +40,9 @@ function resolveOptions(options = {}, args) {
       bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
     discoverFunctionsGlob: options.discoverFunctionsGlob ?? defaults.discoverFunctionsGlob,
+    configureServer: options.configureServer ?? defaults.configureServer,
     configureApiServer: options.configureApiServer ?? defaults.configureApiServer,
+    configureGraphQLServer: options.configureGraphQLServer ?? defaults.configureGraphQLServer,
     apiHost: options.apiHost ?? defaults.apiHost,
     apiPort: options.apiPort ?? defaults.apiPort
   };

package/dist/plugins/api.d.ts

@@ -1,13 +1,12 @@
 import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyInstance } from 'fastify';
-import type { Server } from '../createServerHelpers.js';
 export interface CedarFastifyAPIOptions {
     cedar: {
         apiRootPath?: string;
         fastGlobOptions?: FastGlobOptions;
         discoverFunctionsGlob?: string | string[];
         loadUserConfig?: boolean;
-        configureServer?: (server: Server) => void | Promise<void>;
+        configureServer?: (server: FastifyInstance) => void | Promise<void>;
     };
 }
 export declare function cedarFastifyAPI(fastify: FastifyInstance, opts: CedarFastifyAPIOptions): Promise<void>;

package/dist/plugins/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAI3D,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBA4C7B"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/plugins/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAW9C,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,eAAe,CAAC,EAAE,eAAe,CAAA;QACjC,qBAAqB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QACzC,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KAIpE,CAAA;CACF;AAED,wBAAsB,eAAe,CACnC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,sBAAsB,iBAgD7B"}

package/dist/plugins/graphql.d.ts

@@ -4,6 +4,7 @@ export interface CedarFastifyGraphQLOptions {
     cedar: {
         apiRootPath?: string;
         graphql?: GraphQLYogaOptions;
+        configureServer?: (server: FastifyInstance) => void | Promise<void>;
     };
 }
 export declare function cedarFastifyGraphQLServer(fastify: FastifyInstance, options: CedarFastifyGraphQLOptions): Promise<void>;

package/dist/plugins/graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,SAAS,CAAA;AAOhB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;KAC7B,CAAA;CACF;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,0BAA0B,iBA0HpC;AAMD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAc3D"}
+{"version":3,"file":"graphql.d.ts","sourceRoot":"","sources":["../../src/plugins/graphql.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,eAAe,EAIhB,MAAM,SAAS,CAAA;AAOhB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAKjE,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,OAAO,CAAC,EAAE,kBAAkB,CAAA;QAC5B,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;KACpE,CAAA;CACF;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,0BAA0B,iBAmIpC;AAMD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAc3D"}

package/dist/plugins/graphql.js

@@ -18,6 +18,9 @@ async function cedarFastifyGraphQLServer(fastify, options) {
   fastify.addHook("onRequest", (_req, _reply, done) => {
     getAsyncStoreInstance().run(/* @__PURE__ */ new Map(), done);
   });
+  if (cedarOptions.configureServer) {
+    await cedarOptions.configureServer(fastify);
+  }
   try {
     if (!cedarOptions.graphql) {
       const [graphqlFunctionPath] = await fg("dist/functions/graphql.{ts,js}", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "6.0.0-rc.241",
+  "version": "6.0.0-rc.260",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -92,13 +92,13 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/api": "6.0.0-rc.241",
-    "@cedarjs/context": "6.0.0-rc.241",
-    "@cedarjs/fastify-web": "6.0.0-rc.241",
-    "@cedarjs/project-config": "6.0.0-rc.241",
-    "@cedarjs/web-server": "6.0.0-rc.241",
+    "@cedarjs/api": "6.0.0-rc.260",
+    "@cedarjs/context": "6.0.0-rc.260",
+    "@cedarjs/fastify-web": "6.0.0-rc.260",
+    "@cedarjs/project-config": "6.0.0-rc.260",
+    "@cedarjs/web-server": "6.0.0-rc.260",
     "@fastify/multipart": "9.4.0",
-    "@fastify/url-data": "6.0.3",
+    "@fastify/url-data": "6.0.4",
     "ansis": "4.3.1",
     "dotenv-defaults": "5.0.2",
     "fast-glob": "3.3.3",
@@ -113,13 +113,14 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-rc.241",
+    "@cedarjs/framework-tools": "6.0.0-rc.260",
+    "@fastify/compress": "9.1.1",
     "@types/aws-lambda": "8.10.162",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/split2": "4.2.3",
     "@types/yargs": "17.0.35",
     "concurrently": "9.2.4",
-    "esbuild": "0.28.1",
+    "esbuild": "0.28.2",
     "memfs": "4.64.0",
     "pino": "9.7.0",
     "pino-abstract-transport": "1.2.0",
@@ -128,7 +129,7 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "6.0.0-rc.241"
+    "@cedarjs/graphql-server": "6.0.0-rc.260"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {