@batijs/cli 0.0.633 → 0.0.634

package/dist/boilerplates/@batijs/kysely/files/database/kysely/queries/todos.ts

@@ -1,7 +1,8 @@
-import type { dbKysely, dbKyselyD1 } from "../db";
+import type { dbKysely, dbKyselyD1, dbKyselyPostgres } from "../db";
 
 export async function insertTodo(
   db: BATI.If<{
+    'BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
     "!BATI.hasD1": ReturnType<typeof dbKysely>;
     "BATI.hasD1": ReturnType<typeof dbKyselyD1>;
   }>,
@@ -12,6 +13,7 @@ export async function insertTodo(
 
 export async function getAllTodos(
   db: BATI.If<{
+    'BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
     "!BATI.hasD1": ReturnType<typeof dbKysely>;
     "BATI.hasD1": ReturnType<typeof dbKyselyD1>;
   }>,

package/dist/boilerplates/@batijs/kysely/types/database/kysely/db.d.mts

@@ -4,5 +4,6 @@ import { Kysely } from "kysely";
 //#region files/database/kysely/db.d.ts
 declare function dbKysely(): Kysely<Database>;
 declare function dbKyselyD1(d1: D1Database): Kysely<Database>;
+declare function dbKyselyPostgres(): Kysely<Database>;
 //#endregion
-export { dbKysely, dbKyselyD1 };
+export { dbKysely, dbKyselyD1, dbKyselyPostgres };

package/dist/boilerplates/@batijs/kysely/types/database/kysely/queries/todos.d.mts

@@ -1,7 +1,8 @@
-import { dbKysely, dbKyselyD1 } from "../db.mjs";
+import { dbKysely, dbKyselyD1, dbKyselyPostgres } from "../db.mjs";
 
 //#region files/database/kysely/queries/todos.d.ts
 declare function insertTodo(db: BATI.If<{
+  'BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
   "!BATI.hasD1": ReturnType<typeof dbKysely>;
   "BATI.hasD1": ReturnType<typeof dbKyselyD1>;
 }>, text: string): Promise<{
@@ -9,6 +10,7 @@ declare function insertTodo(db: BATI.If<{
   text: string;
 }>;
 declare function getAllTodos(db: BATI.If<{
+  'BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
   "!BATI.hasD1": ReturnType<typeof dbKysely>;
   "BATI.hasD1": ReturnType<typeof dbKyselyD1>;
 }>): Promise<{

package/dist/boilerplates/@batijs/postgres/bati.config.mjs

@@ -0,0 +1,25 @@
+//#region ../../packages/core/dist/config.js
+function e(e, t) {
+	if (!e) throw Error(t);
+}
+function t(t) {
+	return `enforce` in t && e(t.enforce === `pre` || t.enforce === `post`, `'enforce' must be 'pre' or 'post', was ${t.enforce}`), `if` in t && e(typeof t.if == `function`, `'if' must be a function`), `nextSteps` in t && e(typeof t.nextSteps == `function`, `'nextSteps' must be a function`), `knip` in t && (e(typeof t.knip == `object` && t.knip !== null, `'knip' must be an object`), `entry` in t.knip && e(Array.isArray(t.knip.entry), `'knip.entry' must be an array`), `ignoreDependencies` in t.knip && e(Array.isArray(t.knip.ignoreDependencies), `'knip.ignoreDependencies' must be an array`), `ignore` in t.knip && e(Array.isArray(t.knip.ignore), `'knip.ignore' must be an array`), `vite` in t.knip && e(typeof t.knip.vite == `boolean`, `'knip.vite' must be a boolean`)), `env` in t && e(typeof t.env == `function`, `'env' must be a function of meta`), t;
+}
+//#endregion
+//#region bati.config.ts
+var bati_config_default = t({
+	if(meta) {
+		return meta.BATI.has("postgres") && !meta.BATI.hasOrm;
+	},
+	nextSteps(_meta, packageManager, { bold }) {
+		return [{
+			type: "text",
+			step: `Set your ${bold("DATABASE_URL")} in .env and provide a PostgreSQL server — see ${bold("TODO.md")}`
+		}, {
+			type: "command",
+			step: `${packageManager} postgres:migrate`
+		}];
+	}
+});
+//#endregion
+export { bati_config_default as default };

package/dist/boilerplates/@batijs/postgres/files/$TODO.md.js

@@ -0,0 +1,25 @@
+#!/usr/bin/env node
+
+import { loadMarkdown, packageManager } from "@batijs/core";
+//#region ../../boilerplates/postgres/dist/files/$TODO.md.mjs
+async function getTodo(props) {
+	const content = await loadMarkdown(props);
+	const pmCmd = packageManager().run;
+	const todo = `
+## PostgreSQL
+
+${props.meta.BATI.has("docker") ? "The Docker setup provisions a PostgreSQL server for you via `docker-compose.yml`." : "Bati only installs the `postgres` client — **bring your own PostgreSQL server** (a local install, a managed instance, or e.g. `docker run -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres`)."}
+
+Set \`DATABASE_URL\` in \`.env\` to your connection string, then create the example table:
+\`\`\`bash
+${pmCmd} postgres:migrate # creates the \`todos\` table
+\`\`\`
+
+Queries use [postgres.js](https://github.com/porsager/postgres). See \`database/postgres/\` for the
+client, schema and example queries.
+`;
+	content.addMarkdownFeature(todo, "postgres");
+	return content;
+}
+//#endregion
+export { getTodo as default };

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

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+
+import { loadPackageJson, packageManager } from "@batijs/core";
+//#region ../../boilerplates/postgres/dist/files/$package.json.mjs
+async function getPackageJson(props) {
+	const packageJson = await loadPackageJson(props, await import("../../../../asset-package.json-D5lEjBIT.js").then((x) => x.default));
+	const bun = packageManager().name === "bun";
+	packageJson.setScript("postgres:migrate", {
+		value: `${bun ? "bun" : "tsx"} ./database/postgres/schema/all.ts`,
+		precedence: 1
+	}).addDependencies(["postgres", "dotenv"]).addDevDependencies(["tsx"], ["postgres:migrate"], !bun);
+	return packageJson;
+}
+//#endregion
+export { getPackageJson as default };

package/dist/boilerplates/@batijs/postgres/files/asset-package.json.mjs

@@ -0,0 +1,39 @@
+//#region package.json
+var package_default = {
+	name: "@batijs/postgres",
+	"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:*",
+		"@batijs/core": "workspace:*",
+		"@types/node": "^20.19.37",
+		"dotenv": "^17.4.2",
+		"postgres": "^3.4.7",
+		"tsx": "^4.22.3"
+	},
+	files: ["dist/"],
+	exports: {
+		"./database/postgres/db": { "types": "./dist/types/database/postgres/db.d.mts" },
+		"./database/postgres/queries/todos": { "types": "./dist/types/database/postgres/queries/todos.d.mts" },
+		"./database/postgres/schema/all": { "types": "./dist/types/database/postgres/schema/all.d.mts" },
+		"./database/postgres/schema/todos": { "types": "./dist/types/database/postgres/schema/todos.d.mts" }
+	},
+	typesVersions: { "*": {
+		"database/postgres/db": ["./dist/types/database/postgres/db.d.mts"],
+		"database/postgres/queries/todos": ["./dist/types/database/postgres/queries/todos.d.mts"],
+		"database/postgres/schema/all": ["./dist/types/database/postgres/schema/all.d.mts"],
+		"database/postgres/schema/todos": ["./dist/types/database/postgres/schema/todos.d.mts"]
+	} },
+	nx: { "tags": ["type:boilerplate"] }
+};
+//#endregion
+export { package_default as default };

package/dist/boilerplates/@batijs/postgres/files/database/postgres/db.ts

@@ -0,0 +1,15 @@
+/*# BATI include-if-imported #*/
+import postgres from "postgres";
+
+let singleton: postgres.Sql | undefined;
+
+export function db(): postgres.Sql {
+  if (!singleton) {
+    if (!process.env.DATABASE_URL) {
+      throw new Error("Missing DATABASE_URL in .env file");
+    }
+
+    singleton = postgres(process.env.DATABASE_URL);
+  }
+  return singleton;
+}

package/dist/boilerplates/@batijs/postgres/files/database/postgres/queries/todos.ts

@@ -0,0 +1,9 @@
+import type postgres from "postgres";
+
+export function insertTodo(sql: postgres.Sql, text: string) {
+  return sql`INSERT INTO todos (text) VALUES (${text})`;
+}
+
+export function getAllTodos(sql: postgres.Sql) {
+  return sql<{ id: number; text: string }[]>`SELECT id, text FROM todos ORDER BY id`;
+}

package/dist/boilerplates/@batijs/postgres/files/database/postgres/schema/all.ts

@@ -0,0 +1 @@
+import "./todos";

package/dist/boilerplates/@batijs/postgres/files/database/postgres/schema/todos.ts

@@ -0,0 +1,16 @@
+/*# BATI include-if-imported #*/
+import "dotenv/config";
+import { db } from "../db";
+
+const sql = db();
+
+/**
+ * PostgreSQL Schema
+ * `todos` example
+ */
+await sql`CREATE TABLE IF NOT EXISTS todos (
+    id SERIAL PRIMARY KEY,
+    text TEXT NOT NULL
+)`;
+
+await sql.end();

package/dist/boilerplates/@batijs/postgres/types/database/postgres/db.d.mts

@@ -0,0 +1,6 @@
+import postgres from "postgres";
+
+//#region files/database/postgres/db.d.ts
+declare function db(): postgres.Sql;
+//#endregion
+export { db };

package/dist/boilerplates/@batijs/postgres/types/database/postgres/queries/todos.d.mts

@@ -0,0 +1,10 @@
+import postgres from "postgres";
+
+//#region files/database/postgres/queries/todos.d.ts
+declare function insertTodo(sql: postgres.Sql, text: string): postgres.PendingQuery<postgres.Row[]>;
+declare function getAllTodos(sql: postgres.Sql): postgres.PendingQuery<{
+  id: number;
+  text: string;
+}[]>;
+//#endregion
+export { getAllTodos, insertTodo };

package/dist/boilerplates/@batijs/postgres/types/database/postgres/schema/all.d.mts

@@ -0,0 +1 @@
+export { };

package/dist/boilerplates/@batijs/postgres/types/database/postgres/schema/todos.d.mts

@@ -0,0 +1 @@
+export { };

package/dist/boilerplates/@batijs/prisma/bati.config.mjs

@@ -11,25 +11,19 @@ var bati_config_default = t({
 	if(meta) {
 		return meta.BATI.has("prisma");
 	},
-	env: () => [{
+	env: (meta) => [{
 		key: "DATABASE_URL",
 		scope: "server-default",
-		default: "postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public",
-		comment: `Prisma
-
-Environment variables declared in this file are automatically made available to Prisma.
-See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
-
-Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
-See the documentation for all the connection string options: https://pris.ly/d/connection-strings`
+		default: meta.BATI.has("postgres") ? "postgresql://johndoe:randompassword@localhost:5432/mydb?schema=public" : "file:./dev.db",
+		comment: `Prisma connection string — see https://pris.ly/d/connection-strings`
 	}],
-	nextSteps(_meta, packageManager) {
+	nextSteps(meta, packageManager) {
 		return [{
 			type: "command",
-			step: `${packageManager} prisma init --db`
+			step: `${packageManager} prisma init --datasource-provider ${meta.BATI.has("postgres") ? "postgresql" : "sqlite"}`
 		}, {
 			type: "text",
-			step: `Then follow instructions at https://www.prisma.io/docs/getting-started/prisma-orm/quickstart/prisma-postgres`
+			step: `Then define your models and run ${packageManager} prisma migrate dev — https://www.prisma.io/docs/getting-started`
 		}];
 	},
 	knip: { ignoreDependencies: ["@prisma/client", "prisma"] }

package/dist/boilerplates/@batijs/prisma/files/$TODO.md.js

@@ -4,15 +4,16 @@ import { loadMarkdown, packageManager } from "@batijs/core";
 //#region ../../boilerplates/prisma/dist/files/$TODO.md.mjs
 async function getTodo(props) {
 	const content = await loadMarkdown(props);
+	const pmCmd = packageManager().run;
 	const todo = `
 ## Prisma
 
-Run the following command once:
+Scaffold your Prisma schema (uses the \`DATABASE_URL\` already set in \`.env\`):
 \`\`\`sh
-${packageManager().run} prisma init --db
+${pmCmd} prisma init --datasource-provider ${props.meta.BATI.has("postgres") ? "postgresql" : "sqlite"}
 \`\`\`
 
-then follow instructions at <https://www.prisma.io/docs/getting-started/prisma-orm/quickstart/prisma-postgres#4-initialize-prisma-orm-and-create-a-prisma-postgres-database>`;
+Then define your models and run \`${pmCmd} prisma migrate dev\`. See <https://www.prisma.io/docs/getting-started>`;
 	content.addMarkdownFeature(todo, "prisma");
 	return content;
 }

package/dist/boilerplates/@batijs/shared-db/bati.config.mjs

@@ -9,19 +9,33 @@ function t(t) {
 //#region bati.config.ts
 var bati_config_default = t({
 	if(meta) {
-		return meta.BATI.hasDatabase;
+		return meta.BATI.hasDbDemo;
 	},
-	env: (meta) => meta.BATI.hasD1 ? [] : [{
-		key: "DATABASE_URL",
-		scope: "server-default",
-		comment: "Path to the database",
-		default: "sqlite.db",
-		perSink: {
-			compose: "/app/data/db.sqlite",
-			dockerfile: "/app/database/sqlite.db"
-		},
-		group: "non-D1 database"
-	}]
+	env: (meta) => {
+		if (meta.BATI.hasD1) return [];
+		if (meta.BATI.has("postgres")) return [{
+			key: "DATABASE_URL",
+			scope: "server-default",
+			comment: "PostgreSQL connection string",
+			default: "postgresql://postgres:postgres@localhost:5432/app",
+			perSink: {
+				compose: "postgresql://postgres:postgres@postgres:5432/app",
+				dockerfile: "postgresql://postgres:postgres@postgres:5432/app"
+			},
+			group: "postgres database"
+		}];
+		return [{
+			key: "DATABASE_URL",
+			scope: "server-default",
+			comment: "Path to the database",
+			default: "sqlite.db",
+			perSink: {
+				compose: "/app/data/db.sqlite",
+				dockerfile: "/app/database/sqlite.db"
+			},
+			group: "non-D1 database"
+		}];
+	}
 });
 //#endregion
 export { bati_config_default as default };

package/dist/boilerplates/@batijs/shared-db/files/server/db-middleware.ts

@@ -1,8 +1,9 @@
 /*# BATI include-if-imported #*/
 
 import { getDbFromRuntime } from "@batijs/d1/database/d1/helpers";
-import { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
-import { dbKysely, dbKyselyD1 } from "@batijs/kysely/database/kysely/db";
+import { dbD1, dbPostgres, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
+import { dbKysely, dbKyselyD1, dbKyselyPostgres } from "@batijs/kysely/database/kysely/db";
+import { db as pgDb } from "@batijs/postgres/database/postgres/db";
 import { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
 import { enhance, type UniversalMiddleware } from "@universal-middleware/core";
 
@@ -11,12 +12,15 @@ declare global {
   namespace Universal {
     interface Context {
       db: BATI.If<{
-        'BATI.has("sqlite") && !BATI.hasD1': ReturnType<typeof sqliteDb>;
+        'BATI.has("drizzle") && BATI.has("postgres")': ReturnType<typeof dbPostgres>;
+        'BATI.has("kysely") && BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
+        'BATI.has("postgres") && !BATI.hasOrm': ReturnType<typeof pgDb>;
+        'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': ReturnType<typeof sqliteDb>;
         'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
         'BATI.has("drizzle")': ReturnType<typeof dbD1>;
         'BATI.has("kysely") && !BATI.hasD1': ReturnType<typeof dbKysely>;
         'BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
-        "BATI.hasD1": D1Database;
+        "BATI.hasD1 && !BATI.hasOrm": D1Database;
       }>;
     }
   }
@@ -30,17 +34,23 @@ export const dbMiddleware: UniversalMiddleware = enhance(
   // The context we add here is automatically merged into pageContext
   async (_request, context, _runtime) => {
     const db =
-      BATI.has("sqlite") && !BATI.hasD1
-        ? sqliteDb()
-        : BATI.has("drizzle") && !BATI.hasD1
-          ? dbSqlite()
-          : BATI.has("kysely") && !BATI.hasD1
-            ? dbKysely()
-            : BATI.has("kysely")
-              ? dbKyselyD1(await getDbFromRuntime(_runtime))
-              : BATI.has("drizzle")
-                ? dbD1(await getDbFromRuntime(_runtime))
-                : await getDbFromRuntime(_runtime);
+      BATI.has("drizzle") && BATI.has("postgres")
+        ? dbPostgres()
+        : BATI.has("kysely") && BATI.has("postgres")
+          ? dbKyselyPostgres()
+          : BATI.has("postgres") && !BATI.hasOrm
+            ? pgDb()
+            : BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm
+              ? sqliteDb()
+              : BATI.has("drizzle") && !BATI.hasD1
+                ? dbSqlite()
+                : BATI.has("kysely") && !BATI.hasD1
+                  ? dbKysely()
+                  : BATI.has("kysely")
+                    ? dbKyselyD1(await getDbFromRuntime(_runtime))
+                    : BATI.has("drizzle")
+                      ? dbD1(await getDbFromRuntime(_runtime))
+                      : await getDbFromRuntime(_runtime);
 
     return {
       ...context,

package/dist/boilerplates/@batijs/shared-db/types/server/db-middleware.d.mts

@@ -1,6 +1,7 @@
-import { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
-import { dbKysely, dbKyselyD1 } from "@batijs/kysely/database/kysely/db";
-import { db } from "@batijs/sqlite/database/sqlite/db";
+import { dbD1, dbPostgres, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
+import { dbKysely, dbKyselyD1, dbKyselyPostgres } from "@batijs/kysely/database/kysely/db";
+import { db } from "@batijs/postgres/database/postgres/db";
+import { db as db$1 } from "@batijs/sqlite/database/sqlite/db";
 import { UniversalMiddleware } from "@universal-middleware/core";
 
 //#region files/server/db-middleware.d.ts
@@ -8,12 +9,15 @@ declare global {
   namespace Universal {
     interface Context {
       db: BATI.If<{
-        'BATI.has("sqlite") && !BATI.hasD1': ReturnType<typeof db>;
+        'BATI.has("drizzle") && BATI.has("postgres")': ReturnType<typeof dbPostgres>;
+        'BATI.has("kysely") && BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
+        'BATI.has("postgres") && !BATI.hasOrm': ReturnType<typeof db>;
+        'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': ReturnType<typeof db$1>;
         'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
         'BATI.has("drizzle")': ReturnType<typeof dbD1>;
         'BATI.has("kysely") && !BATI.hasD1': ReturnType<typeof dbKysely>;
         'BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
-        "BATI.hasD1": D1Database;
+        "BATI.hasD1 && !BATI.hasOrm": D1Database;
       }>;
     }
   }

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

@@ -3,7 +3,7 @@
 import { loadPackageJson } from "@batijs/core";
 //#region ../../boilerplates/shared-server/dist/files/$package.json.mjs
 async function getPackageJson(props) {
-	return (await loadPackageJson(props, await import("../../../../asset-package.json-CJq8QmFk.js").then((x) => x.default))).addDependencies(["@universal-middleware/core"]);
+	return (await loadPackageJson(props, await import("../../../../asset-package.json-CXa26JLJ.js").then((x) => x.default))).addDependencies(["@universal-middleware/core"]);
 }
 //#endregion
 export { getPackageJson as default };

package/dist/boilerplates/@batijs/shared-server/files/asset-package.json.mjs

@@ -19,6 +19,7 @@ var package_default = {
 		"@batijs/d1-sqlite": "workspace:*",
 		"@batijs/drizzle": "workspace:*",
 		"@batijs/kysely": "workspace:*",
+		"@batijs/postgres": "workspace:*",
 		"@batijs/sqlite": "workspace:*",
 		"@types/node": "^20.19.37",
 		"@universal-middleware/core": "^0.4.17",

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

@@ -1,10 +1,12 @@
 /*# BATI include-if-imported #*/
 
 import * as d1Queries from "@batijs/d1-sqlite/database/d1/queries/todos";
-import type { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
+import type { dbD1, dbPostgres, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
 import * as drizzleQueries from "@batijs/drizzle/database/drizzle/queries/todos";
-import type { dbKysely, dbKyselyD1 } from "@batijs/kysely/database/kysely/db";
+import type { dbKysely, dbKyselyD1, dbKyselyPostgres } from "@batijs/kysely/database/kysely/db";
 import * as kyselyQueries from "@batijs/kysely/database/kysely/queries/todos";
+import type { db as pgDb } from "@batijs/postgres/database/postgres/db";
+import * as pgQueries from "@batijs/postgres/database/postgres/queries/todos";
 import type { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
 import * as sqliteQueries from "@batijs/sqlite/database/sqlite/queries/todos";
 import { enhance, type UniversalHandler } from "@universal-middleware/core";
@@ -13,12 +15,15 @@ import { enhance, type UniversalHandler } from "@universal-middleware/core";
 export const createTodoHandler: UniversalHandler<
   Universal.Context &
     BATI.If<{
-      'BATI.has("sqlite") && !BATI.hasD1': { db: ReturnType<typeof sqliteDb> };
+      'BATI.has("drizzle") && BATI.has("postgres")': { db: ReturnType<typeof dbPostgres> };
+      'BATI.has("kysely") && BATI.has("postgres")': { db: ReturnType<typeof dbKyselyPostgres> };
+      'BATI.has("postgres") && !BATI.hasOrm': { db: ReturnType<typeof pgDb> };
+      'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': { db: ReturnType<typeof sqliteDb> };
       'BATI.has("drizzle") && !BATI.hasD1': { db: ReturnType<typeof dbSqlite> };
       'BATI.has("drizzle")': { db: ReturnType<typeof dbD1> };
       'BATI.has("kysely") && !BATI.hasD1': { db: ReturnType<typeof dbKysely> };
       'BATI.has("kysely")': { db: ReturnType<typeof dbKyselyD1> };
-      "BATI.hasD1": { db: D1Database };
+      "BATI.hasD1 && !BATI.hasOrm": { db: D1Database };
       _: object;
     }>
 > = enhance(
@@ -28,12 +33,14 @@ export const createTodoHandler: UniversalHandler<
 
     if (BATI.has("drizzle")) {
       await drizzleQueries.insertTodo(_context.db, newTodo.text);
-    } else if (BATI.has("sqlite") && !BATI.hasD1) {
+    } else if (BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm) {
       sqliteQueries.insertTodo(_context.db, newTodo.text);
     } else if (BATI.has("kysely")) {
       await kyselyQueries.insertTodo(_context.db, newTodo.text);
-    } else if (BATI.hasD1) {
+    } else if (BATI.hasD1 && !BATI.hasOrm) {
       await d1Queries.insertTodo(_context.db, newTodo.text);
+    } else if (BATI.has("postgres") && !BATI.hasOrm) {
+      await pgQueries.insertTodo(_context.db, newTodo.text);
     } else {
       // This is where you'd persist the data
       console.log("Received new todo", newTodo);

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

@@ -1,13 +1,23 @@
-import { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
-import { dbKysely, dbKyselyD1 } from "@batijs/kysely/database/kysely/db";
-import { db } from "@batijs/sqlite/database/sqlite/db";
+import { dbD1, dbPostgres, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
+import { dbKysely, dbKyselyD1, dbKyselyPostgres } from "@batijs/kysely/database/kysely/db";
+import { db } from "@batijs/postgres/database/postgres/db";
+import { db as db$1 } from "@batijs/sqlite/database/sqlite/db";
 import { UniversalHandler } from "@universal-middleware/core";
 
 //#region files/server/create-todo-handler.d.ts
 declare const createTodoHandler: UniversalHandler<Universal.Context & BATI.If<{
-  'BATI.has("sqlite") && !BATI.hasD1': {
+  'BATI.has("drizzle") && BATI.has("postgres")': {
+    db: ReturnType<typeof dbPostgres>;
+  };
+  'BATI.has("kysely") && BATI.has("postgres")': {
+    db: ReturnType<typeof dbKyselyPostgres>;
+  };
+  'BATI.has("postgres") && !BATI.hasOrm': {
     db: ReturnType<typeof db>;
   };
+  'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': {
+    db: ReturnType<typeof db$1>;
+  };
   'BATI.has("drizzle") && !BATI.hasD1': {
     db: ReturnType<typeof dbSqlite>;
   };
@@ -20,7 +30,7 @@ declare const createTodoHandler: UniversalHandler<Universal.Context & BATI.If<{
   'BATI.has("kysely")': {
     db: ReturnType<typeof dbKyselyD1>;
   };
-  "BATI.hasD1": {
+  "BATI.hasD1 && !BATI.hasOrm": {
     db: D1Database;
   };
   _: object;

package/dist/boilerplates/@batijs/shared-todo/files/global.d.ts

@@ -1,18 +1,22 @@
-import type { dbD1, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
-import type { dbKysely, dbKyselyD1 } from "@batijs/kysely/database/kysely/db";
+import type { dbD1, dbPostgres, dbSqlite } from "@batijs/drizzle/database/drizzle/db";
+import type { dbKysely, dbKyselyD1, dbKyselyPostgres } from "@batijs/kysely/database/kysely/db";
+import type { db as pgDb } from "@batijs/postgres/database/postgres/db";
 import type { db as sqliteDb } from "@batijs/sqlite/database/sqlite/db";
 
-//# BATI.hasDatabase
+//# BATI.hasDbDemo
 declare global {
   namespace Vike {
     interface PageContextServer {
       db: BATI.If<{
-        'BATI.has("sqlite") && !BATI.hasD1': ReturnType<typeof sqliteDb>;
+        'BATI.has("drizzle") && BATI.has("postgres")': ReturnType<typeof dbPostgres>;
+        'BATI.has("kysely") && BATI.has("postgres")': ReturnType<typeof dbKyselyPostgres>;
+        'BATI.has("postgres") && !BATI.hasOrm': ReturnType<typeof pgDb>;
+        'BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm': ReturnType<typeof sqliteDb>;
         'BATI.has("drizzle") && !BATI.hasD1': ReturnType<typeof dbSqlite>;
         'BATI.has("drizzle")': ReturnType<typeof dbD1>;
         'BATI.has("kysely") && !BATI.hasD1': ReturnType<typeof dbKysely>;
         'BATI.has("kysely")': ReturnType<typeof dbKyselyD1>;
-        "BATI.hasD1": D1Database;
+        "BATI.hasD1 && !BATI.hasOrm": D1Database;
       }>;
     }
   }

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

@@ -3,6 +3,7 @@
 import * as d1Queries from "@batijs/d1-sqlite/database/d1/queries/todos";
 import * as drizzleQueries from "@batijs/drizzle/database/drizzle/queries/todos";
 import * as kyselyQueries from "@batijs/kysely/database/kysely/queries/todos";
+import * as pgQueries from "@batijs/postgres/database/postgres/queries/todos";
 import * as sqliteQueries from "@batijs/sqlite/database/sqlite/queries/todos";
 import type { PageContextServer } from "vike/types";
 
@@ -13,7 +14,7 @@ export async function data(_pageContext: PageContextServer) {
     const todoItemsInitial = await drizzleQueries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };
-  } else if (BATI.has("sqlite") && !BATI.hasD1) {
+  } else if (BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm) {
     const todoItemsInitial = sqliteQueries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };
@@ -21,9 +22,13 @@ export async function data(_pageContext: PageContextServer) {
     const todoItemsInitial = await kyselyQueries.getAllTodos(_pageContext.db);
 
     return { todoItemsInitial };
-  } else if (BATI.hasD1) {
+  } else if (BATI.hasD1 && !BATI.hasOrm) {
     const todoItemsInitial = await d1Queries.getAllTodos(_pageContext.db);
 
+    return { todoItemsInitial };
+  } else if (BATI.has("postgres") && !BATI.hasOrm) {
+    const todoItemsInitial = await pgQueries.getAllTodos(_pageContext.db);
+
     return { todoItemsInitial };
   } else {
     // NOTE: This +data hook is only for demonstration — it doesn't actually retrieve data from a database.

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

@@ -3,9 +3,7 @@ import { PageContextServer } from "vike/types";
 //#region files/pages/todo/+data.d.ts
 type Data = Awaited<ReturnType<typeof data>>;
 declare function data(_pageContext: PageContextServer): Promise<{
-  todoItemsInitial: {
-    text: string;
-  }[];
+  todoItemsInitial: any;
 }>;
 //#endregion
 export { Data, data };

package/dist/boilerplates/@batijs/sqlite/bati.config.mjs

@@ -9,7 +9,7 @@ function t(t) {
 //#region bati.config.ts
 var bati_config_default = t({
 	if(meta) {
-		return meta.BATI.has("sqlite") && !meta.BATI.has("cloudflare");
+		return meta.BATI.has("sqlite") && !meta.BATI.hasOrm && !meta.BATI.has("cloudflare");
 	},
 	nextSteps(_meta, packageManager) {
 		return [{

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

@@ -3,7 +3,7 @@
 import { loadPackageJson } from "@batijs/core";
 //#region ../../boilerplates/telefunc/dist/files/$package.json.mjs
 async function getPackageJson(props) {
-	return (await loadPackageJson(props, await import("../../../../asset-package.json-BgXWfTnb.js").then((x) => x.default))).addDependencies(["telefunc", "@universal-middleware/core"]);
+	return (await loadPackageJson(props, await import("../../../../asset-package.json-CBsEdGlU.js").then((x) => x.default))).addDependencies(["telefunc", "@universal-middleware/core"]);
 }
 //#endregion
 export { getPackageJson as default };