@tobi2409/fullsty 0.5.3 → 0.5.5

package/README.md

@@ -14,12 +14,20 @@ Minimal Fullsty starter workflow.
 
 A sample application can be found at https://github.com/tobi2409/fullsty/tree/main/projects/db-test
 
+For the `db-test` demo, add the required server wrappers in your project root before generating/running:
+
+```bash
+fullsty-server-pkg add pg
+fullsty-server-pkg add db-connection
+fullsty-server-pkg add kysely
+```
+
 ## 1) Create a project
 
 From the repository root:
 
 ```bash
-npx create-fullsty-project projects/demo1
+create-fullsty-project projects/demo1
 ```
 
 This creates a new folder (for example [projects/demo1](projects/demo1)).
@@ -55,12 +63,12 @@ It also copies [project-frame/server-package.json](project-frame/server-package.
 Run it from the project root, for example:
 
 ```bash
-../../scripts/fullsty-server-pkg.js add pg
-../../scripts/fullsty-server-pkg.js add kysely
-../../scripts/fullsty-server-pkg.js remove pg
+fullsty-server-pkg add pg
+fullsty-server-pkg add kysely
+fullsty-server-pkg remove pg
 ```
 
-Alternatively, you can also use npx fullsty-server-pkg.
+Alternatively, you can also use `npx fullsty-server-pkg`.
 
 What it does:
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tobi2409/fullsty",
-    "version": "0.5.3",
+    "version": "0.5.5",
     "description": "Fullsty is a modular fullstack framework starter built from three core parts: template-engine, layout and proc2rest. It provides a project frame for building fullstack applications with a clear separation of client and server code.",
     "license": "ISC",
     "author": "Tobias Hollstein",

package/scripts/extension-wrappers/@tobi2409/authentication-core-db/current-user.ts

@@ -0,0 +1,47 @@
+import { DbConnection } from "../../db-connection/db-connection-wrapper.ts";
+// @ts-ignore kysely is supplied by the server package in generated projects.
+import { KyselyWrapper } from "../../kysely/kysely-wrapper.ts";
+import { authenticationCoreLib } from "../../@tobi2409/authentication-core-lib/authentication-core-lib-wrapper.ts";
+import { DEFAULT_TABLE_NAME, DEFAULT_USER_COLUMN, UserColumn } from "./shared.ts";
+
+export namespace AuthenticationCoreKyselyCurrentUser {
+    export async function getCurrentUser(
+        token: string,
+        jwtKey: Parameters<typeof authenticationCoreLib.AuthenticationCoreCurrentUser.getCurrentUser>[1],
+        dbConnection: DbConnection,
+        tableName: string = DEFAULT_TABLE_NAME,
+        columns: UserColumn = DEFAULT_USER_COLUMN,
+        verifyOptions: Parameters<typeof authenticationCoreLib.AuthenticationCoreCurrentUser.getCurrentUser>[3] = {}
+    ): Promise<string> {
+        try {
+            const db = KyselyWrapper.buildQueryCompiler(dbConnection.getDriverName());
+
+            const isActiveCallback = async (uuid: string): Promise<boolean> => {
+                const compiledQuery = db
+                    .selectFrom(tableName)
+                    .select([
+                        KyselyWrapper.sql.ref(columns.isActive).as("isActive")
+                    ])
+                    .where(KyselyWrapper.sql.ref(columns.uuid), "=", uuid)
+                    .limit(1)
+                    .compile();
+
+                // 'any' is used instead of 'unknown' because calling .query() on an unknown type requires
+                // either a type assertion or a separate interface. DbConnection is driver-agnostic, so
+                // the concrete pool type (e.g. pg.Pool) is not available here without adding a dependency.
+                const connection = await dbConnection.getConnection() as any;
+                const result = await connection.query(compiledQuery.sql, compiledQuery.parameters);
+
+                if (!result.rows?.[0]) {
+                    return false;
+                }
+
+                return Boolean((result.rows[0] as Record<string, unknown>).isActive);
+            };
+
+            return authenticationCoreLib.AuthenticationCoreCurrentUser.getCurrentUser(token, jwtKey, isActiveCallback, verifyOptions);
+        } catch (error) {
+            throw error;
+        }
+    }
+}

package/scripts/extension-wrappers/@tobi2409/authentication-core-db/extension.json

@@ -0,0 +1,3 @@
+{
+    "addToServerPackage": false
+}

package/scripts/extension-wrappers/@tobi2409/authentication-core-db/login.ts

@@ -0,0 +1,57 @@
+import { DbConnection } from "../../db-connection/db-connection-wrapper.ts";
+// @ts-ignore kysely is supplied by the server package in generated projects.
+import { KyselyWrapper } from "../../kysely/kysely-wrapper.ts";
+import { authenticationCoreLib } from "../../@tobi2409/authentication-core-lib/authentication-core-lib-wrapper.ts";
+import { DEFAULT_TABLE_NAME, DEFAULT_USER_COLUMN, UserColumn } from "./shared.ts";
+
+export namespace AuthenticationCoreKyselyLogin {
+    function mapFetchedUser(row: Record<string, unknown> | undefined): authenticationCoreLib.FetchedUser | undefined {
+        if (!row) {
+            return undefined;
+        }
+
+        return {
+            uuid: String(row.uuid),
+            mail: String(row.mail),
+            password: String(row.password),
+            isActive: Boolean(row.isActive)
+        };
+    }
+
+    export async function login(
+        typedMail: string,
+        typedPassword: string,
+        jwtKey: Parameters<typeof authenticationCoreLib.AuthenticationCoreLogin.login>[3],
+        dbConnection: DbConnection,
+        tableName: string = DEFAULT_TABLE_NAME,
+        columns: UserColumn = DEFAULT_USER_COLUMN,
+        jwtOptions: Parameters<typeof authenticationCoreLib.AuthenticationCoreLogin.login>[4] = {}
+    ): Promise<string> {
+        try {
+            const db = KyselyWrapper.buildQueryCompiler(dbConnection.getDriverName());
+
+            const compiledQuery = db
+                .selectFrom(tableName)
+                .select([
+                    KyselyWrapper.sql.ref(columns.uuid).as("uuid"),
+                    KyselyWrapper.sql.ref(columns.mail).as("mail"),
+                    KyselyWrapper.sql.ref(columns.password).as("password"),
+                    KyselyWrapper.sql.ref(columns.isActive).as("isActive")
+                ])
+                .where(KyselyWrapper.sql.ref(columns.mail), "=", typedMail)
+                .limit(1)
+                .compile();
+
+            // 'any' is used instead of 'unknown' because calling .query() on an unknown type requires
+            // either a type assertion or a separate interface. DbConnection is driver-agnostic, so
+            // the concrete pool type (e.g. pg.Pool) is not available here without adding a dependency.
+            const connection = await dbConnection.getConnection() as any;
+            const result = await connection.query(compiledQuery.sql, compiledQuery.parameters);
+
+            const fetchedUser = mapFetchedUser(result.rows?.[0] as Record<string, unknown> | undefined);
+            return authenticationCoreLib.AuthenticationCoreLogin.login(typedMail, typedPassword, fetchedUser, jwtKey, jwtOptions);
+        } catch (error) {
+            throw error;
+        }
+    }
+}

package/scripts/extension-wrappers/@tobi2409/authentication-core-db/register.ts

@@ -0,0 +1,108 @@
+import { DbConnection } from "../../db-connection/db-connection-wrapper.ts";
+// @ts-ignore kysely is supplied by the server package in generated projects.
+import { KyselyWrapper } from "../../kysely/kysely-wrapper.ts";
+import { authenticationCoreLib } from "../../@tobi2409/authentication-core-lib/authentication-core-lib-wrapper.ts";
+import { DEFAULT_TABLE_NAME, DEFAULT_USER_COLUMN, UserColumn } from "./shared.ts";
+
+export namespace AuthenticationCoreKyselyRegister {
+    function mapFetchedUser(row: Record<string, unknown> | undefined): authenticationCoreLib.FetchedUser | undefined {
+        if (!row) {
+            return undefined;
+        }
+
+        return {
+            uuid: String(row.uuid),
+            mail: String(row.mail),
+            password: String(row.password),
+            isActive: Boolean(row.isActive)
+        };
+    }
+
+    export async function register(
+        registrationInputData: authenticationCoreLib.RegistrationInputData,
+        customInputData: Record<string, unknown>,
+        verificationMail: authenticationCoreLib.VerificationMail,
+        dbConnection: DbConnection,
+        tableName: string = DEFAULT_TABLE_NAME,
+        columns: UserColumn = DEFAULT_USER_COLUMN,
+        mailTransportConfig?: Parameters<typeof authenticationCoreLib.AuthenticationCoreRegister.register>[5],
+        hashOptions?: Parameters<typeof authenticationCoreLib.AuthenticationCoreRegister.register>[6],
+    ): Promise<authenticationCoreLib.FetchedUser> {
+        const db = KyselyWrapper.buildQueryCompiler(dbConnection.getDriverName());
+
+        // 'any' is used instead of 'unknown' because calling pool/client APIs on an unknown type requires
+        // either a type assertion or a separate interface. DbConnection is driver-agnostic, so
+        // the concrete pool/client type (e.g. pg.Pool/PoolClient) is not available here without adding a dependency.
+        const pool = await dbConnection.getConnection() as any;
+        const transactionConnection = await pool.connect();
+
+        const mailExistsRoutine = async (mail: string): Promise<boolean> => {
+            const compiledQuery = db
+                .selectFrom(tableName)
+                .select((eb: any) => [eb.val(1).as("exists")])
+                .where(KyselyWrapper.sql.ref(columns.mail), "=", mail)
+                .limit(1)
+                .compile();
+
+            const result = await transactionConnection.query(compiledQuery.sql, compiledQuery.parameters);
+
+            return (result.rows?.length ?? 0) > 0;
+        };
+
+        const dataProcessing = async (
+            identification: string,
+            hashedPassword: string,
+            inputData: Record<string, unknown>
+        ): Promise<authenticationCoreLib.FetchedUser | undefined> => {
+            const userData: Record<string, unknown> = {
+                [columns.mail]: identification,
+                [columns.password]: hashedPassword,
+                [columns.isActive]: false,
+                ...inputData
+            };
+
+            const compiledQuery = db
+                .insertInto(tableName)
+                .values(userData as any)
+                .returning([
+                    KyselyWrapper.sql.ref(columns.uuid).as("uuid"),
+                    KyselyWrapper.sql.ref(columns.mail).as("mail"),
+                    KyselyWrapper.sql.ref(columns.password).as("password"),
+                    KyselyWrapper.sql.ref(columns.isActive).as("isActive")
+                ])
+                .compile();
+
+            const result = await transactionConnection.query(compiledQuery.sql, compiledQuery.parameters);
+            return mapFetchedUser(result.rows?.[0] as Record<string, unknown> | undefined);
+        };
+
+        try {
+            await transactionConnection.query("BEGIN");
+
+            const registeredUser = await authenticationCoreLib.AuthenticationCoreRegister.register(
+                registrationInputData,
+                mailExistsRoutine,
+                customInputData,
+                dataProcessing,
+                verificationMail,
+                mailTransportConfig,
+                hashOptions
+            );
+
+            await transactionConnection.query("COMMIT");
+            return registeredUser;
+        } catch (error) {
+            try {
+                await transactionConnection.query("ROLLBACK");
+            } catch {
+                // Ignore rollback errors, original error is more relevant.
+            }
+
+            throw error;
+        } finally {
+            if (typeof transactionConnection.release === "function") {
+                transactionConnection.release();
+            }
+        }
+    }
+}

package/scripts/extension-wrappers/@tobi2409/authentication-core-db/shared.ts

@@ -0,0 +1,15 @@
+export type UserColumn = {
+    uuid: string;
+    mail: string;
+    password: string;
+    isActive: string;
+};
+
+export const DEFAULT_TABLE_NAME = "users";
+
+export const DEFAULT_USER_COLUMN: UserColumn = {
+    uuid: "uuid",
+    mail: "mail",
+    password: "password",
+    isActive: "isActive"
+};

package/scripts/extension-wrappers/@tobi2409/authentication-core-lib/authentication-core-lib-wrapper.ts

@@ -0,0 +1,2 @@
+// @ts-ignore package is supplied by the server package in generated projects.
+export * as authenticationCoreLib from "@tobi2409/authentication-core-lib";

package/scripts/extension-wrappers/@tobi2409/authentication-core-lib/extension.json

@@ -0,0 +1,3 @@
+{
+    "addToServerPackage": true
+}

package/scripts/shared/server-package-utils.js

@@ -24,17 +24,21 @@ export function handleAdd(projectDir, scriptDir, serverDir, packageNames) {
     for (const packageName of packageNames) {
         const wrapperDir = wrapperDirFromPackage(scriptDir, packageName);
         const targetWrapperDir = path.join(serverDir, packageName);
+        const wrapperExists = fs.existsSync(wrapperDir);
 
-        if (shouldAddToServerPackage(wrapperDir)) {
+        if (!wrapperExists) {
             json.dependencies[packageName] = "latest";
+            continue;
         }
 
-        if (fs.existsSync(wrapperDir)) {
-            copyDirectory(wrapperDir, targetWrapperDir, {
-                excludedNames: [EXTENSION_CONFIG_FILE],
-            });
-            console.log(`\n✅ Copied wrapper for ${packageName} to src/server/${packageName}`);
+        if (shouldAddToServerPackage(wrapperDir)) {
+            json.dependencies[packageName] = "latest";
         }
+
+        copyDirectory(wrapperDir, targetWrapperDir, {
+            excludedNames: [EXTENSION_CONFIG_FILE],
+        });
+        console.log(`\n✅ Copied wrapper for ${packageName} to src/server/${packageName}`);
     }
 
     writeJson(projectDir, "server-package.json", json);
@@ -54,13 +58,20 @@ export function handleRemove(projectDir, scriptDir, serverDir, packageNames) {
     for (const packageName of packageNames) {
         const wrapperDir = wrapperDirFromPackage(scriptDir, packageName);
         const targetWrapperDir = path.join(serverDir, packageName);
+        const wrapperExists = fs.existsSync(wrapperDir);
+
+        if (!wrapperExists) {
+            delete json.dependencies[packageName];
+            delete json.devDependencies[packageName];
+            continue;
+        }
 
         if (shouldAddToServerPackage(wrapperDir)) {
             delete json.dependencies[packageName];
             delete json.devDependencies[packageName];
         }
 
-        if (fs.existsSync(wrapperDir) && fs.existsSync(targetWrapperDir)) {
+        if (fs.existsSync(targetWrapperDir)) {
             fs.rmSync(targetWrapperDir, { recursive: true, force: true });
 
             console.log(