gasup 0.0.1 → 0.1.0

package/dist/Config.d.ts

@@ -2,12 +2,12 @@ export type Env = 'dev' | 'stag' | 'prod';
 export interface Config {
     envPaths?: Record<Env, string>;
     claspJsonPath?: string;
-    appScriptJsonPath?: string;
+    appsScriptJsonPath?: string;
     bundleEntries?: string[];
     bundleOutfile?: string;
     srcDir?: string;
     distDir?: string;
 }
 export declare const defaultConfig: Config;
-export declare function getConfig(): Promise<Config>;
-export declare function saveDefaultConfig(): Promise<void>;
+export declare function initConfig(): void;
+export declare function getConfig(): Config;

package/dist/Config.js

@@ -5,23 +5,24 @@ const configPath = 'gasup.json';
 export const defaultConfig = {
     envPaths: {
         dev: '.env',
-        stag: '.env.stag',
-        prod: '.env.prod',
+        stag: '.env.staging',
+        prod: '.env.production',
     },
     claspJsonPath: '.clasp.json',
-    appScriptJsonPath: 'appsscript.json',
+    appsScriptJsonPath: 'appsscript.json',
     bundleEntries: [path.join('src', 'index.ts')],
     bundleOutfile: path.join('dist', 'bundle.js'),
     srcDir: 'src',
     distDir: 'dist',
 };
-export async function getConfig() {
+export function initConfig() {
+    const config = getConfig();
+    fs.writeFileSync(path.join(process.cwd(), configPath), JSON.stringify(config, null, 2));
+}
+export function getConfig() {
     try {
-        console.log('getConfig', configPath);
-        // const require = createRequire(import.meta.url);
         const res = readFileSync(path.join(process.cwd(), configPath));
         const data = JSON.parse(res.toString());
-        console.log('data', data);
         return {
             ...defaultConfig,
             ...data,
@@ -33,7 +34,3 @@ export async function getConfig() {
         return defaultConfig;
     }
 }
-export async function saveDefaultConfig() {
-    const config = { ...defaultConfig };
-    await fs.writeFile(path.join(process.cwd(), configPath), JSON.stringify(config, null, 2));
-}

package/dist/appsScript.d.ts

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

package/dist/appsScript.js

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

package/dist/bin/gasup.js

@@ -1,28 +1,37 @@
 import { program } from 'commander';
+import { build } from '../build.js';
 import { bundle } from '../bundle.js';
 import { changeEnv } from '../changeEnv.js';
-import { saveDefaultConfig } from '../Config.js';
+import { init } from '../init.js';
 program
     .option('--init', 'init')
     .option('--env <env>', 'change env')
     .option('--bundle', 'bundle')
+    .option('--build', 'build')
     .parse();
-async function main() {
+function main() {
     if (program.opts().init) {
-        await init();
+        console.log('init gasup');
+        init();
     }
-    if (program.opts().change) {
-        await changeEnv(program.opts().change);
+    if (program.opts().env) {
+        changeEnv(program.opts().env);
+        console.log(`env changed to ${program.opts().env}`);
+    }
+    if (program.opts().build) {
+        console.log('build with tsc');
+        build();
     }
     if (program.opts().bundle) {
-        await bundle();
+        console.log('bundle with esbuild');
+        bundle();
     }
-    console.log('done');
+    console.log('gasup done');
+}
+try {
+    main();
 }
-main().catch((err) => {
+catch (err) {
     console.error(err.message);
     process.exit(1);
-});
-async function init() {
-    await saveDefaultConfig();
 }

package/dist/build.d.ts

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

package/dist/build.js

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

package/dist/bundle.d.ts

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

package/dist/bundle.js

@@ -1,20 +1,15 @@
-import { getConfig } from './Config.js';
+import { getConfig } from './config.js';
 import esbuild from 'esbuild';
 import { GasPlugin } from 'esbuild-gas-plugin';
 import fs from 'fs-extra';
 import path from 'path';
-export async function bundle() {
-    console.log('bundle with esbuild');
-    const config = await getConfig();
-    await esbuild
-        .build({
+export function bundle() {
+    const config = getConfig();
+    esbuild.buildSync({
         entryPoints: config.bundleEntries,
         bundle: true,
         outfile: config.bundleOutfile,
         plugins: [GasPlugin],
-    })
-        .catch((e) => {
-        throw new Error(e);
     });
-    fs.copyFileSync(config.appScriptJsonPath, path.join(config.distDir, 'appsscript.json'));
+    fs.copyFileSync(config.appsScriptJsonPath, path.join(config.distDir, 'appsscript.json'));
 }

package/dist/changeEnv.d.ts

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

package/dist/changeEnv.js

@@ -1,8 +1,8 @@
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
-import { getConfig } from './Config.js';
-export async function changeEnv(env = 'dev') {
-    const config = await getConfig();
+import { getConfig } from './config.js';
+export function changeEnv(env = 'dev') {
+    const config = getConfig();
     const envPath = config.envPaths[env];
     if (!envPath) {
         throw new Error(`envPath not found on ${envPath}`);
@@ -23,5 +23,4 @@ export async function changeEnv(env = 'dev') {
         rootDir: config.distDir,
     };
     fs.writeFileSync(claspJsonPath, JSON.stringify(data, null, 2));
-    console.log(`env changed to ${env}`);
 }

package/dist/envFile.d.ts

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,49 @@
+import fs from 'fs-extra';
+import { getConfig } from './config.js';
+import { getAppsScript } from './appsScript.js';
+export function initEnvFiles() {
+    const config = getConfig();
+    const appsScript = getAppsScript();
+    const scriptId = appsScript.scriptId;
+    const envPath = config.envPaths['dev'];
+    addToEnvFile(envPath, {
+        SCRIPT_ID: scriptId,
+    });
+}
+export function addToEnvFile(envPath, _items) {
+    const envString = fs.readFileSync(envPath, 'utf-8');
+    const newEnvString = addToEnvString(envString, _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) {
+                newLines.push(`${key}=${value}`);
+            }
+            else {
+                newLines.push('');
+            }
+            delete items[key];
+        }
+    }
+    newLines.push('');
+    for (const [key, value] of Object.entries(items)) {
+        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

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

package/dist/envFile.test.js

@@ -0,0 +1,56 @@
+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/gitignore.d.ts

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

package/dist/gitignore.js

@@ -0,0 +1,18 @@
+import path from 'path';
+import fs from 'fs-extra';
+import * as R from 'remeda';
+export function addGitIgnores() {
+    const filePath = path.join(process.cwd(), '.gitignore');
+    const existsIgnores = read(filePath);
+    const ignores = ['node_modules', '.DS_Store', '.env*', '.clasp.json'];
+    const newIgnores = R.unique([...existsIgnores, ...ignores]);
+    fs.writeFileSync(filePath, newIgnores.join('\n'));
+}
+function read(filePath) {
+    try {
+        return fs.readFileSync(filePath).toString().split('\n');
+    }
+    catch (err) {
+        return [];
+    }
+}

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 export * from './bundle.js';
 export * from './changeEnv.js';
-export * from './Config.js';
+export * from './config.js';

package/dist/index.js

@@ -1,3 +1,3 @@
 export * from './bundle.js';
 export * from './changeEnv.js';
-export * from './Config.js';
+export * from './config.js';

package/dist/init.d.ts

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

package/dist/init.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gasup",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "type": "module",
   "bin": {
     "gasup": "./dist/bin/gasup.js"
@@ -19,16 +19,19 @@
   "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",
     "path": "^0.12.7",
+    "remeda": "^2.19.2",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.2"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.10.7"
+    "@types/node": "^22.10.7",
+    "vitest": "^3.0.2"
   },
   "scripts": {
     "build": "tsc",