@ffflorian/jszip-cli 3.6.5 → 3.7.1

package/dist/BuildService.d.ts

@@ -1,4 +1,4 @@
-import { TerminalOptions } from './interfaces';
+import { TerminalOptions } from './interfaces.js';
 export declare class BuildService {
     compressedFilesCount: number;
     outputFile: string | null;

package/dist/BuildService.js

@@ -1,53 +1,24 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BuildService = void 0;
-const fs = __importStar(require("fs-extra"));
-const jszip_1 = __importDefault(require("jszip"));
-const logdown_1 = __importDefault(require("logdown"));
-const path_1 = __importDefault(require("path"));
-const progress_1 = __importDefault(require("progress"));
-const FileService_1 = require("./FileService");
-const glob_1 = require("glob");
-class BuildService {
+import path from 'node:path';
+import * as fs from 'fs-extra';
+import JSZip from 'jszip';
+import logdown from 'logdown';
+import progress from 'progress';
+import { globSync } from 'glob';
+import { FileService } from './FileService.js';
+export class BuildService {
     constructor(options) {
-        this.fileService = new FileService_1.FileService(options);
-        this.jszip = new jszip_1.default();
+        this.fileService = new FileService(options);
+        this.jszip = new JSZip();
         this.options = options;
-        this.logger = (0, logdown_1.default)('jszip-cli/BuildService', {
+        this.logger = logdown('jszip-cli/BuildService', {
             logger: console,
             markdown: false,
         });
         this.logger.state = { isEnabled: options.verbose };
         this.entries = [];
         this.ignoreEntries = this.options.ignoreEntries.map(entry => entry instanceof RegExp ? entry : new RegExp(entry.replace(/\*/g, '.*')));
-        this.outputFile = this.options.outputEntry ? path_1.default.resolve(this.options.outputEntry) : null;
-        this.progressBar = new progress_1.default('Compressing [:bar] :percent :elapseds', {
+        this.outputFile = this.options.outputEntry ? path.resolve(this.options.outputEntry) : null;
+        this.progressBar = new progress('Compressing [:bar] :percent :elapseds', {
             complete: '=',
             incomplete: ' ',
             total: 100,
@@ -58,9 +29,9 @@ class BuildService {
     add(rawEntries) {
         this.logger.info(`Adding ${rawEntries.length} entr${rawEntries.length === 1 ? 'y' : 'ies'} to ZIP file.`);
         const normalizedEntries = this.normalizePaths(rawEntries);
-        this.entries = (0, glob_1.globSync)(normalizedEntries).map(rawEntry => {
-            const resolvedPath = path_1.default.resolve(rawEntry);
-            const baseName = path_1.default.basename(rawEntry);
+        this.entries = globSync(normalizedEntries).map(rawEntry => {
+            const resolvedPath = path.resolve(rawEntry);
+            const baseName = path.basename(rawEntry);
             return {
                 resolvedPath,
                 zipPath: baseName,
@@ -74,7 +45,7 @@ class BuildService {
         const data = await this.getBuffer();
         if (this.outputFile) {
             if (!this.outputFile.match(/\.\w+$/)) {
-                this.outputFile = path_1.default.join(this.outputFile, 'data.zip');
+                this.outputFile = path.join(this.outputFile, 'data.zip');
             }
             this.logger.info(`Saving finished zip file to "${this.outputFile}" ...`);
             await this.fileService.writeFile(data, this.outputFile);
@@ -181,9 +152,9 @@ class BuildService {
     async checkOutput() {
         if (this.outputFile) {
             if (this.outputFile.match(/\.\w+$/)) {
-                const dirExists = await this.fileService.dirExists(path_1.default.dirname(this.outputFile));
+                const dirExists = await this.fileService.dirExists(path.dirname(this.outputFile));
                 if (!dirExists) {
-                    throw new Error(`Directory "${path_1.default.dirname(this.outputFile)}" doesn't exist or is not writable.`);
+                    throw new Error(`Directory "${path.dirname(this.outputFile)}" doesn't exist or is not writable.`);
                 }
                 const fileIsWritable = await this.fileService.fileIsWritable(this.outputFile);
                 if (!fileIsWritable) {
@@ -220,7 +191,7 @@ class BuildService {
         const dirEntries = await fs.readdir(entry.resolvedPath);
         for (const dirEntry of dirEntries) {
             const newZipPath = entry.zipPath === '.' ? dirEntry : `${entry.zipPath}/${dirEntry}`;
-            const newResolvedPath = path_1.default.join(entry.resolvedPath, dirEntry);
+            const newResolvedPath = path.join(entry.resolvedPath, dirEntry);
             await this.checkEntry({
                 resolvedPath: newResolvedPath,
                 zipPath: newZipPath,
@@ -228,4 +199,3 @@ class BuildService {
         }
     }
 }
-exports.BuildService = BuildService;

package/dist/ExtractService.d.ts

@@ -1,4 +1,4 @@
-import { TerminalOptions } from './interfaces';
+import { TerminalOptions } from './interfaces.js';
 export declare class ExtractService {
     extractedFilesCount: number;
     outputDir: string | null;

package/dist/ExtractService.js

@@ -1,25 +1,19 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtractService = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const jszip_1 = __importDefault(require("jszip"));
-const logdown_1 = __importDefault(require("logdown"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const progress_1 = __importDefault(require("progress"));
-class ExtractService {
+import os from 'node:os';
+import path from 'node:path';
+import fs from 'fs-extra';
+import JSZip from 'jszip';
+import logdown from 'logdown';
+import progress from 'progress';
+export class ExtractService {
     constructor(options) {
         this.options = options;
-        this.logger = (0, logdown_1.default)('jszip-cli/ExtractService', {
+        this.logger = logdown('jszip-cli/ExtractService', {
             logger: console,
             markdown: false,
         });
         this.logger.state.isEnabled = this.options.verbose;
-        this.outputDir = this.options.outputEntry ? path_1.default.resolve(this.options.outputEntry) : null;
-        this.progressBar = new progress_1.default('Extracting [:bar] :percent :elapseds', {
+        this.outputDir = this.options.outputEntry ? path.resolve(this.options.outputEntry) : null;
+        this.progressBar = new progress('Extracting [:bar] :percent :elapseds', {
             complete: '=',
             incomplete: ' ',
             total: 100,
@@ -28,14 +22,14 @@ class ExtractService {
         this.extractedFilesCount = 0;
     }
     async extract(rawEntries) {
-        const isWin32 = os_1.default.platform() === 'win32';
+        const isWin32 = os.platform() === 'win32';
         for (const entry of rawEntries) {
-            const jszip = new jszip_1.default();
+            const jszip = new JSZip();
             if (this.outputDir) {
-                await fs_extra_1.default.ensureDir(this.outputDir);
+                await fs.ensureDir(this.outputDir);
             }
-            const resolvedPath = path_1.default.resolve(entry);
-            const data = await fs_extra_1.default.readFile(resolvedPath);
+            const resolvedPath = path.resolve(entry);
+            const data = await fs.readFile(resolvedPath);
             const entries = [];
             await jszip.loadAsync(data, { createFolders: true });
             if (!this.outputDir) {
@@ -52,13 +46,13 @@ class ExtractService {
             });
             let lastPercent = 0;
             await Promise.all(entries.map(async ([filePath, entry], index) => {
-                const resolvedFilePath = path_1.default.join(this.outputDir, filePath);
+                const resolvedFilePath = path.join(this.outputDir, filePath);
                 if (entry.dir) {
-                    await fs_extra_1.default.ensureDir(resolvedFilePath);
+                    await fs.ensureDir(resolvedFilePath);
                 }
                 else {
                     const data = await entry.async('nodebuffer');
-                    await fs_extra_1.default.writeFile(resolvedFilePath, data, {
+                    await fs.writeFile(resolvedFilePath, data, {
                         encoding: 'utf-8',
                     });
                     this.extractedFilesCount++;
@@ -70,11 +64,11 @@ class ExtractService {
                 }
                 if (isWin32) {
                     if (entry.dosPermissions) {
-                        await fs_extra_1.default.chmod(resolvedFilePath, entry.dosPermissions);
+                        await fs.chmod(resolvedFilePath, entry.dosPermissions);
                     }
                 }
                 else if (entry.unixPermissions) {
-                    await fs_extra_1.default.chmod(resolvedFilePath, entry.unixPermissions);
+                    await fs.chmod(resolvedFilePath, entry.unixPermissions);
                 }
             }));
         }
@@ -88,4 +82,3 @@ class ExtractService {
         });
     }
 }
-exports.ExtractService = ExtractService;

package/dist/FileService.d.ts

@@ -1,4 +1,4 @@
-import type { TerminalOptions } from './interfaces';
+import type { TerminalOptions } from './interfaces.js';
 export declare class FileService {
     private readonly logger;
     private readonly options;

package/dist/FileService.js

@@ -1,16 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileService = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const logdown_1 = __importDefault(require("logdown"));
-const path_1 = __importDefault(require("path"));
-class FileService {
+import path from 'node:path';
+import fs from 'fs-extra';
+import logdown from 'logdown';
+export class FileService {
     constructor(options) {
         this.options = options;
-        this.logger = (0, logdown_1.default)('jszip-cli/FileService', {
+        this.logger = logdown('jszip-cli/FileService', {
             logger: console,
             markdown: false,
         });
@@ -18,48 +12,48 @@ class FileService {
     }
     async dirExists(dirPath) {
         try {
-            await fs_extra_1.default.access(dirPath, fs_extra_1.default.constants.F_OK);
+            await fs.access(dirPath, fs.constants.F_OK);
             try {
-                await fs_extra_1.default.access(dirPath, fs_extra_1.default.constants.W_OK);
+                await fs.access(dirPath, fs.constants.W_OK);
                 return true;
             }
-            catch (error) {
+            catch (_error) {
                 this.logger.info(`Directory "${dirPath}" exists but is not writable.`);
                 return false;
             }
         }
-        catch (error) {
+        catch (_error) {
             this.logger.info(`Directory "${dirPath}" doesn't exist.`, this.options.force ? 'Creating.' : 'Not creating.');
             if (this.options.force) {
-                await fs_extra_1.default.ensureDir(dirPath);
+                await fs.ensureDir(dirPath);
                 return true;
             }
             return false;
         }
     }
     async fileIsReadable(filePath) {
-        const dirExists = await this.dirExists(path_1.default.dirname(filePath));
+        const dirExists = await this.dirExists(path.dirname(filePath));
         if (dirExists) {
             try {
-                await fs_extra_1.default.access(filePath, fs_extra_1.default.constants.F_OK | fs_extra_1.default.constants.R_OK);
+                await fs.access(filePath, fs.constants.F_OK | fs.constants.R_OK);
                 return true;
             }
-            catch (error) {
+            catch (_error) {
                 return false;
             }
         }
         return false;
     }
     async fileIsWritable(filePath) {
-        const dirName = path_1.default.dirname(filePath);
+        const dirName = path.dirname(filePath);
         const dirExists = await this.dirExists(dirName);
         if (dirExists) {
             try {
-                await fs_extra_1.default.access(filePath, fs_extra_1.default.constants.F_OK | fs_extra_1.default.constants.R_OK);
+                await fs.access(filePath, fs.constants.F_OK | fs.constants.R_OK);
                 this.logger.info(`File "${filePath}" already exists.`, this.options.force ? 'Forcing overwrite.' : 'Not overwriting.');
                 return this.options.force;
             }
-            catch (error) {
+            catch (_error) {
                 return true;
             }
         }
@@ -68,10 +62,9 @@ class FileService {
     async writeFile(data, filePath) {
         const fileIsWritable = await this.fileIsWritable(filePath);
         if (fileIsWritable) {
-            await fs_extra_1.default.writeFile(filePath, data);
+            await fs.writeFile(filePath, data);
             return this;
         }
         throw new Error(`File "${this.options.outputEntry}" already exists.`);
     }
 }
-exports.FileService = FileService;

package/dist/JSZipCLI.d.ts

@@ -1,6 +1,6 @@
-import { BuildService } from './BuildService';
-import { ExtractService } from './ExtractService';
-import type { TerminalOptions } from './interfaces';
+import { BuildService } from './BuildService.js';
+import { ExtractService } from './ExtractService.js';
+import type { TerminalOptions } from './interfaces.js';
 export declare class JSZipCLI {
     private readonly buildService;
     private readonly configExplorer;

package/dist/JSZipCLI.js

@@ -1,13 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSZipCLI = void 0;
-const cosmiconfig_1 = require("cosmiconfig");
-const logdown_1 = __importDefault(require("logdown"));
-const BuildService_1 = require("./BuildService");
-const ExtractService_1 = require("./ExtractService");
+import { cosmiconfigSync } from 'cosmiconfig';
+import logdown from 'logdown';
+import { BuildService } from './BuildService.js';
+import { ExtractService } from './ExtractService.js';
 const defaultOptions = {
     compressionLevel: 5,
     configFile: true,
@@ -18,21 +12,21 @@ const defaultOptions = {
     quiet: false,
     verbose: false,
 };
-class JSZipCLI {
+export class JSZipCLI {
     constructor(options) {
         this.terminalOptions = options;
-        this.logger = (0, logdown_1.default)('jszip-cli/index', {
+        this.logger = logdown('jszip-cli/index', {
             logger: console,
             markdown: false,
         });
-        this.configExplorer = (0, cosmiconfig_1.cosmiconfigSync)('jszip');
+        this.configExplorer = cosmiconfigSync('jszip');
         this.options = { ...defaultOptions, ...this.terminalOptions };
         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_1.BuildService(this.options);
-        this.extractService = new ExtractService_1.ExtractService(this.options);
+        this.buildService = new BuildService(this.options);
+        this.extractService = new ExtractService(this.options);
     }
     /**
      * Add files and directories to the ZIP file.
@@ -125,4 +119,3 @@ class JSZipCLI {
         this.logger.state.isEnabled = this.options.verbose;
     }
 }
-exports.JSZipCLI = JSZipCLI;

package/dist/cli.js

@@ -1,19 +1,14 @@
 #!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const JSZipCLI_1 = require("./JSZipCLI");
-const defaultPackageJsonPath = path_1.default.join(__dirname, '../../package.json');
-const packageJsonPath = fs_extra_1.default.existsSync(defaultPackageJsonPath)
-    ? defaultPackageJsonPath
-    : path_1.default.join(__dirname, '../package.json');
-const { description, name, version } = fs_extra_1.default.readJSONSync(packageJsonPath);
-commander_1.program
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { program as commander } from 'commander';
+import fs from 'fs-extra';
+import { JSZipCLI } from './JSZipCLI.js';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const packageJsonPath = path.join(__dirname, '../package.json');
+const { description, name, version } = fs.readJSONSync(packageJsonPath);
+commander
     .name(name.replace(/^@[^/]+\//, ''))
     .description(description)
     .option('--noconfig', "don't look for a configuration file")
@@ -30,7 +25,7 @@ commander_1.program
     console.error(`\n  error: invalid command \`${args[0]}'\n`);
     process.exit(1);
 });
-commander_1.program
+commander
     .command('add')
     .alias('a')
     .description('add files and directories to a new ZIP archive')
@@ -45,9 +40,9 @@ commander_1.program
     .option('-V, --verbose', 'enable verbose logging', false)
     .arguments('[entries...]')
     .action(async (entries) => {
-    const options = commander_1.program.opts();
+    const options = commander.opts();
     try {
-        const jszip = new JSZipCLI_1.JSZipCLI({
+        const jszip = new JSZipCLI({
             ...(options.level && { compressionLevel: Number(options.level) }),
             ...((options.config && { configFile: options.config }) || (options.noconfig && { configFile: false })),
             ...(options.dereference && { dereferenceLinks: options.dereference }),
@@ -68,7 +63,7 @@ commander_1.program
         process.exit(1);
     }
 });
-commander_1.program
+commander
     .command('extract')
     .alias('e')
     .description('extract files and directories from ZIP archive(s)')
@@ -81,9 +76,9 @@ commander_1.program
     .option('-q, --quiet', "don't log anything excluding errors", false)
     .arguments('<archives...>')
     .action(async (archives) => {
-    const options = commander_1.program.opts();
+    const options = commander.opts();
     try {
-        const { outputDir, extractedFilesCount } = await new JSZipCLI_1.JSZipCLI({
+        const { outputDir, extractedFilesCount } = await new JSZipCLI({
             ...((options.config && { configFile: options.config }) || (options.noconfig && { configFile: false })),
             ...(options.force && { force: options.force }),
             ...(options.ignore && { ignoreEntries: [options.ignore] }),
@@ -100,7 +95,7 @@ commander_1.program
         process.exit(1);
     }
 });
-commander_1.program
+commander
     .command('fileMode', { hidden: true, isDefault: true })
     .option('--noconfig', "don't look for a configuration file", false)
     .option('-c, --config <path>', 'use a configuration file (default: .jsziprc.json)')
@@ -110,12 +105,12 @@ commander_1.program
     .option('-V, --verbose', 'enable verbose logging', false)
     .option('-q, --quiet', "don't log anything excluding errors", false)
     .action(async () => {
-    const options = commander_1.program.opts();
+    const options = commander.opts();
     try {
         if (options.noconfig) {
-            commander_1.program.outputHelp();
+            commander.outputHelp();
         }
-        await new JSZipCLI_1.JSZipCLI({
+        await new JSZipCLI({
             ...(options.config && { configFile: options.config }),
             ...(options.force && { force: options.force }),
             ...(options.ignore && { ignoreEntries: [options.ignore] }),
@@ -134,4 +129,4 @@ commander_1.program
         process.exit(1);
     }
 });
-commander_1.program.parse(process.argv);
+commander.parse(process.argv);

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from './JSZipCLI';
-export * from './interfaces';
+export * from './JSZipCLI.js';
+export * from './interfaces.js';

package/dist/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./JSZipCLI"), exports);
-__exportStar(require("./interfaces"), exports);
+export * from './JSZipCLI.js';
+export * from './interfaces.js';

package/dist/interfaces.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/package.json

@@ -5,7 +5,7 @@
     "commander": "12.1.0",
     "cosmiconfig": "9.0.0",
     "fs-extra": "11.2.0",
-    "glob": "10.4.1",
+    "glob": "11.0.0",
     "jszip": "3.10.1",
     "logdown": "3.3.1",
     "progress": "2.0.3"
@@ -15,13 +15,12 @@
     "@types/fs-extra": "11.0.4",
     "@types/progress": "2.0.7",
     "cross-env": "7.0.3",
-    "rimraf": "5.0.7",
-    "ts-node": "10.9.2",
-    "typescript": "5.5.2",
-    "vitest": "1.6.0"
+    "rimraf": "6.0.1",
+    "typescript": "5.5.4",
+    "vitest": "2.0.5"
   },
   "engines": {
-    "node": ">= 10.9"
+    "node": ">= 18.0"
   },
   "files": [
     "dist"
@@ -33,7 +32,7 @@
     "zip"
   ],
   "license": "GPL-3.0",
-  "main": "dist/index.js",
+  "module": "dist/index.js",
   "name": "@ffflorian/jszip-cli",
   "repository": "https://github.com/ffflorian/node-packages/tree/main/packages/jszip-cli",
   "scripts": {
@@ -43,6 +42,7 @@
     "start": "cross-env NODE_DEBUG=\"jszip-cli/*\" node --loader ts-node/esm src/cli.ts",
     "test": "vitest run"
   },
-  "version": "3.6.5",
-  "gitHead": "f7a6a79286e4eb85392b5f2d33942ab166142109"
+  "type": "module",
+  "version": "3.7.1",
+  "gitHead": "aadf648655ecd0f6bea0c989542a16ff636c71a7"
 }