create-absolutejs 0.3.21 → 0.4.0

package/dist/generators/db/handlerTemplates.d.ts

@@ -46,13 +46,13 @@ declare const driverConfigurations: {
         readonly queries: QueryOperations;
     };
     readonly 'postgresql:drizzle:local': {
-        readonly dbType: "BunSQLDatabase<SchemaType>";
+        readonly dbType: "NodePgDatabase<SchemaType>";
         readonly importLines: "\nimport { eq } from 'drizzle-orm'\nimport { BunSQLDatabase } from 'drizzle-orm/bun-sql'\nimport { schema, type SchemaType } from '../../../db/schema'";
         readonly queries: QueryOperations;
     };
     readonly 'postgresql:drizzle:neon': {
-        readonly dbType: "NeonHttpDatabase<SchemaType>";
-        readonly importLines: "\nimport { eq } from 'drizzle-orm'\nimport { NeonHttpDatabase } from 'drizzle-orm/neon-http'\nimport { schema, type SchemaType } from '../../../db/schema'";
+        readonly dbType: "NeonDatabase<SchemaType>";
+        readonly importLines: "\nimport { eq } from 'drizzle-orm'\nimport { NeonDatabase } from 'drizzle-orm/neon-serverless'\nimport { schema, type SchemaType } from '../../../db/schema'";
         readonly queries: QueryOperations;
     };
     readonly 'postgresql:sql:local': {

package/dist/generators/db/handlerTemplates.js

@@ -309,7 +309,7 @@ import { schema, type SchemaType } from '../../../db/schema'`,
         queries: mysqlSqlQueryOperations
     },
     'postgresql:drizzle:local': {
-        dbType: 'BunSQLDatabase<SchemaType>',
+        dbType: 'NodePgDatabase<SchemaType>',
         importLines: `
 import { eq } from 'drizzle-orm'
 import { BunSQLDatabase } from 'drizzle-orm/bun-sql'
@@ -317,10 +317,10 @@ import { schema, type SchemaType } from '../../../db/schema'`,
         queries: drizzleQueryOperations
     },
     'postgresql:drizzle:neon': {
-        dbType: 'NeonHttpDatabase<SchemaType>',
+        dbType: 'NeonDatabase<SchemaType>',
         importLines: `
 import { eq } from 'drizzle-orm'
-import { NeonHttpDatabase } from 'drizzle-orm/neon-http'
+import { NeonDatabase } from 'drizzle-orm/neon-serverless'
 import { schema, type SchemaType } from '../../../db/schema'`,
         queries: drizzleQueryOperations
     },

package/dist/generators/project/generateDBBlock.js

@@ -1,7 +1,7 @@
 import { availableDrizzleDialects } from '../../data';
 const connectionMap = {
     cockroachdb: {
-        none: { connect: true, expr: 'new SQL(getEnv("DATABASE_URL"))' }
+        none: { expr: 'new Pool({ connectionString: getEnv("DATABASE_URL") })' }
     },
     gel: {
         none: { expr: 'gelClient({ url: getEnv("DATABASE_URL") })' }
@@ -10,18 +10,20 @@ const connectionMap = {
         none: { expr: 'createPool(getEnv("DATABASE_URL"))' }
     },
     mongodb: {
-        none: { expr: 'new MongoClient(getEnv("DATABASE_URL"))' }
+        none: { expr: 'new MongoClient(getEnv("DATABASE_URL") })' }
     },
     mssql: {
-        none: { expr: 'connect(getEnv("DATABASE_URL"))' }
+        none: { expr: 'await connect(getEnv("DATABASE_URL"))' }
     },
     mysql: {
         none: { expr: 'createPool(getEnv("DATABASE_URL"))' },
         planetscale: { expr: 'connect({ url: getEnv("DATABASE_URL") })' }
     },
     postgresql: {
-        neon: { expr: 'neon(getEnv("DATABASE_URL"))' },
-        none: { connect: true, expr: 'new SQL(getEnv("DATABASE_URL"))' }
+        neon: {
+            expr: 'new Pool({ connectionString: getEnv("DATABASE_URL") })'
+        },
+        none: { expr: 'new Pool({ connectionString: getEnv("DATABASE_URL") })' }
     },
     singlestore: {
         none: { expr: 'createClient({ url: getEnv("DATABASE_URL") })' }
@@ -32,7 +34,7 @@ const connectionMap = {
     }
 };
 const remoteDrizzleInit = {
-    neon: 'neon(getEnv("DATABASE_URL"))',
+    neon: 'new Pool({ connectionString: getEnv("DATABASE_URL") })',
     planetscale: 'connect({ url: getEnv("DATABASE_URL") })',
     turso: 'createClient({ url: getEnv("DATABASE_URL") })'
 };
@@ -50,8 +52,8 @@ export const generateDBBlock = ({ databaseEngine, orm, databaseHost }) => {
         if (!hostCfg)
             return '';
         return `
-const db = ${hostCfg.expr}
-${hostCfg.connect ? 'await db.connect();\n' : ''}`;
+const pool = ${hostCfg.expr}
+`;
     }
     if (!drizzleDialectSet.has(databaseEngine))
         return '';
@@ -61,12 +63,18 @@ ${hostCfg.connect ? 'await db.connect();\n' : ''}`;
     if (databaseEngine === 'mysql') {
         const mode = databaseHost === 'planetscale' ? 'planetscale' : 'default';
         return `
-const sql = ${expr}
-const db = drizzle(sql, { schema, mode: '${mode}' })
+const pool = ${expr}
+const db = drizzle(pool, { schema, mode: '${mode}' })
+`;
+    }
+    if (databaseEngine === 'sqlite') {
+        return `
+const pool = ${expr}
+const db = drizzle(pool, { schema })
 `;
     }
     return `
-const sql = ${expr}
-const db = drizzle(sql, { schema })
+const pool = ${expr}
+const db = drizzle(pool, { schema })
 `;
 };

package/dist/generators/project/generateImportsBlock.js

@@ -37,16 +37,16 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
     if (flags.requiresVue && !flags.requiresSvelte && vueDir !== undefined)
         rawImports.push(`import VueExample from '${buildExamplePath(vueDir, 'VueExample.vue')}'`);
     const connectorImports = {
-        neon: ["import { neon } from '@neondatabase/serverless'"],
-        planetscale: ["import { connect } from '@planetscale/database'"],
-        turso: ["import { createClient } from '@libsql/client'"]
+        neon: [`import { Pool } from '@neondatabase/serverless'`],
+        planetscale: [`import { connect } from '@planetscale/database'`],
+        turso: [`import { createClient } from '@libsql/client'`]
     };
     const dialectImports = {
-        neon: ["import { drizzle } from 'drizzle-orm/neon-http'"],
+        neon: [`import { drizzle } from 'drizzle-orm/node-postgres'`],
         planetscale: [
-            "import { drizzle } from 'drizzle-orm/planetscale-serverless'"
+            `import { drizzle } from 'drizzle-orm/planetscale-serverless'`
         ],
-        turso: ["import { drizzle } from 'drizzle-orm/libsql'"]
+        turso: [`import { drizzle } from 'drizzle-orm/libsql'`]
     };
     const isRemoteHost = databaseHost !== undefined && databaseHost !== 'none';
     const hasDatabase = databaseEngine !== undefined && databaseEngine !== 'none';
@@ -56,7 +56,7 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
         rawImports.push(...connectorImports[key], ...dialectImports[key]);
     }
     if (orm === 'drizzle' && !isRemoteHost && databaseEngine === 'postgresql')
-        rawImports.push(`import { SQL } from 'bun'`, `import { drizzle } from 'drizzle-orm/bun-sql'`);
+        rawImports.push(`import { Pool } from 'pg'`, `import { drizzle } from 'drizzle-orm/node-postgres'`);
     if (orm === 'drizzle' && databaseEngine === 'sqlite' && !isRemoteHost)
         rawImports.push(`import { Database } from 'bun:sqlite'`, `import { drizzle } from 'drizzle-orm/bun-sqlite'`);
     if (noOrm && databaseEngine === 'sqlite')
@@ -67,21 +67,22 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
             ]
             : [`import { Database } from 'bun:sqlite'`]));
     if (databaseEngine === 'mysql' && isRemoteHost) {
-        rawImports.push(...connectorImports[databaseHost]);
+        const key = databaseHost;
+        rawImports.push(...connectorImports[key]);
     }
     if (databaseEngine === 'mysql' && !isRemoteHost) {
-        rawImports.push("import { createPool } from 'mysql2/promise'");
+        rawImports.push(`import { createPool } from 'mysql2/promise'`);
     }
     if (databaseEngine === 'mysql' && orm === 'drizzle') {
-        rawImports.push("import { drizzle } from 'drizzle-orm/mysql2'");
+        rawImports.push(`import { drizzle } from 'drizzle-orm/mysql2'`);
     }
     if (databaseEngine === 'mysql') {
-        rawImports.push("import { getEnv } from '@absolutejs/absolute'");
+        rawImports.push(`import { getEnv } from '@absolutejs/absolute'`);
     }
     if (noOrm && databaseEngine === 'postgresql')
         rawImports.push(...(isRemoteHost
             ? connectorImports[databaseHost]
-            : [`import { SQL } from 'bun'`]), `import { getEnv } from '@absolutejs/absolute'`);
+            : [`import { Pool } from 'pg'`]), `import { getEnv } from '@absolutejs/absolute'`);
     if (orm === 'drizzle') {
         rawImports.push(`import { Elysia } from 'elysia'`, ...(databaseEngine === 'sqlite' && !isRemoteHost
             ? []

package/package.json

@@ -47,5 +47,5 @@
 		"typecheck": "bun run tsc --noEmit"
 	},
 	"type": "module",
-	"version": "0.3.21"
+	"version": "0.4.0"
 }