piral-core 1.6.1 → 1.6.2-beta.7393

package/lib/codegen.js

@@ -865,13 +865,13 @@ var require_CachedInputFileSystem = __commonJS({
             callback = options;
             options = void 0;
           }
+          if (typeof path !== "string" && !Buffer.isBuffer(path) && !(path instanceof URL) && typeof path !== "number") {
+            callback(new TypeError("path must be a string, Buffer, URL or number"));
+            return;
+          }
           if (options) {
             return this._provider.call(this._providerContext, path, options, callback);
           }
-          if (typeof path !== "string") {
-            callback(new TypeError("path must be a string"));
-            return;
-          }
           let callbacks = this._activeAsyncOperations.get(path);
           if (callbacks) {
             callbacks.push(callback);
@@ -921,68 +921,70 @@ var require_CachedInputFileSystem = __commonJS({
           callback = options;
           options = void 0;
         }
-        if (typeof path !== "string") {
-          callback(new TypeError("path must be a string"));
+        if (typeof path !== "string" && !Buffer.isBuffer(path) && !(path instanceof URL) && typeof path !== "number") {
+          callback(new TypeError("path must be a string, Buffer, URL or number"));
           return;
         }
+        const strPath = typeof path !== "string" ? path.toString() : path;
         if (options) {
           return this._provider.call(this._providerContext, path, options, callback);
         }
         if (this._mode === STORAGE_MODE_SYNC) {
           this._enterAsyncMode();
         }
-        let cacheEntry = this._data.get(path);
+        let cacheEntry = this._data.get(strPath);
         if (cacheEntry !== void 0) {
           if (cacheEntry.err)
             return nextTick(callback, cacheEntry.err);
           return nextTick(callback, null, cacheEntry.result);
         }
-        let callbacks = this._activeAsyncOperations.get(path);
+        let callbacks = this._activeAsyncOperations.get(strPath);
         if (callbacks !== void 0) {
           callbacks.push(callback);
           return;
         }
-        this._activeAsyncOperations.set(path, callbacks = [callback]);
+        this._activeAsyncOperations.set(strPath, callbacks = [callback]);
         this._provider.call(this._providerContext, path, (err, result) => {
-          this._activeAsyncOperations.delete(path);
-          this._storeResult(path, err, result);
+          this._activeAsyncOperations.delete(strPath);
+          this._storeResult(strPath, err, result);
           this._enterAsyncMode();
           runCallbacks(callbacks, err, result);
         });
       }
       provideSync(path, options) {
-        if (typeof path !== "string") {
+        if (typeof path !== "string" && !Buffer.isBuffer(path) && !(path instanceof URL) && typeof path !== "number") {
           throw new TypeError("path must be a string");
         }
+        const strPath = typeof path !== "string" ? path.toString() : path;
         if (options) {
           return this._syncProvider.call(this._providerContext, path, options);
         }
         if (this._mode === STORAGE_MODE_SYNC) {
           this._runDecays();
         }
-        let cacheEntry = this._data.get(path);
+        let cacheEntry = this._data.get(strPath);
         if (cacheEntry !== void 0) {
           if (cacheEntry.err)
             throw cacheEntry.err;
           return cacheEntry.result;
         }
-        const callbacks = this._activeAsyncOperations.get(path);
-        this._activeAsyncOperations.delete(path);
+        const callbacks = this._activeAsyncOperations.get(strPath);
+        this._activeAsyncOperations.delete(strPath);
         let result;
         try {
           result = this._syncProvider.call(this._providerContext, path);
         } catch (err) {
-          this._storeResult(path, err, void 0);
+          this._storeResult(strPath, err, void 0);
           this._enterSyncModeWhenIdle();
           if (callbacks) {
             runCallbacks(callbacks, err, void 0);
           }
           throw err;
         }
-        this._storeResult(path, void 0, result);
+        this._storeResult(strPath, null, result);
         this._enterSyncModeWhenIdle();
         if (callbacks) {
-          runCallbacks(callbacks, void 0, result);
+          runCallbacks(callbacks, null, result);
         }
         return result;
       }
@@ -995,9 +997,10 @@ var require_CachedInputFileSystem = __commonJS({
             }
             this._enterIdleMode();
           }
-        } else if (typeof what === "string") {
+        } else if (typeof what === "string" || Buffer.isBuffer(what) || what instanceof URL || typeof what === "number") {
+          const strWhat = typeof what !== "string" ? what.toString() : what;
           for (let [key, data] of this._data) {
-            if (key.startsWith(what)) {
+            if (key.startsWith(strWhat)) {
               this._data.delete(key);
               data.level.delete(key);
             }
@@ -1008,7 +1011,8 @@ var require_CachedInputFileSystem = __commonJS({
         } else {
           for (let [key, data] of this._data) {
             for (const item of what) {
-              if (key.startsWith(item)) {
+              const strItem = typeof item !== "string" ? item.toString() : item;
+              if (key.startsWith(strItem)) {
                 this._data.delete(key);
                 data.level.delete(key);
                 break;
@@ -1023,12 +1027,14 @@ var require_CachedInputFileSystem = __commonJS({
       purgeParent(what) {
         if (!what) {
           this.purge();
-        } else if (typeof what === "string") {
-          this.purge(dirname2(what));
+        } else if (typeof what === "string" || Buffer.isBuffer(what) || what instanceof URL || typeof what === "number") {
+          const strWhat = typeof what !== "string" ? what.toString() : what;
+          this.purge(dirname2(strWhat));
         } else {
           const set = new Set();
           for (const item of what) {
-            set.add(dirname2(item));
+            const strItem = typeof item !== "string" ? item.toString() : item;
+            set.add(dirname2(strItem));
           }
           this.purge(set);
         }
@@ -1154,6 +1160,11 @@ var require_CachedInputFileSystem = __commonJS({
         this.readlink = readlink;
         const readlinkSync = this._readlinkBackend.provideSync;
         this.readlinkSync = readlinkSync;
+        this._realpathBackend = createBackend(duration, this.fileSystem.realpath, this.fileSystem.realpathSync, this.fileSystem);
+        const realpath = this._realpathBackend.provide;
+        this.realpath = realpath;
+        const realpathSync = this._realpathBackend.provideSync;
+        this.realpathSync = realpathSync;
       }
       purge(what) {
         this._statBackend.purge(what);
@@ -1162,6 +1173,7 @@ var require_CachedInputFileSystem = __commonJS({
         this._readFileBackend.purge(what);
         this._readlinkBackend.purge(what);
         this._readJsonBackend.purge(what);
+        this._realpathBackend.purge(what);
       }
     };
   }
@@ -2413,6 +2425,10 @@ var require_path = __commonJS({
       Internal: 5
     });
     exports.PathType = PathType;
+    var invalidSegmentRegEx = /(^|\\|\/)((\.|%2e)(\.|%2e)?|(n|%6e|%4e)(o|%6f|%4f)(d|%64|%44)(e|%65|%45)(_|%5f)(m|%6d|%4d)(o|%6f|%4f)(d|%64|%44)(u|%75|%55)(l|%6c|%4c)(e|%65|%45)(s|%73|%53))?(\\|\/|$)/i;
+    exports.invalidSegmentRegEx = invalidSegmentRegEx;
+    var deprecatedInvalidSegmentRegEx = /(^|\\|\/)((\.|%2e)(\.|%2e)?|(n|%6e|%4e)(o|%6f|%4f)(d|%64|%44)(e|%65|%45)(_|%5f)(m|%6d|%4d)(o|%6f|%4f)(d|%64|%44)(u|%75|%55)(l|%6c|%4c)(e|%65|%45)(s|%73|%53))(\\|\/|$)/i;
+    exports.deprecatedInvalidSegmentRegEx = deprecatedInvalidSegmentRegEx;
     var getType = (p) => {
       switch (p.length) {
         case 0:
@@ -2545,30 +2561,6 @@ var require_path = __commonJS({
       return cacheEntry;
     };
     exports.cachedJoin = cachedJoin;
-    var checkImportsExportsFieldTarget = (relativePath) => {
-      let lastNonSlashIndex = 0;
-      let slashIndex = relativePath.indexOf("/", 1);
-      let cd = 0;
-      while (slashIndex !== -1) {
-        const folder = relativePath.slice(lastNonSlashIndex, slashIndex);
-        switch (folder) {
-          case "..": {
-            cd--;
-            if (cd < 0)
-              return new Error(`Trying to access out of package scope. Requesting ${relativePath}`);
-            break;
-          }
-          case ".":
-            break;
-          default:
-            cd++;
-            break;
-        }
-        lastNonSlashIndex = slashIndex + 1;
-        slashIndex = relativePath.indexOf("/", lastNonSlashIndex);
-      }
-    };
-    exports.checkImportsExportsFieldTarget = checkImportsExportsFieldTarget;
   }
 });
 
@@ -2772,7 +2764,8 @@ var require_Resolver = __commonJS({
           }
           newStack.add(stackEntry);
         } else {
-          newStack = new Set([stackEntry]);
+          newStack = new Set();
+          newStack.add(stackEntry);
         }
         this.hooks.resolveStep.call(hook, request);
         if (hook.isUsed()) {
@@ -2852,7 +2845,7 @@ var require_SyncAsyncFileSystemDecorator = __commonJS({
         this.lstat = (arg, options, callback) => {
           let result;
           try {
-            result = lstatSync.call(fs2, arg);
+            result = callback ? lstatSync.call(fs2, arg, options) : lstatSync.call(fs2, arg);
           } catch (e) {
             return (callback || options)(e);
           }
@@ -2873,7 +2866,7 @@ var require_SyncAsyncFileSystemDecorator = __commonJS({
       this.readdir = (arg, options, callback) => {
         let result;
         try {
-          result = fs2.readdirSync(arg);
+          result = callback ? fs2.readdirSync(arg, options) : fs2.readdirSync(arg);
         } catch (e) {
           return (callback || options)(e);
         }
@@ -2883,7 +2876,7 @@ var require_SyncAsyncFileSystemDecorator = __commonJS({
       this.readFile = (arg, options, callback) => {
         let result;
         try {
-          result = fs2.readFileSync(arg);
+          result = callback ? fs2.readFileSync(arg, options) : fs2.readFileSync(arg);
         } catch (e) {
           return (callback || options)(e);
         }
@@ -2893,7 +2886,7 @@ var require_SyncAsyncFileSystemDecorator = __commonJS({
       this.readlink = (arg, options, callback) => {
         let result;
         try {
-          result = fs2.readlinkSync(arg);
+          result = callback ? fs2.readlinkSync(arg, options) : fs2.readlinkSync(arg);
         } catch (e) {
           return (callback || options)(e);
         }
@@ -2904,16 +2897,31 @@ var require_SyncAsyncFileSystemDecorator = __commonJS({
       this.readJsonSync = void 0;
       const readJsonSync = fs2.readJsonSync;
       if (readJsonSync) {
-        this.readJson = (arg, options, callback) => {
+        this.readJson = (arg, callback) => {
           let result;
           try {
             result = readJsonSync.call(fs2, arg);
+          } catch (e) {
+            return callback(e);
+          }
+          callback(null, result);
+        };
+        this.readJsonSync = (arg) => readJsonSync.call(fs2, arg);
+      }
+      this.realpath = void 0;
+      this.realpathSync = void 0;
+      const realpathSync = fs2.realpathSync;
+      if (realpathSync) {
+        this.realpath = (arg, options, callback) => {
+          let result;
+          try {
+            result = callback ? realpathSync.call(fs2, arg, options) : realpathSync.call(fs2, arg);
           } catch (e) {
             return (callback || options)(e);
           }
           (callback || options)(null, result);
         };
-        this.readJsonSync = (arg, options) => readJsonSync.call(fs2, arg, options);
+        this.realpathSync = (arg, options) => realpathSync.call(fs2, arg, options);
       }
     }
     module2.exports = SyncAsyncFileSystemDecorator;
@@ -2932,7 +2940,7 @@ var require_forEachBail = __commonJS({
         let loop = void 0;
         iterator(array[i++], (err, result) => {
           if (err || result !== void 0 || i >= array.length) {
-            return callback(err, result);
+            return callback(err, result, i);
           }
           if (loop === false)
             while (next())
@@ -3398,6 +3406,7 @@ var require_DirectoryExistsPlugin = __commonJS({
 var require_entrypoints = __commonJS({
   "../../../node_modules/enhanced-resolve/lib/util/entrypoints.js"(exports, module2) {
     "use strict";
+    var { parseIdentifier } = require_identifier();
     var slashCode = "/".charCodeAt(0);
     var dotCode = ".".charCodeAt(0);
     var hashCode = "#".charCodeAt(0);
@@ -3406,24 +3415,27 @@ var require_entrypoints = __commonJS({
       return createFieldProcessor(buildExportsField(exportsField), (request) => request.length === 0 ? "." : "./" + request, assertExportsFieldRequest, assertExportTarget);
     };
     module2.exports.processImportsField = function processImportsField(importsField) {
-      return createFieldProcessor(buildImportsField(importsField), (request) => "#" + request, assertImportsFieldRequest, assertImportTarget);
+      return createFieldProcessor(importsField, (request) => "#" + request, assertImportsFieldRequest, assertImportTarget);
     };
     function createFieldProcessor(field, normalizeRequest, assertRequest, assertTarget) {
       return function fieldProcessor(request, conditionNames) {
         request = assertRequest(request);
         const match = findMatch(normalizeRequest(request), field);
         if (match === null)
-          return [];
-        const [mapping, remainingRequest, isSubpathMapping, isPattern] = match;
+          return [[], null];
+        const [mapping, remainingRequest, isSubpathMapping, isPattern, usedField] = match;
         let direct = null;
         if (isConditionalMapping(mapping)) {
           direct = conditionalMapping(mapping, conditionNames);
           if (direct === null)
-            return [];
+            return [[], null];
         } else {
           direct = mapping;
         }
-        return directMapping(remainingRequest, isPattern, isSubpathMapping, direct, conditionNames, assertTarget);
+        return [
+          directMapping(remainingRequest, isPattern, isSubpathMapping, direct, conditionNames, assertTarget),
+          usedField
+        ];
       };
     }
     function assertExportsFieldRequest(request) {
@@ -3456,16 +3468,23 @@ var require_entrypoints = __commonJS({
       return request.slice(1);
     }
     function assertExportTarget(exp, expectFolder) {
-      if (exp.charCodeAt(0) === slashCode || exp.charCodeAt(0) === dotCode && exp.charCodeAt(1) !== slashCode) {
-        throw new Error(`Export should be relative path and start with "./", got ${JSON.stringify(exp)}.`);
+      const parsedIdentifier = parseIdentifier(exp);
+      if (!parsedIdentifier) {
+        return;
       }
-      const isFolder = exp.charCodeAt(exp.length - 1) === slashCode;
+      const [relativePath] = parsedIdentifier;
+      const isFolder = relativePath.charCodeAt(relativePath.length - 1) === slashCode;
       if (isFolder !== expectFolder) {
         throw new Error(expectFolder ? `Expecting folder to folder mapping. ${JSON.stringify(exp)} should end with "/"` : `Expecting file to file mapping. ${JSON.stringify(exp)} should not end with "/"`);
       }
     }
     function assertImportTarget(imp, expectFolder) {
-      const isFolder = imp.charCodeAt(imp.length - 1) === slashCode;
+      const parsedIdentifier = parseIdentifier(imp);
+      if (!parsedIdentifier) {
+        return;
+      }
+      const [relativePath] = parsedIdentifier;
+      const isFolder = relativePath.charCodeAt(relativePath.length - 1) === slashCode;
       if (isFolder !== expectFolder) {
         throw new Error(expectFolder ? `Expecting folder to folder mapping. ${JSON.stringify(imp)} should end with "/"` : `Expecting file to file mapping. ${JSON.stringify(imp)} should not end with "/"`);
       }
@@ -3492,7 +3511,7 @@ var require_entrypoints = __commonJS({
     function findMatch(request, field) {
       if (Object.prototype.hasOwnProperty.call(field, request) && !request.includes("*") && !request.endsWith("/")) {
         const target2 = field[request];
-        return [target2, "", false, false];
+        return [target2, "", false, false, request];
       }
       let bestMatch = "";
       let bestMatchSubpath;
@@ -3520,7 +3539,8 @@ var require_entrypoints = __commonJS({
         target,
         bestMatchSubpath,
         isSubpathMapping,
-        isPattern
+        isPattern,
+        bestMatch
       ];
     }
     function isConditionalMapping(mapping) {
@@ -3571,14 +3591,9 @@ var require_entrypoints = __commonJS({
       loop:
         while (lookup.length > 0) {
           const [mapping, conditions, j] = lookup[lookup.length - 1];
-          const last = conditions.length - 1;
           for (let i = j; i < conditions.length; i++) {
             const condition = conditions[i];
-            if (i !== last) {
-              if (condition === "default") {
-                throw new Error("Default condition should be last one");
-              }
-            } else if (condition === "default") {
+            if (condition === "default") {
               const innerMapping = mapping[condition];
               if (isConditionalMapping(innerMapping)) {
                 const conditionalMapping2 = innerMapping;
@@ -3632,22 +3647,6 @@ var require_entrypoints = __commonJS({
       }
       return field;
     }
-    function buildImportsField(field) {
-      const keys = Object.keys(field);
-      for (let i = 0; i < keys.length; i++) {
-        const key = keys[i];
-        if (key.charCodeAt(0) !== hashCode) {
-          throw new Error(`Imports field key should start with "#" (key: ${JSON.stringify(key)})`);
-        }
-        if (key.length === 1) {
-          throw new Error(`Imports field key should have at least 2 characters (key: ${JSON.stringify(key)})`);
-        }
-        if (key.charCodeAt(1) === slashCode) {
-          throw new Error(`Imports field key should not start with "#/" (key: ${JSON.stringify(key)})`);
-        }
-      }
-      return field;
-    }
   }
 });
 
@@ -3655,12 +3654,14 @@ var require_entrypoints = __commonJS({
 var require_ExportsFieldPlugin = __commonJS({
   "../../../node_modules/enhanced-resolve/lib/ExportsFieldPlugin.js"(exports, module2) {
     "use strict";
-    var path = require("path");
     var DescriptionFileUtils = require_DescriptionFileUtils();
     var forEachBail = require_forEachBail();
     var { processExportsField } = require_entrypoints();
     var { parseIdentifier } = require_identifier();
-    var { checkImportsExportsFieldTarget } = require_path();
+    var {
+      invalidSegmentRegEx,
+      deprecatedInvalidSegmentRegEx
+    } = require_path();
     module2.exports = class ExportsFieldPlugin {
       constructor(source, conditionNames, fieldNamePath, target) {
         this.source = source;
@@ -3684,13 +3685,14 @@ var require_ExportsFieldPlugin = __commonJS({
             return callback(new Error(`Resolving to directories is not possible with the exports field (request was ${remainingRequest}/)`));
           }
           let paths;
+          let usedField;
           try {
             let fieldProcessor = this.fieldProcessorCache.get(request.descriptionFileData);
             if (fieldProcessor === void 0) {
               fieldProcessor = processExportsField(exportsField);
               this.fieldProcessorCache.set(request.descriptionFileData, fieldProcessor);
             }
-            paths = fieldProcessor(remainingRequest, this.conditionNames);
+            [paths, usedField] = fieldProcessor(remainingRequest, this.conditionNames);
           } catch (err) {
             if (resolveContext.log) {
               resolveContext.log(`Exports field in ${request.descriptionFilePath} can't be processed: ${err}`);
@@ -3700,24 +3702,38 @@ var require_ExportsFieldPlugin = __commonJS({
           if (paths.length === 0) {
             return callback(new Error(`Package path ${remainingRequest} is not exported from package ${request.descriptionFileRoot} (see exports field in ${request.descriptionFilePath})`));
           }
-          forEachBail(paths, (p, callback2) => {
+          forEachBail(paths, (p, callback2, i) => {
             const parsedIdentifier = parseIdentifier(p);
             if (!parsedIdentifier)
               return callback2();
             const [relativePath, query, fragment] = parsedIdentifier;
-            const error = checkImportsExportsFieldTarget(relativePath);
-            if (error) {
-              return callback2(error);
+            if (relativePath.length === 0 || !relativePath.startsWith("./")) {
+              if (paths.length === i) {
+                return callback2(new Error(`Invalid "exports" target "${p}" defined for "${usedField}" in the package config ${request.descriptionFilePath}, targets must start with "./"`));
+              }
+              return callback2();
+            }
+            if (invalidSegmentRegEx.exec(relativePath.slice(2)) !== null && deprecatedInvalidSegmentRegEx.test(relativePath.slice(2)) !== null) {
+              if (paths.length === i) {
+                return callback2(new Error(`Invalid "exports" target "${p}" defined for "${usedField}" in the package config ${request.descriptionFilePath}, targets must start with "./"`));
+              }
+              return callback2();
             }
             const obj = {
               ...request,
               request: void 0,
-              path: path.join(request.descriptionFileRoot, relativePath),
+              path: resolver.join(request.descriptionFileRoot, relativePath),
               relativePath,
               query,
               fragment
             };
-            resolver.doResolve(target, obj, "using exports field: " + p, resolveContext, callback2);
+            resolver.doResolve(target, obj, "using exports field: " + p, resolveContext, (err, result) => {
+              if (err)
+                return callback2(err);
+              if (result === void 0)
+                return callback2(null, null);
+              callback2(null, result);
+            });
           }, (err, result) => callback(err, result || null));
         });
       }
@@ -3829,12 +3845,14 @@ var require_FileExistsPlugin = __commonJS({
 var require_ImportsFieldPlugin = __commonJS({
   "../../../node_modules/enhanced-resolve/lib/ImportsFieldPlugin.js"(exports, module2) {
     "use strict";
-    var path = require("path");
     var DescriptionFileUtils = require_DescriptionFileUtils();
     var forEachBail = require_forEachBail();
     var { processImportsField } = require_entrypoints();
     var { parseIdentifier } = require_identifier();
-    var { checkImportsExportsFieldTarget } = require_path();
+    var {
+      invalidSegmentRegEx,
+      deprecatedInvalidSegmentRegEx
+    } = require_path();
     var dotCode = ".".charCodeAt(0);
     module2.exports = class ImportsFieldPlugin {
       constructor(source, conditionNames, fieldNamePath, targetFile, targetPackage) {
@@ -3860,13 +3878,14 @@ var require_ImportsFieldPlugin = __commonJS({
             return callback(new Error(`Resolving to directories is not possible with the imports field (request was ${remainingRequest}/)`));
           }
           let paths;
+          let usedField;
           try {
             let fieldProcessor = this.fieldProcessorCache.get(request.descriptionFileData);
             if (fieldProcessor === void 0) {
               fieldProcessor = processImportsField(importsField);
               this.fieldProcessorCache.set(request.descriptionFileData, fieldProcessor);
             }
-            paths = fieldProcessor(remainingRequest, this.conditionNames);
+            [paths, usedField] = fieldProcessor(remainingRequest, this.conditionNames);
           } catch (err) {
             if (resolveContext.log) {
               resolveContext.log(`Imports field in ${request.descriptionFilePath} can't be processed: ${err}`);
@@ -3876,26 +3895,34 @@ var require_ImportsFieldPlugin = __commonJS({
           if (paths.length === 0) {
             return callback(new Error(`Package import ${remainingRequest} is not imported from package ${request.descriptionFileRoot} (see imports field in ${request.descriptionFilePath})`));
           }
-          forEachBail(paths, (p, callback2) => {
+          forEachBail(paths, (p, callback2, i) => {
             const parsedIdentifier = parseIdentifier(p);
             if (!parsedIdentifier)
               return callback2();
             const [path_, query, fragment] = parsedIdentifier;
-            const error = checkImportsExportsFieldTarget(path_);
-            if (error) {
-              return callback2(error);
-            }
             switch (path_.charCodeAt(0)) {
               case dotCode: {
+                if (invalidSegmentRegEx.exec(path_.slice(2)) !== null && deprecatedInvalidSegmentRegEx.test(path_.slice(2)) !== null) {
+                  if (paths.length === i) {
+                    return callback2(new Error(`Invalid "imports" target "${p}" defined for "${usedField}" in the package config ${request.descriptionFilePath}, targets must start with "./"`));
+                  }
+                  return callback2();
+                }
                 const obj = {
                   ...request,
                   request: void 0,
-                  path: path.join(request.descriptionFileRoot, path_),
+                  path: resolver.join(request.descriptionFileRoot, path_),
                   relativePath: path_,
                   query,
                   fragment
                 };
-                resolver.doResolve(targetFile, obj, "using imports field: " + p, resolveContext, callback2);
+                resolver.doResolve(targetFile, obj, "using imports field: " + p, resolveContext, (err, result) => {
+                  if (err)
+                    return callback2(err);
+                  if (result === void 0)
+                    return callback2(null, null);
+                  callback2(null, result);
+                });
                 break;
               }
               default: {
@@ -3907,7 +3934,13 @@ var require_ImportsFieldPlugin = __commonJS({
                   query,
                   fragment
                 };
-                resolver.doResolve(targetPackage, obj, "using imports field: " + p, resolveContext, callback2);
+                resolver.doResolve(targetPackage, obj, "using imports field: " + p, resolveContext, (err, result) => {
+                  if (err)
+                    return callback2(err);
+                  if (result === void 0)
+                    return callback2(null, null);
+                  callback2(null, result);
+                });
               }
             }
           }, (err, result) => callback(err, result || null));
@@ -4212,13 +4245,15 @@ var require_PnpPlugin = __commonJS({
   "../../../node_modules/enhanced-resolve/lib/PnpPlugin.js"(exports, module2) {
     "use strict";
     module2.exports = class PnpPlugin {
-      constructor(source, pnpApi, target) {
+      constructor(source, pnpApi, target, alternateTarget) {
         this.source = source;
         this.pnpApi = pnpApi;
         this.target = target;
+        this.alternateTarget = alternateTarget;
       }
       apply(resolver) {
         const target = resolver.ensureHook(this.target);
+        const alternateTarget = resolver.ensureHook(this.alternateTarget);
         resolver.getHook(this.source).tapAsync("PnpPlugin", (request, resolveContext, callback) => {
           const req = request.request;
           if (!req)
@@ -4235,6 +4270,16 @@ var require_PnpPlugin = __commonJS({
             resolution = this.pnpApi.resolveToUnqualified(packageName, issuer, {
               considerBuiltins: false
             });
+            if (resolution === null) {
+              resolver.doResolve(alternateTarget, request, "issuer is not managed by a pnpapi", resolveContext, (err, result) => {
+                if (err)
+                  return callback(err);
+                if (result)
+                  return callback(null, result);
+                return callback(null, null);
+              });
+              return;
+            }
             if (resolveContext.fileDependencies) {
               apiResolution = this.pnpApi.resolveToUnqualified("pnpapi", issuer, {
                 considerBuiltins: false
@@ -4643,7 +4688,18 @@ var require_ResolverFactory = __commonJS({
     var UseFilePlugin = require_UseFilePlugin();
     function processPnpApiOption(option) {
       if (option === void 0 && versions.pnp) {
-        return require("pnpapi");
+        const _findPnpApi = require("module").findPnpApi;
+        if (_findPnpApi) {
+          return {
+            resolveToUnqualified(request, issuer, opts) {
+              const pnpapi = _findPnpApi(issuer);
+              if (!pnpapi) {
+                return null;
+              }
+              return pnpapi.resolveToUnqualified(request, issuer, opts);
+            }
+          };
+        }
       }
       return option || null;
     }
@@ -4758,6 +4814,7 @@ var require_ResolverFactory = __commonJS({
       resolver.ensureHook("normalResolve");
       resolver.ensureHook("internal");
       resolver.ensureHook("rawModule");
+      resolver.ensureHook("alternateRawModule");
       resolver.ensureHook("module");
       resolver.ensureHook("resolveAsModule");
       resolver.ensureHook("undescribedResolveInPackage");
@@ -4824,7 +4881,8 @@ var require_ResolverFactory = __commonJS({
         if (Array.isArray(item)) {
           if (item.includes("node_modules") && pnpApi) {
             plugins.push(new ModulesInHierarchicalDirectoriesPlugin("raw-module", item.filter((i) => i !== "node_modules"), "module"));
-            plugins.push(new PnpPlugin("raw-module", pnpApi, "undescribed-resolve-in-package"));
+            plugins.push(new PnpPlugin("raw-module", pnpApi, "undescribed-resolve-in-package", "alternate-raw-module"));
+            plugins.push(new ModulesInHierarchicalDirectoriesPlugin("alternate-raw-module", ["node_modules"], "module"));
           } else {
             plugins.push(new ModulesInHierarchicalDirectoriesPlugin("raw-module", item, "module"));
           }

package/lib/utils/routes.js

@@ -1,5 +1,103 @@
-import ptr from 'path-to-regexp';
+const defaultDelimiter = escapeString('/');
+const pathExpr = new RegExp([
+    '(\\\\.)',
+    '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))',
+].join('|'), 'g');
+function escapeString(str) {
+    return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1');
+}
+function escapeGroup(group) {
+    return group.replace(/([=!:$\/()])/g, '\\$1');
+}
+function parse(str) {
+    const tokens = [];
+    let key = 0;
+    let index = 0;
+    let path = '';
+    let res;
+    while ((res = pathExpr.exec(str)) !== null) {
+        const m = res[0];
+        const escaped = res[1];
+        const offset = res.index;
+        path += str.slice(index, offset);
+        index = offset + m.length;
+        // Ignore already escaped sequences.
+        if (escaped) {
+            path += escaped[1];
+            continue;
+        }
+        const next = str[index];
+        const prefix = res[2];
+        const name = res[3];
+        const capture = res[4];
+        const group = res[5];
+        const modifier = res[6];
+        const asterisk = res[7];
+        // Push the current path onto the tokens.
+        if (path) {
+            tokens.push(path);
+            path = '';
+        }
+        const partial = prefix != null && next != null && next !== prefix;
+        const repeat = modifier === '+' || modifier === '*';
+        const optional = modifier === '?' || modifier === '*';
+        const delimiter = res[2] || '/';
+        const pattern = capture || group;
+        tokens.push({
+            name: name || `${key++}`,
+            prefix: prefix || '',
+            delimiter,
+            optional,
+            repeat,
+            partial,
+            asterisk: !!asterisk,
+            pattern: pattern ? escapeGroup(pattern) : asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?',
+        });
+    }
+    // Match any characters still remaining.
+    if (index < str.length) {
+        path += str.substring(index);
+    }
+    // If the path exists, push it onto the end.
+    if (path) {
+        tokens.push(path);
+    }
+    return tokens;
+}
+function tokensToRegExp(tokens) {
+    let route = '';
+    for (const token of tokens) {
+        if (typeof token === 'string') {
+            route += escapeString(token);
+        }
+        else {
+            const prefix = escapeString(token.prefix);
+            let capture = '(?:' + token.pattern + ')';
+            if (token.repeat) {
+                capture += '(?:' + prefix + capture + ')*';
+            }
+            if (token.optional) {
+                if (!token.partial) {
+                    capture = '(?:' + prefix + '(' + capture + '))?';
+                }
+                else {
+                    capture = prefix + '(' + capture + ')?';
+                }
+            }
+            else {
+                capture = prefix + '(' + capture + ')';
+            }
+            route += capture;
+        }
+    }
+    const endsWithDelimiter = route.slice(-defaultDelimiter.length) === defaultDelimiter;
+    const path = endsWithDelimiter ? route.slice(0, -defaultDelimiter.length) : route;
+    return new RegExp(`^${path}(?:${defaultDelimiter}(?=$))?$`, 'i');
+}
+function stringToRegexp(path) {
+    return tokensToRegExp(parse(path));
+}
 export function createRouteMatcher(path) {
-    return ptr(path);
+    return stringToRegexp(path);
 }
 //# sourceMappingURL=routes.js.map

package/lib/utils/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AAEjC,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;AACnB,CAAC"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "1.6.1",
+  "version": "1.6.2-beta.7393",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -61,9 +61,8 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "path-to-regexp": "^1.8.0",
-    "piral-base": "^1.6.1",
-    "piral-debug-utils": "^1.6.1",
+    "piral-base": "1.6.2-beta.7393",
+    "piral-debug-utils": "1.6.2-beta.7393",
     "zustand": "^3.0.0"
   },
   "devDependencies": {
@@ -83,5 +82,5 @@
     "react-router-dom",
     "tslib"
   ],
-  "gitHead": "9fc8bab4468f424e458f5a5c75ba051a196624f5"
+  "gitHead": "75d596d714a582f54071e1799e0ce183dbacbb09"
 }

package/src/utils/routes.ts

@@ -1,5 +1,135 @@
-import ptr from 'path-to-regexp';
+const defaultDelimiter = escapeString('/');
+const pathExpr = new RegExp(
+  [
+    '(\\\\.)',
+    '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))',
+  ].join('|'),
+  'g',
+);
+
+function escapeString(str: string) {
+  return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1');
+}
+
+function escapeGroup(group: string) {
+  return group.replace(/([=!:$\/()])/g, '\\$1');
+}
+
+type Token =
+  | string
+  | {
+      name: string;
+      prefix: string;
+      delimiter: string;
+      optional: boolean;
+      repeat: boolean;
+      partial: boolean;
+      asterisk: boolean;
+      pattern: string;
+    };
+
+function parse(str: string) {
+  const tokens: Array<Token> = [];
+  let key = 0;
+  let index = 0;
+  let path = '';
+  let res: RegExpExecArray;
+
+  while ((res = pathExpr.exec(str)) !== null) {
+    const m = res[0];
+    const escaped = res[1];
+    const offset = res.index;
+    path += str.slice(index, offset);
+    index = offset + m.length;
+
+    // Ignore already escaped sequences.
+    if (escaped) {
+      path += escaped[1];
+      continue;
+    }
+
+    const next = str[index];
+    const prefix = res[2];
+    const name = res[3];
+    const capture = res[4];
+    const group = res[5];
+    const modifier = res[6];
+    const asterisk = res[7];
+
+    // Push the current path onto the tokens.
+    if (path) {
+      tokens.push(path);
+      path = '';
+    }
+
+    const partial = prefix != null && next != null && next !== prefix;
+    const repeat = modifier === '+' || modifier === '*';
+    const optional = modifier === '?' || modifier === '*';
+    const delimiter = res[2] || '/';
+    const pattern = capture || group;
+
+    tokens.push({
+      name: name || `${key++}`,
+      prefix: prefix || '',
+      delimiter,
+      optional,
+      repeat,
+      partial,
+      asterisk: !!asterisk,
+      pattern: pattern ? escapeGroup(pattern) : asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?',
+    });
+  }
+
+  // Match any characters still remaining.
+  if (index < str.length) {
+    path += str.substring(index);
+  }
+
+  // If the path exists, push it onto the end.
+  if (path) {
+    tokens.push(path);
+  }
+
+  return tokens;
+}
+
+function tokensToRegExp(tokens: Array<Token>) {
+  let route = '';
+
+  for (const token of tokens) {
+    if (typeof token === 'string') {
+      route += escapeString(token);
+    } else {
+      const prefix = escapeString(token.prefix);
+      let capture = '(?:' + token.pattern + ')';
+
+      if (token.repeat) {
+        capture += '(?:' + prefix + capture + ')*';
+      }
+
+      if (token.optional) {
+        if (!token.partial) {
+          capture = '(?:' + prefix + '(' + capture + '))?';
+        } else {
+          capture = prefix + '(' + capture + ')?';
+        }
+      } else {
+        capture = prefix + '(' + capture + ')';
+      }
+
+      route += capture;
+    }
+  }
+
+  const endsWithDelimiter = route.slice(-defaultDelimiter.length) === defaultDelimiter;
+  const path = endsWithDelimiter ? route.slice(0, -defaultDelimiter.length) : route;
+  return new RegExp(`^${path}(?:${defaultDelimiter}(?=$))?$`, 'i');
+}
+
+function stringToRegexp(path: string) {
+  return tokensToRegExp(parse(path));
+}
 
 export function createRouteMatcher(path: string): RegExp {
-  return ptr(path);
+  return stringToRegexp(path);
 }