obsidian-plugin-config 1.3.7 → 1.3.9

package/bin/obsidian-inject.js

@@ -3,7 +3,7 @@
 /**
  * Obsidian Plugin Config - CLI Entry Point
  * Global command: obsidian-inject
- * Version: 1.3.7
+ * Version: 1.3.9
  */
 
 import { execSync } from 'child_process';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plugin-config",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "Système d'injection pour plugins Obsidian autonomes",
   "type": "module",
   "main": "src/index.ts",

package/scripts/build-npm.ts

@@ -199,44 +199,63 @@ main();
  */
 function buildAndPublishNpm(): void {
   console.log(`🚀 Obsidian Plugin Config - Complete NPM Workflow`);
-  console.log(`Full automation: version → commit → push → exports → bin → publish\n`);
+  console.log(
+    `Full automation: version → exports → bin → commit → publish\n`
+  );
 
   try {
-    // Step 1: Update version and push to GitHub
+    // Step 1: Update version in package.json only
+    // (no commit yet - we'll do one big commit after)
     console.log(`📋 Step 1/6: Updating version...`);
-    execSync('tsx scripts/update-version-config.ts', { stdio: 'inherit' });
-
-    // Step 2: Commit and push any remaining changes
-    console.log(`\n📤 Step 2/6: Committing and pushing changes...`);
-    try {
-      execSync('echo "Prepare NPM package publication" | tsx scripts/acp.ts -b', { stdio: 'inherit' });
-    } catch {
-      console.log(`   ℹ️  No additional changes to commit`);
-    }
+    execSync('tsx scripts/update-version-config.ts', {
+      stdio: 'inherit'
+    });
 
-    // Step 3: Update exports automatically
-    console.log(`\n📦 Step 3/6: Updating exports...`);
+    // Step 2: Update exports automatically
+    console.log(`\n📦 Step 2/6: Updating exports...`);
     execSync('yarn update-exports', { stdio: 'inherit' });
 
-    // Step 4: Generate bin file
-    console.log(`\n🔧 Step 4/6: Generating bin/obsidian-inject.js...`);
+    // Step 3: Generate bin file (uses updated version)
+    console.log(`\n🔧 Step 3/6: Generating bin/obsidian-inject.js...`);
     generateBinFile();
 
-    // Step 5: Verify package is ready
-    console.log(`\n📋 Step 5/6: Verifying package...`);
+    // Step 4: Verify package and sync versions.json
+    // (must happen before commit so versions.json is included)
+    console.log(`\n📋 Step 4/6: Verifying package...`);
     verifyPackage();
 
+    // Step 5: Commit and push ALL changes together
+    // (package.json version, bin/, versions.json, exports)
+    console.log(`\n📤 Step 5/6: Committing and pushing changes...`);
+    try {
+      execSync(
+        'echo "Publish NPM package" | tsx scripts/acp.ts -b',
+        { stdio: 'inherit' }
+      );
+    } catch {
+      console.log(`   ℹ️  No additional changes to commit`);
+    }
+
     // Step 6: Publish to NPM
     console.log(`\n📤 Step 6/6: Publishing to NPM...`);
-    execSync('npm publish --registry https://registry.npmjs.org/', { stdio: 'inherit' });
+    execSync(
+      'npm publish --registry https://registry.npmjs.org/',
+      { stdio: 'inherit' }
+    );
 
     console.log(`\n🎉 Complete workflow successful!`);
     console.log(`\n📋 Next steps:`);
     console.log(`   1. npm install -g obsidian-plugin-config`);
-    console.log(`   2. Test injection: cd any-plugin && obsidian-inject`);
+    console.log(
+      `   2. Test injection: cd any-plugin && obsidian-inject`
+    );
 
   } catch (error) {
-    console.error(`\n❌ Workflow failed: ${error instanceof Error ? error.message : String(error)}`);
+    console.error(
+      `\n❌ Workflow failed: ${
+        error instanceof Error ? error.message : String(error)
+      }`
+    );
     process.exit(1);
   }
 }

package/scripts/inject-core.ts

@@ -293,9 +293,9 @@ export async function injectScripts(targetPath: string, useSass: boolean = false
     "templates/scripts/help.ts"
   ];
 
-  // Files that should NOT be overwritten if they
-  // already exist (contain user-specific config)
-  const skipIfExists = new Set([".env"]);
+  // Files that need value-preserving merge instead
+  // of full overwrite (user fills in their paths)
+  const mergeEnvFile = new Set([".env"]);
 
   // Files with .template suffix (NPM excludes dotfiles)
   // Map: { source: targetName }
@@ -331,7 +331,9 @@ export async function injectScripts(targetPath: string, useSass: boolean = false
       fs.writeFileSync(targetFile, content, "utf8");
       console.log(`   ✅ ${fileName}`);
     } catch (error) {
-      console.error(`   ❌ Failed to inject ${scriptFile}: ${error}`);
+      console.error(
+        `   ❌ Failed to inject ${scriptFile}: ${error}`
+      );
     }
   }
 
@@ -342,27 +344,49 @@ export async function injectScripts(targetPath: string, useSass: boolean = false
     configFileMap
   )) {
     try {
-      const targetFile = path.join(
-        targetPath, destName
-      );
-      // Skip if file exists and is user-specific
+      const targetFile = path.join(targetPath, destName);
+      const templateContent = copyFromLocal(src);
+
+      // For .env: merge existing values into the template
       if (
-        skipIfExists.has(destName) &&
+        mergeEnvFile.has(destName) &&
         fs.existsSync(targetFile)
       ) {
-        console.log(
-          `   ⏭️  ${destName} (kept existing)`
+        const existing = fs.readFileSync(
+          targetFile, "utf8"
         );
+        // Parse existing key=value pairs
+        const existingVals: Record<string, string> = {};
+        for (const line of existing.split(/\r?\n/)) {
+          const m = line.match(/^([^#=]+)=(.*)$/);
+          if (m) existingVals[m[1].trim()] = m[2].trim();
+        }
+        // Re-write template, substituting existing values
+        const merged = templateContent
+          .split(/\r?\n/)
+          .map((line) => {
+            const m = line.match(/^([^#=]+)=(.*)$/);
+            if (m) {
+              const key = m[1].trim();
+              const val = existingVals[key] ?? m[2].trim();
+              return `${key}=${val}`;
+            }
+            return line;
+          })
+          .join("\n");
+        fs.writeFileSync(targetFile, merged, "utf8");
+        console.log(`   ✅ ${destName} (values preserved)`);
         continue;
       }
-      const content = copyFromLocal(src);
-      fs.writeFileSync(targetFile, content, "utf8");
+
+      fs.writeFileSync(targetFile, templateContent, "utf8");
       console.log(`   ✅ ${destName}`);
     } catch (error) {
       console.error(
         `   ❌ Failed to inject ${destName}: ${error}`
       );
     }
+
   }
 
   // Copy .vscode config files

package/versions.json

@@ -33,5 +33,7 @@
 	"1.3.4": "1.8.9",
 	"1.3.5": "1.8.9",
 	"1.3.6": "1.8.9",
-	"1.3.7": "1.8.9"
+	"1.3.7": "1.8.9",
+	"1.3.8": "1.8.9",
+	"1.3.9": "1.8.9"
 }