siteplane 0.2.0-rc.0 → 0.2.0-rc.1

package/dist/bin/siteplane.js

@@ -1349,6 +1349,9 @@ async function checkProject(root) {
     }
   }
   const scan = scanFields(await collectSourceFiles2(root));
+  if (scan.fields.length === 0 && scan.issues.length === 0) {
+    warning("no_fields", "There are no fields yet. Wire the content the task names (npx siteplane task shows it again), then run check again.");
+  }
   return { project, fields: scan.fields, issues: [...issues, ...scan.issues] };
 }
 function reachesSiteplaneRoutes(source) {
@@ -1448,26 +1451,51 @@ import ts6 from "typescript";
 var IMPORT = 'import { withSiteplane } from "siteplane/next";';
 function wrapNextConfig(source) {
   const file = ts6.createSourceFile("next.config.ts", source, ts6.ScriptTarget.Latest, true, ts6.ScriptKind.TS);
-  const exported = file.statements.find((statement) => ts6.isExportAssignment(statement) && !statement.isExportEquals);
-  if (!exported) {
+  const edits = wrapDefaultExport(file, source);
+  if (edits === "already")
+    return { status: "already" };
+  if (!edits) {
     const commonJs = /\bmodule\.exports\s*=|\bexports\.default\s*=/u.test(source);
     return { status: "manual", reason: commonJs ? "commonjs" : "unrecognized" };
   }
-  const expression = exported.expression;
-  if (ts6.isCallExpression(expression) && expression.expression.getText(file) === "withSiteplane") {
-    return { status: "already" };
-  }
-  const start = expression.getStart(file);
-  let next = `${source.slice(0, start)}withSiteplane(${source.slice(start, expression.end)})${source.slice(expression.end)}`;
   if (!source.includes(IMPORT)) {
-    const imports = file.statements.filter(ts6.isImportDeclaration);
-    const last = imports.at(-1);
-    next = last ? `${next.slice(0, last.end)}
-${IMPORT}${next.slice(last.end)}` : `${IMPORT}
-${next}`;
+    const last = file.statements.filter(ts6.isImportDeclaration).at(-1);
+    edits.push(last ? { start: last.end, end: last.end, text: `
+${IMPORT}` } : { start: 0, end: 0, text: `${IMPORT}
+` });
   }
+  const next = edits.sort((a, b) => b.start - a.start || b.end - a.end).reduce((text, edit) => `${text.slice(0, edit.start)}${edit.text}${text.slice(edit.end)}`, source);
   return { status: "wrapped", source: next };
 }
+function wrapDefaultExport(file, source) {
+  const exported = file.statements.find((statement) => ts6.isExportAssignment(statement) && !statement.isExportEquals);
+  if (exported) {
+    const expression = exported.expression;
+    if (ts6.isCallExpression(expression) && expression.expression.getText(file) === "withSiteplane")
+      return "already";
+    const start = expression.getStart(file);
+    return [
+      { start, end: start, text: "withSiteplane(" },
+      { start: expression.end, end: expression.end, text: ")" }
+    ];
+  }
+  const declaration = file.statements.find((statement) => ts6.isFunctionDeclaration(statement) && Boolean(ts6.getModifiers(statement)?.some((modifier) => modifier.kind === ts6.SyntaxKind.DefaultKeyword)));
+  if (!declaration?.body)
+    return null;
+  const modifiers = ts6.getModifiers(declaration) ?? [];
+  const exportStart = modifiers[0]?.getStart(file) ?? declaration.getStart(file);
+  const defaultEnd = modifiers.find((modifier) => modifier.kind === ts6.SyntaxKind.DefaultKeyword)?.end ?? exportStart;
+  const functionStart = defaultEnd + (/^\s*/u.exec(source.slice(defaultEnd))?.[0].length ?? 0);
+  return declaration.name ? [
+    { start: exportStart, end: functionStart, text: "" },
+    { start: declaration.end, end: declaration.end, text: `
+
+export default withSiteplane(${declaration.name.text});` }
+  ] : [
+    { start: exportStart, end: functionStart, text: "export default withSiteplane(" },
+    { start: declaration.end, end: declaration.end, text: ");" }
+  ];
+}
 function newNextConfig(typescript) {
   return typescript ? `import type { NextConfig } from "next";
 ${IMPORT}
@@ -1488,7 +1516,7 @@ export default withSiteplane(nextConfig);
 function formatTask(task) {
   const wish = clean(task.editableBrief ?? "").trim();
   const rules = [
-    "Before you change code, tell the user this task and the fields you picked, in a few lines.",
+    "Tell the user this task and the fields you picked in a few lines, then go on without waiting for an answer; ask only when something blocks you.",
     "Wire content values only: texts, links and images. Keep components, layout, styles, animations and accessibility as they are.",
     'Give every field one value call and put {...siteplane.attrs("<id>")} on each element that shows it.',
     "Field IDs are lowercase with at least two dot-separated parts (page.section.item) and stay the same when the text changes. Repeated content gets its own IDs (services.haircut.price); one ID on several pages is one shared field.",
@@ -1501,6 +1529,7 @@ function formatTask(task) {
   ];
   return [
     `Siteplane task for ${JSON.stringify(normalizeSiteName(task.site.name))} (site ${task.site.id})`,
+    "Carry out this task now: wire the fields, then check, sync, deploy as usual and confirm with npx siteplane status --url.",
     "",
     "What should be editable (the owner's wish in Siteplane):",
     ...wish ? wish.split("\n").map((line) => `> ${line.trim()}`) : ["Agent decides: pick the content the owner will want to change."],
@@ -2046,7 +2075,7 @@ async function writeStore(connections, options) {
 }
 
 // src/version.ts
-var PACKAGE_VERSION = "0.2.0-rc.0";
+var PACKAGE_VERSION = "0.2.0-rc.1";
 
 // src/bin/run-siteplane.ts
 var usage = [

package/dist/route.js

@@ -114,7 +114,7 @@ async function readBoundedText(request) {
 }
 
 // src/version.ts
-var PACKAGE_VERSION = "0.2.0-rc.0";
+var PACKAGE_VERSION = "0.2.0-rc.1";
 
 // src/route.ts
 var embeddable = { httpOnly: true, secure: true, sameSite: "none", partitioned: true, path: "/" };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "siteplane",
   "private": false,
-  "version": "0.2.0-rc.0",
+  "version": "0.2.0-rc.1",
   "description": "Siteplane for Next.js websites: editable content with code fallbacks, Draft Mode preview, Booking and the siteplane CLI.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",