@cedarjs/api-server 1.1.1-next.21 → 1.1.1

package/dist/bin.js

@@ -38,17 +38,15 @@ var init_cliHelpers = __esm({
 // src/createServerHelpers.ts
 import { parseArgs } from "util";
 import { coerceRootPath } from "@cedarjs/fastify-web/dist/helpers.js";
-function isCustomLoggerInstance(logger) {
-  return !!logger && typeof logger === "object" && "info" in logger;
-}
 function resolveOptions(options = {}, args) {
   options.parseArgs ??= true;
   const defaults = getDefaultCreateServerOptions();
-  const logger = options.logger ?? defaults.logger;
+  options.logger ??= defaults.logger;
   const resolvedOptions = {
     apiRootPath: options.apiRootPath ?? defaults.apiRootPath,
     fastifyServerOptions: options.fastifyServerOptions ?? {
       requestTimeout: defaults.fastifyServerOptions.requestTimeout,
+      logger: options.logger ?? defaults.logger,
       bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
     discoverFunctionsGlob: options.discoverFunctionsGlob ?? defaults.discoverFunctionsGlob,
@@ -57,11 +55,7 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  if (isCustomLoggerInstance(logger)) {
-    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
-  } else {
-    resolvedOptions.fastifyServerOptions.logger = logger;
-  }
+  resolvedOptions.fastifyServerOptions.logger = options.logger;
   if (options.parseArgs) {
     const { values } = parseArgs({
       options: {
@@ -153,7 +147,7 @@ async function loadFastifyConfig() {
   }
   return serverConfigFile;
 }
-var DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance, fastify_default;
+var DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance;
 var init_fastify = __esm({
   "src/fastify.ts"() {
     "use strict";
@@ -181,7 +175,6 @@ var init_fastify = __esm({
       });
       return fastify2;
     };
-    fastify_default = createFastifyInstance;
   }
 });
 
@@ -717,7 +710,7 @@ async function handler2(options) {
     options.apiPort,
     options.apiRootPath
   ].join("");
-  const webFastify = await fastify_default();
+  const webFastify = await createFastifyInstance();
   webFastify.register(redwoodFastifyWeb, {
     redwood: {
       apiProxyTarget

package/dist/bothCLIConfigHandler.js

@@ -2,7 +2,7 @@ import ansis from "ansis";
 import { redwoodFastifyWeb, coerceRootPath } from "@cedarjs/fastify-web";
 import { getWebHost, getWebPort, getAPIHost, getAPIPort } from "./cliHelpers.js";
 import { createServer as createApiServer } from "./createServer.js";
-import createFastifyInstance from "./fastify.js";
+import { createFastifyInstance } from "./fastify.js";
 async function handler(options) {
   const timeStart = Date.now();
   console.log(ansis.dim.italic("Starting API and Web Servers..."));

package/dist/cjs/bin.js

@@ -58,17 +58,15 @@ var init_cliHelpers = __esm({
 });
 
 // src/createServerHelpers.ts
-function isCustomLoggerInstance(logger) {
-  return !!logger && typeof logger === "object" && "info" in logger;
-}
 function resolveOptions(options = {}, args) {
   options.parseArgs ??= true;
   const defaults = getDefaultCreateServerOptions();
-  const logger = options.logger ?? defaults.logger;
+  options.logger ??= defaults.logger;
   const resolvedOptions = {
     apiRootPath: options.apiRootPath ?? defaults.apiRootPath,
     fastifyServerOptions: options.fastifyServerOptions ?? {
       requestTimeout: defaults.fastifyServerOptions.requestTimeout,
+      logger: options.logger ?? defaults.logger,
       bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
     discoverFunctionsGlob: options.discoverFunctionsGlob ?? defaults.discoverFunctionsGlob,
@@ -77,11 +75,7 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  if (isCustomLoggerInstance(logger)) {
-    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
-  } else {
-    resolvedOptions.fastifyServerOptions.logger = logger;
-  }
+  resolvedOptions.fastifyServerOptions.logger = options.logger;
   if (options.parseArgs) {
     const { values } = (0, import_util.parseArgs)({
       options: {
@@ -169,7 +163,7 @@ async function loadFastifyConfig() {
   }
   return serverConfigFile;
 }
-var import_fs, import_path, import_url, import_fastify, import_store, import_project_config2, DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance, fastify_default;
+var import_fs, import_path, import_url, import_fastify, import_store, import_project_config2, DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance;
 var init_fastify = __esm({
   "src/fastify.ts"() {
     "use strict";
@@ -203,7 +197,6 @@ var init_fastify = __esm({
       });
       return fastify2;
     };
-    fastify_default = createFastifyInstance;
   }
 });
 
@@ -741,7 +734,7 @@ async function handler2(options) {
     options.apiPort,
     options.apiRootPath
   ].join("");
-  const webFastify = await fastify_default();
+  const webFastify = await createFastifyInstance();
   webFastify.register(import_fastify_web2.redwoodFastifyWeb, {
     redwood: {
       apiProxyTarget

package/dist/cjs/bothCLIConfigHandler.js

@@ -35,7 +35,7 @@ var import_ansis = __toESM(require("ansis"), 1);
 var import_fastify_web = require("@cedarjs/fastify-web");
 var import_cliHelpers = require("./cliHelpers.js");
 var import_createServer = require("./createServer.js");
-var import_fastify = __toESM(require("./fastify.js"), 1);
+var import_fastify = require("./fastify.js");
 async function handler(options) {
   const timeStart = Date.now();
   console.log(import_ansis.default.dim.italic("Starting API and Web Servers..."));
@@ -51,7 +51,7 @@ async function handler(options) {
     options.apiPort,
     options.apiRootPath
   ].join("");
-  const webFastify = await (0, import_fastify.default)();
+  const webFastify = await (0, import_fastify.createFastifyInstance)();
   webFastify.register(import_fastify_web.redwoodFastifyWeb, {
     redwood: {
       apiProxyTarget

package/dist/cjs/createServerHelpers.d.ts

@@ -7,7 +7,7 @@ export interface CreateServerOptions {
     /** The prefix for all routes. Defaults to `/` */
     apiRootPath?: string;
     /** Logger instance or options */
-    logger?: FastifyServerOptions['logger'] | FastifyServerOptions['loggerInstance'];
+    logger?: FastifyServerOptions['logger'];
     /**
      * Options for the fastify server instance.
      * Omitting logger here because we move it up.

package/dist/cjs/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,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,yEAAyE;IACzE,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,0BAiB9C,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;IAEpB,iCAAiC;IACjC,MAAM,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IAEvC;;;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,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,yEAAyE;IACzE,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,0BAiB9C,CAAA;AAQJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BANS,oBAAoB;GAgF7C"}

package/dist/cjs/createServerHelpers.js

@@ -42,17 +42,15 @@ const getDefaultCreateServerOptions = () => ({
   apiHost: (0, import_cliHelpers.getAPIHost)(),
   apiPort: (0, import_cliHelpers.getAPIPort)()
 });
-function isCustomLoggerInstance(logger) {
-  return !!logger && typeof logger === "object" && "info" in logger;
-}
 function resolveOptions(options = {}, args) {
   options.parseArgs ??= true;
   const defaults = getDefaultCreateServerOptions();
-  const logger = options.logger ?? defaults.logger;
+  options.logger ??= defaults.logger;
   const resolvedOptions = {
     apiRootPath: options.apiRootPath ?? defaults.apiRootPath,
     fastifyServerOptions: options.fastifyServerOptions ?? {
       requestTimeout: defaults.fastifyServerOptions.requestTimeout,
+      logger: options.logger ?? defaults.logger,
       bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
     discoverFunctionsGlob: options.discoverFunctionsGlob ?? defaults.discoverFunctionsGlob,
@@ -61,11 +59,7 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  if (isCustomLoggerInstance(logger)) {
-    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
-  } else {
-    resolvedOptions.fastifyServerOptions.logger = logger;
-  }
+  resolvedOptions.fastifyServerOptions.logger = options.logger;
   if (options.parseArgs) {
     const { values } = (0, import_util.parseArgs)({
       options: {

package/dist/cjs/fastify.d.ts

@@ -10,5 +10,4 @@ export declare function loadFastifyConfig(): Promise<{
     configureFastify: FastifySideConfigFn;
 }>;
 export declare const createFastifyInstance: (options?: FastifyServerOptions) => Promise<FastifyInstance>;
-export default createFastifyInstance;
 //# sourceMappingURL=fastify.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAiBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GAsCtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA;AAED,eAAe,qBAAqB,CAAA"}
+{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAiBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GAsCtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}

package/dist/cjs/fastify.js

@@ -30,7 +30,6 @@ var fastify_exports = {};
 __export(fastify_exports, {
   DEFAULT_OPTIONS: () => DEFAULT_OPTIONS,
   createFastifyInstance: () => createFastifyInstance,
-  default: () => fastify_default,
   loadFastifyConfig: () => loadFastifyConfig
 });
 module.exports = __toCommonJS(fastify_exports);
@@ -84,7 +83,6 @@ const createFastifyInstance = async (options) => {
   });
   return fastify;
 };
-var fastify_default = createFastifyInstance;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_OPTIONS,

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/watch.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAsB,UAAU,kBA+E/B"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/watch.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAsB,UAAU,kBA6E/B"}

package/dist/cjs/watch.js

@@ -252,13 +252,12 @@ async function validateSdls() {
   }
 }
 async function startWatch() {
-  const dbDir = await (0, import_project_config2.getDbDir)(cedarPaths.api.prismaConfig);
   const ignoredApiPaths = [
     // use this, because using cedarPaths.api.dist seems to not ignore on first
     // build
     "api/dist",
     cedarPaths.api.types,
-    dbDir
+    cedarPaths.api.db
   ].map((path3) => (0, import_project_config2.ensurePosixPath)(path3));
   const ignoredExtensions = [
     ".DS_Store",

package/dist/createServerHelpers.d.ts

@@ -7,7 +7,7 @@ export interface CreateServerOptions {
     /** The prefix for all routes. Defaults to `/` */
     apiRootPath?: string;
     /** Logger instance or options */
-    logger?: FastifyServerOptions['logger'] | FastifyServerOptions['loggerInstance'];
+    logger?: FastifyServerOptions['logger'];
     /**
      * Options for the fastify server instance.
      * Omitting logger here because we move it up.

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,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,yEAAyE;IACzE,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,0BAiB9C,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;IAEpB,iCAAiC;IACjC,MAAM,CAAC,EAAE,oBAAoB,CAAC,QAAQ,CAAC,CAAA;IAEvC;;;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,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB,yEAAyE;IACzE,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,0BAiB9C,CAAA;AAQJ,wBAAgB,cAAc,CAC5B,OAAO,GAAE,mBAAwB,EACjC,IAAI,CAAC,EAAE,MAAM,EAAE;0BANS,oBAAoB;GAgF7C"}

package/dist/createServerHelpers.js

@@ -18,17 +18,15 @@ const getDefaultCreateServerOptions = () => ({
   apiHost: getAPIHost(),
   apiPort: getAPIPort()
 });
-function isCustomLoggerInstance(logger) {
-  return !!logger && typeof logger === "object" && "info" in logger;
-}
 function resolveOptions(options = {}, args) {
   options.parseArgs ??= true;
   const defaults = getDefaultCreateServerOptions();
-  const logger = options.logger ?? defaults.logger;
+  options.logger ??= defaults.logger;
   const resolvedOptions = {
     apiRootPath: options.apiRootPath ?? defaults.apiRootPath,
     fastifyServerOptions: options.fastifyServerOptions ?? {
       requestTimeout: defaults.fastifyServerOptions.requestTimeout,
+      logger: options.logger ?? defaults.logger,
       bodyLimit: defaults.fastifyServerOptions.bodyLimit
     },
     discoverFunctionsGlob: options.discoverFunctionsGlob ?? defaults.discoverFunctionsGlob,
@@ -37,11 +35,7 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  if (isCustomLoggerInstance(logger)) {
-    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
-  } else {
-    resolvedOptions.fastifyServerOptions.logger = logger;
-  }
+  resolvedOptions.fastifyServerOptions.logger = options.logger;
   if (options.parseArgs) {
     const { values } = parseArgs({
       options: {

package/dist/fastify.d.ts

@@ -10,5 +10,4 @@ export declare function loadFastifyConfig(): Promise<{
     configureFastify: FastifySideConfigFn;
 }>;
 export declare const createFastifyInstance: (options?: FastifyServerOptions) => Promise<FastifyInstance>;
-export default createFastifyInstance;
 //# sourceMappingURL=fastify.d.ts.map

package/dist/fastify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAiBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GAsCtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA;AAED,eAAe,qBAAqB,CAAA"}
+{"version":3,"file":"fastify.d.ts","sourceRoot":"","sources":["../src/fastify.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAOpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrD,eAAO,MAAM,eAAe;;;;CAI3B,CAAA;AAiBD,wBAAsB,iBAAiB;YAb7B,oBAAoB;sBACV,mBAAmB;GAsCtC;AAED,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,KAC7B,OAAO,CAAC,eAAe,CAWzB,CAAA"}

package/dist/fastify.js

@@ -48,10 +48,8 @@ const createFastifyInstance = async (options) => {
   });
   return fastify;
 };
-var fastify_default = createFastifyInstance;
 export {
   DEFAULT_OPTIONS,
   createFastifyInstance,
-  fastify_default as default,
   loadFastifyConfig
 };

package/dist/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../src/watch.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAsB,UAAU,kBA+E/B"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../src/watch.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAsB,UAAU,kBA6E/B"}

package/dist/watch.js

@@ -11,7 +11,7 @@ import {
   rebuildApi
 } from "@cedarjs/internal/dist/build/api";
 import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
-import { ensurePosixPath, getPaths as getPaths2, getDbDir } from "@cedarjs/project-config";
+import { ensurePosixPath, getPaths as getPaths2 } from "@cedarjs/project-config";
 
 // src/utils.ts
 function debounce(func, wait) {
@@ -223,13 +223,12 @@ async function validateSdls() {
   }
 }
 async function startWatch() {
-  const dbDir = await getDbDir(cedarPaths.api.prismaConfig);
   const ignoredApiPaths = [
     // use this, because using cedarPaths.api.dist seems to not ignore on first
     // build
     "api/dist",
     cedarPaths.api.types,
-    dbDir
+    cedarPaths.api.db
   ].map((path3) => ensurePosixPath(path3));
   const ignoredExtensions = [
     ".DS_Store",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "1.1.1-next.21+77cfbaa90",
+  "version": "1.1.1",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -69,6 +69,10 @@
       "types": "./dist/cjs/cliHelpers.d.ts",
       "default": "./dist/cjs/cliHelpers.js"
     },
+    "./cjs/bothCliConfigHandler": {
+      "types": "./dist/cjs/bothCLIConfigHandler.d.ts",
+      "default": "./dist/cjs/bothCLIConfigHandler.js"
+    },
     "./watch": {
       "import": {
         "types": "./dist/watch.d.ts",
@@ -107,20 +111,20 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/context": "1.1.1-next.21",
-    "@cedarjs/fastify-web": "1.1.1-next.21",
-    "@cedarjs/internal": "1.1.1-next.21",
-    "@cedarjs/project-config": "1.1.1-next.21",
-    "@cedarjs/web-server": "1.1.1-next.21",
-    "@fastify/multipart": "9.0.3",
-    "@fastify/url-data": "6.0.3",
-    "chalk": "4.1.2",
+    "@cedarjs/context": "1.1.1",
+    "@cedarjs/fastify-web": "1.1.1",
+    "@cedarjs/internal": "1.1.1",
+    "@cedarjs/project-config": "1.1.1",
+    "@cedarjs/web-server": "1.1.1",
+    "@fastify/multipart": "8.3.1",
+    "@fastify/url-data": "5.4.0",
+    "ansis": "4.1.0",
     "chokidar": "3.6.0",
     "dotenv-defaults": "5.0.2",
     "fast-glob": "3.3.3",
     "fast-json-parse": "1.0.3",
-    "fastify": "5.4.0",
-    "fastify-raw-body": "5.0.0",
+    "fastify": "4.28.1",
+    "fastify-raw-body": "4.3.0",
     "pretty-bytes": "5.6.0",
     "pretty-ms": "7.0.1",
     "qs": "6.13.0",
@@ -128,20 +132,19 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.1.0",
+    "@cedarjs/framework-tools": "1.1.1",
     "@types/aws-lambda": "8.10.152",
     "@types/dotenv-defaults": "^2.0.4",
     "@types/qs": "6.9.16",
     "@types/split2": "4.2.3",
     "@types/yargs": "17.0.33",
-    "memfs": "4.17.2",
     "pino-abstract-transport": "1.2.0",
     "tsx": "4.20.5",
     "typescript": "5.9.2",
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "1.1.0"
+    "@cedarjs/graphql-server": "1.1.1"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {
@@ -151,5 +154,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "77cfbaa90a726923a763fb33b836638d94b2d431"
+  "gitHead": "0c21e9ed1de0c7302295f3ca284924e48dd81afe"
 }