gasup 0.1.0 → 0.2.0

package/dist/Config.js

@@ -10,7 +10,7 @@ export const defaultConfig = {
     },
     claspJsonPath: '.clasp.json',
     appsScriptJsonPath: 'appsscript.json',
-    bundleEntries: [path.join('src', 'index.ts')],
+    bundleEntries: [path.join('main', 'src', 'index.ts')],
     bundleOutfile: path.join('dist', 'bundle.js'),
     srcDir: 'src',
     distDir: 'dist',
@@ -30,7 +30,6 @@ export function getConfig() {
         };
     }
     catch (e) {
-        console.error(e);
         return defaultConfig;
     }
 }

package/dist/bin/gasup.js

@@ -3,16 +3,29 @@ import { build } from '../build.js';
 import { bundle } from '../bundle.js';
 import { changeEnv } from '../changeEnv.js';
 import { init } from '../init.js';
+import inquirer from 'inquirer';
 program
     .option('--init', 'init')
     .option('--env <env>', 'change env')
     .option('--bundle', 'bundle')
     .option('--build', 'build')
     .parse();
-function main() {
+async function main() {
     if (program.opts().init) {
-        console.log('init gasup');
-        init();
+        inquirer
+            .prompt({
+            type: 'confirm',
+            name: 'do',
+            message: 'This action will overwrite some files. Are you sure?',
+        })
+            .then((res) => {
+            if (!res.do)
+                return;
+            console.log('init gasup');
+            init();
+            console.log('init done');
+        });
+        return;
     }
     if (program.opts().env) {
         changeEnv(program.opts().env);
@@ -24,12 +37,12 @@ function main() {
     }
     if (program.opts().bundle) {
         console.log('bundle with esbuild');
-        bundle();
+        await bundle();
     }
     console.log('gasup done');
 }
 try {
-    main();
+    await main();
 }
 catch (err) {
     console.error(err.message);

package/dist/bundle.d.ts

@@ -1 +1 @@
-export declare function bundle(): void;
+export declare function bundle(): Promise<void>;

package/dist/bundle.js

@@ -3,9 +3,9 @@ import esbuild from 'esbuild';
 import { GasPlugin } from 'esbuild-gas-plugin';
 import fs from 'fs-extra';
 import path from 'path';
-export function bundle() {
+export async function bundle() {
     const config = getConfig();
-    esbuild.buildSync({
+    await esbuild.build({
         entryPoints: config.bundleEntries,
         bundle: true,
         outfile: config.bundleOutfile,

package/dist/changeEnv.js

@@ -14,9 +14,9 @@ export function changeEnv(env = 'dev') {
         }
     }
     dotenv.config({ path: envPath });
-    const scriptId = process.env.SCRIPT_ID;
+    const scriptId = process.env.GASUP_SCRIPT_ID;
     if (!scriptId) {
-        throw new Error(`SCRIPT_ID not found on ${envPath}`);
+        throw new Error(`GASUP_SCRIPT_ID not found on ${envPath}`);
     }
     const data = {
         scriptId,

package/dist/claspJson.d.ts

@@ -0,0 +1 @@
+export declare function getClaspJson(): any;

package/dist/claspJson.js

@@ -0,0 +1,7 @@
+import { getConfig } from './config.js';
+import fs from 'fs-extra';
+export function getClaspJson() {
+    const config = getConfig();
+    const json = fs.readFileSync(config.claspJsonPath, 'utf-8');
+    return JSON.parse(json ?? '{}');
+}

package/dist/envFile.js

@@ -1,21 +1,25 @@
 import fs from 'fs-extra';
 import { getConfig } from './config.js';
-import { getAppsScript } from './appsScript.js';
+import { getClaspJson } from './claspJson.js';
 export function initEnvFiles() {
     const config = getConfig();
-    const appsScript = getAppsScript();
-    const scriptId = appsScript.scriptId;
+    const claspJson = getClaspJson();
+    const scriptId = claspJson.scriptId;
     const envPath = config.envPaths['dev'];
     addToEnvFile(envPath, {
-        SCRIPT_ID: scriptId,
+        GASUP_SCRIPT_ID: scriptId,
     });
 }
 export function addToEnvFile(envPath, _items) {
-    const envString = fs.readFileSync(envPath, 'utf-8');
-    const newEnvString = addToEnvString(envString, _items);
+    let envString = '';
+    try {
+        envString = fs.readFileSync(envPath, 'utf-8');
+    }
+    catch (e) { }
+    const newEnvString = addToEnvString(envString.trim(), _items);
     fs.writeFileSync(envPath, newEnvString);
 }
-// 環境変数を追加する。安全のため、既存の環境変数は上書きしない
+// 環境変数を変更する
 export function addToEnvString(envString, _items) {
     const items = { ..._items };
     const newLines = [];
@@ -26,16 +30,23 @@ export function addToEnvString(envString, _items) {
         else {
             const { key, value } = parseLine(line);
             if (key) {
-                newLines.push(`${key}=${value}`);
+                if (items[key]) {
+                    newLines.push(`${key}=${items[key]}`);
+                    delete items[key];
+                }
+                else {
+                    newLines.push(`${key}=${value}`);
+                }
             }
             else {
                 newLines.push('');
             }
-            delete items[key];
         }
     }
     newLines.push('');
     for (const [key, value] of Object.entries(items)) {
+        if (!key)
+            continue;
         newLines.push(`${key}=${value}`);
     }
     return newLines.join('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gasup",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "bin": {
     "gasup": "./dist/bin/gasup.js"
@@ -23,6 +23,7 @@
     "esbuild": "^0.24.2",
     "esbuild-gas-plugin": "^0.8.0",
     "fs-extra": "^11.3.0",
+    "inquirer": "^12.3.2",
     "path": "^0.12.7",
     "remeda": "^2.19.2",
     "ts-node": "^10.9.2",