@augment-vir/common 13.1.0 → 13.2.1

package/dist/cjs/augments/async.js

@@ -21,7 +21,7 @@ async function awaitedBlockingMap(input, callback) {
 }
 exports.awaitedBlockingMap = awaitedBlockingMap;
 async function awaitedFilter(arrayInput, filterCallback, options) {
-    const callbackResults = (options === null || options === void 0 ? void 0 : options.blocking)
+    const callbackResults = options?.blocking
         ? await awaitedBlockingMap(arrayInput, filterCallback)
         : await Promise.all(arrayInput.map(filterCallback));
     return arrayInput.filter((originalValue, index) => !!callbackResults[index]);

package/dist/cjs/augments/object/matches-object-shape.js

@@ -55,7 +55,6 @@ function assertMatchesObjectShape(testThisOne, compareToThisOne, allowExtraProps
         }
     }
     matchKeys.forEach((key) => {
-        var _a;
         if (!(0, typed_has_property_1.typedHasProperty)(testThisOne, key)) {
             throw new Error(`test object does not have key "${String(key)}" from expected shape.`);
         }
@@ -65,13 +64,12 @@ function assertMatchesObjectShape(testThisOne, compareToThisOne, allowExtraProps
         const testValue = testThisOne[key];
         const shouldMatch = compareToThisOne[key];
         if (!noCheckInnerValueOfTheseKeys[key]) {
-            compareInnerValue(testValue, shouldMatch, throwKeyError, allowExtraProps, (_a = noCheckInnerValueOfTheseKeys[key]) !== null && _a !== void 0 ? _a : {});
+            compareInnerValue(testValue, shouldMatch, throwKeyError, allowExtraProps, noCheckInnerValueOfTheseKeys[key] ?? {});
         }
     });
 }
 exports.assertMatchesObjectShape = assertMatchesObjectShape;
 function compareInnerValue(testValue, matchValue, throwKeyError, allowExtraProps, noCheckInnerValueOfTheseKeys) {
-    var _a;
     const testType = typeof testValue;
     const shouldMatchType = typeof matchValue;
     if (testType !== shouldMatchType) {
@@ -81,7 +79,7 @@ function compareInnerValue(testValue, matchValue, throwKeyError, allowExtraProps
         if ((0, typed_has_property_1.typedHasProperty)(matchValue, 'constructor')) {
             if (!(0, typed_has_property_1.typedHasProperty)(testValue, 'constructor') ||
                 testValue.constructor !== matchValue.constructor) {
-                throwKeyError(`constructor "${(_a = testValue === null || testValue === void 0 ? void 0 : testValue.constructor) === null || _a === void 0 ? void 0 : _a.name}" did not match expected constructor "${matchValue.constructor}"`);
+                throwKeyError(`constructor "${testValue?.constructor?.name}" did not match expected constructor "${matchValue.constructor}"`);
             }
         }
     }

package/dist/cjs/augments/object/object-entries.js

@@ -12,10 +12,11 @@ function getObjectTypedKeys(input) {
         reflectKeys = Reflect.ownKeys(input);
     }
     catch (error) { }
-    return (reflectKeys !== null && reflectKeys !== void 0 ? reflectKeys : [
-        ...Object.keys(input),
-        ...Object.getOwnPropertySymbols(input),
-    ]);
+    return (reflectKeys ??
+        [
+            ...Object.keys(input),
+            ...Object.getOwnPropertySymbols(input),
+        ]);
 }
 exports.getObjectTypedKeys = getObjectTypedKeys;
 function getObjectTypedValues(input) {

package/dist/cjs/augments/regexp.js

@@ -15,6 +15,6 @@ function addRegExpFlags(originalRegExp, flags) {
 exports.addRegExpFlags = addRegExpFlags;
 function safeMatch(input, regExp) {
     const match = input.match(regExp);
-    return match !== null && match !== void 0 ? match : [];
+    return match ?? [];
 }
 exports.safeMatch = safeMatch;

package/dist/cjs/augments/string/url.d.ts

@@ -1,6 +1,6 @@
 /**
  * Joins all given arguments together as if they were parts of a URL. Preserves trailing slashes and
- * removes consecutive slashes in the path. This also encodes each part of the
+ * removes consecutive slashes in the path. This also encodes each URL part.
  *
  * @example: joinToUrl('https://example.com', 'path1', 'path2/', '/path3/') === 'https://example.com/path1/path2/path3/'
  */

package/dist/cjs/augments/string/url.js

@@ -4,7 +4,7 @@ exports.joinUrlParts = void 0;
 const protocolSplit = '://';
 /**
  * Joins all given arguments together as if they were parts of a URL. Preserves trailing slashes and
- * removes consecutive slashes in the path. This also encodes each part of the
+ * removes consecutive slashes in the path. This also encodes each URL part.
  *
  * @example: joinToUrl('https://example.com', 'path1', 'path2/', '/path3/') === 'https://example.com/path1/path2/path3/'
  */
@@ -16,10 +16,54 @@ function joinUrlParts(...urlParts) {
             '',
             rawJoined,
         ];
+    let mapSearchParamsStarted = false;
+    let reduceSearchParamsStarted = false;
     const fixedRest = rawRest
         .replace(/\/{2,}/g, '/')
         .split('/')
-        .map((part) => encodeURIComponent(part));
+        .map((part) => {
+        if (part.includes('?') || mapSearchParamsStarted) {
+            mapSearchParamsStarted = true;
+            return part;
+        }
+        else {
+            return encodeURIComponent(part);
+        }
+    })
+        .reduce((fillingUpArray, currentEntry, currentIndex, inputArray) => {
+        if (reduceSearchParamsStarted) {
+            return fillingUpArray;
+        }
+        const nextEntry = inputArray[currentIndex + 1];
+        let newEntry = currentEntry;
+        const nextHasQuestion = !currentEntry.includes('?') && nextEntry?.startsWith('?');
+        if (nextEntry?.startsWith('?') || nextHasQuestion) {
+            reduceSearchParamsStarted = true;
+            let foundHash = false;
+            const subsequentSearchParams = inputArray
+                .slice(nextHasQuestion ? currentIndex + 2 : currentIndex + 1)
+                .reduce((joinedParams, currentParam) => {
+                if (currentParam.includes('#')) {
+                    foundHash = true;
+                }
+                if (foundHash) {
+                    return joinedParams.concat(currentParam);
+                }
+                else {
+                    return [
+                        joinedParams,
+                        currentParam,
+                    ].join('&');
+                }
+            }, '');
+            newEntry = [
+                currentEntry,
+                nextEntry,
+                subsequentSearchParams,
+            ].join('');
+        }
+        return fillingUpArray.concat(newEntry);
+    }, []);
     return [
         protocol,
         protocol ? protocolSplit : '',

package/dist/esm/augments/async.js

@@ -16,7 +16,7 @@ export async function awaitedBlockingMap(input, callback) {
     return mappedValues;
 }
 export async function awaitedFilter(arrayInput, filterCallback, options) {
-    const callbackResults = (options === null || options === void 0 ? void 0 : options.blocking)
+    const callbackResults = options?.blocking
         ? await awaitedBlockingMap(arrayInput, filterCallback)
         : await Promise.all(arrayInput.map(filterCallback));
     return arrayInput.filter((originalValue, index) => !!callbackResults[index]);

package/dist/esm/augments/object/matches-object-shape.js

@@ -51,7 +51,6 @@ export function assertMatchesObjectShape(testThisOne, compareToThisOne, allowExt
         }
     }
     matchKeys.forEach((key) => {
-        var _a;
         if (!typedHasProperty(testThisOne, key)) {
             throw new Error(`test object does not have key "${String(key)}" from expected shape.`);
         }
@@ -61,12 +60,11 @@ export function assertMatchesObjectShape(testThisOne, compareToThisOne, allowExt
         const testValue = testThisOne[key];
         const shouldMatch = compareToThisOne[key];
         if (!noCheckInnerValueOfTheseKeys[key]) {
-            compareInnerValue(testValue, shouldMatch, throwKeyError, allowExtraProps, (_a = noCheckInnerValueOfTheseKeys[key]) !== null && _a !== void 0 ? _a : {});
+            compareInnerValue(testValue, shouldMatch, throwKeyError, allowExtraProps, noCheckInnerValueOfTheseKeys[key] ?? {});
         }
     });
 }
 function compareInnerValue(testValue, matchValue, throwKeyError, allowExtraProps, noCheckInnerValueOfTheseKeys) {
-    var _a;
     const testType = typeof testValue;
     const shouldMatchType = typeof matchValue;
     if (testType !== shouldMatchType) {
@@ -76,7 +74,7 @@ function compareInnerValue(testValue, matchValue, throwKeyError, allowExtraProps
         if (typedHasProperty(matchValue, 'constructor')) {
             if (!typedHasProperty(testValue, 'constructor') ||
                 testValue.constructor !== matchValue.constructor) {
-                throwKeyError(`constructor "${(_a = testValue === null || testValue === void 0 ? void 0 : testValue.constructor) === null || _a === void 0 ? void 0 : _a.name}" did not match expected constructor "${matchValue.constructor}"`);
+                throwKeyError(`constructor "${testValue?.constructor?.name}" did not match expected constructor "${matchValue.constructor}"`);
             }
         }
     }

package/dist/esm/augments/object/object-entries.js

@@ -8,10 +8,11 @@ export function getObjectTypedKeys(input) {
         reflectKeys = Reflect.ownKeys(input);
     }
     catch (error) { }
-    return (reflectKeys !== null && reflectKeys !== void 0 ? reflectKeys : [
-        ...Object.keys(input),
-        ...Object.getOwnPropertySymbols(input),
-    ]);
+    return (reflectKeys ??
+        [
+            ...Object.keys(input),
+            ...Object.getOwnPropertySymbols(input),
+        ]);
 }
 export function getObjectTypedValues(input) {
     return getObjectTypedKeys(input).map((key) => input[key]);

package/dist/esm/augments/regexp.js

@@ -10,5 +10,5 @@ export function addRegExpFlags(originalRegExp, flags) {
 }
 export function safeMatch(input, regExp) {
     const match = input.match(regExp);
-    return match !== null && match !== void 0 ? match : [];
+    return match ?? [];
 }

package/dist/esm/augments/string/url.d.ts

@@ -1,6 +1,6 @@
 /**
  * Joins all given arguments together as if they were parts of a URL. Preserves trailing slashes and
- * removes consecutive slashes in the path. This also encodes each part of the
+ * removes consecutive slashes in the path. This also encodes each URL part.
  *
  * @example: joinToUrl('https://example.com', 'path1', 'path2/', '/path3/') === 'https://example.com/path1/path2/path3/'
  */

package/dist/esm/augments/string/url.js

@@ -1,7 +1,7 @@
 const protocolSplit = '://';
 /**
  * Joins all given arguments together as if they were parts of a URL. Preserves trailing slashes and
- * removes consecutive slashes in the path. This also encodes each part of the
+ * removes consecutive slashes in the path. This also encodes each URL part.
  *
  * @example: joinToUrl('https://example.com', 'path1', 'path2/', '/path3/') === 'https://example.com/path1/path2/path3/'
  */
@@ -13,10 +13,54 @@ export function joinUrlParts(...urlParts) {
             '',
             rawJoined,
         ];
+    let mapSearchParamsStarted = false;
+    let reduceSearchParamsStarted = false;
     const fixedRest = rawRest
         .replace(/\/{2,}/g, '/')
         .split('/')
-        .map((part) => encodeURIComponent(part));
+        .map((part) => {
+        if (part.includes('?') || mapSearchParamsStarted) {
+            mapSearchParamsStarted = true;
+            return part;
+        }
+        else {
+            return encodeURIComponent(part);
+        }
+    })
+        .reduce((fillingUpArray, currentEntry, currentIndex, inputArray) => {
+        if (reduceSearchParamsStarted) {
+            return fillingUpArray;
+        }
+        const nextEntry = inputArray[currentIndex + 1];
+        let newEntry = currentEntry;
+        const nextHasQuestion = !currentEntry.includes('?') && nextEntry?.startsWith('?');
+        if (nextEntry?.startsWith('?') || nextHasQuestion) {
+            reduceSearchParamsStarted = true;
+            let foundHash = false;
+            const subsequentSearchParams = inputArray
+                .slice(nextHasQuestion ? currentIndex + 2 : currentIndex + 1)
+                .reduce((joinedParams, currentParam) => {
+                if (currentParam.includes('#')) {
+                    foundHash = true;
+                }
+                if (foundHash) {
+                    return joinedParams.concat(currentParam);
+                }
+                else {
+                    return [
+                        joinedParams,
+                        currentParam,
+                    ].join('&');
+                }
+            }, '');
+            newEntry = [
+                currentEntry,
+                nextEntry,
+                subsequentSearchParams,
+            ].join('');
+        }
+        return fillingUpArray.concat(newEntry);
+    }, []);
     return [
         protocol,
         protocol ? protocolSplit : '',

package/dist/types/augments/string/url.d.ts

@@ -1,6 +1,6 @@
 /**
  * Joins all given arguments together as if they were parts of a URL. Preserves trailing slashes and
- * removes consecutive slashes in the path. This also encodes each part of the
+ * removes consecutive slashes in the path. This also encodes each URL part.
  *
  * @example: joinToUrl('https://example.com', 'path1', 'path2/', '/path3/') === 'https://example.com/path1/path2/path3/'
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@augment-vir/common",
-    "version": "13.1.0",
+    "version": "13.2.1",
     "homepage": "https://github.com/electrovir/augment-vir/tree/main/packages/common",
     "bugs": {
         "url": "https://github.com/electrovir/augment-vir/issues"