@o3r/schematics 11.1.0-prerelease.30 → 11.1.0-prerelease.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "11.1.0-prerelease.30",
+  "version": "11.1.0-prerelease.32",
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +30,7 @@
     "@angular-devkit/core": "~18.0.0",
     "@angular-devkit/schematics": "~18.0.0",
     "@angular/cli": "~18.0.0",
-    "@o3r/telemetry": "^11.1.0-prerelease.30",
+    "@o3r/telemetry": "^11.1.0-prerelease.32",
     "@schematics/angular": "~18.0.0",
     "eslint": "^8.57.0",
     "rxjs": "^7.8.1",
@@ -85,9 +85,9 @@
     "@nx/eslint-plugin": "~19.3.0",
     "@nx/jest": "~19.3.0",
     "@nx/js": "~19.3.0",
-    "@o3r/build-helpers": "^11.1.0-prerelease.30",
-    "@o3r/eslint-plugin": "^11.1.0-prerelease.30",
-    "@o3r/telemetry": "^11.1.0-prerelease.30",
+    "@o3r/build-helpers": "^11.1.0-prerelease.32",
+    "@o3r/eslint-plugin": "^11.1.0-prerelease.32",
+    "@o3r/telemetry": "^11.1.0-prerelease.32",
     "@schematics/angular": "~18.0.0",
     "@stylistic/eslint-plugin-ts": "^2.0.0",
     "@types/inquirer": "~8.2.10",

package/src/utility/gitignore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAC,EAAE,gEAoBrG"}
+{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAC,EAAE,gEA2BrG"}

package/src/utility/gitignore.js

@@ -7,20 +7,24 @@ exports.ignorePatterns = void 0;
  * @param patternsToAdd List of patterns with description to add to gitignore files
  */
 function ignorePatterns(tree, patternsToAdd) {
-    if (tree.exists('/.gitignore')) {
-        let gitIgnoreFile = tree.read('/.gitignore').toString();
-        let found = false;
-        patternsToAdd
-            .map(({ description, patterns }) => ({ description, patterns: patterns.filter((pattern) => new RegExp('^' + pattern.replace(/([*/\\.])/g, '\\$1')).test(gitIgnoreFile)) }))
-            .filter(({ patterns }) => patterns.length)
-            .forEach(({ description, patterns }) => {
-            found = true;
-            gitIgnoreFile = gitIgnoreFile + `\n# ${description}\n${patterns.join('\n')}\n`;
-        });
-        if (found) {
-            tree.overwrite('/.gitignore', gitIgnoreFile);
-        }
+    const gitIgnoreFileName = '/.gitignore';
+    const isGitIgnorePresent = tree.exists(gitIgnoreFileName);
+    let gitIgnoreFileContent = isGitIgnorePresent ? tree.readText(gitIgnoreFileName) : '';
+    const filteredPatternsToAdd = patternsToAdd
+        .map(({ description, patterns }) => ({ description, patterns: patterns.filter((pattern) => !new RegExp('^' + pattern.replace(/([*/\\.])/g, '\\$1')).test(gitIgnoreFileContent)) }))
+        .filter(({ patterns }) => patterns.length);
+    if (!filteredPatternsToAdd.length) {
+        return tree;
     }
+    gitIgnoreFileContent += '\n' + filteredPatternsToAdd
+        .map(({ description, patterns }) => (description ? `# ${description}\n` : '')
+        + patterns.join('\n'))
+        .join('\n');
+    if (isGitIgnorePresent) {
+        tree.overwrite(gitIgnoreFileName, gitIgnoreFileContent);
+        return tree;
+    }
+    tree.create(gitIgnoreFileName, gitIgnoreFileContent);
     return tree;
 }
 exports.ignorePatterns = ignorePatterns;

package/src/utility/gitignore.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitignore.js","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,cAAc,CAAC,IAAU,EAAE,aAA2D;IACpG,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAE/B,IAAI,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAE,CAAC,QAAQ,EAAE,CAAC;QACzD,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,aAAa;aACV,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,EAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAC,CAAC,CAAC;aACxK,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;aACzC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE;YACrC,KAAK,GAAG,IAAI,CAAC;YACb,aAAa,GAAG,aAAa,GAAG,OAAO,WAAY,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAClF,CAAC,CAAC,CAAC;QAEL,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AApBD,wCAoBC"}
+{"version":3,"file":"gitignore.js","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,cAAc,CAAC,IAAU,EAAE,aAA2D;IACpG,MAAM,iBAAiB,GAAG,aAAa,CAAC;IACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,oBAAoB,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEtF,MAAM,qBAAqB,GAAG,aAAa;SACxC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,EAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAC,CAAC,CAAC;SAChL,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE7C,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oBAAoB,IAAI,IAAI,GAAG,qBAAqB;SACjD,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CACjC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;UACvC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CACtB;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,wCA2BC"}