create-absolutejs 0.3.17 → 0.3.20

package/dist/generators/configurations/generatePackageJson.js

@@ -37,7 +37,7 @@ export const createPackageJson = ({ projectName, authProvider, plugins, database
         devDependencies['@tailwindcss/cli'] = resolveVersion('@tailwindcss/cli', '4.1.7');
     }
     if (flags.requiresReact) {
-        dependencies['react'] = resolveVersion('react', '19.1.0');
+        dependencies['react'] = resolveVersion('react', '19.1.1');
         devDependencies['@types/react'] = resolveVersion('@types/react', '19.1.8');
     }
     if (flags.requiresSvelte) {
@@ -78,13 +78,13 @@ export const createPackageJson = ({ projectName, authProvider, plugins, database
     if (databaseEngine === 'postgresql' &&
         (!databaseHost || databaseHost === 'none')) {
         scripts['db:up'] =
-            'sh -c "docker info >/dev/null 2>&1 || sudo service docker start; docker compose -p postgres -f db/docker-compose.db.yml up -d db"';
+            'sh -c "docker info >/dev/null 2>&1 || sudo service docker start; docker compose -p postgresql -f db/docker-compose.db.yml up -d db"';
         scripts['db:down'] =
-            'docker compose -p postgres -f db/docker-compose.db.yml down';
+            'docker compose -p postgresql -f db/docker-compose.db.yml down';
         scripts['db:reset'] =
-            'docker compose -p postgres -f db/docker-compose.db.yml down -v';
+            'docker compose -p postgresql -f db/docker-compose.db.yml down -v';
         scripts['db:psql'] =
-            "docker compose -p postgres -f db/docker-compose.db.yml exec db bash -lc 'until pg_isready -U user -h localhost --quiet; do sleep 1; done; exec psql -h localhost -U user -d database'";
+            "docker compose -p postgresql -f db/docker-compose.db.yml exec db bash -lc 'until pg_isready -U user -h localhost --quiet; do sleep 1; done; exec psql -h localhost -U user -d database'";
         scripts['predev'] = 'bun db:up';
         scripts['predb:psql'] = 'bun db:up';
         scripts['postdev'] = 'bun db:down';

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

@@ -0,0 +1,48 @@
+export declare const userTables: {
+    readonly cockroachdb: "CREATE TABLE IF NOT EXISTS users (\n  auth_sub   VARCHAR(255) PRIMARY KEY,\n  created_at TIMESTAMP NOT NULL DEFAULT NOW(),\n  metadata   JSONB        DEFAULT '{}'::jsonb\n);";
+    readonly gel: "CREATE TABLE IF NOT EXISTS users (\n  auth_sub   VARCHAR(255) PRIMARY KEY,\n  created_at TIMESTAMP NOT NULL DEFAULT NOW(),\n  metadata   JSON        DEFAULT '{}'::json\n);";
+    readonly mariadb: "CREATE TABLE IF NOT EXISTS users (\n  auth_sub   VARCHAR(255) PRIMARY KEY,\n  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n  metadata   JSON         DEFAULT ('{}')\n);";
+    readonly mssql: "IF OBJECT_ID('users','U') IS NULL\nBEGIN\n  CREATE TABLE users (\n    auth_sub   NVARCHAR(255) PRIMARY KEY,\n    created_at DATETIME2     NOT NULL DEFAULT SYSUTCDATETIME(),\n    metadata   NVARCHAR(MAX) NULL\n  );\nEND;";
+    readonly mysql: "CREATE TABLE IF NOT EXISTS users (\n  auth_sub   VARCHAR(255) PRIMARY KEY,\n  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n  metadata   JSON         DEFAULT (JSON_OBJECT())\n);";
+    readonly postgresql: "CREATE TABLE IF NOT EXISTS users (\n  auth_sub   VARCHAR(255) PRIMARY KEY,\n  created_at TIMESTAMP NOT NULL DEFAULT NOW(),\n  metadata   JSONB        DEFAULT '{}'::jsonb\n);";
+    readonly singlestore: "CREATE TABLE IF NOT EXISTS users (\n  auth_sub   VARCHAR(255) PRIMARY KEY,\n  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n  metadata   JSON         DEFAULT ('{}')\n);";
+};
+export declare const countHistoryTables: {
+    readonly cockroachdb: "CREATE TABLE IF NOT EXISTS count_history (\n  uid         INT PRIMARY KEY DEFAULT unique_rowid(),\n  count       INT      NOT NULL,\n  created_at  TIMESTAMP NOT NULL DEFAULT NOW()\n);";
+    readonly gel: "CREATE TABLE IF NOT EXISTS count_history (\n  uid         INTEGER   PRIMARY KEY GENERATED ALWAYS AS IDENTITY,\n  count       INTEGER   NOT NULL,\n  created_at  TIMESTAMP NOT NULL DEFAULT NOW()\n);";
+    readonly mariadb: "CREATE TABLE IF NOT EXISTS count_history (\n  uid         INT AUTO_INCREMENT PRIMARY KEY,\n  count       INT NOT NULL,\n  created_at  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP\n);";
+    readonly mssql: "IF OBJECT_ID('count_history','U') IS NULL\nBEGIN\n  CREATE TABLE count_history (\n    uid         INT IDENTITY(1,1) PRIMARY KEY,\n    count       INT        NOT NULL,\n    created_at  DATETIME2   NOT NULL DEFAULT SYSUTCDATETIME()\n  );\nEND;";
+    readonly mysql: "CREATE TABLE IF NOT EXISTS count_history (\n  uid         INT AUTO_INCREMENT PRIMARY KEY,\n  count       INT NOT NULL,\n  created_at  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP\n);";
+    readonly postgresql: "CREATE TABLE IF NOT EXISTS count_history (\n  uid         INTEGER   PRIMARY KEY GENERATED ALWAYS AS IDENTITY,\n  count       INTEGER   NOT NULL,\n  created_at  TIMESTAMP NOT NULL DEFAULT NOW()\n);";
+    readonly singlestore: "CREATE TABLE IF NOT EXISTS count_history (\n  uid         INT AUTO_INCREMENT PRIMARY KEY,\n  count       INT NOT NULL,\n  created_at  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP\n);";
+};
+export declare const initTemplates: {
+    readonly cockroachdb: {
+        readonly cli: "cockroach sql --insecure --host=localhost -e";
+        readonly wait: "until pg_isready -U root -h localhost --quiet; do sleep 1; done";
+    };
+    readonly gel: {
+        readonly cli: "psql -U user -d database -c";
+        readonly wait: "until pg_isready -U user -h localhost --quiet; do sleep 1; done";
+    };
+    readonly mariadb: {
+        readonly cli: "MYSQL_PWD=userpassword mariadb -h127.0.0.1 -u user -e";
+        readonly wait: "until mysqladmin ping -h127.0.0.1 --silent; do sleep 1; done";
+    };
+    readonly mssql: {
+        readonly cli: "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P sapassword -Q";
+        readonly wait: "until /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P sapassword -Q \"SELECT 1\" >/dev/null 2>&1; do sleep 1; done";
+    };
+    readonly mysql: {
+        readonly cli: "MYSQL_PWD=userpassword mysql -h127.0.0.1 -u user database -e";
+        readonly wait: "until mysqladmin ping -h127.0.0.1 --silent; do sleep 1; done";
+    };
+    readonly postgresql: {
+        readonly cli: "psql -U user -d database -c";
+        readonly wait: "until pg_isready -U user -h localhost --quiet; do sleep 1; done";
+    };
+    readonly singlestore: {
+        readonly cli: "MYSQL_PWD=userpassword mysql -h127.0.0.1 -u user -e";
+        readonly wait: "until mysqladmin ping -h127.0.0.1 --silent; do sleep 1; done";
+    };
+};

package/dist/generators/db/dockerInitTemplates.js

@@ -0,0 +1,124 @@
+const postgresqlUsers = `CREATE TABLE IF NOT EXISTS users (
+  auth_sub   VARCHAR(255) PRIMARY KEY,
+  created_at TIMESTAMP NOT NULL DEFAULT NOW(),
+  metadata   JSONB        DEFAULT '{}'::jsonb
+);`;
+const postgresqlCountHistory = `CREATE TABLE IF NOT EXISTS count_history (
+  uid         INTEGER   PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  count       INTEGER   NOT NULL,
+  created_at  TIMESTAMP NOT NULL DEFAULT NOW()
+);`;
+const mysqlUsers = `CREATE TABLE IF NOT EXISTS users (
+  auth_sub   VARCHAR(255) PRIMARY KEY,
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  metadata   JSON         DEFAULT (JSON_OBJECT())
+);`;
+const mysqlCountHistory = `CREATE TABLE IF NOT EXISTS count_history (
+  uid         INT AUTO_INCREMENT PRIMARY KEY,
+  count       INT NOT NULL,
+  created_at  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);`;
+const mariadbUsers = `CREATE TABLE IF NOT EXISTS users (
+  auth_sub   VARCHAR(255) PRIMARY KEY,
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  metadata   JSON         DEFAULT ('{}')
+);`;
+const mariadbCountHistory = `CREATE TABLE IF NOT EXISTS count_history (
+  uid         INT AUTO_INCREMENT PRIMARY KEY,
+  count       INT NOT NULL,
+  created_at  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);`;
+const singlestoreUsers = `CREATE TABLE IF NOT EXISTS users (
+  auth_sub   VARCHAR(255) PRIMARY KEY,
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  metadata   JSON         DEFAULT ('{}')
+);`;
+const singlestoreCountHistory = `CREATE TABLE IF NOT EXISTS count_history (
+  uid         INT AUTO_INCREMENT PRIMARY KEY,
+  count       INT NOT NULL,
+  created_at  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);`;
+const cockroachdbUsers = `CREATE TABLE IF NOT EXISTS users (
+  auth_sub   VARCHAR(255) PRIMARY KEY,
+  created_at TIMESTAMP NOT NULL DEFAULT NOW(),
+  metadata   JSONB        DEFAULT '{}'::jsonb
+);`;
+const cockroachdbCountHistory = `CREATE TABLE IF NOT EXISTS count_history (
+  uid         INT PRIMARY KEY DEFAULT unique_rowid(),
+  count       INT      NOT NULL,
+  created_at  TIMESTAMP NOT NULL DEFAULT NOW()
+);`;
+const mssqlUsers = `IF OBJECT_ID('users','U') IS NULL
+BEGIN
+  CREATE TABLE users (
+    auth_sub   NVARCHAR(255) PRIMARY KEY,
+    created_at DATETIME2     NOT NULL DEFAULT SYSUTCDATETIME(),
+    metadata   NVARCHAR(MAX) NULL
+  );
+END;`;
+const mssqlCountHistory = `IF OBJECT_ID('count_history','U') IS NULL
+BEGIN
+  CREATE TABLE count_history (
+    uid         INT IDENTITY(1,1) PRIMARY KEY,
+    count       INT        NOT NULL,
+    created_at  DATETIME2   NOT NULL DEFAULT SYSUTCDATETIME()
+  );
+END;`;
+const gelUsers = `CREATE TABLE IF NOT EXISTS users (
+  auth_sub   VARCHAR(255) PRIMARY KEY,
+  created_at TIMESTAMP NOT NULL DEFAULT NOW(),
+  metadata   JSON        DEFAULT '{}'::json
+);`;
+const gelCountHistory = `CREATE TABLE IF NOT EXISTS count_history (
+  uid         INTEGER   PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
+  count       INTEGER   NOT NULL,
+  created_at  TIMESTAMP NOT NULL DEFAULT NOW()
+);`;
+export const userTables = {
+    cockroachdb: cockroachdbUsers,
+    gel: gelUsers,
+    mariadb: mariadbUsers,
+    mssql: mssqlUsers,
+    mysql: mysqlUsers,
+    postgresql: postgresqlUsers,
+    singlestore: singlestoreUsers
+};
+export const countHistoryTables = {
+    cockroachdb: cockroachdbCountHistory,
+    gel: gelCountHistory,
+    mariadb: mariadbCountHistory,
+    mssql: mssqlCountHistory,
+    mysql: mysqlCountHistory,
+    postgresql: postgresqlCountHistory,
+    singlestore: singlestoreCountHistory
+};
+export const initTemplates = {
+    cockroachdb: {
+        cli: 'cockroach sql --insecure --host=localhost -e',
+        wait: 'until pg_isready -U root -h localhost --quiet; do sleep 1; done'
+    },
+    gel: {
+        cli: 'psql -U user -d database -c',
+        wait: 'until pg_isready -U user -h localhost --quiet; do sleep 1; done'
+    },
+    mariadb: {
+        cli: 'MYSQL_PWD=userpassword mariadb -h127.0.0.1 -u user -e',
+        wait: 'until mysqladmin ping -h127.0.0.1 --silent; do sleep 1; done'
+    },
+    mssql: {
+        cli: '/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P sapassword -Q',
+        wait: 'until /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P sapassword -Q "SELECT 1" >/dev/null 2>&1; do sleep 1; done'
+    },
+    mysql: {
+        cli: 'MYSQL_PWD=userpassword mysql -h127.0.0.1 -u user database -e',
+        wait: 'until mysqladmin ping -h127.0.0.1 --silent; do sleep 1; done'
+    },
+    postgresql: {
+        cli: 'psql -U user -d database -c',
+        wait: 'until pg_isready -U user -h localhost --quiet; do sleep 1; done'
+    },
+    singlestore: {
+        cli: 'MYSQL_PWD=userpassword mysql -h127.0.0.1 -u user -e',
+        wait: 'until mysqladmin ping -h127.0.0.1 --silent; do sleep 1; done'
+    }
+};

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

@@ -0,0 +1,2 @@
+import { DatabaseEngine } from '../../types';
+export declare const generateDockerContainer: (databaseEngine: DatabaseEngine) => string;

package/dist/generators/db/{generateDBContainer.js → generateDockerContainer.js}

@@ -78,7 +78,7 @@ const templates = {
         volumePath: '/var/lib/memsql'
     }
 };
-export const generateDatabaseContainer = (databaseEngine) => {
+export const generateDockerContainer = (databaseEngine) => {
     if (databaseEngine === undefined ||
         databaseEngine === 'none' ||
         databaseEngine === 'sqlite') {

package/dist/generators/db/scaffoldDatabase.js

@@ -3,18 +3,12 @@ import { join } from 'path';
 import { $ } from 'bun';
 import { dim, yellow } from 'picocolors';
 import { isDrizzleDialect } from '../../typeGuards';
-import { checkDockerInstalled } from '../../utils/checkDockerInstalled';
 import { checkSqliteInstalled } from '../../utils/checkSqliteInstalled';
 import { createDrizzleConfig } from '../configurations/generateDrizzleConfig';
-import { generateDatabaseContainer } from './generateDBContainer';
-import { generateDBHandlers } from './generateDBHandlers';
 import { generateDrizzleSchema } from './generateDrizzleSchema';
+import { generateDBHandlers } from './generateHandlers';
 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');
-};
+import { scaffoldDocker } from './scaffoldDocker';
 export const scaffoldDatabase = async ({ projectName, databaseEngine, databaseHost, databaseDirectory, backendDirectory, authProvider, orm }) => {
     const projectDatabaseDirectory = join(projectName, databaseDirectory);
     const handlerDirectory = join(backendDirectory, 'handlers');
@@ -38,9 +32,16 @@ export const scaffoldDatabase = async ({ projectName, databaseEngine, databaseHo
         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 ((databaseHost === 'none' || databaseHost === undefined) &&
+        databaseEngine !== 'sqlite' &&
+        databaseEngine !== undefined &&
+        databaseEngine !== 'none') {
+        await scaffoldDocker({
+            authProvider,
+            databaseEngine,
+            projectDatabaseDirectory,
+            projectName
+        });
     }
     if (orm === 'drizzle') {
         if (!isDrizzleDialect(databaseEngine)) {

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

@@ -0,0 +1,9 @@
+import { AuthProvider, DatabaseEngine } from '../../types';
+type ScaffoldDockerProps = {
+    databaseEngine: DatabaseEngine;
+    projectDatabaseDirectory: string;
+    authProvider: AuthProvider;
+    projectName: string;
+};
+export declare const scaffoldDocker: ({ databaseEngine, projectDatabaseDirectory, projectName, authProvider }: ScaffoldDockerProps) => Promise<void>;
+export {};

package/dist/generators/db/scaffoldDocker.js

@@ -0,0 +1,29 @@
+import { writeFileSync } from 'fs';
+import { join } from 'path';
+import { $ } from 'bun';
+import { checkDockerInstalled } from '../../utils/checkDockerInstalled';
+import { countHistoryTables, initTemplates, userTables } from './dockerInitTemplates';
+import { generateDockerContainer } from './generateDockerContainer';
+export const scaffoldDocker = async ({ databaseEngine, projectDatabaseDirectory, projectName, authProvider }) => {
+    if (databaseEngine === undefined ||
+        databaseEngine === 'none' ||
+        databaseEngine === 'sqlite') {
+        throw new Error('Internal type error: databaseEngine must be defined and not "none" or "sqlite"');
+    }
+    await checkDockerInstalled();
+    const dbContainer = generateDockerContainer(databaseEngine);
+    writeFileSync(join(projectDatabaseDirectory, 'docker-compose.db.yml'), dbContainer, 'utf-8');
+    if (databaseEngine === 'mongodb') {
+    }
+    else {
+        const { wait, cli } = initTemplates[databaseEngine];
+        const usesAuth = authProvider !== undefined && authProvider !== '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 \
+  bash -lc '${wait} && ${cli} "${dbCommand}"'`.cwd(projectName);
+        await $ `bun db:down`.cwd(projectName);
+    }
+};

package/dist/generators/project/generateServer.js

@@ -27,7 +27,10 @@ export const generateServerFile = ({ tailwind, authProvider, plugins, buildDirec
         frontendDirectories,
         tailwind
     });
-    const dbBlock = generateDBBlock({ databaseEngine, databaseHost, orm });
+    let dbBlock = '';
+    if (databaseEngine && databaseEngine !== 'none') {
+        dbBlock = generateDBBlock({ databaseEngine, databaseHost, orm });
+    }
     const useBlock = generateUseBlock({
         databaseEngine,
         deps,

package/package.json

@@ -39,7 +39,7 @@
 	},
 	"scripts": {
 		"build": "rm -rf dist && tsc --project tsconfig.build.json && cp -R src/templates dist/templates",
-		"dev": "rm -rf absolutejs-project && bun run src/index.ts",
+		"dev": "if [ -f absolutejs-project/package.json ] && grep -q '\"db:reset\"' absolutejs-project/package.json; then cd absolutejs-project && bun run db:reset && cd ..; fi && rm -rf absolutejs-project && bun run src/index.ts",
 		"format": "prettier --write \"./**/*.{js,jsx,ts,tsx,css,json,mjs,md,svelte,html,vue}\"",
 		"lint": "eslint ./",
 		"release": "bun run format && bun run build && bun publish",
@@ -47,5 +47,5 @@
 		"typecheck": "bun run tsc --noEmit"
 	},
 	"type": "module",
-	"version": "0.3.17"
+	"version": "0.3.20"
 }

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

@@ -1,2 +0,0 @@
-import { DatabaseEngine } from '../../types';
-export declare const generateDatabaseContainer: (databaseEngine: DatabaseEngine) => string;