@cedarjs/api-server 2.8.1-next.109 → 2.8.1-rc.3

package/dist/bin.js

@@ -219,26 +219,18 @@ var init_utils = __esm({
 });
 
 // src/requestHandlers/awsLambdaFastify.ts
-import { parse } from "picoquery";
+import qs from "qs";
 var lambdaEventForFastifyRequest, fastifyResponseForLambdaResult, fastifyResponseForLambdaError, requestHandler;
 var init_awsLambdaFastify = __esm({
   "src/requestHandlers/awsLambdaFastify.ts"() {
     "use strict";
     init_utils();
     lambdaEventForFastifyRequest = (request) => {
-      const qsParams = parse(
-        request.url.split(/\?(.+)/)[1],
-        {
-          nestingSyntax: "index",
-          arrayRepeat: true,
-          arrayRepeatSyntax: "bracket"
-        }
-      );
       return {
         httpMethod: request.method,
         headers: request.headers,
         path: request.urlData("path"),
-        queryStringParameters: qsParams,
+        queryStringParameters: qs.parse(request.url.split(/\?(.+)/)[1]),
         requestContext: {
           requestId: request.id,
           identity: {
@@ -419,12 +411,12 @@ import fastifyUrlData from "@fastify/url-data";
 import fastifyRawBody from "fastify-raw-body";
 import { getAsyncStoreInstance as getAsyncStoreInstance2 } from "@cedarjs/context/dist/store";
 import { coerceRootPath as coerceRootPath2 } from "@cedarjs/fastify-web/dist/helpers.js";
-async function cedarFastifyAPI(fastify2, opts) {
-  const cedarOptions = opts.redwood ?? {};
-  cedarOptions.apiRootPath ??= "/";
-  cedarOptions.apiRootPath = coerceRootPath2(cedarOptions.apiRootPath);
-  cedarOptions.fastGlobOptions ??= {};
-  cedarOptions.loadUserConfig ??= false;
+async function redwoodFastifyAPI(fastify2, opts) {
+  const redwoodOptions = opts.redwood ?? {};
+  redwoodOptions.apiRootPath ??= "/";
+  redwoodOptions.apiRootPath = coerceRootPath2(redwoodOptions.apiRootPath);
+  redwoodOptions.fastGlobOptions ??= {};
+  redwoodOptions.loadUserConfig ??= false;
   fastify2.register(fastifyUrlData);
   await fastify2.register(fastifyRawBody);
   fastify2.addHook("onRequest", (_req, _reply, done) => {
@@ -435,23 +427,23 @@ async function cedarFastifyAPI(fastify2, opts) {
     { parseAs: "string" },
     fastify2.defaultTextParser
   );
-  if (cedarOptions.loadUserConfig) {
+  if (redwoodOptions.loadUserConfig) {
     const { configureFastify } = await loadFastifyConfig();
     if (configureFastify) {
       await configureFastify(fastify2, {
         side: "api",
-        apiRootPath: cedarOptions.apiRootPath
+        apiRootPath: redwoodOptions.apiRootPath
       });
     }
   }
-  if (cedarOptions.configureServer) {
-    await cedarOptions.configureServer(fastify2);
+  if (redwoodOptions.configureServer) {
+    await redwoodOptions.configureServer(fastify2);
   }
-  fastify2.all(`${cedarOptions.apiRootPath}:routeName`, lambdaRequestHandler);
-  fastify2.all(`${cedarOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
+  fastify2.all(`${redwoodOptions.apiRootPath}:routeName`, lambdaRequestHandler);
+  fastify2.all(`${redwoodOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
   await loadFunctionsFromDist({
-    fastGlobOptions: cedarOptions.fastGlobOptions,
-    discoverFunctionsGlob: cedarOptions.discoverFunctionsGlob
+    fastGlobOptions: redwoodOptions.fastGlobOptions,
+    discoverFunctionsGlob: redwoodOptions.discoverFunctionsGlob
   });
 }
 var init_api = __esm({
@@ -604,7 +596,7 @@ async function createServer(options = {}) {
   server.addHook("onRequest", (_req, _reply, done) => {
     getAsyncStoreInstance4().run(/* @__PURE__ */ new Map(), done);
   });
-  await server.register(cedarFastifyAPI, {
+  await server.register(redwoodFastifyAPI, {
     redwood: {
       apiRootPath,
       fastGlobOptions: {

package/dist/cjs/bin.js

@@ -241,26 +241,18 @@ var init_utils = __esm({
 });
 
 // src/requestHandlers/awsLambdaFastify.ts
-var import_picoquery, lambdaEventForFastifyRequest, fastifyResponseForLambdaResult, fastifyResponseForLambdaError, requestHandler;
+var import_qs, lambdaEventForFastifyRequest, fastifyResponseForLambdaResult, fastifyResponseForLambdaError, requestHandler;
 var init_awsLambdaFastify = __esm({
   "src/requestHandlers/awsLambdaFastify.ts"() {
     "use strict";
-    import_picoquery = require("picoquery");
+    import_qs = __toESM(require("qs"), 1);
     init_utils();
     lambdaEventForFastifyRequest = (request) => {
-      const qsParams = (0, import_picoquery.parse)(
-        request.url.split(/\?(.+)/)[1],
-        {
-          nestingSyntax: "index",
-          arrayRepeat: true,
-          arrayRepeatSyntax: "bracket"
-        }
-      );
       return {
         httpMethod: request.method,
         headers: request.headers,
         path: request.urlData("path"),
-        queryStringParameters: qsParams,
+        queryStringParameters: import_qs.default.parse(request.url.split(/\?(.+)/)[1]),
         requestContext: {
           requestId: request.id,
           identity: {
@@ -437,12 +429,12 @@ var init_lambdaLoader = __esm({
 });
 
 // src/plugins/api.ts
-async function cedarFastifyAPI(fastify2, opts) {
-  const cedarOptions = opts.redwood ?? {};
-  cedarOptions.apiRootPath ??= "/";
-  cedarOptions.apiRootPath = (0, import_helpers2.coerceRootPath)(cedarOptions.apiRootPath);
-  cedarOptions.fastGlobOptions ??= {};
-  cedarOptions.loadUserConfig ??= false;
+async function redwoodFastifyAPI(fastify2, opts) {
+  const redwoodOptions = opts.redwood ?? {};
+  redwoodOptions.apiRootPath ??= "/";
+  redwoodOptions.apiRootPath = (0, import_helpers2.coerceRootPath)(redwoodOptions.apiRootPath);
+  redwoodOptions.fastGlobOptions ??= {};
+  redwoodOptions.loadUserConfig ??= false;
   fastify2.register(import_url_data.default);
   await fastify2.register(import_fastify_raw_body.default);
   fastify2.addHook("onRequest", (_req, _reply, done) => {
@@ -453,23 +445,23 @@ async function cedarFastifyAPI(fastify2, opts) {
     { parseAs: "string" },
     fastify2.defaultTextParser
   );
-  if (cedarOptions.loadUserConfig) {
+  if (redwoodOptions.loadUserConfig) {
     const { configureFastify } = await loadFastifyConfig();
     if (configureFastify) {
       await configureFastify(fastify2, {
         side: "api",
-        apiRootPath: cedarOptions.apiRootPath
+        apiRootPath: redwoodOptions.apiRootPath
       });
     }
   }
-  if (cedarOptions.configureServer) {
-    await cedarOptions.configureServer(fastify2);
+  if (redwoodOptions.configureServer) {
+    await redwoodOptions.configureServer(fastify2);
   }
-  fastify2.all(`${cedarOptions.apiRootPath}:routeName`, lambdaRequestHandler);
-  fastify2.all(`${cedarOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
+  fastify2.all(`${redwoodOptions.apiRootPath}:routeName`, lambdaRequestHandler);
+  fastify2.all(`${redwoodOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
   await loadFunctionsFromDist({
-    fastGlobOptions: cedarOptions.fastGlobOptions,
-    discoverFunctionsGlob: cedarOptions.discoverFunctionsGlob
+    fastGlobOptions: redwoodOptions.fastGlobOptions,
+    discoverFunctionsGlob: redwoodOptions.discoverFunctionsGlob
   });
 }
 var import_url_data, import_fastify_raw_body, import_store2, import_helpers2;
@@ -620,7 +612,7 @@ async function createServer(options = {}) {
   server.addHook("onRequest", (_req, _reply, done) => {
     (0, import_store4.getAsyncStoreInstance)().run(/* @__PURE__ */ new Map(), done);
   });
-  await server.register(cedarFastifyAPI, {
+  await server.register(redwoodFastifyAPI, {
     redwood: {
       apiRootPath,
       fastGlobOptions: {

package/dist/cjs/createServer.js

@@ -93,7 +93,7 @@ async function createServer(options = {}) {
   server.addHook("onRequest", (_req, _reply, done) => {
     (0, import_store.getAsyncStoreInstance)().run(/* @__PURE__ */ new Map(), done);
   });
-  await server.register(import_api.cedarFastifyAPI, {
+  await server.register(import_api.redwoodFastifyAPI, {
     redwood: {
       apiRootPath,
       fastGlobOptions: {

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

@@ -1,7 +1,7 @@
 import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyInstance } from 'fastify';
 import type { Server } from '../createServerHelpers.js';
-export interface CedarFastifyAPIOptions {
+export interface RedwoodFastifyAPIOptions {
     redwood: {
         apiRootPath?: string;
         fastGlobOptions?: FastGlobOptions;
@@ -10,5 +10,5 @@ export interface CedarFastifyAPIOptions {
         configureServer?: (server: Server) => void | Promise<void>;
     };
 }
-export declare function cedarFastifyAPI(fastify: FastifyInstance, opts: CedarFastifyAPIOptions): Promise<void>;
+export declare function redwoodFastifyAPI(fastify: FastifyInstance, opts: RedwoodFastifyAPIOptions): Promise<void>;
 //# sourceMappingURL=api.d.ts.map

package/dist/cjs/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;IAErC,OAAO,EAAE;QACP,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;KAC3D,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;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE;QACP,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;KAC3D,CAAA;CACF;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,iBA4C/B"}

package/dist/cjs/plugins/api.js

@@ -28,7 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  cedarFastifyAPI: () => cedarFastifyAPI
+  redwoodFastifyAPI: () => redwoodFastifyAPI
 });
 module.exports = __toCommonJS(api_exports);
 var import_url_data = __toESM(require("@fastify/url-data"), 1);
@@ -37,12 +37,12 @@ var import_store = require("@cedarjs/context/dist/store");
 var import_helpers = require("@cedarjs/fastify-web/dist/helpers.js");
 var import_fastify = require("../fastify.js");
 var import_lambdaLoader = require("./lambdaLoader.js");
-async function cedarFastifyAPI(fastify, opts) {
-  const cedarOptions = opts.redwood ?? {};
-  cedarOptions.apiRootPath ??= "/";
-  cedarOptions.apiRootPath = (0, import_helpers.coerceRootPath)(cedarOptions.apiRootPath);
-  cedarOptions.fastGlobOptions ??= {};
-  cedarOptions.loadUserConfig ??= false;
+async function redwoodFastifyAPI(fastify, opts) {
+  const redwoodOptions = opts.redwood ?? {};
+  redwoodOptions.apiRootPath ??= "/";
+  redwoodOptions.apiRootPath = (0, import_helpers.coerceRootPath)(redwoodOptions.apiRootPath);
+  redwoodOptions.fastGlobOptions ??= {};
+  redwoodOptions.loadUserConfig ??= false;
   fastify.register(import_url_data.default);
   await fastify.register(import_fastify_raw_body.default);
   fastify.addHook("onRequest", (_req, _reply, done) => {
@@ -53,26 +53,26 @@ async function cedarFastifyAPI(fastify, opts) {
     { parseAs: "string" },
     fastify.defaultTextParser
   );
-  if (cedarOptions.loadUserConfig) {
+  if (redwoodOptions.loadUserConfig) {
     const { configureFastify } = await (0, import_fastify.loadFastifyConfig)();
     if (configureFastify) {
       await configureFastify(fastify, {
         side: "api",
-        apiRootPath: cedarOptions.apiRootPath
+        apiRootPath: redwoodOptions.apiRootPath
       });
     }
   }
-  if (cedarOptions.configureServer) {
-    await cedarOptions.configureServer(fastify);
+  if (redwoodOptions.configureServer) {
+    await redwoodOptions.configureServer(fastify);
   }
-  fastify.all(`${cedarOptions.apiRootPath}:routeName`, import_lambdaLoader.lambdaRequestHandler);
-  fastify.all(`${cedarOptions.apiRootPath}:routeName/*`, import_lambdaLoader.lambdaRequestHandler);
+  fastify.all(`${redwoodOptions.apiRootPath}:routeName`, import_lambdaLoader.lambdaRequestHandler);
+  fastify.all(`${redwoodOptions.apiRootPath}:routeName/*`, import_lambdaLoader.lambdaRequestHandler);
   await (0, import_lambdaLoader.loadFunctionsFromDist)({
-    fastGlobOptions: cedarOptions.fastGlobOptions,
-    discoverFunctionsGlob: cedarOptions.discoverFunctionsGlob
+    fastGlobOptions: redwoodOptions.fastGlobOptions,
+    discoverFunctionsGlob: redwoodOptions.discoverFunctionsGlob
   });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  cedarFastifyAPI
+  redwoodFastifyAPI
 });

package/dist/cjs/requestHandlers/awsLambdaFastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"awsLambdaFastify.d.ts","sourceRoot":"","sources":["../../../src/requestHandlers/awsLambdaFastify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,OAAO,EAER,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAK3D,eAAO,MAAM,4BAA4B,GACvC,SAAS,cAAc,KACtB,oBAyBF,CAAA;AAoCD,eAAO,MAAM,cAAc,GACzB,KAAK,cAAc,EACnB,OAAO,YAAY,EACnB,SAAS,OAAO,kBAmCjB,CAAA"}
+{"version":3,"file":"awsLambdaFastify.d.ts","sourceRoot":"","sources":["../../../src/requestHandlers/awsLambdaFastify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,OAAO,EACR,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAK3D,eAAO,MAAM,4BAA4B,GACvC,SAAS,cAAc,KACtB,oBAcF,CAAA;AAoCD,eAAO,MAAM,cAAc,GACzB,KAAK,cAAc,EACnB,OAAO,YAAY,EACnB,SAAS,OAAO,kBAmCjB,CAAA"}

package/dist/cjs/requestHandlers/awsLambdaFastify.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var awsLambdaFastify_exports = {};
 __export(awsLambdaFastify_exports, {
@@ -22,22 +32,14 @@ __export(awsLambdaFastify_exports, {
   requestHandler: () => requestHandler
 });
 module.exports = __toCommonJS(awsLambdaFastify_exports);
-var import_picoquery = require("picoquery");
+var import_qs = __toESM(require("qs"), 1);
 var import_utils = require("./utils.js");
 const lambdaEventForFastifyRequest = (request) => {
-  const qsParams = (0, import_picoquery.parse)(
-    request.url.split(/\?(.+)/)[1],
-    {
-      nestingSyntax: "index",
-      arrayRepeat: true,
-      arrayRepeatSyntax: "bracket"
-    }
-  );
   return {
     httpMethod: request.method,
     headers: request.headers,
     path: request.urlData("path"),
-    queryStringParameters: qsParams,
+    queryStringParameters: import_qs.default.parse(request.url.split(/\?(.+)/)[1]),
     requestContext: {
       requestId: request.id,
       identity: {

package/dist/cjs/types.d.ts

@@ -1,19 +1,19 @@
 import type { FastifyInstance } from 'fastify';
-import type { CedarFastifyAPIOptions } from './plugins/api.js';
+import type { RedwoodFastifyAPIOptions } from './plugins/api.js';
 export type FastifySideConfigFnOptions = {
     side: 'api' | 'web';
 };
-export type FastifySideConfigFn = (fastify: FastifyInstance, options?: FastifySideConfigFnOptions & Pick<CedarFastifyAPIOptions['redwood'], 'apiRootPath'>) => Promise<FastifyInstance> | void;
+export type FastifySideConfigFn = (fastify: FastifyInstance, options?: FastifySideConfigFnOptions & Pick<RedwoodFastifyAPIOptions['redwood'], 'apiRootPath'>) => Promise<FastifyInstance> | void;
 export type APIParsedOptions = {
     port?: number;
     host?: string;
     loadEnvFiles?: boolean;
-} & Omit<CedarFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
+} & Omit<RedwoodFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
 export type BothParsedOptions = {
     webPort?: number;
     webHost?: string;
     apiPort?: number;
     apiHost?: string;
     apiRootPath?: string;
-} & Omit<CedarFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
+} & Omit<RedwoodFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
 //# sourceMappingURL=types.d.ts.map

package/dist/cjs/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAG9D,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,KAAK,GAAG,KAAK,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,0BAA0B,GAClC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,KACrD,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAA;AAEpC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAGhE,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,KAAK,GAAG,KAAK,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,0BAA0B,GAClC,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,KACvD,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAA;AAEpC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA"}

package/dist/createServer.js

@@ -7,7 +7,7 @@ import fastify from "fastify";
 import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { resolveOptions } from "./createServerHelpers.js";
-import { cedarFastifyAPI } from "./plugins/api.js";
+import { redwoodFastifyAPI } from "./plugins/api.js";
 if (!process.env.REDWOOD_ENV_FILES_LOADED) {
   config({
     path: path.join(getPaths().base, ".env"),
@@ -60,7 +60,7 @@ async function createServer(options = {}) {
   server.addHook("onRequest", (_req, _reply, done) => {
     getAsyncStoreInstance().run(/* @__PURE__ */ new Map(), done);
   });
-  await server.register(cedarFastifyAPI, {
+  await server.register(redwoodFastifyAPI, {
     redwood: {
       apiRootPath,
       fastGlobOptions: {

package/dist/plugins/api.d.ts

@@ -1,7 +1,7 @@
 import type { Options as FastGlobOptions } from 'fast-glob';
 import type { FastifyInstance } from 'fastify';
 import type { Server } from '../createServerHelpers.js';
-export interface CedarFastifyAPIOptions {
+export interface RedwoodFastifyAPIOptions {
     redwood: {
         apiRootPath?: string;
         fastGlobOptions?: FastGlobOptions;
@@ -10,5 +10,5 @@ export interface CedarFastifyAPIOptions {
         configureServer?: (server: Server) => void | Promise<void>;
     };
 }
-export declare function cedarFastifyAPI(fastify: FastifyInstance, opts: CedarFastifyAPIOptions): Promise<void>;
+export declare function redwoodFastifyAPI(fastify: FastifyInstance, opts: RedwoodFastifyAPIOptions): Promise<void>;
 //# sourceMappingURL=api.d.ts.map

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;IAErC,OAAO,EAAE;QACP,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;KAC3D,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;AAO9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAKvD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE;QACP,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;KAC3D,CAAA;CACF;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,iBA4C/B"}

package/dist/plugins/api.js

@@ -4,12 +4,12 @@ import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
 import { coerceRootPath } from "@cedarjs/fastify-web/dist/helpers.js";
 import { loadFastifyConfig } from "../fastify.js";
 import { lambdaRequestHandler, loadFunctionsFromDist } from "./lambdaLoader.js";
-async function cedarFastifyAPI(fastify, opts) {
-  const cedarOptions = opts.redwood ?? {};
-  cedarOptions.apiRootPath ??= "/";
-  cedarOptions.apiRootPath = coerceRootPath(cedarOptions.apiRootPath);
-  cedarOptions.fastGlobOptions ??= {};
-  cedarOptions.loadUserConfig ??= false;
+async function redwoodFastifyAPI(fastify, opts) {
+  const redwoodOptions = opts.redwood ?? {};
+  redwoodOptions.apiRootPath ??= "/";
+  redwoodOptions.apiRootPath = coerceRootPath(redwoodOptions.apiRootPath);
+  redwoodOptions.fastGlobOptions ??= {};
+  redwoodOptions.loadUserConfig ??= false;
   fastify.register(fastifyUrlData);
   await fastify.register(fastifyRawBody);
   fastify.addHook("onRequest", (_req, _reply, done) => {
@@ -20,25 +20,25 @@ async function cedarFastifyAPI(fastify, opts) {
     { parseAs: "string" },
     fastify.defaultTextParser
   );
-  if (cedarOptions.loadUserConfig) {
+  if (redwoodOptions.loadUserConfig) {
     const { configureFastify } = await loadFastifyConfig();
     if (configureFastify) {
       await configureFastify(fastify, {
         side: "api",
-        apiRootPath: cedarOptions.apiRootPath
+        apiRootPath: redwoodOptions.apiRootPath
       });
     }
   }
-  if (cedarOptions.configureServer) {
-    await cedarOptions.configureServer(fastify);
+  if (redwoodOptions.configureServer) {
+    await redwoodOptions.configureServer(fastify);
   }
-  fastify.all(`${cedarOptions.apiRootPath}:routeName`, lambdaRequestHandler);
-  fastify.all(`${cedarOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
+  fastify.all(`${redwoodOptions.apiRootPath}:routeName`, lambdaRequestHandler);
+  fastify.all(`${redwoodOptions.apiRootPath}:routeName/*`, lambdaRequestHandler);
   await loadFunctionsFromDist({
-    fastGlobOptions: cedarOptions.fastGlobOptions,
-    discoverFunctionsGlob: cedarOptions.discoverFunctionsGlob
+    fastGlobOptions: redwoodOptions.fastGlobOptions,
+    discoverFunctionsGlob: redwoodOptions.discoverFunctionsGlob
   });
 }
 export {
-  cedarFastifyAPI
+  redwoodFastifyAPI
 };

package/dist/requestHandlers/awsLambdaFastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"awsLambdaFastify.d.ts","sourceRoot":"","sources":["../../src/requestHandlers/awsLambdaFastify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,OAAO,EAER,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAK3D,eAAO,MAAM,4BAA4B,GACvC,SAAS,cAAc,KACtB,oBAyBF,CAAA;AAoCD,eAAO,MAAM,cAAc,GACzB,KAAK,cAAc,EACnB,OAAO,YAAY,EACnB,SAAS,OAAO,kBAmCjB,CAAA"}
+{"version":3,"file":"awsLambdaFastify.d.ts","sourceRoot":"","sources":["../../src/requestHandlers/awsLambdaFastify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EACpB,OAAO,EACR,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAK3D,eAAO,MAAM,4BAA4B,GACvC,SAAS,cAAc,KACtB,oBAcF,CAAA;AAoCD,eAAO,MAAM,cAAc,GACzB,KAAK,cAAc,EACnB,OAAO,YAAY,EACnB,SAAS,OAAO,kBAmCjB,CAAA"}

package/dist/requestHandlers/awsLambdaFastify.js

@@ -1,19 +1,11 @@
-import { parse } from "picoquery";
+import qs from "qs";
 import { mergeMultiValueHeaders, parseBody } from "./utils.js";
 const lambdaEventForFastifyRequest = (request) => {
-  const qsParams = parse(
-    request.url.split(/\?(.+)/)[1],
-    {
-      nestingSyntax: "index",
-      arrayRepeat: true,
-      arrayRepeatSyntax: "bracket"
-    }
-  );
   return {
     httpMethod: request.method,
     headers: request.headers,
     path: request.urlData("path"),
-    queryStringParameters: qsParams,
+    queryStringParameters: qs.parse(request.url.split(/\?(.+)/)[1]),
     requestContext: {
       requestId: request.id,
       identity: {

package/dist/types.d.ts

@@ -1,19 +1,19 @@
 import type { FastifyInstance } from 'fastify';
-import type { CedarFastifyAPIOptions } from './plugins/api.js';
+import type { RedwoodFastifyAPIOptions } from './plugins/api.js';
 export type FastifySideConfigFnOptions = {
     side: 'api' | 'web';
 };
-export type FastifySideConfigFn = (fastify: FastifyInstance, options?: FastifySideConfigFnOptions & Pick<CedarFastifyAPIOptions['redwood'], 'apiRootPath'>) => Promise<FastifyInstance> | void;
+export type FastifySideConfigFn = (fastify: FastifyInstance, options?: FastifySideConfigFnOptions & Pick<RedwoodFastifyAPIOptions['redwood'], 'apiRootPath'>) => Promise<FastifyInstance> | void;
 export type APIParsedOptions = {
     port?: number;
     host?: string;
     loadEnvFiles?: boolean;
-} & Omit<CedarFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
+} & Omit<RedwoodFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
 export type BothParsedOptions = {
     webPort?: number;
     webHost?: string;
     apiPort?: number;
     apiHost?: string;
     apiRootPath?: string;
-} & Omit<CedarFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
+} & Omit<RedwoodFastifyAPIOptions['redwood'], 'fastGlobOptions'>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAG9D,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,KAAK,GAAG,KAAK,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,0BAA0B,GAClC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,KACrD,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAA;AAEpC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAE9C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAA;AAGhE,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,KAAK,GAAG,KAAK,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,0BAA0B,GAClC,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,KACvD,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,CAAA;AAEpC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,GAAG,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA;AAEhE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "2.8.1-next.109+be993981d",
+  "version": "2.8.1-rc.3",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -111,11 +111,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/context": "2.8.1-next.109+be993981d",
-    "@cedarjs/fastify-web": "2.8.1-next.109+be993981d",
-    "@cedarjs/internal": "2.8.1-next.109+be993981d",
-    "@cedarjs/project-config": "2.8.1-next.109+be993981d",
-    "@cedarjs/web-server": "2.8.1-next.109+be993981d",
+    "@cedarjs/context": "2.8.1-rc.3",
+    "@cedarjs/fastify-web": "2.8.1-rc.3",
+    "@cedarjs/internal": "2.8.1-rc.3",
+    "@cedarjs/project-config": "2.8.1-rc.3",
+    "@cedarjs/web-server": "2.8.1-rc.3",
     "@fastify/multipart": "9.4.0",
     "@fastify/url-data": "6.0.3",
     "ansis": "4.2.0",
@@ -123,29 +123,30 @@
     "dotenv-defaults": "5.0.2",
     "fast-glob": "3.3.3",
     "fast-json-parse": "1.0.3",
-    "fastify": "5.8.2",
+    "fastify": "5.7.4",
     "fastify-raw-body": "5.0.0",
-    "picoquery": "2.5.0",
     "pretty-bytes": "5.6.0",
     "pretty-ms": "7.0.1",
+    "qs": "6.15.0",
     "split2": "4.2.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "2.8.1-next.109",
+    "@cedarjs/framework-tools": "2.8.1-rc.3",
     "@types/aws-lambda": "8.10.161",
     "@types/dotenv-defaults": "^5.0.0",
+    "@types/qs": "6.14.0",
     "@types/split2": "4.2.3",
     "@types/yargs": "17.0.35",
-    "graphql-yoga": "5.18.1",
-    "memfs": "4.56.11",
+    "graphql-yoga": "5.18.0",
+    "memfs": "4.56.10",
     "pino-abstract-transport": "1.2.0",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "2.8.0"
+    "@cedarjs/graphql-server": "2.8.1-rc.3"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {
@@ -155,5 +156,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "be993981d7e162a83244009c3f7ab9270c6773f3"
+  "gitHead": "f778a5b70b97c0b129246e918083f42c63a6dc0a"
 }