@ffflorian/jszip-cli 3.14.3 → 3.15.0

package/dist/JSZipCLI.d.ts

@@ -7,8 +7,7 @@ export declare class JSZipCLI {
     private readonly configFile?;
     private readonly extractService;
     private readonly logger;
-    private options;
-    private readonly terminalOptions?;
+    private readonly options;
     constructor(options?: TerminalOptions);
     /**
      * Add files and directories to the ZIP file.

package/dist/JSZipCLI.js

@@ -14,16 +14,17 @@ const defaultOptions = {
 };
 export class JSZipCLI {
     constructor(options) {
-        this.terminalOptions = options;
         this.logger = logdown('jszip-cli/index', {
             logger: console,
             markdown: false,
         });
         this.configExplorer = cosmiconfigSync('jszip');
-        this.options = { ...defaultOptions, ...this.terminalOptions };
+        this.options = { ...defaultOptions, ...options };
+        if (this.options.configFile) {
+            const configFileData = this.checkConfigFile();
+            this.options = { ...defaultOptions, ...configFileData, ...options };
+        }
         this.logger.state.isEnabled = this.options.verbose;
-        this.logger.info('Merged options', this.options);
-        this.checkConfigFile();
         this.logger.info('Loaded options', this.options);
         this.buildService = new BuildService(this.options);
         this.extractService = new ExtractService(this.options);
@@ -89,10 +90,6 @@ export class JSZipCLI {
         return this.buildService.save();
     }
     checkConfigFile() {
-        if (!this.options.configFile) {
-            this.logger.info('Not using any configuration file.');
-            return;
-        }
         let configResult = null;
         if (typeof this.options.configFile === 'string') {
             try {
@@ -111,12 +108,11 @@ export class JSZipCLI {
             }
         }
         if (!configResult || configResult.isEmpty) {
-            this.logger.info('Not using any configuration file.');
+            this.logger.info('Configuration file not found or empty.');
             return;
         }
         const configFileData = configResult.config;
         this.logger.info(`Using configuration file ${configResult.filepath}`);
-        this.options = { ...defaultOptions, ...configFileData, ...this.terminalOptions };
-        this.logger.state.isEnabled = this.options.verbose;
+        return configFileData;
     }
 }

package/package.json

@@ -19,7 +19,7 @@
     "vitest": "4.0.16"
   },
   "engines": {
-    "node": ">= 18.0"
+    "node": ">= 18"
   },
   "files": [
     "dist"
@@ -42,6 +42,6 @@
     "test": "vitest run"
   },
   "type": "module",
-  "version": "3.14.3",
-  "gitHead": "8c51af36ec3439ba37e2aaa27fe9ae1ef86f8d0b"
+  "version": "3.15.0",
+  "gitHead": "b968c846095113cbe57fbdd34e4593a4dea8a1c9"
 }