@tschk/moonshine-cli 0.3.7 → 0.4.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/src/compile.ts CHANGED
@@ -1,16 +1,25 @@
1
- import { existsSync, readFileSync, writeFileSync } from "node:fs";
1
+ import { access, readFile, writeFile } from "node:fs/promises";
2
2
  import { basename, dirname, extname, join, resolve } from "node:path";
3
3
 
4
- function which(bin: string): string | null {
4
+ async function exists(path: string): Promise<boolean> {
5
+ try {
6
+ await access(path);
7
+ return true;
8
+ } catch {
9
+ return false;
10
+ }
11
+ }
12
+
13
+ async function which(bin: string): Promise<string | null> {
5
14
  const path = process.env.PATH ?? "";
6
15
  for (const dir of path.split(":")) {
7
16
  const candidate = join(dir, bin);
8
- if (existsSync(candidate)) return candidate;
17
+ if (await exists(candidate)) return candidate;
9
18
  }
10
19
  return null;
11
20
  }
12
21
 
13
- function emitTsxFromIr(ir: unknown, outPath: string): void {
22
+ async function emitTsxFromIr(ir: unknown, outPath: string): Promise<void> {
14
23
  const json = JSON.stringify(ir, null, 2);
15
24
  const src = `import { createApp } from "@tschk/moonshine/react";
16
25
  import { renderCrepusIr, type ViewIr } from "@tschk/crepus-moonshine";
@@ -23,7 +32,7 @@ function App() {
23
32
 
24
33
  createApp({ root: App }).mount("#app");
25
34
  `;
26
- writeFileSync(outPath, src);
35
+ await writeFile(outPath, src);
27
36
  console.log(`Wrote ${outPath}`);
28
37
  }
29
38
 
@@ -35,7 +44,7 @@ export async function compileCommand(args: string[]): Promise<void> {
35
44
  }
36
45
 
37
46
  const abs = resolve(process.cwd(), input);
38
- if (!existsSync(abs)) {
47
+ if (!(await exists(abs))) {
39
48
  console.error(`File not found: ${abs}`);
40
49
  process.exit(1);
41
50
  }
@@ -44,13 +53,13 @@ export async function compileCommand(args: string[]): Promise<void> {
44
53
  const outPath = join(dirname(abs), `${basename(abs, ext)}.tsx`);
45
54
 
46
55
  if (ext === ".json") {
47
- const ir = JSON.parse(readFileSync(abs, "utf8"));
48
- emitTsxFromIr(ir, outPath);
56
+ const ir = JSON.parse(await readFile(abs, "utf8"));
57
+ await emitTsxFromIr(ir, outPath);
49
58
  return;
50
59
  }
51
60
 
52
61
  if (ext === ".crepus") {
53
- const crepus = which("crepus");
62
+ const crepus = await which("crepus");
54
63
  if (crepus) {
55
64
  const proc = Bun.spawn(
56
65
  [crepus, "web", "build", "--emit", "moonshine", abs],
package/src/config.ts CHANGED
@@ -35,7 +35,7 @@ export function findConfig(projectDir: string): string | undefined {
35
35
 
36
36
  export async function loadConfig(path: string): Promise<MoonshineCliConfig> {
37
37
  const mod = await import(pathToFileURL(path).href);
38
- const config = mod.default ?? mod;
38
+ const config = "default" in mod ? mod.default : mod;
39
39
  if (typeof config !== "object" || config === null) {
40
40
  throw new Error(`Invalid moonshine config: ${path}`);
41
41
  }
package/src/new.ts CHANGED
@@ -1,4 +1,5 @@
1
- import { mkdirSync, writeFileSync, existsSync } from "node:fs";
1
+ import { existsSync } from "node:fs";
2
+ import { mkdir, writeFile } from "node:fs/promises";
2
3
  import { join, resolve } from "node:path";
3
4
 
4
5
  type Renderer = "react" | "solid" | "crepus";
@@ -108,13 +109,13 @@ function parseArgs(args: string[]): {
108
109
  return { name, renderer, adapter, vite };
109
110
  }
110
111
 
111
- function writePackageJson(
112
+ async function writePackageJson(
112
113
  dir: string,
113
114
  name: string,
114
115
  root: string | null,
115
116
  renderer: Renderer | undefined,
116
117
  adapter: Adapter,
117
- ): void {
118
+ ): Promise<void> {
118
119
  const dependencies: Record<string, string> = {
119
120
  "@tschk/moonshine": packagePath("@tschk/moonshine", root)!,
120
121
  "@tschk/moonshine-framework": packagePath(
@@ -167,7 +168,7 @@ function writePackageJson(
167
168
  devDependencies["@types/react-dom"] = "^19.1.0";
168
169
  }
169
170
 
170
- writeFileSync(
171
+ await writeFile(
171
172
  join(dir, "package.json"),
172
173
  JSON.stringify(
173
174
  {
@@ -189,7 +190,10 @@ function writePackageJson(
189
190
  );
190
191
  }
191
192
 
192
- function writeTsconfig(dir: string, renderer: Renderer | undefined): void {
193
+ async function writeTsconfig(
194
+ dir: string,
195
+ renderer: Renderer | undefined,
196
+ ): Promise<void> {
193
197
  const compilerOptions: Record<string, unknown> = {
194
198
  target: "ES2024",
195
199
  module: "ESNext",
@@ -204,7 +208,7 @@ function writeTsconfig(dir: string, renderer: Renderer | undefined): void {
204
208
  if (renderer === "solid") {
205
209
  compilerOptions.jsxImportSource = "solid-js";
206
210
  }
207
- writeFileSync(
211
+ await writeFile(
208
212
  join(dir, "tsconfig.json"),
209
213
  JSON.stringify(
210
214
  {
@@ -217,15 +221,15 @@ function writeTsconfig(dir: string, renderer: Renderer | undefined): void {
217
221
  );
218
222
  }
219
223
 
220
- function writeConfig(
224
+ async function writeConfig(
221
225
  dir: string,
222
226
  renderer: Renderer | undefined,
223
227
  adapter: Adapter,
224
- ): void {
228
+ ): Promise<void> {
225
229
  const runtime = runtimeForAdapter(adapter);
226
230
  const entries: Record<string, unknown> = { runtime, adapter };
227
231
  if (renderer) entries.renderer = renderer;
228
- writeFileSync(
232
+ await writeFile(
229
233
  join(dir, "moonshine.config.ts"),
230
234
  `import { defineConfig } from "@tschk/moonshine-framework";
231
235
 
@@ -234,10 +238,13 @@ export default defineConfig(${JSON.stringify(entries)});
234
238
  );
235
239
  }
236
240
 
237
- function writeRoute(dir: string, renderer: Renderer | undefined): void {
238
- mkdirSync(join(dir, "src", "routes"), { recursive: true });
241
+ async function writeRoute(
242
+ dir: string,
243
+ renderer: Renderer | undefined,
244
+ ): Promise<void> {
245
+ await mkdir(join(dir, "src", "routes"), { recursive: true });
239
246
  if (renderer === "react") {
240
- writeFileSync(
247
+ await writeFile(
241
248
  join(dir, "src", "routes", "index.tsx"),
242
249
  `export default function Home({ data }: { data?: unknown }) {
243
250
  const d = (data ?? {}) as Record<string, string>;
@@ -250,7 +257,7 @@ function writeRoute(dir: string, renderer: Renderer | undefined): void {
250
257
  `,
251
258
  );
252
259
  } else if (renderer === "solid") {
253
- writeFileSync(
260
+ await writeFile(
254
261
  join(dir, "src", "routes", "index.ts"),
255
262
  `import h from "@tschk/moonshine-solid/h";
256
263
 
@@ -265,9 +272,9 @@ export default function Home({ data }: { data?: unknown }) {
265
272
  `,
266
273
  );
267
274
  } else if (renderer === "crepus") {
268
- writeFileSync(join(dir, "src", "routes", "index.ts"), "\n");
275
+ await writeFile(join(dir, "src", "routes", "index.ts"), "\n");
269
276
  } else {
270
- writeFileSync(
277
+ await writeFile(
271
278
  join(dir, "src", "routes", "index.server.ts"),
272
279
  `export function loader() {
273
280
  return { ok: true };
@@ -277,88 +284,90 @@ export default function Home({ data }: { data?: unknown }) {
277
284
  }
278
285
  }
279
286
 
280
- function writeReadme(
287
+ async function writeReadme(
281
288
  dir: string,
282
289
  name: string,
283
290
  renderer: Renderer | undefined,
284
291
  adapter: Adapter,
285
- ): void {
292
+ ): Promise<void> {
286
293
  const runtime = runtimeForAdapter(adapter);
287
294
  let body = `# ${name}\n\nMoonshine on **${adapter}** (${runtime}).\n\n\`\`\`bash\nbun install\nbun run dev\n\`\`\`\n`;
288
295
  if (!renderer)
289
296
  body += `\nAdd \`--react\`, \`--solid\`, or \`--crepus\` for a UI renderer.\n`;
290
- writeFileSync(join(dir, "README.md"), body);
297
+ await writeFile(join(dir, "README.md"), body);
291
298
  }
292
299
 
293
- function writeViteApp(dir: string, name: string, root: string | null): void {
294
- mkdirSync(join(dir, "src"), { recursive: true });
295
-
296
- writeFileSync(
297
- join(dir, "package.json"),
298
- JSON.stringify(
299
- {
300
- name,
301
- private: true,
302
- version: "0.0.0",
303
- type: "module",
304
- scripts: {
305
- dev: "vite",
306
- build: "vite build",
307
- preview: "vite preview",
308
- },
309
- dependencies: {
310
- "@tschk/moonshine": dep(root, "packages/core"),
311
- react: "^19.1.0",
312
- "react-dom": "^19.1.0",
313
- },
314
- devDependencies: {
315
- "@types/react": "^19.1.0",
316
- "@types/react-dom": "^19.1.0",
317
- "@vitejs/plugin-react": "^4.5.0",
318
- typescript: "~7.0.0",
319
- vite: "^6.3.5",
300
+ async function writeViteApp(
301
+ dir: string,
302
+ name: string,
303
+ root: string | null,
304
+ ): Promise<void> {
305
+ await mkdir(join(dir, "src"), { recursive: true });
306
+
307
+ await Promise.all([
308
+ writeFile(
309
+ join(dir, "package.json"),
310
+ JSON.stringify(
311
+ {
312
+ name,
313
+ private: true,
314
+ version: "0.0.0",
315
+ type: "module",
316
+ scripts: {
317
+ dev: "vite",
318
+ build: "vite build",
319
+ preview: "vite preview",
320
+ },
321
+ dependencies: {
322
+ "@tschk/moonshine": dep(root, "packages/core"),
323
+ react: "^19.1.0",
324
+ "react-dom": "^19.1.0",
325
+ },
326
+ devDependencies: {
327
+ "@types/react": "^19.1.0",
328
+ "@types/react-dom": "^19.1.0",
329
+ "@vitejs/plugin-react": "^4.5.0",
330
+ typescript: "~7.0.0",
331
+ vite: "^6.3.5",
332
+ },
320
333
  },
321
- },
322
- null,
323
- 2,
324
- ) + "\n",
325
- );
326
-
327
- writeFileSync(
328
- join(dir, "tsconfig.json"),
329
- JSON.stringify(
330
- {
331
- compilerOptions: {
332
- target: "ES2024",
333
- module: "ESNext",
334
- moduleResolution: "Bundler",
335
- jsx: "react-jsx",
336
- strict: true,
337
- skipLibCheck: true,
338
- noEmit: true,
339
- types: ["vite/client"],
334
+ null,
335
+ 2,
336
+ ) + "\n",
337
+ ),
338
+ writeFile(
339
+ join(dir, "tsconfig.json"),
340
+ JSON.stringify(
341
+ {
342
+ compilerOptions: {
343
+ target: "ES2024",
344
+ module: "ESNext",
345
+ moduleResolution: "Bundler",
346
+ jsx: "react-jsx",
347
+ strict: true,
348
+ skipLibCheck: true,
349
+ noEmit: true,
350
+ types: ["vite/client"],
351
+ },
352
+ include: ["src"],
340
353
  },
341
- include: ["src"],
342
- },
343
- null,
344
- 2,
345
- ) + "\n",
346
- );
347
-
348
- writeFileSync(
349
- join(dir, "vite.config.ts"),
350
- `import { defineConfig } from "vite";
354
+ null,
355
+ 2,
356
+ ) + "\n",
357
+ ),
358
+ writeFile(
359
+ join(dir, "vite.config.ts"),
360
+ `import { defineConfig } from "vite";
351
361
  import react from "@vitejs/plugin-react";
352
362
 
353
363
  export default defineConfig({
354
364
  plugins: [react()],
355
365
  });
356
366
  `,
357
- );
358
-
359
- writeFileSync(
360
- join(dir, "index.html"),
361
- `<!doctype html>
367
+ ),
368
+ writeFile(
369
+ join(dir, "index.html"),
370
+ `<!doctype html>
362
371
  <html lang="en">
363
372
  <head>
364
373
  <meta charset="UTF-8" />
@@ -371,11 +380,10 @@ export default defineConfig({
371
380
  </body>
372
381
  </html>
373
382
  `,
374
- );
375
-
376
- writeFileSync(
377
- join(dir, "src/main.tsx"),
378
- `import { createSignal, useSignal, createApp } from "@tschk/moonshine/react";
383
+ ),
384
+ writeFile(
385
+ join(dir, "src/main.tsx"),
386
+ `import { createSignal, useSignal, createApp } from "@tschk/moonshine/react";
379
387
 
380
388
  const count = createSignal(0);
381
389
 
@@ -394,28 +402,30 @@ function App() {
394
402
 
395
403
  createApp({ root: App }).mount("#app");
396
404
  `,
397
- );
398
-
399
- writeFileSync(
400
- join(dir, "README.md"),
401
- `# ${name}\n\nVite + moonshine signals (client SPA).\n\n\`\`\`bash\nbun install\nbun run dev\n\`\`\`\n\nFull-stack Bun (server + static + hydrate): \`moonshine new app --bun\`.\n`,
402
- );
405
+ ),
406
+ writeFile(
407
+ join(dir, "README.md"),
408
+ `# ${name}\n\nVite + moonshine signals (client SPA).\n\n\`\`\`bash\nbun install\nbun run dev\n\`\`\`\n\nFull-stack Bun (server + static + hydrate): \`moonshine new app --bun\`.\n`,
409
+ ),
410
+ ]);
403
411
  }
404
412
 
405
- function writeBunApp(
413
+ async function writeBunApp(
406
414
  dir: string,
407
415
  name: string,
408
416
  root: string | null,
409
417
  renderer: Renderer | undefined,
410
418
  adapter: Adapter,
411
- ): void {
412
- mkdirSync(join(dir, "src", "routes"), { recursive: true });
413
-
414
- writePackageJson(dir, name, root, renderer, adapter);
415
- writeTsconfig(dir, renderer);
416
- writeConfig(dir, renderer, adapter);
417
- writeRoute(dir, renderer);
418
- writeReadme(dir, name, renderer, adapter);
419
+ ): Promise<void> {
420
+ await mkdir(join(dir, "src", "routes"), { recursive: true });
421
+
422
+ await Promise.all([
423
+ writePackageJson(dir, name, root, renderer, adapter),
424
+ writeTsconfig(dir, renderer),
425
+ writeConfig(dir, renderer, adapter),
426
+ writeRoute(dir, renderer),
427
+ writeReadme(dir, name, renderer, adapter),
428
+ ]);
419
429
  }
420
430
 
421
431
  export async function newCommand(args: string[]): Promise<void> {
@@ -431,9 +441,9 @@ export async function newCommand(args: string[]): Promise<void> {
431
441
  process.exit(1);
432
442
  }
433
443
 
434
- mkdirSync(dir, { recursive: true });
435
- if (vite) writeViteApp(dir, name, root);
436
- else writeBunApp(dir, name, root, renderer, adapter);
444
+ await mkdir(dir, { recursive: true });
445
+ if (vite) await writeViteApp(dir, name, root);
446
+ else await writeBunApp(dir, name, root, renderer, adapter);
437
447
 
438
448
  console.log(`Created ${name}/ (${vite ? "vite" : adapter})`);
439
449
  if (root) console.log(`Linked moonshine from ${root}`);
package/src/preview.ts CHANGED
@@ -2,7 +2,10 @@ import { existsSync } from "node:fs";
2
2
  import { resolve } from "node:path";
3
3
  import { createBunServer } from "@tschk/moonshine-deploy-bun";
4
4
  import { readManifest } from "@tschk/moonshine-compiler";
5
- import { createRequestHandler } from "@tschk/moonshine-server";
5
+ import {
6
+ createRequestHandler,
7
+ type RouteModule,
8
+ } from "@tschk/moonshine-server";
6
9
  import {
7
10
  PUBLIC_DIR,
8
11
  type MoonshineManifest,
@@ -82,13 +85,24 @@ export async function startPreview(options: {
82
85
  ".moonshine",
83
86
  raw.entries.server ?? "dist/server.js",
84
87
  );
85
- let modules: Record<string, unknown> = {};
88
+ // A missing or broken server bundle used to be swallowed here, leaving an
89
+ // empty module map: preview then booted happily and every server-rendered
90
+ // route 500'd with "cannot find module <source path>", pointing at a file
91
+ // that was never supposed to be loaded at runtime. Say which bundle failed
92
+ // and why, once, instead of making the user infer it from the wreckage.
93
+ let modules: Record<string, RouteModule> = {};
86
94
  try {
87
95
  const bundle = (await import(serverBundlePath)) as {
88
- modules?: Record<string, unknown>;
96
+ modules?: Record<string, RouteModule>;
89
97
  };
90
98
  modules = bundle.modules ?? {};
91
- } catch {}
99
+ } catch (error) {
100
+ console.warn(
101
+ `moonshine preview: could not load ${serverBundlePath}\n` +
102
+ ` ${error instanceof Error ? error.message : String(error)}\n` +
103
+ ` Server-rendered routes will fail. Run \`moonshine build\` first.`,
104
+ );
105
+ }
92
106
  const fetch = createRequestHandler({
93
107
  manifest,
94
108
  modules,