@dereekb/util 11.0.15 → 11.0.17

package/fetch/index.cjs.js

@@ -4836,19 +4836,76 @@ $$1({ global: true, constructor: true, forced: !USE_NATIVE_URL, sham: !DESCRIPTO
   URL: URLConstructor
 });
 
+var anObject$1 = anObject$e;
+
+// `RegExp.prototype.flags` getter implementation
+// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
+var regexpFlags = function () {
+  var that = anObject$1(this);
+  var result = '';
+  if (that.hasIndices) result += 'd';
+  if (that.global) result += 'g';
+  if (that.ignoreCase) result += 'i';
+  if (that.multiline) result += 'm';
+  if (that.dotAll) result += 's';
+  if (that.unicode) result += 'u';
+  if (that.unicodeSets) result += 'v';
+  if (that.sticky) result += 'y';
+  return result;
+};
+
+var call = functionCall;
+var hasOwn = hasOwnProperty_1;
+var isPrototypeOf = objectIsPrototypeOf;
+var regExpFlags = regexpFlags;
+
+var RegExpPrototype$1 = RegExp.prototype;
+
+var regexpGetFlags = function (R) {
+  var flags = R.flags;
+  return flags === undefined && !('flags' in RegExpPrototype$1) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype$1, R)
+    ? call(regExpFlags, R) : flags;
+};
+
+var PROPER_FUNCTION_NAME = functionName.PROPER;
+var defineBuiltIn$1 = defineBuiltIn$a;
+var anObject = anObject$e;
+var $toString = toString$2;
+var fails$1 = fails$g;
+var getRegExpFlags = regexpGetFlags;
+
+var TO_STRING = 'toString';
+var RegExpPrototype = RegExp.prototype;
+var nativeToString = RegExpPrototype[TO_STRING];
+
+var NOT_GENERIC = fails$1(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
+// FF44- RegExp#toString has a wrong name
+var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
+
+// `RegExp.prototype.toString` method
+// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
+if (NOT_GENERIC || INCORRECT_NAME) {
+  defineBuiltIn$1(RegExpPrototype, TO_STRING, function toString() {
+    var R = anObject(this);
+    var pattern = $toString(R.source);
+    var flags = $toString(getRegExpFlags(R));
+    return '/' + pattern + '/' + flags;
+  }, { unsafe: true });
+}
+
 var $ = _export;
 var NativePromiseConstructor = promiseNativeConstructor;
-var fails$1 = fails$g;
+var fails = fails$g;
 var getBuiltIn = getBuiltIn$8;
 var isCallable = isCallable$l;
 var speciesConstructor = speciesConstructor$2;
 var promiseResolve = promiseResolve$2;
-var defineBuiltIn$1 = defineBuiltIn$a;
+var defineBuiltIn = defineBuiltIn$a;
 
 var NativePromisePrototype = NativePromiseConstructor && NativePromiseConstructor.prototype;
 
 // Safari bug https://bugs.webkit.org/show_bug.cgi?id=200829
-var NON_GENERIC = !!NativePromiseConstructor && fails$1(function () {
+var NON_GENERIC = !!NativePromiseConstructor && fails(function () {
   // eslint-disable-next-line unicorn/no-thenable -- required for testing
   NativePromisePrototype['finally'].call({ then: function () { /* empty */ } }, function () { /* empty */ });
 });
@@ -4874,7 +4931,7 @@ $({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, {
 if (isCallable(NativePromiseConstructor)) {
   var method = getBuiltIn('Promise').prototype['finally'];
   if (NativePromisePrototype['finally'] !== method) {
-    defineBuiltIn$1(NativePromisePrototype, 'finally', method, { unsafe: true });
+    defineBuiltIn(NativePromisePrototype, 'finally', method, { unsafe: true });
   }
 }
 
@@ -5065,13 +5122,20 @@ function fetchRequestFactory(config) {
     baseRequest: inputBaseRequest,
     timeout,
     requestInitFactory,
-    useBaseUrlForConfiguredFetchRequests = false
+    useBaseUrlForConfiguredFetchRequests = false,
+    forceBaseUrlForWebsiteUrlWithPrefix = useBaseUrlForConfiguredFetchRequests
   } = config;
   const baseUrl = inputBaseUrl ? new URL(util.removeTrailingSlashes(inputBaseUrl)) : undefined;
   const buildUrl = baseUrl ? url => {
-    // retain the origin and any pathname from the base url
-    const urlPath = baseUrl.origin + util.fixMultiSlashesInSlashPath('/' + baseUrl.pathname + '/' + url);
-    const result = new URL(urlPath, baseUrl);
+    let result;
+    const urlString = url.toString();
+    // retain the origin and any pathname from the base url, unless the url contains a prefix
+    if (!forceBaseUrlForWebsiteUrlWithPrefix && util.isWebsiteUrlWithPrefix(urlString)) {
+      result = new URL(urlString);
+    } else {
+      const urlPath = baseUrl.origin + util.fixMultiSlashesInSlashPath('/' + baseUrl.pathname + '/' + url);
+      result = new URL(urlPath, baseUrl);
+    }
     return result;
   } : undefined;
   const buildRequestWithFixedUrl = buildUrl ? _async$3(function (input) {
@@ -5572,63 +5636,6 @@ function makeUrlSearchParams(input, options) {
   return searchParams;
 }
 
-var anObject$1 = anObject$e;
-
-// `RegExp.prototype.flags` getter implementation
-// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
-var regexpFlags = function () {
-  var that = anObject$1(this);
-  var result = '';
-  if (that.hasIndices) result += 'd';
-  if (that.global) result += 'g';
-  if (that.ignoreCase) result += 'i';
-  if (that.multiline) result += 'm';
-  if (that.dotAll) result += 's';
-  if (that.unicode) result += 'u';
-  if (that.unicodeSets) result += 'v';
-  if (that.sticky) result += 'y';
-  return result;
-};
-
-var call = functionCall;
-var hasOwn = hasOwnProperty_1;
-var isPrototypeOf = objectIsPrototypeOf;
-var regExpFlags = regexpFlags;
-
-var RegExpPrototype$1 = RegExp.prototype;
-
-var regexpGetFlags = function (R) {
-  var flags = R.flags;
-  return flags === undefined && !('flags' in RegExpPrototype$1) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype$1, R)
-    ? call(regExpFlags, R) : flags;
-};
-
-var PROPER_FUNCTION_NAME = functionName.PROPER;
-var defineBuiltIn = defineBuiltIn$a;
-var anObject = anObject$e;
-var $toString = toString$2;
-var fails = fails$g;
-var getRegExpFlags = regexpGetFlags;
-
-var TO_STRING = 'toString';
-var RegExpPrototype = RegExp.prototype;
-var nativeToString = RegExpPrototype[TO_STRING];
-
-var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
-// FF44- RegExp#toString has a wrong name
-var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
-
-// `RegExp.prototype.toString` method
-// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
-if (NOT_GENERIC || INCORRECT_NAME) {
-  defineBuiltIn(RegExpPrototype, TO_STRING, function toString() {
-    var R = anObject(this);
-    var pattern = $toString(R.source);
-    var flags = $toString(getRegExpFlags(R));
-    return '/' + pattern + '/' + flags;
-  }, { unsafe: true });
-}
-
 function fetchURL(input) {
   let url;
   if (typeof input === 'string') {

package/fetch/index.esm.js

@@ -1,4 +1,4 @@
-import { removeTrailingSlashes, asGetter, multiValueMapBuilder, filterMaybeValues, objectToTuples, fixMultiSlashesInSlashPath, isPromiseLike, cachedGetter, FIRST_PAGE, performAsyncTasks, mapIdentityFunction, performTasksFromFactoryInParallelFunction, mergeObjects, useIterableOrValue, isEmptyIterable, fixExtraQueryParameters, forEachInIterable, isIterable, forEachKeyValue } from '@dereekb/util';
+import { removeTrailingSlashes, asGetter, multiValueMapBuilder, filterMaybeValues, objectToTuples, isWebsiteUrlWithPrefix, fixMultiSlashesInSlashPath, isPromiseLike, cachedGetter, FIRST_PAGE, performAsyncTasks, mapIdentityFunction, performTasksFromFactoryInParallelFunction, mergeObjects, useIterableOrValue, isEmptyIterable, fixExtraQueryParameters, forEachInIterable, isIterable, forEachKeyValue } from '@dereekb/util';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -4831,19 +4831,76 @@ $$1({ global: true, constructor: true, forced: !USE_NATIVE_URL, sham: !DESCRIPTO
   URL: URLConstructor
 });
 
+var anObject$1 = anObject$e;
+
+// `RegExp.prototype.flags` getter implementation
+// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
+var regexpFlags = function () {
+  var that = anObject$1(this);
+  var result = '';
+  if (that.hasIndices) result += 'd';
+  if (that.global) result += 'g';
+  if (that.ignoreCase) result += 'i';
+  if (that.multiline) result += 'm';
+  if (that.dotAll) result += 's';
+  if (that.unicode) result += 'u';
+  if (that.unicodeSets) result += 'v';
+  if (that.sticky) result += 'y';
+  return result;
+};
+
+var call = functionCall;
+var hasOwn = hasOwnProperty_1;
+var isPrototypeOf = objectIsPrototypeOf;
+var regExpFlags = regexpFlags;
+
+var RegExpPrototype$1 = RegExp.prototype;
+
+var regexpGetFlags = function (R) {
+  var flags = R.flags;
+  return flags === undefined && !('flags' in RegExpPrototype$1) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype$1, R)
+    ? call(regExpFlags, R) : flags;
+};
+
+var PROPER_FUNCTION_NAME = functionName.PROPER;
+var defineBuiltIn$1 = defineBuiltIn$a;
+var anObject = anObject$e;
+var $toString = toString$2;
+var fails$1 = fails$g;
+var getRegExpFlags = regexpGetFlags;
+
+var TO_STRING = 'toString';
+var RegExpPrototype = RegExp.prototype;
+var nativeToString = RegExpPrototype[TO_STRING];
+
+var NOT_GENERIC = fails$1(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
+// FF44- RegExp#toString has a wrong name
+var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
+
+// `RegExp.prototype.toString` method
+// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
+if (NOT_GENERIC || INCORRECT_NAME) {
+  defineBuiltIn$1(RegExpPrototype, TO_STRING, function toString() {
+    var R = anObject(this);
+    var pattern = $toString(R.source);
+    var flags = $toString(getRegExpFlags(R));
+    return '/' + pattern + '/' + flags;
+  }, { unsafe: true });
+}
+
 var $ = _export;
 var NativePromiseConstructor = promiseNativeConstructor;
-var fails$1 = fails$g;
+var fails = fails$g;
 var getBuiltIn = getBuiltIn$8;
 var isCallable = isCallable$l;
 var speciesConstructor = speciesConstructor$2;
 var promiseResolve = promiseResolve$2;
-var defineBuiltIn$1 = defineBuiltIn$a;
+var defineBuiltIn = defineBuiltIn$a;
 
 var NativePromisePrototype = NativePromiseConstructor && NativePromiseConstructor.prototype;
 
 // Safari bug https://bugs.webkit.org/show_bug.cgi?id=200829
-var NON_GENERIC = !!NativePromiseConstructor && fails$1(function () {
+var NON_GENERIC = !!NativePromiseConstructor && fails(function () {
   // eslint-disable-next-line unicorn/no-thenable -- required for testing
   NativePromisePrototype['finally'].call({ then: function () { /* empty */ } }, function () { /* empty */ });
 });
@@ -4869,7 +4926,7 @@ $({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, {
 if (isCallable(NativePromiseConstructor)) {
   var method = getBuiltIn('Promise').prototype['finally'];
   if (NativePromisePrototype['finally'] !== method) {
-    defineBuiltIn$1(NativePromisePrototype, 'finally', method, { unsafe: true });
+    defineBuiltIn(NativePromisePrototype, 'finally', method, { unsafe: true });
   }
 }
 
@@ -5009,13 +5066,21 @@ function fetchRequestFactory(config) {
     baseRequest: inputBaseRequest,
     timeout,
     requestInitFactory,
-    useBaseUrlForConfiguredFetchRequests = false
+    useBaseUrlForConfiguredFetchRequests = false,
+    forceBaseUrlForWebsiteUrlWithPrefix = useBaseUrlForConfiguredFetchRequests
   } = config;
   const baseUrl = inputBaseUrl ? new URL(removeTrailingSlashes(inputBaseUrl)) : undefined;
   const buildUrl = baseUrl ? url => {
-    // retain the origin and any pathname from the base url
-    const urlPath = baseUrl.origin + fixMultiSlashesInSlashPath('/' + baseUrl.pathname + '/' + url);
-    const result = new URL(urlPath, baseUrl);
+    let result;
+    const urlString = url.toString();
+
+    // retain the origin and any pathname from the base url, unless the url contains a prefix
+    if (!forceBaseUrlForWebsiteUrlWithPrefix && isWebsiteUrlWithPrefix(urlString)) {
+      result = new URL(urlString);
+    } else {
+      const urlPath = baseUrl.origin + fixMultiSlashesInSlashPath('/' + baseUrl.pathname + '/' + url);
+      result = new URL(urlPath, baseUrl);
+    }
     return result;
   } : undefined;
   async function asFetchRequest(input) {
@@ -5450,63 +5515,6 @@ function makeUrlSearchParams(input, options) {
   return searchParams;
 }
 
-var anObject$1 = anObject$e;
-
-// `RegExp.prototype.flags` getter implementation
-// https://tc39.es/ecma262/#sec-get-regexp.prototype.flags
-var regexpFlags = function () {
-  var that = anObject$1(this);
-  var result = '';
-  if (that.hasIndices) result += 'd';
-  if (that.global) result += 'g';
-  if (that.ignoreCase) result += 'i';
-  if (that.multiline) result += 'm';
-  if (that.dotAll) result += 's';
-  if (that.unicode) result += 'u';
-  if (that.unicodeSets) result += 'v';
-  if (that.sticky) result += 'y';
-  return result;
-};
-
-var call = functionCall;
-var hasOwn = hasOwnProperty_1;
-var isPrototypeOf = objectIsPrototypeOf;
-var regExpFlags = regexpFlags;
-
-var RegExpPrototype$1 = RegExp.prototype;
-
-var regexpGetFlags = function (R) {
-  var flags = R.flags;
-  return flags === undefined && !('flags' in RegExpPrototype$1) && !hasOwn(R, 'flags') && isPrototypeOf(RegExpPrototype$1, R)
-    ? call(regExpFlags, R) : flags;
-};
-
-var PROPER_FUNCTION_NAME = functionName.PROPER;
-var defineBuiltIn = defineBuiltIn$a;
-var anObject = anObject$e;
-var $toString = toString$2;
-var fails = fails$g;
-var getRegExpFlags = regexpGetFlags;
-
-var TO_STRING = 'toString';
-var RegExpPrototype = RegExp.prototype;
-var nativeToString = RegExpPrototype[TO_STRING];
-
-var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; });
-// FF44- RegExp#toString has a wrong name
-var INCORRECT_NAME = PROPER_FUNCTION_NAME && nativeToString.name !== TO_STRING;
-
-// `RegExp.prototype.toString` method
-// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
-if (NOT_GENERIC || INCORRECT_NAME) {
-  defineBuiltIn(RegExpPrototype, TO_STRING, function toString() {
-    var R = anObject(this);
-    var pattern = $toString(R.source);
-    var flags = $toString(getRegExpFlags(R));
-    return '/' + pattern + '/' + flags;
-  }, { unsafe: true });
-}
-
 function fetchURL(input) {
   let url;
   if (typeof input === 'string') {

package/fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util/fetch",
-  "version": "11.0.15",
+  "version": "11.0.17",
   ".": {
     "types": "./src/index.d.ts",
     "node": {

package/fetch/src/lib/fetch.d.ts

@@ -76,6 +76,12 @@ export interface FetchRequestFactoryInput {
      * Whether or not to append the base url to RequestInfo that is already configured, instead of only URL or strings.
      */
     useBaseUrlForConfiguredFetchRequests?: boolean;
+    /**
+     * Whether or not to force always using the base url even when a WebsiteUrlWithPrefix value is provided.
+     *
+     * Defaults to useBaseUrlForConfiguredFetchRequests's value.
+     */
+    forceBaseUrlForWebsiteUrlWithPrefix?: boolean;
     /**
      * Base request info to add to each value.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util",
-  "version": "11.0.15",
+  "version": "11.0.17",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",

package/test/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [11.0.17](https://github.com/dereekb/dbx-components/compare/v11.0.16-dev...v11.0.17) (2024-12-05)
+
+
+
+## [11.0.16](https://github.com/dereekb/dbx-components/compare/v11.0.15-dev...v11.0.16) (2024-12-05)
+
+
+
 ## [11.0.15](https://github.com/dereekb/dbx-components/compare/v11.0.14-dev...v11.0.15) (2024-11-29)
 
 

package/test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util/test",
-  "version": "11.0.15",
+  "version": "11.0.17",
   "type": "commonjs",
   "peerDependencies": {
     "@dereekb/util": "*"