@nice-digital/search-client 0.2.1387-async-performance-te → 0.2.1392-async-first-commit

package/es/demo.js

@@ -1,40 +1,29 @@
-import { initialise, search } from ".";
+import { initialise, getSearchUrl, typeAhead } from ".";
 initialise({
     baseURL: "https://dev-search-api.nice.org.uk/api",
     index: "nice",
-    usePrettyUrls: true,
 });
-// console.log(getSearchUrl("/guidance/published?q=test"));
-// console.log(
-//   getSearchUrl(
-//     "/guidance/published?q=test?+hello&om=%5B%7B%22ndt%22%3A%5B%22Guidance%22%5D%7D%5D"
-//   )
-// );
-// typeAhead("para").then((typeAheadSuggestions) => {
-//   console.log({ typeAheadSuggestions });
-// });
+console.log(getSearchUrl("/guidance/published?q=test"));
+console.log(getSearchUrl("/guidance/published?q=test?+hello&om=%5B%7B%22ndt%22%3A%5B%22Guidance%22%5D%7D%5D"));
+typeAhead("para").then(function (typeAheadSuggestions) {
+    console.log({ typeAheadSuggestions: typeAheadSuggestions });
+});
 // console.log(
 //   getUrlPathAndQuery({
 //     route: "/guidance/published",
 //     om: `[{"ndt":["Guidance"]}]`,
 //   })
 // );
-try {
-    // {
-    //   route: "/search",
-    //   ndt: "Guidance",
-    //   //om: '[{"ndt":["Guidance"]}]',
-    // }
-    search("/search?ndt=Guidance&ndt=NICE%20advice").then(function (data) {
-        if (data.failed)
-            console.log({ failed: true, err: data.errorMessage });
-        else
-            console.log("Success! " + data.resultCount + " results found");
-    });
-}
-catch (e) {
-    console.error(e);
-}
+// try {
+//   search({
+//     route: "/search",
+//     om: '[{"ndt":["Guidance"]}]',
+//   }).then((data) => {
+//     console.log({ failed: data.failed, err: data.errorMessage });
+//   });
+// } catch (e) {
+//   console.error(e);
+// }
 // try {
 //     search("/search?om=[{\"ndt\":[\"Guidance\"]}]").then((data) => {
 //         console.log({ failed: data.failed });

package/es/demo.js.map

@@ -1 +1 @@
-{"version":3,"file":"demo.js","sourceRoot":"","sources":["../src/demo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAA2B,MAAM,GAAG,CAAC;AAEhE,UAAU,CAAC;IACT,OAAO,EAAE,wCAAwC;IACjD,KAAK,EAAE,MAAM;IACb,aAAa,EAAE,IAAI;CACpB,CAAC,CAAC;AAEH,2DAA2D;AAE3D,eAAe;AACf,kBAAkB;AAClB,0FAA0F;AAC1F,MAAM;AACN,KAAK;AAEL,qDAAqD;AACrD,2CAA2C;AAC3C,MAAM;AAEN,eAAe;AACf,yBAAyB;AACzB,oCAAoC;AACpC,oCAAoC;AACpC,OAAO;AACP,KAAK;AAEL,IAAI;IAEF,IAAI;IACJ,sBAAsB;IACtB,qBAAqB;IACrB,oCAAoC;IACpC,IAAI;IAEJ,MAAM,CAAC,wCAAwC,CAAC,CAAC,IAAI,CAAC,UAAC,IAAI;QACzD,IAAG,IAAI,CAAC,MAAM;YACZ,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;;YAEtD,OAAO,CAAC,GAAG,CAAC,cAAa,IAAI,CAAC,WAAW,mBAAiB,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;CACJ;AAAC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CAClB;AAED,QAAQ;AACR,uEAAuE;AACvE,gDAAgD;AAChD,SAAS;AACT,IAAI;AACJ,aAAa;AACb,wBAAwB;AACxB,IAAI"}
+{"version":3,"file":"demo.js","sourceRoot":"","sources":["../src/demo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAU,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAEhE,UAAU,CAAC;IACT,OAAO,EAAE,wCAAwC;IACjD,KAAK,EAAE,MAAM;CACd,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC,CAAC;AAExD,OAAO,CAAC,GAAG,CACT,YAAY,CACV,mFAAmF,CACpF,CACF,CAAC;AAEF,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAC,oBAAoB;IAC1C,OAAO,CAAC,GAAG,CAAC,EAAE,oBAAoB,sBAAA,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC;AAEH,eAAe;AACf,yBAAyB;AACzB,oCAAoC;AACpC,oCAAoC;AACpC,OAAO;AACP,KAAK;AAEL,QAAQ;AACR,aAAa;AACb,wBAAwB;AACxB,oCAAoC;AACpC,wBAAwB;AACxB,oEAAoE;AACpE,QAAQ;AACR,gBAAgB;AAChB,sBAAsB;AACtB,IAAI;AAEJ,QAAQ;AACR,uEAAuE;AACvE,gDAAgD;AAChD,SAAS;AACT,IAAI;AACJ,aAAa;AACb,wBAAwB;AACxB,IAAI"}

package/es/index.js

@@ -5,10 +5,8 @@ import applyCaseMiddleware from "axios-case-converter";
 import { EndPointUrl } from "./EndPointUrl";
 import { getSearchUrl, getUrlPathAndQuery } from "./url-utils";
 import qs from "qs";
-import { applyPrettyUrlMiddleware } from "./pretty-url-middleware";
 export * from "./models/Document";
 export * from "./models/Navigator";
-export * from "./models/OrModifiers";
 export * from "./models/PagerLinks";
 export * from "./models/SearchCorrection";
 export * from "./models/SearchResults";
@@ -21,7 +19,7 @@ export * from "./utils";
 /** The default timeout, in milliseconds, if unspecified in `initialise` */
 export var defaultTimeout = 5000;
 var isDevelopment = process.env.NODE_ENV === "development";
-var client;
+export var client;
 /**
  * Ensures that `initialise` has been called before search methods like `search`.
  *
@@ -32,7 +30,7 @@ var ensureInitialised = function () {
         throw new Error("Please call initialise before calling search methods");
 };
 export var initialise = function (_a) {
-    var baseURL = _a.baseURL, index = _a.index, _b = _a.timeout, timeout = _b === void 0 ? defaultTimeout : _b, _c = _a.usePrettyUrls, usePrettyUrls = _c === void 0 ? false : _c;
+    var baseURL = _a.baseURL, index = _a.index, _b = _a.timeout, timeout = _b === void 0 ? defaultTimeout : _b;
     // Lowercase all property names because that's more Javascripty and we receive capitalised properties from the server
     client = applyCaseMiddleware(axios.create({
         baseURL: baseURL,
@@ -51,9 +49,6 @@ export var initialise = function (_a) {
             })
             : undefined,
     }));
-    if (usePrettyUrls)
-        client = applyPrettyUrlMiddleware(client);
-    return client;
 };
 /**
  * Performs a search against the Single Search Endpoint from the given search url.

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/es/url-utils.js

@@ -1,6 +1,5 @@
 import { __assign } from "tslib";
 import qs from "qs";
-import { knownOrModifierKeys } from "./models/OrModifiers";
 /**
  * Gets the path and query from the given search url object.
  *
@@ -15,9 +14,7 @@ export var getUrlPathAndQuery = function (searchUrl) {
     return (searchUrl.route +
         qs.stringify(searchUrl, {
             addQueryPrefix: true,
-            filter: function (prefix, value) {
-                return prefix === "route" || prefix === "fullUrl" ? undefined : value;
-            },
+            filter: function (prefix, value) { return (prefix === "route" || prefix === "fullUrl" ? undefined : value); },
         }));
 };
 /**
@@ -27,103 +24,11 @@ export var getUrlPathAndQuery = function (searchUrl) {
  *  getSearchUrl("/search?q=test")
  *  returns { route: "/search", q: "test" }
  *
- * @param fullSearchUrl The relative url including path and query
+ * @param urlStr The relative url including path and query
  * @returns Search url object
  */
-export var getSearchUrl = function (fullSearchUrl) {
-    var path = fullSearchUrl.split("?")[0], query = fullSearchUrl.split("?")[1] || "", params = qs.parse(query, { ignoreQueryPrefix: true });
-    return __assign({ route: path, fullUrl: fullSearchUrl }, params);
-};
-/**
- * Parses a JSON-formatted 'om' query param into a set of key value pairs
- *
- * @param omJsonQueryString A JSON formatted om query e.g. [{"ndt":["Guidance"]}]
- * @returns A set of key value pairs of or modifiers
- */
-export var getPrettyOrModifierParams = function (omJsonQueryString) {
-    return JSON.parse(decodeURIComponent(omJsonQueryString)).map(function (om) {
-        // Lots of array access here because om is an array objects where the value is itself an array
-        var entry = Object.entries(om)[0], key = entry[0], value = entry[1][0];
-        return { key: key, value: value };
-    });
-};
-/**
- * Turns a search URL with JSON-formatted 'or modifiers' into a 'pretty' url.
- *
- * A pretty url having keys e.g. ndt=Guidance&ndt=Advice rather than JSON
- *
- * @param searchUrl The raw search url, with JSON-formatted 'or modifiers' (om)
- * @returns A flattened pretty URL
- */
-export var getPrettyUrl = function (searchUrl) {
-    var omQueryRegex = /([?&])om=([^&]+)/i, omMatch = searchUrl.match(omQueryRegex), omJsonQueryString = omMatch && omMatch[2];
-    // Or modifiers is the only param that comes through as JSON so all the others we can leave alone
-    if (!omJsonQueryString)
-        return searchUrl;
-    var flattenedOrModifiers = getPrettyOrModifierParams(omJsonQueryString)
-        .map(function (_a) {
-        var key = _a.key, value = _a.value;
-        return key + "=" + encodeURIComponent(value);
-    })
-        .join("&");
-    return searchUrl.replace(omQueryRegex, "$1" + flattenedOrModifiers);
-};
-/**
- * Converts individual or modifier params into a JSON formatted om query param
- *
- * @param params
- * @returns
- */
-export var getParamsWithUglyJSONOrModifier = function (params) {
-    // Find the querystring params we need need to turn into the ugly om JSON
-    var omJSONParam = Object.entries(params)
-        .filter(function (om) { return knownOrModifierKeys.includes(om[0]); })
-        // And convert them into a key values pairs
-        .map(function (om) {
-        var _a;
-        var key = om[0], value = om[1];
-        if (Array.isArray(value))
-            return value.map(function (val) {
-                var _a;
-                return (_a = {}, _a[key] = [val], _a);
-            });
-        return _a = {}, _a[key] = [value], _a;
-    })
-        .reduce(function (prev, curr) {
-        return prev.concat(curr);
-    }, []);
-    // Remove individual or modifier queries now we have a single JSON om
-    knownOrModifierKeys.forEach(function (modifier) {
-        delete params[modifier];
-    });
-    params.om = JSON.stringify(omJSONParam);
-    return params;
-};
-/**
- * Converts a search url with pretty 'or modifiers' into a URL with an ugly JSON-formatted om param.
- *
- * @param prettyUrl The search url with individual om query params
- * @returns The URL with a single
- */
-export var getUglyJSONSearchUrl = function (prettyUrl) {
-    var path = prettyUrl.split("?")[0], query = prettyUrl.split("?")[1] || "", params = qs.parse(query, { ignoreQueryPrefix: true });
-    return (path +
-        qs.stringify(getParamsWithUglyJSONOrModifier(params), {
-            addQueryPrefix: true,
-        }));
-};
-/**
- * Filter function to exclude known or modifier keys from a querystring object.
- *
- * Can be used for the 'filter' parameter within qs.stringify
- *
- * @param prefix The key prefix for this querystring value
- * @param value The value of this questring
- * @returns Undefined for known or modifiers, otherwise the original value
- */
-export var filterKnownOrModifiers = function (prefix, value) {
-    return knownOrModifierKeys.includes(prefix)
-        ? undefined
-        : value;
+export var getSearchUrl = function (urlStr) {
+    var questionMarkIndex = urlStr.indexOf("?"), path = urlStr.substr(0, questionMarkIndex == -1 ? urlStr.length : questionMarkIndex), query = questionMarkIndex === -1 ? "" : urlStr.substr(questionMarkIndex);
+    return __assign(__assign({ route: path }, qs.parse(query, { ignoreQueryPrefix: true })), { fullUrl: urlStr });
 };
 //# sourceMappingURL=url-utils.js.map

package/es/url-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../src/url-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../src/url-utils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAKpB;;;;;;;;;GASG;AACH,MAAM,CAAC,IAAM,kBAAkB,GAAG,UAAC,SAAuC;IACxE,OAAO,CACL,SAAS,CAAC,KAAK;QACf,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE;YACtB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,UAAC,MAAM,EAAE,KAAK,IAAK,OAAA,CAAC,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAhE,CAAgE;SAC5F,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,IAAM,YAAY,GAAG,UAAC,MAAc;IACzC,IAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAC3C,IAAI,GAAG,MAAM,CAAC,MAAM,CAClB,CAAC,EACD,iBAAiB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAC5D,EACD,KAAK,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE3E,2BACE,KAAK,EAAE,IAAI,IACR,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,KAC/C,OAAO,EAAE,MAAM,IACf;AACJ,CAAC,CAAC"}

package/lib/demo.js

@@ -4,39 +4,28 @@ var _1 = require(".");
 _1.initialise({
     baseURL: "https://dev-search-api.nice.org.uk/api",
     index: "nice",
-    usePrettyUrls: true,
 });
-// console.log(getSearchUrl("/guidance/published?q=test"));
-// console.log(
-//   getSearchUrl(
-//     "/guidance/published?q=test?+hello&om=%5B%7B%22ndt%22%3A%5B%22Guidance%22%5D%7D%5D"
-//   )
-// );
-// typeAhead("para").then((typeAheadSuggestions) => {
-//   console.log({ typeAheadSuggestions });
-// });
+console.log(_1.getSearchUrl("/guidance/published?q=test"));
+console.log(_1.getSearchUrl("/guidance/published?q=test?+hello&om=%5B%7B%22ndt%22%3A%5B%22Guidance%22%5D%7D%5D"));
+_1.typeAhead("para").then(function (typeAheadSuggestions) {
+    console.log({ typeAheadSuggestions: typeAheadSuggestions });
+});
 // console.log(
 //   getUrlPathAndQuery({
 //     route: "/guidance/published",
 //     om: `[{"ndt":["Guidance"]}]`,
 //   })
 // );
-try {
-    // {
-    //   route: "/search",
-    //   ndt: "Guidance",
-    //   //om: '[{"ndt":["Guidance"]}]',
-    // }
-    _1.search("/search?ndt=Guidance&ndt=NICE%20advice").then(function (data) {
-        if (data.failed)
-            console.log({ failed: true, err: data.errorMessage });
-        else
-            console.log("Success! " + data.resultCount + " results found");
-    });
-}
-catch (e) {
-    console.error(e);
-}
+// try {
+//   search({
+//     route: "/search",
+//     om: '[{"ndt":["Guidance"]}]',
+//   }).then((data) => {
+//     console.log({ failed: data.failed, err: data.errorMessage });
+//   });
+// } catch (e) {
+//   console.error(e);
+// }
 // try {
 //     search("/search?om=[{\"ndt\":[\"Guidance\"]}]").then((data) => {
 //         console.log({ failed: data.failed });

package/lib/demo.js.map

@@ -1 +1 @@
-{"version":3,"file":"demo.js","sourceRoot":"","sources":["../src/demo.ts"],"names":[],"mappings":";;AAAA,sBAAgE;AAEhE,aAAU,CAAC;IACT,OAAO,EAAE,wCAAwC;IACjD,KAAK,EAAE,MAAM;IACb,aAAa,EAAE,IAAI;CACpB,CAAC,CAAC;AAEH,2DAA2D;AAE3D,eAAe;AACf,kBAAkB;AAClB,0FAA0F;AAC1F,MAAM;AACN,KAAK;AAEL,qDAAqD;AACrD,2CAA2C;AAC3C,MAAM;AAEN,eAAe;AACf,yBAAyB;AACzB,oCAAoC;AACpC,oCAAoC;AACpC,OAAO;AACP,KAAK;AAEL,IAAI;IAEF,IAAI;IACJ,sBAAsB;IACtB,qBAAqB;IACrB,oCAAoC;IACpC,IAAI;IAEJ,SAAM,CAAC,wCAAwC,CAAC,CAAC,IAAI,CAAC,UAAC,IAAI;QACzD,IAAG,IAAI,CAAC,MAAM;YACZ,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;;YAEtD,OAAO,CAAC,GAAG,CAAC,cAAa,IAAI,CAAC,WAAW,mBAAiB,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;CACJ;AAAC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;CAClB;AAED,QAAQ;AACR,uEAAuE;AACvE,gDAAgD;AAChD,SAAS;AACT,IAAI;AACJ,aAAa;AACb,wBAAwB;AACxB,IAAI"}
+{"version":3,"file":"demo.js","sourceRoot":"","sources":["../src/demo.ts"],"names":[],"mappings":";;AAAA,sBAAgE;AAEhE,aAAU,CAAC;IACT,OAAO,EAAE,wCAAwC;IACjD,KAAK,EAAE,MAAM;CACd,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,CAAC,eAAY,CAAC,4BAA4B,CAAC,CAAC,CAAC;AAExD,OAAO,CAAC,GAAG,CACT,eAAY,CACV,mFAAmF,CACpF,CACF,CAAC;AAEF,YAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAC,oBAAoB;IAC1C,OAAO,CAAC,GAAG,CAAC,EAAE,oBAAoB,sBAAA,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC;AAEH,eAAe;AACf,yBAAyB;AACzB,oCAAoC;AACpC,oCAAoC;AACpC,OAAO;AACP,KAAK;AAEL,QAAQ;AACR,aAAa;AACb,wBAAwB;AACxB,oCAAoC;AACpC,wBAAwB;AACxB,oEAAoE;AACpE,QAAQ;AACR,gBAAgB;AAChB,sBAAsB;AACtB,IAAI;AAEJ,QAAQ;AACR,uEAAuE;AACvE,gDAAgD;AAChD,SAAS;AACT,IAAI;AACJ,aAAa;AACb,wBAAwB;AACxB,IAAI"}

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typeAhead = exports.search = exports.initialise = exports.defaultTimeout = void 0;
+exports.typeAhead = exports.search = exports.initialise = exports.client = exports.defaultTimeout = void 0;
 var tslib_1 = require("tslib");
 var https_1 = tslib_1.__importDefault(require("https"));
 var axios_1 = tslib_1.__importDefault(require("axios"));
@@ -8,10 +8,8 @@ var axios_case_converter_1 = tslib_1.__importDefault(require("axios-case-convert
 var EndPointUrl_1 = require("./EndPointUrl");
 var url_utils_1 = require("./url-utils");
 var qs_1 = tslib_1.__importDefault(require("qs"));
-var pretty_url_middleware_1 = require("./pretty-url-middleware");
 tslib_1.__exportStar(require("./models/Document"), exports);
 tslib_1.__exportStar(require("./models/Navigator"), exports);
-tslib_1.__exportStar(require("./models/OrModifiers"), exports);
 tslib_1.__exportStar(require("./models/PagerLinks"), exports);
 tslib_1.__exportStar(require("./models/SearchCorrection"), exports);
 tslib_1.__exportStar(require("./models/SearchResults"), exports);
@@ -24,20 +22,19 @@ tslib_1.__exportStar(require("./utils"), exports);
 /** The default timeout, in milliseconds, if unspecified in `initialise` */
 exports.defaultTimeout = 5000;
 var isDevelopment = process.env.NODE_ENV === "development";
-var client;
 /**
  * Ensures that `initialise` has been called before search methods like `search`.
  *
  * Throws an error if `initialise` hasn't been called.
  */
 var ensureInitialised = function () {
-    if (!client)
+    if (!exports.client)
         throw new Error("Please call initialise before calling search methods");
 };
 var initialise = function (_a) {
-    var baseURL = _a.baseURL, index = _a.index, _b = _a.timeout, timeout = _b === void 0 ? exports.defaultTimeout : _b, _c = _a.usePrettyUrls, usePrettyUrls = _c === void 0 ? false : _c;
+    var baseURL = _a.baseURL, index = _a.index, _b = _a.timeout, timeout = _b === void 0 ? exports.defaultTimeout : _b;
     // Lowercase all property names because that's more Javascripty and we receive capitalised properties from the server
-    client = axios_case_converter_1.default(axios_1.default.create({
+    exports.client = axios_case_converter_1.default(axios_1.default.create({
         baseURL: baseURL,
         timeout: timeout,
         params: {
@@ -54,9 +51,6 @@ var initialise = function (_a) {
             })
             : undefined,
     }));
-    if (usePrettyUrls)
-        client = pretty_url_middleware_1.applyPrettyUrlMiddleware(client);
-    return client;
 };
 exports.initialise = initialise;
 /**
@@ -122,7 +116,7 @@ var doRequest = function (endpoint, url) { return tslib_1.__awaiter(void 0, void
                 _b.label = 1;
             case 1:
                 _b.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, client.get(endpoint, {
+                return [4 /*yield*/, exports.client.get(endpoint, {
                         params: tslib_1.__assign(tslib_1.__assign({}, queryParams), { route: route === endpoint ? undefined : route }),
                     })];
             case 2:

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,wDAA0B;AAC1B,wDAAyD;AACzD,sFAAuD;AAOvD,6CAA4C;AAC5C,yCAA+D;AAE/D,kDAAoB;AAEpB,4DAAkC;AAClC,6DAAmC;AACnC,8DAAoC;AACpC,oEAA0C;AAC1C,iEAAuC;AACvC,sEAA4C;AAC5C,6DAAmC;AACnC,6DAAmC;AACnC,wDAA8B;AAC9B,sDAA4B;AAC5B,kDAAwB;AAExB,2EAA2E;AAC9D,QAAA,cAAc,GAAG,IAAI,CAAC;AAEnC,IAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;AAa7D;;;;GAIG;AACH,IAAM,iBAAiB,GAAG;IACxB,IAAI,CAAC,cAAM;QACT,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;AAC5E,CAAC,CAAC;AAEK,IAAM,UAAU,GAAG,UAAC,EAA+D;QAA7D,OAAO,aAAA,EAAE,KAAK,WAAA,EAAE,eAAwB,EAAxB,OAAO,mBAAG,sBAAc,KAAA;IACnE,qHAAqH;IACrH,cAAM,GAAG,8BAAmB,CAC1B,eAAK,CAAC,MAAM,CAAC;QACX,OAAO,SAAA;QACP,OAAO,SAAA;QACP,MAAM,EAAE;YACN,8DAA8D;YAC9D,KAAK,OAAA;SACN;QACD,OAAO,uBAEF,CAAC,OAAO,MAAM,KAAK,WAAW,IAAI;YACnC,YAAY,EACV,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO;SAC5D,CAAC,CACH;QACD,gEAAgE;QAChE,UAAU,EAAE,aAAa;YACvB,CAAC,CAAC,IAAI,eAAK,CAAC,KAAK,CAAC;gBACd,kBAAkB,EAAE,KAAK;aAC1B,CAAC;YACJ,CAAC,CAAC,SAAS;KACd,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,UAAU,cAyBrB;AAEF;;;;;;;;;;;;;;GAcG;AACI,IAAM,MAAM,GAAG,UACpB,GAA0C;;QAE1C,4DAA4D;QAC5D,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,GAAG,GAAG,8BAAkB,CAAC,GAAG,CAAC,CAAC;QAE3D,sBAAO,SAAS,CAAC,yBAAW,CAAC,MAAM,EAAE,GAAG,CAAC,EAAC;;KAC3C,CAAC;AAPW,QAAA,MAAM,UAOjB;AAEF;;;;;;;;;;;;;;GAcG;AACI,IAAM,SAAS,GAAG,UAAO,KAAa;;QAC3C,sBAAA,SAAS,CACP,yBAAW,CAAC,SAAS,EACrB,yBAAW,CAAC,SAAS,GAAG,YAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAC7E,EAAA;;KAAA,CAAC;AAJS,QAAA,SAAS,aAIlB;AAEJ;;;;;GAKG;AACH,IAAM,SAAS,GAAG,UAChB,QAAqB,EACrB,GAAW;;;;;;;gBAEX,iBAAiB,EAAE,CAAC;gBAEd,KAMF,wBAAY,CAAC,GAAG,CAAC,EALnB,KAAK,WAAA,EACL,OAAO,aAAA,EAEP,KAAK,WAAA,EACF,WAAW,sBALV,6BAML,CADe,CACM;;;;gBAGH,qBAAM,cAAM,CAAC,GAAG,CAAI,QAAQ,EAAE;wBAC7C,MAAM,wCACD,WAAW,KACd,KAAK,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,GAC9C;qBACF,CAAC,EAAA;;gBALI,QAAQ,GAAG,SAKf;gBAEF,sBAAO,QAAQ,CAAC,IAAI,EAAC;;;gBAEf,KAAK,GAAG,KAAY,CAAC;gBAE3B,IAAI,eAAK,CAAC,YAAY,CAAC,KAAG,CAAC,EAAE;oBACnB,QAAQ,GAAK,KAAqC,SAA1C,CAA2C;oBAE3D,0DAA0D;oBAC1D,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI;wBAAE,sBAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAC;iBAC3C;gBAED,yCACE,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,KAAK,CAAC,IAAI,GAAG,IAAI,GAAG,KAAK,CAAC,OAAO,IAC5C,CAAC,aAAa,IAAI;wBACnB,KAAK,EAAE;4BACL,WAAW,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE;yBAC/B;qBACF,CAAC,GACF;;;;KAEL,CAAC"}

package/lib/url-utils.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterKnownOrModifiers = exports.getUglyJSONSearchUrl = exports.getParamsWithUglyJSONOrModifier = exports.getPrettyUrl = exports.getPrettyOrModifierParams = exports.getSearchUrl = exports.getUrlPathAndQuery = void 0;
+exports.getSearchUrl = exports.getUrlPathAndQuery = void 0;
 var tslib_1 = require("tslib");
 var qs_1 = tslib_1.__importDefault(require("qs"));
-var OrModifiers_1 = require("./models/OrModifiers");
 /**
  * Gets the path and query from the given search url object.
  *
@@ -18,9 +17,7 @@ var getUrlPathAndQuery = function (searchUrl) {
     return (searchUrl.route +
         qs_1.default.stringify(searchUrl, {
             addQueryPrefix: true,
-            filter: function (prefix, value) {
-                return prefix === "route" || prefix === "fullUrl" ? undefined : value;
-            },
+            filter: function (prefix, value) { return (prefix === "route" || prefix === "fullUrl" ? undefined : value); },
         }));
 };
 exports.getUrlPathAndQuery = getUrlPathAndQuery;
@@ -31,109 +28,12 @@ exports.getUrlPathAndQuery = getUrlPathAndQuery;
  *  getSearchUrl("/search?q=test")
  *  returns { route: "/search", q: "test" }
  *
- * @param fullSearchUrl The relative url including path and query
+ * @param urlStr The relative url including path and query
  * @returns Search url object
  */
-var getSearchUrl = function (fullSearchUrl) {
-    var path = fullSearchUrl.split("?")[0], query = fullSearchUrl.split("?")[1] || "", params = qs_1.default.parse(query, { ignoreQueryPrefix: true });
-    return tslib_1.__assign({ route: path, fullUrl: fullSearchUrl }, params);
+var getSearchUrl = function (urlStr) {
+    var questionMarkIndex = urlStr.indexOf("?"), path = urlStr.substr(0, questionMarkIndex == -1 ? urlStr.length : questionMarkIndex), query = questionMarkIndex === -1 ? "" : urlStr.substr(questionMarkIndex);
+    return tslib_1.__assign(tslib_1.__assign({ route: path }, qs_1.default.parse(query, { ignoreQueryPrefix: true })), { fullUrl: urlStr });
 };
 exports.getSearchUrl = getSearchUrl;
-/**
- * Parses a JSON-formatted 'om' query param into a set of key value pairs
- *
- * @param omJsonQueryString A JSON formatted om query e.g. [{"ndt":["Guidance"]}]
- * @returns A set of key value pairs of or modifiers
- */
-var getPrettyOrModifierParams = function (omJsonQueryString) {
-    return JSON.parse(decodeURIComponent(omJsonQueryString)).map(function (om) {
-        // Lots of array access here because om is an array objects where the value is itself an array
-        var entry = Object.entries(om)[0], key = entry[0], value = entry[1][0];
-        return { key: key, value: value };
-    });
-};
-exports.getPrettyOrModifierParams = getPrettyOrModifierParams;
-/**
- * Turns a search URL with JSON-formatted 'or modifiers' into a 'pretty' url.
- *
- * A pretty url having keys e.g. ndt=Guidance&ndt=Advice rather than JSON
- *
- * @param searchUrl The raw search url, with JSON-formatted 'or modifiers' (om)
- * @returns A flattened pretty URL
- */
-var getPrettyUrl = function (searchUrl) {
-    var omQueryRegex = /([?&])om=([^&]+)/i, omMatch = searchUrl.match(omQueryRegex), omJsonQueryString = omMatch && omMatch[2];
-    // Or modifiers is the only param that comes through as JSON so all the others we can leave alone
-    if (!omJsonQueryString)
-        return searchUrl;
-    var flattenedOrModifiers = exports.getPrettyOrModifierParams(omJsonQueryString)
-        .map(function (_a) {
-        var key = _a.key, value = _a.value;
-        return key + "=" + encodeURIComponent(value);
-    })
-        .join("&");
-    return searchUrl.replace(omQueryRegex, "$1" + flattenedOrModifiers);
-};
-exports.getPrettyUrl = getPrettyUrl;
-/**
- * Converts individual or modifier params into a JSON formatted om query param
- *
- * @param params
- * @returns
- */
-var getParamsWithUglyJSONOrModifier = function (params) {
-    // Find the querystring params we need need to turn into the ugly om JSON
-    var omJSONParam = Object.entries(params)
-        .filter(function (om) { return OrModifiers_1.knownOrModifierKeys.includes(om[0]); })
-        // And convert them into a key values pairs
-        .map(function (om) {
-        var _a;
-        var key = om[0], value = om[1];
-        if (Array.isArray(value))
-            return value.map(function (val) {
-                var _a;
-                return (_a = {}, _a[key] = [val], _a);
-            });
-        return _a = {}, _a[key] = [value], _a;
-    })
-        .reduce(function (prev, curr) {
-        return prev.concat(curr);
-    }, []);
-    // Remove individual or modifier queries now we have a single JSON om
-    OrModifiers_1.knownOrModifierKeys.forEach(function (modifier) {
-        delete params[modifier];
-    });
-    params.om = JSON.stringify(omJSONParam);
-    return params;
-};
-exports.getParamsWithUglyJSONOrModifier = getParamsWithUglyJSONOrModifier;
-/**
- * Converts a search url with pretty 'or modifiers' into a URL with an ugly JSON-formatted om param.
- *
- * @param prettyUrl The search url with individual om query params
- * @returns The URL with a single
- */
-var getUglyJSONSearchUrl = function (prettyUrl) {
-    var path = prettyUrl.split("?")[0], query = prettyUrl.split("?")[1] || "", params = qs_1.default.parse(query, { ignoreQueryPrefix: true });
-    return (path +
-        qs_1.default.stringify(exports.getParamsWithUglyJSONOrModifier(params), {
-            addQueryPrefix: true,
-        }));
-};
-exports.getUglyJSONSearchUrl = getUglyJSONSearchUrl;
-/**
- * Filter function to exclude known or modifier keys from a querystring object.
- *
- * Can be used for the 'filter' parameter within qs.stringify
- *
- * @param prefix The key prefix for this querystring value
- * @param value The value of this questring
- * @returns Undefined for known or modifiers, otherwise the original value
- */
-var filterKnownOrModifiers = function (prefix, value) {
-    return OrModifiers_1.knownOrModifierKeys.includes(prefix)
-        ? undefined
-        : value;
-};
-exports.filterKnownOrModifiers = filterKnownOrModifiers;
 //# sourceMappingURL=url-utils.js.map

package/lib/url-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../src/url-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"url-utils.js","sourceRoot":"","sources":["../src/url-utils.ts"],"names":[],"mappings":";;;;AAAA,kDAAoB;AAKpB;;;;;;;;;GASG;AACI,IAAM,kBAAkB,GAAG,UAAC,SAAuC;IACxE,OAAO,CACL,SAAS,CAAC,KAAK;QACf,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE;YACtB,cAAc,EAAE,IAAI;YACpB,MAAM,EAAE,UAAC,MAAM,EAAE,KAAK,IAAK,OAAA,CAAC,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAhE,CAAgE;SAC5F,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B;AAEF;;;;;;;;;GASG;AACI,IAAM,YAAY,GAAG,UAAC,MAAc;IACzC,IAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAC3C,IAAI,GAAG,MAAM,CAAC,MAAM,CAClB,CAAC,EACD,iBAAiB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAC5D,EACD,KAAK,GAAG,iBAAiB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE3E,2CACE,KAAK,EAAE,IAAI,IACR,YAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,KAC/C,OAAO,EAAE,MAAM,IACf;AACJ,CAAC,CAAC;AAbW,QAAA,YAAY,gBAavB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nice-digital/search-client",
-  "version": "0.2.1387-async-performance-te",
+  "version": "0.2.1392-async-first-commit",
   "description": "Search client for NICE digital services",
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -15,7 +15,7 @@
     "ts:lib:watch": "npm run ts:lib -- --watch",
     "ts:es": "rimraf es && tsc --p src --module ES6 --outDir es",
     "ts:es:watch": "npm run ts:es -- --watch",
-    "demo": "npm run ts:lib && node lib/demo"
+    "demo": "npm run ts && node lib/demo"
   },
   "files": [
     "lib",

package/types/index.d.ts

@@ -6,7 +6,6 @@ import { TypeAheadResults } from "./models/TypeAhead";
 import { Except } from "type-fest";
 export * from "./models/Document";
 export * from "./models/Navigator";
-export * from "./models/OrModifiers";
 export * from "./models/PagerLinks";
 export * from "./models/SearchCorrection";
 export * from "./models/SearchResults";
@@ -18,6 +17,7 @@ export * from "./url-utils";
 export * from "./utils";
 /** The default timeout, in milliseconds, if unspecified in `initialise` */
 export declare const defaultTimeout = 5000;
+export declare let client: AxiosInstance;
 export interface InitialiseOptions {
     /** The abssolute base URL for the Single Search Endpoint, including the /api path */
     baseURL: `https://${string}/api`;
@@ -25,10 +25,8 @@ export interface InitialiseOptions {
     index: SearchIndex;
     /** The timeout, in milliseconds. Leave blank to use the default timeout. */
     timeout?: number;
-    /** Whether to transform URLs to pretty URLs in server responses and from pretty URLs in requests. Defaults to false. */
-    usePrettyUrls?: boolean;
 }
-export declare const initialise: ({ baseURL, index, timeout, usePrettyUrls, }: InitialiseOptions) => AxiosInstance;
+export declare const initialise: ({ baseURL, index, timeout }: InitialiseOptions) => void;
 /**
  * Performs a search against the Single Search Endpoint from the given search url.
  *

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAc,EAAE,aAAa,EAAc,MAAM,OAAO,CAAC;AAGzD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAInC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AAExB,2EAA2E;AAC3E,eAAO,MAAM,cAAc,OAAO,CAAC;AAMnC,MAAM,WAAW,iBAAiB;IAChC,qFAAqF;IACrF,OAAO,EAAE,WAAW,MAAM,MAAM,CAAC;IACjC,sDAAsD;IACtD,KAAK,EAAE,WAAW,CAAC;IACnB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wHAAwH;IACxH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAYD,eAAO,MAAM,UAAU,gDAKpB,iBAAiB,KAAG,aA6BtB,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,MAAM,QACZ,MAAM,GAAG,OAAO,SAAS,EAAE,SAAS,CAAC,KACzC,QAAQ,aAAa,CAKvB,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,SAAS,UAAiB,MAAM,KAAG,QAAQ,gBAAgB,CAIrE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAc,EAAE,aAAa,EAAc,MAAM,OAAO,CAAC;AAGzD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AAExB,2EAA2E;AAC3E,eAAO,MAAM,cAAc,OAAO,CAAC;AAInC,eAAO,IAAI,MAAM,EAAE,aAAa,CAAC;AAEjC,MAAM,WAAW,iBAAiB;IAChC,qFAAqF;IACrF,OAAO,EAAE,WAAW,MAAM,MAAM,CAAC;IACjC,sDAAsD;IACtD,KAAK,EAAE,WAAW,CAAC;IACnB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAYD,eAAO,MAAM,UAAU,gCAAkD,iBAAiB,SAyBzF,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,MAAM,QACZ,MAAM,GAAG,OAAO,SAAS,EAAE,SAAS,CAAC,KACzC,QAAQ,aAAa,CAKvB,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,SAAS,UAAiB,MAAM,KAAG,QAAQ,gBAAgB,CAIrE,CAAC"}

package/types/models/PagerLinks.d.ts

@@ -1,13 +1,14 @@
 import { SearchUrl } from "./SearchUrl";
-export declare type PagerLinks = {
+import type { ReadonlyDeep } from "type-fest";
+export declare type PagerLinks = ReadonlyDeep<{
     previous: SearchUrl | null;
     first: SearchUrl | null;
     pages: PagerLink[];
     next: SearchUrl | null;
-};
-export declare type PagerLink = {
+}>;
+export declare type PagerLink = ReadonlyDeep<{
     title: string;
     url: SearchUrl;
     isCurrent: boolean;
-};
+}>;
 //# sourceMappingURL=PagerLinks.d.ts.map

package/types/models/PagerLinks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PagerLinks.d.ts","sourceRoot":"","sources":["../../src/models/PagerLinks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,oBAAY,UAAU,GAAG;IACvB,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF,oBAAY,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC"}
+{"version":3,"file":"PagerLinks.d.ts","sourceRoot":"","sources":["../../src/models/PagerLinks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAE9C,oBAAY,UAAU,GAAG,YAAY,CAAC;IACpC,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,IAAI,EAAE,SAAS,GAAG,IAAI,CAAC;CACxB,CAAC,CAAC;AAEH,oBAAY,SAAS,GAAG,YAAY,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC,CAAC"}

package/types/models/SearchUrl.d.ts

@@ -23,7 +23,7 @@ export interface SearchUrl {
     from?: string;
     /** Fielded Search */
     fs?: string;
-    fullUrl: string;
+    readonly fullUrl: string;
     fullUrlWithDefaultRoot?: string;
     /** Modifier/s (legacy) */
     m?: string;

package/types/models/SearchUrl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchUrl.d.ts","sourceRoot":"","sources":["../../src/models/SearchUrl.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IAExB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,oBAAoB;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0BAA0B;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,iBAAiB;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,iBAAiB;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0BAA0B;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,gBAAgB;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0BAA0B;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,qBAAqB;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,OAAO,EAAE,MAAM,CAAC;IAEhB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,0BAA0B;IAC1B,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,mBAAmB;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,gBAAgB;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,sBAAsB;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,wBAAwB;IACxB,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,sBAAsB;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IAEb,iBAAiB;IACjB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpB,uBAAuB;IACvB,EAAE,CAAC,EAAE,OAAO,CAAC;IAEb,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,kDAAkD;IAClD,EAAE,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC;IAEvC,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,sBAAsB;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IAEb,gCAAgC;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,WAAW;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,cAAc;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,wBAAwB;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uBAAuB;IACvB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,KAAK,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"SearchUrl.d.ts","sourceRoot":"","sources":["../../src/models/SearchUrl.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IAExB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,oBAAoB;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0BAA0B;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,iBAAiB;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,iBAAiB;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0BAA0B;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,gBAAgB;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,0BAA0B;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,qBAAqB;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,0BAA0B;IAC1B,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,mBAAmB;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,gBAAgB;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,sBAAsB;IACtB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,wBAAwB;IACxB,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,sBAAsB;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IAEb,iBAAiB;IACjB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpB,uBAAuB;IACvB,EAAE,CAAC,EAAE,OAAO,CAAC;IAEb,sCAAsC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,iBAAiB;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,kDAAkD;IAClD,EAAE,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,KAAK,CAAC;IAEvC,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,kBAAkB;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,sBAAsB;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IAEb,gCAAgC;IAChC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,WAAW;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IAEX,cAAc;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,wBAAwB;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,uBAAuB;IACvB,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,KAAK,EAAE,MAAM,CAAC;CACf"}

package/types/url-utils.d.ts

@@ -1,4 +1,3 @@
-import { ParsedQs } from "qs";
 import type { Except } from "type-fest";
 import { SearchUrl } from "./models/SearchUrl";
 /**
@@ -19,51 +18,8 @@ export declare const getUrlPathAndQuery: (searchUrl: Except<SearchUrl, "fullUrl"
  *  getSearchUrl("/search?q=test")
  *  returns { route: "/search", q: "test" }
  *
- * @param fullSearchUrl The relative url including path and query
+ * @param urlStr The relative url including path and query
  * @returns Search url object
  */
-export declare const getSearchUrl: (fullSearchUrl: string) => SearchUrl;
-/**
- * Parses a JSON-formatted 'om' query param into a set of key value pairs
- *
- * @param omJsonQueryString A JSON formatted om query e.g. [{"ndt":["Guidance"]}]
- * @returns A set of key value pairs of or modifiers
- */
-export declare const getPrettyOrModifierParams: (omJsonQueryString: string) => {
-    key: string;
-    value: any;
-}[];
-/**
- * Turns a search URL with JSON-formatted 'or modifiers' into a 'pretty' url.
- *
- * A pretty url having keys e.g. ndt=Guidance&ndt=Advice rather than JSON
- *
- * @param searchUrl The raw search url, with JSON-formatted 'or modifiers' (om)
- * @returns A flattened pretty URL
- */
-export declare const getPrettyUrl: (searchUrl: string) => string;
-/**
- * Converts individual or modifier params into a JSON formatted om query param
- *
- * @param params
- * @returns
- */
-export declare const getParamsWithUglyJSONOrModifier: (params: ParsedQs) => ParsedQs;
-/**
- * Converts a search url with pretty 'or modifiers' into a URL with an ugly JSON-formatted om param.
- *
- * @param prettyUrl The search url with individual om query params
- * @returns The URL with a single
- */
-export declare const getUglyJSONSearchUrl: (prettyUrl: string) => string;
-/**
- * Filter function to exclude known or modifier keys from a querystring object.
- *
- * Can be used for the 'filter' parameter within qs.stringify
- *
- * @param prefix The key prefix for this querystring value
- * @param value The value of this questring
- * @returns Undefined for known or modifiers, otherwise the original value
- */
-export declare const filterKnownOrModifiers: (prefix: string, value: unknown) => unknown;
+export declare const getSearchUrl: (urlStr: string) => SearchUrl;
 //# sourceMappingURL=url-utils.d.ts.map

package/types/url-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url-utils.d.ts","sourceRoot":"","sources":["../src/url-utils.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,cAClB,OAAO,SAAS,EAAE,SAAS,CAAC,KACtC,MASF,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,kBAAmB,MAAM,KAAG,SAUpD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,sBAAuB,MAAM;;;GAShE,CAAC;AAEJ;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,cAAe,MAAM,WAa7C,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,WAAY,QAAQ,KAAG,QAyBlE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,cAAe,MAAM,WAWrD,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,WAAY,MAAM,SAAS,OAAO,YAG1D,CAAC"}
+{"version":3,"file":"url-utils.d.ts","sourceRoot":"","sources":["../src/url-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,cAAe,OAAO,SAAS,EAAE,SAAS,CAAC,KAAG,MAQ5E,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY,WAAY,MAAM,KAAG,SAa7C,CAAC"}

package/es/models/OrModifiers.js

@@ -1,15 +0,0 @@
-export var knownOrModifierKeys = [
-    "nai",
-    "gst",
-    "ndt",
-    "ngt",
-    "nat",
-    "rty",
-    "drm",
-    // Evidence Search specific:
-    "ety",
-    "srn",
-    "ain",
-    "acc", // Accredited
-];
-//# sourceMappingURL=OrModifiers.js.map

package/es/models/OrModifiers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OrModifiers.js","sourceRoot":"","sources":["../../src/models/OrModifiers.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,IAAM,mBAAmB,GAAG;IACjC,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,4BAA4B;IAC5B,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK,EAAE,aAAa;CACZ,CAAC"}

package/es/pretty-url-middleware.js

@@ -1,75 +0,0 @@
-import { __spreadArray } from "tslib";
-import { getParamsWithUglyJSONOrModifier, getPrettyUrl } from "./url-utils";
-/**
- * Custom type guard for determining if an object is a successful search results response.
- *
- * See https://www.typescriptlang.org/docs/handbook/advanced-types.html#using-type-predicates
- *
- * @param data The server response, which may or may not a results success
- */
-var isSuccessResponse = function (data) {
-    return data.failed === false &&
-        Array.isArray(data.documents);
-};
-/**
- * Tranforms the params in an axios request from individual om params into a single JSON-encoded om query.
- */
-export var prettyUrlAxiosRequestInterceptor = function (config) {
-    if (!config.params)
-        return config;
-    if (config.params.om)
-        throw new Error("Found a pretty URL with an om parameter");
-    config.params = getParamsWithUglyJSONOrModifier(config.params);
-    return config;
-};
-/**
- * Transforms all search urls in a successful search response into 'pretty' urls (URLs with a flattened 'om' query)
- *
- * @param data The data from a Single Search Endpoint respons
- * @returns The data with transformed URLs
- */
-export var prettyUrlAxiosResponseTransformer = function (data) {
-    var _a, _b, _c;
-    if (!isSuccessResponse(data))
-        return data;
-    // First page
-    if ((_a = data.pagerLinks.first) === null || _a === void 0 ? void 0 : _a.fullUrl)
-        data.pagerLinks.first.fullUrl = getPrettyUrl(data.pagerLinks.first.fullUrl);
-    // Next Page
-    if ((_b = data.pagerLinks.next) === null || _b === void 0 ? void 0 : _b.fullUrl)
-        data.pagerLinks.next.fullUrl = getPrettyUrl(data.pagerLinks.next.fullUrl);
-    // Previous page
-    if ((_c = data.pagerLinks.previous) === null || _c === void 0 ? void 0 : _c.fullUrl)
-        data.pagerLinks.previous.fullUrl = getPrettyUrl(data.pagerLinks.previous.fullUrl);
-    // Numbered pages
-    data.pagerLinks.pages.forEach(function (page) {
-        page.url.fullUrl = getPrettyUrl(page.url.fullUrl);
-    });
-    // Navigators
-    data.navigators.forEach(function (navigator) {
-        navigator.modifiers.forEach(function (modifier) {
-            var _a;
-            // Root modifiers
-            modifier.toggleUrl.fullUrl = getPrettyUrl(modifier.toggleUrl.fullUrl);
-            // Child navigators
-            (_a = modifier.childNavigators) === null || _a === void 0 ? void 0 : _a.forEach(function (childNavigator) {
-                childNavigator.modifiers.forEach(function (mod) {
-                    mod.toggleUrl.fullUrl = getPrettyUrl(mod.toggleUrl.fullUrl);
-                });
-            });
-        });
-    });
-    return data;
-};
-export var applyPrettyUrlMiddleware = function (axios) {
-    axios.interceptors.request.use(prettyUrlAxiosRequestInterceptor);
-    axios.defaults.transformResponse = __spreadArray(__spreadArray([], (Array.isArray(axios.defaults.transformResponse)
-        ? axios.defaults.transformResponse
-        : axios.defaults.transformResponse !== undefined
-            ? [axios.defaults.transformResponse]
-            : [])), [
-        prettyUrlAxiosResponseTransformer,
-    ]);
-    return axios;
-};
-//# sourceMappingURL=pretty-url-middleware.js.map

package/es/pretty-url-middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pretty-url-middleware.js","sourceRoot":"","sources":["../src/pretty-url-middleware.ts"],"names":[],"mappings":"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"}

package/lib/models/OrModifiers.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.knownOrModifierKeys = void 0;
-exports.knownOrModifierKeys = [
-    "nai",
-    "gst",
-    "ndt",
-    "ngt",
-    "nat",
-    "rty",
-    "drm",
-    // Evidence Search specific:
-    "ety",
-    "srn",
-    "ain",
-    "acc", // Accredited
-];
-//# sourceMappingURL=OrModifiers.js.map

package/lib/models/OrModifiers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"OrModifiers.js","sourceRoot":"","sources":["../../src/models/OrModifiers.ts"],"names":[],"mappings":";;;AAEa,QAAA,mBAAmB,GAAG;IACjC,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,4BAA4B;IAC5B,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK,EAAE,aAAa;CACZ,CAAC"}

package/lib/pretty-url-middleware.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyPrettyUrlMiddleware = exports.prettyUrlAxiosResponseTransformer = exports.prettyUrlAxiosRequestInterceptor = void 0;
-var tslib_1 = require("tslib");
-var url_utils_1 = require("./url-utils");
-/**
- * Custom type guard for determining if an object is a successful search results response.
- *
- * See https://www.typescriptlang.org/docs/handbook/advanced-types.html#using-type-predicates
- *
- * @param data The server response, which may or may not a results success
- */
-var isSuccessResponse = function (data) {
-    return data.failed === false &&
-        Array.isArray(data.documents);
-};
-/**
- * Tranforms the params in an axios request from individual om params into a single JSON-encoded om query.
- */
-var prettyUrlAxiosRequestInterceptor = function (config) {
-    if (!config.params)
-        return config;
-    if (config.params.om)
-        throw new Error("Found a pretty URL with an om parameter");
-    config.params = url_utils_1.getParamsWithUglyJSONOrModifier(config.params);
-    return config;
-};
-exports.prettyUrlAxiosRequestInterceptor = prettyUrlAxiosRequestInterceptor;
-/**
- * Transforms all search urls in a successful search response into 'pretty' urls (URLs with a flattened 'om' query)
- *
- * @param data The data from a Single Search Endpoint respons
- * @returns The data with transformed URLs
- */
-var prettyUrlAxiosResponseTransformer = function (data) {
-    var _a, _b, _c;
-    if (!isSuccessResponse(data))
-        return data;
-    // First page
-    if ((_a = data.pagerLinks.first) === null || _a === void 0 ? void 0 : _a.fullUrl)
-        data.pagerLinks.first.fullUrl = url_utils_1.getPrettyUrl(data.pagerLinks.first.fullUrl);
-    // Next Page
-    if ((_b = data.pagerLinks.next) === null || _b === void 0 ? void 0 : _b.fullUrl)
-        data.pagerLinks.next.fullUrl = url_utils_1.getPrettyUrl(data.pagerLinks.next.fullUrl);
-    // Previous page
-    if ((_c = data.pagerLinks.previous) === null || _c === void 0 ? void 0 : _c.fullUrl)
-        data.pagerLinks.previous.fullUrl = url_utils_1.getPrettyUrl(data.pagerLinks.previous.fullUrl);
-    // Numbered pages
-    data.pagerLinks.pages.forEach(function (page) {
-        page.url.fullUrl = url_utils_1.getPrettyUrl(page.url.fullUrl);
-    });
-    // Navigators
-    data.navigators.forEach(function (navigator) {
-        navigator.modifiers.forEach(function (modifier) {
-            var _a;
-            // Root modifiers
-            modifier.toggleUrl.fullUrl = url_utils_1.getPrettyUrl(modifier.toggleUrl.fullUrl);
-            // Child navigators
-            (_a = modifier.childNavigators) === null || _a === void 0 ? void 0 : _a.forEach(function (childNavigator) {
-                childNavigator.modifiers.forEach(function (mod) {
-                    mod.toggleUrl.fullUrl = url_utils_1.getPrettyUrl(mod.toggleUrl.fullUrl);
-                });
-            });
-        });
-    });
-    return data;
-};
-exports.prettyUrlAxiosResponseTransformer = prettyUrlAxiosResponseTransformer;
-var applyPrettyUrlMiddleware = function (axios) {
-    axios.interceptors.request.use(exports.prettyUrlAxiosRequestInterceptor);
-    axios.defaults.transformResponse = tslib_1.__spreadArray(tslib_1.__spreadArray([], (Array.isArray(axios.defaults.transformResponse)
-        ? axios.defaults.transformResponse
-        : axios.defaults.transformResponse !== undefined
-            ? [axios.defaults.transformResponse]
-            : [])), [
-        exports.prettyUrlAxiosResponseTransformer,
-    ]);
-    return axios;
-};
-exports.applyPrettyUrlMiddleware = applyPrettyUrlMiddleware;
-//# sourceMappingURL=pretty-url-middleware.js.map

package/lib/pretty-url-middleware.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pretty-url-middleware.js","sourceRoot":"","sources":["../src/pretty-url-middleware.ts"],"names":[],"mappings":"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"}

package/types/models/OrModifiers.d.ts

@@ -1,7 +0,0 @@
-import type { RequireExactlyOne } from "type-fest";
-export declare const knownOrModifierKeys: readonly ["nai", "gst", "ndt", "ngt", "nat", "rty", "drm", "ety", "srn", "ain", "acc"];
-export declare type KnownOrModifierKeys = typeof knownOrModifierKeys[number];
-export declare type OrModifier = RequireExactlyOne<{
-    [Property in KnownOrModifierKeys]: [string];
-}, KnownOrModifierKeys>;
-//# sourceMappingURL=OrModifiers.d.ts.map

package/types/models/OrModifiers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"OrModifiers.d.ts","sourceRoot":"","sources":["../../src/models/OrModifiers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEnD,eAAO,MAAM,mBAAmB,wFAatB,CAAC;AAEX,oBAAY,mBAAmB,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAErE,oBAAY,UAAU,GAAG,iBAAiB,CACxC;KACG,QAAQ,IAAI,mBAAmB,GAAG,CAAC,MAAM,CAAC;CAC5C,EACD,mBAAmB,CACpB,CAAC"}

package/types/pretty-url-middleware.d.ts

@@ -1,14 +0,0 @@
-import { AxiosInstance, AxiosRequestConfig, AxiosTransformer } from "axios";
-/**
- * Tranforms the params in an axios request from individual om params into a single JSON-encoded om query.
- */
-export declare const prettyUrlAxiosRequestInterceptor: (config: AxiosRequestConfig) => AxiosRequestConfig;
-/**
- * Transforms all search urls in a successful search response into 'pretty' urls (URLs with a flattened 'om' query)
- *
- * @param data The data from a Single Search Endpoint respons
- * @returns The data with transformed URLs
- */
-export declare const prettyUrlAxiosResponseTransformer: AxiosTransformer;
-export declare const applyPrettyUrlMiddleware: (axios: AxiosInstance) => AxiosInstance;
-//# sourceMappingURL=pretty-url-middleware.d.ts.map

package/types/pretty-url-middleware.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pretty-url-middleware.d.ts","sourceRoot":"","sources":["../src/pretty-url-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAkB5E;;GAEG;AACH,eAAO,MAAM,gCAAgC,WACnC,kBAAkB,uBAU3B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iCAAiC,EAAE,gBAwC/C,CAAC;AAEF,eAAO,MAAM,wBAAwB,UAAW,aAAa,kBAa5D,CAAC"}