Merge remote-tracking branch 'upstream/master' into fix/nullish-resolved

Author: P0lip

.eslintrc.yml

@@ -1,16 +1,9 @@
 # ESLint config
 # http://eslint.org/docs/user-guide/configuring
-# https://jstools.dev/eslint-config-modular/
+# https://jstools.dev/eslint-config/
 
 root: true
-
-extends:
-  - "@jsdevtools/modular/best-practices"
-  - "@jsdevtools/modular/style"
-  - "@jsdevtools/modular/browser"
-  - "@jsdevtools/modular/node"
-  - "@jsdevtools/modular/es6"
-
-rules:
-  # This rule erroneously flags functions that use the `arguments` object
-  no-unused-vars: off
+extends: "@jsdevtools"
+env:
+  node: true
+  browser: true

.github/workflows/CI-CD.yaml

@@ -2,6 +2,7 @@
 # https://help.github.com/en/actions/automating-your-workflow-with-github-actions
 # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions
 # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/contexts-and-expression-syntax-for-github-actions
+# https://www.npmjs.com/package/@amanda-mitchell/semantic-release-npm-multiple
 
 name: CI-CD
 
@@ -30,6 +31,7 @@ jobs:
         node:
           - 10
           - 12
+          - 14
 
     steps:
       - name: Checkout source
@@ -53,7 +55,7 @@ jobs:
         run: npm run coverage:node
 
       - name: Send code coverage results to Coveralls
-        uses: coverallsapp/github-action@v1.0.1
+        uses: coverallsapp/github-action@v1.1.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel: true
@@ -94,7 +96,7 @@ jobs:
           cat coverage/*/lcov.info > ./coverage/lcov.info
 
       - name: Send code coverage results to Coveralls
-        uses: coverallsapp/github-action@v1.0.1
+        uses: coverallsapp/github-action@v1.1.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel: true
@@ -108,43 +110,34 @@ jobs:
       - browser_tests
     steps:
       - name: Let Coveralls know that all tests have finished
-        uses: coverallsapp/github-action@v1.0.1
+        uses: coverallsapp/github-action@v1.1.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
 
-  deploy:
-    name: Publish to NPM
-    if: github.ref == 'refs/heads/master'
+  release:
+    name: Release
+    # removed to test beta branch.
+    # if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     timeout-minutes: 10
     needs:
       - node_tests
       - browser_tests
-
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v2
-
-      - name: Install Node
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
 
       - name: Install dependencies
         run: npm ci
 
-      - name: Publish to NPM
-        uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-
-      - name: Prepare the non-scoped packaged
-        run: |
-          cp LICENSE *.md dist
-          VERSION=$(node -e "console.log(require('./package.json').version)")
-          sed -i "s/X.X.X/${VERSION}/g" dist/package.json
+      - name: Prepare Unscoped Package
+        run: npm run build --if-present
 
-      - name: Publish the non-scoped package to NPM
-        uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-          package: dist/package.json
+      - name: Publish to NPM
+        run: npx semantic-release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.vscode/tasks.json

@@ -1,3 +1,6 @@
+// VSCode Tasks
+// https://code.visualstudio.com/docs/editor/tasks
+
 // Available variables which can be used inside of strings.
 // ${workspaceRoot}: the root folder of the team
 // ${file}: the current opened file
@@ -7,23 +10,25 @@
 // ${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",
-      "problemMatcher": "$eslint-stylish",
-      "isBuildCommand": true
+      "type": "npm",
+      "script": "lint",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": "$tsc",
     },
     {
-      "taskName": "test",
-      "args": ["run", "mocha"],
-      "showOutput": "always",
-      "isTestCommand": true
-    }
+      "type": "npm",
+      "script": "test:node",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+    },
   ]
 }

README.md

@@ -2,7 +2,7 @@ JSON Schema $Ref Parser
 ============================
 #### Parse, Resolve, and Dereference JSON Schema $ref pointers
 
-[![Build Status](https://github.com/APIDevTools/json-schema-ref-parser/workflows/CI-CD/badge.svg?branch=master)](https://github.com/APIDevTools/json-schema-ref-parser/blob/master/.github/workflows/CI-CD.yaml)
+[![Build Status](https://github.com/APIDevTools/json-schema-ref-parser/workflows/CI-CD/badge.svg?branch=master)](https://github.com/APIDevTools/json-schema-ref-parser/actions)
 [![Coverage Status](https://coveralls.io/repos/github/APIDevTools/json-schema-ref-parser/badge.svg?branch=master)](https://coveralls.io/github/APIDevTools/json-schema-ref-parser)
 
 [![npm](https://img.shields.io/npm/v/@apidevtools/json-schema-ref-parser.svg)](https://www.npmjs.com/package/@apidevtools/json-schema-ref-parser)
@@ -11,7 +11,7 @@ JSON Schema $Ref Parser
 [![Buy us a tree](https://img.shields.io/badge/Treeware-%F0%9F%8C%B3-lightgreen)](https://plant.treeware.earth/APIDevTools/json-schema-ref-parser)
 
 
-[![OS and Browser Compatibility](https://apitools.dev/img/badges/ci-badges-with-ie.svg)](https://github.com/APIDevTools/json-schema-ref-parser/blob/master/.github/workflows/CI-CD.yaml)
+[![OS and Browser Compatibility](https://apitools.dev/img/badges/ci-badges-with-ie.svg)](https://github.com/APIDevTools/json-schema-ref-parser/actions)
 
 
 The Problem:
@@ -52,7 +52,7 @@ JSON Schema $Ref Parser is a full [JSON Reference](https://tools.ietf.org/html/d
 - Can [dereference](https://apitools.dev/json-schema-ref-parser/docs/ref-parser.html#dereferencepath-options-callback) your schema, producing a plain-old JavaScript object that's easy to work with
 - Supports [circular references](https://apitools.dev/json-schema-ref-parser/docs/#circular-refs), nested references, back-references, and cross-references between files
 - Maintains object reference equality — `$ref` pointers to the same value always resolve to the same object instance
-- Tested in Node and all major web browsers on Windows, Mac, and Linux
+- Tested in Node v10, v12, & v14, and all major web browsers on Windows, Mac, and Linux
 
 
 Example
@@ -129,7 +129,7 @@ Full API documentation is available [right here](https://apitools.dev/json-schem
 
 Contributing
 --------------------------
-I welcome any contributions, enhancements, and bug-fixes.  [File an issue](https://github.com/APIDevTools/json-schema-ref-parser/issues) on GitHub and [submit a pull request](https://github.com/APIDevTools/json-schema-ref-parser/pulls).
+I welcome any contributions, enhancements, and bug-fixes.  [Open an issue](https://github.com/APIDevTools/json-schema-ref-parser/issues) on GitHub and [submit a pull request](https://github.com/APIDevTools/json-schema-ref-parser/pulls).
 
 #### Building/Testing
 To build/test the project locally on your computer:
@@ -157,6 +157,6 @@ Big Thanks To
 --------------------------
 Thanks to these awesome companies for their support of Open Source developers ❤
 
-[![Travis CI](https://jstools.dev/img/badges/travis-ci.svg)](https://travis-ci.com)
+[![Stoplight](https://svgshare.com/i/TK5.svg)](https://stoplight.io/?utm_source=github&utm_medium=readme&utm_campaign=json_schema_ref_parser)
 [![SauceLabs](https://jstools.dev/img/badges/sauce-labs.svg)](https://saucelabs.com)
 [![Coveralls](https://jstools.dev/img/badges/coveralls.svg)](https://coveralls.io)

docs/options.md

@@ -10,6 +10,7 @@ Example
 
 ```javascript
 $RefParser.dereference("my-schema.yaml", {
+  continueOnError: true,            // Don't throw on the first error
   parse: {
     json: false,                    // Disable the JSON parser
     yaml: {
@@ -27,7 +28,6 @@ $RefParser.dereference("my-schema.yaml", {
       withCredentials: true,        // Include auth credentials when resolving HTTP references
     }
   },
-  continueOnError: true,            // Don't throw on the first error
   dereference: {
     circular: false                 // Don't allow circular $refs
   }

karma.conf.js

@@ -13,8 +13,8 @@ module.exports = karmaConfig({
   browsers: {
     chrome: host.ci ? host.os.linux : true,
     firefox: host.ci ? host.os.linux : true,
-    safari: host.ci ? host.os.linux : host.os.mac,
-    edge: host.ci ? host.os.linux : host.os.windows,
-    ie: host.os.windows,
+    safari: host.ci ? host.os.linux : host.os.mac,    // SauceLabs in CI
+    edge: host.ci ? host.os.linux : host.os.windows,  // SauceLabs in CI
+    ie: host.ci ? host.os.windows : false,  // IE needs to run by itself, due to Babel transforms
   },
 });

lib/bundle.js

@@ -39,7 +39,7 @@ function bundle (parser, options) {
 function crawl (parent, key, path, pathFromRoot, indirections, inventory, $refs, options) {
   let obj = key === null ? parent : parent[key];
 
-  if (obj && typeof obj === "object") {
+  if (obj && typeof obj === "object" && !ArrayBuffer.isView(obj)) {
     if ($Ref.isAllowed$Ref(obj)) {
       inventory$Ref(parent, key, path, pathFromRoot, indirections, inventory, $refs, options);
     }
@@ -135,7 +135,9 @@ function inventory$Ref ($refParent, $refKey, path, pathFromRoot, indirections, i
   });
 
   // Recursively crawl the resolved value
-  crawl(pointer.value, null, pointer.path, pathFromRoot, indirections + 1, inventory, $refs, options);
+  if (!existingEntry) {
+    crawl(pointer.value, null, pointer.path, pathFromRoot, indirections + 1, inventory, $refs, options);
+  }
 }
 
 /**