beforeとafter逆だった

Author: Rozelin-dc

scripts/diff-match/for-multi.mjs

@@ -1,28 +1,12 @@
 /// <reference path="../util/type.mjs" />
+/// <reference path="./type.mjs" />
 
 import path from 'path'
 import { XMLParser } from 'fast-xml-parser'
 import yargs from 'yargs'
 import { RECORD_ACTION_PROP_NAMES } from '../util/constant.mjs'
 import { readFile, writeFile } from '../util/file.mjs'
 
-/**
- * @typedef {object} DiffXml
- * @property {string} context
- * @property {DiffNode} root
- */
-
-/**
- * @typedef {object} DiffNode
- * @property {DiffNode | DiffNode[]} [tree]
- * @property {string} '@_type'
- * @property {string} [@_label]
- * @property {string} '@_pos'
- * @property {string} '@_length'
- * @property {string} [@_other_pos]
- * @property {string} [@_other_length]
- */
-
 const argv = await yargs(process.argv.slice(2))
   .option('file', {
     demandOption: true,
@@ -57,10 +41,10 @@ const idMapDir = argv.idMapDir
 const beforeTmpDir = argv.beforeTmpDir
 const afterTmpDir = argv.afterTmpDir
 
-const rawXml = await readFile(`${fileName}.diff.xml`)
+const rawXml = await readFile(fileName)
 
-console.log(`Processing file: ${fileName}.diff.xml`)
-console.log('file content:', rawXml)
+console.log(`Processing file: ${fileName}`)
+// console.log('file content:', rawXml)
 
 /** @type {DiffXml} */
 const xml = new XMLParser({
@@ -158,8 +142,8 @@ const runXml = (xml, parent) => {
         break
       }
 
-      const afterPos = parseInt(xml['@_pos'])
-      const beforePos = parseInt(xml['@_other_pos'])
+      const beforePos = parseInt(xml['@_pos'])
+      const afterPos = parseInt(xml['@_other_pos'])
       if (RECORD_ACTION_PROP_NAMES[identifier['@_label']]) {
         const parentPos = parseInt(parent['@_pos'])
 
@@ -190,8 +174,8 @@ const runXml = (xml, parent) => {
         break
       }
 
-      const afterPos = parseInt(xml['@_pos'])
-      const beforePos = parseInt(xml['@_other_pos'])
+      const beforePos = parseInt(xml['@_pos'])
+      const afterPos = parseInt(xml['@_other_pos'])
 
       const normalizedBefore = normalizePos('before', beforePos)
       const normalizedAfter = normalizePos('after', afterPos)

scripts/diff-match/for-multi.sh

@@ -52,5 +52,5 @@ for commit in $commits; do
 
   # Do diff matching
   docker run --rm -v "$left_tmp:/diff/left" -v "$right_tmp:/diff/right" -p 4567:4567 rozelin/gumtree:latest axmldiff left/$commit.tsx right/$commit.tsx > "$map_file_tmp_dir/$commit.diff.xml"
-  node ./scripts/diff-match/main.mjs --file $map_file_tmp_dir/$commit.diff.xml --multiFiles $actual_files --projectRootDir $project_root_dir --idMapDir $map_file_dir --beforeTmpDir $left_tmp --afterTmpDir $right_tmp
+  node ./scripts/diff-match/for-multi.mjs --file $map_file_tmp_dir/$commit.diff.xml --multiFiles $actual_files --projectRootDir $project_root_dir --idMapDir $map_file_dir --beforeTmpDir $left_tmp --afterTmpDir $right_tmp
 done

scripts/diff-match/main.mjs

@@ -1,27 +1,11 @@
 /// <reference path="../util/type.mjs" />
+/// <reference path="./type.mjs" />
 
 import { XMLParser } from 'fast-xml-parser'
 import yargs from 'yargs'
 import { RECORD_ACTION_PROP_NAMES } from '../util/constant.mjs'
 import { readFile, writeFile } from '../util/file.mjs'
 
-/**
- * @typedef {object} DiffXml
- * @property {string} context
- * @property {DiffNode} root
- */
-
-/**
- * @typedef {object} DiffNode
- * @property {DiffNode | DiffNode[]} [tree]
- * @property {string} '@_type'
- * @property {string} [@_label]
- * @property {string} '@_pos'
- * @property {string} '@_length'
- * @property {string} [@_other_pos]
- * @property {string} [@_other_length]
- */
-
 const argv = await yargs(process.argv.slice(2))
   .option('file', {
     demandOption: true,
@@ -34,7 +18,7 @@ const fileName = argv.file
 const rawXml = await readFile(`${fileName}.diff.xml`)
 
 console.log(`Processing file: ${fileName}.diff.xml`)
-console.log('file content:', rawXml)
+// console.log('file content:', rawXml)
 
 /** @type {DiffXml} */
 const xml = new XMLParser({
@@ -76,8 +60,8 @@ const runXml = (xml, parent) => {
         break
       }
 
-      const afterPos = parseInt(xml['@_pos'])
-      const beforePos = parseInt(xml['@_other_pos'])
+      const beforePos = parseInt(xml['@_pos'])
+      const afterPos = parseInt(xml['@_other_pos'])
       if (RECORD_ACTION_PROP_NAMES[identifier['@_label']]) {
         const parentPos = parseInt(parent['@_pos'])
 
@@ -96,8 +80,8 @@ const runXml = (xml, parent) => {
         break
       }
 
-      const afterPos = parseInt(xml['@_pos'])
-      const beforePos = parseInt(xml['@_other_pos'])
+      const beforePos = parseInt(xml['@_pos'])
+      const afterPos = parseInt(xml['@_other_pos'])
 
       newIdMap[afterPos] = { ...idMap[beforePos], position: afterPos }
       break

scripts/diff-match/type.mjs

@@ -0,0 +1,16 @@
+/**
+ * @typedef {object} DiffXml
+ * @property {string} context
+ * @property {DiffNode} root
+ */
+
+/**
+ * @typedef {object} DiffNode
+ * @property {DiffNode | DiffNode[]} [tree]
+ * @property {string} '@_type'
+ * @property {string} [@_label]
+ * @property {string} '@_pos'
+ * @property {string} '@_length'
+ * @property {string} [@_other_pos]
+ * @property {string} [@_other_length]
+ */