@o3r/schematics 11.1.0-prerelease.4 → 11.1.0-prerelease.40

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. package/package.json +10 -10
  2. package/src/utility/gitignore.d.ts.map +1 -1
  3. package/src/utility/gitignore.js +17 -13
  4. package/src/utility/gitignore.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/schematics",
3
- "version": "11.1.0-prerelease.4",
3
+ "version": "11.1.0-prerelease.40",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -30,7 +30,7 @@
30
30
  "@angular-devkit/core": "~18.0.0",
31
31
  "@angular-devkit/schematics": "~18.0.0",
32
32
  "@angular/cli": "~18.0.0",
33
- "@o3r/telemetry": "^11.1.0-prerelease.4",
33
+ "@o3r/telemetry": "^11.1.0-prerelease.40",
34
34
  "@schematics/angular": "~18.0.0",
35
35
  "eslint": "^8.57.0",
36
36
  "rxjs": "^7.8.1",
@@ -85,23 +85,23 @@
85
85
  "@nx/eslint-plugin": "~19.3.0",
86
86
  "@nx/jest": "~19.3.0",
87
87
  "@nx/js": "~19.3.0",
88
- "@o3r/build-helpers": "^11.1.0-prerelease.4",
89
- "@o3r/eslint-plugin": "^11.1.0-prerelease.4",
90
- "@o3r/telemetry": "^11.1.0-prerelease.4",
88
+ "@o3r/build-helpers": "^11.1.0-prerelease.40",
89
+ "@o3r/eslint-plugin": "^11.1.0-prerelease.40",
90
+ "@o3r/telemetry": "^11.1.0-prerelease.40",
91
91
  "@schematics/angular": "~18.0.0",
92
92
  "@stylistic/eslint-plugin-ts": "^2.0.0",
93
93
  "@types/inquirer": "~8.2.10",
94
94
  "@types/jest": "~29.5.2",
95
95
  "@types/node": "^20.0.0",
96
96
  "@types/semver": "^7.3.13",
97
- "@typescript-eslint/eslint-plugin": "^7.2.0",
98
- "@typescript-eslint/parser": "^7.2.0",
99
- "@typescript-eslint/utils": "~7.14.1",
97
+ "@typescript-eslint/eslint-plugin": "^7.14.1",
98
+ "@typescript-eslint/parser": "^7.14.1",
99
+ "@typescript-eslint/utils": "^7.14.1",
100
100
  "cpy-cli": "^5.0.0",
101
101
  "eslint": "^8.57.0",
102
102
  "eslint-import-resolver-node": "^0.3.9",
103
103
  "eslint-plugin-jest": "~28.6.0",
104
- "eslint-plugin-jsdoc": "~48.5.0",
104
+ "eslint-plugin-jsdoc": "~48.8.0",
105
105
  "eslint-plugin-prefer-arrow": "~1.2.3",
106
106
  "eslint-plugin-unicorn": "^54.0.0",
107
107
  "jest": "~29.7.0",
@@ -110,7 +110,7 @@
110
110
  "jsonschema": "~1.4.1",
111
111
  "nx": "~19.3.0",
112
112
  "rxjs": "^7.8.1",
113
- "ts-jest": "~29.1.2",
113
+ "ts-jest": "~29.2.0",
114
114
  "ts-node": "~10.9.2",
115
115
  "type-fest": "^4.10.2",
116
116
  "typescript": "~5.4.2",
package/src/utility/gitignore.d.ts.map CHANGED
@@ -1 +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"}
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,gEA2BrG"}
package/src/utility/gitignore.js CHANGED
@@ -7,20 +7,24 @@ exports.ignorePatterns = void 0;
7
7
  * @param patternsToAdd List of patterns with description to add to gitignore files
8
8
  */
9
9
  function ignorePatterns(tree, patternsToAdd) {
10
- if (tree.exists('/.gitignore')) {
11
- let gitIgnoreFile = tree.read('/.gitignore').toString();
12
- let found = false;
13
- patternsToAdd
14
- .map(({ description, patterns }) => ({ description, patterns: patterns.filter((pattern) => new RegExp('^' + pattern.replace(/([*/\\.])/g, '\\$1')).test(gitIgnoreFile)) }))
15
- .filter(({ patterns }) => patterns.length)
16
- .forEach(({ description, patterns }) => {
17
- found = true;
18
- gitIgnoreFile = gitIgnoreFile + `\n# ${description}\n${patterns.join('\n')}\n`;
19
- });
20
- if (found) {
21
- tree.overwrite('/.gitignore', gitIgnoreFile);
22
- }
10
+ const gitIgnoreFileName = '/.gitignore';
11
+ const isGitIgnorePresent = tree.exists(gitIgnoreFileName);
12
+ let gitIgnoreFileContent = isGitIgnorePresent ? tree.readText(gitIgnoreFileName) : '';
13
+ const filteredPatternsToAdd = patternsToAdd
14
+ .map(({ description, patterns }) => ({ description, patterns: patterns.filter((pattern) => !new RegExp('^' + pattern.replace(/([*/\\.])/g, '\\$1')).test(gitIgnoreFileContent)) }))
15
+ .filter(({ patterns }) => patterns.length);
16
+ if (!filteredPatternsToAdd.length) {
17
+ return tree;
23
18
  }
19
+ gitIgnoreFileContent += '\n' + filteredPatternsToAdd
20
+ .map(({ description, patterns }) => (description ? `# ${description}\n` : '')
21
+ + patterns.join('\n'))
22
+ .join('\n');
23
+ if (isGitIgnorePresent) {
24
+ tree.overwrite(gitIgnoreFileName, gitIgnoreFileContent);
25
+ return tree;
26
+ }
27
+ tree.create(gitIgnoreFileName, gitIgnoreFileContent);
24
28
  return tree;
25
29
  }
26
30
  exports.ignorePatterns = ignorePatterns;
package/src/utility/gitignore.js.map CHANGED
@@ -1 +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"}
1
+ {"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"}