@mrgrain/jsii-struct-builder - npm Package Compare versions

Comparing version 0.5.14 to 0.5.15

lib/private/assembly.js

@@ -7,12 +7,33 @@ "use strict";
 exports.findInterface = void 0;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = require("node:path");
 const spec_1 = require("@jsii/spec");
 const structured_clone_1 = __importDefault(require("@ungap/structured-clone"));
+const DOT_JSII = '.jsii';
 const assemblies = {};
 function assemblyPath(asm) {
-    return path_1.default.dirname(require.resolve(`${asm}/.jsii`));
+    return (0, node_path_1.dirname)(require.resolve((0, node_path_1.join)(asm, DOT_JSII)));
 }
+function loadAssemblyByName(asm) {
+    return loadAssemblyFromDirectory(asm, assemblyPath(asm));
+}
+function loadAssemblyFromDirectory(asm, dir) {
+    const assembly = (0, spec_1.loadAssemblyFromPath)(dir, false);
+    if (assembly.name !== asm) {
+        throw `jsii assembly ${asm} not found in ${(0, node_path_1.join)(dir, DOT_JSII)}, got: ${assembly.name}`;
+    }
+    return assembly;
+}
 function loadAssembly(asm) {
     if (!assemblies[asm]) {
-        assemblies[asm] = (0, spec_1.loadAssemblyFromPath)(assemblyPath(asm), false);
+        try {
+            assemblies[asm] = loadAssemblyByName(asm);
+        }
+        catch (error) {
+            try {
+                assemblies[asm] = loadAssemblyFromDirectory(asm, process.cwd());
+            }
+            catch (errorLocal) {
+                throw new AggregateError([error, errorLocal], `jsii assembly ${asm} not found`);
+            }
+        }
     }
@@ -26,3 +47,3 @@ return assemblies[asm];
     if (!candidate) {
-        throw `Type ${fqn} not found`;
+        throw `Type ${fqn} not found in jsii assembly ${asm}`;
     }
@@ -64,2 +85,2 @@ if ((candidate === null || candidate === void 0 ? void 0 : candidate.kind) !== spec_1.TypeKind.Interface) {
 exports.findInterface = findInterface;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzZW1ibHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJpdmF0ZS9hc3NlbWJseS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxnREFBd0I7QUFDeEIscUNBT29CO0FBQ3BCLCtFQUFzRDtBQUV0RCxNQUFNLFVBQVUsR0FBNkIsRUFBRSxDQUFDO0FBRWhELFNBQVMsWUFBWSxDQUFDLEdBQVc7SUFDL0IsT0FBTyxjQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUM7QUFDdkQsQ0FBQztBQUVELFNBQVMsWUFBWSxDQUFDLEdBQVc7SUFDL0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNwQixVQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBQSwyQkFBb0IsRUFBQyxZQUFZLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUM7S0FDbEU7SUFFRCxPQUFPLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUN6QixDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsR0FBVzs7SUFDaEMsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBRSxDQUFDLENBQUM7SUFFaEQsTUFBTSxTQUFTLEdBQUcsTUFBQSxHQUFHLENBQUMsS0FBSywwQ0FBRyxHQUFHLENBQUMsQ0FBQztJQUVuQyxJQUFJLENBQUMsU0FBUyxFQUFFO1FBQ2QsTUFBTSxRQUFRLEdBQUcsWUFBWSxDQUFDO0tBQy9CO0lBRUQsSUFBSSxDQUFBLFNBQVMsYUFBVCxTQUFTLHVCQUFULFNBQVMsQ0FBRSxJQUFJLE1BQUssZUFBUSxDQUFDLFNBQVMsRUFBRTtRQUMxQyxNQUFNLFlBQVksR0FBRyxpQ0FBaUMsU0FBUyxhQUFULFNBQVMsdUJBQVQsU0FBUyxDQUFFLElBQUksRUFBRSxDQUFDO0tBQ3pFO0lBRUQsT0FBTyxJQUFBLDBCQUFlLEVBQUMsU0FBUyxDQUFDLENBQUM7QUFDcEMsQ0FBQztBQUVELFNBQWdCLGFBQWEsQ0FDM0IsR0FBVyxFQUNYLGlCQUEwQixJQUFJOztJQUU5QixNQUFNLElBQUksR0FBRyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUM7SUFFaEMsSUFBSSxDQUFDLGNBQWMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUU7UUFDdkMsT0FBTyxJQUFJLENBQUM7S0FDYjtJQUVELE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFvQixDQUFDO0lBQzFDLE1BQU0sT0FBTyxHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO0lBRTFDLEtBQUssTUFBTSxNQUFNLElBQUksSUFBSSxDQUFDLFVBQVUsRUFBRTtRQUNwQyxNQUFNLFVBQVUsR0FBRyxhQUFhLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQy9DLE1BQUEsVUFBVSxDQUFDLFVBQVUsMENBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDbkMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLENBQUMsQ0FBQyxDQUFDO1FBQ0gsTUFBQSxVQUFVLENBQUMsT0FBTywwQ0FBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtZQUNoQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDekIsQ0FBQyxDQUFDLENBQUM7S0FDSjtJQUVELE1BQUEsSUFBSSxDQUFDLFVBQVUsMENBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7UUFDN0IsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ3ZCLENBQUMsQ0FBQyxDQUFDO0lBQ0gsTUFBQSxJQUFJLENBQUMsT0FBTywwQ0FBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRTtRQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDekIsQ0FBQyxDQUFDLENBQUM7SUFFSCxPQUFPO1FBQ0wsR0FBRyxJQUFJO1FBQ1AsT0FBTyxFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ3JDLFVBQVUsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQztLQUN2QyxDQUFDO0FBQ0osQ0FBQztBQW5DRCxzQ0FtQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCB7XG4gIEFzc2VtYmx5LFxuICBJbnRlcmZhY2VUeXBlLFxuICBsb2FkQXNzZW1ibHlGcm9tUGF0aCxcbiAgTWV0aG9kLFxuICBQcm9wZXJ0eSxcbiAgVHlwZUtpbmQsXG59IGZyb20gJ0Bqc2lpL3NwZWMnO1xuaW1wb3J0IHN0cnVjdHVyZWRDbG9uZSBmcm9tICdAdW5nYXAvc3RydWN0dXJlZC1jbG9uZSc7XG5cbmNvbnN0IGFzc2VtYmxpZXM6IFJlY29yZDxzdHJpbmcsIEFzc2VtYmx5PiA9IHt9O1xuXG5mdW5jdGlvbiBhc3NlbWJseVBhdGgoYXNtOiBzdHJpbmcpOiBzdHJpbmcge1xuICByZXR1cm4gcGF0aC5kaXJuYW1lKHJlcXVpcmUucmVzb2x2ZShgJHthc219Ly5qc2lpYCkpO1xufVxuXG5mdW5jdGlvbiBsb2FkQXNzZW1ibHkoYXNtOiBzdHJpbmcpOiBBc3NlbWJseSB7XG4gIGlmICghYXNzZW1ibGllc1thc21dKSB7XG4gICAgYXNzZW1ibGllc1thc21dID0gbG9hZEFzc2VtYmx5RnJvbVBhdGgoYXNzZW1ibHlQYXRoKGFzbSksIGZhbHNlKTtcbiAgfVxuXG4gIHJldHVybiBhc3NlbWJsaWVzW2FzbV07XG59XG5cbmZ1bmN0aW9uIGxvYWRJbnRlcmZhY2UoZnFuOiBzdHJpbmcpIHtcbiAgY29uc3QgYXNtID0gbG9hZEFzc2VtYmx5KGZxbi5zcGxpdCgnLicpLmF0KDApISk7XG5cbiAgY29uc3QgY2FuZGlkYXRlID0gYXNtLnR5cGVzPy5bZnFuXTtcblxuICBpZiAoIWNhbmRpZGF0ZSkge1xuICAgIHRocm93IGBUeXBlICR7ZnFufSBub3QgZm91bmRgO1xuICB9XG5cbiAgaWYgKGNhbmRpZGF0ZT8ua2luZCAhPT0gVHlwZUtpbmQuSW50ZXJmYWNlKSB7XG4gICAgdGhyb3cgYEV4cGVjdGVkICR7ZnFufSB0byBiZSBhbiBpbnRlcmZhY2UsIGJ1dCBnb3Q6ICR7Y2FuZGlkYXRlPy5raW5kfWA7XG4gIH1cblxuICByZXR1cm4gc3RydWN0dXJlZENsb25lKGNhbmRpZGF0ZSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmaW5kSW50ZXJmYWNlKFxuICBmcW46IHN0cmluZyxcbiAgbWVyZ2VJbmhlcml0ZWQ6IGJvb2xlYW4gPSB0cnVlLFxuKTogSW50ZXJmYWNlVHlwZSB7XG4gIGNvbnN0IHNwZWMgPSBsb2FkSW50ZXJmYWNlKGZxbik7XG5cbiAgaWYgKCFtZXJnZUluaGVyaXRlZCB8fCAhc3BlYy5pbnRlcmZhY2VzKSB7XG4gICAgcmV0dXJuIHNwZWM7XG4gIH1cblxuICBjb25zdCBwcm9wcyA9IG5ldyBNYXA8c3RyaW5nLCBQcm9wZXJ0eT4oKTtcbiAgY29uc3QgbWV0aG9kcyA9IG5ldyBNYXA8c3RyaW5nLCBNZXRob2Q+KCk7XG5cbiAgZm9yIChjb25zdCBwYXJlbnQgb2Ygc3BlYy5pbnRlcmZhY2VzKSB7XG4gICAgY29uc3QgcGFyZW50U3BlYyA9IGZpbmRJbnRlcmZhY2UocGFyZW50LCB0cnVlKTtcbiAgICBwYXJlbnRTcGVjLnByb3BlcnRpZXM/LmZvckVhY2goKHApID0+IHtcbiAgICAgIHByb3BzLnNldChwLm5hbWUsIHApO1xuICAgIH0pO1xuICAgIHBhcmVudFNwZWMubWV0aG9kcz8uZm9yRWFjaCgobSkgPT4ge1xuICAgICAgbWV0aG9kcy5zZXQobS5uYW1lLCBtKTtcbiAgICB9KTtcbiAgfVxuXG4gIHNwZWMucHJvcGVydGllcz8uZm9yRWFjaCgocCkgPT4ge1xuICAgIHByb3BzLnNldChwLm5hbWUsIHApO1xuICB9KTtcbiAgc3BlYy5tZXRob2RzPy5mb3JFYWNoKChtKSA9PiB7XG4gICAgbWV0aG9kcy5zZXQobS5uYW1lLCBtKTtcbiAgfSk7XG5cbiAgcmV0dXJuIHtcbiAgICAuLi5zcGVjLFxuICAgIG1ldGhvZHM6IEFycmF5LmZyb20obWV0aG9kcy52YWx1ZXMoKSksXG4gICAgcHJvcGVydGllczogQXJyYXkuZnJvbShwcm9wcy52YWx1ZXMoKSksXG4gIH07XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzZW1ibHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJpdmF0ZS9hc3NlbWJseS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx5Q0FBMEM7QUFDMUMscUNBT29CO0FBQ3BCLCtFQUFzRDtBQUV0RCxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUM7QUFFekIsTUFBTSxVQUFVLEdBQTZCLEVBQUUsQ0FBQztBQUVoRCxTQUFTLFlBQVksQ0FBQyxHQUFXO0lBQy9CLE9BQU8sSUFBQSxtQkFBTyxFQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBQSxnQkFBSSxFQUFDLEdBQUcsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDdkQsQ0FBQztBQUVELFNBQVMsa0JBQWtCLENBQUMsR0FBVztJQUNyQyxPQUFPLHlCQUF5QixDQUFDLEdBQUcsRUFBRSxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztBQUMzRCxDQUFDO0FBRUQsU0FBUyx5QkFBeUIsQ0FBQyxHQUFXLEVBQUUsR0FBVztJQUN6RCxNQUFNLFFBQVEsR0FBRyxJQUFBLDJCQUFvQixFQUFDLEdBQUcsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNsRCxJQUFJLFFBQVEsQ0FBQyxJQUFJLEtBQUssR0FBRyxFQUFFO1FBQ3pCLE1BQU0saUJBQWlCLEdBQUcsaUJBQWlCLElBQUEsZ0JBQUksRUFBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLFVBQVUsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO0tBQ3pGO0lBRUQsT0FBTyxRQUFRLENBQUM7QUFDbEIsQ0FBQztBQUVELFNBQVMsWUFBWSxDQUFDLEdBQVc7SUFDL0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNwQixJQUFJO1lBQ0YsVUFBVSxDQUFDLEdBQUcsQ0FBQyxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzNDO1FBQUMsT0FBTyxLQUFLLEVBQUU7WUFDZCxJ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QztLQUN2QyxDQUFDO0FBQ0osQ0FBQztBQW5DRCxzQ0FtQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkaXJuYW1lLCBqb2luIH0gZnJvbSAnbm9kZTpwYXRoJztcbmltcG9ydCB7XG4gIEFzc2VtYmx5LFxuICBJbnRlcmZhY2VUeXBlLFxuICBsb2FkQXNzZW1ibHlGcm9tUGF0aCxcbiAgTWV0aG9kLFxuICBQcm9wZXJ0eSxcbiAgVHlwZUtpbmQsXG59IGZyb20gJ0Bqc2lpL3NwZWMnO1xuaW1wb3J0IHN0cnVjdHVyZWRDbG9uZSBmcm9tICdAdW5nYXAvc3RydWN0dXJlZC1jbG9uZSc7XG5cbmNvbnN0IERPVF9KU0lJID0gJy5qc2lpJztcblxuY29uc3QgYXNzZW1ibGllczogUmVjb3JkPHN0cmluZywgQXNzZW1ibHk+ID0ge307XG5cbmZ1bmN0aW9uIGFzc2VtYmx5UGF0aChhc206IHN0cmluZyk6IHN0cmluZyB7XG4gIHJldHVybiBkaXJuYW1lKHJlcXVpcmUucmVzb2x2ZShqb2luKGFzbSwgRE9UX0pTSUkpKSk7XG59XG5cbmZ1bmN0aW9uIGxvYWRBc3NlbWJseUJ5TmFtZShhc206IHN0cmluZyk6IEFzc2VtYmx5IHtcbiAgcmV0dXJuIGxvYWRBc3NlbWJseUZyb21EaXJlY3RvcnkoYXNtLCBhc3NlbWJseVBhdGgoYXNtKSk7XG59XG5cbmZ1bmN0aW9uIGxvYWRBc3NlbWJseUZyb21EaXJlY3RvcnkoYXNtOiBzdHJpbmcsIGRpcjogc3RyaW5nKTogQXNzZW1ibHkge1xuICBjb25zdCBhc3NlbWJseSA9IGxvYWRBc3NlbWJseUZyb21QYXRoKGRpciwgZmFsc2UpO1xuICBpZiAoYXNzZW1ibHkubmFtZSAhPT0gYXNtKSB7XG4gICAgdGhyb3cgYGpzaWkgYXNzZW1ibHkgJHthc219IG5vdCBmb3VuZCBpbiAke2pvaW4oZGlyLCBET1RfSlNJSSl9LCBnb3Q6ICR7YXNzZW1ibHkubmFtZX1gO1xuICB9XG5cbiAgcmV0dXJuIGFzc2VtYmx5O1xufVxuXG5mdW5jdGlvbiBsb2FkQXNzZW1ibHkoYXNtOiBzdHJpbmcpOiBBc3NlbWJseSB7XG4gIGlmICghYXNzZW1ibGllc1thc21dKSB7XG4gICAgdHJ5IHtcbiAgICAgIGFzc2VtYmxpZXNbYXNtXSA9IGxvYWRBc3NlbWJseUJ5TmFtZShhc20pO1xuICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICB0cnkge1xuICAgICAgICBhc3NlbWJsaWVzW2FzbV0gPSBsb2FkQXNzZW1ibHlGcm9tRGlyZWN0b3J5KGFzbSwgcHJvY2Vzcy5jd2QoKSk7XG4gICAgICB9IGNhdGNoIChlcnJvckxvY2FsKSB7XG4gICAgICAgIHRocm93IG5ldyBBZ2dyZWdhdGVFcnJvcihbZXJyb3IsIGVycm9yTG9jYWxdLCBganNpaSBhc3NlbWJseSAke2FzbX0gbm90IGZvdW5kYCk7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIGFzc2VtYmxpZXNbYXNtXTtcbn1cblxuZnVuY3Rpb24gbG9hZEludGVyZmFjZShmcW46IHN0cmluZykge1xuICBjb25zdCBhc20gPSBsb2FkQXNzZW1ibHkoZnFuLnNwbGl0KCcuJykuYXQoMCkhKTtcblxuICBjb25zdCBjYW5kaWRhdGUgPSBhc20udHlwZXM/LltmcW5dO1xuXG4gIGlmICghY2FuZGlkYXRlKSB7XG4gICAgdGhyb3cgYFR5cGUgJHtmcW59IG5vdCBmb3VuZCBpbiBqc2lpIGFzc2VtYmx5ICR7YXNtfWA7XG4gIH1cblxuICBpZiAoY2FuZGlkYXRlPy5raW5kICE9PSBUeXBlS2luZC5JbnRlcmZhY2UpIHtcbiAgICB0aHJvdyBgRXhwZWN0ZWQgJHtmcW59IHRvIGJlIGFuIGludGVyZmFjZSwgYnV0IGdvdDogJHtjYW5kaWRhdGU/LmtpbmR9YDtcbiAgfVxuXG4gIHJldHVybiBzdHJ1Y3R1cmVkQ2xvbmUoY2FuZGlkYXRlKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGZpbmRJbnRlcmZhY2UoXG4gIGZxbjogc3RyaW5nLFxuICBtZXJnZUluaGVyaXRlZDogYm9vbGVhbiA9IHRydWUsXG4pOiBJbnRlcmZhY2VUeXBlIHtcbiAgY29uc3Qgc3BlYyA9IGxvYWRJbnRlcmZhY2UoZnFuKTtcblxuICBpZiAoIW1lcmdlSW5oZXJpdGVkIHx8ICFzcGVjLmludGVyZmFjZXMpIHtcbiAgICByZXR1cm4gc3BlYztcbiAgfVxuXG4gIGNvbnN0IHByb3BzID0gbmV3IE1hcDxzdHJpbmcsIFByb3BlcnR5PigpO1xuICBjb25zdCBtZXRob2RzID0gbmV3IE1hcDxzdHJpbmcsIE1ldGhvZD4oKTtcblxuICBmb3IgKGNvbnN0IHBhcmVudCBvZiBzcGVjLmludGVyZmFjZXMpIHtcbiAgICBjb25zdCBwYXJlbnRTcGVjID0gZmluZEludGVyZmFjZShwYXJlbnQsIHRydWUpO1xuICAgIHBhcmVudFNwZWMucHJvcGVydGllcz8uZm9yRWFjaCgocCkgPT4ge1xuICAgICAgcHJvcHMuc2V0KHAubmFtZSwgcCk7XG4gICAgfSk7XG4gICAgcGFyZW50U3BlYy5tZXRob2RzPy5mb3JFYWNoKChtKSA9PiB7XG4gICAgICBtZXRob2RzLnNldChtLm5hbWUsIG0pO1xuICAgIH0pO1xuICB9XG5cbiAgc3BlYy5wcm9wZXJ0aWVzPy5mb3JFYWNoKChwKSA9PiB7XG4gICAgcHJvcHMuc2V0KHAubmFtZSwgcCk7XG4gIH0pO1xuICBzcGVjLm1ldGhvZHM/LmZvckVhY2goKG0pID0+IHtcbiAgICBtZXRob2RzLnNldChtLm5hbWUsIG0pO1xuICB9KTtcblxuICByZXR1cm4ge1xuICAgIC4uLnNwZWMsXG4gICAgbWV0aG9kczogQXJyYXkuZnJvbShtZXRob2RzLnZhbHVlcygpKSxcbiAgICBwcm9wZXJ0aWVzOiBBcnJheS5mcm9tKHByb3BzLnZhbHVlcygpKSxcbiAgfTtcbn1cbiJdfQ==

package.json

@@ -68,3 +68,3 @@ {
   },
-  "version": "0.5.14",
+  "version": "0.5.15",
   "jest": {
@@ -71,0 +71,0 @@ "testMatch": [

New alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Fixed alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

118429

increased by2.21%

Lines of code

999

increased by2.15%

No dependency changes