@jxsuite/create 1.5.5 → 1.6.0

package/generate.ts

@@ -1,7 +1,7 @@
 /** Shared project generation logic. Used by both the CLI scaffolder and the Studio server endpoint. */
 
 import { chmod, cp, lstat, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
-import { adapterNeedsWrangler, buildWranglerJsonc, isJsonObject, parseJson } from "./scaffold";
+import { adapterNeedsWrangler, buildWranglerJsonc, isJsonObject } from "./scaffold";
 import { basename, join, relative, sep } from "node:path";
 
 import { Buffer } from "node:buffer";
@@ -12,7 +12,12 @@ import type { TemplateId } from "./templates";
 import type { JsonObject } from "./scaffold";
 
 import TEMPLATE_VERSIONS from "./template-versions.json";
-import { PROJECT_FILE_NAME, serializeProjectFile } from "@jxsuite/schema/project-file";
+import {
+  NEW_PROJECT_FILE_NAME,
+  parseProjectSource,
+  serializeProjectFile,
+} from "@jxsuite/schema/project-file";
+import { projectFilePath } from "@jxsuite/schema/project-file/node";
 
 const __dirname = import.meta.dirname;
 const TEMPLATE_DIR = join(__dirname, "template");
@@ -200,7 +205,7 @@ async function populateProject(destPath: string, opts: ProjectOptions) {
   const packageJson = buildPackageJson({ adapter, description, name });
 
   const writes = [
-    writeFile(join(destPath, PROJECT_FILE_NAME), serializeProjectFile(projectJson, null)),
+    writeFile(join(destPath, NEW_PROJECT_FILE_NAME), serializeProjectFile(projectJson, null)),
     writeFile(join(destPath, "package.json"), `${JSON.stringify(packageJson, null, "  ")}\n`),
     cp(join(TEMPLATE_DIR, "gitignore"), join(destPath, ".gitignore")),
     cp(join(TEMPLATE_DIR, "layouts"), join(destPath, "layouts"), { recursive: true }),
@@ -272,14 +277,13 @@ async function scaffoldFromStarter(
   // Before the re-stamp below, which writes straight back into the tree that was just copied.
   await makeWritable(destPath);
 
-  // Re-stamp project.json with the new project's identity, keeping the starter's design tokens,
-  // Content types, image pipeline, and head.
-  const projectPath = join(destPath, PROJECT_FILE_NAME);
+  // Re-stamp the project file with the new project's identity, keeping the starter's design tokens,
+  // Content types, image pipeline, head, and in a project.jxn its comments.
+  const projectPath = projectFilePath(destPath);
   const starterText = await readFile(projectPath, "utf8");
-  const project = parseJson(starterText);
-  if (!isJsonObject(project)) {
-    throw new TypeError(`Starter "${starter}" has a project.json that is not a JSON object`);
-  }
+  /* SAFETY: both readers answer an object, or throw (a starter whose project file is a list is
+     refused there, naming the file), and every member below is one the re-stamp owns. */
+  const project = parseProjectSource(starterText, projectPath) as JsonObject;
   project.name = name;
   if (url) {
     project.url = url;
@@ -293,7 +297,7 @@ async function scaffoldFromStarter(
   if (design) {
     applyDesign(project, design, { starter: true });
   }
-  await writeFile(projectPath, serializeProjectFile(project, starterText));
+  await writeFile(projectPath, serializeProjectFile(project, starterText, projectPath));
 
   // Rebuild package.json so scaffolded projects get current dep ranges and scripts regardless of
   // What the in-repo starter pinned.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/create",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "description": "Scaffold a new Jx project",
   "license": "MIT",
   "repository": {
@@ -37,7 +37,7 @@
     "test:coverage": "bun test --isolate --coverage"
   },
   "dependencies": {
-    "@jxsuite/schema": "^5.3.0",
-    "@jxsuite/starters": "^3.3.1"
+    "@jxsuite/schema": "^5.4.0",
+    "@jxsuite/starters": "^3.3.2"
   }
 }

package/template-versions.json

@@ -1,6 +1,6 @@
 {
-  "parser": "^4.3.1",
-  "compiler": "^8.3.0",
-  "runtime": "^6.2.0",
-  "server": "^8.4.0"
+  "parser": "^4.3.2",
+  "compiler": "^8.4.0",
+  "runtime": "^6.2.1",
+  "server": "^8.5.0"
 }