cloesce 0.0.5-unstable.0 → 0.0.5-unstable.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/dist/ast.d.ts +80 -100
- package/dist/ast.js +12 -12
- package/dist/cli.d.ts +1 -1
- package/dist/cli.js +331 -368
- package/dist/extractor/err.d.ts +26 -26
- package/dist/extractor/err.js +100 -129
- package/dist/extractor/extract.d.ts +17 -60
- package/dist/extractor/extract.js +764 -826
- package/dist/generator.wasm +0 -0
- package/dist/orm.wasm +0 -0
- package/dist/router/crud.d.ts +1 -1
- package/dist/router/crud.js +43 -42
- package/dist/router/router.d.ts +98 -135
- package/dist/router/router.js +381 -424
- package/dist/router/validator.d.ts +6 -11
- package/dist/router/validator.js +144 -158
- package/dist/router/wasm.d.ts +22 -56
- package/dist/router/wasm.js +79 -91
- package/dist/ui/backend.d.ts +181 -214
- package/dist/ui/backend.js +245 -258
- package/dist/ui/client.d.ts +1 -1
- package/dist/ui/common.d.ts +31 -48
- package/dist/ui/common.d.ts.map +1 -1
- package/dist/ui/common.js +159 -178
- package/package.json +2 -2
package/dist/cli.js
CHANGED
|
@@ -3,406 +3,369 @@ import { WASI } from "node:wasi";
|
|
|
3
3
|
import fs from "node:fs";
|
|
4
4
|
import { readFile } from "fs/promises";
|
|
5
5
|
import path from "node:path";
|
|
6
|
-
import {
|
|
7
|
-
command,
|
|
8
|
-
run,
|
|
9
|
-
subcommands,
|
|
10
|
-
flag,
|
|
11
|
-
string,
|
|
12
|
-
positional,
|
|
13
|
-
option,
|
|
14
|
-
optional,
|
|
15
|
-
} from "cmd-ts";
|
|
6
|
+
import { command, run, subcommands, flag, string, positional, option, optional, } from "cmd-ts";
|
|
16
7
|
import { Project } from "ts-morph";
|
|
17
8
|
import { CidlExtractor } from "./extractor/extract.js";
|
|
18
|
-
import {
|
|
19
|
-
ExtractorError,
|
|
20
|
-
ExtractorErrorCode,
|
|
21
|
-
getErrorInfo,
|
|
22
|
-
} from "./extractor/err.js";
|
|
9
|
+
import { ExtractorError, ExtractorErrorCode, getErrorInfo, } from "./extractor/err.js";
|
|
23
10
|
let debugPhase = "npm cloesce";
|
|
24
11
|
function debug(...args) {
|
|
25
|
-
|
|
12
|
+
console.log(`[${debugPhase}]: `, ...args);
|
|
26
13
|
}
|
|
27
14
|
const cmds = subcommands({
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
}),
|
|
58
|
-
extract: command({
|
|
59
|
-
name: "extract",
|
|
60
|
-
description: "Extract models and write cidl.pre.json",
|
|
61
|
-
args: {
|
|
62
|
-
projectName: option({
|
|
63
|
-
long: "project-name",
|
|
64
|
-
type: optional(string),
|
|
65
|
-
description: "Project name",
|
|
66
|
-
}),
|
|
67
|
-
out: option({
|
|
68
|
-
long: "out",
|
|
69
|
-
short: "o",
|
|
70
|
-
type: optional(string),
|
|
71
|
-
}),
|
|
72
|
-
inp: option({
|
|
73
|
-
long: "in",
|
|
74
|
-
short: "i",
|
|
75
|
-
type: optional(string),
|
|
76
|
-
description: "Input file or directory",
|
|
15
|
+
name: "cloesce",
|
|
16
|
+
cmds: {
|
|
17
|
+
compile: command({
|
|
18
|
+
name: "compile",
|
|
19
|
+
description: "Run through the full compilation process.",
|
|
20
|
+
args: {},
|
|
21
|
+
handler: async () => {
|
|
22
|
+
const config = loadCloesceConfig(process.cwd());
|
|
23
|
+
if (!config) {
|
|
24
|
+
process.exit(1);
|
|
25
|
+
}
|
|
26
|
+
await extract(config);
|
|
27
|
+
debugPhase = "npm cloesce";
|
|
28
|
+
const outputDir = config.outPath ?? ".generated";
|
|
29
|
+
const generateConfig = {
|
|
30
|
+
name: "generate",
|
|
31
|
+
wasmFile: "generator.wasm",
|
|
32
|
+
args: [
|
|
33
|
+
"generate",
|
|
34
|
+
path.join(outputDir, "cidl.pre.json"),
|
|
35
|
+
path.join(outputDir, "cidl.json"),
|
|
36
|
+
"wrangler.toml",
|
|
37
|
+
path.join(outputDir, "workers.ts"),
|
|
38
|
+
path.join(outputDir, "client.ts"),
|
|
39
|
+
config.workersUrl,
|
|
40
|
+
],
|
|
41
|
+
};
|
|
42
|
+
await generate(generateConfig);
|
|
43
|
+
},
|
|
77
44
|
}),
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
45
|
+
extract: command({
|
|
46
|
+
name: "extract",
|
|
47
|
+
description: "Extract models and write cidl.pre.json",
|
|
48
|
+
args: {
|
|
49
|
+
projectName: option({
|
|
50
|
+
long: "project-name",
|
|
51
|
+
type: optional(string),
|
|
52
|
+
description: "Project name",
|
|
53
|
+
}),
|
|
54
|
+
out: option({
|
|
55
|
+
long: "out",
|
|
56
|
+
short: "o",
|
|
57
|
+
type: optional(string),
|
|
58
|
+
}),
|
|
59
|
+
inp: option({
|
|
60
|
+
long: "in",
|
|
61
|
+
short: "i",
|
|
62
|
+
type: optional(string),
|
|
63
|
+
description: "Input file or directory",
|
|
64
|
+
}),
|
|
65
|
+
truncateSourcePaths: flag({
|
|
66
|
+
long: "truncateSourcePaths",
|
|
67
|
+
description: "Sets all source paths to just their file name",
|
|
68
|
+
}),
|
|
69
|
+
skipTsCheck: flag({
|
|
70
|
+
long: "skipTsCheck",
|
|
71
|
+
description: "Skip TypeScript compilation checks",
|
|
72
|
+
}),
|
|
73
|
+
},
|
|
74
|
+
handler: async (args) => {
|
|
75
|
+
const config = {
|
|
76
|
+
projectName: args.projectName,
|
|
77
|
+
outPath: args.out,
|
|
78
|
+
paths: [args.inp],
|
|
79
|
+
truncateSourcePaths: false,
|
|
80
|
+
workersUrl: "",
|
|
81
|
+
migrationsPath: "",
|
|
82
|
+
};
|
|
83
|
+
await extract(config, {
|
|
84
|
+
truncateSourcePaths: args.truncateSourcePaths,
|
|
85
|
+
skipTsCheck: args.skipTsCheck,
|
|
86
|
+
});
|
|
87
|
+
},
|
|
81
88
|
}),
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
89
|
+
migrate: command({
|
|
90
|
+
name: "migrate",
|
|
91
|
+
description: "Creates a database migration.",
|
|
92
|
+
args: {
|
|
93
|
+
name: positional({ type: string, displayName: "name" }),
|
|
94
|
+
debug: flag({
|
|
95
|
+
long: "debug",
|
|
96
|
+
short: "d",
|
|
97
|
+
description: "Show debug output",
|
|
98
|
+
}),
|
|
99
|
+
},
|
|
100
|
+
handler: async (args) => {
|
|
101
|
+
const config = loadCloesceConfig(process.cwd());
|
|
102
|
+
if (!config) {
|
|
103
|
+
process.exit(1);
|
|
104
|
+
}
|
|
105
|
+
const cidlPath = path.join(config.outPath, "cidl.json");
|
|
106
|
+
if (!fs.existsSync(cidlPath)) {
|
|
107
|
+
console.error("Err: No cloesce file found, have you ran `cloesce compile`?");
|
|
108
|
+
process.exit(1);
|
|
109
|
+
}
|
|
110
|
+
if (!fs.existsSync(config.migrationsPath)) {
|
|
111
|
+
fs.mkdirSync(config.migrationsPath);
|
|
112
|
+
}
|
|
113
|
+
const migrationPrefix = path.join(config.migrationsPath, `${timestamp()}_${args.name}`);
|
|
114
|
+
let wasmArgs = [
|
|
115
|
+
"migrations",
|
|
116
|
+
cidlPath,
|
|
117
|
+
`${migrationPrefix}.json`,
|
|
118
|
+
`${migrationPrefix}.sql`,
|
|
119
|
+
];
|
|
120
|
+
// Add last migration if exists
|
|
121
|
+
{
|
|
122
|
+
const files = fs.readdirSync(config.migrationsPath);
|
|
123
|
+
const jsonFiles = files.filter((f) => f.endsWith(".json"));
|
|
124
|
+
// Sort descending by filename
|
|
125
|
+
jsonFiles.sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));
|
|
126
|
+
if (jsonFiles.length > 0) {
|
|
127
|
+
wasmArgs.push(path.join(config.migrationsPath, jsonFiles[0]));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
const migrateConfig = {
|
|
131
|
+
name: "migrations",
|
|
132
|
+
wasmFile: "generator.wasm",
|
|
133
|
+
args: wasmArgs,
|
|
134
|
+
};
|
|
135
|
+
// Runs a generator command. Exits the process on failure.
|
|
136
|
+
await generate(migrateConfig);
|
|
137
|
+
},
|
|
85
138
|
}),
|
|
86
|
-
|
|
87
|
-
handler: async (args) => {
|
|
88
|
-
const config = {
|
|
89
|
-
projectName: args.projectName,
|
|
90
|
-
outPath: args.out,
|
|
91
|
-
paths: [args.inp],
|
|
92
|
-
truncateSourcePaths: false,
|
|
93
|
-
workersUrl: "",
|
|
94
|
-
migrationsPath: "",
|
|
95
|
-
};
|
|
96
|
-
await extract(config, {
|
|
97
|
-
truncateSourcePaths: args.truncateSourcePaths,
|
|
98
|
-
skipTsCheck: args.skipTsCheck,
|
|
99
|
-
});
|
|
100
|
-
},
|
|
101
|
-
}),
|
|
102
|
-
migrate: command({
|
|
103
|
-
name: "migrate",
|
|
104
|
-
description: "Creates a database migration.",
|
|
105
|
-
args: {
|
|
106
|
-
name: positional({ type: string, displayName: "name" }),
|
|
107
|
-
debug: flag({
|
|
108
|
-
long: "debug",
|
|
109
|
-
short: "d",
|
|
110
|
-
description: "Show debug output",
|
|
111
|
-
}),
|
|
112
|
-
},
|
|
113
|
-
handler: async (args) => {
|
|
114
|
-
const config = loadCloesceConfig(process.cwd());
|
|
115
|
-
if (!config) {
|
|
116
|
-
process.exit(1);
|
|
117
|
-
}
|
|
118
|
-
const cidlPath = path.join(config.outPath, "cidl.json");
|
|
119
|
-
if (!fs.existsSync(cidlPath)) {
|
|
120
|
-
console.error(
|
|
121
|
-
"Err: No cloesce file found, have you ran `cloesce compile`?",
|
|
122
|
-
);
|
|
123
|
-
process.exit(1);
|
|
124
|
-
}
|
|
125
|
-
if (!fs.existsSync(config.migrationsPath)) {
|
|
126
|
-
fs.mkdirSync(config.migrationsPath);
|
|
127
|
-
}
|
|
128
|
-
const migrationPrefix = path.join(
|
|
129
|
-
config.migrationsPath,
|
|
130
|
-
`${timestamp()}_${args.name}`,
|
|
131
|
-
);
|
|
132
|
-
let wasmArgs = [
|
|
133
|
-
"migrations",
|
|
134
|
-
cidlPath,
|
|
135
|
-
`${migrationPrefix}.json`,
|
|
136
|
-
`${migrationPrefix}.sql`,
|
|
137
|
-
];
|
|
138
|
-
// Add last migration if exists
|
|
139
|
-
{
|
|
140
|
-
const files = fs.readdirSync(config.migrationsPath);
|
|
141
|
-
const jsonFiles = files.filter((f) => f.endsWith(".json"));
|
|
142
|
-
// Sort descending by filename
|
|
143
|
-
jsonFiles.sort((a, b) =>
|
|
144
|
-
b.localeCompare(a, undefined, { numeric: true }),
|
|
145
|
-
);
|
|
146
|
-
if (jsonFiles.length > 0) {
|
|
147
|
-
wasmArgs.push(path.join(config.migrationsPath, jsonFiles[0]));
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
const migrateConfig = {
|
|
151
|
-
name: "migrations",
|
|
152
|
-
wasmFile: "generator.wasm",
|
|
153
|
-
args: wasmArgs,
|
|
154
|
-
};
|
|
155
|
-
// Runs a generator command. Exits the process on failure.
|
|
156
|
-
await generate(migrateConfig);
|
|
157
|
-
},
|
|
158
|
-
}),
|
|
159
|
-
},
|
|
139
|
+
},
|
|
160
140
|
});
|
|
161
141
|
async function extract(config, args = {}) {
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
142
|
+
const startTime = Date.now();
|
|
143
|
+
debugPhase = "extractor";
|
|
144
|
+
debug("Preparing extraction...");
|
|
145
|
+
const root = process.cwd();
|
|
146
|
+
const projectRoot = process.cwd();
|
|
147
|
+
const searchPaths = config.paths ?? [root];
|
|
148
|
+
const outPath = (() => {
|
|
149
|
+
// If the out path is a directory, join it with "cidl.pre.json"
|
|
150
|
+
if (fs.existsSync(config.outPath) &&
|
|
151
|
+
fs.statSync(config.outPath).isDirectory()) {
|
|
152
|
+
return path.join(config.outPath, "cidl.pre.json");
|
|
153
|
+
}
|
|
154
|
+
// If the out path is a file, use it directly
|
|
155
|
+
if (config.outPath && config.outPath.endsWith(".json")) {
|
|
156
|
+
return config.outPath;
|
|
157
|
+
}
|
|
158
|
+
// Default to .generated/cidl.pre.json
|
|
159
|
+
return path.join(config.outPath ?? ".generated", "cidl.pre.json");
|
|
160
|
+
})();
|
|
161
|
+
const truncate = args.truncateSourcePaths ?? config.truncateSourcePaths ?? false;
|
|
162
|
+
const cloesceProjectName = config.projectName ?? readPackageJsonProjectName(projectRoot);
|
|
163
|
+
const project = new Project({
|
|
164
|
+
skipAddingFilesFromTsConfig: true,
|
|
165
|
+
compilerOptions: {
|
|
166
|
+
skipLibCheck: true,
|
|
167
|
+
strictNullChecks: true,
|
|
168
|
+
experimentalDecorators: true,
|
|
169
|
+
emitDecoratorMetadata: true,
|
|
170
|
+
},
|
|
171
|
+
});
|
|
172
|
+
findCloesceProject(root, searchPaths, project);
|
|
173
|
+
const fileCount = project.getSourceFiles().length;
|
|
174
|
+
if (fileCount === 0) {
|
|
175
|
+
new ExtractorError(ExtractorErrorCode.MissingFile);
|
|
175
176
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
177
|
+
debug(`Found ${fileCount} .cloesce.ts files`);
|
|
178
|
+
// Run typescript compiler checks to before extraction
|
|
179
|
+
if (!args.skipTsCheck) {
|
|
180
|
+
const tscStart = Date.now();
|
|
181
|
+
debug("Running TypeScript compiler checks...");
|
|
182
|
+
const diagnostics = project.getPreEmitDiagnostics();
|
|
183
|
+
if (diagnostics.length > 0) {
|
|
184
|
+
console.error("TypeScript errors detected in provided files:");
|
|
185
|
+
console.error(project.formatDiagnosticsWithColorAndContext(diagnostics));
|
|
186
|
+
process.exit(1);
|
|
187
|
+
}
|
|
188
|
+
debug(`TypeScript checks completed in ${Date.now() - tscStart}ms`);
|
|
179
189
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
190
|
+
try {
|
|
191
|
+
const extractorStart = Date.now();
|
|
192
|
+
debug("Extracting CIDL...");
|
|
193
|
+
const extractor = new CidlExtractor(cloesceProjectName, "v0.0.4");
|
|
194
|
+
const result = extractor.extract(project);
|
|
195
|
+
if (result.isLeft()) {
|
|
196
|
+
console.error(formatErr(result.value));
|
|
197
|
+
process.exit(1);
|
|
198
|
+
}
|
|
199
|
+
let ast = result.unwrap();
|
|
200
|
+
if (truncate) {
|
|
201
|
+
if (ast.wrangler_env) {
|
|
202
|
+
ast.wrangler_env.source_path =
|
|
203
|
+
"./" + path.basename(ast.wrangler_env.source_path);
|
|
204
|
+
}
|
|
205
|
+
if (ast.app_source) {
|
|
206
|
+
ast.app_source = "./" + path.basename(ast.app_source);
|
|
207
|
+
}
|
|
208
|
+
for (const model of Object.values(ast.models)) {
|
|
209
|
+
model.source_path = "./" + path.basename(model.source_path);
|
|
210
|
+
}
|
|
211
|
+
for (const poo of Object.values(ast.poos)) {
|
|
212
|
+
poo.source_path = "./" + path.basename(poo.source_path);
|
|
213
|
+
}
|
|
214
|
+
for (const service of Object.values(ast.services)) {
|
|
215
|
+
service.source_path = "./" + path.basename(service.source_path);
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
const json = JSON.stringify(ast, null, 4);
|
|
219
|
+
fs.mkdirSync(path.dirname(outPath), { recursive: true });
|
|
220
|
+
fs.writeFileSync(outPath, json);
|
|
221
|
+
debug(`Successfully extracted cidl.pre.json ${outPath} in ${Date.now() - extractorStart}ms`);
|
|
222
|
+
return { outPath, projectName: cloesceProjectName };
|
|
211
223
|
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
const extractorStart = Date.now();
|
|
216
|
-
debug("Extracting CIDL...");
|
|
217
|
-
const extractor = new CidlExtractor(cloesceProjectName, "v0.0.4");
|
|
218
|
-
const result = extractor.extract(project);
|
|
219
|
-
if (result.isLeft()) {
|
|
220
|
-
console.error(formatErr(result.value));
|
|
221
|
-
process.exit(1);
|
|
224
|
+
catch (err) {
|
|
225
|
+
console.error("Critical uncaught error in extractor. \nSubmit a ticket to https://github.com/bens-schreiber/cloesce\n\n", err?.message ?? "No error message.", "\n", err?.stack ?? "No error stack.");
|
|
226
|
+
process.exit(1);
|
|
222
227
|
}
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
if (ast.wrangler_env) {
|
|
226
|
-
ast.wrangler_env.source_path =
|
|
227
|
-
"./" + path.basename(ast.wrangler_env.source_path);
|
|
228
|
-
}
|
|
229
|
-
if (ast.app_source) {
|
|
230
|
-
ast.app_source = "./" + path.basename(ast.app_source);
|
|
231
|
-
}
|
|
232
|
-
for (const model of Object.values(ast.models)) {
|
|
233
|
-
model.source_path = "./" + path.basename(model.source_path);
|
|
234
|
-
}
|
|
235
|
-
for (const poo of Object.values(ast.poos)) {
|
|
236
|
-
poo.source_path = "./" + path.basename(poo.source_path);
|
|
237
|
-
}
|
|
238
|
-
for (const service of Object.values(ast.services)) {
|
|
239
|
-
service.source_path = "./" + path.basename(service.source_path);
|
|
240
|
-
}
|
|
228
|
+
finally {
|
|
229
|
+
debug(`Extraction process completed in ${Date.now() - startTime}ms`);
|
|
241
230
|
}
|
|
242
|
-
const json = JSON.stringify(ast, null, 4);
|
|
243
|
-
fs.mkdirSync(path.dirname(outPath), { recursive: true });
|
|
244
|
-
fs.writeFileSync(outPath, json);
|
|
245
|
-
debug(
|
|
246
|
-
`Successfully extracted cidl.pre.json ${outPath} in ${Date.now() - extractorStart}ms`,
|
|
247
|
-
);
|
|
248
|
-
return { outPath, projectName: cloesceProjectName };
|
|
249
|
-
} catch (err) {
|
|
250
|
-
console.error(
|
|
251
|
-
"Critical uncaught error in extractor. \nSubmit a ticket to https://github.com/bens-schreiber/cloesce\n\n",
|
|
252
|
-
err?.message ?? "No error message.",
|
|
253
|
-
"\n",
|
|
254
|
-
err?.stack ?? "No error stack.",
|
|
255
|
-
);
|
|
256
|
-
process.exit(1);
|
|
257
|
-
} finally {
|
|
258
|
-
debug(`Extraction process completed in ${Date.now() - startTime}ms`);
|
|
259
|
-
}
|
|
260
231
|
}
|
|
261
232
|
async function generate(config) {
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
}
|
|
271
|
-
debug(`Using wrangler.toml at ${wranglerPath}`);
|
|
272
|
-
const wasi = new WASI({
|
|
273
|
-
version: "preview1",
|
|
274
|
-
args: ["generate", ...config.args],
|
|
275
|
-
env: { ...process.env, ...config.env },
|
|
276
|
-
preopens: { ".": root },
|
|
277
|
-
});
|
|
278
|
-
const readWasmStart = Date.now();
|
|
279
|
-
debug(`Reading generator binary...`);
|
|
280
|
-
const wasm = await readFile(new URL("./generator.wasm", import.meta.url));
|
|
281
|
-
const mod = await WebAssembly.compile(new Uint8Array(wasm));
|
|
282
|
-
let instance = await WebAssembly.instantiate(mod, {
|
|
283
|
-
wasi_snapshot_preview1: wasi.wasiImport,
|
|
284
|
-
});
|
|
285
|
-
debug(
|
|
286
|
-
`Read and compiled generator wasm binary in ${Date.now() - readWasmStart}ms`,
|
|
287
|
-
);
|
|
288
|
-
try {
|
|
289
|
-
wasi.start(instance);
|
|
290
|
-
} catch (err) {
|
|
291
|
-
console.error(`WASM execution failed for ${config.name}:`, err);
|
|
292
|
-
throw err;
|
|
293
|
-
} finally {
|
|
294
|
-
debug(`Generator ${config.name} completed in ${Date.now() - debugStart}ms`);
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
function loadCloesceConfig(root) {
|
|
298
|
-
const configPath = path.join(root, "cloesce.config.json");
|
|
299
|
-
if (!fs.existsSync(configPath)) {
|
|
300
|
-
debug("No cloesce.config.json found");
|
|
301
|
-
return undefined;
|
|
302
|
-
}
|
|
303
|
-
try {
|
|
304
|
-
const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
305
|
-
debug(`Loaded config from ${configPath}`);
|
|
306
|
-
if (!config.paths || !Array.isArray(config.paths)) {
|
|
307
|
-
debug("No paths specified in cloesce.config.json, defaulting to root");
|
|
308
|
-
config.paths = [root];
|
|
233
|
+
const debugStart = Date.now();
|
|
234
|
+
debug(`Starting generator`);
|
|
235
|
+
const root = process.cwd();
|
|
236
|
+
// Look for wrangler.toml in the root directory
|
|
237
|
+
const wranglerPath = path.join(root, "wrangler.toml");
|
|
238
|
+
if (!fs.existsSync(wranglerPath)) {
|
|
239
|
+
debug("No wrangler.toml found, creating empty file.");
|
|
240
|
+
fs.writeFileSync(wranglerPath, "");
|
|
309
241
|
}
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
242
|
+
debug(`Using wrangler.toml at ${wranglerPath}`);
|
|
243
|
+
const wasi = new WASI({
|
|
244
|
+
version: "preview1",
|
|
245
|
+
args: ["generate", ...config.args],
|
|
246
|
+
env: { ...process.env, ...config.env },
|
|
247
|
+
preopens: { ".": root },
|
|
248
|
+
});
|
|
249
|
+
const readWasmStart = Date.now();
|
|
250
|
+
debug(`Reading generator binary...`);
|
|
251
|
+
const wasm = await readFile(new URL("./generator.wasm", import.meta.url));
|
|
252
|
+
const mod = await WebAssembly.compile(new Uint8Array(wasm));
|
|
253
|
+
let instance = await WebAssembly.instantiate(mod, {
|
|
254
|
+
wasi_snapshot_preview1: wasi.wasiImport,
|
|
255
|
+
});
|
|
256
|
+
debug(`Read and compiled generator wasm binary in ${Date.now() - readWasmStart}ms`);
|
|
257
|
+
try {
|
|
258
|
+
wasi.start(instance);
|
|
315
259
|
}
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
);
|
|
320
|
-
config.outPath = ".generated";
|
|
260
|
+
catch (err) {
|
|
261
|
+
console.error(`WASM execution failed for ${config.name}:`, err);
|
|
262
|
+
throw err;
|
|
321
263
|
}
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
"No workersUrl specified in cloesce.config.json, localhost:8787 will be used",
|
|
325
|
-
);
|
|
326
|
-
config.workersUrl = "http://localhost:8787";
|
|
264
|
+
finally {
|
|
265
|
+
debug(`Generator ${config.name} completed in ${Date.now() - debugStart}ms`);
|
|
327
266
|
}
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
267
|
+
}
|
|
268
|
+
function loadCloesceConfig(root) {
|
|
269
|
+
const configPath = path.join(root, "cloesce.config.json");
|
|
270
|
+
if (!fs.existsSync(configPath)) {
|
|
271
|
+
debug("No cloesce.config.json found");
|
|
272
|
+
return undefined;
|
|
333
273
|
}
|
|
334
|
-
|
|
335
|
-
|
|
274
|
+
try {
|
|
275
|
+
const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
|
|
276
|
+
debug(`Loaded config from ${configPath}`);
|
|
277
|
+
if (!config.paths || !Array.isArray(config.paths)) {
|
|
278
|
+
debug("No paths specified in cloesce.config.json, defaulting to root");
|
|
279
|
+
config.paths = [root];
|
|
280
|
+
}
|
|
281
|
+
if (!config.projectName) {
|
|
282
|
+
debug("No projectName specified in cloesce.config.json, reading from package.json");
|
|
283
|
+
config.projectName = readPackageJsonProjectName(root);
|
|
284
|
+
}
|
|
285
|
+
if (!config.outPath) {
|
|
286
|
+
debug("No outPath specified in cloesce.config.json, defaulting to .generated");
|
|
287
|
+
config.outPath = ".generated";
|
|
288
|
+
}
|
|
289
|
+
if (!config.workersUrl) {
|
|
290
|
+
debug("No workersUrl specified in cloesce.config.json, localhost:8787 will be used");
|
|
291
|
+
config.workersUrl = "http://localhost:8787";
|
|
292
|
+
}
|
|
293
|
+
if (!config.migrationsPath) {
|
|
294
|
+
debug("No migrationsPath specified in cloesce.config.json, defaulting to ./migrations");
|
|
295
|
+
config.migrationsPath = "./migrations";
|
|
296
|
+
}
|
|
297
|
+
if (typeof config.truncateSourcePaths !== "boolean") {
|
|
298
|
+
config.truncateSourcePaths = false;
|
|
299
|
+
}
|
|
300
|
+
debug(`Cloesce Config: ${JSON.stringify({ ...config, truncateSourcePaths: undefined }, null, 4)}`);
|
|
301
|
+
return config;
|
|
302
|
+
}
|
|
303
|
+
catch (err) {
|
|
304
|
+
console.warn(`Failed to parse cloesce.config.json: ${err}`);
|
|
305
|
+
throw err;
|
|
336
306
|
}
|
|
337
|
-
debug(
|
|
338
|
-
`Cloesce Config: ${JSON.stringify({ ...config, truncateSourcePaths: undefined }, null, 4)}`,
|
|
339
|
-
);
|
|
340
|
-
return config;
|
|
341
|
-
} catch (err) {
|
|
342
|
-
console.warn(`Failed to parse cloesce.config.json: ${err}`);
|
|
343
|
-
throw err;
|
|
344
|
-
}
|
|
345
307
|
}
|
|
346
308
|
function timestamp() {
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
String(d.getSeconds()).padStart(2, "0")
|
|
356
|
-
);
|
|
309
|
+
const d = new Date();
|
|
310
|
+
return (d.getFullYear().toString() +
|
|
311
|
+
String(d.getMonth() + 1).padStart(2, "0") +
|
|
312
|
+
String(d.getDate()).padStart(2, "0") +
|
|
313
|
+
"T" +
|
|
314
|
+
String(d.getHours()).padStart(2, "0") +
|
|
315
|
+
String(d.getMinutes()).padStart(2, "0") +
|
|
316
|
+
String(d.getSeconds()).padStart(2, "0"));
|
|
357
317
|
}
|
|
358
318
|
function readPackageJsonProjectName(cwd) {
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
319
|
+
const pkgPath = path.join(cwd, "package.json");
|
|
320
|
+
let projectName = path.basename(cwd);
|
|
321
|
+
if (fs.existsSync(pkgPath)) {
|
|
322
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
|
|
323
|
+
projectName = pkg.name ?? projectName;
|
|
324
|
+
}
|
|
325
|
+
return projectName;
|
|
366
326
|
}
|
|
367
327
|
function findCloesceProject(root, searchPaths, project) {
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
328
|
+
for (const searchPath of searchPaths) {
|
|
329
|
+
let fullPath;
|
|
330
|
+
if (path.isAbsolute(searchPath) || searchPath.startsWith(root)) {
|
|
331
|
+
fullPath = path.normalize(searchPath);
|
|
332
|
+
}
|
|
333
|
+
else {
|
|
334
|
+
fullPath = path.resolve(root, searchPath);
|
|
335
|
+
}
|
|
336
|
+
if (!fs.existsSync(fullPath)) {
|
|
337
|
+
console.warn(`Warning: Path "${searchPath}" does not exist`);
|
|
338
|
+
continue;
|
|
339
|
+
}
|
|
340
|
+
const stats = fs.statSync(fullPath);
|
|
341
|
+
if (stats.isFile() && /\.cloesce\.ts$/i.test(fullPath)) {
|
|
342
|
+
debug(`Found file: ${fullPath}`);
|
|
343
|
+
project.addSourceFileAtPath(fullPath);
|
|
344
|
+
}
|
|
345
|
+
else if (stats.isDirectory()) {
|
|
346
|
+
debug(`Searching directory: ${fullPath}`);
|
|
347
|
+
walkDirectory(fullPath);
|
|
348
|
+
}
|
|
386
349
|
}
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
350
|
+
function walkDirectory(dir) {
|
|
351
|
+
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
352
|
+
const fullPath = path.join(dir, entry.name);
|
|
353
|
+
if (entry.isDirectory() && !entry.name.startsWith(".")) {
|
|
354
|
+
debug(`Entering directory: ${fullPath}`);
|
|
355
|
+
walkDirectory(fullPath);
|
|
356
|
+
}
|
|
357
|
+
else if (entry.isFile() && /\.cloesce\.ts$/i.test(entry.name)) {
|
|
358
|
+
debug(`Found file: ${fullPath}`);
|
|
359
|
+
project.addSourceFileAtPath(fullPath);
|
|
360
|
+
}
|
|
361
|
+
}
|
|
398
362
|
}
|
|
399
|
-
}
|
|
400
363
|
}
|
|
401
364
|
function formatErr(e) {
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
365
|
+
const { description, suggestion } = getErrorInfo(e.code);
|
|
366
|
+
const contextLine = e.context ? `Context: ${e.context}\n` : "";
|
|
367
|
+
const snippetLine = e.snippet ? `${e.snippet}\n\n` : "";
|
|
368
|
+
return `
|
|
406
369
|
==== CLOESCE ERROR ====
|
|
407
370
|
Error [${ExtractorErrorCode[e.code]}]: ${description}
|
|
408
371
|
Phase: TypeScript IDL Extraction
|
|
@@ -411,6 +374,6 @@ ${contextLine}${snippetLine}Suggested fix: ${suggestion}
|
|
|
411
374
|
`;
|
|
412
375
|
}
|
|
413
376
|
run(cmds, process.argv.slice(2)).catch((err) => {
|
|
414
|
-
|
|
415
|
-
|
|
377
|
+
console.error(err);
|
|
378
|
+
process.exit(1);
|
|
416
379
|
});
|