@ciderjs/gasbombe 0.2.0 → 0.2.1

package/dist/cli.cjs

@@ -11,14 +11,14 @@ require('consola');
 require('ejs');
 require('glob');
 
-const version = "0.2.0";
+const version = "0.2.1";
 
 async function main() {
   const program = new commander.Command();
   program.version(version, "-v, --version");
   program.description("Create project for GoogleAppsScript").option(
     "-n, --name [projectName]",
-    "Project name what you want to generate",
+    'Project name what you want to generate\n* Project name must be "." or a valid folder name without path characters.',
     ""
   ).option(
     "-p, --pkg [packageManager]",
@@ -46,9 +46,22 @@ async function main() {
     } = command.opts();
     let claspProjectId;
     try {
+      const validProjectNameRegex = /^(?!.*\.\.)[a-zA-Z0-9_-]+$/;
       projectName ||= await prompts.input({
-        message: "Input project name what you want to generate..."
+        message: "Input project name what you want to generate...",
+        validate: (value) => {
+          if (value === ".") {
+            return true;
+          }
+          if (validProjectNameRegex.test(value) && !value.includes("/") && !value.includes("\\")) {
+            return true;
+          }
+          return 'Project name must be "." or a valid folder name without path characters.';
+        }
       });
+      if (!validProjectNameRegex.test(projectName)) {
+        throw Error("Invalid project name");
+      }
       templateType ||= await prompts.select({
         message: "Choice project template...",
         choices: [
@@ -56,6 +69,10 @@ async function main() {
           { name: "react-tsx", value: "react-tsx" }
         ]
       });
+      const templateTypes = ["vanilla-ts", "react-tsx"];
+      if (!templateTypes.includes(templateType)) {
+        throw Error("Invalid project template");
+      }
       clasp ||= await prompts.select({
         message: 'How do you want to set up the Apps Script project?\n* If you use "create" or "select", you need to login to clasp first',
         choices: [
@@ -81,6 +98,10 @@ async function main() {
           }
         ]
       });
+      const claspOptions = ["create", "list", "input", "skip"];
+      if (!claspOptions.includes(clasp)) {
+        throw Error("Invalid clasp option");
+      }
       if (clasp === "input") {
         claspProjectId = await prompts.input({
           message: "Input Apps Script project ID...",
@@ -98,6 +119,10 @@ async function main() {
           { name: "yarn", value: "yarn" }
         ]
       });
+      const packageManagers = ["npm", "pnpm", "yarn"];
+      if (!packageManagers.includes(packageManager)) {
+        throw Error("Invalid package manager");
+      }
     } catch (e) {
       e.message === "User force closed the prompt with SIGINT" && process.exit(0);
       throw e;

package/dist/cli.mjs

@@ -9,14 +9,14 @@ import 'consola';
 import 'ejs';
 import 'glob';
 
-const version = "0.2.0";
+const version = "0.2.1";
 
 async function main() {
   const program = new Command();
   program.version(version, "-v, --version");
   program.description("Create project for GoogleAppsScript").option(
     "-n, --name [projectName]",
-    "Project name what you want to generate",
+    'Project name what you want to generate\n* Project name must be "." or a valid folder name without path characters.',
     ""
   ).option(
     "-p, --pkg [packageManager]",
@@ -44,9 +44,22 @@ async function main() {
     } = command.opts();
     let claspProjectId;
     try {
+      const validProjectNameRegex = /^(?!.*\.\.)[a-zA-Z0-9_-]+$/;
       projectName ||= await input({
-        message: "Input project name what you want to generate..."
+        message: "Input project name what you want to generate...",
+        validate: (value) => {
+          if (value === ".") {
+            return true;
+          }
+          if (validProjectNameRegex.test(value) && !value.includes("/") && !value.includes("\\")) {
+            return true;
+          }
+          return 'Project name must be "." or a valid folder name without path characters.';
+        }
       });
+      if (!validProjectNameRegex.test(projectName)) {
+        throw Error("Invalid project name");
+      }
       templateType ||= await select({
         message: "Choice project template...",
         choices: [
@@ -54,6 +67,10 @@ async function main() {
           { name: "react-tsx", value: "react-tsx" }
         ]
       });
+      const templateTypes = ["vanilla-ts", "react-tsx"];
+      if (!templateTypes.includes(templateType)) {
+        throw Error("Invalid project template");
+      }
       clasp ||= await select({
         message: 'How do you want to set up the Apps Script project?\n* If you use "create" or "select", you need to login to clasp first',
         choices: [
@@ -79,6 +96,10 @@ async function main() {
           }
         ]
       });
+      const claspOptions = ["create", "list", "input", "skip"];
+      if (!claspOptions.includes(clasp)) {
+        throw Error("Invalid clasp option");
+      }
       if (clasp === "input") {
         claspProjectId = await input({
           message: "Input Apps Script project ID...",
@@ -96,6 +117,10 @@ async function main() {
           { name: "yarn", value: "yarn" }
         ]
       });
+      const packageManagers = ["npm", "pnpm", "yarn"];
+      if (!packageManagers.includes(packageManager)) {
+        throw Error("Invalid package manager");
+      }
     } catch (e) {
       e.message === "User force closed the prompt with SIGINT" && process.exit(0);
       throw e;

package/dist/index.cjs

@@ -64,9 +64,17 @@ async function handleClaspSetup(claspOption, projectName, outputDir, claspProjec
     }
   }
   let scriptId;
+  let existingClaspJson = null;
   switch (claspOption) {
     case "create":
       try {
+        const claspJsonPath = path__default.join(outputDir, ".clasp.json");
+        try {
+          const existingContent = await fs__default.readFile(claspJsonPath, "utf-8");
+          existingClaspJson = JSON.parse(existingContent);
+          await fs__default.unlink(claspJsonPath);
+        } catch {
+        }
         const result = await runCommand(
           npxLikeCommand,
           [
@@ -139,12 +147,17 @@ async function handleClaspSetup(claspOption, projectName, outputDir, claspProjec
       scriptId
     };
     let successMessage = `.clasp.json created successfully with scriptId: ${scriptId}`;
-    try {
-      const existingContent = await fs__default.readFile(claspJsonPath, "utf-8");
-      const existingJson = JSON.parse(existingContent);
-      claspJson = { ...existingJson, scriptId };
+    if (existingClaspJson) {
+      claspJson = { ...existingClaspJson, scriptId };
       successMessage = `.clasp.json updated successfully with scriptId: ${scriptId}`;
-    } catch {
+    } else {
+      try {
+        const existingContent = await fs__default.readFile(claspJsonPath, "utf-8");
+        const currentClaspJson = JSON.parse(existingContent);
+        claspJson = { ...currentClaspJson, scriptId };
+        successMessage = `.clasp.json updated successfully with scriptId: ${scriptId}`;
+      } catch {
+      }
     }
     const claspJsonContent = JSON.stringify(claspJson, null, 2);
     await fs__default.writeFile(claspJsonPath, claspJsonContent, { encoding: "utf-8" });
@@ -166,12 +179,28 @@ async function generateProject({
   consola.consola.start(
     `Creating a new Project for GoogleAppsScript in ${outputDir}...`
   );
-  try {
-    await fs__default.access(outputDir);
-    consola.consola.error(`Directory ${projectName} already exists.`);
-    process.exit(1);
-    return;
-  } catch {
+  if (projectName === ".") {
+    try {
+      const files = await fs__default.readdir(outputDir);
+      const relevantFiles = files.filter((file) => !file.startsWith("."));
+      if (relevantFiles.length > 0) {
+        const proceed = await confirm(
+          "Current directory is not empty. Proceed anyway?"
+        );
+        if (!proceed) {
+          consola.consola.warn("Operation cancelled.");
+          process.exit(0);
+        }
+      }
+    } catch {
+    }
+  } else {
+    try {
+      await fs__default.access(outputDir);
+      consola.consola.error(`Directory ${projectName} already exists.`);
+      process.exit(1);
+    } catch {
+    }
   }
   await fs__default.mkdir(outputDir, { recursive: true });
   consola.consola.info(`Generating project files from template '${templateType}'...`);

package/dist/index.mjs

@@ -65,9 +65,17 @@ async function handleClaspSetup(claspOption, projectName, outputDir, claspProjec
     }
   }
   let scriptId;
+  let existingClaspJson = null;
   switch (claspOption) {
     case "create":
       try {
+        const claspJsonPath = path.join(outputDir, ".clasp.json");
+        try {
+          const existingContent = await fs.readFile(claspJsonPath, "utf-8");
+          existingClaspJson = JSON.parse(existingContent);
+          await fs.unlink(claspJsonPath);
+        } catch {
+        }
         const result = await runCommand(
           npxLikeCommand,
           [
@@ -140,12 +148,17 @@ async function handleClaspSetup(claspOption, projectName, outputDir, claspProjec
       scriptId
     };
     let successMessage = `.clasp.json created successfully with scriptId: ${scriptId}`;
-    try {
-      const existingContent = await fs.readFile(claspJsonPath, "utf-8");
-      const existingJson = JSON.parse(existingContent);
-      claspJson = { ...existingJson, scriptId };
+    if (existingClaspJson) {
+      claspJson = { ...existingClaspJson, scriptId };
       successMessage = `.clasp.json updated successfully with scriptId: ${scriptId}`;
-    } catch {
+    } else {
+      try {
+        const existingContent = await fs.readFile(claspJsonPath, "utf-8");
+        const currentClaspJson = JSON.parse(existingContent);
+        claspJson = { ...currentClaspJson, scriptId };
+        successMessage = `.clasp.json updated successfully with scriptId: ${scriptId}`;
+      } catch {
+      }
     }
     const claspJsonContent = JSON.stringify(claspJson, null, 2);
     await fs.writeFile(claspJsonPath, claspJsonContent, { encoding: "utf-8" });
@@ -167,12 +180,28 @@ async function generateProject({
   consola.start(
     `Creating a new Project for GoogleAppsScript in ${outputDir}...`
   );
-  try {
-    await fs.access(outputDir);
-    consola.error(`Directory ${projectName} already exists.`);
-    process.exit(1);
-    return;
-  } catch {
+  if (projectName === ".") {
+    try {
+      const files = await fs.readdir(outputDir);
+      const relevantFiles = files.filter((file) => !file.startsWith("."));
+      if (relevantFiles.length > 0) {
+        const proceed = await confirm(
+          "Current directory is not empty. Proceed anyway?"
+        );
+        if (!proceed) {
+          consola.warn("Operation cancelled.");
+          process.exit(0);
+        }
+      }
+    } catch {
+    }
+  } else {
+    try {
+      await fs.access(outputDir);
+      consola.error(`Directory ${projectName} already exists.`);
+      process.exit(1);
+    } catch {
+    }
   }
   await fs.mkdir(outputDir, { recursive: true });
   consola.info(`Generating project files from template '${templateType}'...`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciderjs/gasbombe",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A TypeScript Project Generator for GoogleAppsScript, available as CLI",
   "type": "module",
   "main": "src/index.ts",

package/src/index.ts

@@ -81,10 +81,20 @@ async function handleClaspSetup(
   }
 
   let scriptId: string | undefined;
+  let existingClaspJson: { scriptId: string; [key: string]: string | string[] } | null = null;
 
   switch (claspOption) {
     case 'create':
       try {
+        const claspJsonPath = path.join(outputDir, '.clasp.json');
+        try {
+          const existingContent = await fs.readFile(claspJsonPath, 'utf-8');
+          existingClaspJson = JSON.parse(existingContent);
+          await fs.unlink(claspJsonPath);
+        } catch {
+          // No existing .clasp.json, which is fine.
+        }
+
         const result = await runCommand(
           npxLikeCommand,
           [
@@ -169,13 +179,18 @@ async function handleClaspSetup(
     };
     let successMessage = `.clasp.json created successfully with scriptId: ${scriptId}`;
 
-    try {
-      const existingContent = await fs.readFile(claspJsonPath, 'utf-8');
-      const existingJson = JSON.parse(existingContent);
-      claspJson = { ...existingJson, scriptId };
+    if (existingClaspJson) {
+      claspJson = { ...existingClaspJson, scriptId };
       successMessage = `.clasp.json updated successfully with scriptId: ${scriptId}`;
-    } catch {
-      // If file doesn't exist or is invalid, we'll just create a new one.
+    } else {
+      try {
+        const existingContent = await fs.readFile(claspJsonPath, 'utf-8');
+        const currentClaspJson = JSON.parse(existingContent);
+        claspJson = { ...currentClaspJson, scriptId };
+        successMessage = `.clasp.json updated successfully with scriptId: ${scriptId}`;
+      } catch {
+        // If file doesn't exist or is invalid, we'll just create a new one.
+      }
     }
 
     const claspJsonContent = JSON.stringify(claspJson, null, 2);
@@ -201,13 +216,32 @@ export async function generateProject({
     `Creating a new Project for GoogleAppsScript in ${outputDir}...`,
   );
 
-  try {
-    await fs.access(outputDir);
-    consola.error(`Directory ${projectName} already exists.`);
-    process.exit(1);
-    return;
-  } catch {
-    // Directory does not exist, which is what we want.
+  if (projectName === '.') {
+    try {
+      const files = await fs.readdir(outputDir);
+      const relevantFiles = files.filter((file) => !file.startsWith('.'));
+
+      if (relevantFiles.length > 0) {
+        const proceed = await confirm(
+          'Current directory is not empty. Proceed anyway?',
+        );
+
+        if (!proceed) {
+          consola.warn('Operation cancelled.');
+          process.exit(0);
+        }
+      }
+    } catch {
+      // Directory does not exist, then mkdir will create it.
+    }
+  } else {
+    try {
+      await fs.access(outputDir);
+      consola.error(`Directory ${projectName} already exists.`);
+      process.exit(1);
+    } catch {
+      // Directory does not exist, which is what we want.
+    }
   }
 
   await fs.mkdir(outputDir, { recursive: true });