@augment-vir/common 17.0.0 → 18.1.0

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removePrefix = exports.addPrefix = void 0;
+function addPrefix({ value, prefix, }) {
+    if (String(value).startsWith(prefix)) {
+        return String(value);
+    }
+    else {
+        return `${prefix}${String(value)}`;
+    }
+}
+exports.addPrefix = addPrefix;
+function removePrefix({ value, prefix, }) {
+    if (value.startsWith(prefix)) {
+        return value.substring(prefix.length);
+    }
+    else {
+        return value;
+    }
+}
+exports.removePrefix = removePrefix;

package/dist/cjs/augments/string/search-params.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchParamStringToObject = exports.objectToSearchParamsString = void 0;
+exports.urlToSearchParamsObject = exports.objectToSearchParamsString = void 0;
 const boolean_1 = require("../boolean");
+const common_string_1 = require("../common-string");
 const matches_object_shape_1 = require("../object/matches-object-shape");
 const runtime_type_of_1 = require("../runtime-type-of");
+const prefixes_1 = require("./prefixes");
 function objectToSearchParamsString(inputObject) {
     const valueStrings = Object.entries(inputObject)
         .map(([key, value,]) => {
@@ -21,13 +23,30 @@ function objectToSearchParamsString(inputObject) {
     }
 }
 exports.objectToSearchParamsString = objectToSearchParamsString;
-function searchParamStringToObject(inputUrl, verifyShape) {
-    const urlForSearchParams = (0, runtime_type_of_1.isRuntimeTypeOf)(inputUrl, 'string') ? new URL(inputUrl) : inputUrl;
-    const searchEntries = Array.from(urlForSearchParams.searchParams.entries());
+function splitSearchString(searchString) {
+    const params = (0, prefixes_1.removePrefix)({ value: searchString, prefix: '?' }).split('&');
+    const paramEntries = params
+        .map((param) => {
+        const [key, ...everythingElse] = (0, common_string_1.typedSplit)(param, '=');
+        const value = everythingElse.join('');
+        if (!value && !key) {
+            return undefined;
+        }
+        return [
+            key,
+            value,
+        ];
+    })
+        .filter(boolean_1.isTruthy);
+    return paramEntries;
+}
+function urlToSearchParamsObject(inputUrl, verifyShape) {
+    const ensuredUrl = (0, runtime_type_of_1.isRuntimeTypeOf)(inputUrl, 'string') ? new URL(inputUrl) : inputUrl;
+    const searchEntries = splitSearchString(ensuredUrl.search);
     const paramsObject = Object.fromEntries(searchEntries);
     if (verifyShape) {
         (0, matches_object_shape_1.assertMatchesObjectShape)(paramsObject, verifyShape);
     }
     return paramsObject;
 }
-exports.searchParamStringToObject = searchParamStringToObject;
+exports.urlToSearchParamsObject = urlToSearchParamsObject;

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

@@ -5,36 +5,36 @@ const number_1 = require("../number");
 exports.percentSuffix = '%';
 exports.pxSuffix = 'px';
 function addPx(input) {
-    return addSuffix(input, exports.pxSuffix);
+    return addSuffix({ value: input, suffix: exports.pxSuffix });
 }
 exports.addPx = addPx;
 function removePx(input) {
-    return (0, number_1.toEnsuredNumber)(input.replace(/px$/, ''));
+    return (0, number_1.toEnsuredNumber)(removeSuffix({ value: input, suffix: exports.pxSuffix }));
 }
 exports.removePx = removePx;
 function addPercent(input) {
-    return addSuffix(input, exports.percentSuffix);
+    return addSuffix({ value: input, suffix: exports.percentSuffix });
 }
 exports.addPercent = addPercent;
 function removePercent(input) {
-    return (0, number_1.toEnsuredNumber)(removeSuffix(input, exports.percentSuffix));
+    return (0, number_1.toEnsuredNumber)(removeSuffix({ value: input, suffix: exports.percentSuffix }));
 }
 exports.removePercent = removePercent;
-function addSuffix(input, suffix) {
-    if (String(input).endsWith(suffix)) {
-        return String(input);
+function addSuffix({ value, suffix, }) {
+    if (String(value).endsWith(suffix)) {
+        return String(value);
     }
     else {
-        return `${String(input)}${suffix}`;
+        return `${String(value)}${suffix}`;
     }
 }
 exports.addSuffix = addSuffix;
-function removeSuffix(input, suffix) {
-    if (input.endsWith(suffix)) {
-        return input.substring(0, input.length - suffix.length);
+function removeSuffix({ value, suffix, }) {
+    if (value.endsWith(suffix)) {
+        return value.substring(0, value.length - suffix.length);
     }
     else {
-        return input;
+        return value;
     }
 }
 exports.removeSuffix = removeSuffix;

package/dist/cjs/index.js

@@ -41,6 +41,7 @@ __exportStar(require("./augments/object/typed-has-property"), exports);
 __exportStar(require("./augments/promise"), exports);
 __exportStar(require("./augments/regexp"), exports);
 __exportStar(require("./augments/runtime-type-of"), exports);
+__exportStar(require("./augments/string/prefixes"), exports);
 __exportStar(require("./augments/string/search-params"), exports);
 __exportStar(require("./augments/string/suffixes"), exports);
 __exportStar(require("./augments/string/url"), exports);

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

@@ -0,0 +1,16 @@
+export function addPrefix({ value, prefix, }) {
+    if (String(value).startsWith(prefix)) {
+        return String(value);
+    }
+    else {
+        return `${prefix}${String(value)}`;
+    }
+}
+export function removePrefix({ value, prefix, }) {
+    if (value.startsWith(prefix)) {
+        return value.substring(prefix.length);
+    }
+    else {
+        return value;
+    }
+}

package/dist/esm/augments/string/search-params.js

@@ -1,6 +1,8 @@
 import { isTruthy } from '../boolean';
+import { typedSplit } from '../common-string';
 import { assertMatchesObjectShape } from '../object/matches-object-shape';
 import { isRuntimeTypeOf } from '../runtime-type-of';
+import { removePrefix } from './prefixes';
 export function objectToSearchParamsString(inputObject) {
     const valueStrings = Object.entries(inputObject)
         .map(([key, value,]) => {
@@ -17,9 +19,26 @@ export function objectToSearchParamsString(inputObject) {
         return '';
     }
 }
-export function searchParamStringToObject(inputUrl, verifyShape) {
-    const urlForSearchParams = isRuntimeTypeOf(inputUrl, 'string') ? new URL(inputUrl) : inputUrl;
-    const searchEntries = Array.from(urlForSearchParams.searchParams.entries());
+function splitSearchString(searchString) {
+    const params = removePrefix({ value: searchString, prefix: '?' }).split('&');
+    const paramEntries = params
+        .map((param) => {
+        const [key, ...everythingElse] = typedSplit(param, '=');
+        const value = everythingElse.join('');
+        if (!value && !key) {
+            return undefined;
+        }
+        return [
+            key,
+            value,
+        ];
+    })
+        .filter(isTruthy);
+    return paramEntries;
+}
+export function urlToSearchParamsObject(inputUrl, verifyShape) {
+    const ensuredUrl = isRuntimeTypeOf(inputUrl, 'string') ? new URL(inputUrl) : inputUrl;
+    const searchEntries = splitSearchString(ensuredUrl.search);
     const paramsObject = Object.fromEntries(searchEntries);
     if (verifyShape) {
         assertMatchesObjectShape(paramsObject, verifyShape);

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

@@ -2,30 +2,30 @@ import { toEnsuredNumber } from '../number';
 export const percentSuffix = '%';
 export const pxSuffix = 'px';
 export function addPx(input) {
-    return addSuffix(input, pxSuffix);
+    return addSuffix({ value: input, suffix: pxSuffix });
 }
 export function removePx(input) {
-    return toEnsuredNumber(input.replace(/px$/, ''));
+    return toEnsuredNumber(removeSuffix({ value: input, suffix: pxSuffix }));
 }
 export function addPercent(input) {
-    return addSuffix(input, percentSuffix);
+    return addSuffix({ value: input, suffix: percentSuffix });
 }
 export function removePercent(input) {
-    return toEnsuredNumber(removeSuffix(input, percentSuffix));
+    return toEnsuredNumber(removeSuffix({ value: input, suffix: percentSuffix }));
 }
-export function addSuffix(input, suffix) {
-    if (String(input).endsWith(suffix)) {
-        return String(input);
+export function addSuffix({ value, suffix, }) {
+    if (String(value).endsWith(suffix)) {
+        return String(value);
     }
     else {
-        return `${String(input)}${suffix}`;
+        return `${String(value)}${suffix}`;
     }
 }
-export function removeSuffix(input, suffix) {
-    if (input.endsWith(suffix)) {
-        return input.substring(0, input.length - suffix.length);
+export function removeSuffix({ value, suffix, }) {
+    if (value.endsWith(suffix)) {
+        return value.substring(0, value.length - suffix.length);
     }
     else {
-        return input;
+        return value;
     }
 }

package/dist/esm/index.js

@@ -25,6 +25,7 @@ export * from './augments/object/typed-has-property';
 export * from './augments/promise';
 export * from './augments/regexp';
 export * from './augments/runtime-type-of';
+export * from './augments/string/prefixes';
 export * from './augments/string/search-params';
 export * from './augments/string/suffixes';
 export * from './augments/string/url';

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

@@ -0,0 +1,9 @@
+export type WithPrefix<Prefix extends string> = `${Prefix}${string}`;
+export declare function addPrefix<const Prefix extends string>({ value, prefix, }: {
+    value: unknown;
+    prefix: Prefix;
+}): WithPrefix<Prefix>;
+export declare function removePrefix<const Prefix extends string>({ value, prefix, }: {
+    value: WithPrefix<Prefix> | string;
+    prefix: Prefix;
+}): string;

package/dist/types/augments/string/search-params.d.ts

@@ -1,5 +1,5 @@
 import { Primitive } from 'type-fest';
 export type SearchParamObjectBase = Record<string, Exclude<Primitive, symbol>>;
 export declare function objectToSearchParamsString(inputObject: SearchParamObjectBase): string;
-export declare function searchParamStringToObject<VerifyShapeGeneric extends SearchParamObjectBase>(inputUrl: string | Pick<URL, 'searchParams'>, verifyShape: VerifyShapeGeneric): VerifyShapeGeneric;
-export declare function searchParamStringToObject<VerifyShapeGeneric extends SearchParamObjectBase>(inputUrl: string | Pick<URL, 'searchParams'>, verifyShape?: VerifyShapeGeneric | undefined): Record<string, string>;
+export declare function urlToSearchParamsObject<VerifyShapeGeneric extends SearchParamObjectBase>(inputUrl: string | Pick<URL, 'search'>, verifyShape: VerifyShapeGeneric): VerifyShapeGeneric;
+export declare function urlToSearchParamsObject<VerifyShapeGeneric extends SearchParamObjectBase>(inputUrl: string | Pick<URL, 'search'>, verifyShape?: VerifyShapeGeneric | undefined): Record<string, string>;

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

@@ -7,5 +7,11 @@ export declare function addPx(input: number | string): WithPx;
 export declare function removePx(input: string): number;
 export declare function addPercent(input: number | string): WithPercent;
 export declare function removePercent(input: string): number;
-export declare function addSuffix<const Suffix extends string>(input: unknown, suffix: Suffix): WithSuffix<Suffix>;
-export declare function removeSuffix<const Suffix extends string>(input: WithSuffix<Suffix> | string, suffix: Suffix): string;
+export declare function addSuffix<const Suffix extends string>({ value, suffix, }: {
+    value: unknown;
+    suffix: Suffix;
+}): WithSuffix<Suffix>;
+export declare function removeSuffix<const Suffix extends string>({ value, suffix, }: {
+    value: WithSuffix<Suffix> | string;
+    suffix: Suffix;
+}): string;

package/dist/types/index.d.ts

@@ -25,6 +25,7 @@ export * from './augments/object/typed-has-property';
 export * from './augments/promise';
 export * from './augments/regexp';
 export * from './augments/runtime-type-of';
+export * from './augments/string/prefixes';
 export * from './augments/string/search-params';
 export * from './augments/string/suffixes';
 export * from './augments/string/url';

package/package.json

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