@cedarjs/api-server 2.5.0 → 2.5.1-next.27

package/dist/cjs/watch.js

@@ -217,7 +217,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_project_config2 = require("@cedarjs/project-config");
 async function workspacePackagesPaths() {
   const cedarPaths2 = (0, import_project_config2.getPaths)();
-  const packagesDir = import_node_path.default.join(cedarPaths2.base, "packages");
+  const packagesDir = import_node_path.default.join(cedarPaths2.packages);
   const packages = [];
   try {
     const rootPackageJsonPath = import_node_path.default.join(cedarPaths2.base, "package.json");
@@ -259,18 +259,14 @@ async function workspacePackagesPaths() {
   }
   return packages;
 }
-function workspacePackagesIgnorePaths() {
-  const cedarPaths2 = (0, import_project_config2.getPaths)();
-  const packagesDir = import_node_path.default.join(cedarPaths2.base, "packages");
-  const packageIgnoredPaths = [];
-  if (import_node_fs2.default.existsSync(packagesDir)) {
-    packageIgnoredPaths.push(import_node_path.default.join(packagesDir, "*/src"));
-  }
-  return packageIgnoredPaths;
-}
 async function apiIgnorePaths() {
   const cedarPaths2 = (0, import_project_config2.getPaths)();
   const dbDir = await (0, import_project_config2.getDbDir)(cedarPaths2.api.prismaConfig);
+  if (dbDir === cedarPaths2.api.base) {
+    throw new Error(
+      "Database directory cannot be the same as the API directory"
+    );
+  }
   const ignoredApiPaths = [
     // TODO: Is this still true?
     // use this, because using cedarPaths.api.dist seems to not ignore on first
@@ -281,13 +277,9 @@ async function apiIgnorePaths() {
   ];
   return ignoredApiPaths;
 }
-async function ignorePaths() {
-  const apiIgnore = await apiIgnorePaths();
-  const packagesIgnore = workspacePackagesIgnorePaths();
-  return [...apiIgnore, ...packagesIgnore].map((p) => (0, import_project_config2.importStatementPath)(p));
-}
 async function getIgnoreFunction() {
-  const ignoredWatchPaths = await ignorePaths();
+  const cedarPaths2 = (0, import_project_config2.getPaths)();
+  const ignoredApiPaths = await apiIgnorePaths();
   const ignoredExtensions = [
     ".DS_Store",
     ".db",
@@ -301,8 +293,19 @@ async function getIgnoreFunction() {
     ".log"
   ];
   return (file) => {
-    const shouldIgnore = file.includes("node_modules") || ignoredWatchPaths.some((ignoredPath) => file.includes(ignoredPath)) || ignoredExtensions.some((ext) => file.endsWith(ext));
-    return shouldIgnore;
+    if (file.includes("node_modules")) {
+      return true;
+    }
+    if (ignoredExtensions.some((ext) => file.endsWith(ext))) {
+      return true;
+    }
+    if (file.includes((0, import_project_config2.importStatementPath)(cedarPaths2.packages)) && file.includes("/src/")) {
+      return true;
+    }
+    if (ignoredApiPaths.some((ignoredPath) => file.includes(ignoredPath))) {
+      return true;
+    }
+    return false;
   };
 }
 async function pathsToWatch() {

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

@@ -1 +1 @@
-{"version":3,"file":"watchPaths.d.ts","sourceRoot":"","sources":["../../src/watchPaths.ts"],"names":[],"mappings":"AAoHA,wBAAsB,iBAAiB,mBAgBvB,MAAM,cAQrB;AAED,wBAAsB,YAAY,sBAQjC"}
+{"version":3,"file":"watchPaths.d.ts","sourceRoot":"","sources":["../../src/watchPaths.ts"],"names":[],"mappings":"AAmGA,wBAAsB,iBAAiB,mBAqBvB,MAAM,cAwBrB;AAED,wBAAsB,YAAY,sBAQjC"}

package/dist/cjs/watchPaths.js

@@ -37,7 +37,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_project_config = require("@cedarjs/project-config");
 async function workspacePackagesPaths() {
   const cedarPaths = (0, import_project_config.getPaths)();
-  const packagesDir = import_node_path.default.join(cedarPaths.base, "packages");
+  const packagesDir = import_node_path.default.join(cedarPaths.packages);
   const packages = [];
   try {
     const rootPackageJsonPath = import_node_path.default.join(cedarPaths.base, "package.json");
@@ -79,18 +79,14 @@ async function workspacePackagesPaths() {
   }
   return packages;
 }
-function workspacePackagesIgnorePaths() {
-  const cedarPaths = (0, import_project_config.getPaths)();
-  const packagesDir = import_node_path.default.join(cedarPaths.base, "packages");
-  const packageIgnoredPaths = [];
-  if (import_node_fs.default.existsSync(packagesDir)) {
-    packageIgnoredPaths.push(import_node_path.default.join(packagesDir, "*/src"));
-  }
-  return packageIgnoredPaths;
-}
 async function apiIgnorePaths() {
   const cedarPaths = (0, import_project_config.getPaths)();
   const dbDir = await (0, import_project_config.getDbDir)(cedarPaths.api.prismaConfig);
+  if (dbDir === cedarPaths.api.base) {
+    throw new Error(
+      "Database directory cannot be the same as the API directory"
+    );
+  }
   const ignoredApiPaths = [
     // TODO: Is this still true?
     // use this, because using cedarPaths.api.dist seems to not ignore on first
@@ -101,13 +97,9 @@ async function apiIgnorePaths() {
   ];
   return ignoredApiPaths;
 }
-async function ignorePaths() {
-  const apiIgnore = await apiIgnorePaths();
-  const packagesIgnore = workspacePackagesIgnorePaths();
-  return [...apiIgnore, ...packagesIgnore].map((p) => (0, import_project_config.importStatementPath)(p));
-}
 async function getIgnoreFunction() {
-  const ignoredWatchPaths = await ignorePaths();
+  const cedarPaths = (0, import_project_config.getPaths)();
+  const ignoredApiPaths = await apiIgnorePaths();
   const ignoredExtensions = [
     ".DS_Store",
     ".db",
@@ -121,8 +113,19 @@ async function getIgnoreFunction() {
     ".log"
   ];
   return (file) => {
-    const shouldIgnore = file.includes("node_modules") || ignoredWatchPaths.some((ignoredPath) => file.includes(ignoredPath)) || ignoredExtensions.some((ext) => file.endsWith(ext));
-    return shouldIgnore;
+    if (file.includes("node_modules")) {
+      return true;
+    }
+    if (ignoredExtensions.some((ext) => file.endsWith(ext))) {
+      return true;
+    }
+    if (file.includes((0, import_project_config.importStatementPath)(cedarPaths.packages)) && file.includes("/src/")) {
+      return true;
+    }
+    if (ignoredApiPaths.some((ignoredPath) => file.includes(ignoredPath))) {
+      return true;
+    }
+    return false;
   };
 }
 async function pathsToWatch() {

package/dist/watch.js

@@ -192,7 +192,7 @@ import {
 } from "@cedarjs/project-config";
 async function workspacePackagesPaths() {
   const cedarPaths2 = getPaths2();
-  const packagesDir = path2.join(cedarPaths2.base, "packages");
+  const packagesDir = path2.join(cedarPaths2.packages);
   const packages = [];
   try {
     const rootPackageJsonPath = path2.join(cedarPaths2.base, "package.json");
@@ -234,18 +234,14 @@ async function workspacePackagesPaths() {
   }
   return packages;
 }
-function workspacePackagesIgnorePaths() {
-  const cedarPaths2 = getPaths2();
-  const packagesDir = path2.join(cedarPaths2.base, "packages");
-  const packageIgnoredPaths = [];
-  if (fs2.existsSync(packagesDir)) {
-    packageIgnoredPaths.push(path2.join(packagesDir, "*/src"));
-  }
-  return packageIgnoredPaths;
-}
 async function apiIgnorePaths() {
   const cedarPaths2 = getPaths2();
   const dbDir = await getDbDir(cedarPaths2.api.prismaConfig);
+  if (dbDir === cedarPaths2.api.base) {
+    throw new Error(
+      "Database directory cannot be the same as the API directory"
+    );
+  }
   const ignoredApiPaths = [
     // TODO: Is this still true?
     // use this, because using cedarPaths.api.dist seems to not ignore on first
@@ -256,13 +252,9 @@ async function apiIgnorePaths() {
   ];
   return ignoredApiPaths;
 }
-async function ignorePaths() {
-  const apiIgnore = await apiIgnorePaths();
-  const packagesIgnore = workspacePackagesIgnorePaths();
-  return [...apiIgnore, ...packagesIgnore].map((p) => importStatementPath(p));
-}
 async function getIgnoreFunction() {
-  const ignoredWatchPaths = await ignorePaths();
+  const cedarPaths2 = getPaths2();
+  const ignoredApiPaths = await apiIgnorePaths();
   const ignoredExtensions = [
     ".DS_Store",
     ".db",
@@ -276,8 +268,19 @@ async function getIgnoreFunction() {
     ".log"
   ];
   return (file) => {
-    const shouldIgnore = file.includes("node_modules") || ignoredWatchPaths.some((ignoredPath) => file.includes(ignoredPath)) || ignoredExtensions.some((ext) => file.endsWith(ext));
-    return shouldIgnore;
+    if (file.includes("node_modules")) {
+      return true;
+    }
+    if (ignoredExtensions.some((ext) => file.endsWith(ext))) {
+      return true;
+    }
+    if (file.includes(importStatementPath(cedarPaths2.packages)) && file.includes("/src/")) {
+      return true;
+    }
+    if (ignoredApiPaths.some((ignoredPath) => file.includes(ignoredPath))) {
+      return true;
+    }
+    return false;
   };
 }
 async function pathsToWatch() {

package/dist/watchPaths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watchPaths.d.ts","sourceRoot":"","sources":["../src/watchPaths.ts"],"names":[],"mappings":"AAoHA,wBAAsB,iBAAiB,mBAgBvB,MAAM,cAQrB;AAED,wBAAsB,YAAY,sBAQjC"}
+{"version":3,"file":"watchPaths.d.ts","sourceRoot":"","sources":["../src/watchPaths.ts"],"names":[],"mappings":"AAmGA,wBAAsB,iBAAiB,mBAqBvB,MAAM,cAwBrB;AAED,wBAAsB,YAAY,sBAQjC"}

package/dist/watchPaths.js

@@ -7,7 +7,7 @@ import {
 } from "@cedarjs/project-config";
 async function workspacePackagesPaths() {
   const cedarPaths = getPaths();
-  const packagesDir = path.join(cedarPaths.base, "packages");
+  const packagesDir = path.join(cedarPaths.packages);
   const packages = [];
   try {
     const rootPackageJsonPath = path.join(cedarPaths.base, "package.json");
@@ -49,18 +49,14 @@ async function workspacePackagesPaths() {
   }
   return packages;
 }
-function workspacePackagesIgnorePaths() {
-  const cedarPaths = getPaths();
-  const packagesDir = path.join(cedarPaths.base, "packages");
-  const packageIgnoredPaths = [];
-  if (fs.existsSync(packagesDir)) {
-    packageIgnoredPaths.push(path.join(packagesDir, "*/src"));
-  }
-  return packageIgnoredPaths;
-}
 async function apiIgnorePaths() {
   const cedarPaths = getPaths();
   const dbDir = await getDbDir(cedarPaths.api.prismaConfig);
+  if (dbDir === cedarPaths.api.base) {
+    throw new Error(
+      "Database directory cannot be the same as the API directory"
+    );
+  }
   const ignoredApiPaths = [
     // TODO: Is this still true?
     // use this, because using cedarPaths.api.dist seems to not ignore on first
@@ -71,13 +67,9 @@ async function apiIgnorePaths() {
   ];
   return ignoredApiPaths;
 }
-async function ignorePaths() {
-  const apiIgnore = await apiIgnorePaths();
-  const packagesIgnore = workspacePackagesIgnorePaths();
-  return [...apiIgnore, ...packagesIgnore].map((p) => importStatementPath(p));
-}
 async function getIgnoreFunction() {
-  const ignoredWatchPaths = await ignorePaths();
+  const cedarPaths = getPaths();
+  const ignoredApiPaths = await apiIgnorePaths();
   const ignoredExtensions = [
     ".DS_Store",
     ".db",
@@ -91,8 +83,19 @@ async function getIgnoreFunction() {
     ".log"
   ];
   return (file) => {
-    const shouldIgnore = file.includes("node_modules") || ignoredWatchPaths.some((ignoredPath) => file.includes(ignoredPath)) || ignoredExtensions.some((ext) => file.endsWith(ext));
-    return shouldIgnore;
+    if (file.includes("node_modules")) {
+      return true;
+    }
+    if (ignoredExtensions.some((ext) => file.endsWith(ext))) {
+      return true;
+    }
+    if (file.includes(importStatementPath(cedarPaths.packages)) && file.includes("/src/")) {
+      return true;
+    }
+    if (ignoredApiPaths.some((ignoredPath) => file.includes(ignoredPath))) {
+      return true;
+    }
+    return false;
   };
 }
 async function pathsToWatch() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "2.5.0",
+  "version": "2.5.1-next.27+4a00a5632",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -111,11 +111,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/context": "2.5.0",
-    "@cedarjs/fastify-web": "2.5.0",
-    "@cedarjs/internal": "2.5.0",
-    "@cedarjs/project-config": "2.5.0",
-    "@cedarjs/web-server": "2.5.0",
+    "@cedarjs/context": "2.5.1-next.27+4a00a5632",
+    "@cedarjs/fastify-web": "2.5.1-next.27+4a00a5632",
+    "@cedarjs/internal": "2.5.1-next.27+4a00a5632",
+    "@cedarjs/project-config": "2.5.1-next.27+4a00a5632",
+    "@cedarjs/web-server": "2.5.1-next.27+4a00a5632",
     "@fastify/multipart": "9.4.0",
     "@fastify/url-data": "6.0.3",
     "ansis": "4.2.0",
@@ -123,7 +123,7 @@
     "dotenv-defaults": "5.0.2",
     "fast-glob": "3.3.3",
     "fast-json-parse": "1.0.3",
-    "fastify": "5.7.2",
+    "fastify": "5.7.4",
     "fastify-raw-body": "5.0.0",
     "pretty-bytes": "5.6.0",
     "pretty-ms": "7.0.1",
@@ -132,7 +132,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "0.0.0",
+    "@cedarjs/framework-tools": "2.5.1-next.27",
     "@types/aws-lambda": "8.10.160",
     "@types/dotenv-defaults": "^5.0.0",
     "@types/qs": "6.14.0",
@@ -155,5 +155,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "42e3c32b60325fcab386d1816401a8451f910121"
+  "gitHead": "4a00a56324db4db5db1559e21850f4d9b5856b52"
 }