@yarnpkg/libzip - npm Package Compare versions

Comparing version 3.0.0-rc.18 to 3.0.0-rc.20

lib/async.d.ts

 /// <reference types="emscripten" />
-export declare function getLibzipSync(): void;
+export * from './common';
+export declare function getLibzipSync(): {
+    readonly HEAP8: Int8Array;
+    readonly HEAPU8: Uint8Array;
+    readonly errors: typeof import("./makeInterface").Errors;
+    readonly SEEK_SET: 0;
+    readonly SEEK_CUR: 1;
+    readonly SEEK_END: 2;
+    readonly ZIP_CHECKCONS: 4;
+    readonly ZIP_CREATE: 1;
+    readonly ZIP_EXCL: 2;
+    readonly ZIP_TRUNCATE: 8;
+    readonly ZIP_RDONLY: 16;
+    readonly ZIP_FL_OVERWRITE: 8192;
+    readonly ZIP_FL_COMPRESSED: 4;
+    readonly ZIP_OPSYS_DOS: 0;
+    readonly ZIP_OPSYS_AMIGA: 1;
+    readonly ZIP_OPSYS_OPENVMS: 2;
+    readonly ZIP_OPSYS_UNIX: 3;
+    readonly ZIP_OPSYS_VM_CMS: 4;
+    readonly ZIP_OPSYS_ATARI_ST: 5;
+    readonly ZIP_OPSYS_OS_2: 6;
+    readonly ZIP_OPSYS_MACINTOSH: 7;
+    readonly ZIP_OPSYS_Z_SYSTEM: 8;
+    readonly ZIP_OPSYS_CPM: 9;
+    readonly ZIP_OPSYS_WINDOWS_NTFS: 10;
+    readonly ZIP_OPSYS_MVS: 11;
+    readonly ZIP_OPSYS_VSE: 12;
+    readonly ZIP_OPSYS_ACORN_RISC: 13;
+    readonly ZIP_OPSYS_VFAT: 14;
+    readonly ZIP_OPSYS_ALTERNATE_MVS: 15;
+    readonly ZIP_OPSYS_BEOS: 16;
+    readonly ZIP_OPSYS_TANDEM: 17;
+    readonly ZIP_OPSYS_OS_400: 18;
+    readonly ZIP_OPSYS_OS_X: 19;
+    readonly ZIP_CM_DEFAULT: -1;
+    readonly ZIP_CM_STORE: 0;
+    readonly ZIP_CM_DEFLATE: 8;
+    readonly uint08S: number;
+    readonly uint16S: number;
+    readonly uint32S: number;
+    readonly uint64S: number;
+    readonly malloc: (size: number) => number;
+    readonly free: (ptr: number) => void;
+    readonly getValue: typeof getValue;
+    readonly open: (arg_0: string, arg_1: number, arg_2: number) => number;
+    readonly openFromSource: (arg_0: number, arg_1: number, arg_2: number) => number;
+    readonly close: (arg_0: number) => number;
+    readonly discard: (arg_0: number) => null;
+    readonly getError: (arg_0: number) => number;
+    readonly getName: (arg_0: number, arg_1: number, arg_2: number) => string;
+    readonly getNumEntries: (arg_0: number, arg_1: number) => number;
+    readonly delete: (arg_0: number, arg_1: number) => number;
+    readonly stat: (arg_0: number, arg_1: string, arg_2: number, arg_3: number) => number;
+    readonly statIndex: (arg_0: number, arg_1: number, arg_2: number, arg_3: number, arg_4: number) => number;
+    readonly fopen: (arg_0: number, arg_1: string, arg_2: number) => number;
+    readonly fopenIndex: (arg_0: number, arg_1: number, arg_2: number, arg_3: number) => number;
+    readonly fread: (arg_0: number, arg_1: number, arg_2: number, arg_3: number) => number;
+    readonly fclose: (arg_0: number) => number;
+    readonly dir: {
+        readonly add: (arg_0: number, arg_1: string) => number;
+    };
+    readonly file: {
+        readonly add: (arg_0: number, arg_1: string, arg_2: number, arg_3: number) => number;
+        readonly getError: (arg_0: number) => number;
+        readonly getExternalAttributes: (arg_0: number, arg_1: number, arg_2: number, arg_3: number, arg_4: number, arg_5: number) => number;
+        readonly setExternalAttributes: (arg_0: number, arg_1: number, arg_2: number, arg_3: number, arg_4: number, arg_5: number) => number;
+        readonly setMtime: (arg_0: number, arg_1: number, arg_2: number, arg_3: number, arg_4: number) => number;
+        readonly setCompression: (arg_0: number, arg_1: number, arg_2: number, arg_3: number, arg_4: number) => number;
+    };
+    readonly ext: {
+        readonly countSymlinks: (arg_0: number) => number;
+    };
+    readonly error: {
+        readonly initWithCode: (arg_0: number, arg_1: number) => null;
+        readonly strerror: (arg_0: number) => string;
+    };
+    readonly name: {
+        readonly locate: (arg_0: number, arg_1: string, arg_2: number) => number;
+    };
+    readonly source: {
+        readonly fromUnattachedBuffer: (arg_0: number, arg_1: number, arg_2: number, arg_3: number, arg_4: number) => number;
+        readonly fromBuffer: (arg_0: number, arg_1: number, arg_2: number, arg_3: number, arg_4: number) => number;
+        readonly free: (arg_0: number) => null;
+        readonly keep: (arg_0: number) => null;
+        readonly open: (arg_0: number) => number;
+        readonly close: (arg_0: number) => number;
+        readonly seek: (arg_0: number, arg_1: number, arg_2: number, arg_3: number) => number;
+        readonly tell: (arg_0: number) => number;
+        readonly read: (arg_0: number, arg_1: number, arg_2: number) => number;
+        readonly error: (arg_0: number) => number;
+        readonly setMtime: (arg_0: number, arg_1: number) => number;
+    };
+    readonly struct: {
+        readonly stat: () => number;
+        readonly statS: () => number;
+        readonly statName: (arg_0: number) => string;
+        readonly statIndex: (arg_0: number) => number;
+        readonly statSize: (arg_0: number) => number;
+        readonly statCompSize: (arg_0: number) => number;
+        readonly statCompMethod: (arg_0: number) => number;
+        readonly statMtime: (arg_0: number) => number;
+        readonly statCrc: (arg_0: number) => number;
+        readonly error: () => number;
+        readonly errorS: () => number;
+        readonly errorCodeZip: (arg_0: number) => number;
+    };
+};
 export declare function getLibzipPromise(): Promise<{
@@ -110,2 +217,1 @@ readonly HEAP8: Int8Array;
 }>;
-export type { Libzip } from './makeInterface';

lib/async.js

 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLibzipPromise = exports.getLibzipSync = void 0;
+const tslib_1 = require("tslib");
+const instance_1 = require("./instance");
 const makeInterface_1 = require("./makeInterface");
-let promise = null;
+tslib_1.__exportStar(require("./common"), exports);
+let promise;
+(0, instance_1.setFactory)(() => {
+    throw new Error(`Zip methods must be called within the context of getLibzipPromise when operating under async-only environments`);
+});
 function getLibzipSync() {
-    throw new Error(`Cannot use getLibzipSync when using the async version of the libzip`);
+    return (0, instance_1.getInstance)();
 }
 exports.getLibzipSync = getLibzipSync;
 async function getLibzipPromise() {
-    if (promise === null) {
-        promise = Promise.resolve().then(() => __importStar(require(`./libzipAsync`))).then(async ({ default: createModule }) => {
-            const libzip = await createModule();
-            return (0, makeInterface_1.makeInterface)(libzip);
-        });
-    }
-    return promise;
+    const instance = (0, instance_1.tryInstance)();
+    if (typeof instance !== `undefined`)
+        return instance;
+    if (typeof promise !== `undefined`)
+        return promise;
+    return promise = Promise.resolve().then(() => tslib_1.__importStar(require(`./libzipAsync`))).then(async ({ default: createModule }) => {
+        const emZip = await createModule();
+        const libzip = (0, makeInterface_1.makeInterface)(emZip);
+        promise = undefined;
+        (0, instance_1.setFactory)(() => libzip);
+        return (0, instance_1.getInstance)();
+    });
 }
 exports.getLibzipPromise = getLibzipPromise;

lib/makeInterface.d.ts

@@ -38,3 +38,3 @@ /// <reference types="emscripten" />
 }
-export declare const makeInterface: (libzip: LibzipEmscriptenModule) => {
+export declare const makeInterface: (emZip: LibzipEmscriptenModule) => {
     readonly HEAP8: Int8Array;
@@ -41,0 +41,0 @@ readonly HEAPU8: Uint8Array;

lib/makeInterface.js

@@ -43,9 +43,9 @@ "use strict";
 })(Errors = exports.Errors || (exports.Errors = {}));
-const makeInterface = (libzip) => ({
+const makeInterface = (emZip) => ({
     // Those are getters because they can change after memory growth
     get HEAP8() {
-        return libzip.HEAP8;
+        return emZip.HEAP8;
     },
     get HEAPU8() {
-        return libzip.HEAPU8;
+        return emZip.HEAPU8;
     },
@@ -86,72 +86,72 @@ errors: Errors,
     ZIP_CM_DEFLATE: 8,
-    uint08S: libzip._malloc(1),
-    uint16S: libzip._malloc(2),
-    uint32S: libzip._malloc(4),
-    uint64S: libzip._malloc(8),
-    malloc: libzip._malloc,
-    free: libzip._free,
-    getValue: libzip.getValue,
-    open: libzip.cwrap(`zip_open`, `number`, [`string`, `number`, `number`]),
-    openFromSource: libzip.cwrap(`zip_open_from_source`, `number`, [`number`, `number`, `number`]),
-    close: libzip.cwrap(`zip_close`, `number`, [`number`]),
-    discard: libzip.cwrap(`zip_discard`, null, [`number`]),
-    getError: libzip.cwrap(`zip_get_error`, `number`, [`number`]),
-    getName: libzip.cwrap(`zip_get_name`, `string`, [`number`, `number`, `number`]),
-    getNumEntries: libzip.cwrap(`zip_get_num_entries`, `number`, [`number`, `number`]),
-    delete: libzip.cwrap(`zip_delete`, `number`, [`number`, `number`]),
-    stat: libzip.cwrap(`zip_stat`, `number`, [`number`, `string`, `number`, `number`]),
-    statIndex: libzip.cwrap(`zip_stat_index`, `number`, [`number`, ...number64, `number`, `number`]),
-    fopen: libzip.cwrap(`zip_fopen`, `number`, [`number`, `string`, `number`]),
-    fopenIndex: libzip.cwrap(`zip_fopen_index`, `number`, [`number`, ...number64, `number`]),
-    fread: libzip.cwrap(`zip_fread`, `number`, [`number`, `number`, `number`, `number`]),
-    fclose: libzip.cwrap(`zip_fclose`, `number`, [`number`]),
+    uint08S: emZip._malloc(1),
+    uint16S: emZip._malloc(2),
+    uint32S: emZip._malloc(4),
+    uint64S: emZip._malloc(8),
+    malloc: emZip._malloc,
+    free: emZip._free,
+    getValue: emZip.getValue,
+    open: emZip.cwrap(`zip_open`, `number`, [`string`, `number`, `number`]),
+    openFromSource: emZip.cwrap(`zip_open_from_source`, `number`, [`number`, `number`, `number`]),
+    close: emZip.cwrap(`zip_close`, `number`, [`number`]),
+    discard: emZip.cwrap(`zip_discard`, null, [`number`]),
+    getError: emZip.cwrap(`zip_get_error`, `number`, [`number`]),
+    getName: emZip.cwrap(`zip_get_name`, `string`, [`number`, `number`, `number`]),
+    getNumEntries: emZip.cwrap(`zip_get_num_entries`, `number`, [`number`, `number`]),
+    delete: emZip.cwrap(`zip_delete`, `number`, [`number`, `number`]),
+    stat: emZip.cwrap(`zip_stat`, `number`, [`number`, `string`, `number`, `number`]),
+    statIndex: emZip.cwrap(`zip_stat_index`, `number`, [`number`, ...number64, `number`, `number`]),
+    fopen: emZip.cwrap(`zip_fopen`, `number`, [`number`, `string`, `number`]),
+    fopenIndex: emZip.cwrap(`zip_fopen_index`, `number`, [`number`, ...number64, `number`]),
+    fread: emZip.cwrap(`zip_fread`, `number`, [`number`, `number`, `number`, `number`]),
+    fclose: emZip.cwrap(`zip_fclose`, `number`, [`number`]),
     dir: {
-        add: libzip.cwrap(`zip_dir_add`, `number`, [`number`, `string`]),
+        add: emZip.cwrap(`zip_dir_add`, `number`, [`number`, `string`]),
     },
     file: {
-        add: libzip.cwrap(`zip_file_add`, `number`, [`number`, `string`, `number`, `number`]),
-        getError: libzip.cwrap(`zip_file_get_error`, `number`, [`number`]),
-        getExternalAttributes: libzip.cwrap(`zip_file_get_external_attributes`, `number`, [`number`, ...number64, `number`, `number`, `number`]),
-        setExternalAttributes: libzip.cwrap(`zip_file_set_external_attributes`, `number`, [`number`, ...number64, `number`, `number`, `number`]),
-        setMtime: libzip.cwrap(`zip_file_set_mtime`, `number`, [`number`, ...number64, `number`, `number`]),
-        setCompression: libzip.cwrap(`zip_set_file_compression`, `number`, [`number`, ...number64, `number`, `number`]),
+        add: emZip.cwrap(`zip_file_add`, `number`, [`number`, `string`, `number`, `number`]),
+        getError: emZip.cwrap(`zip_file_get_error`, `number`, [`number`]),
+        getExternalAttributes: emZip.cwrap(`zip_file_get_external_attributes`, `number`, [`number`, ...number64, `number`, `number`, `number`]),
+        setExternalAttributes: emZip.cwrap(`zip_file_set_external_attributes`, `number`, [`number`, ...number64, `number`, `number`, `number`]),
+        setMtime: emZip.cwrap(`zip_file_set_mtime`, `number`, [`number`, ...number64, `number`, `number`]),
+        setCompression: emZip.cwrap(`zip_set_file_compression`, `number`, [`number`, ...number64, `number`, `number`]),
     },
     ext: {
-        countSymlinks: libzip.cwrap(`zip_ext_count_symlinks`, `number`, [`number`]),
+        countSymlinks: emZip.cwrap(`zip_ext_count_symlinks`, `number`, [`number`]),
     },
     error: {
-        initWithCode: libzip.cwrap(`zip_error_init_with_code`, null, [`number`, `number`]),
-        strerror: libzip.cwrap(`zip_error_strerror`, `string`, [`number`]),
+        initWithCode: emZip.cwrap(`zip_error_init_with_code`, null, [`number`, `number`]),
+        strerror: emZip.cwrap(`zip_error_strerror`, `string`, [`number`]),
     },
     name: {
-        locate: libzip.cwrap(`zip_name_locate`, `number`, [`number`, `string`, `number`]),
+        locate: emZip.cwrap(`zip_name_locate`, `number`, [`number`, `string`, `number`]),
     },
     source: {
-        fromUnattachedBuffer: libzip.cwrap(`zip_source_buffer_create`, `number`, [`number`, ...number64, `number`, `number`]),
-        fromBuffer: libzip.cwrap(`zip_source_buffer`, `number`, [`number`, `number`, ...number64, `number`]),
-        free: libzip.cwrap(`zip_source_free`, null, [`number`]),
-        keep: libzip.cwrap(`zip_source_keep`, null, [`number`]),
-        open: libzip.cwrap(`zip_source_open`, `number`, [`number`]),
-        close: libzip.cwrap(`zip_source_close`, `number`, [`number`]),
-        seek: libzip.cwrap(`zip_source_seek`, `number`, [`number`, ...number64, `number`]),
-        tell: libzip.cwrap(`zip_source_tell`, `number`, [`number`]),
-        read: libzip.cwrap(`zip_source_read`, `number`, [`number`, `number`, `number`]),
-        error: libzip.cwrap(`zip_source_error`, `number`, [`number`]),
-        setMtime: libzip.cwrap(`zip_source_set_mtime`, `number`, [`number`, `number`]),
+        fromUnattachedBuffer: emZip.cwrap(`zip_source_buffer_create`, `number`, [`number`, ...number64, `number`, `number`]),
+        fromBuffer: emZip.cwrap(`zip_source_buffer`, `number`, [`number`, `number`, ...number64, `number`]),
+        free: emZip.cwrap(`zip_source_free`, null, [`number`]),
+        keep: emZip.cwrap(`zip_source_keep`, null, [`number`]),
+        open: emZip.cwrap(`zip_source_open`, `number`, [`number`]),
+        close: emZip.cwrap(`zip_source_close`, `number`, [`number`]),
+        seek: emZip.cwrap(`zip_source_seek`, `number`, [`number`, ...number64, `number`]),
+        tell: emZip.cwrap(`zip_source_tell`, `number`, [`number`]),
+        read: emZip.cwrap(`zip_source_read`, `number`, [`number`, `number`, `number`]),
+        error: emZip.cwrap(`zip_source_error`, `number`, [`number`]),
+        setMtime: emZip.cwrap(`zip_source_set_mtime`, `number`, [`number`, `number`]),
     },
     struct: {
-        stat: libzip.cwrap(`zipstruct_stat`, `number`, []),
-        statS: libzip.cwrap(`zipstruct_statS`, `number`, []),
-        statName: libzip.cwrap(`zipstruct_stat_name`, `string`, [`number`]),
-        statIndex: libzip.cwrap(`zipstruct_stat_index`, `number`, [`number`]),
-        statSize: libzip.cwrap(`zipstruct_stat_size`, `number`, [`number`]),
-        statCompSize: libzip.cwrap(`zipstruct_stat_comp_size`, `number`, [`number`]),
-        statCompMethod: libzip.cwrap(`zipstruct_stat_comp_method`, `number`, [`number`]),
-        statMtime: libzip.cwrap(`zipstruct_stat_mtime`, `number`, [`number`]),
-        statCrc: libzip.cwrap(`zipstruct_stat_crc`, `number`, [`number`]),
-        error: libzip.cwrap(`zipstruct_error`, `number`, []),
-        errorS: libzip.cwrap(`zipstruct_errorS`, `number`, []),
-        errorCodeZip: libzip.cwrap(`zipstruct_error_code_zip`, `number`, [`number`]),
+        stat: emZip.cwrap(`zipstruct_stat`, `number`, []),
+        statS: emZip.cwrap(`zipstruct_statS`, `number`, []),
+        statName: emZip.cwrap(`zipstruct_stat_name`, `string`, [`number`]),
+        statIndex: emZip.cwrap(`zipstruct_stat_index`, `number`, [`number`]),
+        statSize: emZip.cwrap(`zipstruct_stat_size`, `number`, [`number`]),
+        statCompSize: emZip.cwrap(`zipstruct_stat_comp_size`, `number`, [`number`]),
+        statCompMethod: emZip.cwrap(`zipstruct_stat_comp_method`, `number`, [`number`]),
+        statMtime: emZip.cwrap(`zipstruct_stat_mtime`, `number`, [`number`]),
+        statCrc: emZip.cwrap(`zipstruct_stat_crc`, `number`, [`number`]),
+        error: emZip.cwrap(`zipstruct_error`, `number`, []),
+        errorS: emZip.cwrap(`zipstruct_errorS`, `number`, []),
+        errorCodeZip: emZip.cwrap(`zipstruct_error_code_zip`, `number`, [`number`]),
     },
 });
 exports.makeInterface = makeInterface;

lib/sync.d.ts

 /// <reference types="emscripten" />
+export * from './common';
 export declare function getLibzipSync(): {
@@ -3,0 +4,0 @@ readonly HEAP8: Int8Array;

lib/sync.js

@@ -5,14 +5,17 @@ "use strict";
 const tslib_1 = require("tslib");
+const instance_1 = require("./instance");
 const libzipSync_1 = tslib_1.__importDefault(require("./libzipSync"));
 const makeInterface_1 = require("./makeInterface");
-let mod = null;
+tslib_1.__exportStar(require("./common"), exports);
+(0, instance_1.setFactory)(() => {
+    const emZip = (0, libzipSync_1.default)();
+    return (0, makeInterface_1.makeInterface)(emZip);
+});
 function getLibzipSync() {
-    if (mod === null)
-        mod = (0, makeInterface_1.makeInterface)((0, libzipSync_1.default)());
-    return mod;
+    return (0, instance_1.getInstance)();
 }
 exports.getLibzipSync = getLibzipSync;
 async function getLibzipPromise() {
-    return getLibzipSync();
+    return (0, instance_1.getInstance)();
 }
 exports.getLibzipPromise = getLibzipPromise;

package.json

 {
   "name": "@yarnpkg/libzip",
-  "version": "3.0.0-rc.18",
+  "version": "3.0.0-rc.20",
   "license": "BSD-2-Clause",
   "main": "./lib/sync.js",
   "browser": "./lib/async.js",
+  "exports": {
+    ".": {
+      "browser": "./lib/async.js",
+      "default": "./lib/sync.js"
+    },
+    "./package.json": "./package.json"
+  },
   "scripts": {
@@ -15,3 +22,10 @@ "build:libzip:wasm": "cd ./artifacts && ./build.sh",
     "main": "./lib/sync.js",
-    "browser": "./lib/async.js"
+    "browser": "./lib/async.js",
+    "exports": {
+      ".": {
+        "browser": "./lib/async.js",
+        "default": "./lib/sync.js"
+      },
+      "./package.json": "./package.json"
+    }
   },
@@ -32,4 +46,8 @@ "files": [
     "@types/emscripten": "^1.39.6",
+    "@yarnpkg/fslib": "^3.0.0-rc.20",
     "tslib": "^2.4.0"
   },
+  "peerDependencies": {
+    "@yarnpkg/fslib": "^3.0.0-rc.20"
+  },
   "engines": {
@@ -36,0 +54,0 @@ "node": ">=14.15.0"

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

861487

increased by10.67%

Number of package files

23

increased by76.92%

Lines of code

13392

increased by16.75%

Worsened metrics

Dependency count

4

increased by100%

Number of low supply chain risk alerts

7

increased by40%

Dependency changes

• + Added@yarnpkg/fslib@^3.0.0-rc.20

• + Added@yarnpkg/fslib@3.1.0(transitive)