@tobi2409/fullsty 0.5.0 → 0.5.1

package/README.md

@@ -56,7 +56,7 @@ Run it from the project root, for example:
 
 ```bash
 ../../scripts/fullsty-server-pkg.js add pg
-../../scripts/fullsty-server-pkg.js add sql-template-tag
+../../scripts/fullsty-server-pkg.js add drizzle-orm
 ../../scripts/fullsty-server-pkg.js remove pg
 ```
 
@@ -66,7 +66,7 @@ What it does:
 
 - `add <package>`
 	- adds the package to the project's server package file, which is initially created from [project-frame/server-package.json](project-frame/server-package.json)
-	- copies a matching wrapper from [extension-wrappers](extension-wrappers) into [projects/demo1/src/server](projects/demo1/src/server)
+	- copies a matching wrapper from [scripts/extension-wrappers](scripts/extension-wrappers) into [projects/demo1/src/server](projects/demo1/src/server)
 - `remove <package>`
 	- removes the package from the project's server package file
 	- removes the matching wrapper from [projects/demo1/src/server](projects/demo1/src/server)
@@ -75,7 +75,7 @@ The script does not manage the project-level [package.json](project-frame/packag
 
 After `fullsty-server-pkg.js add <package>` you should run `npm run generate` again so the updated project server package file is copied into `generated/server/package.json`. After that, run `npm install` again inside [projects/demo1/generated/server](projects/demo1/generated/server) so the generated server gets the updated dependencies.
 
-`fullsty-server-pkg.js add sql-template-tag` copies [extension-wrappers/sql-template-tag/sql-template-tag-wrapper.ts](extension-wrappers/sql-template-tag/sql-template-tag-wrapper.ts) into [projects/demo1/src/server](projects/demo1/src/server). This keeps `sql-template-tag` visible as the recommended SQL style without coupling it to a specific DBMS wrapper. For PostgreSQL pooling and env handling you can add `pg` separately.
+`fullsty-server-pkg.js add drizzle-orm` copies [scripts/extension-wrappers/drizzle-orm/drizzle-orm-wrapper.ts](scripts/extension-wrappers/drizzle-orm/drizzle-orm-wrapper.ts) into [projects/demo1/src/server](projects/demo1/src/server). This keeps `drizzle-orm` visible as the recommended SQL style without coupling it to a specific DBMS wrapper. For PostgreSQL pooling and env handling you can add `pg` separately.
 
 ## 5) Start the generated server
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tobi2409/fullsty",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "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/db-connection/db-connection-wrapper.ts

@@ -0,0 +1,32 @@
+// @ts-ignore pg-wrapper is supplied by the pg extension in generated projects.
+import { getPgPool, closeAllPgPools } from "../pg/pg-wrapper";
+
+type DriverName = "pg" | "mysql" | "sqlite";
+
+type ConnectionData = {
+    connectionName?: string;
+};
+
+export class DbConnection {
+    constructor(
+        private readonly driverName: DriverName,
+        private readonly connectionData: ConnectionData = {},
+    ) {}
+
+    connect() {
+        if (this.driverName === "pg") {
+            return getPgPool(this.connectionData.connectionName ?? "default");
+        }
+
+        throw new Error(`Driver is not integrated yet: ${this.driverName}`);
+    }
+
+    async close() {
+        if (this.driverName === "pg") {
+            await closeAllPgPools();
+            return;
+        }
+
+        throw new Error(`Driver is not integrated yet: ${this.driverName}`);
+    }
+}

package/scripts/extension-wrappers/db-connection/extension.json

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

package/scripts/extension-wrappers/drizzle-orm/drizzle-orm-wrapper.ts

@@ -0,0 +1 @@
+export { sql } from "drizzle-orm";

package/scripts/extension-wrappers/drizzle-orm/extension.json

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

package/scripts/extension-wrappers/pg/extension.json

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

package/scripts/extension-wrappers/pg/pg-wrapper.ts

@@ -1,10 +1,14 @@
 import dotenv from "dotenv";
 import fs from "fs";
+import path from "path";
 import { Pool } from "pg";
+import { fileURLToPath } from "url";
 
 const pools = new Map<string, Pool>();
 let pgEnv: Record<string, string> = {};
 let pgEnvLoaded = false;
+const wrapperDir = path.dirname(fileURLToPath(import.meta.url));
+const envFilePath = path.join(wrapperDir, ".env.pg");
 
 function envKey(connectionName: string, key: string): string {
     const prefix = connectionName.toUpperCase().replace(/[^A-Z0-9_]/g, "_");
@@ -19,8 +23,8 @@ function loadPgEnv(): void {
     // Load .env.pg into a local cache instead of writing into process.env.
     // This keeps the pg wrapper isolated from other wrappers such as auth,
     // which may load their own .env files later.
-    const envFileContent = fs.existsSync(".env.pg")
-        ? fs.readFileSync(".env.pg", "utf8")
+    const envFileContent = fs.existsSync(envFilePath)
+        ? fs.readFileSync(envFilePath, "utf8")
         : "";
 
     pgEnv = dotenv.parse(envFileContent);

package/scripts/extension-wrappers/sql-template-tag/extension.json

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

package/scripts/shared/file-copy.js

@@ -2,16 +2,22 @@ import fs from "fs";
 import path from "path";
 
 // Recursively copy a directory and all nested files/folders.
-export function copyDirectory(sourceDir, targetDir) {
+export function copyDirectory(sourceDir, targetDir, options = {}) {
+    const excludedNames = new Set(options.excludedNames ?? []);
+
     fs.mkdirSync(targetDir, { recursive: true });
     const entries = fs.readdirSync(sourceDir, { withFileTypes: true });
 
     for (const entry of entries) {
+        if (excludedNames.has(entry.name)) {
+            continue;
+        }
+
         const sourcePath = path.join(sourceDir, entry.name);
         const targetPath = path.join(targetDir, entry.name);
 
         if (entry.isDirectory()) {
-            copyDirectory(sourcePath, targetPath);
+            copyDirectory(sourcePath, targetPath, options);
         } else {
             fs.copyFileSync(sourcePath, targetPath);
         }

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

@@ -1,31 +1,17 @@
-import fs, { write } from "fs";
+import fs from "fs";
 import path from "path";
 import { copyDirectory } from "./file-copy.js";
 import { readJson, writeJson } from "./project-json-utils.js";
 
+const EXTENSION_CONFIG_FILE = "extension.json";
+
 function wrapperDirFromPackage(scriptDir, packageName) {
     return path.join(scriptDir, "extension-wrappers", packageName);
 }
 
-function removeWrapperFiles(sourceWrapperDir, targetServerDir) {
-    const entries = fs.readdirSync(sourceWrapperDir, { withFileTypes: true });
-
-    for (const entry of entries) {
-        const sourcePath = path.join(sourceWrapperDir, entry.name);
-        const targetPath = path.join(targetServerDir, entry.name);
-
-        if (entry.isDirectory()) {
-            if (fs.existsSync(targetPath)) {
-                removeWrapperFiles(sourcePath, targetPath);
-            }
-
-            continue;
-        }
-
-        if (fs.existsSync(targetPath)) {
-            fs.rmSync(targetPath, { force: true });
-        }
-    }
+function shouldAddToServerPackage(wrapperDir) {
+    const extensionConfig = readJson(wrapperDir, EXTENSION_CONFIG_FILE);
+    return extensionConfig.addToServerPackage;
 }
 
 export function handleAdd(projectDir, scriptDir, serverDir, packageNames) {
@@ -37,12 +23,17 @@ export function handleAdd(projectDir, scriptDir, serverDir, packageNames) {
 
     for (const packageName of packageNames) {
         const wrapperDir = wrapperDirFromPackage(scriptDir, packageName);
+        const targetWrapperDir = path.join(serverDir, packageName);
 
-        json.dependencies[packageName] = "latest";
+        if (shouldAddToServerPackage(wrapperDir)) {
+            json.dependencies[packageName] = "latest";
+        }
 
         if (fs.existsSync(wrapperDir)) {
-            copyDirectory(wrapperDir, serverDir);
-            console.log(`\n✅ Copied wrapper for ${packageName} to src/server`);
+            copyDirectory(wrapperDir, targetWrapperDir, {
+                excludedNames: [EXTENSION_CONFIG_FILE],
+            });
+            console.log(`\n✅ Copied wrapper for ${packageName} to src/server/${packageName}`);
         }
     }
 
@@ -62,15 +53,18 @@ export function handleRemove(projectDir, scriptDir, serverDir, packageNames) {
 
     for (const packageName of packageNames) {
         const wrapperDir = wrapperDirFromPackage(scriptDir, packageName);
+        const targetWrapperDir = path.join(serverDir, packageName);
 
-        delete json.dependencies[packageName];
-        delete json.devDependencies[packageName];
+        if (shouldAddToServerPackage(wrapperDir)) {
+            delete json.dependencies[packageName];
+            delete json.devDependencies[packageName];
+        }
+
+        if (fs.existsSync(wrapperDir) && fs.existsSync(targetWrapperDir)) {
+            fs.rmSync(targetWrapperDir, { recursive: true, force: true });
 
-        if (fs.existsSync(wrapperDir)) {
-            removeWrapperFiles(wrapperDir, serverDir);
-            
             console.log(
-                `\n✅ Removed wrapper for ${packageName} from src/server`,
+                `\n✅ Removed wrapper for ${packageName} from src/server/${packageName}`,
             );
         }
     }