@cedarjs/cli 1.0.0-canary.13057 → 1.0.0-canary.13060

package/dist/commands/dev.js

@@ -8,7 +8,8 @@ const builder = (yargs) => {
     choices: ["api", "web"],
     default: ["api", "web"],
     description: "Which dev server(s) to start",
-    type: "array"
+    type: "string",
+    array: true
   }).option("forward", {
     alias: "fwd",
     description: 'String of one or more vite dev server config options, for example: `--fwd="--port=1234 --open=false"`',

package/dist/commands/devHandler.js

@@ -26,8 +26,10 @@ const handler = async ({
   });
   const rwjsPaths = getPaths();
   const serverFile = serverFileExists();
-  let apiPreferredPort = parseInt(getConfig().api.port);
-  let webPreferredPort = parseInt(getConfig().web.port);
+  const apiPreferredPort = parseInt(String(getConfig().api.port));
+  let webPreferredPort = parseInt(
+    String(getConfig().web.port)
+  );
   let apiAvailablePort = apiPreferredPort;
   let apiPortChangeNeeded = false;
   let webAvailablePort = webPreferredPort;
@@ -46,7 +48,8 @@ const handler = async ({
       ...forward.matchAll(/\-\-port(\=|\s)(?<port>[^\s]*)/g)
     ];
     if (forwardedPortMatches.length) {
-      webPreferredPort = parseInt(forwardedPortMatches.pop().groups.port);
+      const port = forwardedPortMatches.pop()?.groups?.port;
+      webPreferredPort = port ? parseInt(port, 10) : void 0;
     }
     webAvailablePort = await getFreePort(webPreferredPort, [
       apiPreferredPort,
@@ -84,19 +87,18 @@ const handler = async ({
         force: false
       });
     } catch (e) {
-      errorTelemetry(
-        process.argv,
-        `Error generating prisma client: ${e.message}`
-      );
-      console.error(c.error(e.message));
+      const message = e instanceof Object && "message" in e ? e.message : String(e);
+      errorTelemetry(process.argv, `Error generating prisma client: ${message}`);
+      console.error(c.error(message));
     }
     if (!serverFile) {
       try {
         await shutdownPort(apiAvailablePort);
       } catch (e) {
-        errorTelemetry(process.argv, `Error shutting down "api": ${e.message}`);
+        const message = e instanceof Object && "message" in e ? e.message : String(e);
+        errorTelemetry(process.argv, `Error shutting down "api": ${message}`);
         console.error(
-          `Error whilst shutting down "api" port: ${c.error(e.message)}`
+          `Error whilst shutting down "api" port: ${c.error(message)}`
         );
       }
     }
@@ -105,9 +107,10 @@ const handler = async ({
     try {
       await shutdownPort(webAvailablePort);
     } catch (e) {
-      errorTelemetry(process.argv, `Error shutting down "web": ${e.message}`);
+      const message = e instanceof Object && "message" in e ? e.message : String(e);
+      errorTelemetry(process.argv, `Error shutting down "web": ${message}`);
       console.error(
-        `Error whilst shutting down "web" port: ${c.error(e.message)}`
+        `Error whilst shutting down "web" port: ${c.error(message)}`
       );
     }
   }
@@ -168,12 +171,18 @@ const handler = async ({
       runWhen: () => generate
     }
   };
+  const mappedJobs = Object.keys(jobs).map((job) => {
+    if (side.includes(job) || job === "gen") {
+      return jobs[job];
+    }
+    return {
+      name: "",
+      command: "",
+      runWhen: () => false
+    };
+  });
   const { result } = concurrently(
-    Object.keys(jobs).map((job) => {
-      if (side.includes(job) || job === "gen") {
-        return jobs[job];
-      }
-    }).filter((job) => job && job.runWhen()),
+    mappedJobs.filter((job) => job.runWhen()),
     {
       prefix: "{name} |",
       timestampFormat: "HH:mm:ss",
@@ -181,7 +190,7 @@ const handler = async ({
     }
   );
   result.catch((e) => {
-    if (typeof e?.message !== "undefined") {
+    if (e?.message) {
       errorTelemetry(
         process.argv,
         `Error concurrently starting sides: ${e.message}`

package/dist/commands/upgrade.js

@@ -529,7 +529,7 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
     return;
   }
   const checkLevels = [];
-  if (parsed) {
+  if (parsed && !parsed.prerelease.length) {
     checkLevels.push({
       id: "exact",
       candidates: [`${version}.ts`, `${version}/index.ts`]
@@ -545,10 +545,13 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
       id: "minor",
       candidates: [`${parsed.major}.x.ts`, `${parsed.major}.x/index.ts`]
     });
-  } else {
+  } else if (parsed && parsed.prerelease.length > 0) {
     checkLevels.push({
       id: "tag",
-      candidates: [`${version}.ts`, `${version}/index.ts`]
+      candidates: [
+        `${parsed.prerelease[0]}.ts`,
+        `${parsed.prerelease[0]}/index.ts`
+      ]
     });
   }
   const scriptsToRun = [];

package/dist/lib/locking.js

@@ -17,13 +17,17 @@ function setLock(identifier) {
     ""
   );
 }
+function isErrorWithCode(error, code) {
+  return !!error && typeof error === "object" && "code" in error && error.code === code;
+}
 function unsetLock(identifier) {
   try {
     fs.rmSync(path.join(getPaths().generated.base, "locks", identifier));
   } catch (error) {
-    if (error.code !== "ENOENT") {
-      throw error;
+    if (isErrorWithCode(error, "ENOENT")) {
+      return;
     }
+    throw error;
   }
 }
 function isLockSet(identifier) {

package/dist/lib/ports.js

@@ -8,7 +8,7 @@ async function getFreePort(requestedPort, excludePorts = []) {
       freePort = await getFreePort(freePort + 1, excludePorts);
     }
     return freePort;
-  } catch (error) {
+  } catch {
     return -1;
   }
 }

package/dist/lib/updateCheck.js

@@ -26,7 +26,7 @@ async function check() {
   try {
     console.time("Update Check");
     const packageJson = JSON.parse(
-      fs.readFileSync(path.join(getPaths().base, "package.json"))
+      fs.readFileSync(path.join(getPaths().base, "package.json"), "utf-8")
     );
     let localVersion = packageJson.devDependencies["@cedarjs/core"];
     while (!/\d/.test(localVersion.charAt(0))) {
@@ -116,20 +116,26 @@ function getUpdateMessage() {
     borderStyle: "round"
   });
 }
+function isErrorWithCode(error, code) {
+  return !!error && error instanceof Object && "code" in error && error.code === code;
+}
 function readUpdateDataFile() {
   try {
     if (!fs.existsSync(getPersistenceDirectory())) {
       fs.mkdirSync(getPersistenceDirectory(), { recursive: true });
     }
     const persistedData = JSON.parse(
-      fs.readFileSync(path.join(getPersistenceDirectory(), "data.json"))
+      fs.readFileSync(
+        path.join(getPersistenceDirectory(), "data.json"),
+        "utf-8"
+      )
     );
     persistedData.remoteVersions = new Map(
       Object.entries(persistedData.remoteVersions)
     );
     return persistedData;
   } catch (error) {
-    if (error.code === "ENOENT") {
+    if (isErrorWithCode(error, "ENOENT")) {
       return {
         localVersion: "0.0.0",
         remoteVersions: /* @__PURE__ */ new Map(),
@@ -149,15 +155,17 @@ function updateUpdateDataFile({
   const existingData = readUpdateDataFile();
   const updatedData = {
     localVersion: localVersion ?? existingData.localVersion,
-    remoteVersions: Object.fromEntries(
-      remoteVersions ?? existingData.remoteVersions
-    ),
+    remoteVersions: remoteVersions ?? existingData.remoteVersions,
     checkedAt: checkedAt ?? existingData.checkedAt,
     shownAt: shownAt ?? existingData.shownAt
   };
+  const dataToWrite = {
+    ...updatedData,
+    remoteVersions: Object.fromEntries(updatedData.remoteVersions)
+  };
   fs.writeFileSync(
     path.join(getPersistenceDirectory(), "data.json"),
-    JSON.stringify(updatedData, null, 2)
+    JSON.stringify(dataToWrite, null, 2)
   );
 }
 function extractTagFromVersion(version) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13057+31fb574b4",
+  "version": "1.0.0-canary.13060+6c50d6669",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13057",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13057",
-    "@cedarjs/fastify-web": "1.0.0-canary.13057",
-    "@cedarjs/internal": "1.0.0-canary.13057",
-    "@cedarjs/prerender": "1.0.0-canary.13057",
-    "@cedarjs/project-config": "1.0.0-canary.13057",
-    "@cedarjs/structure": "1.0.0-canary.13057",
-    "@cedarjs/telemetry": "1.0.0-canary.13057",
-    "@cedarjs/web-server": "1.0.0-canary.13057",
+    "@cedarjs/api-server": "1.0.0-canary.13060",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13060",
+    "@cedarjs/fastify-web": "1.0.0-canary.13060",
+    "@cedarjs/internal": "1.0.0-canary.13060",
+    "@cedarjs/prerender": "1.0.0-canary.13060",
+    "@cedarjs/project-config": "1.0.0-canary.13060",
+    "@cedarjs/structure": "1.0.0-canary.13060",
+    "@cedarjs/telemetry": "1.0.0-canary.13060",
+    "@cedarjs/web-server": "1.0.0-canary.13060",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "31fb574b4a6996190eb3acc2e76bbdb67dc50e23"
+  "gitHead": "6c50d6669463a18fd4b4978f9e5c4e293555ebc4"
 }