nest-authme 1.2.4 → 1.3.0

package/dist/cli.js

@@ -762,8 +762,7 @@ var init_generator = __esm({
         } else if (config.orm === "prisma") {
           plan.push(
             { template: "prisma/prisma.service.ts.hbs", output: `${config.sourceRoot}/prisma/prisma.service.ts` },
-            { template: "prisma/prisma.module.ts.hbs", output: `${config.sourceRoot}/prisma/prisma.module.ts` },
-            { template: "prisma/schema.prisma.additions.hbs", output: "prisma-schema-additions.prisma" }
+            { template: "prisma/prisma.module.ts.hbs", output: `${config.sourceRoot}/prisma/prisma.module.ts` }
           );
         }
         if (config.features.emailService) {
@@ -1179,13 +1178,139 @@ var init_main_ts_updater = __esm({
   }
 });
 
+// src/installer/prisma-schema-updater.ts
+var fs6, import_execa, PrismaSchemaUpdater;
+var init_prisma_schema_updater = __esm({
+  "src/installer/prisma-schema-updater.ts"() {
+    "use strict";
+    init_cjs_shims();
+    fs6 = __toESM(require("fs-extra"));
+    import_execa = require("execa");
+    init_template_engine();
+    init_config_builder();
+    PrismaSchemaUpdater = class {
+      constructor(schemaPath) {
+        this.schemaPath = schemaPath;
+      }
+      backupPath = null;
+      /**
+       * Update prisma/schema.prisma with auth models
+       */
+      async update(config) {
+        const exists = await fs6.pathExists(this.schemaPath);
+        if (!exists) {
+          return {
+            updated: false,
+            message: 'prisma/schema.prisma not found. Run "npx prisma init" first, then re-run nest-authme.',
+            skippedModels: []
+          };
+        }
+        const existingContent = await fs6.readFile(this.schemaPath, "utf-8");
+        const skippedModels = [];
+        const hasUser = /^\s*model\s+User\s*\{/m.test(existingContent);
+        const hasRefreshToken = /^\s*model\s+RefreshToken\s*\{/m.test(existingContent);
+        if (hasUser) {
+          skippedModels.push("User");
+        }
+        if (hasRefreshToken && config.features.refreshTokens) {
+          skippedModels.push("RefreshToken");
+        }
+        const needsUser = !hasUser;
+        const needsRefreshToken = config.features.refreshTokens && !hasRefreshToken;
+        if (!needsUser && !needsRefreshToken) {
+          return {
+            updated: false,
+            message: `Models already exist in schema.prisma: ${skippedModels.join(", ")}. Please check that your existing models have all required auth fields.`,
+            skippedModels
+          };
+        }
+        const templateEngine = new TemplateEngine();
+        const context = buildTemplateContext(config);
+        let modelsContent = await templateEngine.render("prisma/schema.prisma.models.hbs", context);
+        if (hasUser) {
+          modelsContent = modelsContent.replace(/model\s+User\s*\{[^}]*\}\n?/s, "");
+        }
+        if (hasRefreshToken) {
+          modelsContent = modelsContent.replace(/model\s+RefreshToken\s*\{[^}]*\}\n?/s, "");
+        }
+        modelsContent = modelsContent.replace(/\n{3,}/g, "\n\n").trim();
+        if (!modelsContent) {
+          return {
+            updated: false,
+            message: "No new models to add.",
+            skippedModels
+          };
+        }
+        await this.createBackup();
+        try {
+          const separator = "\n\n// === Auth models (added by nest-authme) ===\n\n";
+          const updatedContent = existingContent.trimEnd() + separator + modelsContent + "\n";
+          await fs6.writeFile(this.schemaPath, updatedContent, "utf-8");
+          await this.tryPrismaFormat();
+          const addedModels = [];
+          if (needsUser) addedModels.push("User");
+          if (needsRefreshToken) addedModels.push("RefreshToken");
+          let message = `Added ${addedModels.join(", ")} model(s) to prisma/schema.prisma`;
+          if (skippedModels.length > 0) {
+            message += `. Skipped existing: ${skippedModels.join(", ")} (check for missing auth fields)`;
+          }
+          return {
+            updated: true,
+            message,
+            skippedModels
+          };
+        } catch (error) {
+          await this.restoreBackup();
+          throw error;
+        }
+      }
+      /**
+       * Try to run prisma format for consistent indentation
+       */
+      async tryPrismaFormat() {
+        try {
+          await (0, import_execa.execa)("npx", ["prisma", "format"], {
+            cwd: this.schemaPath.replace(/[/\\]prisma[/\\]schema\.prisma$/, ""),
+            timeout: 15e3
+          });
+        } catch {
+        }
+      }
+      /**
+       * Create backup of schema.prisma
+       */
+      async createBackup() {
+        this.backupPath = `${this.schemaPath}.backup`;
+        await fs6.copy(this.schemaPath, this.backupPath);
+      }
+      /**
+       * Restore backup on failure
+       */
+      async restoreBackup() {
+        if (this.backupPath && await fs6.pathExists(this.backupPath)) {
+          await fs6.copy(this.backupPath, this.schemaPath, { overwrite: true });
+          await fs6.remove(this.backupPath);
+        }
+      }
+      /**
+       * Clean up backup after success
+       */
+      async cleanupBackup() {
+        if (this.backupPath && await fs6.pathExists(this.backupPath)) {
+          await fs6.remove(this.backupPath);
+        }
+      }
+    };
+  }
+});
+
 // src/installer/package-updater.ts
-var fs6, PackageUpdater;
+var fs7, PackageUpdater;
 var init_package_updater = __esm({
   "src/installer/package-updater.ts"() {
     "use strict";
     init_cjs_shims();
-    fs6 = __toESM(require("fs-extra"));
+    fs7 = __toESM(require("fs-extra"));
     PackageUpdater = class {
       constructor(packageJsonPath) {
         this.packageJsonPath = packageJsonPath;
@@ -1197,7 +1322,7 @@ var init_package_updater = __esm({
       async update(config) {
         await this.createBackup();
         try {
-          const packageJson = await fs6.readJSON(this.packageJsonPath);
+          const packageJson = await fs7.readJSON(this.packageJsonPath);
           const deps = this.getDependencies(config);
           packageJson.dependencies = {
             ...packageJson.dependencies,
@@ -1211,7 +1336,7 @@ var init_package_updater = __esm({
           packageJson.devDependencies = this.sortObject(
             packageJson.devDependencies
           );
-          await fs6.writeJSON(this.packageJsonPath, packageJson, { spaces: 2 });
+          await fs7.writeJSON(this.packageJsonPath, packageJson, { spaces: 2 });
         } catch (error) {
           await this.restoreBackup();
           throw error;
@@ -1293,23 +1418,23 @@ var init_package_updater = __esm({
        */
       async createBackup() {
         this.backupPath = `${this.packageJsonPath}.backup`;
-        await fs6.copy(this.packageJsonPath, this.backupPath);
+        await fs7.copy(this.packageJsonPath, this.backupPath);
       }
       /**
        * Restore backup
        */
       async restoreBackup() {
-        if (this.backupPath && await fs6.pathExists(this.backupPath)) {
-          await fs6.copy(this.backupPath, this.packageJsonPath, { overwrite: true });
-          await fs6.remove(this.backupPath);
+        if (this.backupPath && await fs7.pathExists(this.backupPath)) {
+          await fs7.copy(this.backupPath, this.packageJsonPath, { overwrite: true });
+          await fs7.remove(this.backupPath);
         }
       }
       /**
        * Clean up backup
        */
       async cleanupBackup() {
-        if (this.backupPath && await fs6.pathExists(this.backupPath)) {
-          await fs6.remove(this.backupPath);
+        if (this.backupPath && await fs7.pathExists(this.backupPath)) {
+          await fs7.remove(this.backupPath);
         }
       }
     };
@@ -1317,12 +1442,12 @@ var init_package_updater = __esm({
 });
 
 // src/installer/dependency-installer.ts
-var import_execa, import_detect_package_manager, DependencyInstaller;
+var import_execa2, import_detect_package_manager, DependencyInstaller;
 var init_dependency_installer = __esm({
   "src/installer/dependency-installer.ts"() {
     "use strict";
     init_cjs_shims();
-    import_execa = require("execa");
+    import_execa2 = require("execa");
     import_detect_package_manager = require("detect-package-manager");
     DependencyInstaller = class {
       /**
@@ -1332,7 +1457,7 @@ var init_dependency_installer = __esm({
         const packageManager = await this.detectPackageManager(cwd);
         console.log(`\u{1F4E6} Installing dependencies with ${packageManager}...`);
         try {
-          await (0, import_execa.execa)(packageManager, ["install"], {
+          await (0, import_execa2.execa)(packageManager, ["install"], {
             cwd,
             stdio: "inherit"
           });
@@ -1349,7 +1474,7 @@ var init_dependency_installer = __esm({
       async installCapture(cwd) {
         const packageManager = await this.detectPackageManager(cwd);
         try {
-          const result = await (0, import_execa.execa)(packageManager, ["install"], {
+          const result = await (0, import_execa2.execa)(packageManager, ["install"], {
             cwd,
             stdio: "pipe"
           });
@@ -1380,7 +1505,8 @@ __export(installer_exports, {
   AppModuleUpdater: () => AppModuleUpdater,
   DependencyInstaller: () => DependencyInstaller,
   MainTsUpdater: () => MainTsUpdater,
-  PackageUpdater: () => PackageUpdater
+  PackageUpdater: () => PackageUpdater,
+  PrismaSchemaUpdater: () => PrismaSchemaUpdater
 });
 var init_installer = __esm({
   "src/installer/index.ts"() {
@@ -1388,20 +1514,21 @@ var init_installer = __esm({
     init_cjs_shims();
     init_ast_updater();
     init_main_ts_updater();
+    init_prisma_schema_updater();
     init_package_updater();
     init_dependency_installer();
   }
 });
 
 // src/gui/orchestrator.ts
-var import_events, path5, fs7, GuiOrchestrator;
+var import_events, path5, fs8, GuiOrchestrator;
 var init_orchestrator = __esm({
   "src/gui/orchestrator.ts"() {
     "use strict";
     init_cjs_shims();
     import_events = require("events");
     path5 = __toESM(require("path"));
-    fs7 = __toESM(require("fs-extra"));
+    fs8 = __toESM(require("fs-extra"));
     init_generator();
     init_template_engine();
     init_config_builder();
@@ -1425,7 +1552,7 @@ var init_orchestrator = __esm({
         for (const spec of plan) {
           const content = await templateEngine.render(spec.template, context);
           const fullPath = path5.join(projectInfo.root, spec.output);
-          const exists = await fs7.pathExists(fullPath);
+          const exists = await fs8.pathExists(fullPath);
           files.push({
             path: spec.output,
             content,
@@ -1437,6 +1564,12 @@ var init_orchestrator = __esm({
           { path: `${config.sourceRoot}/main.ts`, description: "Add global JWT guard, ValidationPipe, Swagger setup" },
           { path: "package.json", description: "Add authentication dependencies" }
         ];
+        if (config.orm === "prisma") {
+          modifiedFiles.push({
+            path: "prisma/schema.prisma",
+            description: "Append User and RefreshToken models"
+          });
+        }
         return {
           files,
           modifiedFiles,
@@ -1471,6 +1604,26 @@ var init_orchestrator = __esm({
           errors.push(msg);
           return { success: false, filesCreated: result.filesCreated, filesSkipped: result.filesSkipped, errors, warnings };
         }
+        if (config.orm === "prisma") {
+          this.emitProgress("prisma-schema", "Updating prisma/schema.prisma...", "started");
+          try {
+            const { PrismaSchemaUpdater: PrismaSchemaUpdater2 } = await Promise.resolve().then(() => (init_installer(), installer_exports));
+            const schemaPath = path5.join(projectInfo.root, "prisma", "schema.prisma");
+            const prismaUpdater = new PrismaSchemaUpdater2(schemaPath);
+            const prismaResult = await prismaUpdater.update(config);
+            if (prismaResult.updated) {
+              await prismaUpdater.cleanupBackup();
+              this.emitProgress("prisma-schema", prismaResult.message, "completed");
+            } else {
+              this.emitProgress("prisma-schema", prismaResult.message, "warning");
+              warnings.push(prismaResult.message);
+            }
+          } catch (error) {
+            const msg = error instanceof Error ? error.message : "Unknown error";
+            this.emitProgress("prisma-schema", "Could not update prisma/schema.prisma", "warning", msg);
+            warnings.push("Could not update prisma/schema.prisma - add models manually");
+          }
+        }
         this.emitProgress("ast-main-ts", "Updating main.ts...", "started");
         try {
           const { MainTsUpdater: MainTsUpdater2 } = await Promise.resolve().then(() => (init_installer(), installer_exports));
@@ -1522,14 +1675,14 @@ var init_orchestrator = __esm({
 });
 
 // src/gui/server.ts
-var http, path6, fs8, GuiServer;
+var http, path6, fs9, GuiServer;
 var init_server = __esm({
   "src/gui/server.ts"() {
     "use strict";
     init_cjs_shims();
     http = __toESM(require("http"));
     path6 = __toESM(require("path"));
-    fs8 = __toESM(require("fs-extra"));
+    fs9 = __toESM(require("fs-extra"));
     init_analyzer();
     init_prompts();
     init_orchestrator();
@@ -1643,7 +1796,7 @@ data: ${JSON.stringify(data)}
         ];
         for (const candidate of candidates) {
           try {
-            const html = fs8.readFileSync(candidate, "utf-8");
+            const html = fs9.readFileSync(candidate, "utf-8");
             res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
             res.end(html);
             return;
@@ -1895,10 +2048,16 @@ function showSuccess(stats) {
   console.log(import_chalk.default.gray("      # .env.example is also provided as a git-safe reference"));
   console.log();
   if (stats.orm === "prisma") {
-    console.log(import_chalk.default.cyan("   2. Add Prisma schema models (see prisma-schema-additions.prisma)"));
-    console.log(import_chalk.default.gray("      # Copy the models into your prisma/schema.prisma"));
-    console.log(import_chalk.default.gray("      npx prisma migrate dev --name add-auth-models"));
-    console.log(import_chalk.default.gray("      npx prisma generate"));
+    if (stats.prismaSchemaUpdated) {
+      console.log(import_chalk.default.cyan("   2. Run Prisma migration"));
+      console.log(import_chalk.default.gray("      npx prisma migrate dev --name add-auth-models"));
+      console.log(import_chalk.default.gray("      npx prisma generate"));
+    } else {
+      console.log(import_chalk.default.cyan("   2. Add Prisma schema models manually"));
+      console.log(import_chalk.default.gray("      # Check src/auth/README.md for the model definitions"));
+      console.log(import_chalk.default.gray("      npx prisma migrate dev --name add-auth-models"));
+      console.log(import_chalk.default.gray("      npx prisma generate"));
+    }
   } else {
     console.log(import_chalk.default.cyan("   2. Create database migration (if using TypeORM)"));
     console.log(import_chalk.default.gray("      npm run migration:generate -- src/migrations/CreateUserTable"));
@@ -2053,6 +2212,27 @@ async function run(cwd = process.cwd(), options = {}) {
     );
     process.exit(1);
   }
+  let prismaSchemaUpdated = false;
+  if (config.orm === "prisma") {
+    const prismaSpinner = createSpinner("Updating prisma/schema.prisma...").start();
+    try {
+      const { PrismaSchemaUpdater: PrismaSchemaUpdater2 } = await Promise.resolve().then(() => (init_installer(), installer_exports));
+      const schemaPath = path7.join(projectInfo.root, "prisma", "schema.prisma");
+      const prismaUpdater = new PrismaSchemaUpdater2(schemaPath);
+      const prismaResult = await prismaUpdater.update(config);
+      if (prismaResult.updated) {
+        await prismaUpdater.cleanupBackup();
+        prismaSpinner.succeed(prismaResult.message);
+        prismaSchemaUpdated = true;
+      } else {
+        prismaSpinner.warn(prismaResult.message);
+      }
+    } catch (error) {
+      prismaSpinner.warn(
+        `Could not update prisma/schema.prisma: ${error instanceof Error ? error.message : "Unknown error"}`
+      );
+    }
+  }
   const mainSpinner = createSpinner("Updating main.ts with global guards...").start();
   try {
     const { MainTsUpdater: MainTsUpdater2 } = await Promise.resolve().then(() => (init_installer(), installer_exports));
@@ -2102,16 +2282,19 @@ async function run(cwd = process.cwd(), options = {}) {
     orm: config.orm,
     swagger: config.features.swagger,
     emailVerification: config.features.emailVerification,
-    resetPassword: config.features.resetPassword
+    resetPassword: config.features.resetPassword,
+    prismaSchemaUpdated
   });
   console.log("\u{1F41B} Issues? https://github.com/Islamawad132/add-nest-auth/issues");
   console.log("\u2B50 Like it? https://www.npmjs.com/package/nest-authme");
   console.log();
 }
+var path7;
 var init_index = __esm({
   "src/index.ts"() {
     "use strict";
     init_cjs_shims();
+    path7 = __toESM(require("path"));
     init_analyzer();
     init_prompts();
     init_ui();