From fb3a9cdf3679d533e2dcaa9a9587317ea348dd29 Mon Sep 17 00:00:00 2001
From: Jos de Jong <wjosdejong@gmail.com>
Date: Sun, 12 Jul 2020 10:58:55 +0200
Subject: [PATCH] Rename action to operation

---
 src/JSONEditor.svelte             |  2 +-
 src/JSONNode.svelte               |  2 +-
 src/{actions.js => operations.js} | 27 +++++++++++++++------------
 src/utils/immutableJSONPatch.js   |  6 +++---
 4 files changed, 20 insertions(+), 17 deletions(-)
 rename src/{actions.js => operations.js} (91%)

diff --git a/src/JSONEditor.svelte b/src/JSONEditor.svelte
index cb88602..c899e4a 100644
--- a/src/JSONEditor.svelte
+++ b/src/JSONEditor.svelte
@@ -5,7 +5,7 @@
     insertBefore,
     removeAll,
     replace
-  } from './actions.js'
+  } from './operations.js'
   import {
     DEFAULT_LIMIT,
     STATE_EXPANDED,
diff --git a/src/JSONNode.svelte b/src/JSONNode.svelte
index 325d8e1..39e86ae 100644
--- a/src/JSONNode.svelte
+++ b/src/JSONNode.svelte
@@ -1,6 +1,6 @@
 <script>
   import { debounce, isEqual } from 'lodash-es'
-  import { rename } from './actions.js'
+  import { rename } from './operations.js'
   import {
     DEBOUNCE_DELAY,
     DEFAULT_LIMIT,
diff --git a/src/actions.js b/src/operations.js
similarity index 91%
rename from src/actions.js
rename to src/operations.js
index bb8bfb6..b0bcd9e 100644
--- a/src/actions.js
+++ b/src/operations.js
@@ -6,7 +6,7 @@ import { compileJSONPointer } from './utils/jsonPointer'
 import { findUniqueName } from './utils/stringUtils'
 
 /**
- * Create a JSONPatch for an insert action.
+ * Create a JSONPatch for an insert operation.
  *
  * This function needs the current data in order to be able to determine
  * a unique property name for the inserted node in case of duplicating
@@ -51,7 +51,7 @@ export function insertBefore (json, path, values, nextKeys) {  // TODO: find a b
 }
 
 /**
- * Create a JSONPatch for an append action. The values will be appended
+ * Create a JSONPatch for an append operation. The values will be appended
  * to the end of the array or object.
  *
  * This function needs the current data in order to be able to determine
@@ -113,7 +113,7 @@ export function rename(parentPath, oldKey, newKey, nextKeys) {
 }
 
 /**
- * Create a JSONPatch for an insert action.
+ * Create a JSONPatch for an insert operation.
  *
  * This function needs the current data in order to be able to determine
  * a unique property name for the inserted node in case of duplicating
@@ -136,14 +136,17 @@ export function replace (json, paths, values, nextKeys) {  // TODO: find a bette
     const firstPath = first(paths)
     const offset = firstPath ? parseInt(last(firstPath), 10) : 0
 
-    const removeActions = removeAll(paths)
-    const insertActions = values.map((entry, index) => ({
-      op: 'add',
-      path: compileJSONPointer(parentPath.concat(index + offset)),
-      value: entry.value
-    }))
+    return [
+      // remove operations
+      ...removeAll(paths),
 
-    return removeActions.concat(insertActions)
+      // insert operations
+      values.map((entry, index) => ({
+        op: 'add',
+        path: compileJSONPointer(parentPath.concat(index + offset)),
+        value: entry.value
+      }))
+    ]
   }
   else { // parent is Object
     return [
@@ -168,7 +171,7 @@ export function replace (json, paths, values, nextKeys) {  // TODO: find a bette
 }
 
 /**
- * Create a JSONPatch for a remove action
+ * Create a JSONPatch for a remove operation
  * @param {Path} path
  * @return {JSONPatchDocument}
  */
@@ -180,7 +183,7 @@ export function remove (path) {
 }
 
 /**
- * Create a JSONPatch for a multiple remove action
+ * Create a JSONPatch for a multiple remove operation
  * @param {Path[]} paths
  * @return {JSONPatchDocument}
  */
diff --git a/src/utils/immutableJSONPatch.js b/src/utils/immutableJSONPatch.js
index e718481..4b14eae 100644
--- a/src/utils/immutableJSONPatch.js
+++ b/src/utils/immutableJSONPatch.js
@@ -13,7 +13,7 @@ import { isEqual, initial } from 'lodash-es'
  * The original JSON object will not be changed,
  * instead, the patch is applied in an immutable way
  * @param {JSON} json
- * @param {JSONPatchDocument} operations    Array with JSON patch actions
+ * @param {JSONPatchDocument} operations    Array with JSON patch operations
  * @return {{json: JSON, revert: JSONPatchDocument, error: Error | null}}
  */
 export function immutableJSONPatch (json, operations) {
@@ -54,7 +54,7 @@ export function immutableJSONPatch (json, operations) {
           return {
             json: updatedJson,
             revert: [],
-            error: new Error('Property "from" expected in copy action ' + JSON.stringify(operation))
+            error: new Error('Property "from" expected in copy operation ' + JSON.stringify(operation))
           }
         }
 
@@ -70,7 +70,7 @@ export function immutableJSONPatch (json, operations) {
           return {
             json: updatedJson,
             revert: [],
-            error: new Error('Property "from" expected in move action ' + JSON.stringify(operation))
+            error: new Error('Property "from" expected in move operation ' + JSON.stringify(operation))
           }
         }