@allgemein/moduls 1.9.0 → 1.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/loader/AbstractModuleHandle.d.ts +1 -1
- package/loader/AbstractModuleLoader.js +3 -5
- package/loader/AbstractModuleLoader.js.map +1 -1
- package/loader/IModuleOptions.d.ts +1 -1
- package/loader/classes/ClassesLoader.js +14 -14
- package/loader/classes/ClassesLoader.js.map +1 -1
- package/loader/require/IRequireOptions.d.ts +2 -3
- package/loader/require/RequireHandle.d.ts +1 -1
- package/loader/require/RequireHandle.js +1 -1
- package/loader/require/RequireLoader.js +9 -9
- package/loader/require/RequireLoader.js.map +1 -1
- package/loader/settings/ISettingsOptions.d.ts +1 -1
- package/loader/settings/SettingsHandle.d.ts +1 -1
- package/loader/settings/SettingsHandle.js +1 -1
- package/loader/settings/SettingsHandle.js.map +1 -1
- package/loader/settings/SettingsLoader.js +5 -5
- package/loader/settings/SettingsLoader.js.map +1 -1
- package/package.json +2 -2
- package/registry/Constants.js.map +1 -1
- package/registry/ModuleDescriptor.js +3 -3
- package/registry/ModuleDescriptor.js.map +1 -1
- package/registry/ModuleRegistry.js +21 -27
- package/registry/ModuleRegistry.js.map +1 -1
- package/utils/Helper.js +23 -25
- package/utils/Helper.js.map +1 -1
|
@@ -10,9 +10,7 @@ export class AbstractModuleLoader {
|
|
|
10
10
|
}
|
|
11
11
|
add(handle) {
|
|
12
12
|
if (handle) {
|
|
13
|
-
|
|
14
|
-
return x.module.name === handle.module.name;
|
|
15
|
-
});
|
|
13
|
+
const exists = find(this._handles, (x) => x.module.name === handle.module.name);
|
|
16
14
|
if (!exists) {
|
|
17
15
|
this._handles.push(handle);
|
|
18
16
|
// correct order if necessary
|
|
@@ -31,7 +29,7 @@ export class AbstractModuleLoader {
|
|
|
31
29
|
load(modules) {
|
|
32
30
|
if (isArray(modules)) {
|
|
33
31
|
const promises = [];
|
|
34
|
-
for (
|
|
32
|
+
for (const x of modules) {
|
|
35
33
|
if (this._options.filter && !this._options.filter(x)) {
|
|
36
34
|
continue;
|
|
37
35
|
}
|
|
@@ -45,7 +43,7 @@ export class AbstractModuleLoader {
|
|
|
45
43
|
}
|
|
46
44
|
async _loadOne(modules) {
|
|
47
45
|
let res = null;
|
|
48
|
-
|
|
46
|
+
const y = await this.loadOne(modules);
|
|
49
47
|
try {
|
|
50
48
|
res = this.add(y);
|
|
51
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractModuleLoader.js","sourceRoot":"","sources":["../../../src/loader/AbstractModuleLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAOvD,MAAM,OAAgB,oBAAoB;IAQxC,YAAY,QAAwB,EAAE,OAAa;QAFnD,aAAQ,GAAQ,EAAE,CAAC;QAGjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,IAAS,EAAE,CAAC;IACrC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,MAAS;QACX,IAAI,MAAM,EAAE,CAAC;YACX,
|
|
1
|
+
{"version":3,"file":"AbstractModuleLoader.js","sourceRoot":"","sources":["../../../src/loader/AbstractModuleLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,8 @@ import { ClassLoader, PlatformUtils, __MODULNAME__, Glob } from '@allgemein/base
|
|
|
5
5
|
export class ClassesLoader extends AbstractModuleLoader {
|
|
6
6
|
getClasses(topic) {
|
|
7
7
|
let classes = [];
|
|
8
|
-
for (
|
|
9
|
-
|
|
8
|
+
for (const handle of this.handles()) {
|
|
9
|
+
const cls = handle.getClasses(topic);
|
|
10
10
|
if (!isEmpty(cls)) {
|
|
11
11
|
classes = classes.concat(cls);
|
|
12
12
|
}
|
|
@@ -14,9 +14,9 @@ export class ClassesLoader extends AbstractModuleLoader {
|
|
|
14
14
|
return classes;
|
|
15
15
|
}
|
|
16
16
|
getClassesWithFilter(topic, excludeFilter) {
|
|
17
|
-
|
|
18
|
-
for (
|
|
19
|
-
|
|
17
|
+
const classes = [];
|
|
18
|
+
for (const handle of this.handles()) {
|
|
19
|
+
const cls = handle.getClasses(topic);
|
|
20
20
|
if (!isEmpty(cls)) {
|
|
21
21
|
cls.forEach(c => {
|
|
22
22
|
const className = ClassLoader.getClassName(c);
|
|
@@ -30,9 +30,9 @@ export class ClassesLoader extends AbstractModuleLoader {
|
|
|
30
30
|
return classes;
|
|
31
31
|
}
|
|
32
32
|
getClassesByModule(topic) {
|
|
33
|
-
|
|
34
|
-
for (
|
|
35
|
-
|
|
33
|
+
const classes = {};
|
|
34
|
+
for (const handle of this.handles()) {
|
|
35
|
+
const modulClasses = handle.getClasses(topic);
|
|
36
36
|
if (!isEmpty(modulClasses)) {
|
|
37
37
|
classes[handle.module.name] = modulClasses;
|
|
38
38
|
}
|
|
@@ -40,7 +40,7 @@ export class ClassesLoader extends AbstractModuleLoader {
|
|
|
40
40
|
return classes;
|
|
41
41
|
}
|
|
42
42
|
async loadOne(modul) {
|
|
43
|
-
|
|
43
|
+
const handle = new ClassesHandle(modul);
|
|
44
44
|
// for (let lib of this._options.libs) {
|
|
45
45
|
const libs = await Promise.all(this._options.libs.map(async (lib) => {
|
|
46
46
|
const _lib = {
|
|
@@ -50,11 +50,11 @@ export class ClassesLoader extends AbstractModuleLoader {
|
|
|
50
50
|
};
|
|
51
51
|
const topic = lib.topic;
|
|
52
52
|
// let refs = [];
|
|
53
|
-
for (
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
for (const _path of lib.refs) {
|
|
54
|
+
const lib_path = PlatformUtils.join(modul.path, _path);
|
|
55
|
+
const res = await Glob.async(lib_path);
|
|
56
56
|
if (!isEmpty(res)) {
|
|
57
|
-
for (
|
|
57
|
+
for (const r of res) {
|
|
58
58
|
if (PlatformUtils.fileExist(r) && PlatformUtils.isDir(r)) {
|
|
59
59
|
_lib.refs.push(PlatformUtils.join(r, '*'));
|
|
60
60
|
}
|
|
@@ -88,7 +88,7 @@ export class ClassesLoader extends AbstractModuleLoader {
|
|
|
88
88
|
return handle.hasAnyClasses() ? handle : null;
|
|
89
89
|
}
|
|
90
90
|
async loadClasses(refs, modulName, topic) {
|
|
91
|
-
|
|
91
|
+
const classes = await ClassLoader.importClassesFromAnyAsync(refs);
|
|
92
92
|
if (!isEmpty(classes)) {
|
|
93
93
|
// @ts-ignore
|
|
94
94
|
if (Reflect && Reflect['getOwnMetadata']) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClassesLoader.js","sourceRoot":"","sources":["../../../../src/loader/classes/ClassesLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,aAAa,EAAqB,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAGnG,MAAM,OAAO,aAAc,SAAQ,oBAAoD;IAGrF,UAAU,CAAC,KAAa;QACtB,IAAI,OAAO,GAAe,EAAE,CAAC;QAC7B,KAAK,
|
|
1
|
+
{"version":3,"file":"ClassesLoader.js","sourceRoot":"","sources":["../../../../src/loader/classes/ClassesLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
import { IModuleOptions } from
|
|
2
|
-
export
|
|
3
|
-
}
|
|
1
|
+
import { IModuleOptions } from '../IModuleOptions.js';
|
|
2
|
+
export type IRequireOptions = IModuleOptions;
|
|
@@ -5,11 +5,11 @@ import { AbstractModuleLoader } from '../AbstractModuleLoader.js';
|
|
|
5
5
|
import { Helper } from '../../utils/Helper.js';
|
|
6
6
|
export class RequireLoader extends AbstractModuleLoader {
|
|
7
7
|
async loadOne(modul) {
|
|
8
|
-
|
|
8
|
+
const handle = new RequireHandle(modul);
|
|
9
9
|
// necassary to extend the search directories of require
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
if (_module['paths'].indexOf(new_node_modules_dir)
|
|
10
|
+
const _module = this.registry.options().module;
|
|
11
|
+
const new_node_modules_dir = path.dirname(modul.path); // split.join(path.sep);
|
|
12
|
+
if (_module['paths'].indexOf(new_node_modules_dir) === -1) {
|
|
13
13
|
_module['paths'].unshift(new_node_modules_dir);
|
|
14
14
|
}
|
|
15
15
|
if (modul.internal) {
|
|
@@ -22,7 +22,7 @@ export class RequireLoader extends AbstractModuleLoader {
|
|
|
22
22
|
handle.exposesHooks = handle.ref.exposesHooks;
|
|
23
23
|
}
|
|
24
24
|
Object.getOwnPropertyNames(handle.ref).forEach(function (val, idx, array) {
|
|
25
|
-
if (handle.ref[val] && isFunction(handle.ref[val]) && val
|
|
25
|
+
if (handle.ref[val] && isFunction(handle.ref[val]) && val !== 'exposesHooks' && val.match(/^on[A-Z]/)) {
|
|
26
26
|
let _val = val.replace('on', '');
|
|
27
27
|
_val = _val[0].toLowerCase() + _val.substring(1);
|
|
28
28
|
handle.usesHooks.push(_val);
|
|
@@ -36,7 +36,7 @@ export class RequireLoader extends AbstractModuleLoader {
|
|
|
36
36
|
options = hook;
|
|
37
37
|
hook = options.hook;
|
|
38
38
|
}
|
|
39
|
-
|
|
39
|
+
const handles = filter(this._handles, function (_x) {
|
|
40
40
|
return _x.usesHooks.indexOf(hook) > -1;
|
|
41
41
|
});
|
|
42
42
|
return await Promise.all(map(handles, (handle) => {
|
|
@@ -46,10 +46,10 @@ export class RequireLoader extends AbstractModuleLoader {
|
|
|
46
46
|
}));
|
|
47
47
|
}
|
|
48
48
|
static async handleCall(handle, hook, ...args) {
|
|
49
|
-
|
|
49
|
+
const hookCall = 'on' + Helper.ucfirst(hook);
|
|
50
50
|
if (handle.usesHooks.indexOf(hook) > -1) {
|
|
51
51
|
return new Promise(function (res, rej) {
|
|
52
|
-
if (handle.ref[hookCall].length
|
|
52
|
+
if (handle.ref[hookCall].length === args.length) {
|
|
53
53
|
let result, err;
|
|
54
54
|
try {
|
|
55
55
|
result = handle.ref[hookCall].apply(handle.ref, args);
|
|
@@ -62,7 +62,7 @@ export class RequireLoader extends AbstractModuleLoader {
|
|
|
62
62
|
res(result);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
|
-
else if (handle.ref[hookCall].length
|
|
65
|
+
else if (handle.ref[hookCall].length === (args.length + 1)) {
|
|
66
66
|
args.push(function (err, result) {
|
|
67
67
|
if (err) {
|
|
68
68
|
rej(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequireLoader.js","sourceRoot":"","sources":["../../../../src/loader/require/RequireLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAK7C,MAAM,OAAO,aAAc,SAAQ,oBAAoD;IAG3E,KAAK,CAAC,OAAO,CAAC,KAAuB;QAC7C,
|
|
1
|
+
{"version":3,"file":"RequireLoader.js","sourceRoot":"","sources":["../../../../src/loader/require/RequireLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsHandle.js","sourceRoot":"","sources":["../../../../src/loader/settings/SettingsHandle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAGhE,MAAM,OAAO,cAAe,SAAQ,oBAAoB;IAAxD;;QAEE,aAAQ,
|
|
1
|
+
{"version":3,"file":"SettingsHandle.js","sourceRoot":"","sources":["../../../../src/loader/settings/SettingsHandle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAGhE,MAAM,OAAO,cAAe,SAAQ,oBAAoB;IAAxD;;QAEE,aAAQ,GAAQ,EAAE,CAAC;IAErB,CAAC;CAAA"}
|
|
@@ -5,19 +5,19 @@ import { Helper } from '../../utils/Helper.js';
|
|
|
5
5
|
import { PlatformUtils } from '@allgemein/base';
|
|
6
6
|
export class SettingsLoader extends AbstractModuleLoader {
|
|
7
7
|
getSettings() {
|
|
8
|
-
|
|
9
|
-
for (
|
|
8
|
+
const settings = {};
|
|
9
|
+
for (const x of this.handles()) {
|
|
10
10
|
settings[x.module.name] = x.settings;
|
|
11
11
|
}
|
|
12
12
|
return settings;
|
|
13
13
|
}
|
|
14
14
|
async loadOne(modul) {
|
|
15
15
|
let handle = null;
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
const filepath = PlatformUtils.join(modul.path, this._options.ref);
|
|
17
|
+
const ext = PlatformUtils.pathExtname(filepath, false);
|
|
18
18
|
if (PlatformUtils.fileExist(filepath)) {
|
|
19
19
|
handle = new SettingsHandle(modul);
|
|
20
|
-
|
|
20
|
+
const file = await Helper.readFile(filepath);
|
|
21
21
|
let settings = {};
|
|
22
22
|
switch (ext) {
|
|
23
23
|
case 'json':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsLoader.js","sourceRoot":"","sources":["../../../../src/loader/settings/SettingsLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AACpC,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAI9C,MAAM,OAAO,cAAe,SAAQ,oBAAsD;IAGxF,WAAW;QACT,
|
|
1
|
+
{"version":3,"file":"SettingsLoader.js","sourceRoot":"","sources":["../../../../src/loader/settings/SettingsLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,iBAAiB,CAAC;AACpC,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAI9C,MAAM,OAAO,cAAe,SAAQ,oBAAsD;IAGxF,WAAW;QACT,MAAM,QAAQ,GAAQ,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/B,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;QACvC,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAAuB;QAC7C,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnE,MAAM,GAAG,GAAG,aAAa,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAEvD,IAAI,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,MAAM,GAAG,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,QAAQ,GAAG,EAAE,CAAC;YAElB,QAAQ,GAAG,EAAE,CAAC;gBACZ,KAAK,MAAM;oBACT,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC7C,MAAM;gBACR;oBACE,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,GAAG,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACvB,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;YAED,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC7B,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CAGF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@allgemein/moduls",
|
|
3
|
-
"version": "1.9.
|
|
3
|
+
"version": "1.9.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Commons-moduls handles and manages contextual moduls for complex and modular applications. ",
|
|
6
6
|
"main": "index.js",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"homepage": "https://github.com/allgemein-node/moduls#readme",
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@allgemein/base": "^1.10.
|
|
28
|
+
"@allgemein/base": "^1.10.1",
|
|
29
29
|
"@types/micromatch": "^4.0.9",
|
|
30
30
|
"glob": ">=11.0.0",
|
|
31
31
|
"reflect-metadata": "^0.2.2"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../../../src/registry/Constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAE1C,MAAM,CAAC,MAAM,8BAA8B,GAA2B;IAEpE,KAAK,EAAE,EAAE;IAET,OAAO,EAAE,EAAE;IAEX,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../../../src/registry/Constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAE1C,MAAM,CAAC,MAAM,8BAA8B,GAA2B;IAEpE,KAAK,EAAE,EAAE;IAET,OAAO,EAAE,EAAE;IAEX,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC;IAE5C,sBAAsB,EAAE,MAAM;CAC/B,CAAC"}
|
|
@@ -22,7 +22,7 @@ export class ModuleDescriptor {
|
|
|
22
22
|
this.child_modules = [];
|
|
23
23
|
}
|
|
24
24
|
static fromOptions(options) {
|
|
25
|
-
|
|
25
|
+
const m = new ModuleDescriptor();
|
|
26
26
|
m.name = options.name;
|
|
27
27
|
m.version = options.version || null;
|
|
28
28
|
m.path = options.path || null;
|
|
@@ -32,10 +32,10 @@ export class ModuleDescriptor {
|
|
|
32
32
|
m.peerDependencies = options.peerDependencies || {};
|
|
33
33
|
m.child_modules = options.child_modules || [];
|
|
34
34
|
m.sub_modules = options.sub_modules || {};
|
|
35
|
-
return m; //merge(m,options)
|
|
35
|
+
return m; // merge(m,options)
|
|
36
36
|
}
|
|
37
37
|
getMain(sep = '/') {
|
|
38
|
-
|
|
38
|
+
const chain = [this.path];
|
|
39
39
|
if (this.main) {
|
|
40
40
|
chain.push(this.main.replace(/.\w+$/, ''));
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleDescriptor.js","sourceRoot":"","sources":["../../../src/registry/ModuleDescriptor.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,gBAAgB;IAkC3B;QA9BA,OAAE,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC;QAQ5B,WAAM,GAAW,CAAC,CAAC;QAEnB,iBAAY,GAAQ,EAAE,CAAC;QAEvB,qBAAgB,GAAQ,EAAE,CAAC;QAE3B,kBAAa,GAAa,EAAE,CAAC;QAE7B;;;;WAIG;QACH,aAAQ,GAAY,KAAK,CAAC;QAI1B,gBAAW,GAAsC,EAAE,CAAC;QAEpD,cAAS,GAAY,KAAK,CAAC;QAIzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC1B,CAAC;IAGD,MAAM,CAAC,WAAW,CAAC,OAAY;QAC7B,
|
|
1
|
+
{"version":3,"file":"ModuleDescriptor.js","sourceRoot":"","sources":["../../../src/registry/ModuleDescriptor.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,gBAAgB;IAkC3B;QA9BA,OAAE,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC;QAQ5B,WAAM,GAAW,CAAC,CAAC;QAEnB,iBAAY,GAAQ,EAAE,CAAC;QAEvB,qBAAgB,GAAQ,EAAE,CAAC;QAE3B,kBAAa,GAAa,EAAE,CAAC;QAE7B;;;;WAIG;QACH,aAAQ,GAAY,KAAK,CAAC;QAI1B,gBAAW,GAAsC,EAAE,CAAC;QAEpD,cAAS,GAAY,KAAK,CAAC;QAIzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IAC1B,CAAC;IAGD,MAAM,CAAC,WAAW,CAAC,OAAY;QAC7B,MAAM,CAAC,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACjC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACtB,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC;QACpC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC;QAC9B,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC;QAC9B,CAAC,CAAC,QAAQ,GAAG,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxD,CAAC,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;QAC5C,CAAC,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACpD,CAAC,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QAC1C,OAAO,CAAC,CAAC,CAAC,mBAAmB;IAC/B,CAAC;IAED,OAAO,CAAC,GAAG,GAAW,GAAG;QACvB,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;CACF;AAhEQ,oBAAG,GAAG,CAAC,AAAJ,CAAK"}
|
|
@@ -40,11 +40,11 @@ export class ModuleRegistry {
|
|
|
40
40
|
async rebuild() {
|
|
41
41
|
ModuleDescriptor.INC = 0;
|
|
42
42
|
this._modules = [];
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
for (
|
|
47
|
-
|
|
43
|
+
const modules_lists = await Promise.all(map(this.paths, this._scan_module_path.bind(this)));
|
|
44
|
+
const to_register = [];
|
|
45
|
+
const one_list = [].concat(...modules_lists);
|
|
46
|
+
for (const __modul of one_list) {
|
|
47
|
+
const _modul = find(to_register, function (_x) {
|
|
48
48
|
return _x.name === __modul.name;
|
|
49
49
|
});
|
|
50
50
|
if (!_modul) {
|
|
@@ -75,7 +75,7 @@ export class ModuleRegistry {
|
|
|
75
75
|
catch (e) {
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
|
|
78
|
+
const options = {
|
|
79
79
|
filter: this._options.packageFilter,
|
|
80
80
|
depth: this._options.depth,
|
|
81
81
|
subModulePaths: this._options.pattern,
|
|
@@ -90,8 +90,8 @@ export class ModuleRegistry {
|
|
|
90
90
|
packageJsons = [];
|
|
91
91
|
if (PlatformUtils.fileExist(PlatformUtils.join(node_modules_dir, C_PACKAGE_JSON))) {
|
|
92
92
|
options.depth++;
|
|
93
|
-
|
|
94
|
-
|
|
93
|
+
const dirname = PlatformUtils.dirname(node_modules_dir);
|
|
94
|
+
const basename = PlatformUtils.basename(node_modules_dir);
|
|
95
95
|
// TODO!!!!
|
|
96
96
|
packageJsons = await Helper.lookupNpmInDirectory(dirname, basename, [], options);
|
|
97
97
|
}
|
|
@@ -106,38 +106,32 @@ export class ModuleRegistry {
|
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
|
-
return map(packageJsons, (module) =>
|
|
110
|
-
return ModuleDescriptor.fromOptions(module);
|
|
111
|
-
});
|
|
109
|
+
return map(packageJsons, (module) => ModuleDescriptor.fromOptions(module));
|
|
112
110
|
}
|
|
113
111
|
_build_registry(modules) {
|
|
114
112
|
this._modules = modules;
|
|
115
|
-
for (
|
|
116
|
-
|
|
117
|
-
|
|
113
|
+
for (const _modul of this._modules) {
|
|
114
|
+
const dependencies = concat([], Object.keys(_modul.dependencies), Object.keys(_modul.peerDependencies));
|
|
115
|
+
const submoduls = [];
|
|
118
116
|
map(values(_modul.sub_modules), v => {
|
|
119
117
|
submoduls.push(...v.modules);
|
|
120
118
|
});
|
|
121
|
-
|
|
119
|
+
const children = filter(this._modules, function (_x) {
|
|
122
120
|
return dependencies.indexOf(_x.name) > -1;
|
|
123
121
|
});
|
|
124
|
-
for (
|
|
122
|
+
for (const _dep_modul of children) {
|
|
125
123
|
_modul.child_modules.push(_dep_modul.name);
|
|
126
124
|
}
|
|
127
125
|
_modul.child_modules = uniq(_modul.child_modules);
|
|
128
|
-
|
|
129
|
-
return submoduls.indexOf(_x.name) > -1;
|
|
130
|
-
});
|
|
126
|
+
const submodules = filter(this._modules, (_x) => submoduls.indexOf(_x.name) > -1);
|
|
131
127
|
submodules.forEach((m) => {
|
|
132
128
|
m.submodule = true;
|
|
133
129
|
});
|
|
134
130
|
}
|
|
135
|
-
this._modules.sort((a, b) =>
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
let dependents = filter(this._modules, function (other) {
|
|
140
|
-
if (other.name == first.name) {
|
|
131
|
+
this._modules.sort((a, b) => a.child_modules.length - b.child_modules.length);
|
|
132
|
+
for (const first of this._modules) {
|
|
133
|
+
const dependents = filter(this._modules, function (other) {
|
|
134
|
+
if (other.name === first.name) {
|
|
141
135
|
return false;
|
|
142
136
|
}
|
|
143
137
|
if (other.child_modules.indexOf(first.name) > -1) {
|
|
@@ -146,7 +140,7 @@ export class ModuleRegistry {
|
|
|
146
140
|
return false;
|
|
147
141
|
});
|
|
148
142
|
if (dependents.length) {
|
|
149
|
-
for (
|
|
143
|
+
for (const x of dependents) {
|
|
150
144
|
x.weight += (first.weight + 1);
|
|
151
145
|
}
|
|
152
146
|
}
|
|
@@ -163,7 +157,7 @@ export class ModuleRegistry {
|
|
|
163
157
|
return this._modules;
|
|
164
158
|
}
|
|
165
159
|
async loader(loaderClazz, options) {
|
|
166
|
-
|
|
160
|
+
const instance = Reflect.construct(loaderClazz, [this, options]);
|
|
167
161
|
await instance.load(this.modules());
|
|
168
162
|
return instance;
|
|
169
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleRegistry.js","sourceRoot":"","sources":["../../../src/registry/ModuleRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAC1F,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAE1C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG1D,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AAGjE,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,8BAA8B,EAAC,MAAM,gBAAgB,CAAC;AAG9D,OAAO,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAG/D,MAAM,OAAO,cAAc;IASzB,YAAY,OAA+B;QALnC,aAAQ,GAAuB,EAAE,CAAC;QAE1C,UAAK,GAAa,EAAE,CAAC;QAInB,QAAQ,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,0CAA0C;QACtE,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAGD;;OAEG;IACH,QAAQ;QACN,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAGD,KAAK,CAAC,OAAO;QACX,gBAAgB,CAAC,GAAG,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,
|
|
1
|
+
{"version":3,"file":"ModuleRegistry.js","sourceRoot":"","sources":["../../../src/registry/ModuleRegistry.ts"],"names":[],"mappings":"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"}
|
package/utils/Helper.js
CHANGED
|
@@ -47,8 +47,8 @@ export class Helper {
|
|
|
47
47
|
_path = join(_path, C_PACKAGE_JSON);
|
|
48
48
|
}
|
|
49
49
|
return this.readFile(_path).then(buf => {
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
const data = buf.toString('utf8');
|
|
51
|
+
const json = JSON.parse(data);
|
|
52
52
|
return json;
|
|
53
53
|
});
|
|
54
54
|
}
|
|
@@ -80,19 +80,19 @@ export class Helper {
|
|
|
80
80
|
});
|
|
81
81
|
}
|
|
82
82
|
static async npmls(node_modules_dir, options = { depth: 1, level: 0 }) {
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
const depth = options.depth;
|
|
84
|
+
const inc = options.level;
|
|
85
85
|
if (inc >= depth) {
|
|
86
86
|
return [];
|
|
87
87
|
}
|
|
88
88
|
options.level = inc + 1;
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
const modules = [];
|
|
90
|
+
const directories = await this.getValidDirectories(node_modules_dir, options);
|
|
91
91
|
await Promise.all(map(directories, async (directory) => {
|
|
92
92
|
if (/^@/.test(directory)) {
|
|
93
93
|
// is grouped
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
const _grouped_node_modules_dir = PlatformUtils.join(node_modules_dir, directory);
|
|
95
|
+
const _directories = await this.getValidDirectories(_grouped_node_modules_dir, options);
|
|
96
96
|
return Promise.all(map(_directories, async (_directory) => {
|
|
97
97
|
_directory = PlatformUtils.join(directory, _directory);
|
|
98
98
|
return Helper.lookupNpmInDirectory(node_modules_dir, _directory, modules, options);
|
|
@@ -127,12 +127,12 @@ export class Helper {
|
|
|
127
127
|
return directories;
|
|
128
128
|
}
|
|
129
129
|
static async lookupNpmInDirectory(node_modules_dir, directory, modules = [], options) {
|
|
130
|
-
|
|
130
|
+
const _path = join(node_modules_dir, directory);
|
|
131
131
|
if (!existsSync(join(_path, C_PACKAGE_JSON))) {
|
|
132
132
|
return;
|
|
133
133
|
}
|
|
134
|
-
|
|
135
|
-
|
|
134
|
+
const package_json = await this.getPackageJson(_path);
|
|
135
|
+
const modul_exists = find(modules, x => x.name === directory);
|
|
136
136
|
if (modul_exists) {
|
|
137
137
|
return;
|
|
138
138
|
}
|
|
@@ -147,10 +147,8 @@ export class Helper {
|
|
|
147
147
|
modules.push(package_json);
|
|
148
148
|
if (options.subModulePaths) {
|
|
149
149
|
// look in subpath like "node_modules"
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}));
|
|
153
|
-
for (let res of results) {
|
|
150
|
+
const results = await Promise.all(map(options.subModulePaths, subpath => this.look(_path, subpath, modules, options)));
|
|
151
|
+
for (const res of results) {
|
|
154
152
|
if (res.subpath === C_NODE_MODULES) {
|
|
155
153
|
package_json.has_node_modules = res.has_modules;
|
|
156
154
|
package_json.child_modules = res.child_modules;
|
|
@@ -167,22 +165,22 @@ export class Helper {
|
|
|
167
165
|
}
|
|
168
166
|
static async look(_path, subpath, modules = [], options) {
|
|
169
167
|
// FIXME detect the node_modules path
|
|
170
|
-
|
|
171
|
-
|
|
168
|
+
const _new_node_module_dir = join(_path, subpath);
|
|
169
|
+
const info = {
|
|
172
170
|
subpath: subpath,
|
|
173
171
|
has_modules: false,
|
|
174
172
|
child_modules: []
|
|
175
173
|
};
|
|
176
174
|
if (PlatformUtils.fileExist(_new_node_module_dir)) {
|
|
177
175
|
try {
|
|
178
|
-
|
|
176
|
+
const stat = await this.stat(_new_node_module_dir);
|
|
179
177
|
if (stat && stat.isDirectory()) {
|
|
180
|
-
|
|
178
|
+
const _modules = await this.npmls(_new_node_module_dir, options);
|
|
181
179
|
info.has_modules = true;
|
|
182
|
-
for (
|
|
180
|
+
for (const _x of _modules) {
|
|
183
181
|
info.child_modules.push(_x.name);
|
|
184
|
-
|
|
185
|
-
return _m.name
|
|
182
|
+
const _modul_exists = modules.find(function (_m) {
|
|
183
|
+
return _m.name === _x.name;
|
|
186
184
|
});
|
|
187
185
|
if (!_modul_exists) {
|
|
188
186
|
modules.push(_x);
|
|
@@ -197,11 +195,11 @@ export class Helper {
|
|
|
197
195
|
return info;
|
|
198
196
|
}
|
|
199
197
|
static checkPaths(paths) {
|
|
200
|
-
|
|
198
|
+
const ret_paths = [];
|
|
201
199
|
for (let _path of paths) {
|
|
202
200
|
_path = resolve(_path);
|
|
203
|
-
|
|
204
|
-
|
|
201
|
+
const _try_path = join(_path, C_NODE_MODULES);
|
|
202
|
+
const _try_package = join(_path, C_PACKAGE_JSON);
|
|
205
203
|
if (existsSync(_path)) {
|
|
206
204
|
if (existsSync(_try_package) && existsSync(_try_path)) {
|
|
207
205
|
_path = _try_path;
|
package/utils/Helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Helper.js","sourceRoot":"","sources":["../../../src/utils/Helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAQ,MAAM,IAAI,CAAC;AAC9D,OAAO,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAC,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAG/D,MAAM,OAAO,MAAM;IAEjB;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,QAAgB;QAClC,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC;QACrC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,OAAO,CAAC,KAAK,GAAI,MAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QACpE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,IAAY;QAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;oBAC1B,IAAI,GAAG,EAAE,CAAC;wBACR,MAAM,CAAC,GAAG,CAAC,CAAC;oBACd,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC;4BACH,OAAO,CAAC,GAAG,CAAC,CAAC;wBACf,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,MAAM,CAAC,GAAG,CAAC,CAAC;wBACd,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC,CAAC;IAEL,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,KAAa;QACjC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrC,
|
|
1
|
+
{"version":3,"file":"Helper.js","sourceRoot":"","sources":["../../../src/utils/Helper.ts"],"names":[],"mappings":"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"}
|