add-nest-auth 1.0.6 → 1.0.8

package/README.md

@@ -359,9 +359,9 @@ If this tool helped you, please consider:
 
 ## 🔗 Links
 
-- **GitHub**: https://github.com/yourusername/add-nest-auth
+- **GitHub**: https://github.com/Islamawad132/add-nest-auth
 - **npm**: https://www.npmjs.com/package/add-nest-auth
-- **Issues**: https://github.com/yourusername/add-nest-auth/issues
+- **Issues**: https://github.com/Islamawad132/add-nest-auth/issues
 
 ---
 

package/dist/cli.js

@@ -127,6 +127,7 @@ var init_file_writer = __esm({
     fs3 = __toESM(require("fs-extra"));
     FileWriter = class {
       writtenFiles = [];
+      skippedFiles = [];
       backups = /* @__PURE__ */ new Map();
       /**
        * Write a file to disk
@@ -135,7 +136,8 @@ var init_file_writer = __esm({
         const { overwrite = false, backup = true } = options;
         const exists = await fs3.pathExists(filePath);
         if (exists && !overwrite) {
-          throw new Error(`File already exists: ${filePath}`);
+          this.skippedFiles.push(filePath);
+          return;
         }
         if (exists && backup) {
           await this.createBackup(filePath);
@@ -187,6 +189,12 @@ var init_file_writer = __esm({
       getWrittenFiles() {
         return [...this.writtenFiles];
       }
+      /**
+       * Get list of skipped files (already existed)
+       */
+      getSkippedFiles() {
+        return [...this.skippedFiles];
+      }
     };
   }
 });
@@ -225,7 +233,7 @@ var init_generator = __esm({
       /**
        * Generate all authentication files
        */
-      async generate(config, projectInfo) {
+      async generate(config, projectInfo, overwrite = false) {
         try {
           const context = buildTemplateContext(config);
           const plan = this.buildGenerationPlan(config);
@@ -239,19 +247,22 @@ var init_generator = __esm({
             );
             const outputPath = path4.join(projectInfo.root, fileSpec.output);
             await this.fileWriter.writeFile(outputPath, content, {
-              overwrite: false
+              overwrite
             });
           }
           const filesCreated = this.fileWriter.getWrittenFiles();
+          const filesSkipped = this.fileWriter.getSkippedFiles();
           await this.fileWriter.cleanupBackups();
           return {
             filesCreated,
+            filesSkipped,
             success: true
           };
         } catch (error) {
           await this.fileWriter.rollback();
           return {
             filesCreated: [],
+            filesSkipped: [],
             success: false,
             error: error instanceof Error ? error.message : "Unknown error"
           };
@@ -348,7 +359,10 @@ var init_ast_updater = __esm({
       constructor(appModulePath) {
         this.appModulePath = appModulePath;
         this.project = new import_ts_morph.Project({
-          skipAddingFilesFromTsConfig: true
+          skipAddingFilesFromTsConfig: true,
+          manipulationSettings: {
+            indentationText: import_ts_morph.IndentationText.TwoSpaces
+          }
         });
       }
       project;
@@ -357,12 +371,13 @@ var init_ast_updater = __esm({
       /**
        * Update app.module.ts with auth modules
        */
-      async update() {
+      async update(config) {
         await this.createBackup();
         try {
           this.sourceFile = this.project.addSourceFileAtPath(this.appModulePath);
-          this.addImports();
-          this.addModulesToDecorator();
+          this.addImports(config);
+          this.addModulesToDecorator(config);
+          this.sourceFile.formatText();
           await this.sourceFile.save();
         } catch (error) {
           await this.restoreBackup();
@@ -372,11 +387,18 @@ var init_ast_updater = __esm({
       /**
        * Add necessary imports
        */
-      addImports() {
+      addImports(config) {
         if (!this.sourceFile) {
           throw new Error("Source file not loaded");
         }
         this.addImport("@nestjs/config", ["ConfigModule"]);
+        if (config && config.orm === "typeorm") {
+          this.addImport("@nestjs/typeorm", ["TypeOrmModule"]);
+          this.addImport("./users/entities/user.entity", ["User"]);
+          if (config.features.refreshTokens) {
+            this.addImport("./users/entities/refresh-token.entity", ["RefreshToken"]);
+          }
+        }
         this.addImport("./auth/auth.module", ["AuthModule"]);
         this.addImport("./users/users.module", ["UsersModule"]);
       }
@@ -404,7 +426,7 @@ var init_ast_updater = __esm({
       /**
        * Add modules to @Module decorator imports array
        */
-      addModulesToDecorator() {
+      addModulesToDecorator(config) {
         if (!this.sourceFile) return;
         const appModuleClass = this.sourceFile.getClass("AppModule");
         if (!appModuleClass) {
@@ -437,6 +459,11 @@ var init_ast_updater = __esm({
         if (!existingModules.has("ConfigModule")) {
           importsArray.addElement("ConfigModule.forRoot({ isGlobal: true })");
         }
+        if (config && config.orm === "typeorm" && !existingModules.has("TypeOrmModule")) {
+          const entities = config.features.refreshTokens ? "[User, RefreshToken]" : "[User]";
+          const typeOrmConfig = this.buildTypeOrmConfig(config.database, entities);
+          importsArray.addElement(typeOrmConfig);
+        }
         if (!existingModules.has("AuthModule")) {
           importsArray.addElement("AuthModule");
         }
@@ -444,6 +471,43 @@ var init_ast_updater = __esm({
           importsArray.addElement("UsersModule");
         }
       }
+      /**
+       * Build TypeORM.forRoot() configuration string based on database type
+       */
+      buildTypeOrmConfig(database, entities) {
+        switch (database) {
+          case "sqlite":
+            return `TypeOrmModule.forRoot({
+      type: 'sqlite',
+      database: 'database.sqlite',
+      entities: ${entities},
+      synchronize: true, // WARNING: disable in production!
+    })`;
+          case "mysql":
+            return `TypeOrmModule.forRoot({
+      type: 'mysql',
+      host: process.env.DATABASE_HOST || 'localhost',
+      port: parseInt(process.env.DATABASE_PORT || '3306'),
+      username: process.env.DATABASE_USER || 'root',
+      password: process.env.DATABASE_PASSWORD || '',
+      database: process.env.DATABASE_NAME || 'auth_db',
+      entities: ${entities},
+      synchronize: true, // WARNING: disable in production!
+    })`;
+          case "postgres":
+          default:
+            return `TypeOrmModule.forRoot({
+      type: 'postgres',
+      host: process.env.DATABASE_HOST || 'localhost',
+      port: parseInt(process.env.DATABASE_PORT || '5432'),
+      username: process.env.DATABASE_USER || 'postgres',
+      password: process.env.DATABASE_PASSWORD || 'postgres',
+      database: process.env.DATABASE_NAME || 'auth_db',
+      entities: ${entities},
+      synchronize: true, // WARNING: disable in production!
+    })`;
+        }
+      }
       /**
        * Get existing module names from imports array
        */
@@ -501,7 +565,10 @@ var init_main_ts_updater = __esm({
       constructor(mainTsPath) {
         this.mainTsPath = mainTsPath;
         this.project = new import_ts_morph2.Project({
-          skipAddingFilesFromTsConfig: true
+          skipAddingFilesFromTsConfig: true,
+          manipulationSettings: {
+            indentationText: import_ts_morph2.IndentationText.TwoSpaces
+          }
         });
       }
       project;
@@ -519,6 +586,7 @@ var init_main_ts_updater = __esm({
           this.sourceFile = this.project.addSourceFileAtPath(this.mainTsPath);
           this.addImports();
           this.addGlobalGuardsAndPipes();
+          this.sourceFile.formatText();
           await this.sourceFile.save();
         } catch (error) {
           await this.restoreBackup();
@@ -588,19 +656,19 @@ var init_main_ts_updater = __esm({
         }
         const codeToInsert = [
           "",
-          "  // Enable global validation pipe",
-          "  app.useGlobalPipes(",
-          "    new ValidationPipe({",
-          "      whitelist: true,",
-          "      forbidNonWhitelisted: true,",
-          "      transform: true,",
-          "    }),",
-          "  );",
+          "// Enable global validation pipe",
+          "app.useGlobalPipes(",
+          "  new ValidationPipe({",
+          "    whitelist: true,",
+          "    forbidNonWhitelisted: true,",
+          "    transform: true,",
+          "  }),",
+          ");",
           "",
-          "  // Enable global JWT guard (all routes protected by default)",
-          "  // Use @Public() decorator on routes that should be accessible without auth",
-          "  const reflector = app.get(Reflector);",
-          "  app.useGlobalGuards(new JwtAuthGuard(reflector));",
+          "// Enable global JWT guard (all routes protected by default)",
+          "// Use @Public() decorator on routes that should be accessible without auth",
+          "const reflector = app.get(Reflector);",
+          "app.useGlobalGuards(new JwtAuthGuard(reflector));",
           ""
         ].join("\n");
         body.insertStatements(listenIndex, codeToInsert);
@@ -840,6 +908,25 @@ async function detectORM(packageJson) {
   }
   return "none";
 }
+function detectDatabase(packageJson, orm) {
+  const dependencies = {
+    ...packageJson.dependencies,
+    ...packageJson.devDependencies
+  };
+  if (orm === "typeorm") {
+    if (dependencies["pg"]) return "postgres";
+    if (dependencies["mysql2"] || dependencies["mysql"]) return "mysql";
+    if (dependencies["sqlite3"]) return "sqlite";
+    if (dependencies["mongodb"]) return "mongodb";
+  }
+  if (orm === "prisma") {
+    return void 0;
+  }
+  if (orm === "mongoose") {
+    return "mongodb";
+  }
+  return void 0;
+}
 
 // src/analyzer/project-detector.ts
 var ProjectDetector = class {
@@ -878,11 +965,11 @@ var ProjectDetector = class {
     }
     const mainTsPath = path.join(root, sourceRoot, "main.ts");
     const orm = await detectORM(packageJson);
+    const database = detectDatabase(packageJson, orm);
     const authModulePath = path.join(root, sourceRoot, "auth");
-    if (await fs.pathExists(authModulePath)) {
-      errors.push("auth/ directory already exists (use --force to overwrite)");
-    }
+    const authExists = await fs.pathExists(authModulePath);
     return {
+      authExists,
       root,
       sourceRoot,
       appModulePath,
@@ -890,6 +977,7 @@ var ProjectDetector = class {
       packageJsonPath,
       nestCliConfigPath,
       orm,
+      database,
       nestVersion: packageJson.dependencies?.["@nestjs/core"],
       typescriptVersion: packageJson.devDependencies?.["typescript"],
       isValid: errors.length === 0,
@@ -955,7 +1043,8 @@ function generateSecret(length = 32) {
 }
 
 // src/cli/prompts.ts
-async function promptConfig(detectedORM) {
+async function promptConfig(detectedORM, detectedDB) {
+  const dbLabel = detectedDB ? ` with ${detectedDB.charAt(0).toUpperCase() + detectedDB.slice(1)}` : "";
   const answers = await import_inquirer.default.prompt([
     {
       type: "list",
@@ -1027,7 +1116,7 @@ async function promptConfig(detectedORM) {
     {
       type: "confirm",
       name: "useDetectedORM",
-      message: `Detected ${detectedORM.toUpperCase()}${detectedORM === "typeorm" ? " with PostgreSQL" : ""}. Use it?`,
+      message: `Detected ${detectedORM.toUpperCase()}${dbLabel}. Use it?`,
       default: true,
       when: () => detectedORM !== "none"
     },
@@ -1053,7 +1142,7 @@ async function promptConfig(detectedORM) {
   ]);
   return answers;
 }
-function buildConfig(answers, projectName, sourceRoot, detectedORM) {
+function buildConfig(answers, projectName, sourceRoot, detectedORM, detectedDB) {
   const config = {
     projectName,
     sourceRoot,
@@ -1063,7 +1152,7 @@ function buildConfig(answers, projectName, sourceRoot, detectedORM) {
       roles: answers.roles || []
     },
     orm: answers.useDetectedORM !== false ? detectedORM : "typeorm",
-    database: answers.database || "postgres",
+    database: answers.database || detectedDB || "postgres",
     features: {
       refreshTokens: answers.refreshTokens
     },
@@ -1205,12 +1294,26 @@ async function run(cwd = process.cwd()) {
     orm: projectInfo.orm,
     sourceRoot: projectInfo.sourceRoot
   });
-  const answers = await promptConfig(projectInfo.orm);
+  if (projectInfo.authExists) {
+    const inquirer2 = (await import("inquirer")).default;
+    const { overwrite } = await inquirer2.prompt([{
+      type: "confirm",
+      name: "overwrite",
+      message: "auth/ directory already exists. Overwrite existing files?",
+      default: false
+    }]);
+    if (!overwrite) {
+      console.log("\n\u23ED\uFE0F  Cancelled. Existing auth module unchanged.\n");
+      process.exit(0);
+    }
+  }
+  const answers = await promptConfig(projectInfo.orm, projectInfo.database);
   const config = buildConfig(
     answers,
     projectInfo.root.split(/[/\\]/).pop() || "project",
     projectInfo.sourceRoot,
-    projectInfo.orm
+    projectInfo.orm,
+    projectInfo.database
   );
   console.log();
   console.log("\u2699\uFE0F  Generating authentication module...");
@@ -1218,18 +1321,21 @@ async function run(cwd = process.cwd()) {
   const { Generator: Generator2 } = await Promise.resolve().then(() => (init_generator2(), generator_exports));
   const generator = new Generator2();
   const genSpinner = createSpinner("Generating files from templates...").start();
-  const result = await generator.generate(config, projectInfo);
+  const result = await generator.generate(config, projectInfo, !!projectInfo.authExists);
   if (!result.success) {
     genSpinner.fail("Generation failed");
     showError("Failed to generate files", [result.error || "Unknown error"]);
     process.exit(1);
   }
   genSpinner.succeed(`Generated ${result.filesCreated.length} files`);
+  if (result.filesSkipped.length > 0) {
+    console.log(`  \u26A0\uFE0F  Skipped ${result.filesSkipped.length} existing file(s)`);
+  }
   const astSpinner = createSpinner("Updating app.module.ts...").start();
   try {
     const { AppModuleUpdater: AppModuleUpdater2 } = await Promise.resolve().then(() => (init_installer(), installer_exports));
     const astUpdater = new AppModuleUpdater2(projectInfo.appModulePath);
-    await astUpdater.update();
+    await astUpdater.update(config);
     await astUpdater.cleanupBackup();
     astSpinner.succeed("Updated app.module.ts");
   } catch (error) {