permachine 0.5.1 → 0.5.2

package/dist/cli.js

@@ -5934,6 +5934,10 @@ 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");
@@ -5943,6 +5947,8 @@ function isLegacyFilename(filename, machineName) {
 // 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}.*`,
@@ -5965,25 +5971,93 @@ async function scanForMergeOperations(machineName, cwd = process.cwd()) {
   const context = createCustomContext({ machine: machineName });
   for (const file of uniqueFiles) {
     const basename = path2.basename(file);
-    if (basename.includes(".base.") || basename.includes(".base")) {
+    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",
+    "**/.*.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 = path2.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 = path2.dirname(baseFile);
+  const fullBasename = path2.basename(baseFile);
+  let type;
+  let ext2;
+  if (fullBasename.endsWith(".json") || fullBasename.includes(".base.json") || fullBasename.includes(".{base}.json")) {
+    type = "json";
+    ext2 = ".json";
+  } else if (fullBasename.startsWith(".env")) {
+    type = "env";
+    ext2 = "";
+  } else {
+    type = "unknown";
+    ext2 = path2.extname(baseFile);
+  }
+  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 = path2.join(cwd, baseFile);
+  const outputPath = path2.join(cwd, dir, outputName);
+  return {
+    basePath,
+    machinePath: "",
+    outputPath,
+    type
+  };
+}
 function createMergeOperation(machineFile, machineName, cwd) {
   const dir = path2.dirname(machineFile);
   const fullBasename = path2.basename(machineFile);

package/package.json

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