@batijs/cli 0.0.259 → 0.0.261

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

@@ -1,21 +1,48 @@
+import type { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
+import type { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
+import { D1Database } from "@cloudflare/workers-types";
 /**
  * Export reusable router and procedure helpers
  * that can be used throughout the router
  */
 export declare const router: <TProcRouterRecord extends import("@trpc/server").ProcedureRouterRecord>(procedures: TProcRouterRecord) => import("@trpc/server").CreateRouterInner<import("@trpc/server").RootConfig<{
-    ctx: object;
+    ctx: object & {
+        db: ReturnType<typeof sqliteDb>;
+    } & {
+        db: ReturnType<typeof dbSqlite>;
+    } & {
+        db: ReturnType<typeof dbD1>;
+    } & {
+        db: D1Database;
+    };
     meta: object;
     errorShape: import("@trpc/server").DefaultErrorShape;
     transformer: import("@trpc/server").DefaultDataTransformer;
 }>, TProcRouterRecord>;
 export declare const publicProcedure: import("@trpc/server").ProcedureBuilder<{
     _config: import("@trpc/server").RootConfig<{
-        ctx: object;
+        ctx: object & {
+            db: ReturnType<typeof sqliteDb>;
+        } & {
+            db: ReturnType<typeof dbSqlite>;
+        } & {
+            db: ReturnType<typeof dbD1>;
+        } & {
+            db: D1Database;
+        };
         meta: object;
         errorShape: import("@trpc/server").DefaultErrorShape;
         transformer: import("@trpc/server").DefaultDataTransformer;
     }>;
-    _ctx_out: object;
+    _ctx_out: object & {
+        db: ReturnType<typeof sqliteDb>;
+    } & {
+        db: ReturnType<typeof dbSqlite>;
+    } & {
+        db: ReturnType<typeof dbD1>;
+    } & {
+        db: D1Database;
+    };
     _input_in: typeof import("@trpc/server").unsetMarker;
     _input_out: typeof import("@trpc/server").unsetMarker;
     _output_in: typeof import("@trpc/server").unsetMarker;
@@ -23,19 +50,43 @@ export declare const publicProcedure: import("@trpc/server").ProcedureBuilder<{
     _meta: object;
 }>;
 export declare const appRouter: import("@trpc/server").CreateRouterInner<import("@trpc/server").RootConfig<{
-    ctx: object;
+    ctx: object & {
+        db: ReturnType<typeof sqliteDb>;
+    } & {
+        db: ReturnType<typeof dbSqlite>;
+    } & {
+        db: ReturnType<typeof dbD1>;
+    } & {
+        db: D1Database;
+    };
     meta: object;
     errorShape: import("@trpc/server").DefaultErrorShape;
     transformer: import("@trpc/server").DefaultDataTransformer;
 }>, {
     demo: import("@trpc/server").BuildProcedure<"query", {
         _config: import("@trpc/server").RootConfig<{
-            ctx: object;
+            ctx: object & {
+                db: ReturnType<typeof sqliteDb>;
+            } & {
+                db: ReturnType<typeof dbSqlite>;
+            } & {
+                db: ReturnType<typeof dbD1>;
+            } & {
+                db: D1Database;
+            };
             meta: object;
             errorShape: import("@trpc/server").DefaultErrorShape;
             transformer: import("@trpc/server").DefaultDataTransformer;
         }>;
-        _ctx_out: object;
+        _ctx_out: object & {
+            db: ReturnType<typeof sqliteDb>;
+        } & {
+            db: ReturnType<typeof dbSqlite>;
+        } & {
+            db: ReturnType<typeof dbD1>;
+        } & {
+            db: D1Database;
+        };
         _input_in: typeof import("@trpc/server").unsetMarker;
         _input_out: typeof import("@trpc/server").unsetMarker;
         _output_in: typeof import("@trpc/server").unsetMarker;
@@ -46,13 +97,29 @@ export declare const appRouter: import("@trpc/server").CreateRouterInner<import(
     }>;
     onNewTodo: import("@trpc/server").BuildProcedure<"mutation", {
         _config: import("@trpc/server").RootConfig<{
-            ctx: object;
+            ctx: object & {
+                db: ReturnType<typeof sqliteDb>;
+            } & {
+                db: ReturnType<typeof dbSqlite>;
+            } & {
+                db: ReturnType<typeof dbD1>;
+            } & {
+                db: D1Database;
+            };
             meta: object;
             errorShape: import("@trpc/server").DefaultErrorShape;
             transformer: import("@trpc/server").DefaultDataTransformer;
         }>;
         _meta: object;
-        _ctx_out: object;
+        _ctx_out: object & {
+            db: ReturnType<typeof sqliteDb>;
+        } & {
+            db: ReturnType<typeof dbSqlite>;
+        } & {
+            db: ReturnType<typeof dbD1>;
+        } & {
+            db: D1Database;
+        };
         _input_in: string;
         _input_out: string;
         _output_in: typeof import("@trpc/server").unsetMarker;

package/dist/boilerplates/@batijs/ts-rest/files/$package.json.js

@@ -43,12 +43,14 @@ var require_package = __commonJS({
       devDependencies: {
         "@batijs/compile": "workspace:*",
         "@batijs/drizzle": "workspace:*",
+        "@batijs/d1": "workspace:*",
+        "@batijs/d1-sqlite": "workspace:*",
         "@batijs/sqlite": "workspace:*",
-        "@batijs/shared-no-db": "workspace:*",
+        "@cloudflare/workers-types": "^4.20240821.1",
         "@ts-rest/core": "^3.51.0",
         "@ts-rest/serverless": "^3.51.0",
         "@types/node": "^18.19.14",
-        "@universal-middleware/core": "^0.2.5",
+        "@universal-middleware/core": "^0.2.6",
         zod: "^3.23.8"
       },
       dependencies: {
@@ -98,7 +100,6 @@ async function getPackageJson(props) {
     dependencies: ["@ts-rest/core", "@ts-rest/serverless", "@universal-middleware/core"],
     devDependencies: ["zod"]
   });
-  packageJson.devDependencies.typescript = "~5.4.5";
   return packageJson;
 }
 export {

package/dist/boilerplates/@batijs/ts-rest/files/server/ts-rest-handler.ts

@@ -2,44 +2,65 @@ import { fetchRequestHandler, tsr } from "@ts-rest/serverless/fetch";
 import { contract } from "../ts-rest/contract";
 import { Get, UniversalHandler } from "@universal-middleware/core";
 import * as drizzleQueries from "@batijs/drizzle/database/drizzle/queries/todos";
+import { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
 import * as sqliteQueries from "@batijs/sqlite/database/sqlite/queries/todos";
+import { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
+import * as d1Queries from "@batijs/d1-sqlite/database/d1/queries/todos";
+import type { D1Database } from "@cloudflare/workers-types";
 
 /**
  * ts-rest route
  *
  * @link {@see https://ts-rest.com/docs/serverless/fetch-runtimes/}
  **/
-const router = tsr.router(contract, {
-  demo: async () => {
-    return {
-      status: 200,
-      body: {
-        demo: true,
-      },
-    };
-  },
-  createTodo: async ({ body }) => {
-    if (BATI.has("drizzle")) {
-      await drizzleQueries.insertTodo(body.text);
-    } else if (BATI.has("sqlite")) {
-      sqliteQueries.insertTodo(body.text);
-    } else {
-      // This is where you'd persist the data
-      console.log("Received new todo", { text: body.text });
-    }
-    return {
-      status: 200,
-      body: {
-        status: "Ok",
-      },
-    };
-  },
-});
+const router = tsr
+  .platformContext<
+    BATI.If<{
+      'BATI.has("sqlite") && !BATI.hasD1': { db: ReturnType<typeof sqliteDb> };
+      'BATI.has("drizzle") && !BATI.hasD1': { db: ReturnType<typeof dbSqlite> };
+      'BATI.has("drizzle")': { db: ReturnType<typeof dbD1> };
+      "BATI.hasD1": { db: D1Database };
+      _: object;
+    }>
+  >()
+  .router(contract, {
+    demo: async () => {
+      return {
+        status: 200,
+        body: {
+          demo: true,
+        },
+      };
+    },
+    createTodo: async ({ body }, _ctx) => {
+      if (BATI.has("drizzle")) {
+        await drizzleQueries.insertTodo(_ctx.db, body.text);
+      } else if (BATI.has("sqlite") && !BATI.hasD1) {
+        sqliteQueries.insertTodo(_ctx.db, body.text);
+      } else if (BATI.hasD1) {
+        await d1Queries.insertTodo(_ctx.db, body.text);
+      } else {
+        // This is where you'd persist the data
+        console.log("Received new todo", { text: body.text });
+      }
+      return {
+        status: 200,
+        body: {
+          status: "Ok",
+        },
+      };
+    },
+  });
 
-export const tsRestHandler: Get<[], UniversalHandler> = () => async (request) =>
+export const tsRestHandler: Get<[], UniversalHandler> = () => async (request, ctx, runtime) =>
   fetchRequestHandler({
     request: new Request(request.url, request),
     contract,
     router,
     options: {},
+    platformContext: {
+      ...ctx,
+      ...runtime,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } as any,
   });

package/dist/boilerplates/@batijs/vue-lucia-auth/files/pages/login/+Page.vue

@@ -73,7 +73,8 @@ async function handleOnSubmit(action: "login" | "signup") {
       body: JSON.stringify(formData.value),
       headers: { "Content-Type": "application/json" },
     });
-    const result = await response.json();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const result: Record<string, any> = await response.json();
     if ("error" in result) {
       console.error("A validation error has occurred :", result.error);
       error.value = { ...result.error };

package/dist/boilerplates/boilerplates.json

@@ -26,6 +26,17 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "if": {
+        "flag": "aws"
+      }
+    },
+    "folder": "@batijs/aws",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {
@@ -63,8 +74,11 @@
     "config": {
       "if": {
         "flag": {
+          "$in": [
+            "drizzle",
+            "sqlite"
+          ],
           "$all": [
-            "sqlite",
             "cloudflare"
           ]
         }
@@ -75,6 +89,22 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "if": {
+        "flag": {
+          "$all": [
+            "sqlite",
+            "cloudflare"
+          ]
+        }
+      }
+    },
+    "folder": "@batijs/d1-sqlite",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {
@@ -287,13 +317,32 @@
       "files"
     ]
   },
+  {
+    "config": {
+      "if": {
+        "flag": {
+          "$in": [
+            "drizzle",
+            "sqlite",
+            "edgedb",
+            "prisma"
+          ]
+        }
+      }
+    },
+    "folder": "@batijs/shared-db",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "config": {
       "if": {
         "flag": {
           "$not": {
             "$in": [
-              "drizzle"
+              "drizzle",
+              "sqlite"
             ]
           }
         }
@@ -400,7 +449,16 @@
   {
     "config": {
       "if": {
-        "flag": "sqlite"
+        "flag": {
+          "$in": [
+            "sqlite"
+          ],
+          "$not": {
+            "$in": [
+              "cloudflare"
+            ]
+          }
+        }
       }
     },
     "folder": "@batijs/sqlite",

package/dist/index.js

@@ -98,6 +98,7 @@ async function transformFileAfterExec(filepath, fileContent) {
       case ".env.production.local":
       case ".html":
       case ".md":
+      case ".toml":
         return fileContent;
       case ".json":
         return JSON.stringify(fileContent, null, 2);
@@ -1676,7 +1677,7 @@ var createDefaultQueryTester = function(query, options) {
 // package.json
 var package_default = {
   name: "@batijs/cli",
-  version: "0.0.259",
+  version: "0.0.261",
   type: "module",
   scripts: {
     "check-types": "tsc --noEmit",
@@ -1759,6 +1760,10 @@ Choose one of them, or simply remove selected Server`
   [RulesMessage.ERROR_LUCIA_R_COMPAT_DATABASE]: error(
     `${inverse(bold("Lucia"))} requires a ${inverse(bold("Database"))}, and is only compatible with ${inverse(bold("SQLite"))} or ${inverse(bold("Drizzle"))}`
   ),
+  [RulesMessage.ERROR_AWS_R_COMPAT_SERVER]: error(
+    `${inverse(bold("AWS"))} is only compatible with ${inverse(bold("Hono"))} or ${inverse(bold("HatTip"))}.
+Choose one of them, or simply remove selected Server`
+  ),
   [RulesMessage.INFO_DRIZZLE_STACKBLITZ]: null
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.259",
+  "version": "0.0.261",
   "type": "module",
   "keywords": [],
   "description": "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want",
@@ -20,12 +20,12 @@
     "typescript": "^5.5.4",
     "unplugin-purge-polyfills": "^0.0.5",
     "vite": "^5.4.2",
-    "@batijs/build": "0.0.259",
-    "@batijs/compile": "0.0.259"
+    "@batijs/compile": "0.0.261",
+    "@batijs/build": "0.0.261"
   },
   "dependencies": {
-    "@batijs/features": "0.0.259",
-    "@batijs/core": "0.0.259"
+    "@batijs/core": "0.0.261",
+    "@batijs/features": "0.0.261"
   },
   "bin": "./dist/index.js",
   "exports": {

package/dist/boilerplates/@batijs/drizzle/files/database/drizzle/seed.ts

@@ -1,13 +0,0 @@
-import { db } from "./db";
-import { todoTable } from "./schema/todos";
-
-async function seed() {
-  db()
-    .insert(todoTable)
-    .values([{ text: "Buy milk" }, { text: "Buy strawberries" }])
-    .run();
-
-  console.log("Seed complete!");
-}
-
-await seed();

package/dist/boilerplates/@batijs/trpc/files/$vite.config.ts.js

@@ -1,13 +0,0 @@
-// files/$vite.config.ts.ts
-import { addVitePlugin, loadAsMagicast } from "@batijs/core";
-async function getViteConfig(props) {
-  const mod = await loadAsMagicast(props);
-  addVitePlugin(mod, {
-    from: "./trpc/vite-plugin",
-    constructor: "trpc"
-  });
-  return mod.generate().code;
-}
-export {
-  getViteConfig as default
-};

package/dist/boilerplates/@batijs/trpc/files/trpc/vite-plugin.ts

@@ -1,49 +0,0 @@
-import type { AnyRouter } from "@trpc/server";
-import {
-  nodeHTTPRequestHandler,
-  type NodeHTTPHandlerOptions,
-  type NodeHTTPRequest,
-  type NodeHTTPResponse,
-} from "@trpc/server/adapters/node-http";
-import type { PluginOption } from "vite";
-import { appRouter } from "./server.js";
-
-type TrpcPluginOptions<
-  TRouter extends AnyRouter,
-  TRequest extends NodeHTTPRequest,
-  TResponse extends NodeHTTPResponse,
-> = {
-  /**
-   * Path where the trpc router will be mounted.
-   * @default '/api/trpc'
-   */
-  basePath: string;
-} & NodeHTTPHandlerOptions<TRouter, TRequest, TResponse>;
-
-export default function trpc<
-  TRouter extends AnyRouter,
-  TRequest extends NodeHTTPRequest,
-  TResponse extends NodeHTTPResponse,
->(options?: TrpcPluginOptions<TRouter, TRequest, TResponse>): PluginOption {
-  return {
-    name: "trpc",
-    configureServer(server) {
-      server.middlewares.use(options?.basePath || "/api/trpc", (req, res) => {
-        const url = new URL(req.url || "/", "http://localhost");
-        const path = url.pathname.replace(/^\//, "");
-
-        return nodeHTTPRequestHandler({
-          req: req as TRequest,
-          res: res as TResponse,
-          path,
-          router: options?.router || appRouter,
-          createContext: options?.createContext,
-          batching: options?.batching,
-          responseMeta: options?.responseMeta,
-          maxBodySize: options?.maxBodySize,
-          onError: options?.onError,
-        });
-      });
-    },
-  };
-}

package/dist/boilerplates/@batijs/trpc/types/trpc/vite-plugin.d.ts

@@ -1,12 +0,0 @@
-import type { AnyRouter } from "@trpc/server";
-import { type NodeHTTPHandlerOptions, type NodeHTTPRequest, type NodeHTTPResponse } from "@trpc/server/adapters/node-http";
-import type { PluginOption } from "vite";
-type TrpcPluginOptions<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse> = {
-    /**
-     * Path where the trpc router will be mounted.
-     * @default '/api/trpc'
-     */
-    basePath: string;
-} & NodeHTTPHandlerOptions<TRouter, TRequest, TResponse>;
-export default function trpc<TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse>(options?: TrpcPluginOptions<TRouter, TRequest, TResponse>): PluginOption;
-export {};