@swagger-api/apidom-json-pointer 1.0.0-beta.32 → 1.0.0-beta.33

package/src/escape.cjs

@@ -2,9 +2,11 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _ramda = require("ramda");
+var _jsonPointer = require("@swaggerexpert/json-pointer");
 /**
  * @public
  */
-const escape = (0, _ramda.pipe)((0, _ramda.replace)(/~/g, '~0'), (0, _ramda.replace)(/\//g, '~1'), encodeURIComponent);
+const escape = referenceToken => {
+  return _jsonPointer.URIFragmentIdentifier.to((0, _jsonPointer.escape)(referenceToken)).slice(1);
+};
 var _default = exports.default = escape;

package/src/escape.mjs

@@ -1,7 +1,9 @@
-import { pipe, replace } from 'ramda';
+import { escape as baseEscape, URIFragmentIdentifier } from '@swaggerexpert/json-pointer';
 
 /**
  * @public
  */
-const escape = pipe(replace(/~/g, '~0'), replace(/\//g, '~1'), encodeURIComponent);
+const escape = referenceToken => {
+  return URIFragmentIdentifier.to(baseEscape(referenceToken)).slice(1);
+};
 export default escape;

package/src/evaluate.cjs

@@ -3,60 +3,33 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _ramdaAdjunct = require("ramda-adjunct");
+var _jsonPointer = require("@swaggerexpert/json-pointer");
+var _apidom = require("@swaggerexpert/json-pointer/evaluate/realms/apidom");
 var _apidomCore = require("@swagger-api/apidom-core");
-var _parse = _interopRequireDefault(require("./parse.cjs"));
 var _EvaluationJsonPointerError = _interopRequireDefault(require("./errors/EvaluationJsonPointerError.cjs"));
 /**
  * Evaluates JSON Pointer against ApiDOM fragment.
  * @public
  */
 const evaluate = (pointer, element) => {
-  let tokens;
   try {
-    tokens = (0, _parse.default)(pointer);
+    return (0, _apidom.evaluate)(element, _jsonPointer.URIFragmentIdentifier.from(pointer));
   } catch (error) {
-    throw new _EvaluationJsonPointerError.default(`JSON Pointer evaluation failed while parsing the pointer "${pointer}".`, {
+    if (error instanceof _jsonPointer.JSONPointerEvaluateError) {
+      throw new _EvaluationJsonPointerError.default(error.message, {
+        pointer,
+        tokens: error.referenceTokens,
+        failedToken: error.referenceToken,
+        failedTokenPosition: error.referenceTokenPosition,
+        element: (0, _apidomCore.cloneDeep)(element),
+        cause: error
+      });
+    }
+    throw new _EvaluationJsonPointerError.default(error.message, {
       pointer,
       element: (0, _apidomCore.cloneDeep)(element),
       cause: error
     });
   }
-  return tokens.reduce((acc, token, tokenPosition) => {
-    if ((0, _apidomCore.isObjectElement)(acc)) {
-      // @ts-ignore
-      if (!acc.hasKey(token)) {
-        throw new _EvaluationJsonPointerError.default(`JSON Pointer evaluation failed while evaluating token "${token}" against an ObjectElement`, {
-          pointer,
-          tokens,
-          failedToken: token,
-          failedTokenPosition: tokenPosition,
-          element: (0, _apidomCore.cloneDeep)(acc)
-        });
-      }
-      // @ts-ignore
-      return acc.get(token);
-    }
-    if ((0, _apidomCore.isArrayElement)(acc)) {
-      if (!(token in acc.content) || !(0, _ramdaAdjunct.isInteger)(Number(token))) {
-        throw new _EvaluationJsonPointerError.default(`JSON Pointer evaluation failed while evaluating token "${token}" against an ArrayElement`, {
-          pointer,
-          tokens,
-          failedToken: token,
-          failedTokenPosition: tokenPosition,
-          element: (0, _apidomCore.cloneDeep)(acc)
-        });
-      }
-      // @ts-ignore
-      return acc.get(Number(token));
-    }
-    throw new _EvaluationJsonPointerError.default(`JSON Pointer evaluation failed while evaluating token "${token}" against an unexpected Element`, {
-      pointer,
-      tokens,
-      failedToken: token,
-      failedTokenPosition: tokenPosition,
-      element: (0, _apidomCore.cloneDeep)(acc)
-    });
-  }, element);
 };
 var _default = exports.default = evaluate;

package/src/evaluate.mjs

@@ -1,57 +1,30 @@
-import { isInteger } from 'ramda-adjunct';
-import { isObjectElement, isArrayElement, cloneDeep } from '@swagger-api/apidom-core';
-import parse from "./parse.mjs";
+import { JSONPointerEvaluateError, URIFragmentIdentifier } from '@swaggerexpert/json-pointer';
+import { evaluate as baseEvaluate } from '@swaggerexpert/json-pointer/evaluate/realms/apidom';
+import { cloneDeep } from '@swagger-api/apidom-core';
 import EvaluationJsonPointerError from "./errors/EvaluationJsonPointerError.mjs";
 /**
  * Evaluates JSON Pointer against ApiDOM fragment.
  * @public
  */
 const evaluate = (pointer, element) => {
-  let tokens;
   try {
-    tokens = parse(pointer);
+    return baseEvaluate(element, URIFragmentIdentifier.from(pointer));
   } catch (error) {
-    throw new EvaluationJsonPointerError(`JSON Pointer evaluation failed while parsing the pointer "${pointer}".`, {
+    if (error instanceof JSONPointerEvaluateError) {
+      throw new EvaluationJsonPointerError(error.message, {
+        pointer,
+        tokens: error.referenceTokens,
+        failedToken: error.referenceToken,
+        failedTokenPosition: error.referenceTokenPosition,
+        element: cloneDeep(element),
+        cause: error
+      });
+    }
+    throw new EvaluationJsonPointerError(error.message, {
       pointer,
       element: cloneDeep(element),
       cause: error
     });
   }
-  return tokens.reduce((acc, token, tokenPosition) => {
-    if (isObjectElement(acc)) {
-      // @ts-ignore
-      if (!acc.hasKey(token)) {
-        throw new EvaluationJsonPointerError(`JSON Pointer evaluation failed while evaluating token "${token}" against an ObjectElement`, {
-          pointer,
-          tokens,
-          failedToken: token,
-          failedTokenPosition: tokenPosition,
-          element: cloneDeep(acc)
-        });
-      }
-      // @ts-ignore
-      return acc.get(token);
-    }
-    if (isArrayElement(acc)) {
-      if (!(token in acc.content) || !isInteger(Number(token))) {
-        throw new EvaluationJsonPointerError(`JSON Pointer evaluation failed while evaluating token "${token}" against an ArrayElement`, {
-          pointer,
-          tokens,
-          failedToken: token,
-          failedTokenPosition: tokenPosition,
-          element: cloneDeep(acc)
-        });
-      }
-      // @ts-ignore
-      return acc.get(Number(token));
-    }
-    throw new EvaluationJsonPointerError(`JSON Pointer evaluation failed while evaluating token "${token}" against an unexpected Element`, {
-      pointer,
-      tokens,
-      failedToken: token,
-      failedTokenPosition: tokenPosition,
-      element: cloneDeep(acc)
-    });
-  }, element);
 };
 export default evaluate;

package/src/index.cjs

@@ -12,14 +12,14 @@ var _CompilationJsonPointerError = _interopRequireDefault(require("./errors/Comp
 exports.CompilationJsonPointerError = _CompilationJsonPointerError.default;
 var _EvaluationJsonPointerError = _interopRequireDefault(require("./errors/EvaluationJsonPointerError.cjs"));
 exports.EvaluationJsonPointerError = _EvaluationJsonPointerError.default;
+var _parse = _interopRequireWildcard(require("./parse.cjs"));
+exports.parse = _parse.default;
+exports.uriToPointer = _parse.uriToPointer;
+var _evaluate = _interopRequireDefault(require("./evaluate.cjs"));
+exports.evaluate = _evaluate.default;
 var _escape = _interopRequireDefault(require("./escape.cjs"));
 exports.escape = _escape.default;
 var _unescape = _interopRequireDefault(require("./unescape.cjs"));
 exports.unescape = _unescape.default;
-var _parse = _interopRequireWildcard(require("./parse.cjs"));
-exports.parse = _parse.default;
-exports.uriToPointer = _parse.uriToPointer;
 var _compile = _interopRequireDefault(require("./compile.cjs"));
-exports.compile = _compile.default;
-var _evaluate = _interopRequireDefault(require("./evaluate.cjs"));
-exports.evaluate = _evaluate.default;
+exports.compile = _compile.default;

package/src/index.mjs

@@ -2,8 +2,8 @@ export { default as JsonPointerError } from "./errors/JsonPointerError.mjs";
 export { default as InvalidJsonPointerError } from "./errors/InvalidJsonPointerError.mjs";
 export { default as CompilationJsonPointerError } from "./errors/CompilationJsonPointerError.mjs";
 export { default as EvaluationJsonPointerError } from "./errors/EvaluationJsonPointerError.mjs";
+export { default as parse, uriToPointer } from "./parse.mjs";
+export { default as evaluate } from "./evaluate.mjs";
 export { default as escape } from "./escape.mjs";
 export { default as unescape } from "./unescape.mjs";
-export { default as parse, uriToPointer } from "./parse.mjs";
-export { default as compile } from "./compile.mjs";
-export { default as evaluate } from "./evaluate.mjs";
+export { default as compile } from "./compile.mjs";

package/src/parse.cjs

@@ -1,33 +1,16 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.uriToPointer = exports.default = void 0;
-var _ramda = require("ramda");
-var _ramdaAdjunct = require("ramda-adjunct");
-var _unescape = _interopRequireDefault(require("./unescape.cjs"));
-var _InvalidJsonPointerError = _interopRequireDefault(require("./errors/InvalidJsonPointerError.cjs"));
+var _jsonPointer = require("@swaggerexpert/json-pointer");
 /**
  * @public
  */
-const parse = pointer => {
-  if ((0, _ramdaAdjunct.isEmptyString)(pointer)) {
-    return [];
-  }
-  if (!(0, _ramda.startsWith)('/', pointer)) {
-    throw new _InvalidJsonPointerError.default(`Invalid JSON Pointer "${pointer}". JSON Pointers must begin with "/"`, {
-      pointer
-    });
-  }
-  try {
-    const tokens = (0, _ramda.pipe)((0, _ramda.split)('/'), (0, _ramda.map)(_unescape.default))(pointer);
-    return (0, _ramda.tail)(tokens);
-  } catch (error) {
-    throw new _InvalidJsonPointerError.default(`JSON Pointer parsing of "${pointer}" encountered an error.`, {
-      pointer,
-      cause: error
-    });
-  }
+const parse = (pointer, options) => {
+  const {
+    tree
+  } = (0, _jsonPointer.parse)(_jsonPointer.URIFragmentIdentifier.from(pointer), options);
+  return tree;
 };
 
 /**
@@ -47,7 +30,7 @@ const getHash = uri => {
  */
 const uriToPointer = uri => {
   const hash = getHash(uri);
-  return (0, _ramdaAdjunct.trimCharsStart)('#', hash);
+  return _jsonPointer.URIFragmentIdentifier.from(hash);
 };
 exports.uriToPointer = uriToPointer;
 var _default = exports.default = parse;

package/src/parse.mjs

@@ -1,28 +1,13 @@
-import { map, pipe, split, startsWith, tail } from 'ramda';
-import { isEmptyString, trimCharsStart } from 'ramda-adjunct';
-import unescape from "./unescape.mjs";
-import InvalidJsonPointerError from "./errors/InvalidJsonPointerError.mjs";
+import { parse as jsonPointerParse, URIFragmentIdentifier } from '@swaggerexpert/json-pointer';
+
 /**
  * @public
  */
-const parse = pointer => {
-  if (isEmptyString(pointer)) {
-    return [];
-  }
-  if (!startsWith('/', pointer)) {
-    throw new InvalidJsonPointerError(`Invalid JSON Pointer "${pointer}". JSON Pointers must begin with "/"`, {
-      pointer
-    });
-  }
-  try {
-    const tokens = pipe(split('/'), map(unescape))(pointer);
-    return tail(tokens);
-  } catch (error) {
-    throw new InvalidJsonPointerError(`JSON Pointer parsing of "${pointer}" encountered an error.`, {
-      pointer,
-      cause: error
-    });
-  }
+const parse = (pointer, options) => {
+  const {
+    tree
+  } = jsonPointerParse(URIFragmentIdentifier.from(pointer), options);
+  return tree;
 };
 
 /**
@@ -42,6 +27,6 @@ const getHash = uri => {
  */
 export const uriToPointer = uri => {
   const hash = getHash(uri);
-  return trimCharsStart('#', hash);
+  return URIFragmentIdentifier.from(hash);
 };
 export default parse;

package/src/unescape.cjs

@@ -2,23 +2,11 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _ramda = require("ramda");
-/**
- * decodeURIComponent can throw URIError in certain cases like 'c%d'.
- * safeDecodeURIComponent is a safe variant of decodeURIComponent that never trows.
- *
- * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Malformed_URI|More info about URIError}
- */
-const safeDecodeURIComponent = encodedURIComponent => {
-  try {
-    return decodeURIComponent(encodedURIComponent);
-  } catch {
-    return encodedURIComponent;
-  }
-};
-
+var _jsonPointer = require("@swaggerexpert/json-pointer");
 /**
  * @public
  */
-const unescape = (0, _ramda.pipe)((0, _ramda.replace)(/~1/g, '/'), (0, _ramda.replace)(/~0/g, '~'), safeDecodeURIComponent);
+const unescape = referenceToken => {
+  return _jsonPointer.URIFragmentIdentifier.from((0, _jsonPointer.unescape)(referenceToken));
+};
 var _default = exports.default = unescape;

package/src/unescape.mjs

@@ -1,21 +1,9 @@
-import { pipe, replace } from 'ramda';
-
-/**
- * decodeURIComponent can throw URIError in certain cases like 'c%d'.
- * safeDecodeURIComponent is a safe variant of decodeURIComponent that never trows.
- *
- * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Malformed_URI|More info about URIError}
- */
-const safeDecodeURIComponent = encodedURIComponent => {
-  try {
-    return decodeURIComponent(encodedURIComponent);
-  } catch {
-    return encodedURIComponent;
-  }
-};
+import { unescape as baseUnescape, URIFragmentIdentifier } from '@swaggerexpert/json-pointer';
 
 /**
  * @public
  */
-const unescape = pipe(replace(/~1/g, '/'), replace(/~0/g, '~'), safeDecodeURIComponent);
+const unescape = referenceToken => {
+  return URIFragmentIdentifier.from(baseUnescape(referenceToken));
+};
 export default unescape;

package/types/apidom-json-pointer.d.ts

@@ -1,6 +1,7 @@
 import { ApiDOMErrorOptions } from '@swagger-api/apidom-error';
 import { ApiDOMStructuredError } from '@swagger-api/apidom-error';
 import { Element as Element_2 } from '@swagger-api/apidom-core';
+import { ParseOptions } from '@swaggerexpert/json-pointer';
 
 /**
  * @public
@@ -25,7 +26,7 @@ export declare const compile: (tokens: string[]) => string;
 /**
  * @public
  */
-declare const escape_2: (str: string) => string;
+declare const escape_2: (referenceToken: string) => string;
 export { escape_2 as escape }
 
 /**
@@ -81,12 +82,12 @@ export declare class JsonPointerError extends ApiDOMStructuredError {
 /**
  * @public
  */
-export declare const parse: (pointer: string) => string[];
+export declare const parse: (pointer: string, options?: ParseOptions) => string[];
 
 /**
  * @public
  */
-declare const unescape_2: (str: string) => string;
+declare const unescape_2: (referenceToken: string) => string;
 export { unescape_2 as unescape }
 
 /**