permachine 0.5.1 → 0.6.0

package/dist/cli.js

@@ -5800,7 +5800,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/core/file-scanner.ts
-import path2 from "node:path";
+import path3 from "node:path";
 
 // src/core/file-filters.ts
 import os2 from "node:os";
@@ -5934,117 +5934,18 @@ function matchFilters(filename, context) {
 function getBaseFilename(filename) {
   return parseFilters(filename).baseFilename;
 }
+function isBaseFile(filename) {
+  const basename = filename.includes("/") || filename.includes("\\") ? filename.split(/[/\\]/).pop() || filename : filename;
+  return basename.includes(".base.") || basename.endsWith(".base");
+}
 function isLegacyFilename(filename, machineName) {
   const middlePattern = new RegExp(`\\.${machineName}\\.`, "i");
   const endPattern = new RegExp(`\\.${machineName}$`, "i");
   return (middlePattern.test(filename) || endPattern.test(filename)) && !hasFilters(filename);
 }
 
-// src/core/file-scanner.ts
-async function scanForMergeOperations(machineName, cwd = process.cwd()) {
-  const operations = [];
-  const patterns = [
-    "**/*{*}*",
-    `**/*.${machineName}.*`,
-    `**/.*.${machineName}`,
-    `**/.*.${machineName}.*`
-  ];
-  const foundFiles = [];
-  for (const pattern of patterns) {
-    try {
-      const files = await glob(pattern, {
-        cwd,
-        ignore: ["node_modules/**", ".git/**", "dist/**", "**/*.base.*", "**/.*base*"],
-        dot: true,
-        nodir: true
-      });
-      foundFiles.push(...files);
-    } catch (error) {}
-  }
-  const uniqueFiles = [...new Set(foundFiles)];
-  const context = createCustomContext({ machine: machineName });
-  for (const file of uniqueFiles) {
-    const basename = path2.basename(file);
-    if (basename.includes(".base.") || basename.includes(".base")) {
-      continue;
-    }
-    let shouldProcess = false;
-    if (hasFilters(basename)) {
-      const result = matchFilters(basename, context);
-      shouldProcess = result.matches;
-    } else if (isLegacyFilename(basename, machineName)) {
-      shouldProcess = true;
-    }
-    if (shouldProcess) {
-      const operation = createMergeOperation(file, machineName, cwd);
-      if (operation) {
-        operations.push(operation);
-      }
-    }
-  }
-  return operations;
-}
-function createMergeOperation(machineFile, machineName, cwd) {
-  const dir = path2.dirname(machineFile);
-  const fullBasename = path2.basename(machineFile);
-  let type;
-  let ext2;
-  if (fullBasename.endsWith(".json")) {
-    type = "json";
-    ext2 = ".json";
-  } else if (fullBasename.startsWith(".env")) {
-    type = "env";
-    ext2 = "";
-  } else {
-    type = "unknown";
-    ext2 = path2.extname(machineFile);
-  }
-  if (type === "unknown") {
-    return null;
-  }
-  let baseName;
-  let outputName;
-  if (hasFilters(fullBasename)) {
-    outputName = getBaseFilename(fullBasename);
-    if (type === "env") {
-      const nameWithoutExt = outputName;
-      baseName = nameWithoutExt + ".base";
-    } else {
-      const nameWithoutExt = outputName.replace(ext2, "");
-      baseName = nameWithoutExt + ".base" + ext2;
-    }
-  } else {
-    const basename = type === "env" ? fullBasename : path2.basename(machineFile, ext2);
-    const machinePattern = `.${machineName}`;
-    if (basename.endsWith(machinePattern)) {
-      const withoutMachine = basename.substring(0, basename.length - machinePattern.length);
-      baseName = withoutMachine + ".base";
-      outputName = withoutMachine;
-      if (type !== "env") {
-        baseName = baseName + ext2;
-        outputName = outputName + ext2;
-      }
-    } else {
-      return null;
-    }
-  }
-  const basePath = path2.join(cwd, dir, baseName);
-  const machinePath = path2.join(cwd, machineFile);
-  const outputPath = path2.join(cwd, dir, outputName);
-  return {
-    basePath,
-    machinePath,
-    outputPath,
-    type
-  };
-}
-
-// src/core/merger.ts
-import fs from "node:fs/promises";
-import path4 from "node:path";
-
 // src/adapters/adapter-factory.ts
-import path3 from "node:path";
+import path2 from "node:path";
 
 // node_modules/strip-json-comments/index.js
 var singleComment = Symbol("singleComment");
@@ -6141,7 +6042,7 @@ function stripJsonComments(jsonString, { whitespace = true, trailingCommas = fal
 // src/adapters/json-adapter.ts
 class JsonAdapter {
   canHandle(extension) {
-    return extension === ".json";
+    return extension === ".json" || extension === ".jsonc";
   }
   parse(content) {
     try {
@@ -6233,11 +6134,11 @@ var adapters = [
   new EnvAdapter
 ];
 function getAdapter(filePath) {
-  const basename = path3.basename(filePath);
+  const basename = path2.basename(filePath);
   if (basename.startsWith(".env")) {
     return new EnvAdapter;
   }
-  const ext2 = path3.extname(filePath);
+  const ext2 = path2.extname(filePath);
   for (const adapter of adapters) {
     if (adapter.canHandle(ext2)) {
       return adapter;
@@ -6245,6 +6146,170 @@ function getAdapter(filePath) {
   }
   return null;
 }
+function getFileType(filename) {
+  const basename = path2.basename(filename);
+  if (basename.startsWith(".env")) {
+    return "env";
+  }
+  const ext2 = path2.extname(filename);
+  if (ext2 === ".json" || ext2 === ".jsonc") {
+    return "json";
+  }
+  return "unknown";
+}
+
+// src/core/file-scanner.ts
+async function scanForMergeOperations(machineName, cwd = process.cwd()) {
+  const operations = [];
+  const processedOutputs = new Set;
+  const baseFilesWithMachineFiles = new Set;
+  const patterns = [
+    "**/*{*}*",
+    `**/*.${machineName}.*`,
+    `**/.*.${machineName}`,
+    `**/.*.${machineName}.*`
+  ];
+  const foundFiles = [];
+  for (const pattern of patterns) {
+    try {
+      const files = await glob(pattern, {
+        cwd,
+        ignore: ["node_modules/**", ".git/**", "dist/**", "**/*.base.*", "**/.*base*"],
+        dot: true,
+        nodir: true
+      });
+      foundFiles.push(...files);
+    } catch (error) {}
+  }
+  const uniqueFiles = [...new Set(foundFiles)];
+  const context = createCustomContext({ machine: machineName });
+  for (const file of uniqueFiles) {
+    const basename = path3.basename(file);
+    if (isBaseFile(basename)) {
+      continue;
+    }
+    let shouldProcess = false;
+    if (hasFilters(basename)) {
+      const result = matchFilters(basename, context);
+      shouldProcess = result.matches;
+      const operation = createMergeOperation(file, machineName, cwd);
+      if (operation && operation.basePath) {
+        baseFilesWithMachineFiles.add(operation.basePath);
+      }
+    } else if (isLegacyFilename(basename, machineName)) {
+      shouldProcess = true;
+      const operation = createMergeOperation(file, machineName, cwd);
+      if (operation && operation.basePath) {
+        baseFilesWithMachineFiles.add(operation.basePath);
+      }
+    }
+    if (shouldProcess) {
+      const operation = createMergeOperation(file, machineName, cwd);
+      if (operation) {
+        operations.push(operation);
+        processedOutputs.add(operation.outputPath);
+      }
+    }
+  }
+  const basePatterns = [
+    "**/*.base.json",
+    "**/*.base.jsonc",
+    "**/.*.base",
+    "**/.*.base.*"
+  ];
+  for (const pattern of basePatterns) {
+    try {
+      const baseFiles = await glob(pattern, {
+        cwd,
+        ignore: ["node_modules/**", ".git/**", "dist/**"],
+        dot: true,
+        nodir: true
+      });
+      for (const baseFile of baseFiles) {
+        const fullPath = path3.join(cwd, baseFile);
+        if (baseFilesWithMachineFiles.has(fullPath)) {
+          continue;
+        }
+        const operation = createBaseOnlyMergeOperation(baseFile, cwd);
+        if (operation && !processedOutputs.has(operation.outputPath)) {
+          operations.push(operation);
+          processedOutputs.add(operation.outputPath);
+        }
+      }
+    } catch (error) {}
+  }
+  return operations;
+}
+function createBaseOnlyMergeOperation(baseFile, cwd) {
+  const dir = path3.dirname(baseFile);
+  const fullBasename = path3.basename(baseFile);
+  const type = getFileType(fullBasename);
+  if (type === "unknown") {
+    return null;
+  }
+  let outputName;
+  if (type === "env") {
+    outputName = fullBasename.replace(".base", "").replace(".{base}", "");
+  } else {
+    outputName = fullBasename.replace(".base", "").replace(".{base}", "");
+  }
+  const basePath = path3.join(cwd, baseFile);
+  const outputPath = path3.join(cwd, dir, outputName);
+  return {
+    basePath,
+    machinePath: "",
+    outputPath,
+    type
+  };
+}
+function createMergeOperation(machineFile, machineName, cwd) {
+  const dir = path3.dirname(machineFile);
+  const fullBasename = path3.basename(machineFile);
+  const type = getFileType(fullBasename);
+  const ext2 = path3.extname(machineFile);
+  if (type === "unknown") {
+    return null;
+  }
+  let baseName;
+  let outputName;
+  if (hasFilters(fullBasename)) {
+    outputName = getBaseFilename(fullBasename);
+    if (type === "env") {
+      const nameWithoutExt = outputName;
+      baseName = nameWithoutExt + ".base";
+    } else {
+      const nameWithoutExt = outputName.replace(ext2, "");
+      baseName = nameWithoutExt + ".base" + ext2;
+    }
+  } else {
+    const basename = type === "env" ? fullBasename : path3.basename(machineFile, ext2);
+    const machinePattern = `.${machineName}`;
+    if (basename.endsWith(machinePattern)) {
+      const withoutMachine = basename.substring(0, basename.length - machinePattern.length);
+      baseName = withoutMachine + ".base";
+      outputName = withoutMachine;
+      if (type !== "env") {
+        baseName = baseName + ext2;
+        outputName = outputName + ext2;
+      }
+    } else {
+      return null;
+    }
+  }
+  const basePath = path3.join(cwd, dir, baseName);
+  const machinePath = path3.join(cwd, machineFile);
+  const outputPath = path3.join(cwd, dir, outputName);
+  return {
+    basePath,
+    machinePath,
+    outputPath,
+    type
+  };
+}
+
+// src/core/merger.ts
+import fs from "node:fs/promises";
+import path4 from "node:path";
 
 // src/utils/logger.ts
 var silent = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "permachine",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Automatically merge machine-specific config files with base configs using git hooks",
   "type": "module",
   "bin": {
@@ -57,4 +57,4 @@
   "engines": {
     "node": ">=18.0.0"
   }
-}
+}