@antelopejs/core 1.2.1 → 1.3.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/dist/core/cli/commands/module/test.js +4 -1
- package/dist/core/cli/commands/module/test.js.map +1 -1
- package/dist/core/cli/commands/project/dev.js +2 -1
- package/dist/core/cli/commands/project/dev.js.map +1 -1
- package/dist/core/downloaders/local-folder.js +6 -2
- package/dist/core/downloaders/local-folder.js.map +1 -1
- package/dist/core/downloaders/local.js +5 -2
- package/dist/core/downloaders/local.js.map +1 -1
- package/dist/core/downloaders/registry.d.ts +5 -2
- package/dist/core/downloaders/registry.js +4 -4
- package/dist/core/downloaders/registry.js.map +1 -1
- package/dist/core/module-manager.js +3 -3
- package/dist/core/module-manager.js.map +1 -1
- package/dist/core/resolution/interface-resolution.d.ts +1 -0
- package/dist/core/resolution/interface-resolution.js +26 -7
- package/dist/core/resolution/interface-resolution.js.map +1 -1
- package/dist/core/resolution/stub-interface-runtime.d.ts +1 -1
- package/dist/core/resolution/stub-interface-runtime.js +8 -3
- package/dist/core/resolution/stub-interface-runtime.js.map +1 -1
- package/dist/core/runtime/module-loading.js +3 -3
- package/dist/core/runtime/module-loading.js.map +1 -1
- package/dist/core/shutdown/shutdown-manager.d.ts +2 -0
- package/dist/core/shutdown/shutdown-manager.js +12 -5
- package/dist/core/shutdown/shutdown-manager.js.map +1 -1
- package/dist/core/test/test-module.js +10 -5
- package/dist/core/test/test-module.js.map +1 -1
- package/dist/core/version-checker.d.ts +1 -1
- package/dist/core/version-checker.js +29 -9
- package/dist/core/version-checker.js.map +1 -1
- package/dist/core/watch/hot-reload.d.ts +6 -0
- package/dist/core/watch/hot-reload.js +53 -14
- package/dist/core/watch/hot-reload.js.map +1 -1
- package/package.json +2 -2
|
@@ -25,7 +25,10 @@ async function moduleTestCommand(modulePath = ".", options) {
|
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
27
|
await moduleSpinner.succeed(`Valid module found: ${chalk_1.default.cyan(moduleManifest.name)}`);
|
|
28
|
-
await (0, __1.TestModule)(resolvedPath, options.file);
|
|
28
|
+
const failures = await (0, __1.TestModule)(resolvedPath, options.file);
|
|
29
|
+
if (failures > 0) {
|
|
30
|
+
process.exitCode = 1;
|
|
31
|
+
}
|
|
29
32
|
}
|
|
30
33
|
const filesOption = new commander_1.Option("-f, --file <path>", "Specific test file to run").argParser((val, prev) => [...(prev ?? []), node_path_1.default.resolve(val)]);
|
|
31
34
|
function default_1() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../src/core/cli/commands/module/test.ts"],"names":[],"mappings":";;;;;AAWA,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../src/core/cli/commands/module/test.ts"],"names":[],"mappings":";;;;;AAWA,8CAmCC;AAOD,4BASC;AA9DD,0DAA6B;AAC7B,kDAA0B;AAC1B,yCAA4C;AAC5C,mCAAyC;AACzC,yCAAoD;AACpD,yCAAkD;AAM3C,KAAK,UAAU,iBAAiB,CACrC,UAAU,GAAG,GAAG,EAChB,OAAoB;IAEpB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEhB,MAAM,YAAY,GAAG,mBAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAG9C,MAAM,aAAa,GAAG,IAAI,gBAAO,CAC/B,sBAAsB,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CACjD,CAAC;IACF,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;IAE5B,MAAM,cAAc,GAAG,MAAM,IAAA,2BAAkB,EAAC,YAAY,CAAC,CAAC;IAC9D,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,aAAa,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACrD,IAAA,cAAK,EACH,aAAa,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,8CAA8C,CACpF,CAAC;QACF,IAAA,aAAI,EACF,4EAA4E,CAC7E,CAAC;QACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,MAAM,aAAa,CAAC,OAAO,CACzB,uBAAuB,eAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CACzD,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAU,EAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QACjB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,WAAW,GAAG,IAAI,kBAAM,CAC5B,mBAAmB,EACnB,2BAA2B,CAC5B,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,IAAc,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,mBAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAE3E;IACE,OAAO,IAAI,mBAAO,CAAC,MAAM,CAAC;SACvB,WAAW,CACV,oBAAoB;QAClB,6DAA6D,CAChE;SACA,QAAQ,CAAC,QAAQ,EAAE,8BAA8B,CAAC;SAClD,SAAS,CAAC,WAAW,CAAC;SACtB,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAC/B,CAAC"}
|
|
@@ -55,7 +55,8 @@ const project_command_1 = require("../shared/project-command");
|
|
|
55
55
|
const DEFAULT_INSPECTOR = "--inspect";
|
|
56
56
|
const RUNNER_PREFIX = "antelope-runner-";
|
|
57
57
|
const DEFAULT_INSPECT_HOST = "127.0.0.1:9229";
|
|
58
|
-
const
|
|
58
|
+
const CHILD_TERMINATE_HEADROOM_MS = 2000;
|
|
59
|
+
const CHILD_TERMINATE_TIMEOUT_MS = shutdown_1.DEFAULT_SHUTDOWN_TIMEOUT_MS + CHILD_TERMINATE_HEADROOM_MS;
|
|
59
60
|
const SHUTDOWN_PRIORITY_CHILD = 20;
|
|
60
61
|
const SHUTDOWN_PRIORITY_CLEANUP = 10;
|
|
61
62
|
const SHUTDOWN_PRIORITY_SIGNAL_CLEANUP = 5;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/core/cli/commands/project/dev.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/core/cli/commands/project/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,22 +44,26 @@ const Logger = new logging_1.Logging.Channel("loader.local-folder");
|
|
|
44
44
|
function registerLocalFolderDownloader(registry, deps = {}) {
|
|
45
45
|
const fs = deps.fs ?? new filesystem_1.NodeFileSystem();
|
|
46
46
|
const exec = deps.exec ?? command_1.ExecuteCMD;
|
|
47
|
-
registry.register("local-folder", "path", async (_cache, source) => {
|
|
47
|
+
registry.register("local-folder", "path", async (_cache, source, options) => {
|
|
48
48
|
const searchPath = (0, utils_1.expandHome)(source.path);
|
|
49
49
|
const entries = await fs.readdir(searchPath);
|
|
50
50
|
const manifests = [];
|
|
51
|
+
const installCommand = options?.reload
|
|
52
|
+
? (source.reloadCommand ?? source.installCommand)
|
|
53
|
+
: source.installCommand;
|
|
51
54
|
for (const name of entries) {
|
|
52
55
|
const folder = path.join(searchPath, name);
|
|
53
56
|
const stat = await fs.stat(folder);
|
|
54
57
|
if (!stat.isDirectory())
|
|
55
58
|
continue;
|
|
56
59
|
const moduleName = source.id ? `${source.id}-${name}` : name;
|
|
57
|
-
await (0, utils_1.runInstallCommands)(exec, Logger, moduleName, folder,
|
|
60
|
+
await (0, utils_1.runInstallCommands)(exec, Logger, moduleName, folder, installCommand);
|
|
58
61
|
const moduleSource = {
|
|
59
62
|
type: "local",
|
|
60
63
|
path: folder,
|
|
61
64
|
watchDir: source.watchDir,
|
|
62
65
|
installCommand: source.installCommand,
|
|
66
|
+
reloadCommand: source.reloadCommand,
|
|
63
67
|
};
|
|
64
68
|
const manifest = await module_manifest_1.ModuleManifest.create(folder, moduleSource, moduleName, fs);
|
|
65
69
|
manifests.push(manifest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-folder.js","sourceRoot":"","sources":["../../../src/core/downloaders/local-folder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,
|
|
1
|
+
{"version":3,"file":"local-folder.js","sourceRoot":"","sources":["../../../src/core/downloaders/local-folder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,sEAuDC;AA7ED,gDAAkC;AAKlC,gEAA6D;AAE7D,4CAA4C;AAC5C,8CAA+C;AAE/C,wDAAoD;AAGpD,mCAAyD;AAEzD,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;AAO1D,SAAgB,6BAA6B,CAC3C,QAA4B,EAC5B,OAAkC,EAAE;IAEpC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,2BAAc,EAAE,CAAC;IAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,oBAAU,CAAC;IAErC,QAAQ,CAAC,QAAQ,CACf,cAAc,EACd,MAAM,EACN,KAAK,EACH,MAAmB,EACnB,MAA+B,EAC/B,OAAqB,EACrB,EAAE;QACF,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAqB,EAAE,CAAC;QAEvC,MAAM,cAAc,GAAG,OAAO,EAAE,MAAM;YACpC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,cAAc,CAAC;YACjD,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;QAE1B,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBAAE,SAAS;YAElC,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7D,MAAM,IAAA,0BAAkB,EACtB,IAAI,EACJ,MAAM,EACN,UAAU,EACV,MAAM,EACN,cAAc,CACf,CAAC;YACF,MAAM,YAAY,GAAsB;gBACtC,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,cAAc,EAAE,MAAM,CAAC,cAAc;gBACrC,aAAa,EAAE,MAAM,CAAC,aAAa;aACpC,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,gCAAc,CAAC,MAAM,CAC1C,MAAM,EACN,YAAY,EACZ,UAAU,EACV,EAAE,CACH,CAAC;YACF,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -44,13 +44,16 @@ const Logger = new logging_1.Logging.Channel("loader.local");
|
|
|
44
44
|
function registerLocalDownloader(registry, deps = {}) {
|
|
45
45
|
const fs = deps.fs ?? new filesystem_1.NodeFileSystem();
|
|
46
46
|
const exec = deps.exec ?? command_1.ExecuteCMD;
|
|
47
|
-
registry.register("local", "path", async (_cache, source) => {
|
|
47
|
+
registry.register("local", "path", async (_cache, source, options) => {
|
|
48
48
|
const formattedPath = (0, utils_1.expandHome)(source.path);
|
|
49
49
|
if (!(await fs.exists(formattedPath))) {
|
|
50
50
|
Logger.Error(`Path does not exist or is not accessible: ${formattedPath}`);
|
|
51
51
|
throw new Error(`Path does not exist or is not accessible: ${formattedPath}`);
|
|
52
52
|
}
|
|
53
|
-
|
|
53
|
+
const installCommand = options?.reload
|
|
54
|
+
? (source.reloadCommand ?? source.installCommand)
|
|
55
|
+
: source.installCommand;
|
|
56
|
+
await (0, utils_1.runInstallCommands)(exec, Logger, formattedPath, formattedPath, installCommand);
|
|
54
57
|
const name = source.id ?? path.basename(formattedPath);
|
|
55
58
|
const manifest = await module_manifest_1.ModuleManifest.create(formattedPath, source, name, fs);
|
|
56
59
|
return [manifest];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/core/downloaders/local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA,
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/core/downloaders/local.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA,0DA+CC;AAlED,gDAAkC;AAElC,gEAA6D;AAE7D,4CAA4C;AAC5C,8CAA+C;AAE/C,wDAAoD;AAGpD,mCAAyD;AAEzD,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;AAOnD,SAAgB,uBAAuB,CACrC,QAA4B,EAC5B,OAA4B,EAAE;IAE9B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,2BAAc,EAAE,CAAC;IAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,oBAAU,CAAC;IAErC,QAAQ,CAAC,QAAQ,CACf,OAAO,EACP,MAAM,EACN,KAAK,EACH,MAAmB,EACnB,MAAyB,EACzB,OAAqB,EACrB,EAAE;QACF,MAAM,aAAa,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,KAAK,CACV,6CAA6C,aAAa,EAAE,CAC7D,CAAC;YACF,MAAM,IAAI,KAAK,CACb,6CAA6C,aAAa,EAAE,CAC7D,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,OAAO,EAAE,MAAM;YACpC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,cAAc,CAAC;YACjD,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;QAE1B,MAAM,IAAA,0BAAkB,EACtB,IAAI,EACJ,MAAM,EACN,aAAa,EACb,aAAa,EACb,cAAc,CACf,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,MAAM,gCAAc,CAAC,MAAM,CAC1C,aAAa,EACb,MAAM,EACN,IAAI,EACJ,EAAE,CACH,CAAC;QACF,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import type { ModuleSource } from "@antelopejs/interface-core/config";
|
|
2
2
|
import type { ModuleCache } from "../module-cache";
|
|
3
3
|
import type { ModuleManifest } from "../module-manifest";
|
|
4
|
-
export
|
|
4
|
+
export interface LoadOptions {
|
|
5
|
+
reload?: boolean;
|
|
6
|
+
}
|
|
7
|
+
export type ModuleLoader<T extends ModuleSource = ModuleSource> = (cache: ModuleCache, source: T, options?: LoadOptions) => Promise<ModuleManifest[]>;
|
|
5
8
|
export declare class DownloaderRegistry {
|
|
6
9
|
private waiting;
|
|
7
10
|
private knownTypes;
|
|
8
11
|
register<T extends ModuleSource>(type: string, loaderIdentifier: keyof T, loader: ModuleLoader<T>): void;
|
|
9
|
-
load(projectFolder: string, cache: ModuleCache, source: ModuleSource): Promise<ModuleManifest[]>;
|
|
12
|
+
load(projectFolder: string, cache: ModuleCache, source: ModuleSource, options?: LoadOptions): Promise<ModuleManifest[]>;
|
|
10
13
|
getLoaderIdentifier(source: ModuleSource): any | undefined;
|
|
11
14
|
}
|
|
@@ -45,12 +45,12 @@ class DownloaderRegistry {
|
|
|
45
45
|
const waitingList = this.waiting.get(type);
|
|
46
46
|
if (waitingList) {
|
|
47
47
|
for (const waiter of waitingList) {
|
|
48
|
-
void loader(waiter.cache, waiter.source).then(waiter.resolve, waiter.reject);
|
|
48
|
+
void loader(waiter.cache, waiter.source, waiter.options).then(waiter.resolve, waiter.reject);
|
|
49
49
|
}
|
|
50
50
|
this.waiting.delete(type);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
-
load(projectFolder, cache, source) {
|
|
53
|
+
load(projectFolder, cache, source, options) {
|
|
54
54
|
Logger.Debug(`LoadModule called for type ${source.type}`);
|
|
55
55
|
const type = this.knownTypes.get(source.type);
|
|
56
56
|
if (type) {
|
|
@@ -61,7 +61,7 @@ class DownloaderRegistry {
|
|
|
61
61
|
source[type.loaderIdentifier] = path.resolve(projectFolder, pathValue);
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
return type.loader(cache, source);
|
|
64
|
+
return type.loader(cache, source, options);
|
|
65
65
|
}
|
|
66
66
|
Logger.Info(`No loader found for type ${source.type}, adding to waitlist`);
|
|
67
67
|
return new Promise((resolve, reject) => {
|
|
@@ -70,7 +70,7 @@ class DownloaderRegistry {
|
|
|
70
70
|
waitingList = [];
|
|
71
71
|
this.waiting.set(source.type, waitingList);
|
|
72
72
|
}
|
|
73
|
-
waitingList.push({ cache, source, resolve, reject });
|
|
73
|
+
waitingList.push({ cache, source, options, resolve, reject });
|
|
74
74
|
});
|
|
75
75
|
}
|
|
76
76
|
getLoaderIdentifier(source) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/core/downloaders/registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAElC,gEAA6D;AAI7D,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/core/downloaders/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -160,7 +160,7 @@ class ModuleManager {
|
|
|
160
160
|
return this.resolvedAssociations.get(moduleId)?.has(interfaceName) ?? false;
|
|
161
161
|
}
|
|
162
162
|
registerStubbedInterfaces(stubbed) {
|
|
163
|
-
for (const { moduleId, interfacePackage } of stubbed) {
|
|
163
|
+
for (const { moduleId, interfacePackage, standalone } of stubbed) {
|
|
164
164
|
if (this.stubbedInterfacePaths.has(interfacePackage)) {
|
|
165
165
|
continue;
|
|
166
166
|
}
|
|
@@ -174,7 +174,7 @@ class ModuleManager {
|
|
|
174
174
|
}
|
|
175
175
|
this.stubbedInterfacePaths.set(interfacePackage, pkgRoot);
|
|
176
176
|
this.resolver.interfacePackages.set(interfacePackage, pkgRoot);
|
|
177
|
-
(0, stub_interface_runtime_1.logStubInterfaceWarningOnce)(interfacePackage);
|
|
177
|
+
(0, stub_interface_runtime_1.logStubInterfaceWarningOnce)(interfacePackage, standalone);
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
180
|
resolveInterfacePackageRoot(ifacePkg, fromFolder) {
|
|
@@ -200,7 +200,7 @@ class ModuleManager {
|
|
|
200
200
|
require(interfaceName);
|
|
201
201
|
}
|
|
202
202
|
catch (err) {
|
|
203
|
-
Logger.Error(`Failed to load
|
|
203
|
+
Logger.Error(`Failed to load interface '${interfaceName}':`, err);
|
|
204
204
|
continue;
|
|
205
205
|
}
|
|
206
206
|
(0, stub_interface_runtime_1.neutralizeInterfacePackage)(pkgRoot, interfaceName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-manager.js","sourceRoot":"","sources":["../../src/core/module-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"module-manager.js","sourceRoot":"","sources":["../../src/core/module-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,16 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findUnresolvedInterfaces = findUnresolvedInterfaces;
|
|
4
4
|
const node_fs_1 = require("node:fs");
|
|
5
|
-
function
|
|
5
|
+
function readInterfacePackageInfo(dep, consumerFolder) {
|
|
6
6
|
try {
|
|
7
7
|
const pkgJsonPath = require.resolve(`${dep}/package.json`, {
|
|
8
8
|
paths: [consumerFolder],
|
|
9
9
|
});
|
|
10
10
|
const depPkg = JSON.parse((0, node_fs_1.readFileSync)(pkgJsonPath, "utf8"));
|
|
11
|
-
|
|
11
|
+
const antelopeJs = depPkg.antelopeJs;
|
|
12
|
+
return {
|
|
13
|
+
isInterface: Boolean(antelopeJs),
|
|
14
|
+
standalone: Boolean(antelopeJs?.standalone),
|
|
15
|
+
};
|
|
12
16
|
}
|
|
13
17
|
catch {
|
|
14
|
-
return false;
|
|
18
|
+
return { isInterface: false, standalone: false };
|
|
15
19
|
}
|
|
16
20
|
}
|
|
17
21
|
function findUnresolvedInterfaces(providers, consumers, knownResolved) {
|
|
@@ -29,17 +33,32 @@ function findUnresolvedInterfaces(providers, consumers, knownResolved) {
|
|
|
29
33
|
for (const dep of Object.keys(consumer.dependencies)) {
|
|
30
34
|
if (implementedInterfaces.has(dep))
|
|
31
35
|
continue;
|
|
32
|
-
|
|
36
|
+
const info = readInterfacePackageInfo(dep, consumer.folder);
|
|
37
|
+
if (!info.isInterface)
|
|
33
38
|
continue;
|
|
34
|
-
|
|
39
|
+
if (info.standalone) {
|
|
40
|
+
stubbed.push({
|
|
41
|
+
moduleId: consumer.id,
|
|
42
|
+
interfacePackage: dep,
|
|
43
|
+
standalone: true,
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
unresolved.push({ moduleId: consumer.id, interfacePackage: dep });
|
|
48
|
+
}
|
|
35
49
|
}
|
|
36
50
|
const optional = consumer.optionalDependencies ?? {};
|
|
37
51
|
for (const dep of Object.keys(optional)) {
|
|
38
52
|
if (implementedInterfaces.has(dep))
|
|
39
53
|
continue;
|
|
40
|
-
|
|
54
|
+
const info = readInterfacePackageInfo(dep, consumer.folder);
|
|
55
|
+
if (!info.isInterface)
|
|
41
56
|
continue;
|
|
42
|
-
stubbed.push({
|
|
57
|
+
stubbed.push({
|
|
58
|
+
moduleId: consumer.id,
|
|
59
|
+
interfacePackage: dep,
|
|
60
|
+
standalone: info.standalone,
|
|
61
|
+
});
|
|
43
62
|
}
|
|
44
63
|
}
|
|
45
64
|
return { unresolved, stubbed };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface-resolution.js","sourceRoot":"","sources":["../../../src/core/resolution/interface-resolution.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"interface-resolution.js","sourceRoot":"","sources":["../../../src/core/resolution/interface-resolution.ts"],"names":[],"mappings":";;AAsDA,4DAgDC;AAtGD,qCAAuC;AAmCvC,SAAS,wBAAwB,CAC/B,GAAW,EACX,cAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,eAAe,EAAE;YACzD,KAAK,EAAE,CAAC,cAAc,CAAC;SACxB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACrC,OAAO;YACL,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC;YAChC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC;SAC5C,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACnD,CAAC;AACH,CAAC;AAED,SAAgB,wBAAwB,CACtC,SAA8B,EAC9B,SAA8B,EAC9B,aAAgC;IAEhC,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAS,aAAa,CAAC,CAAC;IAC7D,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1C,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAA0B,EAAE,CAAC;IAC7C,MAAM,OAAO,GAA0B,EAAE,CAAC;IAC1C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACrD,IAAI,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAC7C,MAAM,IAAI,GAAG,wBAAwB,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,SAAS;YAGhC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,QAAQ,EAAE,QAAQ,CAAC,EAAE;oBACrB,gBAAgB,EAAE,GAAG;oBACrB,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,oBAAoB,IAAI,EAAE,CAAC;QACrD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,IAAI,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAC7C,MAAM,IAAI,GAAG,wBAAwB,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,SAAS;YAChC,OAAO,CAAC,IAAI,CAAC;gBACX,QAAQ,EAAE,QAAQ,CAAC,EAAE;gBACrB,gBAAgB,EAAE,GAAG;gBACrB,UAAU,EAAE,IAAI,CAAC,UAAU;aAC5B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACjC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare function neutralizeInterfaceAsyncProxies(exports: unknown, interfaceName: string): void;
|
|
2
2
|
export declare function neutralizeInterfacePackage(packageRoot: string, interfaceName: string): void;
|
|
3
|
-
export declare function logStubInterfaceWarningOnce(interfaceName: string): void;
|
|
3
|
+
export declare function logStubInterfaceWarningOnce(interfaceName: string, standalone?: boolean): void;
|
|
4
4
|
export declare function clearStubInterfaceWarnings(): void;
|
|
@@ -14,8 +14,8 @@ const logging_1 = require("@antelopejs/interface-core/logging");
|
|
|
14
14
|
const Logger = new logging_1.Logging.Channel("loader");
|
|
15
15
|
const warned = new Set();
|
|
16
16
|
function makeRejection(interfaceName) {
|
|
17
|
-
return Promise.reject(new Error(`
|
|
18
|
-
`
|
|
17
|
+
return Promise.reject(new Error(`Interface '${interfaceName}' has no provider for this async method; ` +
|
|
18
|
+
`the call was rejected. Load a module that implements it to enable this call.`));
|
|
19
19
|
}
|
|
20
20
|
function neutralizeAsyncProxy(proxy, interfaceName) {
|
|
21
21
|
proxy.onCall(() => makeRejection(interfaceName), true);
|
|
@@ -72,11 +72,16 @@ function neutralizeInterfacePackage(packageRoot, interfaceName) {
|
|
|
72
72
|
walk(cachedModule.exports, interfaceName, seen);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
-
function logStubInterfaceWarningOnce(interfaceName) {
|
|
75
|
+
function logStubInterfaceWarningOnce(interfaceName, standalone = false) {
|
|
76
76
|
if (warned.has(interfaceName)) {
|
|
77
77
|
return;
|
|
78
78
|
}
|
|
79
79
|
warned.add(interfaceName);
|
|
80
|
+
if (standalone) {
|
|
81
|
+
Logger.Trace(`Interface '${interfaceName}' has no implementing module; running standalone. ` +
|
|
82
|
+
`Proxy methods that require a provider will reject.`);
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
80
85
|
Logger.Warn(`Optional interface '${interfaceName}' has no provider; ` +
|
|
81
86
|
`async calls on it will reject, sync usage will no-op.`);
|
|
82
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stub-interface-runtime.js","sourceRoot":"","sources":["../../../src/core/resolution/stub-interface-runtime.ts"],"names":[],"mappings":";;;;;AA6DA,0EAKC;AAWD,gEAcC;AAED,
|
|
1
|
+
{"version":3,"file":"stub-interface-runtime.js","sourceRoot":"","sources":["../../../src/core/resolution/stub-interface-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -249,11 +249,11 @@ function getWatchDirs(source) {
|
|
|
249
249
|
}
|
|
250
250
|
return localSource.watchDir ? [localSource.watchDir] : [""];
|
|
251
251
|
}
|
|
252
|
-
async function loadModuleManifestFromSource(loaderContext, source, moduleId) {
|
|
252
|
+
async function loadModuleManifestFromSource(loaderContext, source, moduleId, reload = false) {
|
|
253
253
|
const manifests = await loaderContext.registry.load(loaderContext.projectFolder, loaderContext.cache, {
|
|
254
254
|
...source,
|
|
255
255
|
id: moduleId,
|
|
256
|
-
});
|
|
256
|
+
}, { reload });
|
|
257
257
|
const [manifest] = manifests;
|
|
258
258
|
if (!manifest) {
|
|
259
259
|
throw new Error(`Failed to reload module ${moduleId}: no manifest returned`);
|
|
@@ -272,7 +272,7 @@ async function reloadLoadedModuleFromSource(manager, loaderContext, moduleId) {
|
|
|
272
272
|
}
|
|
273
273
|
await entry.module.destroy();
|
|
274
274
|
manager.unrequireModuleFiles(moduleId);
|
|
275
|
-
const manifest = await loadModuleManifestFromSource(loaderContext, entry.module.manifest.source, moduleId);
|
|
275
|
+
const manifest = await loadModuleManifestFromSource(loaderContext, entry.module.manifest.source, moduleId, true);
|
|
276
276
|
const replacement = new module_1.Module(manifest);
|
|
277
277
|
ensureReloadedModuleId(replacement, moduleId);
|
|
278
278
|
manager.replaceLoadedModule(moduleId, replacement);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-loading.js","sourceRoot":"","sources":["../../../src/core/runtime/module-loading.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"module-loading.js","sourceRoot":"","sources":["../../../src/core/runtime/module-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export type ShutdownHandler = () => Promise<void> | void;
|
|
2
|
+
export declare const DEFAULT_SHUTDOWN_TIMEOUT_MS = 10000;
|
|
2
3
|
export declare class ShutdownManager {
|
|
3
4
|
private timeoutMs;
|
|
4
5
|
private handlers;
|
|
@@ -7,6 +8,7 @@ export declare class ShutdownManager {
|
|
|
7
8
|
private requestedExitCode?;
|
|
8
9
|
private sigintHandler?;
|
|
9
10
|
private sigtermHandler?;
|
|
11
|
+
private seenSignals;
|
|
10
12
|
constructor(timeoutMs?: number);
|
|
11
13
|
register(handler: ShutdownHandler, priority: number): void;
|
|
12
14
|
unregister(handler: ShutdownHandler): void;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ShutdownManager = void 0;
|
|
3
|
+
exports.ShutdownManager = exports.DEFAULT_SHUTDOWN_TIMEOUT_MS = void 0;
|
|
4
4
|
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
5
5
|
const Logger = new logging_1.Logging.Channel("shutdown");
|
|
6
|
-
|
|
6
|
+
exports.DEFAULT_SHUTDOWN_TIMEOUT_MS = 10000;
|
|
7
7
|
const EXIT_CODE_SUCCESS = 0;
|
|
8
8
|
const FORCE_EXIT_CODE = 1;
|
|
9
9
|
class ShutdownManager {
|
|
@@ -14,7 +14,8 @@ class ShutdownManager {
|
|
|
14
14
|
requestedExitCode;
|
|
15
15
|
sigintHandler;
|
|
16
16
|
sigtermHandler;
|
|
17
|
-
|
|
17
|
+
seenSignals = new Set();
|
|
18
|
+
constructor(timeoutMs = exports.DEFAULT_SHUTDOWN_TIMEOUT_MS) {
|
|
18
19
|
this.timeoutMs = timeoutMs;
|
|
19
20
|
}
|
|
20
21
|
register(handler, priority) {
|
|
@@ -58,10 +59,16 @@ class ShutdownManager {
|
|
|
58
59
|
}
|
|
59
60
|
handleSignal(signal) {
|
|
60
61
|
if (this.isShuttingDown) {
|
|
61
|
-
|
|
62
|
-
|
|
62
|
+
if (this.seenSignals.has(signal)) {
|
|
63
|
+
Logger.Warn(`Received ${signal} during shutdown. Forcing process exit.`);
|
|
64
|
+
process.exit(FORCE_EXIT_CODE);
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
this.seenSignals.add(signal);
|
|
68
|
+
Logger.Info(`Received ${signal} during graceful shutdown; ignoring (already shutting down).`);
|
|
63
69
|
return;
|
|
64
70
|
}
|
|
71
|
+
this.seenSignals.add(signal);
|
|
65
72
|
void this.shutdown(EXIT_CODE_SUCCESS);
|
|
66
73
|
}
|
|
67
74
|
updateRequestedExitCode(exitCode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown-manager.js","sourceRoot":"","sources":["../../../src/core/shutdown/shutdown-manager.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAW7D,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"shutdown-manager.js","sourceRoot":"","sources":["../../../src/core/shutdown/shutdown-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ const EXIT_CODE_ERROR = 1;
|
|
|
56
56
|
const DEFAULT_TEST_FOLDER = "test";
|
|
57
57
|
const TEST_FILE_PATTERN = /\.(test|spec)\.(js|ts)$/;
|
|
58
58
|
const STUB_INTERFACE_PATH = node_path_1.default.resolve(__dirname, "stub-interface");
|
|
59
|
+
const TEST_MODULE_ID = "__antelope_test__";
|
|
59
60
|
async function collectTestFiles(folder, pattern, fs) {
|
|
60
61
|
const files = [];
|
|
61
62
|
async function scanDir(dir) {
|
|
@@ -119,6 +120,7 @@ async function setupTestEnvironment(moduleRoot, config) {
|
|
|
119
120
|
await (0, module_loading_1.loadModuleEntriesForManager)(manager, normalizedConfig, true);
|
|
120
121
|
await (0, module_loading_1.constructAndStartModules)(manager);
|
|
121
122
|
internal_1.internal.testStubMode = true;
|
|
123
|
+
registerTestDir(node_path_1.default.resolve(moduleRoot), manager);
|
|
122
124
|
return manager;
|
|
123
125
|
});
|
|
124
126
|
}
|
|
@@ -142,7 +144,7 @@ async function collectInterfaceTestFiles(moduleRoot, manager, fs) {
|
|
|
142
144
|
const testDir = node_path_1.default.join(pkgRoot, "dist", "tests");
|
|
143
145
|
const testFiles = await collectTestFiles(testDir, TEST_FILE_PATTERN, fs);
|
|
144
146
|
if (testFiles.length > 0 && manager) {
|
|
145
|
-
|
|
147
|
+
registerTestDir(testDir, manager);
|
|
146
148
|
}
|
|
147
149
|
files.push(...testFiles);
|
|
148
150
|
}
|
|
@@ -151,11 +153,14 @@ async function collectInterfaceTestFiles(moduleRoot, manager, fs) {
|
|
|
151
153
|
}
|
|
152
154
|
return files;
|
|
153
155
|
}
|
|
154
|
-
function
|
|
156
|
+
function registerTestDir(testDir, manager) {
|
|
155
157
|
const resolvedDir = node_path_1.default.resolve(testDir);
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
158
|
+
const firstModule = manager.resolver.moduleByFolder.values().next().value;
|
|
159
|
+
if (firstModule && !manager.resolver.moduleByFolder.has(resolvedDir)) {
|
|
160
|
+
manager.resolver.moduleByFolder.set(resolvedDir, firstModule);
|
|
161
|
+
}
|
|
162
|
+
if (!internal_1.internal.moduleByFolder.some((entry) => entry.dir === resolvedDir)) {
|
|
163
|
+
internal_1.internal.moduleByFolder.push({ dir: resolvedDir, id: TEST_MODULE_ID });
|
|
159
164
|
}
|
|
160
165
|
}
|
|
161
166
|
async function executeTests(moduleRoot, test, manager, fs, files = []) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-module.js","sourceRoot":"","sources":["../../../src/core/test/test-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"test-module.js","sourceRoot":"","sources":["../../../src/core/test/test-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,6 @@ export interface OutdatedModule {
|
|
|
4
4
|
current: string;
|
|
5
5
|
latest: string;
|
|
6
6
|
}
|
|
7
|
-
export declare function fetchLatestVersion(packageName: string): Promise<string
|
|
7
|
+
export declare function fetchLatestVersion(packageName: string): Promise<string>;
|
|
8
8
|
export declare function checkOutdatedModules(modules: Record<string, ExpandedModuleConfig>): Promise<OutdatedModule[]>;
|
|
9
9
|
export declare function warnOutdatedModules(outdated: OutdatedModule[]): void;
|
|
@@ -9,21 +9,41 @@ const package_manager_1 = require("./cli/package-manager");
|
|
|
9
9
|
const NPM_VIEW_COMMAND = "npm view";
|
|
10
10
|
const VERSION_ARGUMENT = "version";
|
|
11
11
|
const UPDATE_COMMAND = "ajs project modules update";
|
|
12
|
+
const SLOW_CHECK_THRESHOLD_MS = 15_000;
|
|
13
|
+
const MAX_REASON_LENGTH = 200;
|
|
12
14
|
async function fetchLatestVersion(packageName) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
return (0, package_manager_1.parsePackageInfoOutput)(result.stdout);
|
|
16
|
-
}
|
|
17
|
-
catch {
|
|
18
|
-
return undefined;
|
|
19
|
-
}
|
|
15
|
+
const result = await (0, command_1.ExecuteCMD)(`${NPM_VIEW_COMMAND} ${packageName} ${VERSION_ARGUMENT}`, {});
|
|
16
|
+
return (0, package_manager_1.parsePackageInfoOutput)(result.stdout);
|
|
20
17
|
}
|
|
21
18
|
async function checkOutdatedModules(modules) {
|
|
22
19
|
const packageModules = Object.entries(modules).filter(([, info]) => info.source?.type === "package");
|
|
23
|
-
|
|
20
|
+
if (packageModules.length === 0) {
|
|
21
|
+
return [];
|
|
22
|
+
}
|
|
23
|
+
(0, cli_ui_1.info)("Checking for module updates...");
|
|
24
|
+
const slowWarning = setTimeout(() => {
|
|
25
|
+
(0, cli_ui_1.warning)("Module version check is taking longer than expected — the npm registry may be slow or unreachable. " +
|
|
26
|
+
"Set NPM_CONFIG_FETCH_RETRIES=0 to fail fast.");
|
|
27
|
+
}, SLOW_CHECK_THRESHOLD_MS);
|
|
28
|
+
let results;
|
|
29
|
+
try {
|
|
30
|
+
results = await Promise.allSettled(packageModules.map(([, info]) => fetchLatestVersion(info.source.package)));
|
|
31
|
+
}
|
|
32
|
+
finally {
|
|
33
|
+
clearTimeout(slowWarning);
|
|
34
|
+
}
|
|
24
35
|
return packageModules.reduce((outdated, [name, info], index) => {
|
|
25
36
|
const result = results[index];
|
|
26
|
-
|
|
37
|
+
const packageName = info.source.package;
|
|
38
|
+
if (result.status === "rejected") {
|
|
39
|
+
const reason = String(result.reason ?? "unknown error");
|
|
40
|
+
const truncated = reason.length > MAX_REASON_LENGTH
|
|
41
|
+
? `${reason.slice(0, MAX_REASON_LENGTH)}…`
|
|
42
|
+
: reason;
|
|
43
|
+
(0, cli_ui_1.warning)(`Could not check latest version of ${packageName}: ${truncated}`);
|
|
44
|
+
return outdated;
|
|
45
|
+
}
|
|
46
|
+
if (!result.value) {
|
|
27
47
|
return outdated;
|
|
28
48
|
}
|
|
29
49
|
const current = info.source.version;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-checker.js","sourceRoot":"","sources":["../../src/core/version-checker.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"version-checker.js","sourceRoot":"","sources":["../../src/core/version-checker.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,14 @@ export declare class HotReload {
|
|
|
3
3
|
private reload;
|
|
4
4
|
private debounceMs;
|
|
5
5
|
private pending;
|
|
6
|
+
private inFlight;
|
|
7
|
+
private rePending;
|
|
6
8
|
private timer?;
|
|
9
|
+
private flushing;
|
|
7
10
|
constructor(reload: ReloadHandler, debounceMs?: number);
|
|
8
11
|
queue(moduleId: string): void;
|
|
9
12
|
clear(): void;
|
|
13
|
+
private scheduleFlush;
|
|
14
|
+
private flush;
|
|
15
|
+
private reloadOne;
|
|
10
16
|
}
|
|
@@ -8,35 +8,74 @@ class HotReload {
|
|
|
8
8
|
reload;
|
|
9
9
|
debounceMs;
|
|
10
10
|
pending = new Set();
|
|
11
|
+
inFlight = new Set();
|
|
12
|
+
rePending = new Set();
|
|
11
13
|
timer;
|
|
14
|
+
flushing = false;
|
|
12
15
|
constructor(reload, debounceMs = DEFAULT_DEBOUNCE_MS) {
|
|
13
16
|
this.reload = reload;
|
|
14
17
|
this.debounceMs = debounceMs;
|
|
15
18
|
}
|
|
16
19
|
queue(moduleId) {
|
|
20
|
+
if (this.inFlight.has(moduleId)) {
|
|
21
|
+
this.rePending.add(moduleId);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
17
24
|
this.pending.add(moduleId);
|
|
18
|
-
|
|
19
|
-
|
|
25
|
+
this.scheduleFlush();
|
|
26
|
+
}
|
|
27
|
+
clear() {
|
|
28
|
+
if (this.timer) {
|
|
29
|
+
clearTimeout(this.timer);
|
|
30
|
+
this.timer = undefined;
|
|
31
|
+
}
|
|
32
|
+
this.pending.clear();
|
|
33
|
+
this.rePending.clear();
|
|
34
|
+
}
|
|
35
|
+
scheduleFlush() {
|
|
36
|
+
if (this.timer || this.flushing) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
this.timer = setTimeout(() => {
|
|
40
|
+
this.timer = undefined;
|
|
41
|
+
void this.flush();
|
|
42
|
+
}, this.debounceMs);
|
|
43
|
+
}
|
|
44
|
+
async flush() {
|
|
45
|
+
if (this.flushing) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
this.flushing = true;
|
|
49
|
+
try {
|
|
50
|
+
while (this.pending.size > 0) {
|
|
20
51
|
const modules = Array.from(this.pending);
|
|
21
52
|
this.pending.clear();
|
|
22
|
-
this.timer = undefined;
|
|
23
53
|
for (const id of modules) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
54
|
+
await this.reloadOne(id);
|
|
55
|
+
}
|
|
56
|
+
if (this.rePending.size > 0) {
|
|
57
|
+
for (const id of this.rePending) {
|
|
58
|
+
this.pending.add(id);
|
|
29
59
|
}
|
|
60
|
+
this.rePending.clear();
|
|
30
61
|
}
|
|
31
|
-
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
finally {
|
|
65
|
+
this.flushing = false;
|
|
32
66
|
}
|
|
33
67
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
this.
|
|
68
|
+
async reloadOne(moduleId) {
|
|
69
|
+
this.inFlight.add(moduleId);
|
|
70
|
+
try {
|
|
71
|
+
await this.reload(moduleId);
|
|
72
|
+
}
|
|
73
|
+
catch (err) {
|
|
74
|
+
Logger.Error(`Failed to reload module ${moduleId}:`, err);
|
|
75
|
+
}
|
|
76
|
+
finally {
|
|
77
|
+
this.inFlight.delete(moduleId);
|
|
38
78
|
}
|
|
39
|
-
this.pending.clear();
|
|
40
79
|
}
|
|
41
80
|
}
|
|
42
81
|
exports.HotReload = HotReload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hot-reload.js","sourceRoot":"","sources":["../../../src/core/watch/hot-reload.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAI7D,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAChC,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAExD,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"hot-reload.js","sourceRoot":"","sources":["../../../src/core/watch/hot-reload.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAI7D,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAChC,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAExD,MAAa,SAAS;IAQV;IACA;IARF,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5B,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7B,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,KAAK,CAAkB;IACvB,QAAQ,GAAG,KAAK,CAAC;IAEzB,YACU,MAAqB,EACrB,aAAqB,mBAAmB;QADxC,WAAM,GAAN,MAAM,CAAe;QACrB,eAAU,GAAV,UAAU,CAA8B;IAC/C,CAAC;IAEJ,KAAK,CAAC,QAAgB;QACpB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEO,aAAa;QACnB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC3B,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,KAAK;QACjB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACrB,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;oBACzB,MAAM,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC3B,CAAC;gBACD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;oBAC5B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;wBAChC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACvB,CAAC;oBACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,QAAgB;QACtC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,2BAA2B,QAAQ,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;CACF;AA1ED,8BA0EC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.1",
|
|
4
4
|
"description": "Modular Node.js framework with interface-based architecture for building extensible applications",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"test:coverage": "c8 --check-coverage --lines 90 --functions 90 --branches 90 --statements 90 mocha --require ts-node/register --require test/setup.ts 'test/**/*.test.ts' --exit"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@antelopejs/interface-core": "^0.0.
|
|
53
|
+
"@antelopejs/interface-core": "^0.0.4",
|
|
54
54
|
"@types/proper-lockfile": "^4.1.4",
|
|
55
55
|
"boxen": "^8.0.1",
|
|
56
56
|
"chalk": "^4.1.2",
|