@tobi2409/fullsty 0.5.2 → 0.5.4

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.2",
+    "version": "0.5.4",
     "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-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/extension-wrappers/db-connection/db-connection-wrapper.ts

@@ -19,8 +19,8 @@ export class DbConnection {
     async getConnection(): Promise<unknown> {
         if (this.driverName === "pg") {
             if (!this.connectionWrapper) {
-                // @ts-ignore pg-connection-wrapper is supplied by the pg extension in generated projects.
-                const { PgConnectionWrapper } = await import("../pg/pg-connection-wrapper.ts");
+                // @ts-ignore pg-wrapper is supplied by the pg extension in generated projects.
+                const { PgConnectionWrapper } = await import("../pg/pg-wrapper.ts");
                 this.connectionWrapper = new PgConnectionWrapper(this.connectionData.connectionName ?? "default");
             }
 

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(