create-absolutejs 0.3.14 → 0.3.16

package/dist/generators/configurations/generateEnv.d.ts

@@ -1,6 +1,6 @@
 import { CreateConfiguration } from '../../types';
-type GenerateEnvProps = Pick<CreateConfiguration, 'databaseEngine' | 'orm' | 'projectName'> & {
+type GenerateEnvProps = Pick<CreateConfiguration, 'databaseEngine' | 'databaseHost' | 'projectName'> & {
     envVariables?: string[];
 };
-export declare const generateEnv: ({ databaseEngine, orm, envVariables, projectName }: GenerateEnvProps) => void;
+export declare const generateEnv: ({ databaseEngine, databaseHost, envVariables, projectName }: GenerateEnvProps) => void;
 export {};

package/dist/generators/configurations/generateEnv.js

@@ -10,12 +10,12 @@ const databaseURLS = {
     postgresql: 'postgresql://user:password@localhost:5432/database',
     singlestore: 'singlestore://user:password@localhost:3306/database'
 };
-export const generateEnv = ({ databaseEngine, orm, envVariables = [], projectName }) => {
+export const generateEnv = ({ databaseEngine, databaseHost, envVariables = [], projectName }) => {
     const vars = [...envVariables];
     if (databaseEngine !== 'sqlite' &&
         databaseEngine !== 'none' &&
         databaseEngine !== undefined &&
-        (orm === 'none' || orm === undefined)) {
+        (databaseHost === 'none' || databaseHost === undefined)) {
         vars.push(`DATABASE_URL=${databaseURLS[databaseEngine]}`);
     }
     if (vars.length === 0)

package/dist/generators/configurations/generatePackageJson.js

@@ -95,10 +95,12 @@ export const createPackageJson = ({ projectName, authProvider, plugins, database
         scripts['db:up'] =
             'sh -c "docker info >/dev/null 2>&1 || sudo service docker start; docker compose -f db/docker-compose.db.yml up -d db"';
         scripts['db:down'] = 'docker compose -f db/docker-compose.db.yml down';
+        scripts['db:reset'] =
+            'docker compose -f db/docker-compose.db.yml down -v';
+        scripts['db:mysql'] =
+            'docker compose -f db/docker-compose.db.yml exec db mysql -u user -ppassword';
         scripts['predev'] = 'bun db:up';
         scripts['postdev'] = 'bun db:down';
-        scripts['db:mysql'] =
-            'docker compose -f db/docker-compose.db.yml exec db mysql -u appuser -pappuser appdb';
     }
     if (databaseEngine === 'sqlite' &&
         (!databaseHost || databaseHost === 'none')) {

package/dist/generators/configurations/scaffoldConfigurationFiles.d.ts

@@ -0,0 +1,7 @@
+import type { CreateConfiguration } from '../../types';
+type AddConfigurationProps = Pick<CreateConfiguration, 'tailwind' | 'initializeGitNow' | 'codeQualityTool' | 'frontends' | 'projectName' | 'databaseEngine' | 'databaseHost'> & {
+    templatesDirectory: string;
+    envVariables: string[] | undefined;
+};
+export declare const scaffoldConfigurationFiles: ({ tailwind, templatesDirectory, databaseEngine, envVariables, databaseHost, codeQualityTool, frontends, initializeGitNow, projectName }: AddConfigurationProps) => void;
+export {};

package/dist/generators/configurations/{addConfigurationFiles.js → scaffoldConfigurationFiles.js}

@@ -3,7 +3,7 @@ import { join } from 'path';
 import { dim, yellow } from 'picocolors';
 import { generateEnv } from './generateEnv';
 import { generatePrettierrc } from './generatePrettierrc';
-export const addConfigurationFiles = ({ tailwind, templatesDirectory, orm, databaseEngine, envVariables, codeQualityTool, frontends, initializeGitNow, projectName }) => {
+export const scaffoldConfigurationFiles = ({ tailwind, templatesDirectory, databaseEngine, envVariables, databaseHost, codeQualityTool, frontends, initializeGitNow, projectName }) => {
     copyFileSync(join(templatesDirectory, 'configurations', 'tsconfig.example.json'), join(projectName, 'tsconfig.json'));
     if (tailwind) {
         copyFileSync(join(templatesDirectory, 'tailwind', 'postcss.config.ts'), join(projectName, 'postcss.config.ts'));
@@ -21,8 +21,8 @@ export const addConfigurationFiles = ({ tailwind, templatesDirectory, orm, datab
         console.warn(`${dim('│')}\n${yellow('▲')}  Biome support not implemented yet`);
     generateEnv({
         databaseEngine,
+        databaseHost,
         envVariables,
-        orm,
         projectName
     });
 };

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

@@ -34,6 +34,11 @@ declare const driverConfigurations: {
         readonly importLines: "import { ConnectionPool } from 'mssql'";
         readonly queries: QueryOperations;
     };
+    readonly 'mysql:drizzle:local': {
+        readonly dbType: "MySql2Database<SchemaType>";
+        readonly importLines: "\nimport { eq } from 'drizzle-orm'\nimport { MySql2Database } from 'drizzle-orm/mysql2'\nimport { schema, type SchemaType } from '../../../db/schema'";
+        readonly queries: QueryOperations;
+    };
     readonly 'mysql:sql:local': {
         readonly dbType: "Pool";
         readonly handlerTypes: HandlerType;

package/dist/generators/db/handlerTemplates.js

@@ -235,6 +235,39 @@ const mysqlHandlerTypes = {
 		metadata: string;
 	}`
 };
+const mysqlDrizzleQueryOperations = {
+    insertHistory: `const [row] = await db
+    .insert(schema.countHistory)
+    .values({ count })
+    .$returningId();
+
+  if (!row) throw new Error('insert failed: no uid returned');
+  const { uid } = row;
+
+  const [newHistory] = await db
+    .select()
+    .from(schema.countHistory)
+    .where(eq(schema.countHistory.uid, uid));
+
+  return newHistory;`,
+    insertUser: `const [row] = await db
+    .insert(schema.users)
+    .values({ auth_sub: authSub, metadata: userIdentity })
+    .$returningId();
+
+  if (!row) throw new Error('insert failed: no uid returned');
+  const { uid } = row;
+
+  const [newUser] = await db
+    .select()
+    .from(schema.users)
+    .where(eq(schema.users.uid, uid));
+
+  if (!newUser) throw new Error('Failed to create user');
+  return newUser;`,
+    selectHistory: drizzleQueryOperations.selectHistory,
+    selectUser: drizzleQueryOperations.selectUser
+};
 const driverConfigurations = {
     'cockroachdb:sql:local': {
         dbType: 'Pool',
@@ -261,6 +294,14 @@ const driverConfigurations = {
         importLines: `import { ConnectionPool } from 'mssql'`,
         queries: mssqlSqlQueryOperations
     },
+    'mysql:drizzle:local': {
+        dbType: 'MySql2Database<SchemaType>',
+        importLines: `
+import { eq } from 'drizzle-orm'
+import { MySql2Database } from 'drizzle-orm/mysql2'
+import { schema, type SchemaType } from '../../../db/schema'`,
+        queries: mysqlDrizzleQueryOperations
+    },
     'mysql:sql:local': {
         dbType: 'Pool',
         handlerTypes: mysqlHandlerTypes,

package/dist/generators/db/scaffoldDatabase.js

@@ -10,6 +10,11 @@ import { generateDatabaseContainer } from './generateDBContainer';
 import { generateDBHandlers } from './generateDBHandlers';
 import { generateDrizzleSchema } from './generateDrizzleSchema';
 import { generateSqliteSchema } from './generateSqliteSchema';
+const scaffoldDocker = async (databaseEngine, projectDatabaseDirectory) => {
+    await checkDockerInstalled();
+    const dbContainer = generateDatabaseContainer(databaseEngine);
+    writeFileSync(join(projectDatabaseDirectory, 'docker-compose.db.yml'), dbContainer, 'utf-8');
+};
 export const scaffoldDatabase = async ({ projectName, databaseEngine, databaseHost, databaseDirectory, backendDirectory, authProvider, orm }) => {
     const projectDatabaseDirectory = join(projectName, databaseDirectory);
     const handlerDirectory = join(backendDirectory, 'handlers');
@@ -30,10 +35,13 @@ export const scaffoldDatabase = async ({ projectName, databaseEngine, databaseHo
         void ((orm === undefined || orm === 'none') &&
             (await checkSqliteInstalled()));
         const sqliteSchema = generateSqliteSchema(authProvider);
-        const sqliteSchemaFilePath = join(projectDatabaseDirectory, 'schema.sql');
-        writeFileSync(sqliteSchemaFilePath, sqliteSchema);
+        writeFileSync(join(projectDatabaseDirectory, 'schema.sql'), sqliteSchema);
         await $ `sqlite3 ${databaseDirectory}/database.sqlite ".read ${join(databaseDirectory, 'schema.sql')}"`.cwd(projectName);
     }
+    if (databaseEngine !== 'sqlite' &&
+        (databaseHost === undefined || databaseHost === 'none')) {
+        await scaffoldDocker(databaseEngine, projectDatabaseDirectory);
+    }
     if (orm === 'drizzle') {
         if (!isDrizzleDialect(databaseEngine)) {
             throw new Error('Internal type error: Expected a Drizzle dialect');
@@ -43,18 +51,11 @@ export const scaffoldDatabase = async ({ projectName, databaseEngine, databaseHo
             databaseEngine,
             databaseHost
         });
-        const schemaFilePath = join(projectDatabaseDirectory, 'schema.ts');
-        writeFileSync(schemaFilePath, drizzleSchema);
+        writeFileSync(join(projectDatabaseDirectory, 'schema.ts'), drizzleSchema);
         createDrizzleConfig({ databaseDirectory, databaseEngine, projectName });
         return;
     }
     if (orm === 'prisma') {
         console.warn(`${dim('│')}\n${yellow('▲')}  Prisma support is not implemented yet`);
-        return;
-    }
-    if (databaseEngine !== 'sqlite' && (orm === undefined || orm === 'none')) {
-        await checkDockerInstalled();
-        const dbContainer = generateDatabaseContainer(databaseEngine);
-        writeFileSync(join(projectDatabaseDirectory, 'docker-compose.db.yml'), dbContainer, 'utf-8');
     }
 };

package/dist/generators/project/generateDBBlock.js

@@ -51,14 +51,20 @@ export const generateDBBlock = ({ databaseEngine, orm, databaseHost }) => {
             return '';
         return `
 const db = ${hostCfg.expr}
-${hostCfg.connect ? 'await db.connect();\n' : ''}
-`;
+${hostCfg.connect ? 'await db.connect();\n' : ''}`;
     }
     if (!drizzleDialectSet.has(databaseEngine))
         return '';
     const expr = engineGroup[hostKey]?.expr ?? remoteDrizzleInit[hostKey];
     if (!expr)
         return '';
+    if (databaseEngine === 'mysql') {
+        const mode = databaseHost === 'planetscale' ? 'planetscale' : 'default';
+        return `
+const sql = ${expr}
+const db = drizzle(sql, { schema, mode: '${mode}' })
+`;
+    }
     return `
 const sql = ${expr}
 const db = drizzle(sql, { schema })

package/dist/generators/project/generateImportsBlock.js

@@ -66,10 +66,17 @@ export const generateImportsBlock = ({ backendDirectory, deps, flags, orm, authP
                 `import { getEnv } from '@absolutejs/absolute'`
             ]
             : [`import { Database } from 'bun:sqlite'`]));
-    if (noOrm && databaseEngine === 'mysql') {
-        rawImports.push(...(isRemoteHost
-            ? connectorImports[databaseHost]
-            : [`import { createPool } from 'mysql2/promise'`]), `import { getEnv } from '@absolutejs/absolute'`);
+    if (databaseEngine === 'mysql' && isRemoteHost) {
+        rawImports.push(...connectorImports[databaseHost]);
+    }
+    if (databaseEngine === 'mysql' && !isRemoteHost) {
+        rawImports.push("import { createPool } from 'mysql2/promise'");
+    }
+    if (databaseEngine === 'mysql' && orm === 'drizzle') {
+        rawImports.push("import { drizzle } from 'drizzle-orm/mysql2'");
+    }
+    if (databaseEngine === 'mysql') {
+        rawImports.push("import { getEnv } from '@absolutejs/absolute'");
     }
     if (noOrm && databaseEngine === 'postgresql')
         rawImports.push(...(isRemoteHost

package/dist/scaffold.js

@@ -4,9 +4,9 @@ import { fileURLToPath } from 'node:url';
 import { formatProject } from './commands/formatProject';
 import { initializeGit } from './commands/initializeGit';
 import { installDependencies } from './commands/installDependencies';
-import { addConfigurationFiles } from './generators/configurations/addConfigurationFiles';
 import { createPackageJson } from './generators/configurations/generatePackageJson';
 import { initalizeRoot } from './generators/configurations/initializeRoot';
+import { scaffoldConfigurationFiles } from './generators/configurations/scaffoldConfigurationFiles';
 import { scaffoldDatabase } from './generators/db/scaffoldDatabase';
 import { generateServerFile } from './generators/project/generateServer';
 import { scaffoldFrontends } from './generators/project/scaffoldFrontends';
@@ -15,13 +15,13 @@ export const scaffold = async ({ response: { projectName, codeQualityTool, initi
     const templatesDirectory = join(__dirname, '/templates');
     const { frontendDirectory, backendDirectory, projectAssetsDirectory } = initalizeRoot(projectName, templatesDirectory);
     copyFileSync(join(templatesDirectory, 'README.md'), join(projectName, 'README.md'));
-    addConfigurationFiles({
+    scaffoldConfigurationFiles({
         codeQualityTool,
         databaseEngine,
+        databaseHost,
         envVariables,
         frontends,
         initializeGitNow,
-        orm,
         projectName,
         tailwind,
         templatesDirectory

package/package.json

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

package/dist/generators/configurations/addConfigurationFiles.d.ts

@@ -1,8 +0,0 @@
-import type { CreateConfiguration } from '../../types';
-type AddConfigurationProps = Pick<CreateConfiguration, 'tailwind' | 'initializeGitNow' | 'codeQualityTool' | 'frontends' | 'projectName' | 'databaseEngine' | 'orm'> & {
-    templatesDirectory: string;
-    projectName: string;
-    envVariables: string[] | undefined;
-};
-export declare const addConfigurationFiles: ({ tailwind, templatesDirectory, orm, databaseEngine, envVariables, codeQualityTool, frontends, initializeGitNow, projectName }: AddConfigurationProps) => void;
-export {};