declapract-typescript-ehmpathy 0.47.36 → 0.47.38

package/dist/practices/git/best-practice/.gitattributes.declapract.ts

@@ -101,26 +101,26 @@ const ensureSection = (
 ): string => {
   const lines = content.split('\n');
 
+  // find which entries are absent from the content
+  const entriesAbsent = section.entries.latest.filter(
+    (entry) => !content.includes(entry),
+  );
+
   // find the header line index
   const headerIndex = lines.findIndex(
     (line) => line.trim() === section.header.latest,
   );
 
-  // if header not found, append the whole section at the end
+  // if header not found, append header and only absent entries
   if (headerIndex === -1) {
     return (
       content.trimEnd() +
       '\n\n' +
-      [section.header.latest, ...section.entries.latest].join('\n') +
+      [section.header.latest, ...entriesAbsent].join('\n') +
       '\n'
     );
   }
 
-  // find which entries are absent
-  const entriesAbsent = section.entries.latest.filter(
-    (entry) => !content.includes(entry),
-  );
-
   // if all entries present, no fix required
   if (entriesAbsent.length === 0) return content;
 

package/dist/practices/git/best-practice/.gitignore.declapract.ts

@@ -2,7 +2,10 @@ import type { FileCheckFunction, FileFixFunction } from 'declapract';
 import { dedupe } from 'domain-objects';
 import expect from 'expect';
 
-const expectedIgnores = [
+/**
+ * ignores that can be sorted alphabetically (no order dependencies)
+ */
+const ignoresSortable = [
   '*.log',
   '*.tsbuildinfo',
   '.artifact', // deployment artifacts from `simple-artifact-builder` are produced here
@@ -17,15 +20,38 @@ const expectedIgnores = [
   '*.bak.*', // backup files
   'coverage',
   'dist',
-  'node_modules',
 ].sort();
 
+/**
+ * ignores that must appear in a specific order (negations must follow their targets)
+ *
+ * note
+ * - node_modules under .test* dirs are test fixtures (cloned repos via genTempDir)
+ * - gitignore negation requires the negated pattern to come after the original
+ */
+const ignoresOrdered = [
+  'node_modules',
+  '!.test*/**/node_modules',
+  '!.test*/**/node_modules/**',
+];
+
 const defineExpectedContents = (contents: string | null): string => {
-  const ignoresAlreadyDefined = contents ? contents.split('\n') : [];
-  const finalLines = dedupe([...ignoresAlreadyDefined, ...expectedIgnores])
-    .sort() // sorted
-    .filter((line) => !!line); // without empty lines
-  return [...finalLines.sort(), ''].join('\n');
+  // parse ignores from file
+  const ignoresFromFile = contents ? contents.split('\n') : [];
+
+  // separate into sortable vs ordered
+  const orderedPatterns = new Set(ignoresOrdered);
+  const ignoresFromFileSortable = ignoresFromFile.filter(
+    (line) => !!line && !orderedPatterns.has(line),
+  );
+
+  // combine and sort the sortable ignores
+  const sortedIgnores = dedupe([...ignoresFromFileSortable, ...ignoresSortable])
+    .sort()
+    .filter((line) => !!line);
+
+  // append ordered ignores at the end (order preserved)
+  return [...sortedIgnores, ...ignoresOrdered, ''].join('\n');
 };
 
 export const check: FileCheckFunction = (contents) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "declapract-typescript-ehmpathy",
   "author": "ehmpathy",
   "description": "declapract best practices declarations for typescript",
-  "version": "0.47.36",
+  "version": "0.47.38",
   "license": "MIT",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",