@cedarjs/api-server 1.1.1-next.0 → 1.1.1-next.18

package/dist/bin.js

@@ -38,15 +38,17 @@ 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();
-  options.logger ??= defaults.logger;
+  const 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,
@@ -55,7 +57,11 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  resolvedOptions.fastifyServerOptions.logger = options.logger;
+  if (isCustomLoggerInstance(logger)) {
+    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
+  } else {
+    resolvedOptions.fastifyServerOptions.logger = logger;
+  }
   if (options.parseArgs) {
     const { values } = parseArgs({
       options: {

package/dist/cjs/bin.js

@@ -58,15 +58,17 @@ 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();
-  options.logger ??= defaults.logger;
+  const 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,
@@ -75,7 +77,11 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  resolvedOptions.fastifyServerOptions.logger = options.logger;
+  if (isCustomLoggerInstance(logger)) {
+    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
+  } else {
+    resolvedOptions.fastifyServerOptions.logger = logger;
+  }
   if (options.parseArgs) {
     const { values } = (0, import_util.parseArgs)({
       options: {

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'];
+    logger?: FastifyServerOptions['logger'] | FastifyServerOptions['loggerInstance'];
     /**
      * 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;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"}
+{"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"}

package/dist/cjs/createServerHelpers.js

@@ -42,15 +42,17 @@ 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();
-  options.logger ??= defaults.logger;
+  const 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,
@@ -59,7 +61,11 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  resolvedOptions.fastifyServerOptions.logger = options.logger;
+  if (isCustomLoggerInstance(logger)) {
+    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
+  } else {
+    resolvedOptions.fastifyServerOptions.logger = logger;
+  }
   if (options.parseArgs) {
     const { values } = (0, import_util.parseArgs)({
       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,kBA6E/B"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/watch.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAsB,UAAU,kBA+E/B"}

package/dist/cjs/watch.js

@@ -252,12 +252,13 @@ 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,
-    cedarPaths.api.db
+    dbDir
   ].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'];
+    logger?: FastifyServerOptions['logger'] | FastifyServerOptions['loggerInstance'];
     /**
      * 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;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"}
+{"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"}

package/dist/createServerHelpers.js

@@ -18,15 +18,17 @@ 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();
-  options.logger ??= defaults.logger;
+  const 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,
@@ -35,7 +37,11 @@ function resolveOptions(options = {}, args) {
     apiPort: options.apiPort ?? defaults.apiPort
   };
   resolvedOptions.fastifyServerOptions.requestTimeout ??= defaults.fastifyServerOptions.requestTimeout;
-  resolvedOptions.fastifyServerOptions.logger = options.logger;
+  if (isCustomLoggerInstance(logger)) {
+    resolvedOptions.fastifyServerOptions.loggerInstance = logger;
+  } else {
+    resolvedOptions.fastifyServerOptions.logger = logger;
+  }
   if (options.parseArgs) {
     const { values } = parseArgs({
       options: {

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,kBA6E/B"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../src/watch.ts"],"names":[],"mappings":"AAuEA;;;;GAIG;AACH,wBAAsB,UAAU,kBA+E/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 } from "@cedarjs/project-config";
+import { ensurePosixPath, getPaths as getPaths2, getDbDir } from "@cedarjs/project-config";
 
 // src/utils.ts
 function debounce(func, wait) {
@@ -223,12 +223,13 @@ 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,
-    cedarPaths.api.db
+    dbDir
   ].map((path3) => ensurePosixPath(path3));
   const ignoredExtensions = [
     ".DS_Store",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "1.1.1-next.0+4e91c835e",
+  "version": "1.1.1-next.18+5ffd3124d",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -107,20 +107,20 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/context": "1.1.1-next.0+4e91c835e",
-    "@cedarjs/fastify-web": "1.1.1-next.0+4e91c835e",
-    "@cedarjs/internal": "1.1.1-next.0+4e91c835e",
-    "@cedarjs/project-config": "1.1.1-next.0+4e91c835e",
-    "@cedarjs/web-server": "1.1.1-next.0+4e91c835e",
-    "@fastify/multipart": "8.3.1",
-    "@fastify/url-data": "5.4.0",
-    "ansis": "4.1.0",
+    "@cedarjs/context": "1.1.1-next.18",
+    "@cedarjs/fastify-web": "1.1.1-next.18",
+    "@cedarjs/internal": "1.1.1-next.18",
+    "@cedarjs/project-config": "1.1.1-next.18",
+    "@cedarjs/web-server": "1.1.1-next.18",
+    "@fastify/multipart": "9.0.3",
+    "@fastify/url-data": "6.0.3",
+    "chalk": "4.1.2",
     "chokidar": "3.6.0",
     "dotenv-defaults": "5.0.2",
     "fast-glob": "3.3.3",
     "fast-json-parse": "1.0.3",
-    "fastify": "4.28.1",
-    "fastify-raw-body": "4.3.0",
+    "fastify": "5.4.0",
+    "fastify-raw-body": "5.0.0",
     "pretty-bytes": "5.6.0",
     "pretty-ms": "7.0.1",
     "qs": "6.13.0",
@@ -134,6 +134,7 @@
     "@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",
@@ -150,5 +151,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4e91c835e7b5fc4fe1499b811415ff56041ae9bf"
+  "gitHead": "5ffd3124d3d4ceb7843408264c96ecceff8542f5"
 }