@node-red/registry 5.0.7 → 5.0.9

package/lib/externalModules.js

@@ -11,11 +11,9 @@ const exec = require("@node-red/util").exec;
 const log = require("@node-red/util").log;
 const hooks = require("@node-red/util").hooks;
 const url = require("url");
-const { createRequire } = require("module");
+const { createRequire, isBuiltin } = require("module");
 const validateNpmPackageName = require("validate-npm-package-name");
 
-const BUILTIN_MODULES = require('module').builtinModules;
-
 const npmPackageJson = require.resolve('npm/package.json')
 const npmRoot = path.dirname(npmPackageJson);
 const npmCli = path.join(npmRoot, 'bin', 'npm-cli.js');
@@ -129,23 +127,122 @@ function importModule(module) {
     // specific file that is loaded when the module is required/imported
     // As this won't be on the natural module search path, we use createRequire
     // to access the module
-    const modulePath = createRequire(moduleDir).resolve(module)
+    let modulePath;
+    try {
+        modulePath = createRequire(moduleDir).resolve(module)
+    } catch (err) {
+        if (err.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
+            throw err;
+        }
+        // require.resolve only matches the 'require' export condition. ESM-only
+        // packages may only provide an 'import' condition, so resolve it ourselves.
+        modulePath = resolveImportExport(moduleDir, parsedModule.subpath);
+        if (!modulePath) {
+            throw err;
+        }
+    }
     // Import needs the full path to the module's main .js file
     // It also needs to be a file:// url for Windows
     const moduleUrl = url.pathToFileURL(modulePath);
     return import(moduleUrl);
 }
 
+const IMPORT_CONDITIONS = ['import', 'node', 'default'];
+
+/**
+ * Resolve a package subpath using the 'import' conditions of its package.json exports
+ * @param {string} moduleDir - the directory of the package
+ * @param {string} subpath - the subpath being imported, eg '' or '/foo'
+ * @return {string|null} the absolute path to the file, or null if it cannot be resolved
+ */
+function resolveImportExport(moduleDir, subpath) {
+    let pkg;
+    try {
+        pkg = fs.readJsonSync(path.join(moduleDir, 'package.json'));
+    } catch (err) {
+        return null;
+    }
+    const exportsField = pkg.exports;
+    if (exportsField === undefined || exportsField === null) {
+        return null;
+    }
+    const request = '.' + (subpath || '');
+    let target;
+    let patternMatch;
+    const isSubpathMap = typeof exportsField === 'object' && !Array.isArray(exportsField) &&
+        Object.keys(exportsField).some(k => k.startsWith('.'));
+    if (!isSubpathMap) {
+        if (request === '.') {
+            target = exportsField;
+        }
+    } else if (Object.prototype.hasOwnProperty.call(exportsField, request)) {
+        target = exportsField[request];
+    } else {
+        // Find the most specific matching pattern, eg "./features/*.js"
+        let bestKey;
+        for (const key of Object.keys(exportsField)) {
+            const star = key.indexOf('*');
+            if (star === -1) {
+                continue;
+            }
+            const prefix = key.substring(0, star);
+            const suffix = key.substring(star + 1);
+            if (request.length >= key.length && request.startsWith(prefix) && request.endsWith(suffix) &&
+                    (!bestKey || prefix.length > bestKey.indexOf('*'))) {
+                bestKey = key;
+                patternMatch = request.substring(prefix.length, request.length - suffix.length);
+            }
+        }
+        if (bestKey) {
+            target = exportsField[bestKey];
+        }
+    }
+    const resolved = resolveExportTarget(target, patternMatch);
+    if (!resolved) {
+        return null;
+    }
+    const resolvedPath = path.resolve(moduleDir, resolved);
+    // Do not allow the target to escape the package directory
+    if (path.relative(moduleDir, resolvedPath).startsWith('..')) {
+        return null;
+    }
+    return resolvedPath;
+}
+
+function resolveExportTarget(target, patternMatch) {
+    if (typeof target === 'string') {
+        if (!target.startsWith('./')) {
+            return null;
+        }
+        return patternMatch !== undefined ? target.replace(/\*/g, patternMatch) : target;
+    }
+    if (Array.isArray(target)) {
+        for (const t of target) {
+            const resolved = resolveExportTarget(t, patternMatch);
+            if (resolved) {
+                return resolved;
+            }
+        }
+        return null;
+    }
+    if (target && typeof target === 'object') {
+        for (const condition of Object.keys(target)) {
+            if (IMPORT_CONDITIONS.includes(condition)) {
+                const resolved = resolveExportTarget(target[condition], patternMatch);
+                if (resolved) {
+                    return resolved;
+                }
+            }
+        }
+    }
+    return null;
+}
+
 function parseModuleName(module) {
     const match = /((?:@[^/]+\/)?[^/@]+)(\/[^/@]+)?(?:@([\s\S]+))?/.exec(module);
     if (match) {
         const moduleName = match[1]
-        let isBuiltIn = false
-        if (/^node:/.test(moduleName)) {
-            isBuiltIn = BUILTIN_MODULES.includes(moduleName.substring(5))
-        } else {
-            isBuiltIn = BUILTIN_MODULES.includes(moduleName)
-        }
+        const isBuiltIn = isBuiltin(moduleName)
         return {
             spec: module,
             module: moduleName,

package/lib/loader.js

@@ -272,7 +272,7 @@ async function loadNodeConfig(fileInfo) {
         module: module,
         name: name,
         file: file,
-        template: file.replace(/\.c?js$/,".html"),
+        template: file.replace(/\.[cm]?js$/,".html"),
         enabled: isEnabled,
         loaded:false,
         version: version,

package/lib/localfilesystem.js

@@ -72,11 +72,11 @@ function getLocalFile(file) {
         return null;
     }
     try {
-        fs.statSync(file.replace(/\.c?js$/,".html"));
+        fs.statSync(file.replace(/\.[cm]?js$/,".html"));
         return {
             file:    file,
             module:  "node-red",
-            name:    path.basename(file).replace(/^\d+-/,"").replace(/\.c?js$/,""),
+            name:    path.basename(file).replace(/^\d+-/,"").replace(/\.[cm]?js$/,""),
             version: settings.version
         };
     } catch(err) {
@@ -114,7 +114,7 @@ function getLocalNodeFiles(dir, skipValidNodeRedModules) {
     files.forEach(function(fn) {
         var stats = fs.statSync(path.join(dir,fn));
         if (stats.isFile()) {
-            if (/\.c?js$/.test(fn)) {
+            if (/\.[cm]?js$/.test(fn)) {
                 var info = getLocalFile(path.join(dir,fn));
                 if (info) {
                     result.push(info);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "5.0.7",
+    "version": "5.0.9",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,10 +16,10 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "5.0.7",
+        "@node-red/util": "5.0.9",
         "clone": "2.1.2",
-        "fs-extra": "11.4.0",
-        "npm": "11.19.1",
+        "fs-extra": "11.4.1",
+        "npm": "11.21.1",
         "semver": "7.8.5",
         "tar": "7.5.22",
         "uglify-js": "3.19.3",