@batijs/cli 0.0.633 → 0.0.635

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

@@ -18,6 +18,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/telefunc/files/global.d.ts

@@ -1,19 +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 module "telefunc" {
   namespace Telefunc {
     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;
-        _: object;
+        "BATI.hasD1 && !BATI.hasOrm": D1Database;
       }>;
     }
   }

package/dist/boilerplates/@batijs/telefunc/files/pages/todo/TodoList.telefunc.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 { getContext } from "telefunc";
 
@@ -10,15 +11,18 @@ export async function onNewTodo({ text }: { text: string }) {
   if (BATI.has("drizzle")) {
     const context = getContext();
     await drizzleQueries.insertTodo(context.db, text);
-  } else if (BATI.has("sqlite") && !BATI.hasD1) {
+  } else if (BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm) {
     const context = getContext();
     sqliteQueries.insertTodo(context.db, text);
   } else if (BATI.has("kysely")) {
     const context = getContext();
     await kyselyQueries.insertTodo(context.db, text);
-  } else if (BATI.hasD1) {
+  } else if (BATI.hasD1 && !BATI.hasOrm) {
     const context = getContext();
     await d1Queries.insertTodo(context.db, text);
+  } else if (BATI.has("postgres") && !BATI.hasOrm) {
+    const context = getContext();
+    await pgQueries.insertTodo(context.db, text);
   } else {
     // NOTE: This telefunction is only for demonstration — it doesn't actually save changes to a database.
     // Go to https://vike.dev/new and select a database to scaffold an app with a persisted to-do list.

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

@@ -1,5 +1,6 @@
-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";
 import { enhance, type UniversalHandler } from "@universal-middleware/core";
 import { telefunc } from "telefunc";
@@ -11,12 +12,16 @@ export const telefuncHandler: UniversalHandler = enhance(
       request,
       context: {
         ...(context as 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;
         }>),
         ...(runtime as BATI.If<{
           "BATI.hasD1": { runtime: "workerd"; env?: { DB: D1Database } };

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

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

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

@@ -18,6 +18,7 @@ var package_default = {
 		"@batijs/d1-sqlite": "workspace:*",
 		"@batijs/drizzle": "workspace:*",
 		"@batijs/kysely": "workspace:*",
+		"@batijs/postgres": "workspace:*",
 		"@batijs/sqlite": "workspace:*",
 		"@trpc/client": "^11.17.0",
 		"@trpc/server": "^11.17.0",

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

@@ -1,8 +1,10 @@
 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 { initTRPC } from "@trpc/server";
@@ -14,12 +16,15 @@ import { initTRPC } from "@trpc/server";
 const t = initTRPC
   .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;
     }>
   >()
@@ -46,12 +51,14 @@ export const appRouter = router({
     .mutation(async (opts) => {
       if (BATI.has("drizzle")) {
         await drizzleQueries.insertTodo(opts.ctx.db, opts.input);
-      } else if (BATI.has("sqlite") && !BATI.hasD1) {
+      } else if (BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm) {
         sqliteQueries.insertTodo(opts.ctx.db, opts.input);
       } else if (BATI.has("kysely")) {
         await kyselyQueries.insertTodo(opts.ctx.db, opts.input);
-      } else if (BATI.hasD1) {
+      } else if (BATI.hasD1 && !BATI.hasOrm) {
         await d1Queries.insertTodo(opts.ctx.db, opts.input);
+      } else if (BATI.has("postgres") && !BATI.hasOrm) {
+        await pgQueries.insertTodo(opts.ctx.db, opts.input);
       } else {
         // This is where you'd persist the data
         console.log("Received new todo", { text: opts.input });

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

@@ -1,6 +1,12 @@
 //#region files/trpc/client.d.ts
 declare const trpc: import("@trpc/client").TRPCClient<import("@trpc/server").TRPCBuiltRouter<{
   ctx: object & {
+    db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbPostgres>;
+  } & {
+    db: ReturnType<typeof import("@batijs/kysely/database/kysely/db").dbKyselyPostgres>;
+  } & {
+    db: ReturnType<typeof import("@batijs/postgres/database/postgres/db").db>;
+  } & {
     db: ReturnType<typeof import("@batijs/sqlite/database/sqlite/db").db>;
   } & {
     db: ReturnType<typeof import("@batijs/drizzle/database/drizzle/db").dbSqlite>;

package/dist/boilerplates/@batijs/trpc/types/trpc/server.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";
 
 //#region files/trpc/server.d.ts
 /**
@@ -9,7 +10,13 @@ import { db } from "@batijs/sqlite/database/sqlite/db";
  */
 declare const router: import("@trpc/server").TRPCRouterBuilder<{
   ctx: object & {
+    db: ReturnType<typeof dbPostgres>;
+  } & {
+    db: ReturnType<typeof dbKyselyPostgres>;
+  } & {
     db: ReturnType<typeof db>;
+  } & {
+    db: ReturnType<typeof db$1>;
   } & {
     db: ReturnType<typeof dbSqlite>;
   } & {
@@ -26,7 +33,13 @@ declare const router: import("@trpc/server").TRPCRouterBuilder<{
   transformer: false;
 }>;
 declare const publicProcedure: import("@trpc/server").TRPCProcedureBuilder<object & {
+  db: ReturnType<typeof dbPostgres>;
+} & {
+  db: ReturnType<typeof dbKyselyPostgres>;
+} & {
   db: ReturnType<typeof db>;
+} & {
+  db: ReturnType<typeof db$1>;
 } & {
   db: ReturnType<typeof dbSqlite>;
 } & {
@@ -40,7 +53,13 @@ declare const publicProcedure: import("@trpc/server").TRPCProcedureBuilder<objec
 }, object, object, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>;
 declare const appRouter: import("@trpc/server").TRPCBuiltRouter<{
   ctx: object & {
+    db: ReturnType<typeof dbPostgres>;
+  } & {
+    db: ReturnType<typeof dbKyselyPostgres>;
+  } & {
     db: ReturnType<typeof db>;
+  } & {
+    db: ReturnType<typeof db$1>;
   } & {
     db: ReturnType<typeof dbSqlite>;
   } & {

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

@@ -3,7 +3,7 @@
 import { loadPackageJson } from "@batijs/core";
 //#region ../../boilerplates/ts-rest/dist/files/$package.json.mjs
 async function getPackageJson(props) {
-	return (await loadPackageJson(props, await import("../../../../asset-package.json-D5VQND8y.js").then((x) => x.default))).addDevDependencies(["zod"]).addDependencies([
+	return (await loadPackageJson(props, await import("../../../../asset-package2.json-Cqt3zXsB.js").then((x) => x.default))).addDevDependencies(["zod"]).addDependencies([
 		"@ts-rest/core",
 		"@ts-rest/serverless",
 		"@universal-middleware/core"

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

@@ -18,6 +18,7 @@ var package_default = {
 		"@batijs/d1-sqlite": "workspace:*",
 		"@batijs/drizzle": "workspace:*",
 		"@batijs/kysely": "workspace:*",
+		"@batijs/postgres": "workspace:*",
 		"@batijs/sqlite": "workspace:*",
 		"@ts-rest/core": "^3.52.1",
 		"@ts-rest/serverless": "^3.52.1",

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

@@ -1,9 +1,11 @@
 /** biome-ignore-all lint/suspicious/noExplicitAny: avoid platformContext type inference */
 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 { fetchRequestHandler, tsr } from "@ts-rest/serverless/fetch";
@@ -18,12 +20,15 @@ import { contract } from "../ts-rest/contract";
 const router = tsr
   .platformContext<
     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;
     }>
   >()
@@ -39,12 +44,14 @@ const router = tsr
     createTodo: async ({ body }, _ctx) => {
       if (BATI.has("drizzle")) {
         await drizzleQueries.insertTodo(_ctx.db, body.text);
-      } else if (BATI.has("sqlite") && !BATI.hasD1) {
+      } else if (BATI.has("sqlite") && !BATI.hasD1 && !BATI.hasOrm) {
         sqliteQueries.insertTodo(_ctx.db, body.text);
       } else if (BATI.has("kysely")) {
         await kyselyQueries.insertTodo(_ctx.db, body.text);
-      } else if (BATI.hasD1) {
+      } else if (BATI.hasD1 && !BATI.hasOrm) {
         await d1Queries.insertTodo(_ctx.db, body.text);
+      } else if (BATI.has("postgres") && !BATI.hasOrm) {
+        await pgQueries.insertTodo(_ctx.db, body.text);
       } else {
         // This is where you'd persist the data
         console.log("Received new todo", { text: body.text });

package/dist/boilerplates/boilerplates.json

@@ -147,6 +147,12 @@
       "files"
     ]
   },
+  {
+    "folder": "@batijs/postgres",
+    "subfolders": [
+      "files"
+    ]
+  },
   {
     "folder": "@batijs/prettier",
     "subfolders": [

package/dist/index.js

@@ -2637,7 +2637,7 @@ function kebabCase(str, joiner) {
 //#endregion
 //#region package.json
 var name = "@batijs/cli";
-var version = "0.0.633";
+var version = "0.0.635";
 var description = "Next-gen scaffolder. Get started with fully-functional apps, and choose any tool you want";
 //#endregion
 //#region rules.ts
@@ -2660,6 +2660,9 @@ const rulesMessages = {
 	[RulesMessage.ERROR_DRIZZLE_R_SERVER]: error(`A ${inverse(bold("Server"))} is required when using ${inverse(bold("Drizzle"))}`),
 	[RulesMessage.ERROR_SQLITE_R_SERVER]: error(`A ${inverse(bold("Server"))} is required when using ${inverse(bold("SQLite"))}`),
 	[RulesMessage.ERROR_KYSELY_R_SERVER]: error(`A ${inverse(bold("Server"))} is required when using ${inverse(bold("Kysely"))}`),
+	[RulesMessage.ERROR_POSTGRES_R_SERVER]: error(`A ${inverse(bold("Server"))} is required when using ${inverse(bold("PostgreSQL"))}`),
+	[RulesMessage.ERROR_POSTGRES_X_SQLITE]: error(`${inverse(bold("PostgreSQL"))} and ${inverse(bold("SQLite"))} are mutually exclusive database engines. Pick only one`),
+	[RulesMessage.ERROR_ORM_R_DATABASE]: error(`An ${inverse(bold("ORM / Query builder"))} requires a ${inverse(bold("Database"))} (SQLite or PostgreSQL)`),
 	[RulesMessage.ERROR_DATA_R_SERVER]: error(`A ${inverse(bold("Server"))} is required when using ${inverse(bold("Data fetching"))}`),
 	[RulesMessage.ERROR_CLOUDFLARE_R_COMPAT_SERVER]: error(`${inverse(bold("Cloudflare"))} is only compatible with ${inverse(bold("Hono"))} or ${inverse(bold("H3"))}.
 Choose one of them or remove selected Server`),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/cli",
-  "version": "0.0.633",
+  "version": "0.0.635",
   "type": "module",
   "scripts": {
     "check-types": "tsc --noEmit",
@@ -13,8 +13,8 @@
   "repository": "https://github.com/vikejs/bati",
   "license": "MIT",
   "devDependencies": {
-    "@batijs/build": "0.0.633",
-    "@batijs/compile": "0.0.633",
+    "@batijs/build": "0.0.635",
+    "@batijs/compile": "0.0.635",
     "@inquirer/prompts": "^8.4.3",
     "@types/node": "^20.19.37",
     "@types/which": "^3.0.4",
@@ -30,8 +30,8 @@
     "vite": "^8.0.14"
   },
   "dependencies": {
-    "@batijs/core": "0.0.633",
-    "@batijs/features": "0.0.633"
+    "@batijs/core": "0.0.635",
+    "@batijs/features": "0.0.635"
   },
   "bin": "./cli.js",
   "exports": {