json-p3 2.3.0 → 2.3.2

package/dist/json-p3.esm.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 2.3.0
+ * json-p3 version 2.3.2
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -3398,87 +3398,51 @@ class SliceSelector extends JSONPathSelector {
       }
     }
   }
-
-  // eslint-disable-next-line sonarjs/cognitive-complexity
   slice(arr, start, stop, step) {
-    if (!arr.length) return [];
-
-    // Handle negative start and stop values
-    if (start === undefined || start === null) {
-      start = step && step < 0 ? arr.length - 1 : 0;
-    } else if (start < 0) {
-      start = Math.max(arr.length + start, 0);
-    } else {
-      start = Math.min(start, arr.length - 1);
-    }
-    if (stop === undefined || stop === null) {
-      stop = step && step < 0 ? -1 : arr.length;
-    } else if (stop < 0) {
-      stop = Math.max(arr.length + stop, -1);
-    } else {
-      stop = Math.min(stop, arr.length);
-    }
-
-    // Handle step value
-    if (step === 0) {
-      return [];
-    }
-    if (!step) {
-      step = 1;
-    }
-
-    // Perform the slice
-    const slicedArray = [];
+    const len = arr.length;
+    step = step ?? 1;
+    if (step === 0 || !len) return [];
+    const result = [];
+    let i;
     if (step > 0) {
-      for (let i = start; i < stop; i += step) {
-        slicedArray.push([i, arr[i]]);
+      i = this.normalizeIndex(start, 0, len, step);
+      const stop_ = this.normalizeIndex(stop, len, len, step);
+      for (; i < stop_; i += step) {
+        result.push([i, arr[i]]);
       }
     } else {
-      for (let i = start; i > stop; i += step) {
-        slicedArray.push([i, arr[i]]);
+      i = this.normalizeIndex(start, len - 1, len, step);
+      const stop_ = this.normalizeIndex(stop, -1, len, step);
+      for (; i > stop_; i += step) {
+        result.push([i, arr[i]]);
       }
     }
-    return slicedArray;
+    return result;
   }
-
-  // eslint-disable-next-line sonarjs/cognitive-complexity
   *lazySlice(arr, start, stop, step) {
-    if (!arr.length) return;
-
-    // Handle negative and undefined start values
-    if (start === undefined || start === null) {
-      start = step && step < 0 ? arr.length - 1 : 0;
-    } else if (start < 0) {
-      start = Math.max(arr.length + start, 0);
-    } else {
-      start = Math.min(start, arr.length - 1);
-    }
-
-    // Handle negative and undefined stop values
-    if (stop === undefined || stop === null) {
-      stop = step && step < 0 ? -1 : arr.length;
-    } else if (stop < 0) {
-      stop = Math.max(arr.length + stop, -1);
-    } else {
-      stop = Math.min(stop, arr.length);
-    }
-
-    // Perform the slice
-    if (step === undefined) {
-      // Default to a step of 1
-      for (let i = start; i < stop; i += 1) {
-        yield [i, arr[i]];
-      }
-    } else if (step > 0) {
-      for (let i = start; i < stop; i += step) {
+    const len = arr.length;
+    step = step ?? 1;
+    if (step === 0 || !len) return [];
+    let i;
+    if (step > 0) {
+      i = this.normalizeIndex(start, 0, len, step);
+      const stop_ = this.normalizeIndex(stop, len, len, step);
+      for (; i < stop_; i += step) {
         yield [i, arr[i]];
       }
-    } else if (step < 0) {
-      for (let i = start; i > stop; i += step) {
+    } else {
+      i = this.normalizeIndex(start, len - 1, len, step);
+      const stop_ = this.normalizeIndex(stop, -1, len, step);
+      for (; i > stop_; i += step) {
         yield [i, arr[i]];
       }
     }
   }
+  normalizeIndex(n, defaultValue, len, step) {
+    if (n === undefined) return defaultValue;
+    if (n < 0) return step < 0 ? Math.max(n + len, -1) : Math.max(n + len, 0);
+    return step < 0 ? Math.min(n, len - 1) : Math.min(n, len);
+  }
 }
 class WildcardSelector extends JSONPathSelector {
   constructor(environment, token) {
@@ -3625,7 +3589,7 @@ class ChildSegment extends JSONPathSegment {
     const rv = [];
     for (const node of nodes) {
       for (const selector of this.selectors) {
-        rv.push(...selector.resolve(node));
+        for (const match of selector.resolve(node)) rv.push(match);
       }
     }
     return rv;
@@ -3660,7 +3624,7 @@ class DescendantSegment extends JSONPathSegment {
     for (const node of nodes) {
       for (const _node of visitor(node)) {
         for (const selector of this.selectors) {
-          rv.push(...selector.resolve(_node));
+          for (const match of selector.resolve(_node)) rv.push(match);
         }
       }
     }
@@ -4844,31 +4808,7 @@ class OpAdd {
     this.value = value;
   }
   apply(value, index) {
-    const [parent, obj] = this.path.resolveWithParent(value);
-    if (parent === UNDEFINED) {
-      // Replace the root object.
-      return this.value;
-    }
-    const target = this.path.tokens.at(-1);
-    if (target === undefined) {
-      // this should not be possible
-      throw new JSONPatchError(`unexpected operation on 'undefined' (${this.name}:${index})`);
-    } else if (isArray(parent)) {
-      if (obj === UNDEFINED) {
-        if (target === "-") {
-          parent.push(this.value);
-        } else {
-          throw new JSONPatchError(`index out of range (${this.name}:${index})`);
-        }
-      } else {
-        parent.splice(Number(target), 0, this.value);
-      }
-    } else if (isObject(parent)) {
-      parent[target] = this.value;
-    } else {
-      throw new JSONPatchError(`unexpected operation on '${typeof parent}' (${this.name}:${index})`);
-    }
-    return value;
+    return add(value, this.path, this.value, this.name, index);
   }
   toObject() {
     return {
@@ -4888,27 +4828,7 @@ class OpRemove {
     this.path = path;
   }
   apply(value, index) {
-    const [parent, obj] = this.path.resolveWithParent(value);
-    if (parent === UNDEFINED) {
-      throw new JSONPatchError(`can't remove root (${this.name}:${index})`);
-    }
-    const target = this.path.tokens.at(-1);
-    if (target === undefined) {
-      // this should not be possible
-      throw new JSONPatchError(`unexpected operation on 'undefined' (${this.name}:${index})`);
-    } else if (isArray(parent)) {
-      if (obj === UNDEFINED) {
-        throw new JSONPatchError(`can't remove nonexistent item (${this.name}:${index})`);
-      }
-      parent.splice(Number(target), 1);
-    } else if (isObject(parent)) {
-      if (obj === UNDEFINED) {
-        throw new JSONPatchError(`can't remove nonexistent property (${this.name}:${index})`);
-      }
-      delete parent[target];
-    } else {
-      throw new JSONPatchError(`unexpected operation on '${typeof parent}' (${this.name}:${index})`);
-    }
+    remove(value, this.path, this.name, index);
     return value;
   }
   toObject() {
@@ -4944,15 +4864,16 @@ class OpReplace {
         throw new JSONPatchError(`can't replace nonexistent item (${this.name}:${index})`);
       }
       parent.splice(Number(target), 1, this.value);
-    } else if (isObject(parent)) {
+      return value;
+    }
+    if (isObject(parent)) {
       if (obj === UNDEFINED) {
         throw new JSONPatchError(`can't replace nonexistent property (${this.name}:${index})`);
       }
       parent[target] = this.value;
-    } else {
-      throw new JSONPatchError(`unexpected operation on '${typeof parent}' (${this.name}:${index})`);
+      return value;
     }
-    return value;
+    throw new JSONPatchError(`unexpected operation on '${typeof parent}' (${this.name}:${index})`);
   }
   toObject() {
     return {
@@ -4976,42 +4897,8 @@ class OpMove {
     if (this.path.isRelativeTo(this.from)) {
       throw new JSONPatchError(`can't move object to one of its own children (${this.name}:${index})`);
     }
-    const [sourceParent, sourceObj] = this.from.resolveWithParent(value);
-    if (sourceObj === UNDEFINED) {
-      throw new JSONPatchError(`source object does not exist (${this.name}:${index})`);
-    }
-    const sourceTarget = this.from.tokens.at(-1);
-    if (sourceTarget === undefined) {
-      // this should not be possible
-      throw new JSONPatchError(`unexpected operation on 'undefined' (${this.name}:${index})`);
-    }
-    if (isArray(sourceParent)) {
-      sourceParent.splice(Number(sourceTarget), 1);
-    } else if (isObject(sourceParent)) {
-      delete sourceParent[sourceTarget];
-    }
-    const [destParent, _] = this.path.resolveWithParent(value);
-    if (destParent === UNDEFINED) {
-      // move source to root
-      return sourceObj;
-    }
-    const destTarget = this.path.tokens.at(-1);
-    if (destTarget === undefined) {
-      // this should not be possible
-      throw new JSONPatchError(`unexpected operation on 'undefined' (${this.name}:${index})`);
-    }
-    if (isArray(destParent)) {
-      if (destTarget === "-") {
-        destParent.push(sourceObj);
-      } else {
-        destParent.splice(Number(destTarget), 0, sourceObj);
-      }
-    } else if (isObject(destParent)) {
-      destParent[destTarget] = sourceObj;
-    } else {
-      throw new JSONPatchError(`unexpected operation on '${typeof parent}' (${this.name}:${index})`);
-    }
-    return value;
+    const obj = remove(value, this.from, this.name, index);
+    return add(value, this.path, obj, this.name, index);
   }
   toObject() {
     return {
@@ -5036,28 +4923,7 @@ class OpCopy {
     if (sourceObj === UNDEFINED) {
       throw new JSONPatchError(`source object does not exist (${this.name}:${index})`);
     }
-    const [destParent] = this.path.resolveWithParent(value);
-    if (destParent === UNDEFINED) {
-      // copy source to root
-      return this.deepCopy(sourceObj);
-    }
-    const destTarget = this.path.tokens.at(-1);
-    if (destTarget === undefined) {
-      // this should not be possible
-      throw new JSONPatchError(`unexpected operation on 'undefined' (${this.name}:${index})`);
-    }
-    if (isArray(destParent)) {
-      if (destTarget === "-") {
-        destParent.push(this.deepCopy(sourceObj));
-      } else {
-        destParent.splice(Number(destTarget), 0, this.deepCopy(sourceObj));
-      }
-    } else if (isObject(destParent)) {
-      destParent[destTarget] = this.deepCopy(sourceObj);
-    } else {
-      throw new JSONPatchError(`unexpected operation on '${typeof destParent}' (${this.name}:${index})`);
-    }
-    return value;
+    return add(value, this.path, sourceObj, this.name, index);
   }
 
   // eslint-disable-next-line sonarjs/no-identical-functions
@@ -5098,6 +4964,72 @@ class OpTest {
   }
 }
 
+/**
+ * Add _value_ to _data_ at _path_.
+ *
+ * This is semantically the `add` operation, used by `OpAdd`, `OpMove` and
+ * `OpCopy`.
+ */
+function add(data, path, value, opLabel, opIndex) {
+  const [parent, obj] = path.resolveWithParent(data);
+  if (parent === UNDEFINED) {
+    // Replace the root object.
+    return value;
+  }
+  const target = path.tokens.at(-1);
+  if (target === undefined) {
+    throw new JSONPatchError(`unexpected operation on 'undefined' (${opLabel}:${opIndex})`);
+  }
+  if (isArray(parent)) {
+    if (obj === UNDEFINED) {
+      if (!(target === "-" || Number(target) === parent.length)) {
+        throw new JSONPatchError(`index out of range (${opLabel}:${opIndex})`);
+      }
+      parent.push(value);
+      return data;
+    }
+    parent.splice(Number(target), 0, value);
+    return data;
+  }
+  if (isObject(parent)) {
+    parent[target] = value;
+    return data;
+  }
+  throw new JSONPatchError(`unexpected operation on '${typeof parent}' (${opLabel}:${opIndex})`);
+}
+
+/**
+ * Remove the element at _path_ from _data_ and return the removed value.
+ *
+ * This is semantically the `remove` operation used by `OpRemove` and
+ * `OpMove`.
+ */
+function remove(data, path, opLabel, opIndex) {
+  const [parent, obj] = path.resolveWithParent(data);
+  if (parent === UNDEFINED) {
+    throw new JSONPatchError(`can't remove root (${opLabel}:${opIndex})`);
+  }
+  const target = path.tokens.at(-1);
+  if (target === undefined) {
+    throw new JSONPatchError(`unexpected operation on 'undefined' (${opLabel}:${opIndex})`);
+  }
+  if (isArray(parent)) {
+    if (obj === UNDEFINED) {
+      throw new JSONPatchError(`can't ${opLabel} nonexistent item (${opLabel}:${opIndex})`);
+    }
+    parent.splice(Number(target), 1);
+    return obj;
+  }
+  if (isObject(parent)) {
+    if (obj === UNDEFINED) {
+      throw new JSONPatchError(`can't ${opLabel} nonexistent property (${opLabel}:${opIndex})`);
+    }
+    delete parent[target];
+    return obj;
+  }
+  throw new JSONPatchError(`unexpected operation on '${typeof parent}' (${opLabel}:${opIndex})`);
+}
+
 /**
  *
  */
@@ -5298,6 +5230,6 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "2.3.0";
+const version = "2.3.2";
 
 export { DEFAULT_ENVIRONMENT, FunctionExpressionType, JSONPatch, JSONPatchError, JSONPatchTestFailure, JSONPathEnvironment, JSONPathError, JSONPathIndexError, JSONPathLexerError, JSONPathNode, JSONPathNodeList, JSONPathQuery, JSONPathRecursionLimitError, JSONPathSyntaxError, JSONPathTypeError, JSONPointer, Nothing, RelativeJSONPointer, Token, TokenKind, UNDEFINED, apply, compile, index as jsonpatch, index$1 as jsonpath, index$3 as jsonpointer, lazyQuery, query, resolve, version };