@gjsify/cli 0.0.2 → 0.0.3

package/lib/actions/build.js

@@ -65,8 +65,12 @@ export class BuildAction {
     }
     /** Application mode */
     async buildApp(app = 'gjs') {
-        const { verbose, esbuild, typescript, exclude } = this.configData;
+        const { verbose, esbuild, typescript, exclude, library: pgk } = this.configData;
         const format = esbuild?.format || esbuild?.outfile?.endsWith('.cjs') ? 'cjs' : 'esm';
+        // Set default outfile if no outdir is set 
+        if (esbuild && !esbuild?.outfile && !esbuild?.outdir && (pgk?.main || pgk?.module)) {
+            esbuild.outfile = esbuild?.format === 'cjs' ? pgk.main || pgk.module : pgk.module || pgk.main;
+        }
         const result = await build({
             ...this.getEsBuildDefaults(),
             ...esbuild,

package/lib/commands/build.js

@@ -35,6 +35,18 @@ export const buildCommand = {
             choices: ['gjs', 'node', 'deno', 'browser'],
             normalize: true,
             default: 'gjs'
+        })
+            .option('format', {
+            description: "Override the default output format",
+            type: 'string',
+            choices: ['iife', 'esm', 'cjs'],
+            normalize: true,
+        })
+            .option('minify', {
+            description: "When enabled, the generated code will be minified instead of pretty-printed",
+            type: 'boolean',
+            normalize: true,
+            default: false
         })
             .option('library', {
             description: "Use this if you want to build a library for Gjsify",
@@ -43,16 +55,19 @@ export const buildCommand = {
             default: false
         })
             .option('outfile', {
+            alias: 'o',
             description: "Sets the output file name for the build operation. If no outfile is specified, the outfile will be parsed from the package.json. Only used if application mode is active",
             type: 'string',
             normalize: true,
         })
             .option('outdir', {
+            alias: 'd',
             description: "Sets the output directory for the build operation. If no outdir is specified, the outdir will be parsed from the package.json. Only used if library mode is active",
             type: 'string',
             normalize: true,
         })
             .option('reflection', {
+            alias: 'r',
             description: "Enables TypeScript types on runtime using Deepkit's type compiler",
             type: 'boolean',
             normalize: true,

package/lib/config.d.ts

@@ -4,7 +4,7 @@ import type { ArgumentsCamelCase } from 'yargs';
 export declare class Config {
     readonly loadOptions: LoadOptions;
     constructor(loadOptions?: LoadOptions);
-    /** Loads gjsify config file, e.g `gjsify.js` */
+    /** Loads gjsify config file, e.g `.gjsifyrc.js` */
     private load;
     /** Loads package.json of the current project */
     private readPackageJSON;

package/lib/config.js

@@ -5,15 +5,13 @@ import { getTsconfig } from 'get-tsconfig';
 import lodash from "lodash";
 const { merge } = lodash;
 export class Config {
-    loadOptions = {
-        searchPlaces: [APP_NAME]
-    };
+    loadOptions = {};
     constructor(loadOptions = {}) {
         if (Object.keys(loadOptions).length) {
             this.loadOptions = loadOptions;
         }
     }
-    /** Loads gjsify config file, e.g `gjsify.js` */
+    /** Loads gjsify config file, e.g `.gjsifyrc.js` */
     async load(searchFrom) {
         let configFile = await cosmiconfig(APP_NAME, this.loadOptions).search(searchFrom);
         configFile ||= {
@@ -51,6 +49,8 @@ export class Config {
         merge(configData.library, pkg, configData.library);
         merge(configData.typescript, tsConfig, configData.typescript);
         merge(configData.esbuild, {
+            format: cliArgs.format,
+            minify: cliArgs.minify,
             entryPoints: cliArgs.entryPoints,
             outfile: cliArgs.outfile,
             outdir: cliArgs.outdir,

package/lib/types/cli-build-options.d.ts

@@ -7,6 +7,16 @@ export interface CliBuildOptions {
     entryPoints?: string[];
     /** Switch on the verbose mode */
     verbose?: boolean;
+    /**
+     * When enabled, the generated code will be minified instead of pretty-printed.
+     * @see https://esbuild.github.io/api/#minify
+     */
+    minify?: boolean;
+    /**
+     * Override the default output format.
+     * @see https://esbuild.github.io/api/#format
+     */
+    format?: 'iife' | 'esm' | 'cjs';
     /** Use this if you want to build a application or test, the platforms node and deno are usually only used internally to build the tests for Gjsify */
     app?: App;
     /** Use this if you want to build a library for Gjsify */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "CLI for Gjsify",
   "type": "module",
   "main": "lib/index.js",
@@ -23,10 +23,10 @@
     "cli"
   ],
   "dependencies": {
-    "@gjsify/esbuild-plugin-deepkit": "^0.0.2",
-    "@gjsify/esbuild-plugin-gjsify": "^0.0.2",
+    "@gjsify/esbuild-plugin-deepkit": "^0.0.3",
+    "@gjsify/esbuild-plugin-gjsify": "^0.0.3",
     "cosmiconfig": "^8.2.0",
-    "esbuild": "^0.18.2",
+    "esbuild": "^0.18.3",
     "get-tsconfig": "^4.6.0",
     "lodash": "^4.17.21",
     "pkg-types": "^1.0.3",

package/src/actions/build.ts

@@ -1,9 +1,8 @@
 import type { ConfigData } from '../types/index.js';
 import type { App } from '@gjsify/esbuild-plugin-gjsify';
-import { build, analyzeMetafile, BuildOptions, BuildResult } from 'esbuild';
+import { build, BuildOptions, BuildResult } from 'esbuild';
 import { gjsifyPlugin } from '@gjsify/esbuild-plugin-gjsify';
 import { dirname, extname } from 'path';
-import { writeFile } from 'fs/promises';
 
 export class BuildAction {
     constructor(readonly configData: ConfigData = {}) {
@@ -78,10 +77,15 @@ export class BuildAction {
     /** Application mode */
     async buildApp(app: App = 'gjs') {
 
-        const { verbose, esbuild, typescript, exclude } = this.configData;
+        const { verbose, esbuild, typescript, exclude, library: pgk } = this.configData;
 
         const format: 'cjs' | 'esm' = esbuild?.format || esbuild?.outfile?.endsWith('.cjs') ? 'cjs' : 'esm';
 
+        // Set default outfile if no outdir is set 
+        if(esbuild && !esbuild?.outfile && !esbuild?.outdir && (pgk?.main || pgk?.module)) {
+            esbuild.outfile = esbuild?.format === 'cjs' ? pgk.main || pgk.module : pgk.module || pgk.main;
+        }
+
         const result = await build({
             ...this.getEsBuildDefaults(),
             ...esbuild,

package/src/commands/build.ts

@@ -38,6 +38,18 @@ export const buildCommand: Command<any, CliBuildOptions> = {
                 normalize: true,
                 default: 'gjs'
             })
+            .option('format', {
+                description: "Override the default output format",
+                type: 'string',
+                choices: ['iife', 'esm', 'cjs'],
+                normalize: true,
+            })
+            .option('minify', {
+                description: "When enabled, the generated code will be minified instead of pretty-printed",
+                type: 'boolean',
+                normalize: true,
+                default: false
+            })
             .option('library', {
                 description: "Use this if you want to build a library for Gjsify",
                 type: 'boolean',
@@ -45,16 +57,19 @@ export const buildCommand: Command<any, CliBuildOptions> = {
                 default: false
             })
             .option('outfile', {
+                alias: 'o',
                 description: "Sets the output file name for the build operation. If no outfile is specified, the outfile will be parsed from the package.json. Only used if application mode is active",
                 type: 'string',
                 normalize: true,
             })
             .option('outdir', {
+                alias: 'd',
                 description: "Sets the output directory for the build operation. If no outdir is specified, the outdir will be parsed from the package.json. Only used if library mode is active",
                 type: 'string',
                 normalize: true,
             })
             .option('reflection', {
+                alias: 'r',
                 description: "Enables TypeScript types on runtime using Deepkit's type compiler",
                 type: 'boolean',
                 normalize: true,

package/src/config.ts

@@ -10,9 +10,7 @@ import type { ArgumentsCamelCase } from 'yargs';
 
 export class Config {
 
-    readonly loadOptions: LoadOptions = {
-        searchPlaces: [APP_NAME]
-    }
+    readonly loadOptions: LoadOptions = {}
 
     constructor(loadOptions: LoadOptions = {}) {
         if(Object.keys(loadOptions).length) {
@@ -20,7 +18,7 @@ export class Config {
         }
     }
 
-    /** Loads gjsify config file, e.g `gjsify.js` */
+    /** Loads gjsify config file, e.g `.gjsifyrc.js` */
     private async load(searchFrom?: string) {        
         let configFile = await cosmiconfig(APP_NAME, this.loadOptions).search(searchFrom) as CosmiconfigResult<ConfigData> | null;
 
@@ -66,6 +64,8 @@ export class Config {
         merge(configData.library, pkg, configData.library);
         merge(configData.typescript, tsConfig, configData.typescript);
         merge(configData.esbuild, {
+            format: cliArgs.format,
+            minify: cliArgs.minify,
             entryPoints: cliArgs.entryPoints,
             outfile: cliArgs.outfile,
             outdir: cliArgs.outdir,

package/src/lodash.d.ts

@@ -0,0 +1,46 @@
+declare module 'lodash' {
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    function merge<TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    /**
+     * @see _.merge
+     */
+    function merge<TObject, TSource1, TSource2>(object: TObject, source1: TSource1, source2: TSource2): TObject & TSource1 & TSource2;
+    /**
+     * @see _.merge
+     */
+    function merge<TObject, TSource1, TSource2, TSource3>(object: TObject, source1: TSource1, source2: TSource2, source3: TSource3): TObject & TSource1 & TSource2 & TSource3;
+    /**
+     * @see _.merge
+     */
+    function merge<TObject, TSource1, TSource2, TSource3, TSource4>(object: TObject, source1: TSource1, source2: TSource2, source3: TSource3, source4: TSource4): TObject & TSource1 & TSource2 & TSource3 & TSource4;
+    /**
+     * @see _.merge
+     */
+    function merge(object: any, ...otherArgs: any[]): any;
+}

package/src/types/cli-build-options.ts

@@ -8,6 +8,16 @@ export interface CliBuildOptions {
   entryPoints?: string[];
   /** Switch on the verbose mode */
   verbose?: boolean;
+  /**
+   * When enabled, the generated code will be minified instead of pretty-printed.
+   * @see https://esbuild.github.io/api/#minify
+   */
+  minify?: boolean;
+  /**
+   * Override the default output format.
+   * @see https://esbuild.github.io/api/#format
+   */
+  format?: 'iife' | 'esm' | 'cjs';
   /** Use this if you want to build a application or test, the platforms node and deno are usually only used internally to build the tests for Gjsify */
   app?: App;
   /** Use this if you want to build a library for Gjsify */

package/tsconfig.json

@@ -8,5 +8,6 @@
       "allowSyntheticDefaultImports": true,
       "strict": true
     },
+    "include": ["src/lodash.d.ts"],
     "files": ["src/index.ts"]
 }