nurev 0.0.6 → 0.0.8

package/bun.lock

@@ -8,9 +8,6 @@
         "fs-extra": "^11.3.4",
         "prompts": "^2.4.2",
       },
-      "peerDependencies": {
-        "typescript": "^5",
-      },
     },
   },
   "packages": {
@@ -26,8 +23,6 @@
 
     "sisteransi": ["sisteransi@1.0.5", "", {}, "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="],
 
-    "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
-
     "universalify": ["universalify@2.0.1", "", {}, "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="],
   }
 }

package/index.js

@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 
+import kleur from "kleur";
 import { default as prompts } from "prompts";
 import { default as fs } from "fs-extra";
 import { fileURLToPath } from "url";
-import kleur from "kleur";
-import { spawn } from "child_process";
+import { spawnPromise } from "./utils/cmd.js";
+import { writeEnvFile } from "./utils/file.js";
 
-console.log(`${kleur.bgGreen().bold("[Nurev]")}`);
-console.log("Template generator 'on demanding revalidation' with Nuxt");
+console.log(`\n${kleur.bgGreen().bold("🚀NUREV🚀")}`);
+console.log("Template generator 'on demanding revalidation' with Nuxt\n");
 
-const questions = [
+const questionsBase = [
   {
     type: "select",
     name: "manager",
@@ -48,49 +49,103 @@ const questions = [
   },
 ];
 
+const questionsPocketbase = [
+  {
+    type: "text",
+    name: "admin",
+    message: "Email address to assign to the Pocketbase superadmin",
+  },
+  {
+    type: "text",
+    style: "password",
+    name: "adminpassword",
+    message: "Password for superadmin",
+    validate: (password) =>
+      password.length > 7 ? true : `8 characters needed or more`,
+  },
+  {
+    type: "text",
+    name: "user",
+    message: "Email for the API user",
+  },
+  {
+    type: "text",
+    style: "password",
+    name: "userpassword",
+    message: "Password for API user",
+    validate: (userpassword) =>
+      userpassword.length > 7 ? true : `8 characters needed or more`,
+  },
+];
+
 (async () => {
-  const response = await prompts(questions);
+  const responseBase = await prompts(questionsBase);
 
-  if (Object.keys(questions).length !== Object.keys(response).length) {
+  if (Object.keys(questionsBase).length !== Object.keys(responseBase).length) {
     console.log("Script finished");
     return;
   }
 
-  const templateBase = fileURLToPath(
-    new URL("./templates/base", import.meta.url),
-  );
-  const templateBackend = fileURLToPath(
-    new URL(`./templates/${response.backend}`, import.meta.url),
-  );
-  const templatePackageManager = fileURLToPath(
-    new URL(
-      `./templates/${response.backend}-${response.manager}`,
-      import.meta.url,
+  const paths = {
+    base: fileURLToPath(new URL("./templates/base", import.meta.url)),
+    backend: fileURLToPath(
+      new URL(`./templates/${responseBase.backend}`, import.meta.url),
     ),
-  );
-  const templateDest = process.cwd();
-
-  try {
-    await fs.copy(templateBase, templateDest);
-    await fs.copy(templateBackend, templateDest);
-    await fs.copy(templatePackageManager, templateDest);
+    packageManager: fileURLToPath(
+      new URL(
+        `./templates/${responseBase.backend}-${responseBase.manager}`,
+        import.meta.url,
+      ),
+    ),
+    destination: {
+      base: process.cwd(),
+      env: `${process.cwd()}/.env`,
+      envExample: `${process.cwd()}/.env.example`,
+    },
+  };
 
-    const processInstall = spawn("/usr/bin/make", ["install"]);
+  if (responseBase.backend === "pocketbase") {
+    const responsePocketbase = await prompts(questionsPocketbase);
 
-    processInstall.stdout.pipe(process.stdout);
-    processInstall.stderr.pipe(process.stderr);
+    if (
+      Object.keys(questionsPocketbase).length !==
+      Object.keys(responsePocketbase).length
+    ) {
+      console.log("Script finished");
+      return;
+    }
 
-    processInstall.on("close", (_code) => {
-      console.log(
-        kleur
-          .bgGreen()
-          .bold(`Template ${response.backend}-${response.manager} ready`),
-      );
-    });
+    for (const key in responsePocketbase) {
+      responseBase[key] = responsePocketbase[key];
+    }
+  }
 
-    processInstall.on("error", (err) => {
-      console.error(`Error: `, err);
-    });
+  try {
+    await fs.copy(paths.base, paths.destination.base);
+    await fs.copy(paths.backend, paths.destination.base);
+    await fs.copy(paths.packageManager, paths.destination.base);
+    await spawnPromise("make", ["install"]);
+    await fs.copy(paths.destination.envExample, paths.destination.env);
+    await spawnPromise("make", ["setup"]);
+    switch (responseBase.backend) {
+      case "pocketbase":
+        await writeEnvFile(paths.destination.env, {
+          NUXT_POCKETBASE_USER: responseBase.user,
+          NUXT_POCKETBASE_PASSWORD: responseBase.userpassword,
+          NUXT_JWT_SECRET: Buffer.from(
+            crypto.getRandomValues(new Uint8Array(32)),
+          ).toString("hex"),
+        });
+        await spawnPromise("make", [
+          "-s",
+          "backend-superuser",
+          `email=${responseBase.admin}`,
+          `password=${responseBase.adminpassword}`,
+        ]);
+        //TODO: ADD USERAPI AND POSTS TABLE
+        break;
+    }
+    console.log("\n🎉 Your template is ready! 🎉\n");
   } catch (error) {
     console.log(error);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nurev",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "module": "index.js",
   "dependencies": {
     "fs-extra": "^11.3.4",

package/templates/base/frontend/server/utils/auth.ts

@@ -38,10 +38,8 @@ export const defineAuthResponseHandler = <T extends EventHandlerRequest, D>(
       }
 
       const response = await handler(event);
-      // do something after the route handler
       return { response };
     } catch (err) {
-      // Error handling
       return { err };
     }
   });

package/templates/pocketbase/.env.example

@@ -1,5 +1,5 @@
-TABLES_TRIGGER=
-JWT_EXPIRES_MINUTES=
+TABLES_TRIGGER=posts
+JWT_EXPIRES_MINUTES=1
 FRONTEND_URL=http://localhost:3000/api/private/reloadcache
 NUXT_POCKETBASE_URL=https://localhost:8090
 NUXT_POCKETBASE_USER=

package/templates/pocketbase/README.md

@@ -9,7 +9,7 @@ Tech stack:
 
 ## Setup
 
-1. Create a `.env` file, follow the `.env.example` file
+1. Check if your `.env` file is correct
 
 - `TABLES_TRIGGER`: collections that trigger the Nuxt cache to be cleared when collections are updated, a new row is added or a row is removed
   - **Example**
@@ -31,47 +31,41 @@ Tech stack:
   ```bash
   NUXT_POCKETBASE_URL=http://localhost:8090
   ```
-- `NUXT_POCKETBASE_USER`: PocketBase user created in `user` collection for login to the API
+- `NUXT_POCKETBASE_USER`: PocketBase user created in `user` collection for login to the API (requested)
   - **Example**
   ```bash
   NUXT_POCKETBASE_USER=paco@paco.me
   ```
-- `NUXT_POCKETBASE_PASSWORD`: PocketBase password user created in `user` collection for login to the API
+- `NUXT_POCKETBASE_PASSWORD`: PocketBase password user created in `user` collection for login to the API (requested)
   - **Example**
   ```bash
   NUXT_POCKETBASE_PASSWORD=secretpassword
   ```
-- `NUXT_JWT_SECRET`: JWT secret for signing and validating tokens
+- `NUXT_JWT_SECRET`: JWT secret for signing and validating tokens (autogenerated)
   - **Example**
   ```bash
   NUXT_JWT_SECRET=secretjwt
   ```
 
-2. Create symbolic links for the environment variables with
-
-```bash
-make setup
-```
-
-3. Start backend dev mode
+2. Start backend dev mode
 
 ```bash
 make backend-dev
 ```
 
-4. Open [http://localhost:8090](`http://localhost:8090/_/) and create a superuser
+3. Create a user inside `users` collection with the same values inside `NUXT_POCKETBASE_USER` and `NUXT_POCKETBASE_PASSWORD`
 
-5. Create a user inside `users` collection with the same values inside `NUXT_POCKETBASE_USER` and `NUXT_POCKETBASE_PASSWORD`
+4. Create a collection named `posts` and change API Rules for give permissions with `@request.auth.id != ""`
 
-6. Create a collection named `posts` and create a new post
+5. Create a new post
 
-7. Start frontend dev mode
+6. Start frontend dev mode
 
 ```bash
 make frontend-dev
 ```
 
-8. Open `http://localhost:3000/posts/[id]` and replace `[id]` with the post id created in the 6. step
+7. Open `http://localhost:3000/posts/[id]` and replace `[id]` with the post id created in the 6. step
 
 ## Build
 

package/templates/pocketbase-bun/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all backend-build backend-update backend-dev backend-run backend-setup \
+.PHONY: all backend-build backend-update backend-dev backend-run backend-setup backend-superuser \
         frontend-install frontend-dev frontend-build frontend-preview frontend-setup\
         help setup build install
         
@@ -26,6 +26,10 @@ backend-dev:  backend-update
 backend-run: backend-build
 	@echo "Running backend..."
 	cd backend && ./backend serve
+	
+backend-superuser: backend-update
+	@echo "Adding superuser..."
+	cd backend && go run . superuser create $(email) $(password)
 
 # Frontend targets
 frontend-setup:
@@ -64,6 +68,7 @@ help:
 	@echo "  make backend-dev      - Run the backend development only"
 	@echo "  make backend-run      - Run the backend only"
 	@echo "  make backend-update   - Update backend dependencies"
+	@echo "  make backend-superuser email=test@test.com password=123  - Add a new superuser"
 	@echo "  make frontend-setup   - Create a symbolic link for frontend"
 	@echo "  make frontend-install - Install frontend dependencies"
 	@echo "  make frontend-dev     - Start frontend development server"

package/templates/pocketbase-npm/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all backend-build backend-update backend-dev backend-run backend-setup \
+.PHONY: all backend-build backend-update backend-dev backend-run backend-setup backend-superuser \
         frontend-install frontend-dev frontend-build frontend-preview frontend-setup\
         help setup build install
         
@@ -27,6 +27,9 @@ backend-run: backend-build
 	@echo "Running backend..."
 	cd backend && ./backend serve
 
+backend-superuser: backend-update
+	@echo "Adding superuser..."
+	cd backend && go run . superuser create $(email) $(password)
 # Frontend targets
 frontend-setup:
 	@echo "Preparing frontend..."
@@ -64,6 +67,7 @@ help:
 	@echo "  make backend-dev      - Run the backend development only"
 	@echo "  make backend-run      - Run the backend only"
 	@echo "  make backend-update   - Update backend dependencies"
+	@echo "  make backend-superuser email=test@test.com password=123  - Add a new superuser"
 	@echo "  make frontend-setup   - Create a symbolic link for frontend"
 	@echo "  make frontend-install - Install frontend dependencies"
 	@echo "  make frontend-dev     - Start frontend development server"

package/templates/pocketbase-pnpm/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all backend-build backend-update backend-dev backend-run backend-setup \
+.PHONY: all backend-build backend-update backend-dev backend-run backend-setup backend-superuser \
         frontend-install frontend-dev frontend-build frontend-preview frontend-setup\
         help setup build install
         
@@ -27,6 +27,10 @@ backend-run: backend-build
 	@echo "Running backend..."
 	cd backend && ./backend serve
 
+backend-superuser: backend-update
+	@echo "Adding superuser..."
+	cd backend && go run . superuser create $(email) $(password)
+	
 # Frontend targets
 frontend-setup:
 	@echo "Preparing frontend..."
@@ -64,6 +68,7 @@ help:
 	@echo "  make backend-dev      - Run the backend development only"
 	@echo "  make backend-run      - Run the backend only"
 	@echo "  make backend-update   - Update backend dependencies"
+	@echo "  make backend-superuser email=test@test.com password=123  - Add a new superuser"
 	@echo "  make frontend-setup   - Create a symbolic link for frontend"
 	@echo "  make frontend-install - Install frontend dependencies"
 	@echo "  make frontend-dev     - Start frontend development server"

package/utils/cmd.js

@@ -0,0 +1,23 @@
+import { spawn } from "child_process";
+
+export function spawnPromise(command, args) {
+  return new Promise((resolve, reject) => {
+    const processChild = spawn(command, args);
+
+    processChild.stdout.pipe(process.stdout);
+    processChild.stderr.pipe(process.stderr);
+
+    processChild.on("close", (code) => {
+      if (code === 0) {
+        resolve({ code });
+      } else {
+        reject(new Error(`Process exited with code ${code}`));
+      }
+    });
+
+    processChild.on("error", (err) => {
+      console.error(`Error: `, err);
+      reject(err);
+    });
+  });
+}

package/utils/file.js

@@ -0,0 +1,25 @@
+import { default as fs } from "fs-extra";
+
+export function writeEnvFile(filePath, params) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      let content = await fs.readFile(filePath, "utf8");
+
+      for (const key in params) {
+        const value = params[key];
+        const regex = new RegExp(`^${key}=.*`, "m");
+
+        if (regex.test(content) === true) {
+          content = content.replace(regex, `${key}=${value}`);
+        } else {
+          reject(new Error(`Param ${key} not found inside .env`));
+        }
+      }
+
+      await fs.writeFile(filePath, content, `utf8`);
+      resolve();
+    } catch (error) {
+      console.error(error);
+    }
+  });
+}