@atls/code-schematics 2.0.20 → 2.0.22

package/dist/schematic/project/project.factory.js

@@ -4,8 +4,42 @@ import { mergeWith } from '@angular-devkit/schematics';
 import { updateTsConfigRule } from '../rules/index.js';
 import { generateCommonSource } from '../sources/index.js';
 import { generateProjectSpecificSource } from '../sources/index.js';
-export const main = (options) => chain([
-    updateTsConfigRule,
-    mergeWith(generateCommonSource(options), MergeStrategy.Overwrite),
-    mergeWith(generateProjectSpecificSource(options), MergeStrategy.Overwrite),
-]);
+import { mergeGitIgnoreContent } from '../utils/index.js';
+const GITIGNORE_PATH = '.gitignore';
+const captureGitIgnoreContentRule = (state) => (host) => {
+    const gitIgnoreBuffer = host.read(GITIGNORE_PATH);
+    if (!gitIgnoreBuffer) {
+        return host;
+    }
+    state.content = gitIgnoreBuffer.toString('utf-8');
+    return host;
+};
+const mergeGitIgnoreContentRule = (state) => (host, context) => {
+    if (state.content === undefined) {
+        return host;
+    }
+    const gitIgnoreBuffer = host.read(GITIGNORE_PATH);
+    if (!gitIgnoreBuffer) {
+        return host;
+    }
+    const templateContent = gitIgnoreBuffer.toString('utf-8');
+    const mergedContent = mergeGitIgnoreContent({
+        existingContent: state.content,
+        templateContent,
+    });
+    if (mergedContent !== templateContent) {
+        context.logger.info('Merging template .gitignore with project-specific entries');
+        host.overwrite(GITIGNORE_PATH, mergedContent);
+    }
+    return host;
+};
+export const main = (options) => {
+    const state = {};
+    return chain([
+        captureGitIgnoreContentRule(state),
+        updateTsConfigRule,
+        mergeWith(generateCommonSource(options), MergeStrategy.Overwrite),
+        mergeWith(generateProjectSpecificSource(options), MergeStrategy.Overwrite),
+        mergeGitIgnoreContentRule(state),
+    ]);
+};

package/dist/schematic/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './gitignore.utils.js';
+export * from './merge-gitignore-content.utils.js';
 export * from './tsconfig.utils.js';
 export * from './json.utils.js';
 export * from './yaml.utils.js';

package/dist/schematic/utils/index.js

@@ -1,4 +1,5 @@
 export * from "./gitignore.utils.js";
+export * from "./merge-gitignore-content.utils.js";
 export * from "./tsconfig.utils.js";
 export * from "./json.utils.js";
 export * from "./yaml.utils.js";

package/dist/schematic/utils/merge-gitignore-content.utils.d.ts

@@ -0,0 +1,6 @@
+type MergeGitIgnoreContentOptions = {
+    existingContent: string;
+    templateContent: string;
+};
+export declare const mergeGitIgnoreContent: ({ existingContent, templateContent, }: MergeGitIgnoreContentOptions) => string;
+export {};

package/dist/schematic/utils/merge-gitignore-content.utils.js

@@ -0,0 +1,40 @@
+const PROJECT_SPECIFIC_START_MARKER = '# raijin:begin project-specific gitignore';
+const PROJECT_SPECIFIC_END_MARKER = '# raijin:end project-specific gitignore';
+const normalizeContent = (content) => content.replace(/\r\n/g, '\n');
+const getNormalizedLines = (content) => normalizeContent(content).split('\n');
+const trimTrailingEmptyLines = (lines) => {
+    const normalizedLines = [...lines];
+    while (normalizedLines.length > 0 && normalizedLines[normalizedLines.length - 1] === '') {
+        normalizedLines.pop();
+    }
+    return normalizedLines;
+};
+const isProjectSpecificLine = (line, templateLineSet) => line !== '' &&
+    !templateLineSet.has(line) &&
+    line !== PROJECT_SPECIFIC_START_MARKER &&
+    line !== PROJECT_SPECIFIC_END_MARKER;
+const getProjectSpecificLines = (existingLines, templateLineSet) => {
+    const startIndex = existingLines.indexOf(PROJECT_SPECIFIC_START_MARKER);
+    const endIndex = existingLines.indexOf(PROJECT_SPECIFIC_END_MARKER);
+    if (startIndex !== -1 && endIndex > startIndex) {
+        return Array.from(new Set(existingLines.filter((line) => isProjectSpecificLine(line, templateLineSet))));
+    }
+    return existingLines.filter((line) => isProjectSpecificLine(line, templateLineSet));
+};
+export const mergeGitIgnoreContent = ({ existingContent, templateContent, }) => {
+    const templateLines = getNormalizedLines(templateContent);
+    const templateLineSet = new Set(templateLines);
+    const existingLines = getNormalizedLines(existingContent);
+    const projectSpecificLines = getProjectSpecificLines(existingLines, templateLineSet);
+    if (projectSpecificLines.length === 0) {
+        return trimTrailingEmptyLines(templateLines).join('\n');
+    }
+    const mergedLines = trimTrailingEmptyLines(templateLines);
+    if (mergedLines.length > 0) {
+        mergedLines.push('');
+    }
+    mergedLines.push(PROJECT_SPECIFIC_START_MARKER);
+    mergedLines.push(...projectSpecificLines);
+    mergedLines.push(PROJECT_SPECIFIC_END_MARKER);
+    return mergedLines.join('\n');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atls/code-schematics",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "license": "BSD-3-Clause",
   "type": "module",
   "exports": {
@@ -24,15 +24,16 @@
   "dependencies": {
     "@angular-devkit/core": "19.1.5",
     "@angular-devkit/schematics": "19.1.5",
+    "js-yaml": "4.1.0",
     "strip-json-comments": "3.1.1"
   },
   "devDependencies": {
-    "@atls/code-runtime": "2.1.25",
-    "@types/node": "22.13.10",
-    "@yarnpkg/cli": "4.5.1",
-    "@yarnpkg/core": "4.1.4",
+    "@atls/code-runtime": "2.1.27",
+    "@types/node": "24.12.2",
+    "@yarnpkg/cli": "4.14.1",
+    "@yarnpkg/core": "4.7.0",
     "@yarnpkg/esbuild-plugin-pnp": "3.0.0-rc.15",
-    "@yarnpkg/fslib": "3.1.0",
+    "@yarnpkg/fslib": "3.1.5",
     "esbuild": "0.24.2",
     "rxjs": "7.8.1"
   },