gasup 0.3.5 → 0.4.1

package/README.md

@@ -34,12 +34,14 @@ This command compiles your code with tsc.
 
 ### Bundle
 
-Bundle with esbuild into one file. This allows you to use libraries that are not natively available in Google Apps Script.
+Bundle with esbuild into one file.
 
 ```
 gasup --bundle
 ```
 
+ This allows you to use libraries that are not natively available in Google Apps Script.
+
 ### Push
 
 Simply push using "clasp push".
@@ -62,7 +64,6 @@ If you want to deploy webapp, appsscript is like below.
 
 ```json
 {
-  ...
   "webapp": {
     "executeAs": "USER_DEPLOYING",
     "access": "ANYONE_ANONYMOUS"
@@ -75,19 +76,9 @@ If you want to deploy webapp, appsscript is like below.
 If you need to switch between different environments (e.g., development, staging, production), you can use the --env flag to modify the appsscript.json file accordingly.
 
 ```
-gasup --env <target>
+gasup --env <envpath>
 ```
 
-Target options:
-
-- dev : Development environment
-- stag : Staging environment
-- prod : Production environment
-
-Default environment files:
-
-.env, .env.staging, .env.production
-
 Environment file details:
 
 ```env
@@ -100,7 +91,7 @@ GASUP_PARENT_ID=yyy,zzz
 Chan command is available like below.
 
 ```
-gasup --env dev --build --push --deploy
+gasup --env .env.production --bundle --push --deploy
 ```
 
 ### Config
@@ -120,8 +111,6 @@ export default config;
 
 ```ts
 export interface Config {
-  envPaths?: Record<Env, string>;
-  claspJsonPath?: string;
   appsScriptJsonPath?: string;
   bundleEntries?: string[];
   bundleOutfile?: string;

package/dist/bin/gasup.js

@@ -1,62 +1,51 @@
+import { execSync } from 'child_process';
 import { program } from 'commander';
 import { build } from '../build.js';
 import { bundle } from '../bundle.js';
-import { changeEnv } from '../envFile/changeEnv.js';
-import { init } from '../init.js';
-import inquirer from 'inquirer';
-import { execSync } from 'child_process';
+import { loadConfigWithDefault } from '../config.js';
 import { deploy } from '../deploy.js';
+import { changeEnv } from '../envFile/changeEnv.js';
 program
-    .option('--init', 'init')
-    .option('--env <env>', 'change env')
+    .option('--config', 'display current configuration')
+    .option('--env <envpath>', 'apply env to clasp')
     .option('--bundle', 'bundle')
     .option('--build', 'build')
     .option('--push', 'push')
     .option('--deploy', 'deploy')
     .parse();
 async function main() {
-    if (program.opts().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');
-        });
+    const opts = program.opts();
+    const config = await loadConfigWithDefault();
+    if (opts.config) {
+        console.log({ config });
         return;
     }
-    if (program.opts().env) {
-        changeEnv(program.opts().env);
-        console.log(`env changed to ${program.opts().env}`);
+    if (opts.env?.startsWith('--')) {
+        throw new Error('env option is required');
     }
-    if (program.opts().build) {
+    if (opts.env) {
+        console.log(`apply ${opts.env} to clasp`);
+        changeEnv(opts.env, config);
+    }
+    if (opts.build) {
         console.log('build with tsc');
-        build();
+        build(config);
     }
-    if (program.opts().bundle) {
+    if (opts.bundle) {
         console.log('bundle with esbuild');
-        await bundle();
+        await bundle(config);
     }
-    if (program.opts().push) {
+    if (opts.push) {
         console.log('push');
         execSync('clasp push', { stdio: 'inherit' });
     }
-    if (program.opts().deploy) {
+    if (opts.deploy) {
         console.log(`deploy`);
         deploy();
     }
     console.log('gasup done');
 }
-try {
-    await main();
-}
-catch (err) {
+main().catch((err) => {
     console.error(err.message);
     process.exit(1);
-}
+});

package/dist/build.d.ts

@@ -1 +1,2 @@
-export declare function build(): void;
+import { Config } from './types.js';
+export declare function build(config: Config): void;

package/dist/build.js

@@ -1,8 +1,7 @@
 import { execSync } from 'child_process';
 import { copyFileSync } from 'fs';
 import path from 'path';
-import { config } from './config.js';
-export function build() {
+export function build(config) {
     execSync('tsc', { stdio: 'inherit' });
     copyFileSync(config.appsScriptJsonPath, path.join(config.distDir, 'appsscript.json'));
 }

package/dist/bundle.d.ts

@@ -1 +1,2 @@
-export declare function bundle(): Promise<void>;
+import { Config } from './types.js';
+export declare function bundle(config: Config): Promise<void>;

package/dist/bundle.js

@@ -2,13 +2,13 @@ import esbuild from 'esbuild';
 import { GasPlugin } from 'esbuild-gas-plugin';
 import fs from 'fs-extra';
 import path from 'path';
-import { config } from './config.js';
-export async function bundle() {
+export async function bundle(config) {
+    const { bundleEntries, bundleOutfile, appsScriptJsonPath, distDir } = config;
     await esbuild.build({
-        entryPoints: config.bundleEntries,
+        entryPoints: bundleEntries,
         bundle: true,
-        outfile: config.bundleOutfile,
+        outfile: bundleOutfile,
         plugins: [GasPlugin],
     });
-    fs.copyFileSync(config.appsScriptJsonPath, path.join(config.distDir, 'appsscript.json'));
+    fs.copyFileSync(appsScriptJsonPath, path.join(distDir, 'appsscript.json'));
 }

package/dist/claspJson.d.ts

@@ -1,6 +1,2 @@
-export interface ClaspJson {
-    scriptId?: string;
-    rootDir?: string;
-    parentId?: string[];
-}
-export declare function getClaspJson(): ClaspJson;
+import { ClaspJson } from './types.js';
+export declare function updateClaspJson(claspJsonPath: string, data: ClaspJson): void;

package/dist/claspJson.js

@@ -1,6 +1,7 @@
 import fs from 'fs-extra';
-import { config } from './config.js';
-export function getClaspJson() {
-    const json = fs.readFileSync(config.claspJsonPath, 'utf-8');
-    return JSON.parse(json ?? '{}');
+export function updateClaspJson(claspJsonPath, data) {
+    const json = fs.readFileSync(claspJsonPath, 'utf-8');
+    const existingData = JSON.parse(json ?? '{}');
+    const newData = { ...existingData, ...data };
+    fs.writeFileSync(claspJsonPath, JSON.stringify(newData, null, 2));
 }

package/dist/{Config.d.ts → config.d.ts}

@@ -1,15 +1,10 @@
 import { Config } from './types.js';
 export declare const defaultConfig: Config;
-export declare const config: {
-    envPaths: {
-        dev: string;
-        stag: string;
-        prod: string;
-    };
+export declare function loadConfigWithDefault(): Promise<{
     claspJsonPath?: string;
     appsScriptJsonPath?: string;
     bundleEntries?: string[];
     bundleOutfile?: string;
     srcDir?: string;
     distDir?: string;
-};
+}>;

package/dist/{Config.js → config.js}

@@ -3,41 +3,36 @@ import path from 'path';
 import tsnode from 'ts-node';
 const configFileName = 'gasup.config.ts';
 export const defaultConfig = {
-    envPaths: {
-        dev: '.env',
-        stag: '.env.staging',
-        prod: '.env.production',
-    },
     claspJsonPath: '.clasp.json',
     appsScriptJsonPath: 'appsscript.json',
-    bundleEntries: [path.join('main', 'src', 'index.ts')],
+    bundleEntries: [path.join('src', 'index.ts')],
     bundleOutfile: path.join('dist', 'bundle.js'),
     srcDir: 'src',
     distDir: 'dist',
 };
-export const config = loadConfigWithDefault();
-function loadConfigWithDefault() {
+// export const config = loadConfigWithDefault();
+export async function loadConfigWithDefault() {
     const configPath = path.join(process.cwd(), configFileName);
-    const config = loadConfig(configPath);
+    const config = await loadConfig(configPath);
     return {
         ...defaultConfig,
         ...config,
-        envPaths: { ...defaultConfig.envPaths, ...(config.envPaths ?? {}) },
     };
 }
-function loadConfig(configPath) {
+async function loadConfig(configPath) {
     try {
         const configString = fs.readFileSync(configPath, 'utf-8');
-        const compiledPath = path.join(__dirname, '__config_compiled.js');
+        const compiledPath = path.join(process.cwd(), '__config_compiled.js');
         const compiledCode = tsnode
             .create()
             .compile(configString, 'config_dummy.ts');
         fs.writeFileSync(compiledPath, compiledCode);
-        const data = require(compiledPath);
+        const data = await import(compiledPath);
         fs.unlinkSync(compiledPath);
         return data.default;
     }
     catch (err) {
+        console.error(err);
         return {};
     }
 }

package/dist/envFile/changeEnv.d.ts

@@ -1,2 +1,2 @@
-import { Env } from '../types.js';
-export declare function changeEnv(env?: Env): void;
+import { Config } from '../types.js';
+export declare function changeEnv(envPath: string, config: Config): void;

package/dist/envFile/changeEnv.js

@@ -1,26 +1,24 @@
 import fs from 'fs-extra';
-import { config } from '../config.js';
+import { updateClaspJson } from '../claspJson.js';
 import { getEnvData } from './envFile.js';
-export function changeEnv(env = 'dev') {
-    const envPath = config.envPaths[env];
+export function changeEnv(envPath, config) {
     if (!envPath) {
         throw new Error(`envPath not found on ${envPath}`);
     }
-    const claspJsonPath = config.claspJsonPath;
-    for (const path of [envPath, claspJsonPath]) {
-        if (!fs.existsSync(path)) {
-            throw new Error(`${path} not found`);
-        }
+    if (!fs.existsSync(envPath)) {
+        throw new Error(`${envPath} not found`);
     }
     const envData = getEnvData(envPath);
     const scriptId = envData.GASUP_SCRIPT_ID;
+    const parentIds = envData.GASUP_PARENT_ID;
     if (!scriptId) {
         throw new Error(`GASUP_SCRIPT_ID not found on ${envPath}`);
     }
-    const data = {
+    if (!parentIds) {
+        throw new Error(`GASUP_PARENT_ID not found on ${envPath}`);
+    }
+    updateClaspJson(config.claspJsonPath, {
         scriptId,
-        rootDir: config.distDir,
-        parentId: envData.GASUP_PARENT_ID,
-    };
-    fs.writeFileSync(claspJsonPath, JSON.stringify(data, null, 2));
+        parentId: parentIds,
+    });
 }

package/dist/envFile/envFile.d.ts

@@ -1,4 +1,3 @@
 import { EnvObject } from '../types.js';
-export declare function initEnvFiles(): void;
 export declare function getEnvData(envPath: string): EnvObject;
 export declare function addToEnvFile(envPath: string, _items: Record<string, string>): void;

package/dist/envFile/envFile.js

@@ -1,17 +1,6 @@
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
-import { config } from '../config.js';
-import { getClaspJson } from './../claspJson.js';
 import { addToEnvString } from './addToEnvString.js';
-export function initEnvFiles() {
-    const claspJson = getClaspJson();
-    const envPath = config.envPaths['dev'];
-    console.log({ claspJson });
-    addToEnvFile(envPath, {
-        GASUP_SCRIPT_ID: claspJson.scriptId,
-        GASUP_PARENT_ID: claspJson.parentId?.join(','),
-    });
-}
 export function getEnvData(envPath) {
     try {
         const envString = fs.readFileSync(envPath, 'utf-8');

package/dist/types.d.ts

@@ -1,6 +1,5 @@
 export type Env = 'dev' | 'stag' | 'prod';
 export interface Config {
-    envPaths?: Record<Env, string>;
     claspJsonPath?: string;
     appsScriptJsonPath?: string;
     bundleEntries?: string[];
@@ -12,3 +11,8 @@ export interface EnvObject {
     GASUP_SCRIPT_ID?: string;
     GASUP_PARENT_ID?: string[];
 }
+export interface ClaspJson {
+    scriptId?: string;
+    rootDir?: string;
+    parentId?: string[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gasup",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "type": "module",
   "repository": {
     "type": "git",
@@ -24,15 +24,11 @@
   "dependencies": {
     "commander": "^13.0.0",
     "dotenv": "^16.4.7",
-    "envfile": "^7.1.0",
     "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",
-    "tsx": "^4.19.2"
+    "ts-node": "^10.9.2"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",

package/dist/appsScript.d.ts

@@ -1,6 +0,0 @@
-export interface AppsScript {
-    scriptId: string;
-    rootDir: string;
-}
-export declare function getAppsScript(): AppsScript;
-export declare function copyAppsScript(): void;

package/dist/appsScript.js

@@ -1,11 +0,0 @@
-import { copyFileSync } from 'fs';
-import fs from 'fs-extra';
-import path from 'path';
-import { config } from './config.js';
-export function getAppsScript() {
-    const json = fs.readFileSync(config.appsScriptJsonPath, 'utf-8');
-    return JSON.parse(json ?? '{}');
-}
-export function copyAppsScript() {
-    copyFileSync(config.appsScriptJsonPath, path.join(config.distDir, 'appsscript.json'));
-}

package/dist/changeEnv.d.ts

@@ -1,2 +0,0 @@
-import { Env } from './config.js';
-export declare function changeEnv(env?: Env): void;

package/dist/changeEnv.js

@@ -1,27 +0,0 @@
-import fs from 'fs-extra';
-import { getConfig } from './config.js';
-import { getEnvData } from './envFile/envFile.js';
-export function changeEnv(env = 'dev') {
-    const config = getConfig();
-    const envPath = config.envPaths[env];
-    if (!envPath) {
-        throw new Error(`envPath not found on ${envPath}`);
-    }
-    const claspJsonPath = config.claspJsonPath;
-    for (const path of [envPath, claspJsonPath]) {
-        if (!fs.existsSync(path)) {
-            throw new Error(`${path} not found`);
-        }
-    }
-    const envData = getEnvData(envPath);
-    const scriptId = envData.GASUP_SCRIPT_ID;
-    if (!scriptId) {
-        throw new Error(`GASUP_SCRIPT_ID not found on ${envPath}`);
-    }
-    const data = {
-        scriptId,
-        rootDir: config.distDir,
-        parentId: envData.GASUP_PARENT_ID,
-    };
-    fs.writeFileSync(claspJsonPath, JSON.stringify(data, null, 2));
-}

package/dist/envFile.d.ts

@@ -1,3 +0,0 @@
-export declare function initEnvFiles(): void;
-export declare function addToEnvFile(envPath: string, _items: Record<string, string>): void;
-export declare function addToEnvString(envString: string, _items: Record<string, string>): string;

package/dist/envFile.js

@@ -1,60 +0,0 @@
-import fs from 'fs-extra';
-import { getClaspJson } from './claspJson.js';
-import { getConfig } from './config.js';
-export function initEnvFiles() {
-    const config = getConfig();
-    const claspJson = getClaspJson();
-    const scriptId = claspJson.scriptId;
-    const envPath = config.envPaths['dev'];
-    addToEnvFile(envPath, {
-        GASUP_SCRIPT_ID: scriptId,
-    });
-}
-export function addToEnvFile(envPath, _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 = [];
-    for (const line of envString.split('\n')) {
-        if (isCommentLine(line)) {
-            newLines.push(line);
-        }
-        else {
-            const { key, value } = parseLine(line);
-            if (key) {
-                if (items[key]) {
-                    newLines.push(`${key}=${items[key]}`);
-                    delete items[key];
-                }
-                else {
-                    newLines.push(`${key}=${value}`);
-                }
-            }
-            else {
-                newLines.push('');
-            }
-        }
-    }
-    newLines.push('');
-    for (const [key, value] of Object.entries(items)) {
-        if (!key)
-            continue;
-        newLines.push(`${key}=${value}`);
-    }
-    return newLines.join('\n');
-}
-function isCommentLine(line) {
-    return line.startsWith('#');
-}
-function parseLine(line) {
-    const [key, ...values] = line.split('=');
-    return { key, value: values.join('=') };
-}

package/dist/envFile.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/envFile.test.js

@@ -1,56 +0,0 @@
-import { addToEnvString } from './envFile.js';
-import { describe, it, expect } from 'vitest';
-describe('addToEnvString', () => {
-    const mockEnvString = `
-# This is a comment
-KEY1=value1
-KEY2=value2
-`.trim();
-    it('should add new keys to the env string and overwrite existing ones', () => {
-        const itemsToAdd = {
-            KEY3: 'value3',
-            KEY1: 'newValue1', // 既存のKEY1を上書きしない
-        };
-        const result = addToEnvString(mockEnvString, itemsToAdd);
-        // 新しい環境変数を含んだ結果を確認
-        const expectedContent = `
-# This is a comment
-KEY1=value1
-KEY2=value2
-
-KEY3=value3
-`.trim();
-        console.log({ mockEnvString, result, expectedContent });
-        expect(result).toBe(expectedContent);
-    });
-    it('should add only new keys if not already in the string', () => {
-        const itemsToAdd = {
-            KEY3: 'value3',
-            KEY4: 'value4',
-        };
-        const result = addToEnvString(mockEnvString, itemsToAdd);
-        // 新しい環境変数を含んだ結果を確認
-        const expectedContent = `
-# This is a comment
-KEY1=value1
-KEY2=value2
-
-KEY3=value3
-KEY4=value4
-`.trim();
-        expect(result).toBe(expectedContent);
-    });
-    it('should handle an empty env string', () => {
-        const itemsToAdd = {
-            KEY1: 'value1',
-            KEY2: 'value2',
-        };
-        const result = addToEnvString('', itemsToAdd);
-        // 空の環境変数文字列に対して追加された内容を確認
-        const expectedContent = `
-KEY1=value1
-KEY2=value2
-`.trim();
-        expect(result.trim()).toBe(expectedContent);
-    });
-});

package/dist/gasup.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/gasup.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const bundle_1 = require("./bundle");
-const changeEnv_1 = require("./changeEnv");
-commander_1.program
-    .option('--env <env>', 'change env')
-    .option('--bundle', 'bundle')
-    .parse();
-async function main() {
-    if (commander_1.program.opts().change) {
-        await (0, changeEnv_1.changeEnv)(commander_1.program.opts().change);
-    }
-    if (commander_1.program.opts().bundle) {
-        await (0, bundle_1.bundle)();
-    }
-    console.log('done');
-}
-main().catch((err) => {
-    console.error(err.message);
-    process.exit(1);
-});

package/dist/init.d.ts

@@ -1 +0,0 @@
-export declare function init(): void;

package/dist/init.js

@@ -1,6 +0,0 @@
-import { initEnvFiles } from './envFile/envFile.js';
-import { addGitIgnores } from './gitignore.js';
-export function init() {
-    initEnvFiles();
-    addGitIgnores();
-}