@aspruyt/json-config-sync 2.0.1 → 2.0.3

package/PR.md

@@ -1,14 +1,15 @@
-## Summary
-
-Automated sync of `{{FILE_NAME}}` configuration file.
-
-## Changes
-
-- {{ACTION}} `{{FILE_NAME}}` in repository root
-
-## Source
-
-Configuration synced using [json-config-sync](https://github.com/anthony-spruyt/json-config-sync).
-
----
-*This PR was automatically generated by [json-config-sync](https://github.com/anthony-spruyt/json-config-sync)*
+## Summary
+
+Automated sync of `{{FILE_NAME}}` configuration file.
+
+## Changes
+
+- {{ACTION}} `{{FILE_NAME}}` in repository root
+
+## Source
+
+Configuration synced using [json-config-sync](https://github.com/anthony-spruyt/json-config-sync).
+
+---
+
+_This PR was automatically generated by [json-config-sync](https://github.com/anthony-spruyt/json-config-sync)_

package/README.md

@@ -21,6 +21,7 @@ A CLI tool that syncs JSON or YAML configuration files across multiple GitHub an
 - [CI/CD Integration](#cicd-integration)
 - [Output Examples](#output-examples)
 - [Troubleshooting](#troubleshooting)
+- [IDE Integration](#ide-integration)
 - [Development](#development)
 - [License](#license)
 
@@ -136,36 +137,36 @@ json-config-sync --config ./config.yaml --work-dir ./my-temp
 ### Basic Structure
 
 ```yaml
-fileName: my.config.json      # Target file (.json outputs JSON, .yaml/.yml outputs YAML)
-mergeStrategy: replace        # Default array merge strategy (optional)
+fileName: my.config.json # Target file (.json outputs JSON, .yaml/.yml outputs YAML)
+mergeStrategy: replace # Default array merge strategy (optional)
 
-content:                      # Base config content (optional)
+content: # Base config content (optional)
   key: value
 
-repos:                        # List of repositories
+repos: # List of repositories
   - git: git@github.com:org/repo.git
-    content:                  # Per-repo overlay (optional if base content exists)
+    content: # Per-repo overlay (optional if base content exists)
       key: override
 ```
 
 ### Root-Level Fields
 
-| Field           | Description                                                           | Required |
-| --------------- | --------------------------------------------------------------------- | -------- |
-| `fileName`      | Target file name (`.json` → JSON output, `.yaml`/`.yml` → YAML output)| Yes      |
-| `content`       | Base config inherited by all repos                                    | No*      |
-| `mergeStrategy` | Default array merge strategy: `replace`, `append`, `prepend`          | No       |
-| `repos`         | Array of repository configurations                                    | Yes      |
+| Field           | Description                                                            | Required |
+| --------------- | ---------------------------------------------------------------------- | -------- |
+| `fileName`      | Target file name (`.json` → JSON output, `.yaml`/`.yml` → YAML output) | Yes      |
+| `content`       | Base config inherited by all repos                                     | No\*     |
+| `mergeStrategy` | Default array merge strategy: `replace`, `append`, `prepend`           | No       |
+| `repos`         | Array of repository configurations                                     | Yes      |
 
 \* Required if any repo entry omits the `content` field.
 
 ### Per-Repo Fields
 
-| Field      | Description                                               | Required |
-| ---------- | --------------------------------------------------------- | -------- |
-| `git`      | Git URL (string) or array of URLs                         | Yes      |
-| `content`  | Content overlay merged onto base (optional if base exists)| No*      |
-| `override` | If `true`, ignore base content and use only this repo's   | No       |
+| Field      | Description                                                | Required |
+| ---------- | ---------------------------------------------------------- | -------- |
+| `git`      | Git URL (string) or array of URLs                          | Yes      |
+| `content`  | Content overlay merged onto base (optional if base exists) | No\*     |
+| `override` | If `true`, ignore base content and use only this repo's    | No       |
 
 \* Required if no root-level `content` is defined.
 
@@ -175,8 +176,8 @@ Use `${VAR}` syntax in string values:
 
 ```yaml
 content:
-  apiUrl: ${API_URL}                    # Required - errors if not set
-  environment: ${ENV:-development}      # With default value
+  apiUrl: ${API_URL} # Required - errors if not set
+  environment: ${ENV:-development} # With default value
   secretKey: ${SECRET:?Secret required} # Required with custom error message
 ```
 
@@ -194,9 +195,9 @@ repos:
   - git: git@github.com:org/repo.git
     content:
       features:
-        $arrayMerge: append  # append | prepend | replace
+        $arrayMerge: append # append | prepend | replace
         values:
-          - custom-feature   # Results in: [core, monitoring, custom-feature]
+          - custom-feature # Results in: [core, monitoring, custom-feature]
 ```
 
 ## Examples
@@ -504,6 +505,43 @@ git config --global http.proxy http://proxy.example.com:8080
 git config --global https.proxy http://proxy.example.com:8080
 ```
 
+## IDE Integration
+
+### VS Code YAML Schema Support
+
+For autocomplete and validation in VS Code, install the [YAML extension](https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml) and add a schema reference to your config file:
+
+**Option 1: Inline comment**
+
+```yaml
+# yaml-language-server: $schema=https://raw.githubusercontent.com/anthony-spruyt/json-config-sync/main/config-schema.json
+fileName: my.config.json
+content:
+  key: value
+repos:
+  - git: git@github.com:org/repo.git
+```
+
+**Option 2: VS Code settings** (`.vscode/settings.json`)
+
+```json
+{
+  "yaml.schemas": {
+    "https://raw.githubusercontent.com/anthony-spruyt/json-config-sync/main/config-schema.json": [
+      "**/sync-config.yaml",
+      "**/config-sync.yaml"
+    ]
+  }
+}
+```
+
+This enables:
+
+- Autocomplete for `fileName`, `mergeStrategy`, `repos`, `content`, `git`, `override`
+- Enum suggestions for `mergeStrategy` values (`replace`, `append`, `prepend`)
+- Validation of required fields
+- Hover documentation for each field
+
 ## Development
 
 ```bash

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { type ArrayMergeStrategy } from './merge.js';
+import { type ArrayMergeStrategy } from "./merge.js";
 export interface RawRepoConfig {
     git: string | string[];
     content?: Record<string, unknown>;

package/dist/config.js

@@ -1,16 +1,16 @@
-import { readFileSync } from 'node:fs';
-import { parse, stringify } from 'yaml';
-import { deepMerge, stripMergeDirectives, createMergeContext, } from './merge.js';
-import { interpolateEnvVars } from './env.js';
+import { readFileSync } from "node:fs";
+import { parse, stringify } from "yaml";
+import { deepMerge, stripMergeDirectives, createMergeContext, } from "./merge.js";
+import { interpolateEnvVars } from "./env.js";
 // =============================================================================
 // Validation
 // =============================================================================
 function validateRawConfig(config) {
     if (!config.fileName) {
-        throw new Error('Config missing required field: fileName');
+        throw new Error("Config missing required field: fileName");
     }
     if (!config.repos || !Array.isArray(config.repos)) {
-        throw new Error('Config missing required field: repos (must be an array)');
+        throw new Error("Config missing required field: repos (must be an array)");
     }
     const hasRootContent = config.content !== undefined;
     for (let i = 0; i < config.repos.length; i++) {
@@ -28,7 +28,7 @@ function validateRawConfig(config) {
 }
 function getGitDisplayName(git) {
     if (Array.isArray(git)) {
-        return git[0] || 'unknown';
+        return git[0] || "unknown";
     }
     return git;
 }
@@ -37,7 +37,7 @@ function getGitDisplayName(git) {
 // =============================================================================
 function normalizeConfig(raw) {
     const baseContent = raw.content ?? {};
-    const defaultStrategy = raw.mergeStrategy ?? 'replace';
+    const defaultStrategy = raw.mergeStrategy ?? "replace";
     const expandedRepos = [];
     for (const rawRepo of raw.repos) {
         // Step 1: Expand git arrays
@@ -76,21 +76,21 @@ function normalizeConfig(raw) {
 // Public API
 // =============================================================================
 export function loadConfig(filePath) {
-    const content = readFileSync(filePath, 'utf-8');
+    const content = readFileSync(filePath, "utf-8");
     const rawConfig = parse(content);
     validateRawConfig(rawConfig);
     return normalizeConfig(rawConfig);
 }
 function detectOutputFormat(fileName) {
-    const ext = fileName.toLowerCase().split('.').pop();
-    if (ext === 'yaml' || ext === 'yml') {
-        return 'yaml';
+    const ext = fileName.toLowerCase().split(".").pop();
+    if (ext === "yaml" || ext === "yml") {
+        return "yaml";
     }
-    return 'json';
+    return "json";
 }
 export function convertContentToString(content, fileName) {
     const format = detectOutputFormat(fileName);
-    if (format === 'yaml') {
+    if (format === "yaml") {
         return stringify(content, { indent: 2 });
     }
     return JSON.stringify(content, null, 2);

package/dist/env.js

@@ -22,7 +22,7 @@ const ENV_VAR_REGEX = /\$\{([^}:]+)(?::([?-])([^}]*))?\}/g;
  * Check if a value is a plain object (not null, not array).
  */
 function isPlainObject(val) {
-    return typeof val === 'object' && val !== null && !Array.isArray(val);
+    return typeof val === "object" && val !== null && !Array.isArray(val);
 }
 /**
  * Process a single string value, replacing environment variable placeholders.
@@ -35,11 +35,11 @@ function processString(value, options) {
             return envValue;
         }
         // Has default value (:-default)
-        if (modifier === '-') {
-            return defaultOrMsg ?? '';
+        if (modifier === "-") {
+            return defaultOrMsg ?? "";
         }
         // Required with message (:?message)
-        if (modifier === '?') {
+        if (modifier === "?") {
             const message = defaultOrMsg || `is required`;
             throw new Error(`${varName}: ${message}`);
         }
@@ -55,7 +55,7 @@ function processString(value, options) {
  * Recursively process a value, interpolating environment variables in strings.
  */
 function processValue(value, options) {
-    if (typeof value === 'string') {
+    if (typeof value === "string") {
         return processString(value, options);
     }
     if (Array.isArray(value)) {

package/dist/git-ops.d.ts

@@ -11,9 +11,17 @@ export declare class GitOps {
     clone(gitUrl: string): void;
     createBranch(branchName: string): void;
     writeFile(fileName: string, content: string): void;
+    /**
+     * Checks if writing the given content would result in changes.
+     * Works in both normal and dry-run modes by comparing content directly.
+     */
+    wouldChange(fileName: string, content: string): boolean;
     hasChanges(): boolean;
     commit(message: string): void;
     push(branchName: string): void;
-    getDefaultBranch(): string;
+    getDefaultBranch(): {
+        branch: string;
+        method: string;
+    };
 }
 export declare function sanitizeBranchName(fileName: string): string;

package/dist/git-ops.js

@@ -1,6 +1,7 @@
-import { execSync } from 'node:child_process';
-import { rmSync, existsSync, mkdirSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { execSync } from "node:child_process";
+import { rmSync, existsSync, mkdirSync, writeFileSync, readFileSync, } from "node:fs";
+import { join } from "node:path";
+import { escapeShellArg } from "./shell-utils.js";
 export class GitOps {
     workDir;
     dryRun;
@@ -11,8 +12,8 @@ export class GitOps {
     exec(command, cwd) {
         return execSync(command, {
             cwd: cwd ?? this.workDir,
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'pipe'],
+            encoding: "utf-8",
+            stdio: ["pipe", "pipe", "pipe"],
         }).trim();
     }
     cleanWorkspace() {
@@ -22,47 +23,70 @@ export class GitOps {
         mkdirSync(this.workDir, { recursive: true });
     }
     clone(gitUrl) {
-        this.exec(`git clone "${gitUrl}" .`, this.workDir);
+        this.exec(`git clone ${escapeShellArg(gitUrl)} .`, this.workDir);
     }
     createBranch(branchName) {
         try {
             // Check if branch exists on remote
-            this.exec(`git fetch origin ${branchName}`, this.workDir);
-            this.exec(`git checkout ${branchName}`, this.workDir);
+            this.exec(`git fetch origin ${escapeShellArg(branchName)}`, this.workDir);
+            this.exec(`git checkout ${escapeShellArg(branchName)}`, this.workDir);
         }
         catch {
             // Branch doesn't exist, create it
-            this.exec(`git checkout -b ${branchName}`, this.workDir);
+            this.exec(`git checkout -b ${escapeShellArg(branchName)}`, this.workDir);
         }
     }
     writeFile(fileName, content) {
+        if (this.dryRun) {
+            return;
+        }
+        const filePath = join(this.workDir, fileName);
+        writeFileSync(filePath, content + "\n", "utf-8");
+    }
+    /**
+     * Checks if writing the given content would result in changes.
+     * Works in both normal and dry-run modes by comparing content directly.
+     */
+    wouldChange(fileName, content) {
         const filePath = join(this.workDir, fileName);
-        writeFileSync(filePath, content + '\n', 'utf-8');
+        const newContent = content + "\n";
+        if (!existsSync(filePath)) {
+            // File doesn't exist, so writing it would be a change
+            return true;
+        }
+        try {
+            const existingContent = readFileSync(filePath, "utf-8");
+            return existingContent !== newContent;
+        }
+        catch {
+            // If we can't read the file, assume it would change
+            return true;
+        }
     }
     hasChanges() {
-        const status = this.exec('git status --porcelain', this.workDir);
+        const status = this.exec("git status --porcelain", this.workDir);
         return status.length > 0;
     }
     commit(message) {
         if (this.dryRun) {
             return;
         }
-        this.exec('git add -A', this.workDir);
-        this.exec(`git commit -m "${message}"`, this.workDir);
+        this.exec("git add -A", this.workDir);
+        this.exec(`git commit -m ${escapeShellArg(message)}`, this.workDir);
     }
     push(branchName) {
         if (this.dryRun) {
             return;
         }
-        this.exec(`git push -u origin ${branchName}`, this.workDir);
+        this.exec(`git push -u origin ${escapeShellArg(branchName)}`, this.workDir);
     }
     getDefaultBranch() {
         try {
             // Try to get the default branch from remote
-            const remoteInfo = this.exec('git remote show origin', this.workDir);
+            const remoteInfo = this.exec("git remote show origin", this.workDir);
             const match = remoteInfo.match(/HEAD branch: (\S+)/);
             if (match) {
-                return match[1];
+                return { branch: match[1], method: "remote HEAD" };
             }
         }
         catch {
@@ -70,27 +94,27 @@ export class GitOps {
         }
         // Try common default branch names
         try {
-            this.exec('git rev-parse --verify origin/main', this.workDir);
-            return 'main';
+            this.exec("git rev-parse --verify origin/main", this.workDir);
+            return { branch: "main", method: "origin/main exists" };
         }
         catch {
             // Try master
         }
         try {
-            this.exec('git rev-parse --verify origin/master', this.workDir);
-            return 'master';
+            this.exec("git rev-parse --verify origin/master", this.workDir);
+            return { branch: "master", method: "origin/master exists" };
         }
         catch {
             // Default to main
         }
-        return 'main';
+        return { branch: "main", method: "fallback default" };
     }
 }
 export function sanitizeBranchName(fileName) {
     return fileName
         .toLowerCase()
-        .replace(/\.[^.]+$/, '') // Remove extension
-        .replace(/[^a-z0-9-]/g, '-') // Replace non-alphanumeric with dashes
-        .replace(/-+/g, '-') // Collapse multiple dashes
-        .replace(/^-|-$/g, ''); // Remove leading/trailing dashes
+        .replace(/\.[^.]+$/, "") // Remove extension
+        .replace(/[^a-z0-9-]/g, "-") // Replace non-alphanumeric with dashes
+        .replace(/-+/g, "-") // Collapse multiple dashes
+        .replace(/^-|-$/g, ""); // Remove leading/trailing dashes
 }

package/dist/index.js

@@ -1,19 +1,29 @@
 #!/usr/bin/env node
-import { program } from 'commander';
-import { resolve, join } from 'node:path';
-import { existsSync } from 'node:fs';
-import { loadConfig, convertContentToString } from './config.js';
-import { parseGitUrl, getRepoDisplayName } from './repo-detector.js';
-import { GitOps, sanitizeBranchName } from './git-ops.js';
-import { createPR } from './pr-creator.js';
-import { logger } from './logger.js';
+import { program } from "commander";
+import { resolve, join } from "node:path";
+import { existsSync } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { loadConfig, convertContentToString } from "./config.js";
+import { parseGitUrl, getRepoDisplayName } from "./repo-detector.js";
+import { GitOps, sanitizeBranchName } from "./git-ops.js";
+import { createPR } from "./pr-creator.js";
+import { logger } from "./logger.js";
+/**
+ * Generates a unique workspace directory name to avoid collisions
+ * when multiple CLI instances run concurrently.
+ */
+function generateWorkspaceName(index) {
+    const timestamp = Date.now();
+    const uuid = randomUUID().slice(0, 8);
+    return `repo-${timestamp}-${index}-${uuid}`;
+}
 program
-    .name('json-config-sync')
-    .description('Sync JSON configuration files across multiple repositories')
-    .version('1.0.0')
-    .requiredOption('-c, --config <path>', 'Path to YAML config file')
-    .option('-d, --dry-run', 'Show what would be done without making changes')
-    .option('-w, --work-dir <path>', 'Temporary directory for cloning', './tmp')
+    .name("json-config-sync")
+    .description("Sync JSON configuration files across multiple repositories")
+    .version("1.0.0")
+    .requiredOption("-c, --config <path>", "Path to YAML config file")
+    .option("-d, --dry-run", "Show what would be done without making changes")
+    .option("-w, --work-dir <path>", "Temporary directory for cloning", "./tmp")
     .parse();
 const options = program.opts();
 async function main() {
@@ -24,7 +34,7 @@ async function main() {
     }
     console.log(`Loading config from: ${configPath}`);
     if (options.dryRun) {
-        console.log('Running in DRY RUN mode - no changes will be made\n');
+        console.log("Running in DRY RUN mode - no changes will be made\n");
     }
     const config = loadConfig(configPath);
     const branchName = `chore/sync-${sanitizeBranchName(config.fileName)}`;
@@ -45,41 +55,50 @@ async function main() {
             continue;
         }
         const repoName = getRepoDisplayName(repoInfo);
-        const workDir = resolve(join(options.workDir ?? './tmp', `repo-${i}`));
+        const workDir = resolve(join(options.workDir ?? "./tmp", generateWorkspaceName(i)));
         try {
-            logger.progress(current, repoName, 'Processing...');
+            logger.progress(current, repoName, "Processing...");
             const gitOps = new GitOps({ workDir, dryRun: options.dryRun });
             // Step 1: Clean workspace
-            logger.info('Cleaning workspace...');
+            logger.info("Cleaning workspace...");
             gitOps.cleanWorkspace();
             // Step 2: Clone repo
-            logger.info('Cloning repository...');
+            logger.info("Cloning repository...");
             gitOps.clone(repoInfo.gitUrl);
             // Step 3: Get default branch for PR base
-            const baseBranch = gitOps.getDefaultBranch();
-            logger.info(`Default branch: ${baseBranch}`);
+            const { branch: baseBranch, method: detectionMethod } = gitOps.getDefaultBranch();
+            logger.info(`Default branch: ${baseBranch} (detected via ${detectionMethod})`);
             // Step 4: Create/checkout branch
             logger.info(`Switching to branch: ${branchName}`);
             gitOps.createBranch(branchName);
+            // Determine if creating or updating (check BEFORE writing)
+            const action = existsSync(join(workDir, config.fileName))
+                ? "update"
+                : "create";
             // Step 5: Write config file
             logger.info(`Writing ${config.fileName}...`);
             const fileContent = convertContentToString(repoConfig.content, config.fileName);
-            gitOps.writeFile(config.fileName, fileContent);
             // Step 6: Check for changes
-            if (!gitOps.hasChanges()) {
-                logger.skip(current, repoName, 'No changes detected');
+            // In dry-run mode, compare content directly since we don't write the file
+            // In normal mode, write the file first then check git status
+            const wouldHaveChanges = options.dryRun
+                ? gitOps.wouldChange(config.fileName, fileContent)
+                : (() => {
+                    gitOps.writeFile(config.fileName, fileContent);
+                    return gitOps.hasChanges();
+                })();
+            if (!wouldHaveChanges) {
+                logger.skip(current, repoName, "No changes detected");
                 continue;
             }
-            // Determine if creating or updating
-            const action = existsSync(join(workDir, config.fileName)) ? 'update' : 'create';
             // Step 7: Commit
-            logger.info('Committing changes...');
+            logger.info("Committing changes...");
             gitOps.commit(`chore: sync ${config.fileName}`);
             // Step 8: Push
-            logger.info('Pushing to remote...');
+            logger.info("Pushing to remote...");
             gitOps.push(branchName);
             // Step 9: Create PR
-            logger.info('Creating pull request...');
+            logger.info("Creating pull request...");
             const prResult = await createPR({
                 repoInfo,
                 branchName,
@@ -107,6 +126,6 @@ async function main() {
     }
 }
 main().catch((error) => {
-    console.error('Fatal error:', error);
+    console.error("Fatal error:", error);
     process.exit(1);
 });

package/dist/logger.js

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import chalk from "chalk";
 export class Logger {
     stats = {
         total: 0,
@@ -10,26 +10,30 @@ export class Logger {
         this.stats.total = total;
     }
     progress(current, repoName, message) {
-        console.log(chalk.blue(`[${current}/${this.stats.total}]`) + ` ${repoName}: ${message}`);
+        console.log(chalk.blue(`[${current}/${this.stats.total}]`) +
+            ` ${repoName}: ${message}`);
     }
     info(message) {
         console.log(chalk.gray(`    ${message}`));
     }
     success(current, repoName, message) {
         this.stats.succeeded++;
-        console.log(chalk.green(`[${current}/${this.stats.total}] ✓`) + ` ${repoName}: ${message}`);
+        console.log(chalk.green(`[${current}/${this.stats.total}] ✓`) +
+            ` ${repoName}: ${message}`);
     }
     skip(current, repoName, reason) {
         this.stats.skipped++;
-        console.log(chalk.yellow(`[${current}/${this.stats.total}] ⊘`) + ` ${repoName}: Skipped - ${reason}`);
+        console.log(chalk.yellow(`[${current}/${this.stats.total}] ⊘`) +
+            ` ${repoName}: Skipped - ${reason}`);
     }
     error(current, repoName, error) {
         this.stats.failed++;
-        console.log(chalk.red(`[${current}/${this.stats.total}] ✗`) + ` ${repoName}: ${error}`);
+        console.log(chalk.red(`[${current}/${this.stats.total}] ✗`) +
+            ` ${repoName}: ${error}`);
     }
     summary() {
-        console.log('');
-        console.log(chalk.bold('Summary:'));
+        console.log("");
+        console.log(chalk.bold("Summary:"));
         console.log(`  Total:     ${this.stats.total}`);
         console.log(chalk.green(`  Succeeded: ${this.stats.succeeded}`));
         console.log(chalk.yellow(`  Skipped:   ${this.stats.skipped}`));

package/dist/merge.d.ts

@@ -2,7 +2,7 @@
  * Deep merge utilities for JSON configuration objects.
  * Supports configurable array merge strategies via $arrayMerge directive.
  */
-export type ArrayMergeStrategy = 'replace' | 'append' | 'prepend';
+export type ArrayMergeStrategy = "replace" | "append" | "prepend";
 export interface MergeContext {
     arrayStrategies: Map<string, ArrayMergeStrategy>;
     defaultArrayStrategy: ArrayMergeStrategy;

package/dist/merge.js

@@ -6,18 +6,18 @@
  * Check if a value is a plain object (not null, not array).
  */
 function isPlainObject(val) {
-    return typeof val === 'object' && val !== null && !Array.isArray(val);
+    return typeof val === "object" && val !== null && !Array.isArray(val);
 }
 /**
  * Merge two arrays based on the specified strategy.
  */
 function mergeArrays(base, overlay, strategy) {
     switch (strategy) {
-        case 'replace':
+        case "replace":
             return overlay;
-        case 'append':
+        case "append":
             return [...base, ...overlay];
-        case 'prepend':
+        case "prepend":
             return [...overlay, ...base];
         default:
             return overlay;
@@ -33,7 +33,7 @@ function extractArrayFromOverlay(overlay) {
     if (Array.isArray(overlay)) {
         return overlay;
     }
-    if (isPlainObject(overlay) && 'values' in overlay) {
+    if (isPlainObject(overlay) && "values" in overlay) {
         const values = overlay.values;
         if (Array.isArray(values)) {
             return values;
@@ -45,11 +45,11 @@ function extractArrayFromOverlay(overlay) {
  * Get merge strategy from an overlay object's $arrayMerge directive.
  */
 function getStrategyFromOverlay(overlay) {
-    if (isPlainObject(overlay) && '$arrayMerge' in overlay) {
+    if (isPlainObject(overlay) && "$arrayMerge" in overlay) {
         const strategy = overlay.$arrayMerge;
-        if (strategy === 'replace' ||
-            strategy === 'append' ||
-            strategy === 'prepend') {
+        if (strategy === "replace" ||
+            strategy === "append" ||
+            strategy === "prepend") {
             return strategy;
         }
     }
@@ -63,18 +63,18 @@ function getStrategyFromOverlay(overlay) {
  * @param ctx - Merge context with array strategies
  * @param path - Current path for strategy lookup (internal)
  */
-export function deepMerge(base, overlay, ctx, path = '') {
+export function deepMerge(base, overlay, ctx, path = "") {
     const result = { ...base };
     // Check for $arrayMerge directive at this level (applies to child arrays)
     const levelStrategy = getStrategyFromOverlay(overlay);
     for (const [key, overlayValue] of Object.entries(overlay)) {
         // Skip directive keys in output
-        if (key.startsWith('$'))
+        if (key.startsWith("$"))
             continue;
         const currentPath = path ? `${path}.${key}` : key;
         const baseValue = base[key];
         // If overlay is an object with $arrayMerge directive for an array field
-        if (isPlainObject(overlayValue) && '$arrayMerge' in overlayValue) {
+        if (isPlainObject(overlayValue) && "$arrayMerge" in overlayValue) {
             const strategy = getStrategyFromOverlay(overlayValue);
             const overlayArray = extractArrayFromOverlay(overlayValue);
             if (strategy && overlayArray && Array.isArray(baseValue)) {
@@ -94,13 +94,15 @@ export function deepMerge(base, overlay, ctx, path = '') {
         // Both are plain objects - recurse
         if (isPlainObject(baseValue) && isPlainObject(overlayValue)) {
             // Extract $arrayMerge for child paths if present
-            if ('$arrayMerge' in overlayValue) {
+            if ("$arrayMerge" in overlayValue) {
                 const childStrategy = getStrategyFromOverlay(overlayValue);
                 if (childStrategy) {
                     // Apply to all immediate child arrays
                     for (const childKey of Object.keys(overlayValue)) {
-                        if (!childKey.startsWith('$')) {
-                            const childPath = currentPath ? `${currentPath}.${childKey}` : childKey;
+                        if (!childKey.startsWith("$")) {
+                            const childPath = currentPath
+                                ? `${currentPath}.${childKey}`
+                                : childKey;
                             ctx.arrayStrategies.set(childPath, childStrategy);
                         }
                     }
@@ -122,7 +124,7 @@ export function stripMergeDirectives(obj) {
     const result = {};
     for (const [key, value] of Object.entries(obj)) {
         // Skip all $-prefixed keys (reserved for directives)
-        if (key.startsWith('$'))
+        if (key.startsWith("$"))
             continue;
         if (isPlainObject(value)) {
             result[key] = stripMergeDirectives(value);
@@ -139,7 +141,7 @@ export function stripMergeDirectives(obj) {
 /**
  * Create a default merge context.
  */
-export function createMergeContext(defaultStrategy = 'replace') {
+export function createMergeContext(defaultStrategy = "replace") {
     return {
         arrayStrategies: new Map(),
         defaultArrayStrategy: defaultStrategy,

package/dist/pr-creator.d.ts

@@ -1,10 +1,11 @@
-import { RepoInfo } from './repo-detector.js';
+import { RepoInfo } from "./repo-detector.js";
+export { escapeShellArg } from "./shell-utils.js";
 export interface PROptions {
     repoInfo: RepoInfo;
     branchName: string;
     baseBranch: string;
     fileName: string;
-    action: 'create' | 'update';
+    action: "create" | "update";
     workDir: string;
     dryRun?: boolean;
 }
@@ -13,4 +14,5 @@ export interface PRResult {
     success: boolean;
     message: string;
 }
+export declare function formatPRBody(fileName: string, action: "create" | "update"): string;
 export declare function createPR(options: PROptions): Promise<PRResult>;

package/dist/pr-creator.js

@@ -1,18 +1,17 @@
-import { execSync } from 'node:child_process';
-import { readFileSync, existsSync, writeFileSync, unlinkSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-function escapeShellArg(arg) {
-    // Use single quotes and escape any single quotes within
-    return `'${arg.replace(/'/g, "'\\''")}'`;
-}
+import { execSync } from "node:child_process";
+import { readFileSync, existsSync, writeFileSync, unlinkSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { escapeShellArg } from "./shell-utils.js";
+// Re-export for backwards compatibility and testing
+export { escapeShellArg } from "./shell-utils.js";
 function loadPRTemplate() {
     // Try to find PR.md in the project root
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = dirname(__filename);
-    const templatePath = join(__dirname, '..', 'PR.md');
+    const templatePath = join(__dirname, "..", "PR.md");
     if (existsSync(templatePath)) {
-        return readFileSync(templatePath, 'utf-8');
+        return readFileSync(templatePath, "utf-8");
     }
     // Fallback template
     return `## Summary
@@ -24,15 +23,15 @@ Automated sync of \`{{FILE_NAME}}\` configuration file.
 ---
 *This PR was automatically generated by json-config-sync*`;
 }
-function formatPRBody(fileName, action) {
+export function formatPRBody(fileName, action) {
     const template = loadPRTemplate();
-    const actionText = action === 'create' ? 'Created' : 'Updated';
+    const actionText = action === "create" ? "Created" : "Updated";
     return template
         .replace(/\{\{FILE_NAME\}\}/g, fileName)
         .replace(/\{\{ACTION\}\}/g, actionText);
 }
 export async function createPR(options) {
-    const { repoInfo, branchName, baseBranch, fileName, action, workDir, dryRun } = options;
+    const { repoInfo, branchName, baseBranch, fileName, action, workDir, dryRun, } = options;
     const title = `chore: sync ${fileName}`;
     const body = formatPRBody(fileName, action);
     if (dryRun) {
@@ -42,8 +41,14 @@ export async function createPR(options) {
         };
     }
     try {
-        if (repoInfo.type === 'github') {
-            return await createGitHubPR({ title, body, branchName, baseBranch, workDir });
+        if (repoInfo.type === "github") {
+            return await createGitHubPR({
+                title,
+                body,
+                branchName,
+                baseBranch,
+                workDir,
+            });
         }
         else {
             return await createAzureDevOpsPR({
@@ -52,7 +57,7 @@ export async function createPR(options) {
                 branchName,
                 baseBranch,
                 repoInfo,
-                workDir
+                workDir,
             });
         }
     }
@@ -68,7 +73,7 @@ async function createGitHubPR(options) {
     const { title, body, branchName, baseBranch, workDir } = options;
     // Check if PR already exists
     try {
-        const existingPR = execSync(`gh pr list --head ${escapeShellArg(branchName)} --json url --jq '.[0].url'`, { cwd: workDir, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const existingPR = execSync(`gh pr list --head ${escapeShellArg(branchName)} --json url --jq '.[0].url'`, { cwd: workDir, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
         if (existingPR) {
             return {
                 url: existingPR,
@@ -81,16 +86,16 @@ async function createGitHubPR(options) {
         // No existing PR, continue to create
     }
     // Write body to temp file to avoid shell escaping issues
-    const bodyFile = join(workDir, '.pr-body.md');
-    writeFileSync(bodyFile, body, 'utf-8');
+    const bodyFile = join(workDir, ".pr-body.md");
+    writeFileSync(bodyFile, body, "utf-8");
     try {
-        const result = execSync(`gh pr create --title ${escapeShellArg(title)} --body-file ${escapeShellArg(bodyFile)} --base ${escapeShellArg(baseBranch)} --head ${escapeShellArg(branchName)}`, { cwd: workDir, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const result = execSync(`gh pr create --title ${escapeShellArg(title)} --body-file ${escapeShellArg(bodyFile)} --base ${escapeShellArg(baseBranch)} --head ${escapeShellArg(branchName)}`, { cwd: workDir, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
         // Extract URL from output
         const urlMatch = result.match(/https:\/\/github\.com\/[^\s]+/);
         return {
             url: urlMatch?.[0] ?? result,
             success: true,
-            message: 'PR created successfully',
+            message: "PR created successfully",
         };
     }
     finally {
@@ -102,12 +107,12 @@ async function createGitHubPR(options) {
 }
 async function createAzureDevOpsPR(options) {
     const { title, body, branchName, baseBranch, repoInfo, workDir } = options;
-    const orgUrl = `https://dev.azure.com/${encodeURIComponent(repoInfo.organization ?? '')}`;
+    const orgUrl = `https://dev.azure.com/${encodeURIComponent(repoInfo.organization ?? "")}`;
     // Check if PR already exists
     try {
-        const existingPRs = execSync(`az repos pr list --repository ${escapeShellArg(repoInfo.repo)} --source-branch ${escapeShellArg(branchName)} --target-branch ${escapeShellArg(baseBranch)} --org ${escapeShellArg(orgUrl)} --project ${escapeShellArg(repoInfo.project ?? '')} --query "[0].pullRequestId" -o tsv`, { cwd: workDir, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const existingPRs = execSync(`az repos pr list --repository ${escapeShellArg(repoInfo.repo)} --source-branch ${escapeShellArg(branchName)} --target-branch ${escapeShellArg(baseBranch)} --org ${escapeShellArg(orgUrl)} --project ${escapeShellArg(repoInfo.project ?? "")} --query "[0].pullRequestId" -o tsv`, { cwd: workDir, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
         if (existingPRs) {
-            const prUrl = `https://dev.azure.com/${encodeURIComponent(repoInfo.organization ?? '')}/${encodeURIComponent(repoInfo.project ?? '')}/_git/${encodeURIComponent(repoInfo.repo)}/pullrequest/${existingPRs}`;
+            const prUrl = `https://dev.azure.com/${encodeURIComponent(repoInfo.organization ?? "")}/${encodeURIComponent(repoInfo.project ?? "")}/_git/${encodeURIComponent(repoInfo.repo)}/pullrequest/${existingPRs}`;
             return {
                 url: prUrl,
                 success: true,
@@ -119,15 +124,15 @@ async function createAzureDevOpsPR(options) {
         // No existing PR, continue to create
     }
     // Write description to temp file to avoid shell escaping issues
-    const descFile = join(workDir, '.pr-description.md');
-    writeFileSync(descFile, body, 'utf-8');
+    const descFile = join(workDir, ".pr-description.md");
+    writeFileSync(descFile, body, "utf-8");
     try {
-        const result = execSync(`az repos pr create --repository ${escapeShellArg(repoInfo.repo)} --source-branch ${escapeShellArg(branchName)} --target-branch ${escapeShellArg(baseBranch)} --title ${escapeShellArg(title)} --description @${escapeShellArg(descFile)} --org ${escapeShellArg(orgUrl)} --project ${escapeShellArg(repoInfo.project ?? '')} --query "pullRequestId" -o tsv`, { cwd: workDir, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-        const prUrl = `https://dev.azure.com/${encodeURIComponent(repoInfo.organization ?? '')}/${encodeURIComponent(repoInfo.project ?? '')}/_git/${encodeURIComponent(repoInfo.repo)}/pullrequest/${result}`;
+        const result = execSync(`az repos pr create --repository ${escapeShellArg(repoInfo.repo)} --source-branch ${escapeShellArg(branchName)} --target-branch ${escapeShellArg(baseBranch)} --title ${escapeShellArg(title)} --description @${escapeShellArg(descFile)} --org ${escapeShellArg(orgUrl)} --project ${escapeShellArg(repoInfo.project ?? "")} --query "pullRequestId" -o tsv`, { cwd: workDir, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }).trim();
+        const prUrl = `https://dev.azure.com/${encodeURIComponent(repoInfo.organization ?? "")}/${encodeURIComponent(repoInfo.project ?? "")}/_git/${encodeURIComponent(repoInfo.repo)}/pullrequest/${result}`;
         return {
             url: prUrl,
             success: true,
-            message: 'PR created successfully',
+            message: "PR created successfully",
         };
     }
     finally {

package/dist/repo-detector.d.ts

@@ -1,4 +1,4 @@
-export type RepoType = 'github' | 'azure-devops';
+export type RepoType = "github" | "azure-devops";
 export interface RepoInfo {
     type: RepoType;
     gitUrl: string;

package/dist/repo-detector.js

@@ -1,38 +1,40 @@
 export function detectRepoType(gitUrl) {
-    // Use strict pattern matching to prevent URL substring attacks
-    // Check for Azure DevOps SSH format: git@ssh.dev.azure.com:v3/...
-    if (/^git@ssh\.dev\.azure\.com:v3\//.test(gitUrl)) {
-        return 'azure-devops';
+    // Check for Azure DevOps SSH format: git@ssh.dev.azure.com:...
+    // Use broader pattern to catch malformed Azure URLs
+    if (/^git@ssh\.dev\.azure\.com:/.test(gitUrl)) {
+        return "azure-devops";
     }
     // Check for Azure DevOps HTTPS format: https://dev.azure.com/...
     if (/^https?:\/\/dev\.azure\.com\//.test(gitUrl)) {
-        return 'azure-devops';
+        return "azure-devops";
     }
-    return 'github';
+    return "github";
 }
 export function parseGitUrl(gitUrl) {
     const type = detectRepoType(gitUrl);
-    if (type === 'azure-devops') {
+    if (type === "azure-devops") {
         return parseAzureDevOpsUrl(gitUrl);
     }
     return parseGitHubUrl(gitUrl);
 }
 function parseGitHubUrl(gitUrl) {
     // Handle SSH format: git@github.com:owner/repo.git
-    const sshMatch = gitUrl.match(/git@github\.com:([^/]+)\/([^.]+)(?:\.git)?/);
+    // Use (.+?) with end anchor to handle repo names with dots (e.g., my.repo.git)
+    const sshMatch = gitUrl.match(/git@github\.com:([^/]+)\/(.+?)(?:\.git)?$/);
     if (sshMatch) {
         return {
-            type: 'github',
+            type: "github",
             gitUrl,
             owner: sshMatch[1],
             repo: sshMatch[2],
         };
     }
     // Handle HTTPS format: https://github.com/owner/repo.git
-    const httpsMatch = gitUrl.match(/https?:\/\/github\.com\/([^/]+)\/([^.]+)(?:\.git)?/);
+    // Use (.+?) with end anchor to handle repo names with dots
+    const httpsMatch = gitUrl.match(/https?:\/\/github\.com\/([^/]+)\/(.+?)(?:\.git)?$/);
     if (httpsMatch) {
         return {
-            type: 'github',
+            type: "github",
             gitUrl,
             owner: httpsMatch[1],
             repo: httpsMatch[2],
@@ -42,10 +44,11 @@ function parseGitHubUrl(gitUrl) {
 }
 function parseAzureDevOpsUrl(gitUrl) {
     // Handle SSH format: git@ssh.dev.azure.com:v3/organization/project/repo
-    const sshMatch = gitUrl.match(/git@ssh\.dev\.azure\.com:v3\/([^/]+)\/([^/]+)\/([^.]+)/);
+    // Use (.+?) with end anchor to handle repo names with dots
+    const sshMatch = gitUrl.match(/git@ssh\.dev\.azure\.com:v3\/([^/]+)\/([^/]+)\/(.+?)(?:\.git)?$/);
     if (sshMatch) {
         return {
-            type: 'azure-devops',
+            type: "azure-devops",
             gitUrl,
             owner: sshMatch[1],
             repo: sshMatch[3],
@@ -54,10 +57,11 @@ function parseAzureDevOpsUrl(gitUrl) {
         };
     }
     // Handle HTTPS format: https://dev.azure.com/organization/project/_git/repo
-    const httpsMatch = gitUrl.match(/https?:\/\/dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/([^.]+)/);
+    // Use (.+?) with end anchor to handle repo names with dots
+    const httpsMatch = gitUrl.match(/https?:\/\/dev\.azure\.com\/([^/]+)\/([^/]+)\/_git\/(.+?)(?:\.git)?$/);
     if (httpsMatch) {
         return {
-            type: 'azure-devops',
+            type: "azure-devops",
             gitUrl,
             owner: httpsMatch[1],
             repo: httpsMatch[3],
@@ -68,7 +72,7 @@ function parseAzureDevOpsUrl(gitUrl) {
     throw new Error(`Unable to parse Azure DevOps URL: ${gitUrl}`);
 }
 export function getRepoDisplayName(repoInfo) {
-    if (repoInfo.type === 'azure-devops') {
+    if (repoInfo.type === "azure-devops") {
         return `${repoInfo.organization}/${repoInfo.project}/${repoInfo.repo}`;
     }
     return `${repoInfo.owner}/${repoInfo.repo}`;

package/dist/shell-utils.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Escapes a string for safe use as a shell argument.
+ * Uses single quotes and escapes any single quotes within the string.
+ *
+ * @param arg - The string to escape
+ * @returns The escaped string wrapped in single quotes
+ */
+export declare function escapeShellArg(arg: string): string;

package/dist/shell-utils.js

@@ -0,0 +1,12 @@
+/**
+ * Escapes a string for safe use as a shell argument.
+ * Uses single quotes and escapes any single quotes within the string.
+ *
+ * @param arg - The string to escape
+ * @returns The escaped string wrapped in single quotes
+ */
+export function escapeShellArg(arg) {
+    // Use single quotes and escape any single quotes within
+    // 'string' -> quote ends, escaped quote, quote starts again
+    return `'${arg.replace(/'/g, "'\\''")}'`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/json-config-sync",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "CLI tool to sync JSON or YAML configuration files across multiple GitHub and Azure DevOps repositories",
   "type": "module",
   "main": "dist/index.js",
@@ -26,12 +26,9 @@
     "build": "tsc",
     "start": "node dist/index.js",
     "dev": "ts-node src/index.ts",
-    "test": "node --import tsx --test src/config.test.ts src/merge.test.ts src/env.test.ts",
+    "test": "node --import tsx --test src/config.test.ts src/merge.test.ts src/env.test.ts src/repo-detector.test.ts src/pr-creator.test.ts",
     "test:integration": "npm run build && node --import tsx --test src/integration.test.ts",
-    "prepublishOnly": "npm run build",
-    "release:patch": "npm version patch && git push --follow-tags",
-    "release:minor": "npm version minor && git push --follow-tags",
-    "release:major": "npm version major && git push --follow-tags"
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "config",