create-absolutejs 0.4.2 → 0.5.0

package/dist/generators/project/generateImportsBlock.js

@@ -1,5 +1,6 @@
 import { mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
+import { isDrizzleDialect } from '../../typeGuards';
 export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authProvider, databaseEngine, databaseHost, frontendDirectories }) => {
     const rawImports = [];
     const pushHandler = (cond, name) => cond &&
@@ -51,44 +52,112 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
     const isRemoteHost = databaseHost !== undefined && databaseHost !== 'none';
     const hasDatabase = databaseEngine !== undefined && databaseEngine !== 'none';
     const noOrm = orm === undefined || orm === 'none';
-    if (orm === 'drizzle' && isRemoteHost) {
-        const key = databaseHost;
-        rawImports.push(...connectorImports[key], ...dialectImports[key]);
-    }
-    if (orm === 'drizzle' && !isRemoteHost && databaseEngine === 'postgresql')
-        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')
-        rawImports.push(...(databaseHost === 'turso'
+    const ormImports = {
+        drizzle: [
+            `import { Elysia } from 'elysia'`,
+            ...(databaseEngine === 'sqlite' && !isRemoteHost
+                ? []
+                : [`import { getEnv } from '@absolutejs/absolute'`]),
+            ...(authProvider === 'absoluteAuth'
+                ? [
+                    `import { schema } from '../../db/schema'`,
+                    `import { User } from '../types/databaseTypes'`
+                ]
+                : [`import { schema } from '../../db/schema'`])
+        ]
+    };
+    const ormDatabaseImports = {
+        drizzle: {
+            gel: [
+                `import { createClient } from 'gel'`,
+                `import { drizzle } from 'drizzle-orm/gel'`
+            ],
+            mariadb: [
+                `import { drizzle } from 'drizzle-orm/mysql2'`,
+                `import { createPool } from 'mysql2/promise'`
+            ],
+            mysql: !isRemoteHost
+                ? [
+                    `import { drizzle } from 'drizzle-orm/mysql2'`,
+                    `import { createPool } from 'mysql2/promise'`
+                ]
+                : [],
+            postgresql: !isRemoteHost
+                ? [
+                    `import { SQL } from 'bun'`,
+                    `import { drizzle } from 'drizzle-orm/bun-sql'`
+                ]
+                : [],
+            singlestore: [
+                `import { drizzle } from 'drizzle-orm/singlestore'`,
+                `import { createPool } from 'mysql2/promise'`
+            ],
+            sqlite: !isRemoteHost
+                ? [
+                    `import { Database } from 'bun:sqlite'`,
+                    `import { drizzle } from 'drizzle-orm/bun-sqlite'`
+                ]
+                : []
+        }
+    };
+    const noOrmImports = {
+        cockroachdb: [
+            `import { SQL } from 'bun'`,
+            `import { getEnv } from '@absolutejs/absolute'`
+        ],
+        gel: [
+            `import { createClient } from 'gel'`,
+            `import { getEnv } from '@absolutejs/absolute'`
+        ],
+        mariadb: [
+            `import { SQL } from 'bun'`,
+            `import { getEnv } from '@absolutejs/absolute'`
+        ],
+        mongodb: [],
+        mssql: [
+            `import { connect } from 'mssql'`,
+            `import { getEnv } from '@absolutejs/absolute'`
+        ],
+        mysql: isRemoteHost
             ? [
-                `import { createClient } from '@libsql/client'`,
+                ...connectorImports[databaseHost],
                 `import { getEnv } from '@absolutejs/absolute'`
             ]
-            : [`import { Database } from 'bun:sqlite'`]));
-    if (databaseEngine === 'mysql' && isRemoteHost) {
-        const key = databaseHost;
-        rawImports.push(...connectorImports[key]);
-    }
-    if (databaseEngine === 'mysql' && !isRemoteHost) {
-        rawImports.push(`import { createPool } from 'mysql2/promise'`);
+            : [
+                `import { SQL } from 'bun'`,
+                `import { getEnv } from '@absolutejs/absolute'`
+            ],
+        postgresql: isRemoteHost
+            ? [
+                ...connectorImports[databaseHost],
+                `import { getEnv } from '@absolutejs/absolute'`
+            ]
+            : [
+                `import { SQL } from 'bun'`,
+                `import { getEnv } from '@absolutejs/absolute'`
+            ],
+        singlestore: [
+            `import { createPool } from 'mysql2/promise'`,
+            `import { getEnv } from '@absolutejs/absolute'`
+        ],
+        sqlite: isRemoteHost
+            ? [
+                ...connectorImports[databaseHost],
+                `import { getEnv } from '@absolutejs/absolute'`
+            ]
+            : [`import { Database } from 'bun:sqlite'`]
+    };
+    if (orm === 'drizzle') {
+        rawImports.push(...ormImports[orm]);
     }
-    if (databaseEngine === 'mysql' && orm === 'drizzle') {
-        rawImports.push(`import { drizzle } from 'drizzle-orm/mysql2'`);
+    if (orm === 'drizzle' && isRemoteHost) {
+        rawImports.push(...connectorImports[databaseHost], ...dialectImports[databaseHost]);
     }
-    if (databaseEngine === 'mysql') {
-        rawImports.push(`import { getEnv } from '@absolutejs/absolute'`);
+    if (orm === 'drizzle' && isDrizzleDialect(databaseEngine)) {
+        rawImports.push(...ormDatabaseImports[orm][databaseEngine]);
     }
-    if (noOrm && databaseEngine === 'postgresql')
-        rawImports.push(...(isRemoteHost
-            ? connectorImports[databaseHost]
-            : [`import { Pool } from 'pg'`]), `import { getEnv } from '@absolutejs/absolute'`);
-    if (orm === 'drizzle') {
-        rawImports.push(`import { Elysia } from 'elysia'`, ...(databaseEngine === 'sqlite' && !isRemoteHost
-            ? []
-            : [`import { getEnv } from '@absolutejs/absolute'`]), authProvider === 'absoluteAuth'
-            ? `import { schema, User } from '../../db/schema'`
-            : `import { schema } from '../../db/schema'`);
+    if (noOrm && hasDatabase && noOrmImports[databaseEngine]) {
+        rawImports.push(...noOrmImports[databaseEngine]);
     }
     if (authProvider === 'absoluteAuth')
         rawImports.push(`import { absoluteAuth, instantiateUserSession } from '@absolutejs/auth'`, ...(hasDatabase

package/dist/generators/project/generateUseBlock.js

@@ -12,7 +12,11 @@ export const generateUseBlock = ({ deps, databaseEngine, orm }) => deps
         const instantiate = 'instantiateUserSession';
         const pluginGeneric = hasOrm ? '<User>' : '';
         const callback = hasDatabase
-            ? `async ({ authProvider, providerInstance, tokenResponse, userSessionId, session }) => ${instantiate}({ authProvider, providerInstance, session, tokenResponse, userSessionId, createUser: (userIdentity) => createUser({ authProvider, db, userIdentity }), getUser: (userIdentity) => getUser({ authProvider, db, userIdentity }) })`
+            ? `async ({ authProvider, providerInstance, tokenResponse, unregisteredSession, cookie: { user_session_id }, session }) => ${instantiate}(
+						{ authProvider, providerInstance, session, tokenResponse, unregisteredSession, user_session_id, 
+						 	getUser: async (userIdentity) => getUser({ authProvider, db, userIdentity }),
+							onNewUser: async (userIdentity) => createUser({ authProvider, db, userIdentity })
+						})`
             : `({ authProvider, tokenResponse, userSessionId }) => { console.log(\`Successfully authorized OAuth2 with \${authProvider} (session: \${userSessionId})\`, tokenResponse); }`;
         const mergedConfig = `{ ${baseConfigString}${baseConfigString ? ',' : ''} onCallbackSuccess: ${callback} }`;
         return `.use(absoluteAuth${pluginGeneric}(${mergedConfig}))`;

package/dist/questions/databaseEngine.d.ts

@@ -1 +1 @@
-export declare const getDatabaseEngine: () => Promise<"gel" | "mysql" | "postgresql" | "sqlite" | "singlestore" | "mongodb" | "mariadb" | "cockroachdb" | "mssql" | undefined>;
+export declare const getDatabaseEngine: () => Promise<"gel" | "mysql" | "postgresql" | "sqlite" | "singlestore" | "mariadb" | "mongodb" | "cockroachdb" | "mssql" | undefined>;

package/dist/scaffold.js

@@ -13,7 +13,7 @@ import { scaffoldFrontends } from './generators/project/scaffoldFrontends';
 export const scaffold = async ({ response: { projectName, codeQualityTool, initializeGitNow, databaseEngine, databaseHost, useHTMLScripts, useTailwind, databaseDirectory, orm, frontends, plugins, authProvider, buildDirectory, assetsDirectory, tailwind, installDependenciesNow, frontendDirectories }, latest, envVariables, packageManager }) => {
     const __dirname = dirname(fileURLToPath(import.meta.url));
     const templatesDirectory = join(__dirname, '/templates');
-    const { frontendDirectory, backendDirectory, projectAssetsDirectory } = initalizeRoot(projectName, templatesDirectory);
+    const { frontendDirectory, backendDirectory, projectAssetsDirectory, typesDirectory } = initalizeRoot(projectName, templatesDirectory);
     copyFileSync(join(templatesDirectory, 'README.md'), join(projectName, 'README.md'));
     scaffoldConfigurationFiles({
         codeQualityTool,
@@ -60,7 +60,8 @@ export const scaffold = async ({ response: { projectName, codeQualityTool, initi
             databaseEngine,
             databaseHost,
             orm,
-            projectName
+            projectName,
+            typesDirectory
         })));
     scaffoldFrontends({
         frontendDirectories,

package/package.json

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