@batijs/cli 0.0.197 → 0.0.198

package/dist/boilerplates/@batijs/react/files/layouts/LayoutDefault.tsx

@@ -20,8 +20,7 @@ export default function LayoutDefault({ children }: { children: React.ReactNode
       <Sidebar>
         <Logo />
         <Link href="/">Welcome</Link>
-        {BATI.has("telefunc") ? <Link href="/todo">Todo (telefunc)</Link> : undefined}
-        {BATI.has("trpc") ? <Link href="/todo-trpc">Todo (tRPC)</Link> : undefined}
+        <Link href="/todo">Todo</Link>
         <Link href="/star-wars">Data Fetching</Link>
       </Sidebar>
       <Content>{children}</Content>

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

@@ -0,0 +1,14 @@
+import type { Data } from "@batijs/shared-todo/pages/todo/+data";
+import React from "react";
+import { useData } from "vike-react/useData";
+import { TodoList } from "./TodoList.js";
+
+export default function Page() {
+  const todoItemsInitial = useData<Data>();
+  return (
+    <>
+      <h1>To-do List</h1>
+      <TodoList initialTodoItems={todoItemsInitial} />
+    </>
+  );
+}

package/dist/boilerplates/@batijs/react/files/pages/todo/TodoList.tsx

@@ -0,0 +1,51 @@
+import { onNewTodo } from "@batijs/telefunc/pages/todo/TodoList.telefunc";
+import { trpc } from "@batijs/trpc/trpc/client";
+import React, { useState } from "react";
+
+export function TodoList({ initialTodoItems }: { initialTodoItems: { text: string }[] }) {
+  const [todoItems, setTodoItems] = useState(initialTodoItems);
+  const [newTodo, setNewTodo] = useState("");
+  return (
+    <>
+      <ul>
+        {todoItems.map((todoItem) => (
+          <li key={todoItem.text}>{todoItem.text}</li>
+        ))}
+      </ul>
+      <div>
+        <form
+          onSubmit={async (ev) => {
+            ev.preventDefault();
+
+            // Optimistic UI update
+            setTodoItems((prev) => [...prev, { text: newTodo }]);
+            try {
+              if (BATI.has("telefunc")) {
+                await onNewTodo({ text: newTodo });
+              } else if (BATI.has("trpc")) {
+                await trpc.onNewTodo.mutate(newTodo);
+              } else {
+                const response = await fetch("/api/todo/create", {
+                  method: "POST",
+                  body: JSON.stringify({ text: newTodo }),
+                  headers: {
+                    "Content-Type": "application/json",
+                  },
+                });
+                await response.blob();
+              }
+              setNewTodo("");
+            } catch (e) {
+              console.error(e);
+              // rollback
+              setTodoItems((prev) => prev.slice(0, -1));
+            }
+          }}
+        >
+          <input type="text" onChange={(ev) => setNewTodo(ev.target.value)} value={newTodo} />{" "}
+          <button type="submit">Add to-do</button>
+        </form>
+      </div>
+    </>
+  );
+}

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

@@ -7,6 +7,9 @@ declare const _default: {
     title: string;
     extends: {
         name: string;
+        require: {
+            vike: string;
+        };
         onRenderHtml: "import:vike-react/renderer/onRenderHtml:onRenderHtml";
         onRenderClient: "import:vike-react/renderer/onRenderClient:onRenderClient";
         passToClient: string[];
@@ -53,7 +56,7 @@ declare const _default: {
                     server: true;
                 };
             };
-            _streamIsRequied: {
+            streamIsRequired: {
                 env: {
                     server: true;
                 };
@@ -68,19 +71,19 @@ declare const _default: {
                     client: true;
                 };
             };
-            VikeReactQueryWrapper: {
+            Wrapper: {
+                cumulative: true;
                 env: {
                     client: true;
                     server: true;
                 };
             };
-            Wrapper: {
+            name: {
                 env: {
-                    client: true;
-                    server: true;
+                    config: true;
                 };
             };
-            name: {
+            require: {
                 env: {
                     config: true;
                 };

package/dist/boilerplates/@batijs/react/types/pages/todo/TodoList.d.ts

@@ -0,0 +1,5 @@
+export declare function TodoList({ initialTodoItems }: {
+    initialTodoItems: {
+        text: string;
+    }[];
+}): import("react/jsx-runtime").JSX.Element;

package/dist/boilerplates/@batijs/shared/files/package.json

@@ -11,10 +11,10 @@
   "keywords": [],
   "author": "",
   "devDependencies": {
-    "@auth/core": "^0.31.0",
+    "@auth/core": "^0.32.0",
     "typescript": "^5.4.5",
-    "vike": "^0.4.172",
-    "vite": "^5.2.11"
+    "vike": "^0.4.174",
+    "vite": "^5.2.12"
   },
   "dependencies": {}
 }

package/dist/boilerplates/@batijs/shared-no-db/files/$package.json.js

@@ -0,0 +1,91 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+// package.json
+var require_package = __commonJS({
+  "package.json"(exports, module) {
+    module.exports = {
+      name: "@batijs/shared-no-db",
+      private: true,
+      version: "0.0.1",
+      description: "",
+      type: "module",
+      scripts: {
+        "check-types": "tsc --noEmit",
+        build: "bati-compile-boilerplate"
+      },
+      keywords: [],
+      author: "",
+      license: "MIT",
+      devDependencies: {
+        "@batijs/compile": "workspace:*",
+        "@types/node": "^18.19.14",
+        lowdb: "^7.0.1"
+      },
+      dependencies: {
+        "@batijs/core": "workspace:*"
+      },
+      files: [
+        "dist/"
+      ],
+      bati: {
+        if: {
+          flag: {
+            $not: {
+              $in: [
+                "drizzle"
+              ]
+            }
+          }
+        }
+      },
+      exports: {
+        "./database/todoItems": {
+          types: "./dist/types/database/todoItems.d.ts"
+        }
+      },
+      typesVersions: {
+        "*": {
+          "database/todoItems": [
+            "./dist/types/database/todoItems.d.ts"
+          ]
+        }
+      }
+    };
+  }
+});
+
+// files/$package.json.ts
+import { addDependency, loadAsJson } from "@batijs/core";
+async function getPackageJson(props) {
+  const packageJson = await loadAsJson(props);
+  return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
+    dependencies: ["lowdb"]
+  });
+}
+export {
+  getPackageJson as default
+};

package/dist/boilerplates/@batijs/shared-no-db/files/database/todoItems.ts

@@ -0,0 +1,13 @@
+import type { LowSync } from "lowdb";
+import { JSONFileSyncPreset } from "lowdb/node";
+
+interface TodoItem {
+  text: string;
+}
+
+const lowDb: LowSync<{ todo: TodoItem[] }> = JSONFileSyncPreset<{ todo: TodoItem[] }>("db.json", {
+  todo: [{ text: "Buy milk" }, { text: "Buy strawberries" }],
+});
+
+export { lowDb };
+export type { TodoItem };

package/dist/boilerplates/@batijs/shared-no-db/types/database/todoItems.d.ts

@@ -0,0 +1,9 @@
+import type { LowSync } from "lowdb";
+interface TodoItem {
+    text: string;
+}
+declare const lowDb: LowSync<{
+    todo: TodoItem[];
+}>;
+export { lowDb };
+export type { TodoItem };

package/dist/boilerplates/@batijs/shared-todo/files/pages/todo/+data.ts

@@ -0,0 +1,15 @@
+// https://vike.dev/data
+import { db } from "@batijs/drizzle/database/db";
+import { todoTable } from "@batijs/drizzle/database/schema";
+import { lowDb } from "@batijs/shared-no-db/database/todoItems";
+
+export type Data = { text: string }[];
+
+export default async function data(): Promise<Data> {
+  if (BATI.has("drizzle")) {
+    return db.select().from(todoTable).all();
+  } else {
+    lowDb.read();
+    return lowDb.data.todo;
+  }
+}

package/dist/boilerplates/@batijs/shared-todo/files/server/create-todo-handler.ts

@@ -0,0 +1,24 @@
+import { db } from "@batijs/drizzle/database/db";
+import { todoTable } from "@batijs/drizzle/database/schema";
+import { lowDb } from "@batijs/shared-no-db/database/todoItems";
+
+export async function createTodoHandler<Context extends Record<string | number | symbol, unknown>>(
+  request: Request,
+  _context?: Context,
+): Promise<Response> {
+  // In a real case, user-provided data should ALWAYS be validated with tools like zod
+  const newTodo = (await request.json()) as { text: string };
+
+  if (BATI.has("drizzle")) {
+    await db.insert(todoTable).values({ text: newTodo.text });
+  } else {
+    await lowDb.update(({ todo }) => todo.push({ text: newTodo.text }));
+  }
+
+  return new Response(JSON.stringify({ status: "OK" }), {
+    status: 200,
+    headers: {
+      "content-type": "application/json",
+    },
+  });
+}

package/dist/boilerplates/@batijs/shared-todo/types/pages/todo/+data.d.ts

@@ -0,0 +1,4 @@
+export type Data = {
+    text: string;
+}[];
+export default function data(): Promise<Data>;

package/dist/boilerplates/@batijs/shared-todo/types/server/create-todo-handler.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="node" />
+export declare function createTodoHandler<Context extends Record<string | number | symbol, unknown>>(request: Request, _context?: Context): Promise<Response>;

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

@@ -42,15 +42,19 @@ 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",
         "cross-fetch": "^4.0.0",
         "eslint-plugin-solid": "^0.14.0",
         "solid-js": "^1.8.17",
-        tailwindcss: "^3.4.3",
+        tailwindcss: "^3.4.4",
         typescript: "^5.4.5",
-        vike: "^0.4.172",
+        vike: "^0.4.174",
         "vike-solid": "^0.4.5",
-        vite: "^5.2.11",
+        vite: "^5.2.12",
         "vite-plugin-solid": "^2.10.2"
       },
       dependencies: {
@@ -112,6 +116,12 @@ var require_package = __commonJS({
         },
         "./pages/star-wars/index/+title": {
           types: "./dist/types/pages/star-wars/index/+title.d.ts"
+        },
+        "./pages/todo/TodoList": {
+          types: "./dist/types/pages/todo/TodoList.d.ts"
+        },
+        "./pages/todo/+Page": {
+          types: "./dist/types/pages/todo/+Page.d.ts"
         }
       },
       typesVersions: {
@@ -163,6 +173,12 @@ var require_package = __commonJS({
           ],
           "pages/star-wars/index/+title": [
             "./dist/types/pages/star-wars/index/+title.d.ts"
+          ],
+          "pages/todo/TodoList": [
+            "./dist/types/pages/todo/TodoList.d.ts"
+          ],
+          "pages/todo/+Page": [
+            "./dist/types/pages/todo/+Page.d.ts"
           ]
         }
       }

package/dist/boilerplates/@batijs/solid/files/layouts/LayoutDefault.tsx

@@ -20,8 +20,7 @@ export default function LayoutDefault(props: { children?: JSX.Element }) {
       <Sidebar>
         <Logo />
         <Link href="/">Welcome</Link>
-        {BATI.has("telefunc") ? <Link href="/todo">Todo (telefunc)</Link> : undefined}
-        {BATI.has("trpc") ? <Link href="/todo-trpc">Todo (tRPC)</Link> : undefined}
+        <Link href="/todo">Todo</Link>
         <Link href="/star-wars">Data Fetching</Link>
       </Sidebar>
       <Content>{props.children}</Content>

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

@@ -0,0 +1,13 @@
+import type { Data } from "@batijs/shared-todo/pages/todo/+data";
+import { useData } from "vike-solid/useData";
+import { TodoList } from "./TodoList.js";
+
+export default function Page() {
+  const initialTodoItems = useData<Data>();
+  return (
+    <>
+      <h1>To-do List</h1>
+      <TodoList initialTodoItems={initialTodoItems} />
+    </>
+  );
+}

package/dist/boilerplates/@batijs/solid/files/pages/todo/TodoList.tsx

@@ -0,0 +1,49 @@
+import { onNewTodo } from "@batijs/telefunc/pages/todo/TodoList.telefunc";
+import { trpc } from "@batijs/trpc/trpc/client";
+import { createSignal, For, untrack } from "solid-js";
+
+export function TodoList(props: { initialTodoItems: { text: string }[] }) {
+  const [todoItems, setTodoItems] = createSignal(props.initialTodoItems);
+  const [newTodo, setNewTodo] = createSignal("");
+  return (
+    <>
+      <ul>
+        <For each={todoItems()}>{(todoItem) => <li>{todoItem.text}</li>}</For>
+      </ul>
+      <div>
+        <form
+          onSubmit={async (ev) => {
+            ev.preventDefault();
+
+            // Optimistic UI update
+            setTodoItems((prev) => [...prev, { text: untrack(newTodo) }]);
+            try {
+              if (BATI.has("telefunc")) {
+                await onNewTodo({ text: untrack(newTodo) });
+              } else if (BATI.has("trpc")) {
+                await trpc.onNewTodo.mutate(untrack(newTodo));
+              } else {
+                const response = await fetch("/api/todo/create", {
+                  method: "POST",
+                  body: JSON.stringify({ text: untrack(newTodo) }),
+                  headers: {
+                    "Content-Type": "application/json",
+                  },
+                });
+                await response.blob();
+              }
+              setNewTodo("");
+            } catch (e) {
+              console.error(e);
+              // rollback
+              setTodoItems((prev) => prev.slice(0, -1));
+            }
+          }}
+        >
+          <input type="text" onChange={(ev) => setNewTodo(ev.target.value)} value={newTodo()} />{" "}
+          <button type="submit">Add to-do</button>
+        </form>
+      </div>
+    </>
+  );
+}

package/dist/boilerplates/@batijs/solid/types/pages/todo/TodoList.d.ts

@@ -0,0 +1,5 @@
+export declare function TodoList(props: {
+    initialTodoItems: {
+        text: string;
+    }[];
+}): import("solid-js").JSX.Element;

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

@@ -44,11 +44,11 @@ var require_package = __commonJS({
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
         autoprefixer: "^10.4.19",
-        daisyui: "^4.11.1",
+        daisyui: "^4.12.2",
         postcss: "^8.4.38",
-        tailwindcss: "^3.4.3",
-        vike: "^0.4.172",
-        vite: "^5.2.11"
+        tailwindcss: "^3.4.4",
+        vike: "^0.4.174",
+        vite: "^5.2.12"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

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

@@ -42,10 +42,13 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@batijs/compile": "workspace:*",
+        "@batijs/drizzle": "workspace:*",
+        "@batijs/shared-no-db": "workspace:*",
+        "@batijs/shared-todo": "workspace:*",
         "@types/node": "^18.19.14",
-        telefunc: "^0.1.72",
-        vike: "^0.4.172",
-        vite: "^5.2.11"
+        telefunc: "^0.1.74",
+        vike: "^0.4.174",
+        vite: "^5.2.12"
       },
       dependencies: {
         "@batijs/core": "workspace:*"
@@ -59,12 +62,18 @@ var require_package = __commonJS({
         }
       },
       exports: {
+        "./pages/todo/TodoList.telefunc": {
+          types: "./dist/types/pages/todo/TodoList.telefunc.d.ts"
+        },
         "./server/telefunc-handler": {
           types: "./dist/types/server/telefunc-handler.d.ts"
         }
       },
       typesVersions: {
         "*": {
+          "pages/todo/TodoList.telefunc": [
+            "./dist/types/pages/todo/TodoList.telefunc.d.ts"
+          ],
           "server/telefunc-handler": [
             "./dist/types/server/telefunc-handler.d.ts"
           ]

package/dist/boilerplates/@batijs/telefunc/files/pages/todo/TodoList.telefunc.ts

@@ -0,0 +1,11 @@
+import { db } from "@batijs/drizzle/database/db";
+import { todoTable } from "@batijs/drizzle/database/schema";
+import { lowDb } from "@batijs/shared-no-db/database/todoItems";
+
+export async function onNewTodo({ text }: { text: string }) {
+  if (BATI.has("drizzle")) {
+    await db.insert(todoTable).values({ text });
+  } else {
+    await lowDb.update(({ todo }) => todo.push({ text }));
+  }
+}

package/dist/boilerplates/@batijs/telefunc/types/pages/todo/TodoList.telefunc.d.ts

@@ -0,0 +1,3 @@
+export declare function onNewTodo({ text }: {
+    text: string;
+}): Promise<void>;

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

@@ -42,11 +42,13 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@batijs/compile": "workspace:*",
-        "@batijs/shared-db": "workspace:*",
+        "@batijs/drizzle": "workspace:*",
+        "@batijs/shared-no-db": "workspace:*",
+        "@batijs/shared-todo": "workspace:*",
         "@trpc/client": "^10.45.2",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
-        vite: "^5.2.11"
+        vite: "^5.2.12"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

package/dist/boilerplates/@batijs/trpc/files/trpc/server.ts

@@ -1,4 +1,6 @@
-import { todoItems } from "@batijs/shared-db/database/todoItems";
+import { db } from "@batijs/drizzle/database/db";
+import { todoTable } from "@batijs/drizzle/database/schema";
+import { lowDb } from "@batijs/shared-no-db/database/todoItems";
 import { initTRPC } from "@trpc/server";
 
 /**
@@ -26,8 +28,11 @@ export const appRouter = router({
       throw new Error("Input is not a string");
     })
     .mutation(async (opts) => {
-      todoItems.push({ text: opts.input });
-      return { todoItems };
+      if (BATI.has("drizzle")) {
+        await db.insert(todoTable).values({ text: opts.input });
+      } else {
+        await lowDb.update(({ todo }) => todo.push({ text: opts.input }));
+      }
     }),
 });
 

package/dist/boilerplates/@batijs/trpc/types/trpc/client.d.ts

@@ -31,8 +31,6 @@ export declare const trpc: {
             _input_out: string;
             _output_in: typeof import("@trpc/server").unsetMarker;
             _output_out: typeof import("@trpc/server").unsetMarker;
-        }, {
-            todoItems: import("@batijs/shared-db/database/todoItems").TodoItem[];
-        }>>;
+        }, void>>;
     };
 };

package/dist/boilerplates/@batijs/trpc/types/trpc/server.d.ts

@@ -57,8 +57,6 @@ export declare const appRouter: import("@trpc/server").CreateRouterInner<import(
         _input_out: string;
         _output_in: typeof import("@trpc/server").unsetMarker;
         _output_out: typeof import("@trpc/server").unsetMarker;
-    }, {
-        todoItems: import("@batijs/shared-db/database/todoItems").TodoItem[];
-    }>;
+    }, void>;
 }>;
 export type AppRouter = typeof appRouter;

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

@@ -44,8 +44,8 @@ var require_package = __commonJS({
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
         "@vite-plugin-vercel/vike": "^7.0.0",
-        vike: "^0.4.172",
-        vite: "^5.2.11",
+        vike: "^0.4.174",
+        vite: "^5.2.12",
         "vite-plugin-vercel": "^7.0.0"
       },
       dependencies: {

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="initialTodoItems" />
+  </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 initialTodoItems = useData<Data>();
+</script>