create-absolutejs 0.3.11 → 0.3.12

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

@@ -8,6 +8,7 @@ type GenerateImportsBlockProps = {
     authProvider: CreateConfiguration['authProvider'];
     databaseEngine: CreateConfiguration['databaseEngine'];
     databaseHost: CreateConfiguration['databaseHost'];
+    frontendDirectories: CreateConfiguration['frontendDirectories'];
 };
-export declare const generateImportsBlock: ({ backendDirectory, deps, flags, orm, authProvider, databaseEngine, databaseHost }: GenerateImportsBlockProps) => string;
+export declare const generateImportsBlock: ({ backendDirectory, deps, flags, orm, authProvider, databaseEngine, databaseHost, frontendDirectories }: GenerateImportsBlockProps) => string;
 export {};

package/dist/generators/project/generateImportsBlock.js

@@ -1,6 +1,6 @@
 import { mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
-export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authProvider, databaseEngine, databaseHost }) => {
+export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authProvider, databaseEngine, databaseHost, frontendDirectories }) => {
     const rawImports = [];
     const pushHandler = (cond, name) => cond &&
         rawImports.push(`import { ${name} } from '@absolutejs/absolute'`);
@@ -26,12 +26,16 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
             .sort()
             .join(', ')} } from '${dependency.value}'`);
     }
-    if (flags.requiresReact)
-        rawImports.push(`import { ReactExample } from '../frontend/react/pages/ReactExample'`);
-    if (flags.requiresSvelte)
-        rawImports.push(`import SvelteExample from '../frontend/svelte/pages/SvelteExample.svelte'`);
-    if (flags.requiresVue && !flags.requiresSvelte)
-        rawImports.push(`import VueExample from '../frontend/vue/pages/VueExample.vue'`);
+    const buildExamplePath = (dir, file) => `../frontend${dir ? `/${dir}` : ''}/pages/${file}`;
+    const reactDir = frontendDirectories.react;
+    const svelteDir = frontendDirectories.svelte;
+    const vueDir = frontendDirectories.vue;
+    if (flags.requiresReact && reactDir !== undefined)
+        rawImports.push(`import { ReactExample } from '${buildExamplePath(reactDir, 'ReactExample')}'`);
+    if (flags.requiresSvelte && svelteDir !== undefined)
+        rawImports.push(`import SvelteExample from '${buildExamplePath(svelteDir, 'SvelteExample.svelte')}'`);
+    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'"],
@@ -45,6 +49,8 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
         turso: ["import { drizzle } from 'drizzle-orm/libsql'"]
     };
     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]);
@@ -53,13 +59,17 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
         rawImports.push(`import { SQL } from 'bun'`, `import { drizzle } from 'drizzle-orm/bun-sql'`);
     if (orm === 'drizzle' && databaseEngine === 'sqlite' && !isRemoteHost)
         rawImports.push(`import { Database } from 'bun:sqlite'`, `import { drizzle } from 'drizzle-orm/bun-sqlite'`);
-    if ((orm ?? 'none') === 'none' && databaseEngine === 'sqlite')
+    if (noOrm && databaseEngine === 'sqlite')
         rawImports.push(...(databaseHost === 'turso'
             ? [
                 `import { createClient } from '@libsql/client'`,
                 `import { getEnv } from '@absolutejs/absolute'`
             ]
             : [`import { Database } from 'bun:sqlite'`]));
+    if (noOrm && databaseEngine === 'postgresql')
+        rawImports.push(...(isRemoteHost
+            ? connectorImports[databaseHost]
+            : [`import { SQL } from 'bun'`]), `import { getEnv } from '@absolutejs/absolute'`);
     if (orm === 'drizzle') {
         rawImports.push(`import { Elysia } from 'elysia'`, ...(databaseEngine === 'sqlite' && !isRemoteHost
             ? []
@@ -67,25 +77,19 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
             ? `import { schema, User } from '../../db/schema'`
             : `import { schema } from '../../db/schema'`);
     }
-    if ((orm === undefined || orm === 'none') &&
-        databaseEngine === 'postgresql')
-        rawImports.push(...(isRemoteHost
-            ? connectorImports[databaseHost]
-            : [`import { SQL } from 'bun'`]), `import { getEnv } from '@absolutejs/absolute'`);
     if (authProvider === 'absoluteAuth')
-        rawImports.push(`import { absoluteAuth, instantiateUserSession } from '@absolutejs/auth'`, ...(databaseEngine && databaseEngine !== 'none'
+        rawImports.push(`import { absoluteAuth, instantiateUserSession } from '@absolutejs/auth'`, ...(hasDatabase
             ? [
                 `import { createUser, getUser } from './handlers/userHandlers'`
             ]
             : []));
-    if ((authProvider === undefined || authProvider === 'none') &&
-        databaseEngine !== undefined &&
-        databaseEngine !== 'none')
+    if (hasDatabase && (authProvider === undefined || authProvider === 'none'))
         rawImports.push(`import { getCountHistory, createCountHistory } from './handlers/countHistoryHandlers'`, `import { t } from 'elysia'`);
     if (flags.requiresVue && flags.requiresSvelte) {
         const utilsDir = join(backendDirectory, 'utils');
         mkdirSync(utilsDir, { recursive: true });
-        writeFileSync(join(utilsDir, 'vueImporter.ts'), `import VueExample from "../../frontend/vue/pages/VueExample.vue"\n\nexport const vueImports = { VueExample } as const\n`);
+        const vuePathForUtils = `../../frontend${vueDir ? `/${vueDir}` : ''}/pages/VueExample.vue`;
+        writeFileSync(join(utilsDir, 'vueImporter.ts'), `import VueExample from "${vuePathForUtils}"\n\nexport const vueImports = { VueExample } as const\n`);
         rawImports.push(`import { vueImports } from './utils/vueImporter'`);
     }
     const importMap = new Map();

package/dist/generators/project/generateServer.js

@@ -18,6 +18,7 @@ export const generateServerFile = ({ tailwind, authProvider, plugins, buildDirec
         databaseHost,
         deps,
         flags,
+        frontendDirectories,
         orm
     });
     const manifestBlock = generateBuildBlock({

package/package.json

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