gasup 0.4.0 → 0.4.1

package/dist/bin/gasup.js

@@ -2,9 +2,11 @@ import { execSync } from 'child_process';
 import { program } from 'commander';
 import { build } from '../build.js';
 import { bundle } from '../bundle.js';
+import { loadConfigWithDefault } from '../config.js';
 import { deploy } from '../deploy.js';
 import { changeEnv } from '../envFile/changeEnv.js';
 program
+    .option('--config', 'display current configuration')
     .option('--env <envpath>', 'apply env to clasp')
     .option('--bundle', 'bundle')
     .option('--build', 'build')
@@ -13,20 +15,25 @@ program
     .parse();
 async function main() {
     const opts = program.opts();
+    const config = await loadConfigWithDefault();
+    if (opts.config) {
+        console.log({ config });
+        return;
+    }
     if (opts.env?.startsWith('--')) {
         throw new Error('env option is required');
     }
     if (opts.env) {
         console.log(`apply ${opts.env} to clasp`);
-        changeEnv(opts.env);
+        changeEnv(opts.env, config);
     }
     if (opts.build) {
         console.log('build with tsc');
-        build();
+        build(config);
     }
     if (opts.bundle) {
         console.log('bundle with esbuild');
-        await bundle();
+        await bundle(config);
     }
     if (opts.push) {
         console.log('push');

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/config.d.ts

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

package/dist/config.js

@@ -10,28 +10,29 @@ export const defaultConfig = {
     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,
     };
 }
-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 +1,2 @@
-export declare function changeEnv(envPath: string): void;
+import { Config } from '../types.js';
+export declare function changeEnv(envPath: string, config: Config): void;

package/dist/envFile/changeEnv.js

@@ -1,8 +1,7 @@
 import fs from 'fs-extra';
 import { updateClaspJson } from '../claspJson.js';
-import { config } from '../config.js';
 import { getEnvData } from './envFile.js';
-export function changeEnv(envPath) {
+export function changeEnv(envPath, config) {
     if (!envPath) {
         throw new Error(`envPath not found on ${envPath}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gasup",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "repository": {
     "type": "git",