permachine 0.8.0 → 0.9.0

package/dist/cli.js

@@ -6025,6 +6025,104 @@ function stripJsonComments(jsonString, { whitespace = true, trailingCommas = fal
   return result + buffer + remaining;
 }
 
+// src/core/errors.ts
+class PermachineError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "PermachineError";
+  }
+}
+
+class NestedFilteredDirectoryError extends PermachineError {
+  outerDir;
+  innerDir;
+  constructor(outerDir, innerDir) {
+    super(`Nested machine-specific directories are not supported.
+` + `Found: ${innerDir} inside ${outerDir}
+` + `Only one level of directory filtering is allowed.`);
+    this.name = "NestedFilteredDirectoryError";
+    this.outerDir = outerDir;
+    this.innerDir = innerDir;
+  }
+}
+
+class DirectoryConflictError extends PermachineError {
+  outputPath;
+  sources;
+  constructor(outputPath, sources) {
+    super(`Multiple directories would output to the same path: ${outputPath}
+` + `Sources: ${sources.join(", ")}
+` + `Only one machine-specific directory can match per output path.`);
+    this.name = "DirectoryConflictError";
+    this.outputPath = outputPath;
+    this.sources = sources;
+  }
+}
+
+class FileDirectoryConflictError extends PermachineError {
+  outputPath;
+  fileSource;
+  dirSource;
+  constructor(outputPath, fileSource, dirSource) {
+    super(`Both a file merge and directory copy would output to: ${outputPath}
+` + `File source: ${fileSource}
+` + `Directory source: ${dirSource}
+` + `Remove one of these to resolve the conflict.`);
+    this.name = "FileDirectoryConflictError";
+    this.outputPath = outputPath;
+    this.fileSource = fileSource;
+    this.dirSource = dirSource;
+  }
+}
+
+class BaseDirectoryNotSupportedError extends PermachineError {
+  dirPath;
+  constructor(dirPath) {
+    super(`Base directories are not supported: ${dirPath}
+` + `Unlike files, directories do not support .base fallback.
+` + `Use machine-specific directories only (e.g., mydir.{machine=X}/).`);
+    this.name = "BaseDirectoryNotSupportedError";
+    this.dirPath = dirPath;
+  }
+}
+
+class DirectoryCopyError extends PermachineError {
+  sourcePath;
+  outputPath;
+  cause;
+  constructor(sourcePath, outputPath, cause) {
+    super(`Failed to copy directory: ${sourcePath} → ${outputPath}
+` + (cause ? `Cause: ${cause.message}` : ""));
+    this.name = "DirectoryCopyError";
+    this.sourcePath = sourcePath;
+    this.outputPath = outputPath;
+    this.cause = cause;
+  }
+}
+
+class CleanupError extends PermachineError {
+  path;
+  cause;
+  constructor(path2, cause) {
+    super(`Failed to cleanup stale output: ${path2}
+` + (cause ? `Cause: ${cause.message}` : ""));
+    this.name = "CleanupError";
+    this.path = path2;
+    this.cause = cause;
+  }
+}
+
+class ArrayMergeError extends PermachineError {
+  key;
+  constructor(key) {
+    super(`Cannot merge arrays containing non-primitive values at key "${key}".
+` + `Array merging only supports primitive values (string, number, boolean, null).
+` + `Arrays containing objects or nested arrays cannot be merged.`);
+    this.name = "ArrayMergeError";
+    this.key = key;
+  }
+}
+
 // src/adapters/json-adapter.ts
 class JsonAdapter {
   canHandle(extension) {
@@ -6046,7 +6144,10 @@ class JsonAdapter {
     return JSON.stringify(data, null, 2) + `
 `;
   }
-  deepMerge(base, machine) {
+  deepMerge(base, machine, path2 = "") {
+    if (Array.isArray(base) && Array.isArray(machine)) {
+      return this.mergeArrays(base, machine, path2);
+    }
     if (machine === null || typeof machine !== "object" || Array.isArray(machine)) {
       return machine;
     }
@@ -6056,8 +6157,9 @@ class JsonAdapter {
     const result = { ...base };
     for (const key in machine) {
       if (Object.prototype.hasOwnProperty.call(machine, key)) {
+        const newPath = path2 ? `${path2}.${key}` : key;
         if (key in result) {
-          result[key] = this.deepMerge(result[key], machine[key]);
+          result[key] = this.deepMerge(result[key], machine[key], newPath);
         } else {
           result[key] = machine[key];
         }
@@ -6065,6 +6167,32 @@ class JsonAdapter {
     }
     return result;
   }
+  isPrimitive(value) {
+    return value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+  }
+  isArrayOfPrimitives(arr) {
+    return arr.every((item) => this.isPrimitive(item));
+  }
+  mergeArrays(base, machine, path2) {
+    if (!this.isArrayOfPrimitives(base) || !this.isArrayOfPrimitives(machine)) {
+      throw new ArrayMergeError(path2 || "root");
+    }
+    const seen = new Set;
+    const result = [];
+    for (const item of base) {
+      if (!seen.has(item)) {
+        seen.add(item);
+        result.push(item);
+      }
+    }
+    for (const item of machine) {
+      if (!seen.has(item)) {
+        seen.add(item);
+        result.push(item);
+      }
+    }
+    return result;
+  }
 }
 
 // src/adapters/env-adapter.ts
@@ -6144,93 +6272,6 @@ function getFileType(filename) {
   return "unknown";
 }
 
-// src/core/errors.ts
-class PermachineError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "PermachineError";
-  }
-}
-
-class NestedFilteredDirectoryError extends PermachineError {
-  outerDir;
-  innerDir;
-  constructor(outerDir, innerDir) {
-    super(`Nested machine-specific directories are not supported.
-` + `Found: ${innerDir} inside ${outerDir}
-` + `Only one level of directory filtering is allowed.`);
-    this.name = "NestedFilteredDirectoryError";
-    this.outerDir = outerDir;
-    this.innerDir = innerDir;
-  }
-}
-
-class DirectoryConflictError extends PermachineError {
-  outputPath;
-  sources;
-  constructor(outputPath, sources) {
-    super(`Multiple directories would output to the same path: ${outputPath}
-` + `Sources: ${sources.join(", ")}
-` + `Only one machine-specific directory can match per output path.`);
-    this.name = "DirectoryConflictError";
-    this.outputPath = outputPath;
-    this.sources = sources;
-  }
-}
-
-class FileDirectoryConflictError extends PermachineError {
-  outputPath;
-  fileSource;
-  dirSource;
-  constructor(outputPath, fileSource, dirSource) {
-    super(`Both a file merge and directory copy would output to: ${outputPath}
-` + `File source: ${fileSource}
-` + `Directory source: ${dirSource}
-` + `Remove one of these to resolve the conflict.`);
-    this.name = "FileDirectoryConflictError";
-    this.outputPath = outputPath;
-    this.fileSource = fileSource;
-    this.dirSource = dirSource;
-  }
-}
-
-class BaseDirectoryNotSupportedError extends PermachineError {
-  dirPath;
-  constructor(dirPath) {
-    super(`Base directories are not supported: ${dirPath}
-` + `Unlike files, directories do not support .base fallback.
-` + `Use machine-specific directories only (e.g., mydir.{machine=X}/).`);
-    this.name = "BaseDirectoryNotSupportedError";
-    this.dirPath = dirPath;
-  }
-}
-
-class DirectoryCopyError extends PermachineError {
-  sourcePath;
-  outputPath;
-  cause;
-  constructor(sourcePath, outputPath, cause) {
-    super(`Failed to copy directory: ${sourcePath} → ${outputPath}
-` + (cause ? `Cause: ${cause.message}` : ""));
-    this.name = "DirectoryCopyError";
-    this.sourcePath = sourcePath;
-    this.outputPath = outputPath;
-    this.cause = cause;
-  }
-}
-
-class CleanupError extends PermachineError {
-  path;
-  cause;
-  constructor(path3, cause) {
-    super(`Failed to cleanup stale output: ${path3}
-` + (cause ? `Cause: ${cause.message}` : ""));
-    this.name = "CleanupError";
-    this.path = path3;
-    this.cause = cause;
-  }
-}
-
 // src/core/file-scanner.ts
 async function scanForMergeOperations(machineName, cwd = process.cwd()) {
   const operations = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "permachine",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Automatically merge machine-specific config files with base configs using git hooks",
   "type": "module",
   "bin": {