From c8b37f448f77448656222a5a5e279432857f7e9f Mon Sep 17 00:00:00 2001
From: Jason Ian Green <jasoniangreen@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:25:06 +0100
Subject: [PATCH] Revert fast-uri change (#2444)

* Revert "Replace `uri-js` with `fast-uri` (#2415)"

This reverts commit fa1b5d56711a038af9a5f059cb7d1203e65449f4.

* bump version to 8.16.0
---
 docs/options.md        | 2 +-
 lib/compile/index.ts   | 2 +-
 lib/compile/resolve.ts | 2 +-
 lib/runtime/uri.ts     | 2 +-
 lib/types/index.ts     | 2 +-
 package.json           | 8 ++++----
 spec/resolve.spec.ts   | 8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/options.md b/docs/options.md
index fdce7f571..6f74b02b3 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -344,7 +344,7 @@ Include human-readable messages in errors. `true` by default. `false` can be pas
 
 ### uriResolver
 
-By default `uriResolver` is undefined and relies on the embedded uriResolver [fast-uri](https://github.com/fastify/fast-uri). Pass an object that satisfies the interface [UriResolver](https://github.com/ajv-validator/ajv/blob/master/lib/types/index.ts) to be used in replacement. One alternative is [uri-js](https://github.com/garycourt/uri-js).
+By default `uriResolver` is undefined and relies on the embedded uriResolver [uri-js](https://github.com/garycourt/uri-js). Pass an object that satisfies the interface [UriResolver](https://github.com/ajv-validator/ajv/blob/master/lib/types/index.ts) to be used in replacement. One alternative is [fast-uri](https://github.com/fastify/fast-uri).
 
 ### code <Badge text="v7" />
 
diff --git a/lib/compile/index.ts b/lib/compile/index.ts
index 9ab38d533..3dac2699b 100644
--- a/lib/compile/index.ts
+++ b/lib/compile/index.ts
@@ -14,7 +14,7 @@ import N from "./names"
 import {LocalRefs, getFullPath, _getFullPath, inlineRef, normalizeId, resolveUrl} from "./resolve"
 import {schemaHasRulesButRef, unescapeFragment} from "./util"
 import {validateFunctionCode} from "./validate"
-import * as URI from "fast-uri"
+import * as URI from "uri-js"
 import {JSONType} from "./rules"
 
 export type SchemaRefs = {
diff --git a/lib/compile/resolve.ts b/lib/compile/resolve.ts
index 7bdd36d91..be283866c 100644
--- a/lib/compile/resolve.ts
+++ b/lib/compile/resolve.ts
@@ -1,6 +1,6 @@
 import type {AnySchema, AnySchemaObject, UriResolver} from "../types"
 import type Ajv from "../ajv"
-import type {URIComponents} from "fast-uri"
+import type {URIComponents} from "uri-js"
 import {eachItem} from "./util"
 import * as equal from "fast-deep-equal"
 import * as traverse from "json-schema-traverse"
diff --git a/lib/runtime/uri.ts b/lib/runtime/uri.ts
index 5450549cd..7dd35f9d1 100644
--- a/lib/runtime/uri.ts
+++ b/lib/runtime/uri.ts
@@ -1,4 +1,4 @@
-import * as uri from "fast-uri"
+import * as uri from "uri-js"
 
 type URI = typeof uri & {code: string}
 ;(uri as URI).code = 'require("ajv/dist/runtime/uri").default'
diff --git a/lib/types/index.ts b/lib/types/index.ts
index 2676a1df3..b5ef53eeb 100644
--- a/lib/types/index.ts
+++ b/lib/types/index.ts
@@ -1,4 +1,4 @@
-import * as URI from "fast-uri"
+import * as URI from "uri-js"
 import type {CodeGen, Code, Name, ScopeValueSets, ValueScopeName} from "../compile/codegen"
 import type {SchemaEnv, SchemaCxt, SchemaObjCxt} from "../compile"
 import type {JSONType} from "../compile/rules"
diff --git a/package.json b/package.json
index 4da6aed2c..ca56231a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ajv",
-  "version": "8.15.0",
+  "version": "8.16.0",
   "description": "Another JSON Schema Validator",
   "main": "dist/ajv.js",
   "types": "dist/ajv.d.ts",
@@ -59,9 +59,9 @@
   "runkitExampleFilename": ".runkit_example.js",
   "dependencies": {
     "fast-deep-equal": "^3.1.3",
-    "fast-uri": "^2.3.0",
     "json-schema-traverse": "^1.0.0",
-    "require-from-string": "^2.0.2"
+    "require-from-string": "^2.0.2",
+    "uri-js": "^4.4.1"
   },
   "devDependencies": {
     "@ajv-validator/config": "^0.5.0",
@@ -83,6 +83,7 @@
     "dayjs-plugin-utc": "^0.1.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
+    "fast-uri": "^2.3.0",
     "glob": "^10.3.10",
     "husky": "^9.0.11",
     "if-node-version": "^1.1.1",
@@ -103,7 +104,6 @@
     "rollup-plugin-terser": "^7.0.2",
     "ts-node": "^10.9.2",
     "tsify": "^5.0.4",
-    "uri-js": "^4.4.1",
     "typescript": "5.3.3"
   },
   "collective": {
diff --git a/spec/resolve.spec.ts b/spec/resolve.spec.ts
index a89cccaf7..2fe5b1041 100644
--- a/spec/resolve.spec.ts
+++ b/spec/resolve.spec.ts
@@ -4,17 +4,17 @@ import _Ajv from "./ajv"
 import type {AnyValidateFunction} from "../dist/types"
 import type MissingRefError from "../dist/compile/ref_error"
 import chai from "./chai"
-import * as uriJs from "uri-js"
+import * as fastUri from "fast-uri"
 const should = chai.should()
 
-const uriResolvers = [undefined, uriJs]
+const uriResolvers = [undefined, fastUri]
 
 uriResolvers.forEach((resolver) => {
   let describeTitle: string
   if (resolver !== undefined) {
-    describeTitle = "uri-js resolver"
-  } else {
     describeTitle = "fast-uri resolver"
+  } else {
+    describeTitle = "uri-js resolver"
   }
   describe(describeTitle, () => {
     describe("resolve", () => {