@ng-annotate/angular 0.3.4 → 0.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ng-annotate/angular",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "schematics": "./schematics/collection.json",
   "description": "Angular library for ng-annotate-mcp — browser overlay for annotating components and routing instructions to an AI agent",
   "keywords": [

package/schematics/ng-add/index.js

@@ -3,6 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
+/** Insert `newImport` on the line after the last import statement (handles multi-line imports and blank lines between groups). */
+function insertAfterLastImport(content, newImport) {
+    const lines = content.split('\n');
+    let lastImportLine = -1;
+    let inImport = false;
+    for (let i = 0; i < lines.length; i++) {
+        if (/^import\s/.test(lines[i]))
+            inImport = true;
+        if (inImport) {
+            lastImportLine = i;
+            if (lines[i].includes(';'))
+                inImport = false;
+        }
+    }
+    if (lastImportLine < 0)
+        return newImport + '\n' + content;
+    lines.splice(lastImportLine + 1, 0, newImport);
+    return lines.join('\n');
+}
+/** Insert `newProvider` as the first item in the `providers: [...]` array, preserving indentation style. */
+function insertIntoProviders(content, newProvider) {
+    return content.replace(/^(\s*)providers\s*:\s*\[/m, (match, indent) => {
+        return `${indent}providers: [\n${indent}  ${newProvider},`;
+    });
+}
 const MIN_ANGULAR_MAJOR = 21;
 function checkAngularVersion() {
     return (tree) => {
@@ -24,9 +49,9 @@ function addVitePlugin() {
         const candidates = ['vite.config.ts', 'vite.config.js', 'vite.config.mts'];
         const viteConfigPath = candidates.find((p) => tree.exists(p));
         if (!viteConfigPath) {
-            context.logger.warn('⚠️  Could not find vite.config.ts — add the plugin manually:\n' +
-                "    import { ngAnnotateMcp } from '@ng-annotate/vite-plugin';\n" +
-                '    plugins: [...ngAnnotateMcp()]');
+            const created = `import { defineConfig } from 'vite';\nimport { ngAnnotateMcp } from '@ng-annotate/vite-plugin';\n\nexport default defineConfig({\n  plugins: [...ngAnnotateMcp()],\n});\n`;
+            tree.create('vite.config.ts', created);
+            context.logger.info('✅ Created vite.config.ts with ngAnnotateMcp()');
             return;
         }
         let content = tree.read(viteConfigPath).toString('utf-8');
@@ -34,9 +59,7 @@ function addVitePlugin() {
             context.logger.info('@ng-annotate/vite-plugin vite plugin already present, skipping.');
             return;
         }
-        // Insert import after the last existing import line
-        content = content.replace(/(^import .+$(\r?\n)?)+/m, (match) => match + "import { ngAnnotateMcp } from '@ng-annotate/vite-plugin';\n");
-        // Insert spread into plugins array (handles `plugins: [` or `plugins:[`)
+        content = insertAfterLastImport(content, "import { ngAnnotateMcp } from '@ng-annotate/vite-plugin';");
         content = content.replace(/plugins\s*:\s*\[/, 'plugins: [...ngAnnotateMcp(), ');
         tree.overwrite(viteConfigPath, content);
         context.logger.info(`✅ Added ngAnnotateMcp() to ${viteConfigPath}`);
@@ -61,10 +84,8 @@ function addProviders() {
             context.logger.info('provideNgAnnotate already present, skipping.');
             return;
         }
-        // Insert import after the last existing import line
-        content = content.replace(/(^import .+$(\r?\n)?)+/m, (match) => match + "import { provideNgAnnotate } from '@ng-annotate/angular';\n");
-        // Insert into providers array
-        content = content.replace(/providers\s*:\s*\[/, 'providers: [\n    provideNgAnnotate(),');
+        content = insertAfterLastImport(content, "import { provideNgAnnotate } from '@ng-annotate/angular';");
+        content = insertIntoProviders(content, 'provideNgAnnotate()');
         tree.overwrite(appConfigPath, content);
         context.logger.info(`✅ Added provideNgAnnotate() to ${appConfigPath}`);
     };

package/schematics/ng-add/index.ts

@@ -1,6 +1,32 @@
 import { Rule, SchematicContext, Tree, chain, SchematicsException } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 
+/** Insert `newImport` on the line after the last import statement (handles multi-line imports and blank lines between groups). */
+function insertAfterLastImport(content: string, newImport: string): string {
+  const lines = content.split('\n');
+  let lastImportLine = -1;
+  let inImport = false;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (/^import\s/.test(lines[i])) inImport = true;
+    if (inImport) {
+      lastImportLine = i;
+      if (lines[i].includes(';')) inImport = false;
+    }
+  }
+
+  if (lastImportLine < 0) return newImport + '\n' + content;
+  lines.splice(lastImportLine + 1, 0, newImport);
+  return lines.join('\n');
+}
+
+/** Insert `newProvider` as the first item in the `providers: [...]` array, preserving indentation style. */
+function insertIntoProviders(content: string, newProvider: string): string {
+  return content.replace(/^(\s*)providers\s*:\s*\[/m, (match, indent) => {
+    return `${indent}providers: [\n${indent}  ${newProvider},`;
+  });
+}
+
 interface Options {
   aiTool: 'claude-code' | 'vscode' | 'both' | 'other';
 }
@@ -36,11 +62,9 @@ function addVitePlugin(): Rule {
     const viteConfigPath = candidates.find((p) => tree.exists(p));
 
     if (!viteConfigPath) {
-      context.logger.warn(
-        '⚠️  Could not find vite.config.ts — add the plugin manually:\n' +
-          "    import { ngAnnotateMcp } from '@ng-annotate/vite-plugin';\n" +
-          '    plugins: [...ngAnnotateMcp()]',
-      );
+      const created = `import { defineConfig } from 'vite';\nimport { ngAnnotateMcp } from '@ng-annotate/vite-plugin';\n\nexport default defineConfig({\n  plugins: [...ngAnnotateMcp()],\n});\n`;
+      tree.create('vite.config.ts', created);
+      context.logger.info('✅ Created vite.config.ts with ngAnnotateMcp()');
       return;
     }
 
@@ -51,13 +75,7 @@ function addVitePlugin(): Rule {
       return;
     }
 
-    // Insert import after the last existing import line
-    content = content.replace(
-      /(^import .+$(\r?\n)?)+/m,
-      (match) => match + "import { ngAnnotateMcp } from '@ng-annotate/vite-plugin';\n",
-    );
-
-    // Insert spread into plugins array (handles `plugins: [` or `plugins:[`)
+    content = insertAfterLastImport(content, "import { ngAnnotateMcp } from '@ng-annotate/vite-plugin';");
     content = content.replace(/plugins\s*:\s*\[/, 'plugins: [...ngAnnotateMcp(), ');
 
     tree.overwrite(viteConfigPath, content);
@@ -90,14 +108,8 @@ function addProviders(): Rule {
       return;
     }
 
-    // Insert import after the last existing import line
-    content = content.replace(
-      /(^import .+$(\r?\n)?)+/m,
-      (match) => match + "import { provideNgAnnotate } from '@ng-annotate/angular';\n",
-    );
-
-    // Insert into providers array
-    content = content.replace(/providers\s*:\s*\[/, 'providers: [\n    provideNgAnnotate(),');
+    content = insertAfterLastImport(content, "import { provideNgAnnotate } from '@ng-annotate/angular';");
+    content = insertIntoProviders(content, 'provideNgAnnotate()');
 
     tree.overwrite(appConfigPath, content);
     context.logger.info(`✅ Added provideNgAnnotate() to ${appConfigPath}`);