@cavulsqa/create 2.11.0 → 2.11.2

package/lib/pruneEngines.mjs

@@ -37,13 +37,13 @@ export function pruneEngines(out, manifest, engine) {
     if (existsSync(file)) rmSync(file);
   }
 
-  dropLines(join(out, "src/shared/database/candidates/types.ts"), (line) =>
+  dropListItems(join(out, "src/shared/database/candidates/types.ts"), (line) =>
     [...deadEngines].some((id) => line.trim() === `"${id}",`),
   );
   dropLines(join(out, "src/shared/database/candidates/index.ts"), (line) =>
     dropped.some(([, module]) => line.includes(`"./${basenameOf(module.file)}"`)),
   );
-  dropLines(join(out, "src/app/storage.config.ts"), (line) =>
+  dropListItems(join(out, "src/app/storage.config.ts"), (line) =>
     [...deadExports].some((symbol) => line.trim() === `${symbol},`),
   );
 
@@ -71,6 +71,64 @@ function dropLines(path, matches) {
   writeFileSync(path, kept.join("\n"));
 }
 
+/** oxfmt's default `printWidth`, which neither template overrides. */
+const PRINT_WIDTH = 100;
+
+const LIST_ITEM = /^\s+[^\s/*].*,\s*$/;
+
+/**
+ * `dropLines` for the items of a bracketed list, leaving the list the way oxfmt would print it.
+ *
+ * oxfmt puts an array or an import's specifiers on one line whenever that line fits, so a list the
+ * template had to break can fit once engines leave it - and an app whose first `vp check` fails on
+ * code nobody in it wrote is a broken scaffold. Only a list that lost an item is rejoined, and only
+ * when every line left in it is a plain item, so a list carrying a comment is never touched.
+ */
+function dropListItems(path, matches) {
+  if (!existsSync(path)) return;
+  const lines = [];
+  const cuts = new Set();
+  for (const line of readFileSync(path, "utf8").split("\n")) {
+    if (matches(line)) cuts.add(lines.length);
+    else lines.push(line);
+  }
+
+  const lists = new Map();
+  for (const cut of cuts) {
+    const list = enclosingList(lines, cut);
+    if (list) lists.set(list.open, list);
+  }
+
+  for (const { open, close } of [...lists.values()].sort((a, b) => b.open - a.open)) {
+    const joined = joinList(lines[open], lines.slice(open + 1, close), lines[close]);
+    if (joined.length <= PRINT_WIDTH) lines.splice(open, close - open + 1, joined);
+  }
+  writeFileSync(path, lines.join("\n"));
+}
+
+/** The opening and closing lines around the place an item was cut, or null if it was no list. */
+function enclosingList(lines, cut) {
+  let open = cut - 1;
+  while (open >= 0 && LIST_ITEM.test(lines[open])) open--;
+  let close = cut;
+  while (close < lines.length && LIST_ITEM.test(lines[close])) close++;
+  if (open < 0 || close >= lines.length || close === open + 1) return null;
+
+  const opener = lines[open].trimEnd();
+  const closer = { "[": "]", "{": "}" }[opener.at(-1)];
+  const indent = opener.match(/^\s*/)[0];
+  if (!closer || !lines[close].startsWith(`${indent}${closer}`)) return null;
+  return { open, close };
+}
+
+/** `[a, b]` hugs its brackets and `{ a, b }` does not, as oxfmt prints them. */
+function joinList(opener, items, closer) {
+  const head = opener.trimEnd();
+  const body = items.map((item) => item.trim().replace(/,$/, "")).join(", ");
+  const tail = closer.trim();
+  return head.endsWith("{") ? `${head} ${body} ${tail}` : `${head}${body}${tail}`;
+}
+
 function rewriteLine(path, matches, replacement) {
   if (!existsSync(path)) return;
   const lines = readFileSync(path, "utf8")

package/lib/scaffold.mjs

@@ -48,9 +48,13 @@ The app ships no update screen: drive it with \`useUpdater()\` from \`@capuchoo/
 `;
 }
 
+/**
+ * The generated app's manifest. Overridden keys keep the template's order, which oxfmt already
+ * accepts: it sorts package.json, and dropping `private` to re-add it last failed `vp check`.
+ */
 function manifest(source, { name, appName, templateName }) {
   const pkg = JSON.parse(source);
-  const { private: _private, cavulsqa: _cavulsqa, ...rest } = pkg;
+  const { cavulsqa: _cavulsqa, ...rest } = pkg;
   return `${JSON.stringify(
     {
       ...rest,
@@ -118,7 +122,7 @@ export function scaffold({ templateDir, out, name, appId, appName, engine, pragm
     writeFileSync(join(out, ".env"), `${lines.join("\n")}\n`);
   }
 
-  if (updateUrl) addUpdates(out, { appId, appName, updateUrl });
+  if (updateUrl) addUpdates(out, { appId, appName, updateUrl, engine, pragmas });
 
   // pnpm will not finish an install while a dependency's build script is neither allowed nor
   // denied, and vite-plus pulls esbuild in. Without this every generated app fails its first

package/lib/updates.mjs

@@ -133,7 +133,15 @@ export function wireEntry(text) {
   return lines.join("\n");
 }
 
-export function flavourFile({ env, idSuffix, nameSuffix }, { appId, appName, updateUrl }) {
+/**
+ * One flavour's env file. The engine and PRAGMA profile are repeated from `.env` because `.env` is
+ * git-ignored: a flavour that left them out would build with whatever the deploying machine has,
+ * which `capuchoo deploy` warns about and refuses for prod.
+ */
+export function flavourFile(
+  { env, idSuffix, nameSuffix },
+  { appId, appName, updateUrl, engine, pragmas },
+) {
   return [
     `# The ${env} flavour. The Capuchoo CLI exports these values when it builds ${env}; see .env.example.`,
     `VITE_APP_ID=${appId}${idSuffix}`,
@@ -141,6 +149,8 @@ export function flavourFile({ env, idSuffix, nameSuffix }, { appId, appName, upd
     `VITE_ENVIRONMENT=${env}`,
     `VITE_UPDATE_API_URL=${updateUrl}`,
     `VITE_UPDATE_CHANNEL=${env}`,
+    ...(engine ? [`VITE_STORAGE_ENGINE=${engine}`] : []),
+    ...(pragmas ? [`VITE_PRAGMA_PROFILE=${pragmas}`] : []),
     "",
   ].join("\n");
 }
@@ -158,7 +168,7 @@ const ENV_EXAMPLE_UPDATES = `
  * app, its channels, registering the flavour ids - is left to `capuchoo init`, which reports
  * everything written here as already satisfied.
  */
-export function addUpdates(out, { appId, appName, updateUrl }) {
+export function addUpdates(out, { appId, appName, updateUrl, engine, pragmas }) {
   const packagePath = join(out, "package.json");
   const pkg = JSON.parse(readFileSync(packagePath, "utf8"));
   writeFileSync(packagePath, `${JSON.stringify(withUpdatePackages(pkg), null, 2)}\n`);
@@ -174,7 +184,7 @@ export function addUpdates(out, { appId, appName, updateUrl }) {
     mkdirSync(dir, { recursive: true });
     writeFileSync(
       join(dir, `.env.${flavour.env}`),
-      flavourFile(flavour, { appId, appName, updateUrl }),
+      flavourFile(flavour, { appId, appName, updateUrl, engine, pragmas }),
     );
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cavulsqa/create",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "description": "Create a Vue + Capacitor + SQLite app from the cavulsqa templates: Framework7 (iOS and Material) or Material 3 Expressive.",
   "keywords": [
     "capacitor",
@@ -60,7 +60,7 @@
       }
     ]
   },
-  "templatesFingerprint": "sha256-eIGH2ix9joNhpsfimiVjXn35142qMIzl59n4E69AcYg=",
+  "templatesFingerprint": "sha256-kWiSBoDPXxEaZd1rE56lZ5473btBLtf2mZosmUur3cc=",
   "scripts": {
     "build": "node scripts/bundleTemplates.mjs",
     "check": "vp check",

package/templates/f7-app/package.json

@@ -22,10 +22,10 @@
     "@capacitor/share": "^8.0.0",
     "@capacitor/splash-screen": "^8.0.0",
     "@capacitor/status-bar": "^8.0.0",
-    "@cavulsqa/mobile-db": "^1.4.0",
-    "@cavulsqa/reactive-db": "^1.4.0",
-    "@cavulsqa/reactive-vue": "^1.4.0",
-    "@cavulsqa/recorder": "^1.4.0",
+    "@cavulsqa/mobile-db": "^1.4.1",
+    "@cavulsqa/reactive-db": "^1.4.1",
+    "@cavulsqa/reactive-vue": "^1.4.1",
+    "@cavulsqa/recorder": "^1.4.1",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@tailwindcss/vite": "^4.3.3",
     "@vueuse/core": "^14.4.0",

package/templates/m3e-app/package.json

@@ -21,11 +21,11 @@
     "@capacitor/preferences": "^8.0.0",
     "@capacitor/splash-screen": "^8.0.0",
     "@capacitor/status-bar": "^8.0.0",
-    "@cavulsqa/m3e": "^1.4.0",
-    "@cavulsqa/m3e-vue": "^1.4.0",
-    "@cavulsqa/mobile-db": "^1.4.0",
-    "@cavulsqa/reactive-db": "^1.4.0",
-    "@cavulsqa/reactive-vue": "^1.4.0",
+    "@cavulsqa/m3e": "^1.4.1",
+    "@cavulsqa/m3e-vue": "^1.4.1",
+    "@cavulsqa/mobile-db": "^1.4.1",
+    "@cavulsqa/reactive-db": "^1.4.1",
+    "@cavulsqa/reactive-vue": "^1.4.1",
     "@fontsource-variable/google-sans-flex": "^5.3.1",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@tailwindcss/vite": "^4.3.3",