fix: blend json encoding flag + escape dot (#7)

soyuka · Jul 11, 2024 · a274437 · a274437
1 parent c622800
commit a274437
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/src/Command/BlendCommand.php b/src/Command/BlendCommand.php
@@ -114,7 +114,17 @@ private function blendJsonPath(InputInterface $input, OutputInterface $output):
         $path = $this->composer->getConfig()->getConfigSource()->getName();
         $file = file_get_contents($path) ?: throw new \RuntimeException(sprintf('File "%s" not found.', $path));
         $data = json_decode($file, true) ?: throw new \RuntimeException(sprintf('File "%s" is not JSON.', $path));
-        $pointers = explode('.', $jsonPath);
+		$pattern = '/(?<!\\\\)\./';  // Regex pattern to match a dot not preceded by a backslash
+		$pointers = preg_split($pattern, $jsonPath);
+
+        if (!$pointers) {
+            $output->writeln('No pointers.');
+            return 1;
+        }
+
+		foreach ($pointers as &$part) {
+			$part = str_replace('\.', '.', $part);
+		}
 
         $p = $pointers;
         $value = $data;
@@ -179,7 +189,7 @@ private function blendJsonPath(InputInterface $input, OutputInterface $output):
 
             unset($ref);
             $ref = $value;
-            $fileContent = file_put_contents($path, json_encode($json, JSON_PRETTY_PRINT));
+            $fileContent = file_put_contents($path, json_encode($json, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
 
             if (!$fileContent) {
                 $output->writeln(sprintf('Could not write JSON at path "%s".', $path));

diff --git a/tests/functional/BlendCommandTest.php b/tests/functional/BlendCommandTest.php
@@ -91,6 +91,21 @@ public function testBlendJsonPath(): void {
         $this->assertEquals("", $output->fetch());
     }
 
+    public function testBlendJsonPathEscapeDot(): void {
+        $this->files = [__DIR__ . '/../monorepo/packages/A/composer.json', __DIR__ . '/../monorepo/packages/B/composer.json', __DIR__ . '/../monorepo/packages/C/composer.json'];
+        $this->backups = array_map('file_get_contents', $this->files);
+        $output = new BufferedOutput;
+        $this->application->run(new StringInput('blend --json-path=extra.branch-alias.dev-3\\\.4 --force'), $output);
+
+        foreach ($this->files as $f) {
+            $json = file_get_contents($f) ?: throw new RuntimeException;
+            /** @var array{extra?: array{branch-alias?: array<string, string>}} */
+            $new = json_decode($json, true);
+            $this->assertEquals($new['extra']['branch-alias']['dev-3.4'] ?? null, '3.4.x-dev');
+        }
+        $this->assertEquals("", $output->fetch());
+    }
+
     protected function tearDown(): void {
         while ($file = array_shift($this->files)) {
             if ($b = array_shift($this->backups)) {

diff --git a/tests/monorepo/composer.json b/tests/monorepo/composer.json
@@ -28,7 +28,8 @@
     ],
     "extra": {
       "branch-alias": {
-        "dev-main": "3.3.x-dev"
+        "dev-main": "3.3.x-dev",
+        "dev-3.4": "3.4.x-dev"
       },
       "projects": [
         "test/a",