Merge remote-tracking branch 'origin/master' into 102-path

metafacture · Mar 10, 2022 · c479c26 · c479c26
2 parents b376291 + 62b2eb2
commit c479c26
Show file tree

Hide file tree

Showing 275 changed files with 1,591 additions and 87 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ subprojects {
       'mockito':        '2.27.0',
       'requirejs':      '2.3.6',
       'slf4j':          '1.7.21',
-      'xtext':          '2.26.0.M2',
+      'xtext':          '2.26.0',
       'guava':          '29.0-jre'
     ]
   }

diff --git a/.../metafix/integration/bind/fromJson/toJson/listArrayOfObjectsAndMoveSubfield/expected.json b/.../metafix/integration/bind/fromJson/toJson/listArrayOfObjectsAndMoveSubfield/expected.json
@@ -0,0 +1,24 @@
+{
+  "author" : [ {
+    "name" : "RUVIVAL Team",
+    "type" : "Person"
+  }, {
+    "name" : "Samuel Duval",
+    "type" : "Person"
+  }, {
+    "name" : "Berenice Lopez Mendez",
+    "type" : "Person"
+  }, {
+    "name" : "Lukas Schreiner",
+    "type" : "Person"
+  }, {
+    "name" : "Isidora Vrbavac",
+    "type" : "Person"
+  } ]
+}
+{
+  "author" : [ {
+    "name" : "Jürgen Böhner",
+    "type" : "Person"
+  } ]
+}
diff --git a/...ure/metafix/integration/bind/fromJson/toJson/listArrayOfObjectsAndMoveSubfield/input.json b/...ure/metafix/integration/bind/fromJson/toJson/listArrayOfObjectsAndMoveSubfield/input.json
@@ -0,0 +1,32 @@
+{
+  "author": [
+    {
+      "name": "RUVIVAL Team",
+      "@type": "Person"
+    },
+    {
+      "name": "Samuel Duval",
+      "@type": "Person"
+    },
+    {
+      "name": "Berenice Lopez Mendez",
+      "@type": "Person"
+    },
+    {
+      "name": "Lukas Schreiner",
+      "@type": "Person"
+    },
+    {
+      "name": "Isidora Vrbavac",
+      "@type": "Person"
+    }
+  ]
+}
+{
+  "author": [
+    {
+      "@type": "Person",
+      "name": "Jürgen Böhner"
+    }
+  ]
+}
diff --git a/...cture/metafix/integration/bind/fromJson/toJson/listArrayOfObjectsAndMoveSubfield/test.fix b/...cture/metafix/integration/bind/fromJson/toJson/listArrayOfObjectsAndMoveSubfield/test.fix
@@ -0,0 +1,3 @@
+do list(path:"author[]")
+  move_field("@type","type")
+end
diff --git a/...omJson/toJson/IfAny_equalSimple/test.flux → ...stArrayOfObjectsAndMoveSubfield/test.flux b/...omJson/toJson/IfAny_equalSimple/test.flux → ...stArrayOfObjectsAndMoveSubfield/test.flux
diff --git a/...gration/bind/fromJson/toJson/listArrayOfObjectsWithVariableAndPathWildcards/expected.json b/...gration/bind/fromJson/toJson/listArrayOfObjectsWithVariableAndPathWildcards/expected.json
@@ -0,0 +1,23 @@
+{
+  "arrayOfObjects_1" : [ {
+    "name" : "red",
+    "type" : "color"
+  }, {
+    "name" : "green",
+    "type" : "color"
+  }, {
+    "name" : "blue",
+    "type" : "color"
+  } ],
+  "arrayOfObjects_2" : [ {
+    "name" : "purple",
+    "type" : "color"
+  }, {
+    "name" : "orange",
+    "type" : "color"
+  }, {
+    "name" : "yellow",
+    "type" : "color"
+  } ],
+  "test" : [ "red", "green", "blue", "purple", "orange", "yellow" ]
+}
diff --git a/...ntegration/bind/fromJson/toJson/listArrayOfObjectsWithVariableAndPathWildcards/input.json b/...ntegration/bind/fromJson/toJson/listArrayOfObjectsWithVariableAndPathWildcards/input.json
@@ -0,0 +1,23 @@
+{
+  "arrayOfObjects_1" : [ {
+    "name": "red",
+    "type" : "color"
+  }, {
+    "name":"green",
+    "type" : "color"
+  }, {
+    "name":"blue",
+    "type" : "color"
+  } ],
+  "arrayOfObjects_2" : [ {
+    "name": "purple",
+    "type" : "color"
+  }, {
+    "name":"orange",
+    "type" : "color"
+  }, {
+    "name":"yellow",
+    "type" : "color"
+  } ],
+  "test" : [ ]
+}
diff --git a/.../integration/bind/fromJson/toJson/listArrayOfObjectsWithVariableAndPathWildcards/test.fix b/.../integration/bind/fromJson/toJson/listArrayOfObjectsWithVariableAndPathWildcards/test.fix
@@ -0,0 +1,3 @@
+do list(path: "arrayOfObjects??[]", "var": "$i")
+  copy_field("$i.name", "test[].$append")
+end
diff --git a/...n/add_fieldAppendAndCreateArray/test.flux → ...ctsWithVariableAndPathWildcards/test.flux b/...n/add_fieldAppendAndCreateArray/test.flux → ...ctsWithVariableAndPathWildcards/test.flux
diff --git a/...listArrayOfObjectsWithVariableUnlessExistsWithOutsideReferenceAndCopy_field/expected.json b/...listArrayOfObjectsWithVariableUnlessExistsWithOutsideReferenceAndCopy_field/expected.json
@@ -0,0 +1,15 @@
+{
+  "arrayOfObjects" : [ {
+    "name" : "red",
+    "type" : "color"
+  }, {
+    "name" : "green",
+    "type" : "color"
+  }, {
+    "name" : "blue",
+    "type" : "color"
+  } ],
+  "test" : {
+    "key" : "red"
+  }
+}
diff --git a/...on/listArrayOfObjectsWithVariableUnlessExistsWithOutsideReferenceAndCopy_field/input.json b/...on/listArrayOfObjectsWithVariableUnlessExistsWithOutsideReferenceAndCopy_field/input.json
@@ -0,0 +1,12 @@
+{
+  "arrayOfObjects" : [ {
+    "name": "red",
+    "type" : "color"
+    }, {
+    "name":"green",
+    "type" : "color"
+    }, {
+    "name":"blue",
+    "type" : "color"
+    } ]
+}
diff --git a/...Json/listArrayOfObjectsWithVariableUnlessExistsWithOutsideReferenceAndCopy_field/test.fix b/...Json/listArrayOfObjectsWithVariableUnlessExistsWithOutsideReferenceAndCopy_field/test.fix
@@ -0,0 +1,5 @@
+do list(path: "arrayOfObjects[]", "var": "$i")
+  unless exists("test.key")
+    copy_field("$i.name", "test.key")
+  end
+end
diff --git a/.../copy_fieldAppendAndCreateArray/test.flux → ...thOutsideReferenceAndCopy_field/test.flux b/.../copy_fieldAppendAndCreateArray/test.flux → ...thOutsideReferenceAndCopy_field/test.flux
diff --git a/...mpleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherArrayOfStrings/expected.json b/...mpleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherArrayOfStrings/expected.json
@@ -0,0 +1,13 @@
+{
+  "arrayOfObjects" : [ {
+    "name" : "red",
+    "type" : "color"
+  }, {
+    "name" : "green",
+    "type" : "color"
+  }, {
+    "name" : "blue",
+    "type" : "color"
+  } ],
+  "array" : [ "red", "green", "blue" ]
+}
diff --git a/...tSimpleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherArrayOfStrings/input.json b/...tSimpleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherArrayOfStrings/input.json
@@ -0,0 +1,13 @@
+{
+  "arrayOfObjects" : [ {
+    "name": "red",
+    "type" : "color"
+    }, {
+    "name":"green",
+    "type" : "color"
+    }, {
+    "name":"blue",
+    "type" : "color"
+    } ],
+  "array" : [ ]
+}
diff --git a/...istSimpleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherArrayOfStrings/test.fix b/...istSimpleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherArrayOfStrings/test.fix
@@ -0,0 +1,3 @@
+do list(path: "arrayOfObjects[]", "var": "$i")
+  copy_field("$i.name", "array[].$append")
+end
diff --git a/...ithTrailingAsteriskPathWildcard/test.flux → ...istValueToAnotherArrayOfStrings/test.flux b/...ithTrailingAsteriskPathWildcard/test.flux → ...istValueToAnotherArrayOfStrings/test.flux
diff --git a/...rayOfObjectsWithVariableAndCopy_fieldListValueToAnotherNestedArrayOfStrings/expected.json b/...rayOfObjectsWithVariableAndCopy_fieldListValueToAnotherNestedArrayOfStrings/expected.json
@@ -0,0 +1,15 @@
+{
+  "arrayOfObjects" : [ {
+    "name" : "red",
+    "type" : "color"
+  }, {
+    "name" : "green",
+    "type" : "color"
+  }, {
+    "name" : "blue",
+    "type" : "color"
+  } ],
+  "test" : {
+    "array" : [ "red", "green", "blue" ]
+  }
+}
diff --git a/...eArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherNestedArrayOfStrings/input.json b/...eArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherNestedArrayOfStrings/input.json
@@ -0,0 +1,13 @@
+{
+  "arrayOfObjects" : [ {
+    "name": "red",
+    "type" : "color"
+    }, {
+    "name":"green",
+    "type" : "color"
+    }, {
+    "name":"blue",
+    "type" : "color"
+    } ],
+  "test" : { "array" : [ ] }
+}
diff --git a/...pleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherNestedArrayOfStrings/test.fix b/...pleArrayOfObjectsWithVariableAndCopy_fieldListValueToAnotherNestedArrayOfStrings/test.fix
@@ -0,0 +1,3 @@
+do list(path: "arrayOfObjects[]", "var": "$i")
+  copy_field("$i.name", "test.array[].$append")
+end
diff --git a/...toJson/copy_fieldArrayOfStrings/test.flux → ...ueToAnotherNestedArrayOfStrings/test.flux b/...toJson/copy_fieldArrayOfStrings/test.flux → ...ueToAnotherNestedArrayOfStrings/test.flux
diff --git a/...ation/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/expected.json b/...ation/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/expected.json
@@ -0,0 +1,3 @@
+{
+  "colors" : [ "Red is a nice color", "Green is a nice color", "Blue is a nice color" ]
+}
diff --git a/...egration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/input.json b/...egration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/input.json
@@ -0,0 +1,3 @@
+{
+  "colors" : [ "red", "green", "blue" ]
+}
diff --git a/...ntegration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/test.fix b/...ntegration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/test.fix
@@ -0,0 +1,4 @@
+do list(path:"colors[]")
+  upcase(".")
+  append(".", " is a nice color")
+end
diff --git a/.../move_fieldAppendAndCreateArray/test.flux → ...StringsWithoutVariableAndAppend/test.flux b/.../move_fieldAppendAndCreateArray/test.flux → ...StringsWithoutVariableAndAppend/test.flux
diff --git a/...ntegration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/todo.txt b/...ntegration/bind/fromJson/toJson/listSimpleArrayOfStringsWithoutVariableAndAppend/todo.txt
@@ -0,0 +1 @@
+See issue #191
diff --git a/...on/toJson/IfAny_equalSimple/expected.json → ...on/toJson/ifAny_equalSimple/expected.json b/...on/toJson/IfAny_equalSimple/expected.json → ...on/toJson/ifAny_equalSimple/expected.json
diff --git a/...mJson/toJson/IfAny_equalSimple/input.json → ...mJson/toJson/ifAny_equalSimple/input.json b/...mJson/toJson/IfAny_equalSimple/input.json → ...mJson/toJson/ifAny_equalSimple/input.json
diff --git a/...romJson/toJson/IfAny_equalSimple/test.fix → ...romJson/toJson/ifAny_equalSimple/test.fix b/...romJson/toJson/IfAny_equalSimple/test.fix → ...romJson/toJson/ifAny_equalSimple/test.fix
diff --git a/...toJson/move_fieldArrayOfStrings/test.flux → ...omJson/toJson/ifAny_equalSimple/test.flux b/...toJson/move_fieldArrayOfStrings/test.flux → ...omJson/toJson/ifAny_equalSimple/test.flux
diff --git a/.../org/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElse/expected.json b/.../org/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElse/expected.json
@@ -0,0 +1,30 @@
+{
+  "name" : "red",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "green",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "blue",
+  "type" : "color",
+  "test" : "true"
+}
+{
+  "name" : "purple",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "orange",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "yellow",
+  "type" : "color",
+  "test" : "false"
+}
diff --git a/...ces/org/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElse/input.json b/...ces/org/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElse/input.json
@@ -0,0 +1,24 @@
+{
+  "name": "red",
+  "type": "color"
+}
+{
+  "name": "green",
+  "type": "color"
+}
+{
+  "name": "blue",
+  "type": "color"
+}
+{
+  "name": "purple",
+  "type": "color"
+}
+{
+  "name": "orange",
+  "type": "color"
+}
+{
+  "name": "yellow",
+  "type": "color"
+}
diff --git a/...urces/org/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElse/test.fix b/...urces/org/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElse/test.fix
@@ -0,0 +1,5 @@
+if all_equal("name", "blue")
+  add_field("test", "true")
+else
+  add_field("test", "false")
+end
diff --git a/...mJson/toJson/set_arrayIntoArray/test.flux → ...onal/fromJson/toJson/ifWithElse/test.flux b/...mJson/toJson/set_arrayIntoArray/test.flux → ...onal/fromJson/toJson/ifWithElse/test.flux
diff --git a/...afacture/metafix/integration/conditional/fromJson/toJson/ifWithElsifAndElse/expected.json b/...afacture/metafix/integration/conditional/fromJson/toJson/ifWithElsifAndElse/expected.json
@@ -0,0 +1,30 @@
+{
+  "name" : "red",
+  "type" : "color",
+  "test_2" : "true"
+}
+{
+  "name" : "green",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "blue",
+  "type" : "color",
+  "test" : "true"
+}
+{
+  "name" : "purple",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "orange",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "yellow",
+  "type" : "color",
+  "test" : "false"
+}
diff --git a/...metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElsifAndElse/input.json b/...metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElsifAndElse/input.json
@@ -0,0 +1,24 @@
+{
+  "name": "red",
+  "type": "color"
+}
+{
+  "name": "green",
+  "type": "color"
+}
+{
+  "name": "blue",
+  "type": "color"
+}
+{
+  "name": "purple",
+  "type": "color"
+}
+{
+  "name": "orange",
+  "type": "color"
+}
+{
+  "name": "yellow",
+  "type": "color"
+}
diff --git a/...g/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElsifAndElse/test.fix b/...g/metafacture/metafix/integration/conditional/fromJson/toJson/ifWithElsifAndElse/test.fix
@@ -0,0 +1,7 @@
+if all_equal("name", "blue")
+  add_field("test", "true")
+elsif all_equal("name", "red")
+  add_field("test_2", "true")
+else
+  add_field("test", "false")
+end
diff --git a/...fromJson/toJson/set_arraySimple/test.flux → ...mJson/toJson/ifWithElsifAndElse/test.flux b/...fromJson/toJson/set_arraySimple/test.flux → ...mJson/toJson/ifWithElsifAndElse/test.flux
diff --git a/.../metafix/integration/conditional/fromJson/toJson/ifWithMultipleElsifAndElse/expected.json b/.../metafix/integration/conditional/fromJson/toJson/ifWithMultipleElsifAndElse/expected.json
@@ -0,0 +1,30 @@
+{
+  "name" : "red",
+  "type" : "color",
+  "test_2" : "true"
+}
+{
+  "name" : "green",
+  "type" : "color",
+  "test_4" : "true"
+}
+{
+  "name" : "blue",
+  "type" : "color",
+  "test" : "true"
+}
+{
+  "name" : "purple",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "orange",
+  "type" : "color",
+  "test" : "false"
+}
+{
+  "name" : "yellow",
+  "type" : "color",
+  "test_3" : "true"
+}