frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4451 from node-red/4446-allow-import-of-subpath-modules

Browse Source 
Allow import of modules with subpath in specifier
This commit is contained in:
Stephen McLaughlin 2023-11-27 16:57:32 +00:00 committed by GitHub
commit 3c036257ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/node_modules/@node-red/registry/lib/externalModules.js vendored
View File

@ -98,7 +98,7 @@ function requireModule(module) {
const parsedModule = parseModuleName(module); const parsedModule = parseModuleName(module);
if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) { if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) {
return require(parsedModule.module); return require(parsedModule.module + parsedModule.subpath);
} }
if (!knownExternalModules[parsedModule.module]) { if (!knownExternalModules[parsedModule.module]) {
const e = new Error("Module not allowed"); const e = new Error("Module not allowed");
@ -131,7 +131,7 @@ function importModule(module) {
const parsedModule = parseModuleName(module); const parsedModule = parseModuleName(module);
if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) { if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) {
return import(parsedModule.module); return import(parsedModule.module + parsedModule.subpath);
} }
if (!knownExternalModules[parsedModule.module]) { if (!knownExternalModules[parsedModule.module]) {
const e = new Error("Module not allowed"); const e = new Error("Module not allowed");
@ -152,12 +152,13 @@ function importModule(module) {
} }
function parseModuleName(module) { function parseModuleName(module) {
var match = /((?:@[^/]+\/)?[^/@]+)(?:@([\s\S]+))?/.exec(module); var match = /((?:@[^/]+\/)?[^/@]+)(\/[^/@]+)?(?:@([\s\S]+))?/.exec(module);
if (match) { if (match) {
return { return {
spec: module, spec: module,
module: match[1], module: match[1],
version: match[2], subpath: match[2] || '',
version: match[3],
builtin: BUILTIN_MODULES.indexOf(match[1]) !== -1, builtin: BUILTIN_MODULES.indexOf(match[1]) !== -1,
known: !!knownExternalModules[match[1]] known: !!knownExternalModules[match[1]]
} }