@webda/compiler 4.0.0-beta.3 → 4.0.0-beta.5
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/lib/compiler.d.ts +16 -1
- package/lib/compiler.d.ts.map +1 -1
- package/lib/compiler.js +93 -1
- package/lib/compiler.js.map +1 -1
- package/package.json +10 -6
package/lib/compiler.d.ts
CHANGED
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
import type { WebdaProject } from "./definition.js";
|
|
2
|
+
/**
|
|
3
|
+
* Installed versions of the packages that generate the build output.
|
|
4
|
+
*
|
|
5
|
+
* Read once per application root and process. A package that cannot be
|
|
6
|
+
* resolved reports "unknown" rather than failing the build.
|
|
7
|
+
* @param appRoot - application root
|
|
8
|
+
* @param resolveEntry - locates a file inside a package, to start the search for its manifest
|
|
9
|
+
* @returns package name to installed version
|
|
10
|
+
*/
|
|
11
|
+
export declare function getGeneratorVersions(appRoot: string, resolveEntry?: (name: string, appRoot: string) => string): Record<string, string>;
|
|
2
12
|
/**
|
|
3
13
|
* Compiler
|
|
4
14
|
*
|
|
@@ -11,6 +21,8 @@ import type { WebdaProject } from "./definition.js";
|
|
|
11
21
|
*/
|
|
12
22
|
export declare class Compiler {
|
|
13
23
|
project: WebdaProject;
|
|
24
|
+
/** Locates generator packages; replaceable to simulate a missing one. */
|
|
25
|
+
private resolveGenerator;
|
|
14
26
|
/**
|
|
15
27
|
* If true the compiler has compiled already
|
|
16
28
|
*/
|
|
@@ -32,8 +44,11 @@ export declare class Compiler {
|
|
|
32
44
|
/**
|
|
33
45
|
* Create a new compiler for the given project
|
|
34
46
|
* @param project - the Webda project to compile
|
|
47
|
+
* @param resolveGenerator - locates generator packages; replaceable to simulate a missing one
|
|
35
48
|
*/
|
|
36
|
-
constructor(project: WebdaProject
|
|
49
|
+
constructor(project: WebdaProject,
|
|
50
|
+
/** Locates generator packages; replaceable to simulate a missing one. */
|
|
51
|
+
resolveGenerator?: (name: string, appRoot: string) => string);
|
|
37
52
|
/**
|
|
38
53
|
* MD5 hex digest of a file's contents.
|
|
39
54
|
* @param path - absolute path to the file
|
package/lib/compiler.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAsCpD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,YAAY,GAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAA8B,GAC9E,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiCxB;AAED;;;;;;;;;GASG;AACH,qBAAa,QAAQ;IA6BV,OAAO,EAAE,YAAY;IAC5B,yEAAyE;IACzE,OAAO,CAAC,gBAAgB;IA9B1B;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB,uCAAuC;IACvC,OAAO,CAAC,OAAO,CAAC,CAAY;IAC5B,gDAAgD;IAChD,OAAO,CAAC,OAAO,CAAC,CAAiB;IACjC;;OAEG;IACH,OAAO,CAAC,UAAU,CAAS;IAE3B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAInB;;;;OAIG;IACH,YACS,OAAO,EAAE,YAAY;IAC5B,yEAAyE;IACjE,gBAAgB,GAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAA8B,EACzF;IAEJ;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAOlB;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAiD5B;IAED;;;;;;;;;OASG;IACH,OAAO,CAAC,cAAc;IAetB;;;;OAIG;IACH,OAAO,CAAC,KAAK,GAAE,OAAe,GAAG,OAAO,CA0DvC;IAED;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAanB;;;;;;;;;;OAUG;IACH,KAAK,CAAC,QAAQ,GAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAe,QAWjD;IAED;;OAEG;IACH,SAAS,SAKR;CACF"}
|
package/lib/compiler.js
CHANGED
|
@@ -1,9 +1,88 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { existsSync, mkdirSync, readFileSync, watch as watchFiles } from "node:fs";
|
|
3
|
+
import { createRequire } from "node:module";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
3
6
|
import { FileUtils } from "@webda/utils";
|
|
4
7
|
import { useLog } from "@webda/workout";
|
|
5
8
|
import { writeModule } from "./module.js";
|
|
6
9
|
import { build } from "./schema-backend.js";
|
|
10
|
+
/** Packages whose version decides whether a cached build is still valid. */
|
|
11
|
+
const GENERATOR_PACKAGES = ["@webda/compiler", "@webda/content-mapper"];
|
|
12
|
+
const generatorVersions = new Map();
|
|
13
|
+
/**
|
|
14
|
+
* Locate a file inside a generator package the way the build does.
|
|
15
|
+
*
|
|
16
|
+
* Mirrors `resolveWorker` in `schema-backend.ts`: `WEBDA_SCHEMA_WORKER`, then
|
|
17
|
+
* the application's copy (it can pin a version), then the compiler's own.
|
|
18
|
+
* @param name - generator package name
|
|
19
|
+
* @param appRoot - application root
|
|
20
|
+
* @returns a file inside the package
|
|
21
|
+
*/
|
|
22
|
+
function resolveGeneratorEntry(name, appRoot) {
|
|
23
|
+
if (name === "@webda/compiler") {
|
|
24
|
+
// The compiler's own manifest sits next to `lib/` (or `src/`).
|
|
25
|
+
return fileURLToPath(new URL("index.js", import.meta.url));
|
|
26
|
+
}
|
|
27
|
+
const override = process.env.WEBDA_SCHEMA_WORKER;
|
|
28
|
+
if (override && existsSync(override)) {
|
|
29
|
+
return override;
|
|
30
|
+
}
|
|
31
|
+
let error;
|
|
32
|
+
for (const base of [appRoot, fileURLToPath(new URL(".", import.meta.url))]) {
|
|
33
|
+
try {
|
|
34
|
+
return createRequire(join(base, "index.js")).resolve(`${name}/schema-worker-cli`);
|
|
35
|
+
}
|
|
36
|
+
catch (err) {
|
|
37
|
+
error = err;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
throw error;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Installed versions of the packages that generate the build output.
|
|
44
|
+
*
|
|
45
|
+
* Read once per application root and process. A package that cannot be
|
|
46
|
+
* resolved reports "unknown" rather than failing the build.
|
|
47
|
+
* @param appRoot - application root
|
|
48
|
+
* @param resolveEntry - locates a file inside a package, to start the search for its manifest
|
|
49
|
+
* @returns package name to installed version
|
|
50
|
+
*/
|
|
51
|
+
export function getGeneratorVersions(appRoot, resolveEntry = resolveGeneratorEntry) {
|
|
52
|
+
const cached = generatorVersions.get(appRoot);
|
|
53
|
+
if (cached) {
|
|
54
|
+
return cached;
|
|
55
|
+
}
|
|
56
|
+
const versions = {};
|
|
57
|
+
for (const name of GENERATOR_PACKAGES) {
|
|
58
|
+
let version = "unknown";
|
|
59
|
+
try {
|
|
60
|
+
// Not every package exports ./package.json, so walk up from a file
|
|
61
|
+
// inside it to the package root.
|
|
62
|
+
let dir = join(resolveEntry(name, appRoot), "..");
|
|
63
|
+
while (dir !== join(dir, "..")) {
|
|
64
|
+
const manifest = join(dir, "package.json");
|
|
65
|
+
if (existsSync(manifest)) {
|
|
66
|
+
const pkg = JSON.parse(readFileSync(manifest, "utf8"));
|
|
67
|
+
if (pkg.name === name) {
|
|
68
|
+
version = pkg.version ?? "unknown";
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
dir = join(dir, "..");
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
catch {
|
|
76
|
+
// Keep "unknown"
|
|
77
|
+
}
|
|
78
|
+
versions[name] = version;
|
|
79
|
+
}
|
|
80
|
+
// Only memoize real results so a transient failure does not stick
|
|
81
|
+
if (!Object.values(versions).includes("unknown")) {
|
|
82
|
+
generatorVersions.set(appRoot, versions);
|
|
83
|
+
}
|
|
84
|
+
return versions;
|
|
85
|
+
}
|
|
7
86
|
/**
|
|
8
87
|
* Compiler
|
|
9
88
|
*
|
|
@@ -16,6 +95,7 @@ import { build } from "./schema-backend.js";
|
|
|
16
95
|
*/
|
|
17
96
|
export class Compiler {
|
|
18
97
|
project;
|
|
98
|
+
resolveGenerator;
|
|
19
99
|
/**
|
|
20
100
|
* If true the compiler has compiled already
|
|
21
101
|
*/
|
|
@@ -39,9 +119,13 @@ export class Compiler {
|
|
|
39
119
|
/**
|
|
40
120
|
* Create a new compiler for the given project
|
|
41
121
|
* @param project - the Webda project to compile
|
|
122
|
+
* @param resolveGenerator - locates generator packages; replaceable to simulate a missing one
|
|
42
123
|
*/
|
|
43
|
-
constructor(project
|
|
124
|
+
constructor(project,
|
|
125
|
+
/** Locates generator packages; replaceable to simulate a missing one. */
|
|
126
|
+
resolveGenerator = resolveGeneratorEntry) {
|
|
44
127
|
this.project = project;
|
|
128
|
+
this.resolveGenerator = resolveGenerator;
|
|
45
129
|
}
|
|
46
130
|
/**
|
|
47
131
|
* MD5 hex digest of a file's contents.
|
|
@@ -67,6 +151,13 @@ export class Compiler {
|
|
|
67
151
|
return true;
|
|
68
152
|
}
|
|
69
153
|
const webdaCache = FileUtils.load(f, "json");
|
|
154
|
+
const generator = getGeneratorVersions(this.project.getAppPath(), this.resolveGenerator);
|
|
155
|
+
for (const name of GENERATOR_PACKAGES) {
|
|
156
|
+
if (webdaCache.generator?.[name] !== generator[name]) {
|
|
157
|
+
useLog("INFO", `Generator changed: ${name} ${webdaCache.generator?.[name] ?? "(not recorded)"} → ${generator[name]}, rebuilding`);
|
|
158
|
+
return true;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
70
161
|
const currentDigest = this.project.getDigest();
|
|
71
162
|
if (webdaCache.sourceDigest !== currentDigest) {
|
|
72
163
|
return true;
|
|
@@ -192,6 +283,7 @@ export class Compiler {
|
|
|
192
283
|
const webdaCache = existsSync(f) ? FileUtils.load(f, "json") : {};
|
|
193
284
|
webdaCache.sourceDigest = this.project.getDigest();
|
|
194
285
|
webdaCache.moduleDigest = this.fileDigest(this.project.getAppPath("webda.module.json"));
|
|
286
|
+
webdaCache.generator = { ...getGeneratorVersions(this.project.getAppPath(), this.resolveGenerator) };
|
|
195
287
|
FileUtils.save(webdaCache, f, "json");
|
|
196
288
|
}
|
|
197
289
|
/**
|
package/lib/compiler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,IAAI,UAAU,EAAkB,MAAM,SAAS,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C;;;;;;;;;GASG;AACH,MAAM,OAAO,QAAQ;
|
|
1
|
+
{"version":3,"file":"compiler.js","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webda/compiler",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.5",
|
|
4
4
|
"description": "Expose API with Lambda",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
"api gateway"
|
|
9
9
|
],
|
|
10
10
|
"author": "Remi Cattiau <remi@cattiau.com>",
|
|
11
|
-
"repository":
|
|
11
|
+
"repository": {
|
|
12
|
+
"type": "git",
|
|
13
|
+
"url": "git+https://github.com/loopingz/webda.io.git",
|
|
14
|
+
"directory": "packages/compiler"
|
|
15
|
+
},
|
|
12
16
|
"main": "lib/index.js",
|
|
13
17
|
"bin": {
|
|
14
18
|
"webdac": "./lib/shell.js"
|
|
@@ -22,9 +26,9 @@
|
|
|
22
26
|
"typescript": "7.1.0-dev.20260929.1",
|
|
23
27
|
"yargs": "^18.0.0",
|
|
24
28
|
"yoctocolors": "^1.0.0",
|
|
25
|
-
"@webda/content-mapper": "4.0.0-beta.
|
|
26
|
-
"@webda/utils": "^4.0.0-beta.
|
|
27
|
-
"@webda/workout": "4.0.0-beta.
|
|
29
|
+
"@webda/content-mapper": "4.0.0-beta.5",
|
|
30
|
+
"@webda/utils": "^4.0.0-beta.5",
|
|
31
|
+
"@webda/workout": "4.0.0-beta.5"
|
|
28
32
|
},
|
|
29
33
|
"devDependencies": {
|
|
30
34
|
"@types/node": "25.5.0",
|
|
@@ -34,7 +38,7 @@
|
|
|
34
38
|
"skott": "^0.35.8",
|
|
35
39
|
"vite": "^6.0.0",
|
|
36
40
|
"vitest": "^4.1.2",
|
|
37
|
-
"@webda/test": "4.0.0-beta.
|
|
41
|
+
"@webda/test": "4.0.0-beta.5"
|
|
38
42
|
},
|
|
39
43
|
"files": [
|
|
40
44
|
"lib"
|