create-absolutejs 0.3.8 → 0.3.10

package/dist/generators/project/generateServer.d.ts

@@ -1,7 +1,6 @@
-import type { AvailableDependency, CreateConfiguration } from '../../types';
-type CreateServerFileProps = Pick<CreateConfiguration, 'tailwind' | 'authProvider' | 'plugins' | 'buildDirectory' | 'assetsDirectory' | 'frontendDirectories'> & {
-    availablePlugins: AvailableDependency[];
+import type { CreateConfiguration } from '../../types';
+type CreateServerFileProps = Pick<CreateConfiguration, 'tailwind' | 'authProvider' | 'databaseEngine' | 'plugins' | 'buildDirectory' | 'databaseHost' | 'orm' | 'assetsDirectory' | 'frontendDirectories'> & {
     backendDirectory: string;
 };
-export declare const generateServerFile: ({ tailwind, frontendDirectories, backendDirectory, authProvider, availablePlugins, buildDirectory, assetsDirectory, plugins }: CreateServerFileProps) => void;
+export declare const generateServerFile: ({ tailwind, authProvider, plugins, buildDirectory, databaseEngine, databaseHost, orm, assetsDirectory, frontendDirectories, backendDirectory }: CreateServerFileProps) => void;
 export {};

package/dist/generators/project/generateServer.js

@@ -1,179 +1,55 @@
-import { mkdirSync, writeFileSync } from 'fs';
+import { writeFileSync, mkdirSync } from 'fs';
 import { join } from 'path';
-import { UNFOUND_INDEX } from '../../constants';
-import { absoluteAuthPlugin, defaultDependencies, defaultPlugins, scopedStatePlugin } from '../../data';
-export const generateServerFile = ({ tailwind, frontendDirectories, backendDirectory, authProvider, availablePlugins, buildDirectory, assetsDirectory, plugins }) => {
+import { collectDependencies } from './collectDependencies';
+import { computeFlags } from './computeFlags';
+import { generateBuildBlock } from './generateBuildBlock';
+import { generateDBBlock } from './generateDBBlock';
+import { generateImportsBlock } from './generateImportsBlock';
+import { generateRoutesBlock } from './generateRoutesBlock';
+import { generateUseBlock } from './generateUseBlock';
+export const generateServerFile = ({ tailwind, authProvider, plugins, buildDirectory, databaseEngine, databaseHost, orm, assetsDirectory, frontendDirectories, backendDirectory }) => {
     const serverFilePath = join(backendDirectory, 'server.ts');
-    const htmlDirectory = frontendDirectories['html'];
-    const reactDirectory = frontendDirectories['react'];
-    const svelteDirectory = frontendDirectories['svelte'];
-    const vueDirectory = frontendDirectories['vue'];
-    const htmxDirectory = frontendDirectories['htmx'];
-    const requiresHtml = htmlDirectory !== undefined;
-    const requiresReact = reactDirectory !== undefined;
-    const requiresSvelte = svelteDirectory !== undefined;
-    const requiresVue = vueDirectory !== undefined;
-    const requiresHtmx = htmxDirectory !== undefined;
-    const nonFrameworkOnly = (requiresHtml || requiresHtmx) &&
-        !requiresReact &&
-        !requiresSvelte &&
-        !requiresVue;
-    const selectedCustomPlugins = availablePlugins.filter(({ value }) => plugins.indexOf(value) !== UNFOUND_INDEX);
-    const authenticationPlugins = authProvider === 'absoluteAuth' ? [absoluteAuthPlugin] : [];
-    const htmxPlugins = requiresHtmx ? [scopedStatePlugin] : [];
-    const allDependencies = [
-        ...defaultDependencies,
-        ...defaultPlugins,
-        ...selectedCustomPlugins,
-        ...authenticationPlugins,
-        ...htmxPlugins
-    ];
-    const uniqueDependencies = Array.from(new Map(allDependencies.map((dependency) => [dependency.value, dependency])).values()).sort((a, b) => a.value.localeCompare(b.value));
-    const importLines = uniqueDependencies.flatMap(({ value, imports }) => {
-        const filteredImports = nonFrameworkOnly && imports
-            ? imports.filter(({ packageName }) => packageName !== 'asset')
-            : imports;
-        return filteredImports && filteredImports.length > 0
-            ? [
-                `import { ${filteredImports
-                    .map(({ packageName }) => packageName)
-                    .join(', ')} } from '${value}';`
-            ]
-            : [];
+    const flags = computeFlags(frontendDirectories);
+    const deps = collectDependencies({ authProvider, flags, plugins });
+    const importsBlock = generateImportsBlock({
+        authProvider,
+        backendDirectory,
+        databaseEngine,
+        databaseHost,
+        deps,
+        flags,
+        orm
     });
-    const absoluteImportIdx = importLines.findIndex((line) => line.includes("from '@absolutejs/absolute'"));
-    if (absoluteImportIdx !== UNFOUND_INDEX && importLines[absoluteImportIdx]) {
-        const existingItems = importLines[absoluteImportIdx]
-            .replace(/import\s*\{\s*|\}\s*from.*$/g, '')
-            .split(',')
-            .map((item) => item.trim())
-            .filter((value) => value.length > 0);
-        const additionalItems = [
-            requiresHtml &&
-                !existingItems.includes('handleHTMLPageRequest') &&
-                'handleHTMLPageRequest',
-            requiresReact &&
-                !existingItems.includes('handleReactPageRequest') &&
-                'handleReactPageRequest',
-            requiresSvelte &&
-                !existingItems.includes('handleSveltePageRequest') &&
-                'handleSveltePageRequest',
-            requiresVue &&
-                !existingItems.includes('handleVuePageRequest') &&
-                'handleVuePageRequest',
-            requiresVue &&
-                !existingItems.includes('generateHeadElement') &&
-                'generateHeadElement',
-            requiresHtmx &&
-                !existingItems.includes('handleHTMXPageRequest') &&
-                'handleHTMXPageRequest'
-        ].filter((value) => typeof value === 'string');
-        importLines[absoluteImportIdx] = `import { ${[
-            ...existingItems,
-            ...additionalItems
-        ].join(', ')} } from '@absolutejs/absolute';`;
-    }
-    if (reactDirectory !== undefined) {
-        const reactImportSource = reactDirectory === ''
-            ? '../frontend/pages/ReactExample'
-            : `../frontend/${reactDirectory}/pages/ReactExample`;
-        importLines.push(`import { ReactExample } from '${reactImportSource}';`);
-    }
-    if (requiresSvelte) {
-        const svelteImportSource = svelteDirectory === ''
-            ? '../frontend/pages/SvelteExample'
-            : `../frontend/${svelteDirectory}/pages/SvelteExample`;
-        importLines.push(`import SvelteExample from '${svelteImportSource}.svelte';`);
-    }
-    if (requiresVue) {
-        const vueImportSource = vueDirectory === ''
-            ? '../frontend/pages/VueExample'
-            : `../frontend/${vueDirectory}/pages/VueExample`;
-        const vueImportLine = requiresSvelte
-            ? `import { vueImports } from './utils/vueImporter';\n\nconst { VueExample } = vueImports;`
-            : `import VueExample from '${vueImportSource}.vue';`;
-        importLines.push(vueImportLine);
-    }
-    if (requiresVue && requiresSvelte) {
-        const vueImporter = `// This file is auto-generated by the AbsoluteJS project generator. 
-		// It is required to use Vue and Svelte together in the same project. 
-		// This is due to how the Vue Official plugin handles non .ts files.
-
-import VueExample from "../../frontend/vue/pages/VueExample.vue";
-
-export const vueImports = {
-	VueExample
-} as const;
-`;
-        const backendUtilsDirectory = join(backendDirectory, 'utils');
-        mkdirSync(backendUtilsDirectory, { recursive: true });
-        writeFileSync(join(backendUtilsDirectory, 'vueImporter.ts'), vueImporter);
-    }
-    const useStatements = uniqueDependencies
-        .flatMap(({ imports }) => imports ?? [])
-        .filter((entry) => entry.isPlugin)
-        .map((entry) => {
-        if (entry.config === undefined)
-            return `.use(${entry.packageName})`;
-        if (entry.config === null)
-            return `.use(${entry.packageName}())`;
-        return `.use(${entry.packageName}(${JSON.stringify(entry.config)}))`;
+    const manifestBlock = generateBuildBlock({
+        assetsDirectory,
+        buildDirectory,
+        frontendDirectories,
+        tailwind
     });
-    const manifestOptions = [
-        `assetsDirectory: '${assetsDirectory}'`,
-        `buildDirectory: '${buildDirectory}'`,
-        ...Object.entries(frontendDirectories).map(([frameworkName, directory]) => `${frameworkName}Directory: 'src/frontend/${directory}'`),
-        tailwind ? `tailwind: ${JSON.stringify(tailwind)}` : ''
-    ].filter(Boolean);
-    const manifestDeclaration = `${nonFrameworkOnly ? '' : 'const manifest = '}await build({
-  ${manifestOptions.join(',\n  ')}
-});`;
-    const routesData = Object.entries(frontendDirectories).reduce((acc, [frameworkName, directory], index) => {
-        let handler;
-        switch (frameworkName) {
-            case 'html':
-                handler = `handleHTMLPageRequest(\`${buildDirectory}${directory ? `/${directory}` : ''}/pages/HTMLExample.html\`)`;
-                break;
-            case 'react':
-                handler = `handleReactPageRequest(ReactExample, asset(manifest, 'ReactExampleIndex'), { initialCount: 0, cssPath: asset(manifest, 'ReactExampleCSS') })`;
-                break;
-            case 'svelte':
-                handler = `handleSveltePageRequest(SvelteExample, asset(manifest, 'SvelteExample'), asset(manifest, 'SvelteExampleIndex'), { initialCount: 0, cssPath: asset(manifest, 'SvelteExampleCSS') })`;
-                break;
-            case 'vue':
-                handler = `handleVuePageRequest(VueExample, asset(manifest, 'VueExample'), asset(manifest, 'VueExampleIndex'), generateHeadElement({ cssPath: asset(manifest, 'VueExampleCSS'), title: 'AbsoluteJS + Vue' }), { initialCount: 0 })`;
-                break;
-            case 'htmx':
-                handler = `handleHTMXPageRequest(\`${buildDirectory}${directory ? `/${directory}` : ''}/pages/HTMXExample.html\`)`;
-                if (index === 0) {
-                    acc.indexRoute = `.get('/', () => ${handler})`;
-                }
-                acc.otherRoutes.push(`.get('/htmx', () => ${handler})`, `.post('/htmx/reset', ({ resetScopedStore }) => resetScopedStore())`, `.get('/htmx/count', ({ scopedStore }) => scopedStore.count)`, `.post('/htmx/increment', ({ scopedStore }) => ++scopedStore.count)`);
-                return acc;
-            default:
-                return acc;
-        }
-        if (index === 0) {
-            acc.indexRoute = `.get('/', () => ${handler})`;
-        }
-        acc.otherRoutes.push(`.get('/${frameworkName}', () => ${handler})`);
-        return acc;
-    }, { indexRoute: null, otherRoutes: [] });
-    const routes = [routesData.indexRoute ?? '', ...routesData.otherRoutes]
-        .filter(Boolean)
-        .join('\n  ');
-    const useLines = useStatements.map((s) => `  ${s}`).join('\n');
-    const serverFileContent = `${importLines.join('\n')}
-
-${manifestDeclaration}
+    const dbBlock = generateDBBlock({ databaseEngine, databaseHost, orm });
+    const useBlock = generateUseBlock({
+        databaseEngine,
+        deps,
+        orm
+    });
+    const routesBlock = generateRoutesBlock({
+        authProvider,
+        buildDirectory,
+        flags,
+        frontendDirectories
+    });
+    const content = `${importsBlock}
 
+${manifestBlock}
+${dbBlock}
 new Elysia()
-${useLines}
-  ${routes}
-  .on('error', (err) => {
-    const { request } = err;
-    console.error(\`Server error on \${request.method} \${request.url}: \${err.message}\`);
+${useBlock}
+  ${routesBlock}
+  .on('error', err => {
+    const { request } = err
+    console.error(\`Server error on \${request.method} \${request.url}: \${err.message}\`)
   });
 `;
-    writeFileSync(serverFilePath, serverFileContent);
+    mkdirSync(backendDirectory, { recursive: true });
+    writeFileSync(serverFilePath, content);
 };

package/dist/generators/project/generateUseBlock.d.ts

@@ -0,0 +1,6 @@
+import type { AvailableDependency, DatabaseEngine, ORM } from '../../types';
+export declare const generateUseBlock: ({ deps, databaseEngine, orm }: {
+    deps: AvailableDependency[];
+    databaseEngine: DatabaseEngine;
+    orm: ORM;
+}) => string;

package/dist/generators/project/generateUseBlock.js

@@ -0,0 +1,28 @@
+export const generateUseBlock = ({ deps, databaseEngine, orm }) => deps
+    .flatMap((dependency) => dependency.imports ?? [])
+    .filter((pluginImport) => pluginImport.isPlugin)
+    .map((pluginImport) => {
+    const isAuth = pluginImport.packageName === 'absoluteAuth';
+    if (isAuth) {
+        const baseConfigString = pluginImport.config !== null
+            ? JSON.stringify(pluginImport.config).slice(1, -1)
+            : '';
+        const hasDatabase = databaseEngine !== undefined && databaseEngine !== 'none';
+        const hasOrm = orm !== undefined && orm !== 'none';
+        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 }) })`
+            : `({ authProvider, tokenResponse, userSessionId }) => { console.log(\`Successfully authorized OAuth2 with \${authProvider} (session: \${userSessionId})\`, tokenResponse); }`;
+        const mergedConfig = `{ ${baseConfigString}${baseConfigString ? ',' : ''} onCallbackSuccess: ${callback} }`;
+        return `.use(absoluteAuth${pluginGeneric}(${mergedConfig}))`;
+    }
+    if (pluginImport.config === undefined) {
+        return `.use(${pluginImport.packageName})`;
+    }
+    if (pluginImport.config === null) {
+        return `.use(${pluginImport.packageName}())`;
+    }
+    return `.use(${pluginImport.packageName}(${JSON.stringify(pluginImport.config)}))`;
+})
+    .join('\n');

package/dist/messages.js

@@ -12,36 +12,36 @@ Options:
   ${cyan('--debug, -d')}                     Display a summary of the project configuration after creation
 
   ${cyan('--angular')}                       Include an Angular frontend
-  ${cyan('--angular-dir')} ${dim(cyan('<dir>'))}             Specify the directory for and use the Angular frontend
-  ${cyan('--assets')} ${dim(cyan('<dir>'))}                  Directory name for your static assets
+  ${cyan('--angular-dir')} ${dim(cyan('<directory>'))}       Specify the directory for and use the Angular frontend
+  ${cyan('--assets')} ${dim(cyan('<directory>'))}            Directory name for your static assets
   ${cyan('--auth')} ${dim(cyan('<plugin>'))}                 Pre-configured auth plugin (currently only "absolute-auth") or 'none'
   ${cyan('--biome')}                         Use Biome for code quality and formatting
-  ${cyan('--build')} ${dim(cyan('<dir>'))}                   Output directory for build artifacts
-  ${cyan('--database')} ${dim(cyan('<dir>'))}                Directory name for your database files
+  ${cyan('--build')} ${dim(cyan('<directory>'))}             Output directory for build artifacts
+  ${cyan('--db')} ${dim(cyan('<engine>'))}                   Database engine (postgresql | mysql | sqlite | mongodb | mariadb | gel | singlestore | cockroachdb | mssql) or 'none'
+  ${cyan('--db-dir')} ${dim(cyan('<directory>'))}            Directory name for your database files
+  ${cyan('--db-host')} ${dim(cyan('<host>'))}                Database host provider (neon | planetscale) or 'none'
   ${cyan('--directory')} ${dim(cyan('<mode>'))}              Directory-naming strategy: "default" or "custom"
-  ${cyan('--engine')} ${dim(cyan('<engine>'))}               Database engine (postgresql | mysql | sqlite | mongodb | redis | singlestore | cockroachdb | mssql) or 'none'
-  ${cyan('--eslint+prettier')}                   Use ESLint + Prettier for code quality and formatting
+  ${cyan('--eslint+prettier')}               Use ESLint + Prettier for code quality and formatting
   ${cyan('--git')}                           Initialize a Git repository
-  ${cyan('--host')} ${dim(cyan('<host>'))}                   Database host provider (neon | planetscale | supabase | turso | vercel | upstash | atlas) or 'none'
   ${cyan('--html')}                          Include a plain HTML frontend
-  ${cyan('--html-dir')} ${dim(cyan('<dir>'))}                Specify the directory for and use the HTML frontend
-  ${cyan('--html-scripts')}                   Enable HTML scripting with TypeScript
+  ${cyan('--html-dir')} ${dim(cyan('<directory>'))}          Specify the directory for and use the HTML frontend
+  ${cyan('--html-scripts')}                  Enable HTML scripting with TypeScript
   ${cyan('--htmx')}                          Include an HTMX frontend
-  ${cyan('--htmx-dir')} ${dim(cyan('<dir>'))}                Specify the directory for and use the HTMX frontend
+  ${cyan('--htmx-dir')} ${dim(cyan('<directory>'))}          Specify the directory for and use the HTMX frontend
   ${cyan('--install')}                       Use the same package manager to install dependencies
   ${cyan('--lts')}                           Use LTS versions of required packages
   ${cyan('--orm')} ${dim(cyan('<orm>'))}                     ORM to configure: "drizzle" | "prisma" | 'none'
   ${cyan('--plugin')} ${dim(cyan('<plugin>'))}               Elysia plugin(s) to include (repeatable); 'none' skips plugin setup
   ${cyan('--react')}                         Include a React frontend
-  ${cyan('--react-dir')} ${dim(cyan('<dir>'))}               Specify the directory for and use the React frontend
+  ${cyan('--react-dir')} ${dim(cyan('<directory>'))}         Specify the directory for and use the React frontend
   ${cyan('--skip')}                          Skip non-required prompts; uses 'none' for all optional configs
   ${cyan('--svelte')}                        Include a Svelte frontend
-  ${cyan('--svelte-dir')} ${dim(cyan('<dir>'))}              Specify the directory for and use the Svelte frontend
+  ${cyan('--svelte-dir')} ${dim(cyan('<directory>'))}        Specify the directory for and use the Svelte frontend
   ${cyan('--tailwind')}                      Include Tailwind CSS setup
   ${cyan('--tailwind-input')} ${dim(cyan('<file>'))}         Path to your Tailwind CSS entry file
   ${cyan('--tailwind-output')} ${dim(cyan('<file>'))}        Path for the generated Tailwind CSS bundle
   ${cyan('--vue')}                           Include a Vue frontend
-  ${cyan('--vue-dir')} ${dim(cyan('<dir>'))}                 Specify the directory for and use the Vue frontend
+  ${cyan('--vue-dir')} ${dim(cyan('<directory>'))}           Specify the directory for and use the Vue frontend
 `;
 export const getOutroMessage = ({ projectName, packageManager, installDependenciesNow }) => `${green('Created successfully')}, you can now run:\n\n` +
     `${cyan('cd')} ${projectName}\n` +

package/dist/prompt.js

@@ -23,11 +23,10 @@ export const prompt = async (argumentConfiguration) => {
     // 4. Frontend(s)
     const frontends = argumentConfiguration.frontends?.filter((frontend) => frontend !== undefined) ?? (await getFrontends());
     // 5. HTML scripting option (if HTML was selected)
-    const useHTMLScripts = !frontends.includes('html') ||
-        argumentConfiguration.useHTMLScripts === undefined
-        ? false
-        : (argumentConfiguration.useHTMLScripts ??
-            (await getHtmlScriptingOption()));
+    const useHTMLScripts = frontends.includes('html')
+        ? (argumentConfiguration.useHTMLScripts ??
+            (await getHtmlScriptingOption()))
+        : false;
     // 6. Database engine
     const databaseEngine = argumentConfiguration.databaseEngine ?? (await getDatabaseEngine());
     // 7. Database host
@@ -35,7 +34,7 @@ export const prompt = async (argumentConfiguration) => {
         (await getDatabaseHost(databaseEngine));
     // 8. ORM choice
     const orm = databaseEngine !== undefined && databaseEngine !== 'none'
-        ? (argumentConfiguration.orm ?? (await getORM()))
+        ? (argumentConfiguration.orm ?? (await getORM(databaseEngine)))
         : undefined;
     // 9. Configuration type
     let directoryConfig = argumentConfiguration.directoryConfig ?? (await getConfigurationType());
@@ -46,7 +45,7 @@ export const prompt = async (argumentConfiguration) => {
         directoryConfig,
         useTailwind
     });
-    // 11. Framework-specific directories
+    // 11. Framework specific directories
     const frontendDirectories = await getFrontendDirectoryConfigurations(directoryConfig, frontends, argumentConfiguration.frontendDirectories);
     // If the user specified a custom directory configuration, we need to update the configuration type
     if (argumentConfiguration.frontendDirectories !== undefined)

package/dist/questions/databaseEngine.d.ts

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

package/dist/questions/databaseEngine.js

@@ -9,7 +9,8 @@ export const getDatabaseEngine = async () => {
             { label: cyan('PostgreSQL'), value: 'postgresql' },
             { label: magenta('SQLite'), value: 'sqlite' },
             { label: green('MySQL'), value: 'mysql' },
-            { label: red('Redis'), value: 'redis' },
+            { label: red('MariaDB'), value: 'mariadb' },
+            { label: cyan('Gel'), value: 'gel' },
             { label: green('MongoDB'), value: 'mongodb' },
             { label: magenta('SingleStore'), value: 'singlestore' },
             { label: yellow('SQL Server'), value: 'mssql' },

package/dist/questions/databaseHost.d.ts

@@ -1,2 +1,2 @@
 import type { DatabaseEngine } from '../types';
-export declare const getDatabaseHost: (databaseEngine: DatabaseEngine) => Promise<"neon" | "planetscale" | "supabase" | "turso" | "upstash" | "atlas" | undefined>;
+export declare const getDatabaseHost: (databaseEngine: DatabaseEngine) => Promise<"neon" | "planetscale" | "turso" | undefined>;

package/dist/questions/databaseHost.js

@@ -1,4 +1,4 @@
-import { select, isCancel, confirm } from '@clack/prompts';
+import { select, isCancel } from '@clack/prompts';
 import { cyan } from 'picocolors';
 import { abort } from '../utils/abort';
 export const getDatabaseHost = async (databaseEngine) => {
@@ -6,46 +6,26 @@ export const getDatabaseHost = async (databaseEngine) => {
         const databaseHost = await select({
             message: 'Select database host:',
             options: [
+                { label: 'None', value: 'none' },
                 { label: cyan('Neon'), value: 'neon' },
-                { label: cyan('Supabase'), value: 'supabase' },
-                { label: 'None', value: 'none' }
+                { label: cyan('PlanetScale'), value: 'planetscale' }
             ]
         });
         if (isCancel(databaseHost))
             abort();
         return databaseHost === 'none' ? undefined : databaseHost;
     }
-    if (databaseEngine === 'mysql') {
-        const databaseHost = await confirm({
-            message: 'Are you using PlanetScale?'
-        });
-        if (isCancel(databaseHost))
-            abort();
-        return databaseHost ? 'planetscale' : undefined;
-    }
     if (databaseEngine === 'sqlite') {
-        const databaseHost = await confirm({
-            message: 'Are you using Turso?'
-        });
-        if (isCancel(databaseHost))
-            abort();
-        return databaseHost ? 'turso' : undefined;
-    }
-    if (databaseEngine === 'mongodb') {
-        const databaseHost = await confirm({
-            message: 'Are you using Atlas?'
-        });
-        if (isCancel(databaseHost))
-            abort();
-        return databaseHost ? 'atlas' : undefined;
-    }
-    if (databaseEngine === 'redis') {
-        const databaseHost = await confirm({
-            message: 'Are you using Upstash?'
+        const databaseHost = await select({
+            message: 'Select database host:',
+            options: [
+                { label: 'None', value: 'none' },
+                { label: cyan('Turso'), value: 'turso' }
+            ]
         });
         if (isCancel(databaseHost))
             abort();
-        return databaseHost ? 'upstash' : undefined;
+        return databaseHost === 'none' ? undefined : databaseHost;
     }
     return undefined;
 };

package/dist/questions/directoryConfiguration.js

@@ -5,7 +5,7 @@ export const getDirectoryConfiguration = async ({ directoryConfig, useTailwind,
         return {
             assetsDirectory: argumentConfiguration.assetsDirectory ?? 'src/backend/assets',
             buildDirectory: argumentConfiguration.buildDirectory ?? 'build',
-            databaseDirectory: databaseEngine
+            databaseDirectory: databaseEngine !== undefined && databaseEngine !== 'none'
                 ? (argumentConfiguration.databaseDirectory ?? 'db')
                 : undefined,
             tailwind: useTailwind
@@ -58,7 +58,7 @@ export const getDirectoryConfiguration = async ({ directoryConfig, useTailwind,
     }
     // Database
     let databaseDirectory;
-    if (databaseEngine !== undefined) {
+    if (databaseEngine !== undefined && databaseEngine !== 'none') {
         databaseDirectory =
             argumentConfiguration.databaseDirectory ??
                 (await text({

package/dist/questions/orm.d.ts

@@ -1 +1,2 @@
-export declare const getORM: () => Promise<"drizzle" | "prisma" | undefined>;
+import { DatabaseEngine } from '../types';
+export declare const getORM: (databaseEngine: Exclude<DatabaseEngine, "none" | undefined>) => Promise<"drizzle" | "prisma" | undefined>;

package/dist/questions/orm.js

@@ -1,14 +1,20 @@
 import { select, isCancel } from '@clack/prompts';
 import { cyan, magenta } from 'picocolors';
+import { isDrizzleDialect, isPrismaDialect } from '../typeGuards';
 import { abort } from '../utils/abort';
-export const getORM = async () => {
+export const getORM = async (databaseEngine) => {
+    const options = [
+        { label: 'None', value: 'none' }
+    ];
+    if (isDrizzleDialect(databaseEngine)) {
+        options.push({ label: cyan('Drizzle'), value: 'drizzle' });
+    }
+    if (isPrismaDialect(databaseEngine)) {
+        options.push({ label: magenta('Prisma'), value: 'prisma' });
+    }
     const orm = await select({
-        message: 'Choose an ORM (optional):',
-        options: [
-            { label: 'None', value: 'none' },
-            { label: cyan('Drizzle'), value: 'drizzle' },
-            { label: magenta('Prisma'), value: 'prisma' }
-        ]
+        message: 'Choose an ORM for your database:',
+        options
     });
     if (isCancel(orm))
         abort();

package/dist/scaffold.d.ts

@@ -4,5 +4,5 @@ type ScaffoldProps = {
     packageManager: PackageManager;
     latest: boolean;
 };
-export declare const scaffold: ({ response: { projectName, codeQualityTool, initializeGitNow, databaseEngine, useHTMLScripts, useTailwind, databaseDirectory, orm, frontends, plugins, authProvider, buildDirectory, assetsDirectory, tailwind, installDependenciesNow, frontendDirectories }, latest, packageManager }: ScaffoldProps) => Promise<void>;
+export declare const scaffold: ({ response: { projectName, codeQualityTool, initializeGitNow, databaseEngine, databaseHost, useHTMLScripts, useTailwind, databaseDirectory, orm, frontends, plugins, authProvider, buildDirectory, assetsDirectory, tailwind, installDependenciesNow, frontendDirectories }, latest, packageManager }: ScaffoldProps) => Promise<void>;
 export {};

package/dist/scaffold.js

@@ -4,16 +4,13 @@ import { fileURLToPath } from 'node:url';
 import { formatProject } from './commands/formatProject';
 import { initializeGit } from './commands/initializeGit';
 import { installDependencies } from './commands/installDependencies';
-import { availablePlugins } from './data';
 import { addConfigurationFiles } from './generators/configurations/addConfigurationFiles';
 import { createPackageJson } from './generators/configurations/generatePackageJson';
 import { initalizeRoot } from './generators/configurations/initializeRoot';
 import { scaffoldDatabase } from './generators/db/scaffoldDatabase';
 import { generateServerFile } from './generators/project/generateServer';
 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, packageManager }) => {
+export const scaffold = async ({ response: { projectName, codeQualityTool, initializeGitNow, databaseEngine, databaseHost, useHTMLScripts, useTailwind, databaseDirectory, orm, frontends, plugins, authProvider, buildDirectory, assetsDirectory, tailwind, installDependenciesNow, frontendDirectories }, latest, packageManager }) => {
     const __dirname = dirname(fileURLToPath(import.meta.url));
     const templatesDirectory = join(__dirname, '/templates');
     const { frontendDirectory, backendDirectory, projectAssetsDirectory } = initalizeRoot(projectName, templatesDirectory);
@@ -29,8 +26,11 @@ useHTMLScripts, useTailwind, databaseDirectory, orm, frontends, plugins, authPro
     createPackageJson({
         authProvider,
         codeQualityTool,
+        databaseEngine,
+        databaseHost,
         frontendDirectories,
         latest,
+        orm,
         plugins,
         projectName,
         useTailwind
@@ -38,20 +38,28 @@ useHTMLScripts, useTailwind, databaseDirectory, orm, frontends, plugins, authPro
     generateServerFile({
         assetsDirectory,
         authProvider,
-        availablePlugins,
         backendDirectory,
         buildDirectory,
+        databaseEngine,
+        databaseHost,
         frontendDirectories,
+        orm,
         plugins,
         tailwind
     });
     void (databaseDirectory !== undefined &&
-        scaffoldDatabase({
+        databaseEngine !== 'none' &&
+        databaseEngine !== undefined &&
+        (await scaffoldDatabase({
+            authProvider,
+            backendDirectory,
             databaseDirectory,
             databaseEngine,
+            databaseHost,
             orm,
-            projectName
-        }));
+            projectName,
+            templatesDirectory
+        })));
     scaffoldFrontends({
         frontendDirectories,
         frontendDirectory,

package/dist/templates/db/docker-compose.db.yml

@@ -0,0 +1,15 @@
+services:
+  db:
+    image: postgres:15
+    restart: always
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: appdb
+    ports:
+      - "5432:5432"
+    volumes:
+      - db_data:/var/lib/postgresql/data
+
+volumes:
+  db_data:

package/dist/typeGuards.d.ts

@@ -1,6 +1,8 @@
-import type { AuthProvider, CodeQualityTool, DatabaseEngine, DatabaseHost, Frontend, ORM } from './types';
+import type { AuthProvider, AvailableDrizzleDialect, CodeQualityTool, DatabaseEngine, DatabaseHost, Frontend, ORM } from './types';
 export declare const isAuthProvider: (value: string | undefined) => value is AuthProvider;
 export declare const isDirectoryConfig: (value: string) => value is "default" | "custom";
+export declare const isDrizzleDialect: (value: string | undefined) => value is AvailableDrizzleDialect;
+export declare const isPrismaDialect: (value: string | undefined) => value is string;
 export declare const isDatabaseEngine: (value: string | undefined) => value is DatabaseEngine;
 export declare const isDatabaseHost: (value: string | undefined) => value is DatabaseHost;
 export declare const isORM: (value: string | undefined) => value is ORM;

package/dist/typeGuards.js

@@ -1,24 +1,10 @@
-import { frontendLabels } from './data';
+import { availableDatabaseEngines, availableDatabaseHosts, availableDrizzleDialects, availablePrismaDialects, frontendLabels } from './data';
 export const isAuthProvider = (value) => value === 'absoluteAuth' || value === 'none' || value === undefined;
 export const isDirectoryConfig = (value) => value === 'default' || value === 'custom';
-export const isDatabaseEngine = (value) => value === 'postgresql' ||
-    value === 'mysql' ||
-    value === 'sqlite' ||
-    value === 'mongodb' ||
-    value === 'redis' ||
-    value === 'singlestore' ||
-    value === 'cockroachdb' ||
-    value === 'mssql' ||
-    value === 'none' ||
-    value === undefined;
-export const isDatabaseHost = (value) => value === 'neon' ||
-    value === 'planetscale' ||
-    value === 'supabase' ||
-    value === 'turso' ||
-    value === 'vercel' ||
-    value === 'upstash' ||
-    value === 'atlas' ||
-    value === undefined;
+export const isDrizzleDialect = (value) => availableDrizzleDialects.some((dialect) => dialect === value);
+export const isPrismaDialect = (value) => availablePrismaDialects.some((dialect) => dialect === value);
+export const isDatabaseEngine = (value) => availableDatabaseEngines.some((engine) => engine === value);
+export const isDatabaseHost = (value) => availableDatabaseHosts.some((host) => host === value);
 export const isORM = (value) => value === 'drizzle' || value === 'prisma' || value === undefined;
 export const isCodeQualityTool = (value) => value === 'eslint+prettier' || value === 'biome' || value === undefined;
 export const isFrontend = (value) => value !== undefined && Object.keys(frontendLabels).includes(value);