@cedarjs/api-server 1.0.1-next.0 → 1.1.0-rc.33

package/dist/cjs/watch.d.ts

@@ -1,2 +1,7 @@
-export {};
+/**
+ * Initialize the file watcher for the API server
+ * Watches for changes in the API source directory and rebuilds/restarts as
+ * needed
+ */
+export declare function startWatch(): Promise<void>;
 //# sourceMappingURL=watch.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/watch.ts"],"names":[],"mappings":""}
+{"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

@@ -6,6 +6,10 @@ 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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -22,8 +26,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/watch.ts
+var watch_exports = {};
+__export(watch_exports, {
+  startWatch: () => startWatch
+});
+module.exports = __toCommonJS(watch_exports);
 var import_path2 = __toESM(require("path"), 1);
 var import_ansis2 = __toESM(require("ansis"), 1);
 var import_chokidar = __toESM(require("chokidar"), 1);
@@ -202,11 +212,11 @@ var ServerManager = class {
 var serverManager = new ServerManager();
 
 // src/watch.ts
-var rwjsPaths2 = (0, import_project_config2.getPaths)();
+var cedarPaths = (0, import_project_config2.getPaths)();
 if (!process.env.REDWOOD_ENV_FILES_LOADED) {
   (0, import_dotenv_defaults.config)({
-    path: import_path2.default.join(rwjsPaths2.base, ".env"),
-    defaults: import_path2.default.join(rwjsPaths2.base, ".env.defaults"),
+    path: import_path2.default.join(cedarPaths.base, ".env"),
+    defaults: import_path2.default.join(cedarPaths.base, ".env.defaults"),
     multiline: true
   });
   process.env.REDWOOD_ENV_FILES_LOADED = "true";
@@ -241,52 +251,63 @@ async function validateSdls() {
     return false;
   }
 }
-var IGNORED_API_PATHS = [
-  "api/dist",
-  // use this, because using rwjsPaths.api.dist seems to not ignore on first build
-  rwjsPaths2.api.types,
-  rwjsPaths2.api.db
-].map((path3) => (0, import_project_config2.ensurePosixPath)(path3));
-import_chokidar.default.watch([rwjsPaths2.api.src], {
-  persistent: true,
-  ignoreInitial: true,
-  ignored: (file) => {
-    const x = file.includes("node_modules") || IGNORED_API_PATHS.some((ignoredPath) => file.includes(ignoredPath)) || [
-      ".DS_Store",
-      ".db",
-      ".sqlite",
-      "-journal",
-      ".test.js",
-      ".test.ts",
-      ".scenarios.ts",
-      ".scenarios.js",
-      ".d.ts",
-      ".log"
-    ].some((ext) => file.endsWith(ext));
-    return x;
-  }
-}).on("ready", async () => {
-  await buildManager.run({ clean: true, rebuild: false });
-  await validateSdls();
-}).on("all", async (eventName, filePath) => {
-  if (eventName === "addDir" && filePath === rwjsPaths2.api.base) {
-    return;
-  }
-  if (eventName) {
-    if (filePath.includes(".sdl")) {
-      const isValid = await validateSdls();
-      if (!isValid) {
-        return;
+async function startWatch() {
+  const ignoredApiPaths = [
+    // use this, because using cedarPaths.api.dist seems to not ignore on first
+    // build
+    "api/dist",
+    cedarPaths.api.types,
+    cedarPaths.api.db
+  ].map((path3) => (0, import_project_config2.ensurePosixPath)(path3));
+  const ignoredExtensions = [
+    ".DS_Store",
+    ".db",
+    ".sqlite",
+    "-journal",
+    ".test.js",
+    ".test.ts",
+    ".scenarios.ts",
+    ".scenarios.js",
+    ".d.ts",
+    ".log"
+  ];
+  const watcher = import_chokidar.default.watch([cedarPaths.api.src], {
+    persistent: true,
+    ignoreInitial: true,
+    ignored: (file) => {
+      const shouldIgnore = file.includes("node_modules") || ignoredApiPaths.some((ignoredPath) => file.includes(ignoredPath)) || ignoredExtensions.some((ext) => file.endsWith(ext));
+      return shouldIgnore;
+    }
+  });
+  watcher.on("ready", async () => {
+    await buildManager.run({ clean: true, rebuild: false });
+    await validateSdls();
+  });
+  watcher.on("all", async (eventName, filePath) => {
+    if (eventName === "addDir" && filePath === cedarPaths.api.base) {
+      return;
+    }
+    if (eventName) {
+      if (filePath.includes(".sdl")) {
+        const isValid = await validateSdls();
+        if (!isValid) {
+          return;
+        }
       }
     }
-  }
-  console.log(
-    import_ansis2.default.dim(`[${eventName}] ${filePath.replace(rwjsPaths2.api.base, "")}`)
-  );
-  buildManager.cancelScheduledBuild();
-  if (eventName === "add" || eventName === "unlink") {
-    await buildManager.run({ rebuild: false });
-  } else {
-    await buildManager.run({ rebuild: true });
-  }
+    console.log(
+      import_ansis2.default.dim(`[${eventName}] ${filePath.replace(cedarPaths.api.base, "")}`)
+    );
+    buildManager.cancelScheduledBuild();
+    if (eventName === "add" || eventName === "unlink") {
+      await buildManager.run({ rebuild: false });
+    } else {
+      await buildManager.run({ rebuild: true });
+    }
+  });
+}
+startWatch();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  startWatch
 });

package/dist/watch.d.ts

@@ -1,2 +1,7 @@
-export {};
+/**
+ * Initialize the file watcher for the API server
+ * Watches for changes in the API source directory and rebuilds/restarts as
+ * needed
+ */
+export declare function startWatch(): Promise<void>;
 //# sourceMappingURL=watch.d.ts.map

package/dist/watch.d.ts.map

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

package/dist/watch.js

@@ -183,11 +183,11 @@ var ServerManager = class {
 var serverManager = new ServerManager();
 
 // src/watch.ts
-var rwjsPaths2 = getPaths2();
+var cedarPaths = getPaths2();
 if (!process.env.REDWOOD_ENV_FILES_LOADED) {
   config({
-    path: path2.join(rwjsPaths2.base, ".env"),
-    defaults: path2.join(rwjsPaths2.base, ".env.defaults"),
+    path: path2.join(cedarPaths.base, ".env"),
+    defaults: path2.join(cedarPaths.base, ".env.defaults"),
     multiline: true
   });
   process.env.REDWOOD_ENV_FILES_LOADED = "true";
@@ -222,52 +222,64 @@ async function validateSdls() {
     return false;
   }
 }
-var IGNORED_API_PATHS = [
-  "api/dist",
-  // use this, because using rwjsPaths.api.dist seems to not ignore on first build
-  rwjsPaths2.api.types,
-  rwjsPaths2.api.db
-].map((path3) => ensurePosixPath(path3));
-chokidar.watch([rwjsPaths2.api.src], {
-  persistent: true,
-  ignoreInitial: true,
-  ignored: (file) => {
-    const x = file.includes("node_modules") || IGNORED_API_PATHS.some((ignoredPath) => file.includes(ignoredPath)) || [
-      ".DS_Store",
-      ".db",
-      ".sqlite",
-      "-journal",
-      ".test.js",
-      ".test.ts",
-      ".scenarios.ts",
-      ".scenarios.js",
-      ".d.ts",
-      ".log"
-    ].some((ext) => file.endsWith(ext));
-    return x;
-  }
-}).on("ready", async () => {
-  await buildManager.run({ clean: true, rebuild: false });
-  await validateSdls();
-}).on("all", async (eventName, filePath) => {
-  if (eventName === "addDir" && filePath === rwjsPaths2.api.base) {
-    return;
-  }
-  if (eventName) {
-    if (filePath.includes(".sdl")) {
-      const isValid = await validateSdls();
-      if (!isValid) {
-        return;
+async function startWatch() {
+  const ignoredApiPaths = [
+    // use this, because using cedarPaths.api.dist seems to not ignore on first
+    // build
+    "api/dist",
+    cedarPaths.api.types,
+    cedarPaths.api.db
+  ].map((path3) => ensurePosixPath(path3));
+  const ignoredExtensions = [
+    ".DS_Store",
+    ".db",
+    ".sqlite",
+    "-journal",
+    ".test.js",
+    ".test.ts",
+    ".scenarios.ts",
+    ".scenarios.js",
+    ".d.ts",
+    ".log"
+  ];
+  const watcher = chokidar.watch([cedarPaths.api.src], {
+    persistent: true,
+    ignoreInitial: true,
+    ignored: (file) => {
+      const shouldIgnore = file.includes("node_modules") || ignoredApiPaths.some((ignoredPath) => file.includes(ignoredPath)) || ignoredExtensions.some((ext) => file.endsWith(ext));
+      return shouldIgnore;
+    }
+  });
+  watcher.on("ready", async () => {
+    await buildManager.run({ clean: true, rebuild: false });
+    await validateSdls();
+  });
+  watcher.on("all", async (eventName, filePath) => {
+    if (eventName === "addDir" && filePath === cedarPaths.api.base) {
+      return;
+    }
+    if (eventName) {
+      if (filePath.includes(".sdl")) {
+        const isValid = await validateSdls();
+        if (!isValid) {
+          return;
+        }
       }
     }
-  }
-  console.log(
-    ansis2.dim(`[${eventName}] ${filePath.replace(rwjsPaths2.api.base, "")}`)
-  );
-  buildManager.cancelScheduledBuild();
-  if (eventName === "add" || eventName === "unlink") {
-    await buildManager.run({ rebuild: false });
-  } else {
-    await buildManager.run({ rebuild: true });
-  }
-});
+    console.log(
+      ansis2.dim(`[${eventName}] ${filePath.replace(cedarPaths.api.base, "")}`)
+    );
+    buildManager.cancelScheduledBuild();
+    if (eventName === "add" || eventName === "unlink") {
+      await buildManager.run({ rebuild: false });
+    } else {
+      await buildManager.run({ rebuild: true });
+    }
+  });
+}
+if (import.meta.url === `file://${process.argv[1]}`) {
+  startWatch();
+}
+export {
+  startWatch
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/api-server",
-  "version": "1.0.1-next.0+5d18bf5dc",
+  "version": "1.1.0-rc.33",
   "description": "CedarJS's HTTP server for Serverless Functions",
   "repository": {
     "type": "git",
@@ -68,6 +68,16 @@
     "./cjs/cliHelpers": {
       "types": "./dist/cjs/cliHelpers.d.ts",
       "default": "./dist/cjs/cliHelpers.js"
+    },
+    "./watch": {
+      "import": {
+        "types": "./dist/watch.d.ts",
+        "default": "./dist/watch.js"
+      },
+      "require": {
+        "types": "./dist/cjs/watch.d.ts",
+        "default": "./dist/cjs/watch.js"
+      }
     }
   },
   "main": "./dist/createServer.js",
@@ -97,11 +107,11 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/context": "1.0.1-next.0+5d18bf5dc",
-    "@cedarjs/fastify-web": "1.0.1-next.0+5d18bf5dc",
-    "@cedarjs/internal": "1.0.1-next.0+5d18bf5dc",
-    "@cedarjs/project-config": "1.0.1-next.0+5d18bf5dc",
-    "@cedarjs/web-server": "1.0.1-next.0+5d18bf5dc",
+    "@cedarjs/context": "1.1.0-rc.33",
+    "@cedarjs/fastify-web": "1.1.0-rc.33",
+    "@cedarjs/internal": "1.1.0-rc.33",
+    "@cedarjs/project-config": "1.1.0-rc.33",
+    "@cedarjs/web-server": "1.1.0-rc.33",
     "@fastify/multipart": "8.3.1",
     "@fastify/url-data": "5.4.0",
     "ansis": "4.1.0",
@@ -118,7 +128,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.0.0",
+    "@cedarjs/framework-tools": "1.1.0-rc.33",
     "@types/aws-lambda": "8.10.152",
     "@types/dotenv-defaults": "^2.0.4",
     "@types/qs": "6.9.16",
@@ -130,7 +140,7 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@cedarjs/graphql-server": "1.0.0"
+    "@cedarjs/graphql-server": "1.1.0-rc.33"
   },
   "peerDependenciesMeta": {
     "@cedarjs/graphql-server": {
@@ -140,5 +150,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5d18bf5dc354ad0d1446e8cc45fcad3d08cad5e7"
+  "gitHead": "86cce410c6f5611663ebcdb11df912f35d0b17fb"
 }