@warlock.js/core 4.0.1 → 4.0.2
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/cjs/dev2-server/config-loader.d.ts.map +1 -1
- package/cjs/dev2-server/config-loader.js +9 -4
- package/cjs/dev2-server/config-loader.js.map +1 -1
- package/cjs/dev2-server/connectors/base-connector.d.ts.map +1 -1
- package/cjs/dev2-server/connectors/base-connector.js +2 -2
- package/cjs/dev2-server/connectors/base-connector.js.map +1 -1
- package/cjs/dev2-server/connectors/database-connector.d.ts.map +1 -1
- package/cjs/dev2-server/connectors/database-connector.js +5 -1
- package/cjs/dev2-server/connectors/database-connector.js.map +1 -1
- package/cjs/dev2-server/dependency-graph.d.ts +9 -2
- package/cjs/dev2-server/dependency-graph.d.ts.map +1 -1
- package/cjs/dev2-server/dependency-graph.js +47 -6
- package/cjs/dev2-server/dependency-graph.js.map +1 -1
- package/cjs/dev2-server/dev-logger.js +1 -13
- package/cjs/dev2-server/dev-logger.js.map +1 -1
- package/cjs/dev2-server/development-server.d.ts.map +1 -1
- package/cjs/dev2-server/development-server.js +25 -13
- package/cjs/dev2-server/development-server.js.map +1 -1
- package/cjs/dev2-server/file-manager.d.ts +6 -1
- package/cjs/dev2-server/file-manager.d.ts.map +1 -1
- package/cjs/dev2-server/file-manager.js +6 -1
- package/cjs/dev2-server/file-manager.js.map +1 -1
- package/cjs/dev2-server/file-operations.js +4 -4
- package/cjs/dev2-server/file-operations.js.map +1 -1
- package/cjs/dev2-server/files-orchestrator.d.ts.map +1 -1
- package/cjs/dev2-server/files-orchestrator.js +10 -8
- package/cjs/dev2-server/files-orchestrator.js.map +1 -1
- package/cjs/dev2-server/import-transformer.d.ts.map +1 -1
- package/cjs/dev2-server/import-transformer.js +37 -8
- package/cjs/dev2-server/import-transformer.js.map +1 -1
- package/cjs/dev2-server/layer-executor.d.ts.map +1 -1
- package/cjs/dev2-server/layer-executor.js +67 -62
- package/cjs/dev2-server/layer-executor.js.map +1 -1
- package/cjs/dev2-server/module-loader.d.ts.map +1 -1
- package/cjs/dev2-server/module-loader.js +14 -15
- package/cjs/dev2-server/module-loader.js.map +1 -1
- package/cjs/dev2-server/parse-imports.d.ts.map +1 -1
- package/cjs/dev2-server/parse-imports.js +97 -43
- package/cjs/dev2-server/parse-imports.js.map +1 -1
- package/cjs/dev2-server/runtime-import-helper.d.ts.map +1 -1
- package/cjs/dev2-server/runtime-import-helper.js +86 -8
- package/cjs/dev2-server/runtime-import-helper.js.map +1 -1
- package/cjs/dev2-server/special-files-collector.d.ts +4 -4
- package/cjs/dev2-server/special-files-collector.js +9 -9
- package/cjs/dev2-server/special-files-collector.js.map +1 -1
- package/cjs/dev2-server/transpile-file.d.ts +4 -0
- package/cjs/dev2-server/transpile-file.d.ts.map +1 -1
- package/cjs/dev2-server/transpile-file.js +20 -3
- package/cjs/dev2-server/transpile-file.js.map +1 -1
- package/cjs/dev2-server/tsconfig-manager.d.ts +2 -2
- package/cjs/dev2-server/tsconfig-manager.d.ts.map +1 -1
- package/cjs/dev2-server/tsconfig-manager.js +8 -7
- package/cjs/dev2-server/tsconfig-manager.js.map +1 -1
- package/cjs/router/route-registry.d.ts +4 -0
- package/cjs/router/route-registry.d.ts.map +1 -1
- package/cjs/router/route-registry.js +26 -7
- package/cjs/router/route-registry.js.map +1 -1
- package/cjs/router/router.d.ts +0 -1
- package/cjs/router/router.d.ts.map +1 -1
- package/cjs/router/router.js +0 -4
- package/cjs/router/router.js.map +1 -1
- package/cjs/router/types.d.ts +2 -2
- package/cjs/router/types.d.ts.map +1 -1
- package/esm/dev2-server/config-loader.d.ts.map +1 -1
- package/esm/dev2-server/config-loader.js +9 -4
- package/esm/dev2-server/config-loader.js.map +1 -1
- package/esm/dev2-server/connectors/base-connector.d.ts.map +1 -1
- package/esm/dev2-server/connectors/base-connector.js +2 -2
- package/esm/dev2-server/connectors/base-connector.js.map +1 -1
- package/esm/dev2-server/connectors/database-connector.d.ts.map +1 -1
- package/esm/dev2-server/connectors/database-connector.js +5 -1
- package/esm/dev2-server/connectors/database-connector.js.map +1 -1
- package/esm/dev2-server/dependency-graph.d.ts +9 -2
- package/esm/dev2-server/dependency-graph.d.ts.map +1 -1
- package/esm/dev2-server/dependency-graph.js +47 -6
- package/esm/dev2-server/dependency-graph.js.map +1 -1
- package/esm/dev2-server/dev-logger.js +1 -13
- package/esm/dev2-server/dev-logger.js.map +1 -1
- package/esm/dev2-server/development-server.d.ts.map +1 -1
- package/esm/dev2-server/development-server.js +25 -13
- package/esm/dev2-server/development-server.js.map +1 -1
- package/esm/dev2-server/file-manager.d.ts +6 -1
- package/esm/dev2-server/file-manager.d.ts.map +1 -1
- package/esm/dev2-server/file-manager.js +6 -1
- package/esm/dev2-server/file-manager.js.map +1 -1
- package/esm/dev2-server/file-operations.js +4 -4
- package/esm/dev2-server/file-operations.js.map +1 -1
- package/esm/dev2-server/files-orchestrator.d.ts.map +1 -1
- package/esm/dev2-server/files-orchestrator.js +10 -8
- package/esm/dev2-server/files-orchestrator.js.map +1 -1
- package/esm/dev2-server/import-transformer.d.ts.map +1 -1
- package/esm/dev2-server/import-transformer.js +37 -8
- package/esm/dev2-server/import-transformer.js.map +1 -1
- package/esm/dev2-server/layer-executor.d.ts.map +1 -1
- package/esm/dev2-server/layer-executor.js +68 -63
- package/esm/dev2-server/layer-executor.js.map +1 -1
- package/esm/dev2-server/module-loader.d.ts.map +1 -1
- package/esm/dev2-server/module-loader.js +15 -16
- package/esm/dev2-server/module-loader.js.map +1 -1
- package/esm/dev2-server/parse-imports.d.ts.map +1 -1
- package/esm/dev2-server/parse-imports.js +98 -44
- package/esm/dev2-server/parse-imports.js.map +1 -1
- package/esm/dev2-server/runtime-import-helper.d.ts.map +1 -1
- package/esm/dev2-server/runtime-import-helper.js +86 -8
- package/esm/dev2-server/runtime-import-helper.js.map +1 -1
- package/esm/dev2-server/special-files-collector.d.ts +4 -4
- package/esm/dev2-server/special-files-collector.js +9 -9
- package/esm/dev2-server/special-files-collector.js.map +1 -1
- package/esm/dev2-server/transpile-file.d.ts +4 -0
- package/esm/dev2-server/transpile-file.d.ts.map +1 -1
- package/esm/dev2-server/transpile-file.js +20 -3
- package/esm/dev2-server/transpile-file.js.map +1 -1
- package/esm/dev2-server/tsconfig-manager.d.ts +2 -2
- package/esm/dev2-server/tsconfig-manager.d.ts.map +1 -1
- package/esm/dev2-server/tsconfig-manager.js +8 -7
- package/esm/dev2-server/tsconfig-manager.js.map +1 -1
- package/esm/router/route-registry.d.ts +4 -0
- package/esm/router/route-registry.d.ts.map +1 -1
- package/esm/router/route-registry.js +26 -7
- package/esm/router/route-registry.js.map +1 -1
- package/esm/router/router.d.ts +0 -1
- package/esm/router/router.d.ts.map +1 -1
- package/esm/router/router.js +1 -5
- package/esm/router/router.js.map +1 -1
- package/esm/router/types.d.ts +2 -2
- package/esm/router/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/cjs/dev-server/file-health.d.ts +0 -9
- package/cjs/dev-server/file-health.d.ts.map +0 -1
- package/cjs/dev-server/file-manager.d.ts +0 -39
- package/cjs/dev-server/file-manager.d.ts.map +0 -1
- package/cjs/dev-server/files-orchestrator.d.ts +0 -1
- package/cjs/dev-server/files-orchestrator.d.ts.map +0 -1
- package/cjs/dev-server/types.d.ts +0 -2
- package/cjs/dev-server/types.d.ts.map +0 -1
- package/esm/dev-server/file-health.d.ts +0 -9
- package/esm/dev-server/file-health.d.ts.map +0 -1
- package/esm/dev-server/file-manager.d.ts +0 -39
- package/esm/dev-server/file-manager.d.ts.map +0 -1
- package/esm/dev-server/files-orchestrator.d.ts +0 -1
- package/esm/dev-server/files-orchestrator.d.ts.map +0 -1
- package/esm/dev-server/types.d.ts +0 -2
- package/esm/dev-server/types.d.ts.map +0 -1
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
async getAllFilesFromFilesystem() {
|
|
82
82
|
const absolutePaths = await utils.getFilesFromDirectory();
|
|
83
83
|
// Convert to relative paths for consistency throughout the system
|
|
84
|
-
return absolutePaths.map(
|
|
84
|
+
return absolutePaths.map(absPath => path.Path.toRelative(absPath));
|
|
85
85
|
}
|
|
86
86
|
/**
|
|
87
87
|
* Process all files fresh (no manifest exists)
|
|
@@ -115,11 +115,11 @@
|
|
|
115
115
|
const filesInManifest = new Set(this.manifest.getAllFilePaths());
|
|
116
116
|
const filesInFilesystemSet = new Set(filesInFilesystem);
|
|
117
117
|
// Find new files (in filesystem but not in manifest)
|
|
118
|
-
const newFiles = filesInFilesystem.filter(
|
|
118
|
+
const newFiles = filesInFilesystem.filter(file => !filesInManifest.has(file));
|
|
119
119
|
// Find deleted files (in manifest but not in filesystem)
|
|
120
|
-
const deletedFiles = Array.from(filesInManifest).filter(
|
|
120
|
+
const deletedFiles = Array.from(filesInManifest).filter(file => !filesInFilesystemSet.has(file));
|
|
121
121
|
// Find existing files (in both)
|
|
122
|
-
const existingFiles = filesInFilesystem.filter(
|
|
122
|
+
const existingFiles = filesInFilesystem.filter(file => filesInManifest.has(file));
|
|
123
123
|
if (newFiles.length > 0 || deletedFiles.length > 0) {
|
|
124
124
|
const newText = newFiles.length > 0 ? copper.colors.green(newFiles.length) : 0;
|
|
125
125
|
const deletedText = deletedFiles.length > 0 ? copper.colors.red(deletedFiles.length) : 0;
|
|
@@ -225,13 +225,13 @@
|
|
|
225
225
|
async startFileWatcher() {
|
|
226
226
|
devLogger.devLogSuccess("watching for file changes");
|
|
227
227
|
// Connect file watcher to event handler
|
|
228
|
-
this.filesWatcher.onFileChange(
|
|
228
|
+
this.filesWatcher.onFileChange(absolutePath => {
|
|
229
229
|
this.eventHandler.handleFileChange(absolutePath);
|
|
230
230
|
});
|
|
231
|
-
this.filesWatcher.onFileAdd(
|
|
231
|
+
this.filesWatcher.onFileAdd(absolutePath => {
|
|
232
232
|
this.eventHandler.handleFileAdd(absolutePath);
|
|
233
233
|
});
|
|
234
|
-
this.filesWatcher.onFileDelete(
|
|
234
|
+
this.filesWatcher.onFileDelete(absolutePath => {
|
|
235
235
|
this.eventHandler.handleFileDelete(absolutePath);
|
|
236
236
|
});
|
|
237
237
|
await this.filesWatcher.watch();
|
|
@@ -265,7 +265,9 @@
|
|
|
265
265
|
fileManager.importsTransformed = true;
|
|
266
266
|
transformedCount++;
|
|
267
267
|
}
|
|
268
|
-
catch (error) {
|
|
268
|
+
catch (error) {
|
|
269
|
+
console.error(`Error transforming imports for ${relativePath}:`, error);
|
|
270
|
+
}
|
|
269
271
|
}
|
|
270
272
|
}
|
|
271
273
|
}exports.FilesOrchestrator=FilesOrchestrator;//# sourceMappingURL=files-orchestrator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-orchestrator.js","sources":["../../src/dev2-server/files-orchestrator.ts"],"sourcesContent":[null],"names":["ManifestManager","DependencyGraph","HealthChecker","FilesWatcher","FileOperations","FileEventHandler","init","tsconfigManager","packageJsonManager","getFilesFromDirectory","Path","devLogDim","createFreshWarlockDirectory","FILE_PROCESSING_BATCH_SIZE","fileManager","FileManager","devLogSuccess","colors","unlinkAsync","warlockCachePath","transformImports","putFileAsync"],"mappings":"
|
|
1
|
+
{"version":3,"file":"files-orchestrator.js","sources":["../../src/dev2-server/files-orchestrator.ts"],"sourcesContent":[null],"names":["ManifestManager","DependencyGraph","HealthChecker","FilesWatcher","FileOperations","FileEventHandler","init","tsconfigManager","packageJsonManager","getFilesFromDirectory","Path","devLogDim","createFreshWarlockDirectory","FILE_PROCESSING_BATCH_SIZE","fileManager","FileManager","devLogSuccess","colors","unlinkAsync","warlockCachePath","transformImports","putFileAsync"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../src/dev2-server/import-transformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GACjC,MAAM,
|
|
1
|
+
{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../src/dev2-server/import-transformer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GACjC,MAAM,CA6MR"}
|
|
@@ -15,7 +15,12 @@ function transformImports(fileManager, filesMap) {
|
|
|
15
15
|
const code = fileManager.transpiled;
|
|
16
16
|
// Pattern to match ES6 import statements
|
|
17
17
|
// Matches: import ... from "..."
|
|
18
|
-
|
|
18
|
+
// Handles:
|
|
19
|
+
// - import { a, b } from "module" (named imports, can span multiple lines)
|
|
20
|
+
// - import * as Foo from "module" (namespace imports)
|
|
21
|
+
// - import Foo from "module" (default imports)
|
|
22
|
+
// - import Foo, { a, b } from "module" (mixed imports)
|
|
23
|
+
const importRegex = /import\s+(\{[\s\S]*?\}|\*\s+as\s+\w+|\w+(?:\s*,\s*\{[\s\S]*?\})?)\s+from\s+["']([^"']+)["'];?/gm;
|
|
19
24
|
// Pattern to match side-effect imports: import "module";
|
|
20
25
|
const sideEffectImportRegex = /import\s+["']([^"']+)["'];?/g;
|
|
21
26
|
// Pattern to match ES6 export statements
|
|
@@ -172,24 +177,47 @@ function transformImports(fileManager, filesMap) {
|
|
|
172
177
|
}
|
|
173
178
|
/**
|
|
174
179
|
* Build a replacement statement for different import syntaxes
|
|
180
|
+
* @param importSpecifier The import specifier (e.g., "Foo", "{ a, b }", "Foo, { a, b }", "* as Bar")
|
|
181
|
+
* @param cachePath The path to the cached file
|
|
175
182
|
*/
|
|
176
183
|
function buildImportReplacement(importSpecifier, cachePath) {
|
|
184
|
+
const trimmed = importSpecifier.trim();
|
|
177
185
|
// Namespace import: import * as Foo from "module";
|
|
178
|
-
if (
|
|
179
|
-
const identifier =
|
|
186
|
+
if (trimmed.startsWith("* as ")) {
|
|
187
|
+
const identifier = trimmed.replace("* as ", "").trim();
|
|
180
188
|
return `const ${identifier} = await __import("./${cachePath}")`;
|
|
181
189
|
}
|
|
190
|
+
// Mixed import: import Foo, { a, b } from "module";
|
|
191
|
+
// Transform to: const __module = await __import(...); const Foo = __module?.default ?? __module; const { a, b } = __module;
|
|
192
|
+
// Handle multiline: import Foo, {\n a,\n b\n} from "module";
|
|
193
|
+
if (trimmed.match(/^(\w+)\s*,\s*\{/)) {
|
|
194
|
+
const match = trimmed.match(/^(\w+)\s*,\s*(\{[\s\S]*?\})/);
|
|
195
|
+
if (match) {
|
|
196
|
+
const defaultImport = match[1];
|
|
197
|
+
let namedImports = match[2];
|
|
198
|
+
const moduleVar = `__module_${Math.random().toString(36).slice(2, 8)}`;
|
|
199
|
+
// Clean up whitespace and normalize
|
|
200
|
+
namedImports = namedImports.replace(/\s+/g, " ").trim();
|
|
201
|
+
// Normalize `{ default as X }` to `{ default: X }` for valid destructuring
|
|
202
|
+
const normalized = namedImports.replace(/default\s+as\s+/g, "default: ");
|
|
203
|
+
// Generate correct syntax with proper separators
|
|
204
|
+
return `const ${moduleVar} = await __import("./${cachePath}");
|
|
205
|
+
const ${defaultImport} = ${moduleVar}?.default ?? ${moduleVar};
|
|
206
|
+
const ${normalized} = ${moduleVar};`;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
182
209
|
// Destructured / named imports (including default alias): import { a, default as X } from "module";
|
|
183
|
-
if (
|
|
210
|
+
if (trimmed.startsWith("{")) {
|
|
211
|
+
// Clean up multiline formatting
|
|
212
|
+
let cleanedImports = trimmed.replace(/\s+/g, " ").trim();
|
|
184
213
|
// Normalize `{ default as X }` to `{ default: X }` for valid destructuring
|
|
185
|
-
const normalized =
|
|
214
|
+
const normalized = cleanedImports.replace(/default\s+as\s+/g, "default: ");
|
|
186
215
|
return `const ${normalized} = await __import("./${cachePath}")`;
|
|
187
216
|
}
|
|
188
217
|
// Default import: import Foo from "module";
|
|
189
|
-
// Use
|
|
190
|
-
// Note: single await, reuses the same import for both destructuring and fallback
|
|
218
|
+
// Use default with fallback to module object
|
|
191
219
|
const moduleVar = `__module_${Math.random().toString(36).slice(2, 8)}`;
|
|
192
|
-
return `const ${moduleVar} = await __import("./${cachePath}");\nconst ${
|
|
220
|
+
return `const ${moduleVar} = await __import("./${cachePath}");\nconst ${trimmed} = ${moduleVar}?.default ?? ${moduleVar};`;
|
|
193
221
|
}
|
|
194
222
|
/**
|
|
195
223
|
* Find the cache path for an import
|
|
@@ -198,6 +226,7 @@ function buildImportReplacement(importSpecifier, cachePath) {
|
|
|
198
226
|
* @param importPath The import path from the import statement
|
|
199
227
|
* @param fileManager The file that contains this import
|
|
200
228
|
* @param filesMap Map of all FileManager instances
|
|
229
|
+
* @returns The cache path string, or null if not found
|
|
201
230
|
*/
|
|
202
231
|
function findCachePathForImport(importPath, fileManager, filesMap) {
|
|
203
232
|
// Look up the resolved absolute path from the import map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-transformer.js","sources":["../../src/dev2-server/import-transformer.ts"],"sourcesContent":[null],"names":["tsconfigManager","devLogError","Path"],"mappings":"iIAKA;;;;;;;;;;;;AAYG;AACa,SAAA,gBAAgB,CAC9B,WAAwB,EACxB,QAAkC,EAAA;AAElC,IAAA,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC
|
|
1
|
+
{"version":3,"file":"import-transformer.js","sources":["../../src/dev2-server/import-transformer.ts"],"sourcesContent":[null],"names":["tsconfigManager","devLogError","Path"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer-executor.d.ts","sourceRoot":"","sources":["../../src/dev2-server/layer-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE;;;;;;;GAOG;AACH,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,eAAe,EAChC,qBAAqB,EAAE,qBAAqB,EAC5C,UAAU,EAAE,SAAS,EAAE,EACvB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY;IAG7C;;;;OAIG;IACU,kBAAkB,CAC7B,YAAY,EAAE,MAAM,EAAE,EACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"layer-executor.d.ts","sourceRoot":"","sources":["../../src/dev2-server/layer-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE;;;;;;;GAOG;AACH,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,eAAe,EAAE,eAAe,EAChC,qBAAqB,EAAE,qBAAqB,EAC5C,UAAU,EAAE,SAAS,EAAE,EACvB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY;IAG7C;;;;OAIG;IACU,kBAAkB,CAC7B,YAAY,EAAE,MAAM,EAAE,EACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC;IAkFhB;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;;OAGG;YACW,wBAAwB;IAwCtC;;;OAGG;YACW,2BAA2B;IAezC;;OAEG;YACW,yBAAyB;IAiBvC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAehC;;;;OAIG;YACW,0BAA0B;IA6DxC;;;;OAIG;YACW,qBAAqB;CAkFpC"}
|
|
@@ -39,7 +39,7 @@ class LayerExecutor {
|
|
|
39
39
|
// Get invalidation chain for this file
|
|
40
40
|
const invalidationChain = this.dependencyGraph.getInvalidationChain(relativePath);
|
|
41
41
|
// Add to combined set
|
|
42
|
-
invalidationChain.forEach(
|
|
42
|
+
invalidationChain.forEach(file => allInvalidatedFiles.add(file));
|
|
43
43
|
// Determine strategy for this file
|
|
44
44
|
const strategy = this.determineReloadStrategy(invalidationChain, filesMap);
|
|
45
45
|
if (strategy === "FSR") {
|
|
@@ -49,58 +49,39 @@ class LayerExecutor {
|
|
|
49
49
|
hmrFiles.push(relativePath);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
const affectedConnectors = this.connectors.filter((connector) => connector.shouldRestart(configFiles));
|
|
65
|
-
if (configFiles.length === 1) {
|
|
66
|
-
devLogger.devLogConfig(configFiles[0], affectedConnectors.map((connector) => connector.name));
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
devLogger.devLogConfig(`${configFiles.length} files`, affectedConnectors.map((connector) => connector.name));
|
|
52
|
+
try {
|
|
53
|
+
if (hmrFiles.length > 0 && fsrFiles.length === 0) {
|
|
54
|
+
if (hmrFiles.length === 1) {
|
|
55
|
+
const dependentCount = this.dependencyGraph.getInvalidationChain(hmrFiles[0]).length - 1;
|
|
56
|
+
devLogger.devLogHMR(hmrFiles[0], dependentCount > 0 ? dependentCount : undefined);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
hmrFiles.forEach(file => {
|
|
60
|
+
const dependentCount = this.dependencyGraph.getInvalidationChain(file).length - 1;
|
|
61
|
+
devLogger.devLogHMR(file, dependentCount > 0 ? dependentCount : undefined);
|
|
62
|
+
});
|
|
63
|
+
}
|
|
70
64
|
}
|
|
71
|
-
// await Promise.all(affectedConnectors.map((connector) => connector.restart()));
|
|
72
65
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
devLogger.devLogFSR(nonConfigFsrFiles[0]);
|
|
76
|
-
}
|
|
77
|
-
else {
|
|
78
|
-
devLogger.devLogFSR(`${nonConfigFsrFiles.length} files`);
|
|
79
|
-
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
console.log("ERRor in devLogHMR: ", error);
|
|
80
68
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
69
|
+
try {
|
|
70
|
+
// Execute reload once for all files
|
|
71
|
+
const invalidationChain = Array.from(allInvalidatedFiles);
|
|
72
|
+
if (fsrFiles.length > 0) {
|
|
73
|
+
// If any file requires FSR, do FSR for all
|
|
74
|
+
const firstFsrFile = filesMap.get(fsrFiles[0]);
|
|
75
|
+
await this.executeFullServerRestart(firstFsrFile, invalidationChain, filesMap);
|
|
85
76
|
}
|
|
86
77
|
else {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
});
|
|
78
|
+
// All files are HMR
|
|
79
|
+
const firstHmrFile = filesMap.get(hmrFiles[0]);
|
|
80
|
+
await this.executeHotModuleReplacement(firstHmrFile, invalidationChain, filesMap, hmrFiles);
|
|
91
81
|
}
|
|
92
82
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
if (fsrFiles.length > 0) {
|
|
96
|
-
// If any file requires FSR, do FSR for all
|
|
97
|
-
const firstFsrFile = filesMap.get(fsrFiles[0]);
|
|
98
|
-
await this.executeFullServerRestart(firstFsrFile, invalidationChain, filesMap);
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
101
|
-
// All files are HMR
|
|
102
|
-
const firstHmrFile = filesMap.get(hmrFiles[0]);
|
|
103
|
-
await this.executeHotModuleReplacement(firstHmrFile, invalidationChain, filesMap);
|
|
83
|
+
catch (error) {
|
|
84
|
+
console.log("ERRor in executeFullServerRestart: ", error);
|
|
104
85
|
}
|
|
105
86
|
}
|
|
106
87
|
/**
|
|
@@ -123,7 +104,7 @@ class LayerExecutor {
|
|
|
123
104
|
async executeFullServerRestart(changedFile, invalidationChain, filesMap) {
|
|
124
105
|
// Step 1: Handle config files specially
|
|
125
106
|
const configFiles = invalidationChain
|
|
126
|
-
.map(
|
|
107
|
+
.map(path => filesMap.get(path))
|
|
127
108
|
.filter((file) => file !== undefined && file.type === "config");
|
|
128
109
|
if (configFiles.length > 0) {
|
|
129
110
|
// Reload config files first
|
|
@@ -149,23 +130,24 @@ class LayerExecutor {
|
|
|
149
130
|
* Execute Hot Module Replacement
|
|
150
131
|
* This happens when only HMR layer files (controllers, services, etc.) change
|
|
151
132
|
*/
|
|
152
|
-
async executeHotModuleReplacement(changedFile, invalidationChain, filesMap) {
|
|
133
|
+
async executeHotModuleReplacement(changedFile, invalidationChain, filesMap, hmrFiles) {
|
|
153
134
|
// Step 1: Clear module cache for invalidation chain
|
|
154
135
|
this.clearModuleCacheForChain(invalidationChain, filesMap);
|
|
155
136
|
// Step 2: Reload affected modules
|
|
156
137
|
await this.reloadAffectedModules(invalidationChain, filesMap);
|
|
138
|
+
await this.restartAffectedConnectors(hmrFiles);
|
|
157
139
|
}
|
|
158
140
|
/**
|
|
159
141
|
* Restart connectors that are affected by the changed files
|
|
160
142
|
*/
|
|
161
143
|
async restartAffectedConnectors(affectedFiles) {
|
|
162
|
-
const connectorsToRestart = this.connectors.filter(
|
|
144
|
+
const connectorsToRestart = this.connectors.filter(connector => connector.shouldRestart(affectedFiles));
|
|
163
145
|
if (connectorsToRestart.length === 0) {
|
|
164
146
|
return;
|
|
165
147
|
}
|
|
166
148
|
// Restart in priority order
|
|
167
149
|
for (const connector of connectorsToRestart) {
|
|
168
|
-
|
|
150
|
+
connector.restart();
|
|
169
151
|
}
|
|
170
152
|
}
|
|
171
153
|
/**
|
|
@@ -177,9 +159,7 @@ class LayerExecutor {
|
|
|
177
159
|
if (file) {
|
|
178
160
|
this.moduleLoader.clearModuleCache(file.absolutePath);
|
|
179
161
|
// Update module version for HMR cache busting
|
|
180
|
-
|
|
181
|
-
global.__updateModuleVersion(`./${file.cachePath}`, Date.now());
|
|
182
|
-
}
|
|
162
|
+
__updateModuleVersion(`./${file.cachePath}`, Date.now());
|
|
183
163
|
}
|
|
184
164
|
}
|
|
185
165
|
}
|
|
@@ -204,10 +184,18 @@ class LayerExecutor {
|
|
|
204
184
|
return false;
|
|
205
185
|
};
|
|
206
186
|
// Check which special files are affected
|
|
207
|
-
const affectedMainFiles = this.specialFilesCollector
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
const
|
|
187
|
+
const affectedMainFiles = this.specialFilesCollector
|
|
188
|
+
.getMainFiles()
|
|
189
|
+
.filter(isAffected);
|
|
190
|
+
const affectedRouteFiles = this.specialFilesCollector
|
|
191
|
+
.getRouteFiles()
|
|
192
|
+
.filter(isAffected);
|
|
193
|
+
const affectedEventFiles = this.specialFilesCollector
|
|
194
|
+
.getEventFiles()
|
|
195
|
+
.filter(isAffected);
|
|
196
|
+
const affectedLocaleFiles = this.specialFilesCollector
|
|
197
|
+
.getLocaleFiles()
|
|
198
|
+
.filter(isAffected);
|
|
211
199
|
// Reload affected special files
|
|
212
200
|
if (affectedMainFiles.length > 0) {
|
|
213
201
|
for (const file of affectedMainFiles) {
|
|
@@ -251,17 +239,34 @@ class LayerExecutor {
|
|
|
251
239
|
return false;
|
|
252
240
|
};
|
|
253
241
|
// Check which special files are affected
|
|
254
|
-
const affectedMainFiles = this.specialFilesCollector
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
const
|
|
242
|
+
const affectedMainFiles = this.specialFilesCollector
|
|
243
|
+
.getMainFiles()
|
|
244
|
+
.filter(isAffected);
|
|
245
|
+
const affectedConfigFiles = this.specialFilesCollector
|
|
246
|
+
.getConfigFiles()
|
|
247
|
+
.filter(isAffected);
|
|
248
|
+
const affectedRouteFiles = this.specialFilesCollector
|
|
249
|
+
.getRouteFiles()
|
|
250
|
+
.filter(isAffected);
|
|
251
|
+
const affectedEventFiles = this.specialFilesCollector
|
|
252
|
+
.getEventFiles()
|
|
253
|
+
.filter(isAffected);
|
|
254
|
+
const affectedLocaleFiles = this.specialFilesCollector
|
|
255
|
+
.getLocaleFiles()
|
|
256
|
+
.filter(isAffected);
|
|
258
257
|
const hasSpecialFiles = affectedMainFiles.length > 0 ||
|
|
259
258
|
affectedRouteFiles.length > 0 ||
|
|
260
259
|
affectedEventFiles.length > 0 ||
|
|
261
|
-
affectedLocaleFiles.length > 0
|
|
260
|
+
affectedLocaleFiles.length > 0 ||
|
|
261
|
+
affectedConfigFiles.length > 0;
|
|
262
262
|
if (!hasSpecialFiles) {
|
|
263
263
|
return;
|
|
264
264
|
}
|
|
265
|
+
if (affectedConfigFiles.length > 0) {
|
|
266
|
+
for (const file of affectedConfigFiles) {
|
|
267
|
+
await this.configLoader.reloadConfig(file);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
265
270
|
// Reload special files
|
|
266
271
|
if (affectedMainFiles.length > 0) {
|
|
267
272
|
for (const file of affectedMainFiles) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layer-executor.js","sources":["../../src/dev2-server/layer-executor.ts"],"sourcesContent":[null],"names":["
|
|
1
|
+
{"version":3,"file":"layer-executor.js","sources":["../../src/dev2-server/layer-executor.ts"],"sourcesContent":[null],"names":["devLogHMR"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-loader.d.ts","sourceRoot":"","sources":["../../src/dev2-server/module-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module-loader.d.ts","sourceRoot":"","sources":["../../src/dev2-server/module-loader.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAGvE;;;;GAIG;AACH,qBAAa,YAAY;IAUX,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IATlD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0B;IAExD;;OAEG;gBAC0B,qBAAqB,EAAE,qBAAqB;IAEzE;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrC;;;;OAIG;IACU,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3C;;;;OAIG;IACU,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAa7C;;;;OAIG;IACU,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAa5C;;;;OAIG;IACU,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAc5C;;;;;OAKG;YACW,UAAU;IAoDxB;;;OAGG;IACU,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC3D;;;;OAIG;IACI,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAKnD;;;OAGG;IACI,wBAAwB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI;IAM9D;;;OAGG;IACI,mBAAmB,IAAI,IAAI;IAOlC;;;OAGG;IACI,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS;IAI7D;;;OAGG;IACI,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAIpD;;OAEG;IACI,oBAAoB,IAAI,MAAM,EAAE;IAIvC;;OAEG;IACI,QAAQ,IAAI;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;KACrB;CASF"}
|
|
@@ -21,12 +21,10 @@ class ModuleLoader {
|
|
|
21
21
|
*/
|
|
22
22
|
async loadAll() {
|
|
23
23
|
// Load in specific order
|
|
24
|
-
await
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
this.loadRouteFiles(),
|
|
29
|
-
]);
|
|
24
|
+
await this.loadLocaleFiles();
|
|
25
|
+
await this.loadEventFiles();
|
|
26
|
+
await this.loadMainFiles();
|
|
27
|
+
await this.loadRouteFiles();
|
|
30
28
|
}
|
|
31
29
|
/**
|
|
32
30
|
* Load all main.ts files
|
|
@@ -39,9 +37,9 @@ class ModuleLoader {
|
|
|
39
37
|
return;
|
|
40
38
|
}
|
|
41
39
|
// Load all main files in parallel
|
|
42
|
-
|
|
40
|
+
for (const file of mainFiles) {
|
|
43
41
|
await this.loadModule(file, "main");
|
|
44
|
-
}
|
|
42
|
+
}
|
|
45
43
|
}
|
|
46
44
|
/**
|
|
47
45
|
* Load all locale files
|
|
@@ -54,9 +52,9 @@ class ModuleLoader {
|
|
|
54
52
|
return;
|
|
55
53
|
}
|
|
56
54
|
// Load all locale files in parallel
|
|
57
|
-
|
|
55
|
+
for (const file of localeFiles) {
|
|
58
56
|
await this.loadModule(file, "locale");
|
|
59
|
-
}
|
|
57
|
+
}
|
|
60
58
|
}
|
|
61
59
|
/**
|
|
62
60
|
* Load all event files
|
|
@@ -69,9 +67,9 @@ class ModuleLoader {
|
|
|
69
67
|
return;
|
|
70
68
|
}
|
|
71
69
|
// Load all event files in parallel
|
|
72
|
-
|
|
70
|
+
for (const file of eventFiles) {
|
|
73
71
|
await this.loadModule(file, "event");
|
|
74
|
-
}
|
|
72
|
+
}
|
|
75
73
|
}
|
|
76
74
|
/**
|
|
77
75
|
* Load all route files
|
|
@@ -80,11 +78,11 @@ class ModuleLoader {
|
|
|
80
78
|
*/
|
|
81
79
|
async loadRouteFiles() {
|
|
82
80
|
const routeFiles = this.specialFilesCollector.getRouteFiles();
|
|
83
|
-
console.log("Loading route files", routeFiles.map(file => file.relativePath));
|
|
84
81
|
if (routeFiles.length === 0) {
|
|
85
82
|
return;
|
|
86
83
|
}
|
|
87
84
|
// Load route files sequentially
|
|
85
|
+
// because we are registering the source file, we must load routes sequentially
|
|
88
86
|
for (const file of routeFiles) {
|
|
89
87
|
await this.loadModule(file, "route");
|
|
90
88
|
}
|
|
@@ -98,6 +96,8 @@ class ModuleLoader {
|
|
|
98
96
|
async loadModule(file, type, bustCache = false) {
|
|
99
97
|
// Get the cached transpiled file path
|
|
100
98
|
const cachedFilePath = utils.warlockCachePath(file.cachePath);
|
|
99
|
+
devLogger.devLogInfo(`Loading module: ${file.relativePath} (${type})`);
|
|
100
|
+
let now = performance.now();
|
|
101
101
|
// Convert to file:// URL for cross-platform compatibility
|
|
102
102
|
let fileUrl = node_url.pathToFileURL(cachedFilePath).href;
|
|
103
103
|
try {
|
|
@@ -109,12 +109,10 @@ class ModuleLoader {
|
|
|
109
109
|
// For route files, wrap the import with source file tracking
|
|
110
110
|
if (type === "route") {
|
|
111
111
|
await router.router.withSourceFile(file.relativePath, async () => {
|
|
112
|
-
console.log("Loading route file", file.relativePath);
|
|
113
112
|
// Dynamic import the module (routes will be registered with sourceFile)
|
|
114
113
|
const module = await (function(t){return Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require(t))})})(fileUrl);
|
|
115
114
|
// Store in cache (use source path as key for consistency)
|
|
116
115
|
this.loadedModules.set(file.absolutePath, module);
|
|
117
|
-
console.log("Loaded route file", file.relativePath);
|
|
118
116
|
});
|
|
119
117
|
}
|
|
120
118
|
else {
|
|
@@ -123,6 +121,7 @@ class ModuleLoader {
|
|
|
123
121
|
// Store in cache (use source path as key for consistency)
|
|
124
122
|
this.loadedModules.set(file.absolutePath, module);
|
|
125
123
|
}
|
|
124
|
+
devLogger.devLogSuccess(`Module loaded: ${file.relativePath} (${type}) in ${performance.now() - now}ms`);
|
|
126
125
|
}
|
|
127
126
|
catch (error) {
|
|
128
127
|
// Format error message (especially for MODULE_NOT_FOUND)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-loader.js","sources":["../../src/dev2-server/module-loader.ts"],"sourcesContent":[null],"names":["warlockCachePath","pathToFileURL","router","devLogError","formatModuleNotFoundError"],"mappings":"
|
|
1
|
+
{"version":3,"file":"module-loader.js","sources":["../../src/dev2-server/module-loader.ts"],"sourcesContent":[null],"names":["warlockCachePath","devLogInfo","pathToFileURL","router","devLogSuccess","devLogError","formatModuleNotFoundError"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-imports.d.ts","sourceRoot":"","sources":["../../src/dev2-server/parse-imports.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse-imports.d.ts","sourceRoot":"","sources":["../../src/dev2-server/parse-imports.ts"],"names":[],"mappings":"AAoJA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,gCAqDlE"}
|