fix constructor param order (thanks Daniel!); revert experimental changes

Author: EdVinyard

.vscode/tasks.json

@@ -7,23 +7,34 @@
 // ${cwd}: the current working directory of the spawned process
 
 {
- "version": "0.1.0",
+ "version": "2.0.0",
  "command": "npm",
- "isShellCommand": true,
- "suppressTaskName": true,
  "tasks": [
  {
- "taskName": "lint",
- "args": ["run", "lint"],
- "showOutput": "always",
+ "label": "lint",
+ "type": "shell",
+ "args": [
+ "run",
+ "lint"
+ ],
  "problemMatcher": "$eslint-stylish",
- "isBuildCommand": true
+ "group": {
+ "_id": "build",
+ "isDefault": false
+ }
  },
  {
- "taskName": "test",
- "args": ["run", "mocha"],
- "showOutput": "always",
- "isTestCommand": true
+ "label": "test",
+ "type": "shell",
+ "args": [
+ "run",
+ "mocha"
+ ],
+ "problemMatcher": [],
+ "group": {
+ "_id": "test",
+ "isDefault": false
+ }
  }
  ]
 }

lib/index.d.ts

@@ -490,7 +490,7 @@ declare namespace $RefParser {
  public readonly code ="EUNMATCHEDRESOLVER";
  }
  export class MissingPointerError extends JSONParserError {
- public constructor(token: string | number, source: string);
+ public constructor(token: string | number, source: string, unresolvableRefValue?: string, pathToUnresolvableRef?: string);
 
  public readonly name = "MissingPointerError";
  public readonly code ="EMISSINGPOINTER";

lib/pointer.js

@@ -97,7 +97,7 @@ Pointer.prototype.resolve = function (obj, options, pathFromRoot) {
  let token = tokens[i];
  if (this.value[token] === undefined || this.value[token] === null) {
  this.value = null;
- throw new MissingPointerError(this.path, pathFromRoot, token, this.originalPath);
+ throw new MissingPointerError(token, this.originalPath, this.path, pathFromRoot);
  }
  else {
  this.value = this.value[token];

lib/util/errors.js

@@ -93,7 +93,7 @@ const UnmatchedResolverError = exports.UnmatchedResolverError = class UnmatchedR
 setErrorName(UnmatchedResolverError);
 
 const MissingPointerError = exports.MissingPointerError = class MissingPointerError extends JSONParserError {
- constructor (unresolvableRefValue, pathToUnresolvableRef, unresolvableTokenInRef, path) {
+ constructor (unresolvableTokenInRef, path, unresolvableRefValue, pathToUnresolvableRef) {
  super(`at "${getHash(pathToUnresolvableRef)}", token "${unresolvableTokenInRef}" in "${getHash(unresolvableRefValue)}" does not exist`, stripHash(path));
 
  this.code = "EMISSINGPOINTER";

test/specs/usage/usage.spec.js

@@ -67,12 +67,9 @@ describe("Usage", () => {
  }
  });
 
- expect(parser.$refs.propertyMap["#/properties/bar"]).to.equal(path.abs("/") + "#/properties/foo");
- expect(parser.$refs.propertyMap["#/properties/baz"]).to.equal(path.abs("/") + "#/properties/foo/properties/id");
- // const expected = {
- // "#/properties/bar": path.abs("/") + "#/properties/foo",
- // "#/properties/baz": path.abs("/") + "#/properties/foo/properties/id"
- // };
- // expect(parser.$refs.propertyMap).to.deep.equal(expected);
+ expect(parser.$refs.propertyMap).to.deep.equal({
+ "#/properties/bar": path.abs("/") + "#/properties/foo",
+ "#/properties/baz": path.abs("/") + "#/properties/foo/properties/id"
+ });
  });
 });