create-absolutejs 0.6.1 → 0.8.0

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

@@ -4,5 +4,7 @@ type ScaffoldDatabaseProps = Pick<CreateConfiguration, 'projectName' | 'database
     backendDirectory: string;
     typesDirectory: string;
 };
-export declare const scaffoldDatabase: ({ projectName, databaseEngine, databaseHost, databaseDirectory, backendDirectory, authOption, orm, typesDirectory }: ScaffoldDatabaseProps) => Promise<void>;
+export declare const scaffoldDatabase: ({ projectName, databaseEngine, databaseHost, databaseDirectory, backendDirectory, authOption, orm, typesDirectory }: ScaffoldDatabaseProps) => Promise<{
+    dockerFreshInstall: boolean;
+}>;
 export {};

package/dist/generators/db/scaffoldDatabase.js

@@ -37,12 +37,13 @@ export const scaffoldDatabase = async ({ projectName, databaseEngine, databaseHo
         databaseEngine !== 'sqlite' &&
         databaseEngine !== undefined &&
         databaseEngine !== 'none') {
-        await scaffoldDocker({
+        const { dockerFreshInstall } = await scaffoldDocker({
             authOption,
             databaseEngine,
             projectDatabaseDirectory,
             projectName
         });
+        return { dockerFreshInstall };
     }
     if (orm === 'drizzle') {
         if (!isDrizzleDialect(databaseEngine)) {
@@ -60,9 +61,10 @@ export const scaffoldDatabase = async ({ projectName, databaseEngine, databaseHo
             databaseHost
         });
         writeFileSync(join(typesDirectory, 'databaseTypes.ts'), drizzleTypes);
-        return;
+        return { dockerFreshInstall: false };
     }
     if (orm === 'prisma') {
         console.warn(`${dim('│')}\n${yellow('▲')}  Prisma support is not implemented yet`);
     }
+    return { dockerFreshInstall: false };
 };

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

@@ -5,5 +5,7 @@ type ScaffoldDockerProps = {
     authOption: AuthOption;
     projectName: string;
 };
-export declare const scaffoldDocker: ({ databaseEngine, projectDatabaseDirectory, projectName, authOption }: ScaffoldDockerProps) => Promise<void>;
+export declare const scaffoldDocker: ({ databaseEngine, projectDatabaseDirectory, projectName, authOption }: ScaffoldDockerProps) => Promise<{
+    dockerFreshInstall: boolean;
+}>;
 export {};

package/dist/generators/db/scaffoldDocker.js

@@ -1,7 +1,7 @@
 import { writeFileSync } from 'fs';
 import { join } from 'path';
 import { $ } from 'bun';
-import { checkDockerInstalled } from '../../utils/checkDockerInstalled';
+import { checkDockerInstalled, ensureDockerDaemonRunning, resolveDockerExe, shutdownDockerDaemon } from '../../utils/checkDockerInstalled';
 import { countHistoryTables, initTemplates, userTables } from './dockerInitTemplates';
 import { generateDockerContainer } from './generateDockerContainer';
 export const scaffoldDocker = async ({ databaseEngine, projectDatabaseDirectory, projectName, authOption }) => {
@@ -10,20 +10,30 @@ export const scaffoldDocker = async ({ databaseEngine, projectDatabaseDirectory,
         databaseEngine === 'sqlite') {
         throw new Error('Internal type error: databaseEngine must be defined and not "none" or "sqlite"');
     }
-    await checkDockerInstalled();
+    const { freshInstall } = await checkDockerInstalled(databaseEngine);
+    const { daemonWasStarted } = await ensureDockerDaemonRunning();
     const dbContainer = generateDockerContainer(databaseEngine);
     writeFileSync(join(projectDatabaseDirectory, 'docker-compose.db.yml'), dbContainer, 'utf-8');
-    if (databaseEngine === 'mongodb') {
-    }
-    else {
-        const { wait, cli } = initTemplates[databaseEngine];
+    const docker = resolveDockerExe();
+    const hasSchemaInit = databaseEngine in userTables;
+    if (hasSchemaInit) {
+        const dbKey = databaseEngine;
+        const { wait, cli } = initTemplates[dbKey];
         const usesAuth = authOption !== undefined && authOption !== 'none';
         const dbCommand = usesAuth
-            ? userTables[databaseEngine]
-            : countHistoryTables[databaseEngine];
-        await $ `bun db:up`.cwd(projectName);
-        await $ `docker compose -p ${databaseEngine} -f db/docker-compose.db.yml exec -T db \
+            ? userTables[dbKey]
+            : countHistoryTables[dbKey];
+        await $ `${docker} compose -p ${databaseEngine} -f db/docker-compose.db.yml up -d db`.cwd(projectName);
+        await $ `${docker} compose -p ${databaseEngine} -f db/docker-compose.db.yml exec -T db \
   bash -lc '${wait} && ${cli} "${dbCommand}"'`.cwd(projectName);
-        await $ `bun db:down`.cwd(projectName);
+        await $ `${docker} compose -p ${databaseEngine} -f db/docker-compose.db.yml down`.cwd(projectName);
+    }
+    else {
+        await $ `${docker} compose -p ${databaseEngine} -f db/docker-compose.db.yml up -d --wait db`.cwd(projectName);
+        await $ `${docker} compose -p ${databaseEngine} -f db/docker-compose.db.yml down`.cwd(projectName);
+    }
+    if (daemonWasStarted) {
+        await shutdownDockerDaemon();
     }
+    return { dockerFreshInstall: freshInstall };
 };

package/dist/generators/html/generateHTMLPage.js

@@ -5,65 +5,65 @@ export const generateHTMLPage = (frontends, useHTMLScripts) => {
     const scriptTagBlock = useHTMLScripts
         ? `        <script src="../scripts/typescript-example.ts"></script>\n`
         : '';
-    return `<!doctype html>
-<html>
-    <head>
-        <title>AbsoluteJS + HTML</title>
-        <meta name="description" content="AbsoluteJS HTML Example" />
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link
-            rel="stylesheet"
-            type="text/css"
-            href="../styles/html-example.css"
-        />
-        <link rel="icon" href="/assets/ico/favicon.ico" />
-    </head>
-    <body>
-        <header>
-            <a href="/">AbsoluteJS</a>
-            <details>
-                <summary>Pages</summary>
-                <nav>
-                    ${navLinks}
-                </nav>
-            </details>
-        </header>
-        <main>
-            <nav>
-                <a href="https://absolutejs.com" target="_blank">
-                    <img
-                        class="logo"
-                        src="/assets/png/absolutejs-temp.png"
-                        alt="AbsoluteJS Logo"
-                    />
-                </a>
-                <a href="https://html.spec.whatwg.org/multipage/">
-                    <img
-                        class="logo html"
-                        src="/assets/svg/HTML5_Badge.svg"
-                        alt="HTML Logo"
-                    />
-                </a>
-            </nav>
-            <h1>AbsoluteJS + HTML</h1>
-            <button id="counter-button">
-                count is <span id="counter">${initialCount}</span>
-            </button>
-            <p>
-                Edit <code>example/html/pages/HtmlExample.html</code> save and
-                rebuild to update the page.
-            </p>
-            <p style="color: #777">( Hot Module Reloading is coming soon )</p>
-            <p style="margin-top: 2rem">
-                Explore the other pages to see how AbsoluteJS seamlessly unifies
-                multiple frameworks on a single server.
-            </p>
-            <p style="margin-top: 2rem; font-size: 1rem; color: #777">
-                Click on the AbsoluteJS and HTML logos to learn more.
-            </p>
-        </main>
-${scriptTagBlock}    </body>
-</html>
+    return `<!doctype html>
+<html>
+    <head>
+        <title>AbsoluteJS + HTML</title>
+        <meta name="description" content="AbsoluteJS HTML Example" />
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <link
+            rel="stylesheet"
+            type="text/css"
+            href="../styles/html-example.css"
+        />
+        <link rel="icon" href="/assets/ico/favicon.ico" />
+    </head>
+    <body>
+        <header>
+            <a href="/">AbsoluteJS</a>
+            <details>
+                <summary>Pages</summary>
+                <nav>
+                    ${navLinks}
+                </nav>
+            </details>
+        </header>
+        <main>
+            <nav>
+                <a href="https://absolutejs.com" target="_blank">
+                    <img
+                        class="logo"
+                        src="/assets/png/absolutejs-temp.png"
+                        alt="AbsoluteJS Logo"
+                    />
+                </a>
+                <a href="https://html.spec.whatwg.org/multipage/">
+                    <img
+                        class="logo html"
+                        src="/assets/svg/HTML5_Badge.svg"
+                        alt="HTML Logo"
+                    />
+                </a>
+            </nav>
+            <h1>AbsoluteJS + HTML</h1>
+            <button id="counter-button">
+                count is <span id="counter">${initialCount}</span>
+            </button>
+            <p>
+                Edit <code>example/html/pages/HtmlExample.html</code> save and
+                rebuild to update the page.
+            </p>
+            <p style="color: #777">( Hot Module Reloading is coming soon )</p>
+            <p style="margin-top: 2rem">
+                Explore the other pages to see how AbsoluteJS seamlessly unifies
+                multiple frameworks on a single server.
+            </p>
+            <p style="margin-top: 2rem; font-size: 1rem; color: #777">
+                Click on the AbsoluteJS and HTML logos to learn more.
+            </p>
+        </main>
+${scriptTagBlock}    </body>
+</html>
 `;
 };

package/dist/generators/htmx/generateHTMXPage.js

@@ -1,91 +1,91 @@
 import { formatNavLink } from '../../utils/formatNavLink';
 export const generateHTMXPage = (isSingle, frontends) => {
     const navLinks = frontends.map(formatNavLink).join('\n\t\t\t');
-    return `<!doctype html>
-<html>
-	<head>
-		<title>AbsoluteJS + HTMX</title>
-		<meta name="description" content="AbsoluteJS HTMX Example" />
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<link
-			rel="stylesheet"
-			type="text/css"
-			href="../styles/htmx-example.css"
-		/>
-		<link rel="icon" href="/assets/ico/favicon.ico" />
-		<script src="${isSingle ? '' : '/htmx'}/htmx.min.js"></script>
-	</head>
-	<body
-		hx-post="/htmx/reset"
-		hx-trigger="beforeunload from:window once"
-		hx-swap="none"
-	>
-		<header>
-			<a href="/">AbsoluteJS</a>
-			<details
-				hx-on:pointerenter="this.open = true"
-				hx-on:pointerleave="this.open = false"
-			>
-				<summary>Pages</summary>
-				<nav>
-					${navLinks}
-				</nav>
-			</details>
-		</header>
-		<main>
-			<nav>
-				<a href="https://absolutejs.com" target="_blank">
-					<img
-						class="logo"
-						src="/assets/png/absolutejs-temp.png"
-						alt="AbsoluteJS Logo"
-					/>
-				</a>
-				<a href="https://htmx.org" target="_blank">
-					<picture>
-						<source
-							srcset="/assets/svg/htmx-logo-white.svg"
-							media="(prefers-color-scheme: dark)"
-						/>
-
-						<img
-							src="/assets/svg/htmx-logo-black.svg"
-							alt="HTMX logo"
-							class="logo htmx"
-						/>
-					</picture>
-				</a>
-			</nav>
-			<h1>AbsoluteJS + HTMX</h1>
-			<button
-				hx-post="/htmx/increment"
-				hx-target="#count"
-				hx-swap="innerHTML"
-			>
-				count is
-				<span
-					id="count"
-					hx-get="/htmx/count"
-					hx-trigger="load"
-					hx-swap="innerHTML"
-					>0</span
-				>
-			</button>
-			<p>
-				Edit <code>example/htmx/pages/HtmxHome.html</code> save and
-				rebuild to update the page.
-			</p>
-			<p style="color: #777">( Hot Module Reloading is coming soon )</p>
-			<p style="margin-top: 2rem">
-				Explore the other pages to see how AbsoluteJS seamlessly unifies
-				multiple frameworks on a single server.
-			</p>
-			<p style="margin-top: 2rem; font-size: 1rem; color: #777">
-				Click on the AbsoluteJS and HTML logos to learn more.
-			</p>
-		</main>
-	</body>
-</html>
+    return `<!doctype html>
+<html>
+	<head>
+		<title>AbsoluteJS + HTMX</title>
+		<meta name="description" content="AbsoluteJS HTMX Example" />
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<link
+			rel="stylesheet"
+			type="text/css"
+			href="../styles/htmx-example.css"
+		/>
+		<link rel="icon" href="/assets/ico/favicon.ico" />
+		<script src="${isSingle ? '' : '/htmx'}/htmx.min.js"></script>
+	</head>
+	<body
+		hx-post="/htmx/reset"
+		hx-trigger="beforeunload from:window once"
+		hx-swap="none"
+	>
+		<header>
+			<a href="/">AbsoluteJS</a>
+			<details
+				hx-on:pointerenter="this.open = true"
+				hx-on:pointerleave="this.open = false"
+			>
+				<summary>Pages</summary>
+				<nav>
+					${navLinks}
+				</nav>
+			</details>
+		</header>
+		<main>
+			<nav>
+				<a href="https://absolutejs.com" target="_blank">
+					<img
+						class="logo"
+						src="/assets/png/absolutejs-temp.png"
+						alt="AbsoluteJS Logo"
+					/>
+				</a>
+				<a href="https://htmx.org" target="_blank">
+					<picture>
+						<source
+							srcset="/assets/svg/htmx-logo-white.svg"
+							media="(prefers-color-scheme: dark)"
+						/>
+
+						<img
+							src="/assets/svg/htmx-logo-black.svg"
+							alt="HTMX logo"
+							class="logo htmx"
+						/>
+					</picture>
+				</a>
+			</nav>
+			<h1>AbsoluteJS + HTMX</h1>
+			<button
+				hx-post="/htmx/increment"
+				hx-target="#count"
+				hx-swap="innerHTML"
+			>
+				count is
+				<span
+					id="count"
+					hx-get="/htmx/count"
+					hx-trigger="load"
+					hx-swap="innerHTML"
+					>0</span
+				>
+			</button>
+			<p>
+				Edit <code>example/htmx/pages/HtmxHome.html</code> save and
+				rebuild to update the page.
+			</p>
+			<p style="color: #777">( Hot Module Reloading is coming soon )</p>
+			<p style="margin-top: 2rem">
+				Explore the other pages to see how AbsoluteJS seamlessly unifies
+				multiple frameworks on a single server.
+			</p>
+			<p style="margin-top: 2rem; font-size: 1rem; color: #777">
+				Click on the AbsoluteJS and HTML logos to learn more.
+			</p>
+		</main>
+	</body>
+</html>
 `;
 };

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

@@ -1,2 +1,2 @@
 import { ProviderOption } from '@absolutejs/auth';
-export declare const generateAbsoluteAuthConfig: (absProviders: ProviderOption[] | undefined) => string;
+export declare const generateAbsoluteAuthConfig: (absProviders: ProviderOption[] | undefined, hasDatabase: boolean) => string;

package/dist/generators/project/generateAbsoluteAuthConfig.js

@@ -12,7 +12,7 @@ const defaultProviderConfigurations = {
         searchParams: [['access_type', 'offline']]
     }
 };
-export const generateAbsoluteAuthConfig = (absProviders) => {
+export const generateAbsoluteAuthConfig = (absProviders, hasDatabase) => {
     const providerConfigs = (absProviders ?? [])
         .map((provider) => {
         const config = defaultProviderConfigurations[provider];
@@ -27,102 +27,113 @@ export const generateAbsoluteAuthConfig = (absProviders) => {
             `                redirectUri: getEnv('OAUTH2_CALLBACK_URI')`
         ].join(',\n');
         const scopePart = config.scope
-            ? `,
+            ? `,
 			scope: ${JSON.stringify(config.scope)}`
             : '';
         const searchParamsPart = config.searchParams && config.searchParams.length > 0
-            ? `,
+            ? `,
 			searchParams: ${JSON.stringify(config.searchParams)}`
             : '';
-        return `        ${provider}: {
-			credentials: {
-${credentialsLines}
-			}${scopePart}${searchParamsPart}
+        return `        ${provider}: {
+			credentials: {
+${credentialsLines}
+			}${scopePart}${searchParamsPart}
 		}`;
     })
         .filter((entry) => entry !== null)
         .join(',\n');
-    return `import { getEnv } from '@absolutejs/absolute';
-import {
-	AbsoluteAuthProps,
-	extractPropFromIdentity,
-	instantiateUserSession,
-	providers
-} from '@absolutejs/auth';
-import { DatabaseType, User } from '../../types/databaseTypes';
-import { createUser, getUser } from '../handlers/userHandlers';
-
-export const absoluteAuthConfig = (
-	db: DatabaseType
-): AbsoluteAuthProps<User> => ({
-	providersConfiguration: {
-${providerConfigs}
-	},
-	onCallbackSuccess: async ({
-		authProvider,
-		providerInstance,
-		tokenResponse,
-		unregisteredSession,
-		cookie: { user_session_id },
-		status,
-		session
-	}) =>
-		instantiateUserSession({
-			authProvider,
-			providerInstance,
-			session,
-			tokenResponse,
-			unregisteredSession,
-			user_session_id,
-			getUser: async (userIdentity) => {
-				const provider = authProvider.toUpperCase();
-				const providerConfiguration = providers[authProvider];
-
-				const subject = extractPropFromIdentity(
-					userIdentity,
-					providerConfiguration.subject,
-					providerConfiguration.subjectType
-				);
-				const authSub = \`\${provider}|\${subject}\`;
-
-				try {
-					const user = await getUser(db, authSub);
-
-					return user;
-				} catch (error) {
-					console.error('Error fetching user:', error);
-					return status(
-						'Internal Server Error',
-						'Could not fetch user data.'
-					);
-				}
-			},
-			onNewUser: async (userIdentity) => {
-				const provider = authProvider.toUpperCase();
-				const providerConfiguration = providers[authProvider];
-
-				const subject = extractPropFromIdentity(
-					userIdentity,
-					providerConfiguration.subject,
-					providerConfiguration.subjectType
-				);
-				const authSub = \`\${provider}|\${subject}\`;
-
-				try {
-					const newUser = await createUser(db, {
-						auth_sub: authSub,
-						metadata: userIdentity
-					});
-					return newUser;
-				} catch (error) {
-					console.error('Error creating user:', error);
-					return status(
-						'Internal Server Error',
-						'Could not create new user.'
-					);
-				}
-			}
-		})
-});
+    if (!hasDatabase) {
+        return `import { getEnv } from '@absolutejs/absolute';
+import { AbsoluteAuthProps } from '@absolutejs/auth';
+
+export const absoluteAuthConfig = (): AbsoluteAuthProps => ({
+	providersConfiguration: {
+${providerConfigs}
+	}
+});
+`;
+    }
+    return `import { getEnv } from '@absolutejs/absolute';
+import {
+	AbsoluteAuthProps,
+	extractPropFromIdentity,
+	instantiateUserSession,
+	providers
+} from '@absolutejs/auth';
+import { DatabaseType, User } from '../../types/databaseTypes';
+import { createUser, getUser } from '../handlers/userHandlers';
+
+export const absoluteAuthConfig = (
+	db: DatabaseType
+): AbsoluteAuthProps<User> => ({
+	providersConfiguration: {
+${providerConfigs}
+	},
+	onCallbackSuccess: async ({
+		authProvider,
+		providerInstance,
+		tokenResponse,
+		unregisteredSession,
+		cookie: { user_session_id },
+		status,
+		session
+	}) =>
+		instantiateUserSession({
+			authProvider,
+			providerInstance,
+			session,
+			tokenResponse,
+			unregisteredSession,
+			user_session_id,
+			getUser: async (userIdentity) => {
+				const provider = authProvider.toUpperCase();
+				const providerConfiguration = providers[authProvider];
+
+				const subject = extractPropFromIdentity(
+					userIdentity,
+					providerConfiguration.subject,
+					providerConfiguration.subjectType
+				);
+				const authSub = \`\${provider}|\${subject}\`;
+
+				try {
+					const user = await getUser(db, authSub);
+
+					return user;
+				} catch (error) {
+					console.error('Error fetching user:', error);
+					return status(
+						'Internal Server Error',
+						'Could not fetch user data.'
+					);
+				}
+			},
+			onNewUser: async (userIdentity) => {
+				const provider = authProvider.toUpperCase();
+				const providerConfiguration = providers[authProvider];
+
+				const subject = extractPropFromIdentity(
+					userIdentity,
+					providerConfiguration.subject,
+					providerConfiguration.subjectType
+				);
+				const authSub = \`\${provider}|\${subject}\`;
+
+				try {
+					const newUser = await createUser(db, {
+						auth_sub: authSub,
+						metadata: userIdentity
+					});
+					return newUser;
+				} catch (error) {
+					console.error('Error creating user:', error);
+					return status(
+						'Internal Server Error',
+						'Could not create new user.'
+					);
+				}
+			}
+		})
+});
 `;
 };

package/dist/generators/project/generateDBBlock.js

@@ -61,19 +61,19 @@ export const generateDBBlock = ({ databaseEngine, orm, databaseHost }) => {
         return '';
     if ((databaseEngine === 'mysql' || databaseEngine === 'mariadb') &&
         databaseHost !== 'planetscale') {
-        return `
-const pool = createPool(getEnv("DATABASE_URL"))
-const db = drizzle(pool, { schema, mode: 'default' })
+        return `
+const pool = createPool(getEnv("DATABASE_URL"))
+const db = drizzle(pool, { schema, mode: 'default' })
 `;
     }
     if (databaseEngine === 'postgresql' && databaseHost === 'neon') {
-        return `
-		const sql = neon(getEnv('DATABASE_URL'));
-const db = drizzle(sql, { schema });
+        return `
+		const sql = neon(getEnv('DATABASE_URL'));
+const db = drizzle(sql, { schema });
 `;
     }
-    return `
-const pool = ${expr}
-const db = drizzle(pool, { schema })
+    return `
+const pool = ${expr}
+const db = drizzle(pool, { schema })
 `;
 };