@antelopejs/core 0.2.0 → 0.3.0
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/dist/cli/common.js +1 -1
- package/dist/cli/common.js.map +1 -1
- package/dist/cli/config/get.js +3 -1
- package/dist/cli/config/get.js.map +1 -1
- package/dist/cli/config/reset.js +1 -1
- package/dist/cli/config/reset.js.map +1 -1
- package/dist/cli/config/set.js +1 -0
- package/dist/cli/config/set.js.map +1 -1
- package/dist/cli/git.d.ts +1 -0
- package/dist/cli/git.js +52 -1
- package/dist/cli/git.js.map +1 -1
- package/dist/cli/index.js +9 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/module/exports/generate.js +33 -58
- package/dist/cli/module/exports/generate.js.map +1 -1
- package/dist/cli/module/exports/set.js +1 -0
- package/dist/cli/module/exports/set.js.map +1 -1
- package/dist/cli/module/imports/add.js +2 -0
- package/dist/cli/module/imports/add.js.map +1 -1
- package/dist/cli/module/imports/install.js +4 -1
- package/dist/cli/module/imports/install.js.map +1 -1
- package/dist/cli/module/imports/list.js +2 -0
- package/dist/cli/module/imports/list.js.map +1 -1
- package/dist/cli/module/imports/remove.js +3 -0
- package/dist/cli/module/imports/remove.js.map +1 -1
- package/dist/cli/module/imports/update.js +5 -0
- package/dist/cli/module/imports/update.js.map +1 -1
- package/dist/cli/module/init.js +4 -1
- package/dist/cli/module/init.js.map +1 -1
- package/dist/cli/module/test.d.ts +5 -1
- package/dist/cli/module/test.js +8 -2
- package/dist/cli/module/test.js.map +1 -1
- package/dist/cli/project/init.js +3 -1
- package/dist/cli/project/init.js.map +1 -1
- package/dist/cli/project/logging/set.js +2 -0
- package/dist/cli/project/logging/set.js.map +1 -1
- package/dist/cli/project/logging/show.js +2 -1
- package/dist/cli/project/logging/show.js.map +1 -1
- package/dist/cli/project/modules/add.js +8 -3
- package/dist/cli/project/modules/add.js.map +1 -1
- package/dist/cli/project/modules/install.js +26 -13
- package/dist/cli/project/modules/install.js.map +1 -1
- package/dist/cli/project/modules/list.js +2 -1
- package/dist/cli/project/modules/list.js.map +1 -1
- package/dist/cli/project/modules/remove.js +3 -0
- package/dist/cli/project/modules/remove.js.map +1 -1
- package/dist/cli/project/modules/update.js +2 -0
- package/dist/cli/project/modules/update.js.map +1 -1
- package/dist/cli/project/run.js +3 -1
- package/dist/cli/project/run.js.map +1 -1
- package/dist/common/config.d.ts +5 -1
- package/dist/common/config.js.map +1 -1
- package/dist/common/downloader/git.js +58 -33
- package/dist/common/downloader/git.js.map +1 -1
- package/dist/common/downloader/index.d.ts +4 -1
- package/dist/common/downloader/index.js +4 -3
- package/dist/common/downloader/index.js.map +1 -1
- package/dist/common/downloader/local.js +20 -8
- package/dist/common/downloader/local.js.map +1 -1
- package/dist/common/downloader/package.js +12 -11
- package/dist/common/downloader/package.js.map +1 -1
- package/dist/common/manifest.d.ts +1 -1
- package/dist/common/manifest.js +2 -2
- package/dist/common/manifest.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +39 -7
- package/dist/index.js.map +1 -1
- package/dist/interfaces/core/beta/index.d.ts +6 -2
- package/dist/interfaces/core/beta/index.js +33 -7
- package/dist/interfaces/core/beta/index.js.map +1 -1
- package/dist/interfaces/logging/beta/index.d.ts +16 -12
- package/dist/interfaces/logging/beta/index.js +26 -37
- package/dist/interfaces/logging/beta/index.js.map +1 -1
- package/dist/loader/index.js +47 -31
- package/dist/loader/index.js.map +1 -1
- package/dist/loader/module.js +6 -5
- package/dist/loader/module.js.map +1 -1
- package/dist/logging/index.d.ts +3 -5
- package/dist/logging/index.js +10 -200
- package/dist/logging/index.js.map +1 -1
- package/dist/logging/logger.d.ts +6 -0
- package/dist/logging/logger.js +132 -0
- package/dist/logging/logger.js.map +1 -0
- package/dist/logging/terminal-display.d.ts +16 -0
- package/dist/logging/terminal-display.js +100 -0
- package/dist/logging/terminal-display.js.map +1 -0
- package/dist/logging/utils.d.ts +21 -0
- package/dist/logging/utils.js +182 -0
- package/dist/logging/utils.js.map +1 -0
- package/dist/utils/cli-ui.d.ts +7 -3
- package/dist/utils/cli-ui.js +128 -56
- package/dist/utils/cli-ui.js.map +1 -1
- package/dist/utils/command.d.ts +1 -1
- package/dist/utils/command.js +4 -7
- package/dist/utils/command.js.map +1 -1
- package/dist/utils/package-manager.js +1 -1
- package/dist/utils/package-manager.js.map +1 -1
- package/package.json +6 -3
- package/dist/cli/package-manager.d.ts +0 -6
- package/dist/cli/package-manager.js +0 -99
- package/dist/cli/package-manager.js.map +0 -1
- package/dist/cli/project/modules/fix.d.ts +0 -2
- package/dist/cli/project/modules/fix.js +0 -201
- package/dist/cli/project/modules/fix.js.map +0 -1
- package/dist/eslint.config.d.mts +0 -2
- package/dist/eslint.config.mjs +0 -85
- package/dist/eslint.config.mjs.map +0 -1
- package/dist/interfaces/core/1/decorators.d.ts +0 -29
- package/dist/interfaces/core/1/decorators.js +0 -72
- package/dist/interfaces/core/1/decorators.js.map +0 -1
- package/dist/interfaces/core/1/index.d.ts +0 -54
- package/dist/interfaces/core/1/index.js +0 -237
- package/dist/interfaces/core/1/index.js.map +0 -1
- package/dist/interfaces/core/1/modules.d.ts +0 -26
- package/dist/interfaces/core/1/modules.js +0 -31
- package/dist/interfaces/core/1/modules.js.map +0 -1
- package/dist/interfaces/logging/1/index.d.ts +0 -16
- package/dist/interfaces/logging/1/index.js +0 -49
- package/dist/interfaces/logging/1/index.js.map +0 -1
- package/dist/interfaces/logging/1/listener.d.ts +0 -9
- package/dist/interfaces/logging/1/listener.js +0 -5
- package/dist/interfaces/logging/1/listener.js.map +0 -1
- package/dist/src/cli/common.d.ts +0 -18
- package/dist/src/cli/common.js +0 -105
- package/dist/src/cli/common.js.map +0 -1
- package/dist/src/cli/config/get.d.ts +0 -2
- package/dist/src/cli/config/get.js +0 -36
- package/dist/src/cli/config/get.js.map +0 -1
- package/dist/src/cli/config/index.d.ts +0 -2
- package/dist/src/cli/config/index.js +0 -20
- package/dist/src/cli/config/index.js.map +0 -1
- package/dist/src/cli/config/reset.d.ts +0 -2
- package/dist/src/cli/config/reset.js +0 -88
- package/dist/src/cli/config/reset.js.map +0 -1
- package/dist/src/cli/config/set.d.ts +0 -2
- package/dist/src/cli/config/set.js +0 -42
- package/dist/src/cli/config/set.js.map +0 -1
- package/dist/src/cli/config/show.d.ts +0 -2
- package/dist/src/cli/config/show.js +0 -27
- package/dist/src/cli/config/show.js.map +0 -1
- package/dist/src/cli/git.d.ts +0 -43
- package/dist/src/cli/git.js +0 -227
- package/dist/src/cli/git.js.map +0 -1
- package/dist/src/cli/index.d.ts +0 -2
- package/dist/src/cli/index.js +0 -43
- package/dist/src/cli/index.js.map +0 -1
- package/dist/src/cli/module/exports/generate.d.ts +0 -2
- package/dist/src/cli/module/exports/generate.js +0 -71
- package/dist/src/cli/module/exports/generate.js.map +0 -1
- package/dist/src/cli/module/exports/index.d.ts +0 -2
- package/dist/src/cli/module/exports/index.js +0 -16
- package/dist/src/cli/module/exports/index.js.map +0 -1
- package/dist/src/cli/module/exports/set.d.ts +0 -2
- package/dist/src/cli/module/exports/set.js +0 -43
- package/dist/src/cli/module/exports/set.js.map +0 -1
- package/dist/src/cli/module/imports/add.d.ts +0 -9
- package/dist/src/cli/module/imports/add.js +0 -98
- package/dist/src/cli/module/imports/add.js.map +0 -1
- package/dist/src/cli/module/imports/index.d.ts +0 -2
- package/dist/src/cli/module/imports/index.js +0 -20
- package/dist/src/cli/module/imports/index.js.map +0 -1
- package/dist/src/cli/module/imports/list.d.ts +0 -2
- package/dist/src/cli/module/imports/list.js +0 -89
- package/dist/src/cli/module/imports/list.js.map +0 -1
- package/dist/src/cli/module/imports/remove.d.ts +0 -2
- package/dist/src/cli/module/imports/remove.js +0 -97
- package/dist/src/cli/module/imports/remove.js.map +0 -1
- package/dist/src/cli/module/imports/update.d.ts +0 -2
- package/dist/src/cli/module/imports/update.js +0 -129
- package/dist/src/cli/module/imports/update.js.map +0 -1
- package/dist/src/cli/module/index.d.ts +0 -2
- package/dist/src/cli/module/index.js +0 -20
- package/dist/src/cli/module/index.js.map +0 -1
- package/dist/src/cli/module/init.d.ts +0 -7
- package/dist/src/cli/module/init.js +0 -136
- package/dist/src/cli/module/init.js.map +0 -1
- package/dist/src/cli/module/test.d.ts +0 -6
- package/dist/src/cli/module/test.js +0 -20
- package/dist/src/cli/module/test.js.map +0 -1
- package/dist/src/cli/project/index.d.ts +0 -2
- package/dist/src/cli/project/index.js +0 -20
- package/dist/src/cli/project/index.js.map +0 -1
- package/dist/src/cli/project/init.d.ts +0 -2
- package/dist/src/cli/project/init.js +0 -116
- package/dist/src/cli/project/init.js.map +0 -1
- package/dist/src/cli/project/logging/index.d.ts +0 -2
- package/dist/src/cli/project/logging/index.js +0 -16
- package/dist/src/cli/project/logging/index.js.map +0 -1
- package/dist/src/cli/project/logging/set.d.ts +0 -2
- package/dist/src/cli/project/logging/set.js +0 -353
- package/dist/src/cli/project/logging/set.js.map +0 -1
- package/dist/src/cli/project/logging/show.d.ts +0 -2
- package/dist/src/cli/project/logging/show.js +0 -93
- package/dist/src/cli/project/logging/show.js.map +0 -1
- package/dist/src/cli/project/modules/add.d.ts +0 -11
- package/dist/src/cli/project/modules/add.js +0 -161
- package/dist/src/cli/project/modules/add.js.map +0 -1
- package/dist/src/cli/project/modules/fix.d.ts +0 -2
- package/dist/src/cli/project/modules/fix.js +0 -224
- package/dist/src/cli/project/modules/fix.js.map +0 -1
- package/dist/src/cli/project/modules/index.d.ts +0 -2
- package/dist/src/cli/project/modules/index.js +0 -20
- package/dist/src/cli/project/modules/index.js.map +0 -1
- package/dist/src/cli/project/modules/remove.d.ts +0 -9
- package/dist/src/cli/project/modules/remove.js +0 -102
- package/dist/src/cli/project/modules/remove.js.map +0 -1
- package/dist/src/cli/project/modules/update.d.ts +0 -2
- package/dist/src/cli/project/modules/update.js +0 -117
- package/dist/src/cli/project/modules/update.js.map +0 -1
- package/dist/src/cli/project/run.d.ts +0 -2
- package/dist/src/cli/project/run.js +0 -60
- package/dist/src/cli/project/run.js.map +0 -1
- package/dist/src/common/cache.d.ts +0 -14
- package/dist/src/common/cache.js +0 -99
- package/dist/src/common/cache.js.map +0 -1
- package/dist/src/common/config.d.ts +0 -58
- package/dist/src/common/config.js +0 -159
- package/dist/src/common/config.js.map +0 -1
- package/dist/src/common/downloader/git.d.ts +0 -8
- package/dist/src/common/downloader/git.js +0 -64
- package/dist/src/common/downloader/git.js.map +0 -1
- package/dist/src/common/downloader/index.d.ts +0 -10
- package/dist/src/common/downloader/index.js +0 -50
- package/dist/src/common/downloader/index.js.map +0 -1
- package/dist/src/common/downloader/local.d.ts +0 -11
- package/dist/src/common/downloader/local.js +0 -39
- package/dist/src/common/downloader/local.js.map +0 -1
- package/dist/src/common/downloader/package.d.ts +0 -6
- package/dist/src/common/downloader/package.js +0 -79
- package/dist/src/common/downloader/package.js.map +0 -1
- package/dist/src/common/manifest.d.ts +0 -45
- package/dist/src/common/manifest.js +0 -114
- package/dist/src/common/manifest.js.map +0 -1
- package/dist/src/index.d.ts +0 -5
- package/dist/src/index.js +0 -117
- package/dist/src/index.js.map +0 -1
- package/dist/src/interfaces/core/1/decorators.d.ts +0 -29
- package/dist/src/interfaces/core/1/decorators.js +0 -72
- package/dist/src/interfaces/core/1/decorators.js.map +0 -1
- package/dist/src/interfaces/core/1/index.d.ts +0 -54
- package/dist/src/interfaces/core/1/index.js +0 -237
- package/dist/src/interfaces/core/1/index.js.map +0 -1
- package/dist/src/interfaces/core/1/modules.d.ts +0 -26
- package/dist/src/interfaces/core/1/modules.js +0 -31
- package/dist/src/interfaces/core/1/modules.js.map +0 -1
- package/dist/src/interfaces/logging/1/index.d.ts +0 -16
- package/dist/src/interfaces/logging/1/index.js +0 -49
- package/dist/src/interfaces/logging/1/index.js.map +0 -1
- package/dist/src/interfaces/logging/1/listener.d.ts +0 -9
- package/dist/src/interfaces/logging/1/listener.js +0 -5
- package/dist/src/interfaces/logging/1/listener.js.map +0 -1
- package/dist/src/loader/index.d.ts +0 -42
- package/dist/src/loader/index.js +0 -428
- package/dist/src/loader/index.js.map +0 -1
- package/dist/src/loader/module.d.ts +0 -29
- package/dist/src/loader/module.js +0 -139
- package/dist/src/loader/module.js.map +0 -1
- package/dist/src/logging/index.d.ts +0 -5
- package/dist/src/logging/index.js +0 -118
- package/dist/src/logging/index.js.map +0 -1
- package/dist/src/utils/cli-ui.d.ts +0 -34
- package/dist/src/utils/cli-ui.js +0 -173
- package/dist/src/utils/cli-ui.js.map +0 -1
- package/dist/src/utils/command.d.ts +0 -3
- package/dist/src/utils/command.js +0 -33
- package/dist/src/utils/command.js.map +0 -1
- package/dist/src/utils/object.d.ts +0 -2
- package/dist/src/utils/object.js +0 -26
- package/dist/src/utils/object.js.map +0 -1
- package/dist/src/utils/promise.d.ts +0 -3
- package/dist/src/utils/promise.js +0 -24
- package/dist/src/utils/promise.js.map +0 -1
- package/dist/utils/antelope-runner.d.ts +0 -1
- package/dist/utils/antelope-runner.js +0 -29
- package/dist/utils/antelope-runner.js.map +0 -1
- package/dist/utils/logger.d.ts +0 -5
- package/dist/utils/logger.js +0 -14
- package/dist/utils/logger.js.map +0 -1
|
@@ -10,6 +10,8 @@ const command_1 = require("../../utils/command");
|
|
|
10
10
|
const manifest_1 = require("../manifest");
|
|
11
11
|
const node_os_1 = __importDefault(require("node:os"));
|
|
12
12
|
const beta_1 = require("../../interfaces/logging/beta");
|
|
13
|
+
const terminal_display_1 = require("../../logging/terminal-display");
|
|
14
|
+
const Logger = new beta_1.Logging.Channel('loader.local');
|
|
13
15
|
function ReplaceUnixRelativeHome(path) {
|
|
14
16
|
const homeDir = node_os_1.default.homedir();
|
|
15
17
|
if (path.startsWith('~')) {
|
|
@@ -30,29 +32,39 @@ function ReplaceUnixRelativeHome(path) {
|
|
|
30
32
|
await (0, promises_1.access)(formattedPath);
|
|
31
33
|
}
|
|
32
34
|
catch (error) {
|
|
33
|
-
|
|
35
|
+
Logger.Error(`Path does not exist or is not accessible: ${formattedPath}`);
|
|
34
36
|
throw error;
|
|
35
37
|
}
|
|
36
38
|
if (source.installCommand) {
|
|
37
|
-
|
|
39
|
+
Logger.Debug(`Running install commands for ${formattedPath}`);
|
|
40
|
+
await terminal_display_1.terminalDisplay.startSpinner(`Installing dependencies for ${formattedPath}`);
|
|
38
41
|
if (Array.isArray(source.installCommand)) {
|
|
39
42
|
for (const command of source.installCommand) {
|
|
40
|
-
|
|
41
|
-
await (0, command_1.ExecuteCMD)(command, { cwd: formattedPath }
|
|
43
|
+
Logger.Debug(`Executing command: ${command}`);
|
|
44
|
+
const result = await (0, command_1.ExecuteCMD)(command, { cwd: formattedPath });
|
|
45
|
+
if (result.code !== 0) {
|
|
46
|
+
await terminal_display_1.terminalDisplay.failSpinner(`Failed to install dependencies: ${result.stderr}`);
|
|
47
|
+
throw new Error(`Failed to install dependencies: ${result.stderr}`);
|
|
48
|
+
}
|
|
42
49
|
}
|
|
43
50
|
}
|
|
44
51
|
else {
|
|
45
|
-
|
|
46
|
-
await (0, command_1.ExecuteCMD)(source.installCommand, { cwd: formattedPath }
|
|
52
|
+
Logger.Debug(`Executing command: ${source.installCommand}`);
|
|
53
|
+
const result = await (0, command_1.ExecuteCMD)(source.installCommand, { cwd: formattedPath });
|
|
54
|
+
if (result.code !== 0) {
|
|
55
|
+
await terminal_display_1.terminalDisplay.failSpinner(`Failed to install dependencies: ${result.stderr}`);
|
|
56
|
+
throw new Error(`Failed to install dependencies: ${result.stderr}`);
|
|
57
|
+
}
|
|
47
58
|
}
|
|
59
|
+
await terminal_display_1.terminalDisplay.stopSpinner(`Dependencies installed for ${formattedPath}`);
|
|
48
60
|
}
|
|
49
|
-
return [new manifest_1.ModuleManifest(formattedPath, source)];
|
|
61
|
+
return [new manifest_1.ModuleManifest(formattedPath, source, source.id)];
|
|
50
62
|
});
|
|
51
63
|
(0, _1.RegisterLoader)('local-folder', 'path', (_, source) => {
|
|
52
64
|
const searchPath = ReplaceUnixRelativeHome(source.path);
|
|
53
65
|
return (0, promises_1.readdir)(searchPath).then((names) => names.map((name) => {
|
|
54
66
|
const folder = path_1.default.join(searchPath, name);
|
|
55
|
-
return new manifest_1.ModuleManifest(folder, { type: 'local', path: folder });
|
|
67
|
+
return new manifest_1.ModuleManifest(folder, { type: 'local', path: folder }, `${source.id}-${name}`);
|
|
56
68
|
}));
|
|
57
69
|
});
|
|
58
70
|
//# sourceMappingURL=local.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/common/downloader/local.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,wBAAiD;AACjD,0CAA8C;AAC9C,iDAAiD;AACjD,0CAA6C;AAE7C,sDAAyB;AACzB,wDAAwD;
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/common/downloader/local.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,40 +18,41 @@ function Extract(from, to) {
|
|
|
18
18
|
i.on('end', resolve);
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
|
+
const Logger = new beta_1.Logging.Channel('loader.package');
|
|
21
22
|
(0, _1.RegisterLoader)('package', 'package', async (cache, source) => {
|
|
22
|
-
|
|
23
|
+
Logger.Debug(`Loading package: ${source.package}@${source.version}`);
|
|
23
24
|
let folder;
|
|
24
25
|
let manifest;
|
|
25
26
|
if (!source.ignoreCache && cache.hasVersion(source.package, source.version)) {
|
|
26
|
-
|
|
27
|
+
Logger.Trace(`Using cached version of ${source.package}@${source.version}`);
|
|
27
28
|
folder = await cache.getFolder(source.package, true, true);
|
|
28
29
|
manifest = require(path_1.default.join(folder, 'package.json'));
|
|
29
30
|
}
|
|
30
31
|
else {
|
|
31
|
-
|
|
32
|
+
Logger.Trace(`Downloading package ${source.package}@${source.version}`);
|
|
32
33
|
const tmp = await cache_1.ModuleCache.getTemp();
|
|
33
|
-
const result = await (0, command_1.ExecuteCMD)(`npm pack ${source.package}@${source.version}`, { cwd: tmp }
|
|
34
|
+
const result = await (0, command_1.ExecuteCMD)(`npm pack ${source.package}@${source.version}`, { cwd: tmp });
|
|
34
35
|
if (result.code !== 0) {
|
|
35
36
|
throw new Error(`Failed to pack npm package: ${result.stderr}`);
|
|
36
37
|
}
|
|
37
38
|
const filename = result.stdout.trim();
|
|
38
39
|
try {
|
|
39
|
-
|
|
40
|
+
Logger.Debug(`Extracting ${filename} for ${source.package}@${source.version}`);
|
|
40
41
|
await Extract(`${tmp}/${filename}`, tmp);
|
|
41
42
|
}
|
|
42
43
|
catch (e) {
|
|
43
|
-
|
|
44
|
+
Logger.Error(`Failed to extract package ${source.package}@${source.version}:`, e);
|
|
44
45
|
return [];
|
|
45
46
|
}
|
|
46
47
|
const tmpPackage = path_1.default.join(tmp, 'package');
|
|
47
48
|
manifest = require(path_1.default.join(tmpPackage, 'package.json'));
|
|
48
|
-
|
|
49
|
+
Logger.Trace(`Transferring ${source.package}@${source.version} to cache`);
|
|
49
50
|
folder = await cache.transfer(tmpPackage, source.package, manifest.version);
|
|
50
|
-
|
|
51
|
+
Logger.Debug(`Installing dependencies for ${source.package}@${source.version}`);
|
|
51
52
|
const installCmd = await (0, package_manager_1.getInstallCommand)(folder);
|
|
52
|
-
await (0, command_1.ExecuteCMD)(installCmd, { cwd: folder }
|
|
53
|
+
await (0, command_1.ExecuteCMD)(installCmd, { cwd: folder });
|
|
53
54
|
}
|
|
54
|
-
|
|
55
|
-
return [new manifest_1.ModuleManifest(folder, source)];
|
|
55
|
+
Logger.Debug(`Successfully loaded ${source.package}@${source.version}`);
|
|
56
|
+
return [new manifest_1.ModuleManifest(folder, source, source.id)];
|
|
56
57
|
});
|
|
57
58
|
//# sourceMappingURL=package.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/common/downloader/package.ts"],"names":[],"mappings":";;;;;AAAA,wBAAiD;AACjD,oCAAuC;AACvC,gDAAwB;AACxB,wDAAwD;
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/common/downloader/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ export declare class ModuleManifest {
|
|
|
42
42
|
replace: string;
|
|
43
43
|
}>;
|
|
44
44
|
static readManifest(folder: string): ModulePackageJson;
|
|
45
|
-
constructor(folder: string, source: ModuleSource);
|
|
45
|
+
constructor(folder: string, source: ModuleSource, name: string);
|
|
46
46
|
loadExports(): Promise<void>;
|
|
47
47
|
reload(): Promise<void>;
|
|
48
48
|
}
|
package/dist/common/manifest.js
CHANGED
|
@@ -44,11 +44,11 @@ class ModuleManifest {
|
|
|
44
44
|
}
|
|
45
45
|
return packageJson;
|
|
46
46
|
}
|
|
47
|
-
constructor(folder, source) {
|
|
47
|
+
constructor(folder, source, name) {
|
|
48
48
|
this.source = source;
|
|
49
|
+
this.name = name;
|
|
49
50
|
this.folder = path_1.default.resolve(folder);
|
|
50
51
|
this.manifest = ModuleManifest.readManifest(this.folder);
|
|
51
|
-
this.name = this.manifest.name;
|
|
52
52
|
this.version = this.manifest.version;
|
|
53
53
|
this.exportsPath = path_1.default.join(this.folder, this.manifest.antelopeJs?.exportsPath || 'interfaces');
|
|
54
54
|
this.imports = this.manifest.antelopeJs?.imports?.map(mapModuleImport) ?? [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/common/manifest.ts"],"names":[],"mappings":";;;;;;AAQA,0CAEC;AAVD,gDAAwB;AAExB,2BAA8C;AAC9C,0CAA6C;AAC7C,qDAAqD;AAIrD,SAAgB,eAAe,CAAC,YAA0B;IACxD,OAAO,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;AAC7E,CAAC;AA6BD,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/common/manifest.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export interface LaunchOptions {
|
|
2
2
|
watch?: boolean;
|
|
3
3
|
concurrency?: number;
|
|
4
|
+
interactive?: boolean;
|
|
4
5
|
}
|
|
5
|
-
export declare function TestModule(moduleFolder?: string): Promise<void>;
|
|
6
|
+
export declare function TestModule(moduleFolder?: string, files?: string[]): Promise<void>;
|
|
6
7
|
export default function (projectFolder?: string, env?: string, options?: LaunchOptions): Promise<void>;
|
package/dist/index.js
CHANGED
|
@@ -9,18 +9,19 @@ const config_1 = require("./common/config");
|
|
|
9
9
|
const loader_1 = require("./loader");
|
|
10
10
|
const async_exit_hook_1 = __importDefault(require("async-exit-hook"));
|
|
11
11
|
const path_1 = __importDefault(require("path"));
|
|
12
|
-
const logging_1 =
|
|
12
|
+
const logging_1 = require("./logging");
|
|
13
13
|
const beta_1 = require("./interfaces/logging/beta");
|
|
14
14
|
const assert_1 = __importDefault(require("assert"));
|
|
15
15
|
const mocha_1 = __importDefault(require("mocha"));
|
|
16
16
|
const promises_1 = require("fs/promises");
|
|
17
17
|
const stream_1 = require("stream");
|
|
18
|
+
const repl_1 = __importDefault(require("repl"));
|
|
18
19
|
stream_1.Writable.prototype.setMaxListeners(20);
|
|
19
20
|
async function ConvertConfig(config) {
|
|
20
21
|
return {
|
|
21
22
|
sources: Object.entries(config.modules)
|
|
22
23
|
.filter(([, module]) => 'source' in module)
|
|
23
|
-
.map(([id, module]) => ({
|
|
24
|
+
.map(([id, module]) => ({ ...module.source, id })),
|
|
24
25
|
configs: Object.entries(config.modules).reduce((configs, [name, module]) => {
|
|
25
26
|
configs[name] = {
|
|
26
27
|
config: module.config,
|
|
@@ -40,6 +41,19 @@ async function ConvertConfig(config) {
|
|
|
40
41
|
}, {}),
|
|
41
42
|
};
|
|
42
43
|
}
|
|
44
|
+
function setupProcessHandlers() {
|
|
45
|
+
process.on('uncaughtException', (error) => {
|
|
46
|
+
beta_1.Logging.Error(error.message);
|
|
47
|
+
process.exit(1);
|
|
48
|
+
});
|
|
49
|
+
process.on('unhandledRejection', (reason) => {
|
|
50
|
+
beta_1.Logging.Error(reason);
|
|
51
|
+
process.exit(1);
|
|
52
|
+
});
|
|
53
|
+
process.on('warning', (warning) => {
|
|
54
|
+
beta_1.Logging.Warn(warning.message);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
43
57
|
async function addTestFolder(mocha, folder, matcher) {
|
|
44
58
|
const files = await (0, promises_1.readdir)(folder);
|
|
45
59
|
for (const file of files) {
|
|
@@ -48,12 +62,12 @@ async function addTestFolder(mocha, folder, matcher) {
|
|
|
48
62
|
await addTestFolder(mocha, filePath, matcher);
|
|
49
63
|
}
|
|
50
64
|
else if (matcher.test(filePath)) {
|
|
51
|
-
|
|
65
|
+
beta_1.Logging.Debug('Adding test file', filePath);
|
|
52
66
|
mocha.addFile(filePath);
|
|
53
67
|
}
|
|
54
68
|
}
|
|
55
69
|
}
|
|
56
|
-
async function TestModule(moduleFolder = '.') {
|
|
70
|
+
async function TestModule(moduleFolder = '.', files) {
|
|
57
71
|
const moduleRoot = path_1.default.resolve(moduleFolder);
|
|
58
72
|
const pack = require(path_1.default.join(moduleRoot, 'package.json'));
|
|
59
73
|
(0, assert_1.default)(pack, 'Missing package.json');
|
|
@@ -66,7 +80,8 @@ async function TestModule(moduleFolder = '.') {
|
|
|
66
80
|
const rawconfig = require(testProject);
|
|
67
81
|
const config = 'setup' in rawconfig ? await rawconfig.setup() : rawconfig;
|
|
68
82
|
try {
|
|
69
|
-
(0, logging_1.
|
|
83
|
+
(0, logging_1.setupAntelopeProjectLogging)(config.logging);
|
|
84
|
+
setupProcessHandlers();
|
|
70
85
|
const moduleManager = new loader_1.ModuleManager(moduleRoot, path_1.default.resolve(path_1.default.join(__dirname, '..')), config.cacheFolder);
|
|
71
86
|
const legacyModuleList = await ConvertConfig(config);
|
|
72
87
|
try {
|
|
@@ -79,7 +94,14 @@ async function TestModule(moduleFolder = '.') {
|
|
|
79
94
|
moduleManager.startModules();
|
|
80
95
|
const testFolder = path_1.default.join(moduleRoot, testConfig.folder);
|
|
81
96
|
const mocha = new mocha_1.default();
|
|
82
|
-
|
|
97
|
+
if (files) {
|
|
98
|
+
for (const file of files) {
|
|
99
|
+
mocha.addFile(file);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
await addTestFolder(mocha, testFolder, /\.js$/);
|
|
104
|
+
}
|
|
83
105
|
await new Promise((resolve) => mocha.run().on('end', resolve));
|
|
84
106
|
try {
|
|
85
107
|
await moduleManager.shutdown();
|
|
@@ -96,7 +118,8 @@ async function TestModule(moduleFolder = '.') {
|
|
|
96
118
|
}
|
|
97
119
|
async function default_1(projectFolder = '.', env = 'default', options = {}) {
|
|
98
120
|
const config = await (0, config_1.LoadConfig)(projectFolder, env);
|
|
99
|
-
(0, logging_1.
|
|
121
|
+
(0, logging_1.setupAntelopeProjectLogging)(config.logging);
|
|
122
|
+
setupProcessHandlers();
|
|
100
123
|
const moduleManager = new loader_1.ModuleManager(path_1.default.resolve(projectFolder), path_1.default.resolve(path_1.default.join(__dirname, '..')), path_1.default.join(projectFolder, config.cacheFolder), options.concurrency);
|
|
101
124
|
const legacyModuleList = await ConvertConfig(config);
|
|
102
125
|
try {
|
|
@@ -110,6 +133,15 @@ async function default_1(projectFolder = '.', env = 'default', options = {}) {
|
|
|
110
133
|
await moduleManager.startWatcher().catch(beta_1.Logging.Error);
|
|
111
134
|
}
|
|
112
135
|
moduleManager.startModules();
|
|
136
|
+
if (options.interactive) {
|
|
137
|
+
const con = repl_1.default.start('> ');
|
|
138
|
+
con.context.moduleManager = moduleManager;
|
|
139
|
+
con.setupHistory('.debugger_history', () => { });
|
|
140
|
+
con.on('close', async () => {
|
|
141
|
+
await moduleManager.shutdown();
|
|
142
|
+
process.exit(0);
|
|
143
|
+
});
|
|
144
|
+
}
|
|
113
145
|
(0, async_exit_hook_1.default)(async (callback) => {
|
|
114
146
|
try {
|
|
115
147
|
await moduleManager.shutdown();
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,11 +41,15 @@ export declare function InterfaceFunction<T extends Func = Func, R = Awaited<Ret
|
|
|
41
41
|
type InterfaceImplType<T> = T extends RegisteringProxy<infer P> ? {
|
|
42
42
|
register: P;
|
|
43
43
|
unregister: (id: RID<P>) => void;
|
|
44
|
-
} : T extends EventProxy ? never : T extends (...args:
|
|
44
|
+
} : T extends EventProxy ? never : T extends (...args: infer A) => infer R ? (...args: A) => Awaited<R> | R : T extends Record<string, any> ? InterfaceToImpl<T> : never;
|
|
45
45
|
type InterfaceToImpl<T> = T extends infer P ? {
|
|
46
46
|
[K in keyof P]?: InterfaceImplType<P[K]>;
|
|
47
47
|
} : never;
|
|
48
|
-
export declare function ImplementInterface<T, T2
|
|
48
|
+
export declare function ImplementInterface<T extends Record<string, unknown>, T2 extends InterfaceToImpl<T>>(declaration: T, implementation: T2): {
|
|
49
|
+
declaration: T;
|
|
50
|
+
implementation: T2;
|
|
51
|
+
};
|
|
52
|
+
export declare function ImplementInterface<T extends Record<string, unknown>, T2 extends InterfaceToImpl<T>>(declaration: T | Promise<T>, implementation: T2 | Promise<T2>): Promise<{
|
|
49
53
|
declaration: Awaited<T>;
|
|
50
54
|
implementation: T2;
|
|
51
55
|
}>;
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.internal = exports.EventProxy = exports.RegisteringProxy = exports.AsyncProxy = void 0;
|
|
4
7
|
exports.GetResponsibleModule = GetResponsibleModule;
|
|
@@ -8,6 +11,7 @@ exports.ImplementInterface = ImplementInterface;
|
|
|
8
11
|
exports.GetInterfaceInstances = GetInterfaceInstances;
|
|
9
12
|
exports.GetInterfaceInstance = GetInterfaceInstance;
|
|
10
13
|
require("reflect-metadata");
|
|
14
|
+
const beta_1 = __importDefault(require("../../logging/beta"));
|
|
11
15
|
class AsyncProxy {
|
|
12
16
|
callback;
|
|
13
17
|
queue = [];
|
|
@@ -103,6 +107,9 @@ class EventProxy {
|
|
|
103
107
|
}
|
|
104
108
|
}
|
|
105
109
|
register(func) {
|
|
110
|
+
if (this.registered.some((existing) => existing.func === func)) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
106
113
|
const module = GetResponsibleModule();
|
|
107
114
|
this.registered.push({ module, func });
|
|
108
115
|
}
|
|
@@ -140,21 +147,23 @@ function GetResponsibleModule(ignoreInterfaces = true, startFrame = 0) {
|
|
|
140
147
|
const oldHandler = Error.prepareStackTrace;
|
|
141
148
|
const oldLimit = Error.stackTraceLimit;
|
|
142
149
|
Error.stackTraceLimit = Infinity;
|
|
143
|
-
Error.prepareStackTrace = (_, trace) => trace
|
|
150
|
+
Error.prepareStackTrace = (_, trace) => trace;
|
|
144
151
|
const errObj = {};
|
|
145
152
|
Error.captureStackTrace(errObj, GetResponsibleModule);
|
|
146
153
|
const trace = errObj.stack;
|
|
147
154
|
Error.prepareStackTrace = oldHandler;
|
|
148
155
|
Error.stackTraceLimit = oldLimit;
|
|
149
156
|
let currentFound = '';
|
|
157
|
+
let lastInterface = '';
|
|
150
158
|
let currentBestMatch = 0;
|
|
151
159
|
for (let i = startFrame; i < trace.length; ++i) {
|
|
152
|
-
const fileName = trace[i];
|
|
153
|
-
if (!fileName || fileName.match(/[/\\]node_modules[/\\]/)) {
|
|
160
|
+
const fileName = trace[i].getFileName();
|
|
161
|
+
if (!fileName || fileName.startsWith('node:internal/') || fileName.match(/[/\\]node_modules[/\\]/)) {
|
|
154
162
|
continue;
|
|
155
163
|
}
|
|
156
164
|
for (const { dir, id, interfaceDir } of internal.moduleByFolder) {
|
|
157
165
|
if (ignoreInterfaces && fileName.startsWith(interfaceDir)) {
|
|
166
|
+
lastInterface = id;
|
|
158
167
|
currentFound = '';
|
|
159
168
|
currentBestMatch = 0;
|
|
160
169
|
break;
|
|
@@ -168,6 +177,14 @@ function GetResponsibleModule(ignoreInterfaces = true, startFrame = 0) {
|
|
|
168
177
|
return currentFound;
|
|
169
178
|
}
|
|
170
179
|
}
|
|
180
|
+
if (trace[trace.length - 1].getFileName() === 'node:internal/timers') {
|
|
181
|
+
const tracestr = trace
|
|
182
|
+
.filter((site) => !site.getFileName()?.startsWith('node:internal/'))
|
|
183
|
+
.map((site) => site.toString())
|
|
184
|
+
.join('\n - ');
|
|
185
|
+
beta_1.default.Error('GetResponsibleModule called from within an async context, this will break hot reloading!\n - ' + tracestr);
|
|
186
|
+
}
|
|
187
|
+
return lastInterface;
|
|
171
188
|
}
|
|
172
189
|
function GetMetadata(target, meta, inherit = true) {
|
|
173
190
|
let data = Reflect.getOwnMetadata(meta.key, target);
|
|
@@ -197,9 +214,7 @@ function InterfaceFunction() {
|
|
|
197
214
|
func.proxy = proxy;
|
|
198
215
|
return func;
|
|
199
216
|
}
|
|
200
|
-
|
|
201
|
-
const decl = await declaration;
|
|
202
|
-
const impl = (await implementation);
|
|
217
|
+
function implement(decl, impl) {
|
|
203
218
|
for (const key in decl) {
|
|
204
219
|
if (key in impl) {
|
|
205
220
|
const val = decl[key];
|
|
@@ -214,10 +229,21 @@ async function ImplementInterface(declaration, implementation) {
|
|
|
214
229
|
val.onCall(impl[key]);
|
|
215
230
|
}
|
|
216
231
|
else if (!(val instanceof EventProxy)) {
|
|
217
|
-
|
|
232
|
+
implement(val, impl[key]);
|
|
218
233
|
}
|
|
219
234
|
}
|
|
220
235
|
}
|
|
236
|
+
}
|
|
237
|
+
function ImplementInterface(declaration, implementation) {
|
|
238
|
+
if (declaration instanceof Promise || implementation instanceof Promise) {
|
|
239
|
+
return Promise.all([declaration, implementation]).then(([decl, impl]) => {
|
|
240
|
+
implement(decl, impl);
|
|
241
|
+
return { declaration: decl, implementation: impl };
|
|
242
|
+
});
|
|
243
|
+
}
|
|
244
|
+
const decl = declaration;
|
|
245
|
+
const impl = implementation;
|
|
246
|
+
implement(decl, impl);
|
|
221
247
|
return { declaration: decl, implementation: impl };
|
|
222
248
|
}
|
|
223
249
|
function GetInterfaceInstances(interfaceID) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/interfaces/core/beta/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/interfaces/core/beta/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,20 +4,24 @@ export declare namespace Logging {
|
|
|
4
4
|
WARN = 30,
|
|
5
5
|
INFO = 20,
|
|
6
6
|
DEBUG = 10,
|
|
7
|
-
TRACE = 0
|
|
7
|
+
TRACE = 0,
|
|
8
|
+
NO_PREFIX = -1
|
|
8
9
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
function Trace(...args: any[]): void;
|
|
10
|
+
class Channel {
|
|
11
|
+
readonly channel: string;
|
|
12
|
+
constructor(channel: string);
|
|
13
|
+
Error(...args: any[]): void;
|
|
14
|
+
Warn(...args: any[]): void;
|
|
15
|
+
Info(...args: any[]): void;
|
|
16
|
+
Debug(...args: any[]): void;
|
|
17
|
+
Trace(...args: any[]): void;
|
|
18
|
+
Write(levelId: number, ...args: any[]): void;
|
|
19
19
|
}
|
|
20
|
-
|
|
20
|
+
const Error: (...args: any[]) => void;
|
|
21
|
+
const Warn: (...args: any[]) => void;
|
|
22
|
+
const Info: (...args: any[]) => void;
|
|
23
|
+
const Debug: (...args: any[]) => void;
|
|
24
|
+
const Trace: (...args: any[]) => void;
|
|
21
25
|
function Write(levelId: number, channel: string, ...args: any[]): void;
|
|
22
26
|
}
|
|
23
27
|
export default Logging;
|
|
@@ -14,50 +14,39 @@ var Logging;
|
|
|
14
14
|
Level[Level["INFO"] = 20] = "INFO";
|
|
15
15
|
Level[Level["DEBUG"] = 10] = "DEBUG";
|
|
16
16
|
Level[Level["TRACE"] = 0] = "TRACE";
|
|
17
|
+
Level[Level["NO_PREFIX"] = -1] = "NO_PREFIX";
|
|
17
18
|
})(Level = Logging.Level || (Logging.Level = {}));
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
Logging.Info = Info;
|
|
30
|
-
function Debug(...args) {
|
|
31
|
-
Write(Level.DEBUG, 'main', ...args);
|
|
32
|
-
}
|
|
33
|
-
Logging.Debug = Debug;
|
|
34
|
-
let inline;
|
|
35
|
-
(function (inline) {
|
|
36
|
-
function Error(...args) {
|
|
37
|
-
Write(Level.ERROR, 'inline', ...args);
|
|
19
|
+
class Channel {
|
|
20
|
+
channel;
|
|
21
|
+
constructor(channel) {
|
|
22
|
+
this.channel = channel;
|
|
23
|
+
}
|
|
24
|
+
Error(...args) {
|
|
25
|
+
Write(Level.ERROR, this.channel, ...args);
|
|
26
|
+
}
|
|
27
|
+
Warn(...args) {
|
|
28
|
+
Write(Level.WARN, this.channel, ...args);
|
|
38
29
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
Write(Level.WARN, 'inline', ...args);
|
|
30
|
+
Info(...args) {
|
|
31
|
+
Write(Level.INFO, this.channel, ...args);
|
|
42
32
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
Write(Level.INFO, 'inline', ...args);
|
|
33
|
+
Debug(...args) {
|
|
34
|
+
Write(Level.DEBUG, this.channel, ...args);
|
|
46
35
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
Write(Level.DEBUG, 'inline', ...args);
|
|
36
|
+
Trace(...args) {
|
|
37
|
+
Write(Level.TRACE, this.channel, ...args);
|
|
50
38
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
Write(Level.TRACE, 'inline', ...args);
|
|
39
|
+
Write(levelId, ...args) {
|
|
40
|
+
Write(levelId, this.channel, ...args);
|
|
54
41
|
}
|
|
55
|
-
inline.Trace = Trace;
|
|
56
|
-
})(inline = Logging.inline || (Logging.inline = {}));
|
|
57
|
-
function Trace(...args) {
|
|
58
|
-
Write(Level.TRACE, 'main', ...args);
|
|
59
42
|
}
|
|
60
|
-
Logging.
|
|
43
|
+
Logging.Channel = Channel;
|
|
44
|
+
const MainChannel = new Channel('main');
|
|
45
|
+
Logging.Error = MainChannel.Error.bind(MainChannel);
|
|
46
|
+
Logging.Warn = MainChannel.Warn.bind(MainChannel);
|
|
47
|
+
Logging.Info = MainChannel.Info.bind(MainChannel);
|
|
48
|
+
Logging.Debug = MainChannel.Debug.bind(MainChannel);
|
|
49
|
+
Logging.Trace = MainChannel.Trace.bind(MainChannel);
|
|
61
50
|
function Write(levelId, channel, ...args) {
|
|
62
51
|
listener_1.default.emit({
|
|
63
52
|
time: Date.now(),
|