create-shiftapi 0.0.6 → 0.0.7

package/dist/index.js

@@ -16,10 +16,14 @@ var renameFiles = {
 };
 var pkgDir = path.resolve(fileURLToPath(import.meta.url), "../..");
 var templatesDir = path.join(pkgDir, "templates");
-var pkgVersion = JSON.parse(
-  fs.readFileSync(path.join(pkgDir, "package.json"), "utf-8")
-).version;
-function replaceplaceholders(content, opts) {
+var pkgVersion = "0.0.0";
+try {
+  pkgVersion = JSON.parse(
+    fs.readFileSync(path.join(pkgDir, "package.json"), "utf-8")
+  ).version;
+} catch {
+}
+function replacePlaceholders(content, opts) {
   return content.replaceAll("{{name}}", opts.name).replaceAll("{{modulePath}}", opts.modulePath).replaceAll("{{port}}", opts.port).replaceAll("{{version}}", pkgVersion);
 }
 function renamePath(filePath, opts) {
@@ -37,7 +41,7 @@ function copyDir(srcDir, destDir, opts) {
     } else {
       const content = fs.readFileSync(srcPath, "utf-8");
       fs.mkdirSync(path.dirname(destPath), { recursive: true });
-      fs.writeFileSync(destPath, replaceplaceholders(content, opts));
+      fs.writeFileSync(destPath, replacePlaceholders(content, opts));
     }
   }
 }
@@ -52,6 +56,39 @@ function gitInit(cwd) {
     });
   });
 }
+function checkCommand(cmd) {
+  return new Promise((resolve, reject) => {
+    execFile(cmd, ["version"], (err) => {
+      if (err) {
+        reject(new Error(`"${cmd}" is not installed or not on PATH. Please install it and try again.`));
+        return;
+      }
+      resolve();
+    });
+  });
+}
+async function installDeps(cwd) {
+  await checkCommand("go");
+  await new Promise((resolve, reject) => {
+    execFile("go", ["mod", "tidy"], { cwd }, (err) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      resolve();
+    });
+  });
+  await checkCommand("npm");
+  await new Promise((resolve, reject) => {
+    execFile("npm", ["install"], { cwd }, (err) => {
+      if (err) {
+        reject(err);
+        return;
+      }
+      resolve();
+    });
+  });
+}
 async function scaffold(opts) {
   copyDir(path.join(templatesDir, "base"), opts.targetDir, opts);
   copyDir(path.join(templatesDir, opts.framework), opts.targetDir, opts);
@@ -86,7 +123,12 @@ async function main() {
       rawName: () => positionalArg ? Promise.resolve(positionalArg) : p.text({
         message: "Project name",
         placeholder: "my-app",
-        defaultValue: "my-app"
+        defaultValue: "my-app",
+        validate: (value) => {
+          if (!/^[a-zA-Z0-9_-]+$/.test(value)) {
+            return "Project name must only contain letters, numbers, hyphens, and underscores";
+          }
+        }
       }),
       framework: () => p.select({
         message: "Framework",
@@ -112,7 +154,13 @@ async function main() {
       port: () => p.text({
         message: "Server port",
         placeholder: "8080",
-        defaultValue: "8080"
+        defaultValue: "8080",
+        validate: (value) => {
+          const n = parseInt(value, 10);
+          if (isNaN(n) || n < 1 || n > 65535) {
+            return "Port must be a number between 1 and 65535";
+          }
+        }
       })
     },
     {
@@ -137,11 +185,22 @@ async function main() {
     targetDir
   });
   s.stop("Project scaffolded");
+  const shouldInstallDeps = await p.confirm({
+    message: "Install dependencies? (go mod tidy & npm install)",
+    initialValue: true
+  });
+  if (p.isCancel(shouldInstallDeps)) {
+    p.cancel("Cancelled.");
+    process.exit(1);
+  }
+  if (shouldInstallDeps) {
+    s.start("Installing dependencies");
+    await installDeps(targetDir);
+    s.stop("Dependencies installed");
+  }
   const relDir = path2.relative(process.cwd(), targetDir) || ".";
-  p.note(
-    [`cd ${relDir}`, "go mod tidy", "npm install", "npm run dev"].join("\n"),
-    "Next steps"
-  );
+  const steps = shouldInstallDeps ? [`cd ${relDir}`, "npm run dev"] : [`cd ${relDir}`, "go mod tidy", "npm install", "npm run dev"];
+  p.note(steps.join("\n"), "Next steps");
   p.outro("Happy hacking!");
 }
 main().catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-shiftapi",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Scaffold a new ShiftAPI fullstack app",
   "author": "Frank Chiarulli Jr. <frank@frankchiarulli.com>",
   "license": "MIT",