@batijs/cli 0.0.197 → 0.0.199

package/dist/boilerplates/@batijs/vue/files/$package.json.js

@@ -42,18 +42,22 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@batijs/compile": "workspace:*",
+        "@batijs/drizzle": "workspace:*",
+        "@batijs/shared-todo": "workspace:*",
+        "@batijs/telefunc": "workspace:*",
+        "@batijs/trpc": "workspace:^",
         "@types/node": "^18.19.14",
-        "@vitejs/plugin-vue": "^5.0.4",
+        "@vitejs/plugin-vue": "^5.0.5",
         "@vue/compiler-sfc": "^3.4.27",
         "@vue/server-renderer": "^3.4.27",
         "cross-fetch": "^4.0.0",
         "eslint-plugin-vue": "^9.26.0",
-        tailwindcss: "^3.4.3",
+        tailwindcss: "^3.4.4",
         typescript: "^5.4.5",
         "unplugin-vue-markdown": "^0.26.2",
-        vike: "^0.4.172",
-        "vike-vue": "^0.6.6",
-        vite: "^5.2.11",
+        vike: "^0.4.174",
+        "vike-vue": "^0.7.1",
+        vite: "^5.2.12",
         vue: "^3.4.27",
         "vue-gtag": "^2.0.1"
       },

package/dist/boilerplates/@batijs/vue/files/layouts/LayoutDefault.vue

@@ -3,10 +3,7 @@
     <Sidebar>
       <Logo />
       <Link href="/"> Welcome </Link>
-      <!-- BATI.has("telefunc") -->
-      <Link href="/todo"> Todo (telefunc) </Link>
-      <!-- BATI.has("trpc") -->
-      <Link href="/todo-trpc"> Todo (tRPC) </Link>
+      <Link href="/todo"> Todo </Link>
       <Link href="/star-wars"> Data Fetching </Link>
     </Sidebar>
     <Content><slot /></Content>

package/dist/boilerplates/@batijs/vue/files/pages/todo/+Page.vue

@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <h1>To-do List</h1>
+    <TodoList :initial-todo-items="data.todo" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { Data } from "@batijs/shared-todo/pages/todo/+data";
+import { useData } from "vike-vue/useData";
+import TodoList from "./TodoList.vue";
+
+const data = useData<Data>();
+</script>

package/dist/boilerplates/@batijs/vue/files/pages/todo/TodoList.vue

@@ -0,0 +1,49 @@
+<template>
+  <ul>
+    <li v-for="item in todoItems" :key="item.text">
+      {{ item.text }}
+    </li>
+    <li>
+      <form @submit.prevent="submitNewTodo()">
+        <input v-model="newTodo" type="text" />{{ " " }}
+        <button type="submit">Add to-do</button>
+      </form>
+    </li>
+  </ul>
+</template>
+
+<script lang="ts" setup>
+import { onNewTodo } from "@batijs/telefunc/pages/todo/TodoList.telefunc";
+import { trpc } from "@batijs/trpc/trpc/client";
+import { ref } from "vue";
+
+const props = defineProps<{ initialTodoItems: { text: string }[] }>();
+const todoItems = ref(props.initialTodoItems);
+const newTodo = ref("");
+
+const submitNewTodo = async () => {
+  // Optimistic UI update
+  todoItems.value.push({ text: newTodo.value });
+  try {
+    if (BATI.has("telefunc")) {
+      await onNewTodo({ text: newTodo.value });
+    } else if (BATI.has("trpc")) {
+      await trpc.onNewTodo.mutate(newTodo.value);
+    } else {
+      const response = await fetch("/api/todo/create", {
+        method: "POST",
+        body: JSON.stringify({ text: newTodo.value }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
+      await response.blob();
+    }
+    newTodo.value = "";
+  } catch (e) {
+    console.error(e);
+    // rollback
+    todoItems.value.slice(0, -1);
+  }
+};
+</script>

package/dist/boilerplates/@batijs/vue/types/pages/+config.d.ts

@@ -1,11 +1,104 @@
-import vikeVue from "vike-vue/config";
 import Head from "../layouts/HeadDefault.vue";
 declare const _default: {
     Layout: typeof Head;
     Head: typeof Head;
     passToClient: string[];
     title: string;
-    extends: typeof vikeVue;
+    extends: {
+        name: string;
+        onRenderHtml: "import:vike-vue/renderer/onRenderHtml:onRenderHtml";
+        onRenderClient: "import:vike-vue/renderer/onRenderClient:onRenderClient";
+        passToClient: string[];
+        clientRouting: true;
+        hydrationCanBeAborted: true;
+        meta: {
+            Head: {
+                env: {
+                    server: true;
+                };
+            };
+            Layout: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+            };
+            title: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+            };
+            favicon: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+            };
+            lang: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+            };
+            ssr: {
+                env: {
+                    config: true;
+                };
+                effect: import("vike/types").ConfigEffect;
+            };
+            stream: {
+                env: {
+                    server: true;
+                };
+            };
+            vuePlugins: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+            };
+            onCreateApp: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+                cumulative: true;
+            };
+            onAfterRenderHtml: {
+                env: {
+                    server: true;
+                };
+                cumulative: true;
+            };
+            onBeforeRenderClient: {
+                env: {
+                    server: false;
+                    client: true;
+                };
+                cumulative: true;
+            };
+            name: {
+                env: {
+                    config: true;
+                };
+            };
+            bodyHtmlStart: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+                cumulative: true;
+            };
+            bodyHtmlEnd: {
+                env: {
+                    server: true;
+                    client: true;
+                };
+                cumulative: true;
+            };
+        };
+    };
     meta: {
         firebaseApp: {
             env: {

package/dist/boilerplates/boilerplates.json

@@ -48,6 +48,17 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "if": {
+        "flag": "drizzle"
+      }
+    },
+    "folder": "@batijs/drizzle",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {
@@ -196,38 +207,6 @@
       "files"
     ]
   },
-  {
-    "config": {
-      "if": {
-        "flag": {
-          "$all": [
-            "react",
-            "telefunc"
-          ]
-        }
-      }
-    },
-    "folder": "@batijs/react-telefunc",
-    "subfolders": [
-      "files"
-    ]
-  },
-  {
-    "config": {
-      "if": {
-        "flag": {
-          "$all": [
-            "react",
-            "trpc"
-          ]
-        }
-      }
-    },
-    "folder": "@batijs/react-trpc",
-    "subfolders": [
-      "files"
-    ]
-  },
   {
     "config": {
       "enforce": "pre"
@@ -241,14 +220,15 @@
     "config": {
       "if": {
         "flag": {
-          "$in": [
-            "trpc",
-            "telefunc"
-          ]
+          "$not": {
+            "$in": [
+              "drizzle"
+            ]
+          }
         }
       }
     },
-    "folder": "@batijs/shared-db",
+    "folder": "@batijs/shared-no-db",
     "subfolders": [
       "files"
     ]
@@ -296,27 +276,9 @@
   },
   {
     "config": {
-      "if": {
-        "flag": "solid"
-      }
-    },
-    "folder": "@batijs/solid",
-    "subfolders": [
-      "files"
-    ]
-  },
-  {
-    "config": {
-      "if": {
-        "flag": {
-          "$all": [
-            "solid",
-            "firebase-auth"
-          ]
-        }
-      }
+      "enforce": "pre"
     },
-    "folder": "@batijs/solid-firebase-auth",
+    "folder": "@batijs/shared-todo",
     "subfolders": [
       "files"
     ]
@@ -324,15 +286,10 @@
   {
     "config": {
       "if": {
-        "flag": {
-          "$all": [
-            "solid",
-            "telefunc"
-          ]
-        }
+        "flag": "solid"
       }
     },
-    "folder": "@batijs/solid-telefunc",
+    "folder": "@batijs/solid",
     "subfolders": [
       "files"
     ]
@@ -343,12 +300,12 @@
         "flag": {
           "$all": [
             "solid",
-            "trpc"
+            "firebase-auth"
           ]
         }
       }
     },
-    "folder": "@batijs/solid-trpc",
+    "folder": "@batijs/solid-firebase-auth",
     "subfolders": [
       "files"
     ]
@@ -423,37 +380,5 @@
     "subfolders": [
       "files"
     ]
-  },
-  {
-    "config": {
-      "if": {
-        "flag": {
-          "$all": [
-            "vue",
-            "telefunc"
-          ]
-        }
-      }
-    },
-    "folder": "@batijs/vue-telefunc",
-    "subfolders": [
-      "files"
-    ]
-  },
-  {
-    "config": {
-      "if": {
-        "flag": {
-          "$all": [
-            "vue",
-            "trpc"
-          ]
-        }
-      }
-    },
-    "folder": "@batijs/vue-trpc",
-    "subfolders": [
-      "files"
-    ]
   }
 ]

package/dist/{chunk-5DE3DJHR.js → chunk-TGVSJ5SD.js}

@@ -1062,7 +1062,7 @@ function createConsola2(options = {}) {
     defaults: { level },
     stdout: process.stdout,
     stderr: process.stderr,
-    prompt: (...args) => import("./prompt-YMZWKECL.js").then((m) => m.prompt(...args)),
+    prompt: (...args) => import("./prompt-XFX2ZGRD.js").then((m) => m.prompt(...args)),
     reporters: options.reporters || [
       options.fancy ?? !(isCI2 || isTest) ? new FancyReporter() : new BasicReporter()
     ],

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   __toESM,
   colors,
   consola
-} from "./chunk-5DE3DJHR.js";
+} from "./chunk-TGVSJ5SD.js";
 
 // ../../node_modules/.pnpm/which-pm-runs@1.1.0/node_modules/which-pm-runs/index.js
 var require_which_pm_runs = __commonJS({
@@ -99,19 +99,16 @@ async function safeWriteFile(destination, content) {
   await writeFile(destination, content, { encoding: "utf-8" });
 }
 async function* walk(dir) {
-  if (!existsSync(dir))
-    return;
+  if (!existsSync(dir)) return;
   for await (const d of await opendir(dir)) {
     const entry = path.join(dir, d.name);
     if (d.isDirectory()) {
       yield* walk(entry);
-    } else if (d.isFile())
-      yield entry;
+    } else if (d.isFile()) yield entry;
   }
 }
 function transformFileAfterExec(filepath, fileContent) {
-  if (fileContent === void 0 || fileContent === null)
-    return null;
+  if (fileContent === void 0 || fileContent === null) return null;
   const parsed = path.parse(filepath);
   const toTest = [parsed.base, parsed.ext, parsed.name].filter(Boolean);
   for (const ext of toTest) {
@@ -781,9 +778,7 @@ var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
     d2.__proto__ = b2;
   } || function(d2, b2) {
-    for (var p in b2)
-      if (Object.prototype.hasOwnProperty.call(b2, p))
-        d2[p] = b2[p];
+    for (var p in b2) if (Object.prototype.hasOwnProperty.call(b2, p)) d2[p] = b2[p];
   };
   return extendStatics(d, b);
 };
@@ -1564,7 +1559,7 @@ var import_which_pm_runs = __toESM(require_which_pm_runs(), 1);
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.197",
+  version: "0.0.199",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",
@@ -1581,7 +1576,7 @@ var package_default = {
     "@batijs/build": "workspace:*",
     "@batijs/compile": "workspace:*",
     "@types/node": "^18.19.14",
-    "@types/which": "^3.0.3",
+    "@types/which": "^3.0.4",
     "@types/which-pm-runs": "^1.0.2",
     citty: "^0.1.6",
     colorette: "^2.0.20",
@@ -1589,9 +1584,9 @@ var package_default = {
     execa: "^9.1.0",
     rimraf: "^5.0.7",
     sift: "^17.1.3",
-    tsup: "^8.0.2",
+    tsup: "^8.1.0",
     typescript: "^5.4.5",
-    vite: "^5.2.11",
+    vite: "^5.2.12",
     "which-pm-runs": "^1.1.0"
   },
   dependencies: {
@@ -1630,7 +1625,10 @@ var rulesMessages = {
   [RulesMessage.ERROR_COMPILED_R_REACT]: error(
     `${inverse(bold("React"))} is required when using ${inverse(bold("Compiled"))}.`
   ),
-  [RulesMessage.INFO_HATTIP]: info(`${inverse(bold("HatTip"))} is an experimental project`)
+  [RulesMessage.INFO_HATTIP]: info(`${inverse(bold("HatTip"))} is an experimental project`),
+  [RulesMessage.ERROR_DRIZZLE_R_SERVER]: error(
+    `A ${inverse(bold("Server"))} is required when using ${inverse(bold("Drizzle"))}.`
+  )
 };
 
 // index.ts
@@ -1650,8 +1648,7 @@ async function parseBoilerplates(dir) {
   return JSON.parse(await readFile3(join(dir, "boilerplates.json"), "utf-8"));
 }
 function toArg(flag, description) {
-  if (!flag)
-    return {};
+  if (!flag) return {};
   return {
     [flag]: {
       type: "boolean",
@@ -1662,8 +1659,7 @@ function toArg(flag, description) {
 }
 function findDescription(key) {
   const feat = features.find((f) => f.flag === key);
-  if (!feat)
-    return;
+  if (!feat) return;
   if (feat.description) {
     return feat.description;
   } else if (feat.label && feat.url) {
@@ -1681,8 +1677,7 @@ function printOK(dist, flags) {
   console.log(list3(green("Vike")));
   for (const key of flags) {
     const feature = features.find((f) => f.flag === key);
-    if (!feature || !feature.label)
-      continue;
+    if (!feature || !feature.label) continue;
     console.log(list3(green(feature.label)));
   }
   console.log("\n" + bold(arrow0("Ready to start your app:")));
@@ -1844,14 +1839,10 @@ async function run() {
       }).flat(1);
       checkRules(flags);
       boilerplates.sort((b1, b2) => {
-        if (b1.config.enforce === "pre")
-          return -1;
-        if (b1.config.enforce === "post")
-          return 1;
-        if (b2.config.enforce === "pre")
-          return 1;
-        if (b2.config.enforce === "post")
-          return -1;
+        if (b1.config.enforce === "pre") return -1;
+        if (b1.config.enforce === "post") return 1;
+        if (b2.config.enforce === "pre") return 1;
+        if (b2.config.enforce === "post") return -1;
         return 0;
       });
       for (const bl of boilerplates) {