js-1.5.0 js-core-1.6.0 java-0.9.5 monaco-1.1.0 - add merge function, expose examples (int-tests) through js-core, migrate from microbundle to tsc. prepare for dynamic docs

Author: elisherer

.gitignore

@@ -81,3 +81,5 @@ gradle-app.setting
 
 # ignore binaries created by VScode Java plugins
 **/bin/
+
+**/*.tsbuildinfo

docs/docs/functions/merge.md

@@ -0,0 +1,255 @@
+# $$merge
+
+Merge multiple objects into one. Allows deep merging and array concatenation.
+
+### Usage
+```transformers
+{
+  "$$merge": [ /* objects */ ],
+  "deep": /* true / false (default) */,
+  "arrays": /* true / false (default) */
+}
+```
+```transformers
+"$$merge([deep],[arrays]):{input}"
+```
+### Returns
+`object` (The merged schema of all specified objects)
+
+### Arguments
+| Argument | Type      | Values | Required / Default Value | Description                     |
+|----------|-----------|--------|-------------------------------|---------------------------------|
+| Primary  | `array`   |        | Yes                           | Array of objects to merge       |
+| `deep`   | `boolean` |        | `false`                       | Whether to merge objects deeply |
+| `arrays` | `boolean` |        | `false`                       | Whether to concatenate arrays   |
+
+## Examples
+
+
+```mdx-code-block
+<div className="examples_grid">
+```
+
+**Input**
+
+**Definition**
+
+**Output**
+
+```json
+{
+  "a": "A"
+}
+```
+```transformers
+{
+  "$$merge": [
+    "$",
+    {
+      "b": "B"
+    }
+  ]
+}
+```
+```json
+{
+  "a": "A",
+  "b": "B"
+}
+```
+
+```json
+{
+  "a": "A",
+  "b": "B"
+}
+```
+```transformers
+{
+  "$$merge": [
+    "$",
+    {
+      "b": "BB"
+    }
+  ]
+}
+```
+```json
+{
+  "a": "A",
+  "b": "BB"
+}
+```
+
+```json
+{
+  "a": "A",
+  "b": "B"
+}
+```
+```transformers
+{
+  "$$merge": [
+    "$",
+    {
+      "b": "#null"
+    }
+  ]
+}
+```
+```json
+{
+  "a": "A",
+  "b": null
+}
+```
+
+```json
+{
+  "a": {
+    "aa": "AA"
+  },
+  "b": "B"
+}
+```
+```transformers
+{
+  "$$merge": [
+    "$",
+    {
+      "a": {
+        "aaa": "AAA"
+      }
+    }
+  ]
+}
+```
+```json
+{
+  "a": {
+    "aaa": "AAA"
+  },
+  "b": "B"
+}
+```
+
+```json
+{
+  "a": {
+    "aa": "AA"
+  },
+  "b": "B"
+}
+```
+```transformers
+{
+  "$$merge": [
+    "$",
+    {
+      "a": {
+        "aaa": "AAA"
+      }
+    }
+  ],
+  "deep": true
+}
+```
+```json
+{
+  "a": {
+    "aa": "AA",
+    "aaa": "AAA"
+  },
+  "b": "B"
+}
+```
+
+```json
+{
+  "a": {
+    "aa": "AA"
+  },
+  "c": [
+    1,
+    2
+  ]
+}
+```
+```transformers
+{
+  "$$merge": [
+    "$",
+    {
+      "a": {
+        "aaa": "AAA"
+      },
+      "c": [
+        3,
+        4
+      ]
+    }
+  ],
+  "deep": true,
+  "arrays": true
+}
+```
+```json
+{
+  "a": {
+    "aa": "AA",
+    "aaa": "AAA"
+  },
+  "c": [
+    1,
+    2,
+    3,
+    4
+  ]
+}
+```
+
+```json
+{
+  "a": {
+    "aa": "AA"
+  },
+  "c": [
+    1,
+    2
+  ]
+}
+```
+```transformers
+{
+  "$$merge": [
+    "$",
+    {
+      "a": {
+        "aaa": "AAA"
+      },
+      "c": [
+        3,
+        4
+      ]
+    }
+  ],
+  "arrays": true
+}
+```
+```json
+{
+  "a": {
+    "aaa": "AAA"
+  },
+  "c": [
+    1,
+    2,
+    3,
+    4
+  ]
+}
+```
+
+```mdx-code-block
+</div>
+```

docs/package-lock.json

@@ -19,9 +19,9 @@
     "@docusaurus/preset-classic": "3.7.0",
     "@mdx-js/react": "3.1.0",
     "@monaco-editor/react": "4.6.0",
-    "@nlighten/json-transform": "^1.3.3",
-    "@nlighten/json-transform-core": "^1.5.0",
-    "@nlighten/monaco-json-transform": "^1.0.0",
+    "@nlighten/json-transform": "^1.5.0",
+    "@nlighten/json-transform-core": "^1.6.0",
+    "@nlighten/monaco-json-transform": "^1.1.0",
     "buffer": "^6.0.3",
     "clsx": "2.1.0",
     "crypto-browserify": "^3.12.1",

docs/package.json

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'co.nlighten'
-version = '0.9.4'
+version = '0.9.5'
 
 ext {
     gsonVersion = "2.10.1"

java/json-transform/build.gradle

@@ -93,7 +93,8 @@ protected Object fromJsonObject(String path, Object definition, ParameterResolve
         }
 
         var result = adapter.createObject();
-        if (adapter.has(definition, OBJ_DESTRUCT_KEY)) {
+        var hasObjectDestruction = adapter.has(definition, OBJ_DESTRUCT_KEY);
+        if (hasObjectDestruction) {
             var val = adapter.get(definition, OBJ_DESTRUCT_KEY);
             var res = fromJsonElement(path + "[\"*\"]", val, resolver, false);
             if (res != null) {
@@ -120,9 +121,13 @@ protected Object fromJsonObject(String path, Object definition, ParameterResolve
             var localKey = kv.getKey();
             var localValue = kv.getValue();
             if (adapter.isJsonString(localValue) && adapter.getAsString(localValue).equals(NULL_VALUE)) {
-                // don't define key if #null was used
-                // might already exist, so try removing it
-                adapter.remove(result, localKey);
+                if (hasObjectDestruction) {
+                    // don't define key if #null was used
+                    // might already exist, so try removing it
+                    adapter.remove(result, localKey);
+                } else {
+                    adapter.add(result, localKey, adapter.jsonNull());
+                }
                 continue;
             }
             var value = fromJsonElement(

java/json-transform/src/main/java/co/nlighten/jsontransform/JsonTransformer.java

@@ -71,6 +71,7 @@ public class TransformerFunctions implements TransformerFunctionsAdapter {
                 Map.entry("matchall", new TransformerFunctionMatchAll()),
                 Map.entry("math", new TransformerFunctionMath()),
                 Map.entry("max",new TransformerFunctionMax()),
+                Map.entry("merge",new TransformerFunctionMerge()),
                 Map.entry("min",new TransformerFunctionMin()),
                 Map.entry("normalize", new TransformerFunctionNormalize()),
                 Map.entry("not", new TransformerFunctionNot()),