@dereekb/util 9.12.3 → 9.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/fetch/CHANGELOG.md +18 -0
- package/fetch/package.json +2 -2
- package/fetch/src/lib/fetch.js +5 -2
- package/fetch/src/lib/fetch.js.map +1 -1
- package/fetch/src/lib/url.d.ts +1 -1
- package/fetch/src/lib/url.js +8 -3
- package/fetch/src/lib/url.js.map +1 -1
- package/package.json +1 -1
- package/src/lib/path/path.d.ts +1 -0
- package/src/lib/path/path.js +5 -1
- package/src/lib/path/path.js.map +1 -1
- package/src/lib/string/replace.d.ts +3 -0
- package/src/lib/string/replace.js +19 -8
- package/src/lib/string/replace.js.map +1 -1
- package/src/lib/string/url.d.ts +8 -0
- package/src/lib/string/url.js +27 -2
- package/src/lib/string/url.js.map +1 -1
- package/test/CHANGELOG.md +8 -0
- package/test/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,24 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [9.13.0](https://github.com/dereekb/dbx-components/compare/v9.12.4-dev...v9.13.0) (2022-11-08)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* fixed issue where empty queries were being appended to url ([2c787e8](https://github.com/dereekb/dbx-components/commit/2c787e83b505ef48b84034a22a66fcc2e478014f))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [9.12.4](https://github.com/dereekb/dbx-components/compare/v9.12.3-dev...v9.12.4) (2022-11-08)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* fixed fetch issues ([8859b49](https://github.com/dereekb/dbx-components/commit/8859b4967030e9cecc336195f4d12551b9cc8d93))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
5
23
|
## [9.12.3](https://github.com/dereekb/dbx-components/compare/v9.12.2-dev...v9.12.3) (2022-11-07)
|
|
6
24
|
|
|
7
25
|
|
package/fetch/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,24 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [9.13.0](https://github.com/dereekb/dbx-components/compare/v9.12.4-dev...v9.13.0) (2022-11-08)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* fixed issue where empty queries were being appended to url ([2c787e8](https://github.com/dereekb/dbx-components/commit/2c787e83b505ef48b84034a22a66fcc2e478014f))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [9.12.4](https://github.com/dereekb/dbx-components/compare/v9.12.3-dev...v9.12.4) (2022-11-08)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* fixed fetch issues ([8859b49](https://github.com/dereekb/dbx-components/commit/8859b4967030e9cecc336195f4d12551b9cc8d93))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
5
23
|
## [9.12.3](https://github.com/dereekb/dbx-components/compare/v9.12.2-dev...v9.12.3) (2022-11-07)
|
|
6
24
|
|
|
7
25
|
|
package/fetch/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/util/fetch",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.13.0",
|
|
4
4
|
"main": "./src/index.js",
|
|
5
5
|
"typings": "./src/index.d.ts",
|
|
6
6
|
"dependencies": {},
|
|
7
7
|
"peerDependencies": {
|
|
8
|
-
"@dereekb/util": "9.
|
|
8
|
+
"@dereekb/util": "9.13.0",
|
|
9
9
|
"lodash.isequal": "^4.5.0",
|
|
10
10
|
"make-error": "^1.3.0",
|
|
11
11
|
"class-validator": "^0.13.2",
|
package/fetch/src/lib/fetch.js
CHANGED
|
@@ -49,11 +49,14 @@ function configureFetch(config) {
|
|
|
49
49
|
exports.configureFetch = configureFetch;
|
|
50
50
|
function fetchRequestFactory(config) {
|
|
51
51
|
const { makeRequest = (input, init) => new Request(input, init), baseUrl: inputBaseUrl, baseRequest: inputBaseRequest, timeout, requestInitFactory, useBaseUrlForConfiguredFetchRequests = false } = config;
|
|
52
|
-
const baseUrl = inputBaseUrl ? new URL((0, util_1.
|
|
52
|
+
const baseUrl = inputBaseUrl ? new URL((0, util_1.removeTrailingSlashes)(inputBaseUrl)) : undefined;
|
|
53
53
|
const baseRequest = timeout ? Object.assign(Object.assign({}, inputBaseRequest), { timeout }) : inputBaseRequest;
|
|
54
54
|
const buildUrl = baseUrl
|
|
55
55
|
? (url) => {
|
|
56
|
-
|
|
56
|
+
// retain the origin and any pathname from the base url
|
|
57
|
+
const urlPath = baseUrl.origin + (0, util_1.fixMultiSlashesInSlashPath)('/' + baseUrl.pathname + '/' + url);
|
|
58
|
+
const result = new URL(urlPath, baseUrl);
|
|
59
|
+
return result;
|
|
57
60
|
}
|
|
58
61
|
: undefined;
|
|
59
62
|
function asFetchRequest(input) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/fetch.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/fetch.ts"],"names":[],"mappings":"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"}
|
package/fetch/src/lib/url.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export interface FetchURLConfiguration {
|
|
|
11
11
|
queryParams?: FetchURLQueryParamsInput;
|
|
12
12
|
}
|
|
13
13
|
export declare type FetchURLInput = SimpleFetchURLInput | FetchURLConfiguration;
|
|
14
|
-
export declare function fetchURL(input: FetchURLInput):
|
|
14
|
+
export declare function fetchURL(input: FetchURLInput): string;
|
|
15
15
|
export declare function isURL(input: unknown): input is URL;
|
|
16
16
|
export declare function isURLSearchParams(input: unknown): input is URLSearchParams;
|
|
17
17
|
export declare type FetchURLQueryParamsInput = URLSearchParams | FetchURLSearchParamsObject | Iterable<FetchURLQueryKeyValueStringTuple> | Iterable<FetchURLQueryKeyValueTuple> | string;
|
package/fetch/src/lib/url.js
CHANGED
|
@@ -5,16 +5,21 @@ const util_1 = require("@dereekb/util");
|
|
|
5
5
|
function fetchURL(input) {
|
|
6
6
|
let url;
|
|
7
7
|
if (typeof input === 'string') {
|
|
8
|
-
url =
|
|
8
|
+
url = input;
|
|
9
9
|
}
|
|
10
10
|
else if (isURL(input)) {
|
|
11
|
-
url = input;
|
|
11
|
+
url = input.href;
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
14
|
const baseUrl = fetchURL(input.url);
|
|
15
15
|
if (input.queryParams) {
|
|
16
16
|
const searchParams = queryParamsToSearchParams(input.queryParams);
|
|
17
|
-
|
|
17
|
+
if (!(0, util_1.isEmptyIterable)(searchParams)) {
|
|
18
|
+
url = (0, util_1.fixExtraQueryParameters)(baseUrl + `?${searchParams.toString()}`);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
url = baseUrl;
|
|
22
|
+
}
|
|
18
23
|
}
|
|
19
24
|
else {
|
|
20
25
|
url = baseUrl;
|
package/fetch/src/lib/url.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/url.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../../../../../packages/util/fetch/src/lib/url.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/lib/path/path.d.ts
CHANGED
|
@@ -90,6 +90,7 @@ export declare function toRelativeSlashPathStartType(input: SlashPath): SlashPat
|
|
|
90
90
|
export declare function toAbsoluteSlashPathStartType(input: SlashPath): SlashPath;
|
|
91
91
|
export declare function fixMultiSlashesInSlashPath(input: SlashPath): SlashPath;
|
|
92
92
|
export declare function replaceMultipleFilePathsInSlashPath(input: SlashPath): SlashPath;
|
|
93
|
+
export declare function removeTrailingSlashes(input: SlashPath): SlashPath;
|
|
93
94
|
export declare function removeTrailingFileTypeSeparators(input: SlashPath): SlashPath;
|
|
94
95
|
/**
|
|
95
96
|
* Replaces all extra and invalidate FilePathTypeSeparator values from the SlashPath, returning a valid SlashPath.
|
package/src/lib/path/path.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isolateSlashPathFunction = exports.isolateSlashPath = exports.slashPathInvalidError = exports.mergeSlashPaths = exports.slashPathFactory = exports.slashPathValidationFactory = exports.replaceInvalidFilePathTypeSeparatorsInSlashPathFunction = exports.replaceInvalidFilePathTypeSeparatorsInSlashPath = exports.removeTrailingFileTypeSeparators = exports.replaceMultipleFilePathsInSlashPath = exports.fixMultiSlashesInSlashPath = exports.toAbsoluteSlashPathStartType = exports.toRelativeSlashPathStartType = exports.ALL_SLASH_PATH_FILE_TYPE_SEPARATORS_REGEX = exports.ALL_DOUBLE_SLASHES_REGEX = exports.ALL_SLASHES_REGEX = exports.TRAILING_FILE_TYPE_SEPARATORS_REGEX = exports.TRAILING_SLASHES_REGEX = exports.LEADING_SLASHES_REGEX = exports.slashPathStartTypeFactory = exports.slashPathParts = exports.slashPathName = exports.isValidSlashPath = exports.isSlashPathFolder = exports.isSlashPathTypedFile = exports.isSlashPathFile = exports.slashPathType = exports.DEFAULT_SLASH_PATH_ILLEGAL_CHARACTER_REPLACEMENT = exports.DEFAULT_SLASH_PATH_ILLEGAL_CHARACTERS = exports.SLASH_PATH_FILE_TYPE_SEPARATOR = exports.SLASH_PATH_SEPARATOR = void 0;
|
|
3
|
+
exports.isolateSlashPathFunction = exports.isolateSlashPath = exports.slashPathInvalidError = exports.mergeSlashPaths = exports.slashPathFactory = exports.slashPathValidationFactory = exports.replaceInvalidFilePathTypeSeparatorsInSlashPathFunction = exports.replaceInvalidFilePathTypeSeparatorsInSlashPath = exports.removeTrailingFileTypeSeparators = exports.removeTrailingSlashes = exports.replaceMultipleFilePathsInSlashPath = exports.fixMultiSlashesInSlashPath = exports.toAbsoluteSlashPathStartType = exports.toRelativeSlashPathStartType = exports.ALL_SLASH_PATH_FILE_TYPE_SEPARATORS_REGEX = exports.ALL_DOUBLE_SLASHES_REGEX = exports.ALL_SLASHES_REGEX = exports.TRAILING_FILE_TYPE_SEPARATORS_REGEX = exports.TRAILING_SLASHES_REGEX = exports.LEADING_SLASHES_REGEX = exports.slashPathStartTypeFactory = exports.slashPathParts = exports.slashPathName = exports.isValidSlashPath = exports.isSlashPathFolder = exports.isSlashPathTypedFile = exports.isSlashPathFile = exports.slashPathType = exports.DEFAULT_SLASH_PATH_ILLEGAL_CHARACTER_REPLACEMENT = exports.DEFAULT_SLASH_PATH_ILLEGAL_CHARACTERS = exports.SLASH_PATH_FILE_TYPE_SEPARATOR = exports.SLASH_PATH_SEPARATOR = void 0;
|
|
4
4
|
const map_1 = require("../value/map");
|
|
5
5
|
const array_1 = require("../array/array");
|
|
6
6
|
const string_1 = require("../string");
|
|
@@ -130,6 +130,10 @@ function replaceMultipleFilePathsInSlashPath(input) {
|
|
|
130
130
|
return input.replace(exports.ALL_DOUBLE_SLASHES_REGEX, exports.SLASH_PATH_SEPARATOR);
|
|
131
131
|
}
|
|
132
132
|
exports.replaceMultipleFilePathsInSlashPath = replaceMultipleFilePathsInSlashPath;
|
|
133
|
+
function removeTrailingSlashes(input) {
|
|
134
|
+
return input.replace(exports.TRAILING_SLASHES_REGEX, '');
|
|
135
|
+
}
|
|
136
|
+
exports.removeTrailingSlashes = removeTrailingSlashes;
|
|
133
137
|
function removeTrailingFileTypeSeparators(input) {
|
|
134
138
|
return input.replace(exports.TRAILING_FILE_TYPE_SEPARATORS_REGEX, '');
|
|
135
139
|
}
|
package/src/lib/path/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/path/path.ts"],"names":[],"mappings":";;;AAAA,sCAAsE;AACtE,0CAAmF;AACnF,sCAAqI;AACrI,oCAAqG;AAErG,sDAA+D;AAElD,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAC3B,QAAA,8BAA8B,GAAG,GAAG,CAAC;AAKrC,QAAA,qCAAqC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE/E;;GAEG;AACU,QAAA,gDAAgD,GAAG,GAAG,CAAC;AAoCpE;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,KAAgB;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,sCAA8B,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3E,IAAI,IAAmB,CAAC;IAExB,QAAQ,QAAQ,EAAE;QAChB,KAAK,CAAC;YACJ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,IAAI,GAAG,SAAS,CAAC;aAClB;iBAAM;gBACL,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAE1C,IAAI,SAAS,KAAK,4BAAoB,EAAE;oBACtC,IAAI,GAAG,QAAQ,CAAC;iBACjB;qBAAM;oBACL,IAAI,GAAG,MAAM,CAAC;iBACf;aACF;YACD,MAAM;QACR,KAAK,CAAC;YACJ,IAAI,GAAG,WAAW,CAAC;YACnB,MAAM;QACR;YACE,IAAI,GAAG,SAAS,CAAC;YACjB,MAAM;KACT;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,sCA2BC;AAED,SAAgB,eAAe,CAAC,KAAa;IAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,WAAW,CAAC;AACjD,CAAC;AAHD,0CAGC;AAED,SAAgB,oBAAoB,CAAC,KAAa;IAChD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,IAAI,KAAK,WAAW,CAAC;AAC9B,CAAC;AAHD,oDAGC;AAED,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,OAAO,aAAa,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC;AAC3C,CAAC;AAFD,8CAEC;AAED,SAAgB,gBAAgB,CAAC,KAAa;IAC5C,OAAO,aAAa,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAC5C,CAAC;AAFD,4CAEC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,SAAoB;IAChD,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC;AAHD,sCAGC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,SAAoB;IACjD,OAAO,SAAS,CAAC,KAAK,CAAC,4BAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAFD,wCAEC;AAeD,SAAgB,yBAAyB,CAAC,IAAwB;IAChE,IAAI,EAA6B,CAAC;IAElC,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU;YACb,EAAE,GAAG,4BAA4B,CAAC;YAClC,MAAM;QACR,KAAK,UAAU;YACb,EAAE,GAAG,4BAA4B,CAAC;YAClC,MAAM;QACR,KAAK,KAAK;YACR,EAAE,GAAG,IAAA,2BAAmB,GAAE,CAAC;YAC3B,MAAM;KACT;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAhBD,8DAgBC;AAEY,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC/B,QAAA,sBAAsB,GAAG,MAAM,CAAC;AAChC,QAAA,mCAAmC,GAAG,MAAM,CAAC;AAC7C,QAAA,iBAAiB,GAAG,MAAM,CAAC;AAC3B,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,yCAAyC,GAAG,MAAM,CAAC;AAEhE,SAAgB,4BAA4B,CAAC,KAAgB;IAC3D,6BAA6B;IAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,6BAAqB,EAAE,EAAE,CAAC,CAAC;AAClD,CAAC;AAHD,oEAGC;AAED;;;;GAIG;AACH,SAAgB,4BAA4B,CAAC,KAAgB;IAC3D,mEAAmE;IACnE,OAAO,KAAK,CAAC,UAAU,CAAC,4BAAoB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,6BAAqB,EAAE,4BAAoB,CAAC,CAAC,CAAC,CAAC,GAAG,4BAAoB,GAAG,KAAK,EAAE,CAAC;AACjJ,CAAC;AAHD,oEAGC;AAED,SAAgB,0BAA0B,CAAC,KAAgB;IACzD,OAAO,KAAK,CAAC,OAAO,CAAC,gCAAwB,EAAE,4BAAoB,CAAC,CAAC;AACvE,CAAC;AAFD,gEAEC;AAED,SAAgB,mCAAmC,CAAC,KAAgB;IAClE,OAAO,KAAK,CAAC,OAAO,CAAC,gCAAwB,EAAE,4BAAoB,CAAC,CAAC;AACvE,CAAC;AAFD,kFAEC;AAED,SAAgB,gCAAgC,CAAC,KAAgB;IAC/D,OAAO,KAAK,CAAC,OAAO,CAAC,2CAAmC,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAFD,4EAEC;AAED;;;;;;GAMG;AACH,SAAgB,+CAA+C,CAAC,KAAgB,EAAE,WAAoB;IACpG,OAAO,uDAAuD,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC;AACrF,CAAC;AAFD,0GAEC;AAED;;;;;;GAMG;AACH,SAAgB,uDAAuD,CAAC,cAAsB,wDAAgD;IAC5I,OAAO,CAAC,KAAgB,EAAE,EAAE;QAC1B,MAAM,uBAAuB,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,sCAA8B,CAAC;QAC3F,MAAM,eAAe,GAAG,uBAAuB,CAAC,CAAC,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAClG,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,wCAA+B,EAAC,eAAe,EAAE,sCAA8B,CAAC,CAAC;QAErH,IAAI,SAAoB,CAAC;QAEzB,QAAQ,UAAU,EAAE;YAClB,KAAK,CAAC;gBACJ,SAAS,GAAG,eAAe,CAAC;gBAC5B,MAAM;YACR,KAAK,CAAC;gBACJ,MAAM,iBAAiB,GAAG,eAAe,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBAE3D,IAAI,iBAAiB,KAAK,CAAC,CAAC,IAAI,iBAAiB,GAAG,IAAI,EAAE;oBACxD,aAAa;oBACb,SAAS,GAAG,eAAe,CAAC;iBAC7B;qBAAM;oBACL,+DAA+D;oBAC/D,SAAS,GAAG,IAAA,oCAA2B,EAAC,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;iBAC7E;gBACD,MAAM;YACR;gBACE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAA,2BAAkB,EAAC,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrE,MAAM,0BAA0B,GAAG,IAAI,CAAC,OAAO,CAAC,iDAAyC,EAAE,WAAW,CAAC,CAAC;gBAExG,SAAS,GAAG,0BAA0B,GAAG,IAAI,CAAC;gBAC9C,MAAM;SACT;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AAjCD,0HAiCC;AAgCD,SAAgB,0BAA0B,CAAC,MAAyC;IAClF,MAAM,EAAE,cAAc,GAAG,6CAAqC,EAAE,wBAAwB,EAAE,6BAA6B,GAAG,IAAI,EAAE,kBAAkB,EAAE,uBAAuB,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAChN,MAAM,GAAG,GAAiC,EAAE,CAAC;IAE7C,MAAM,wBAAwB,GAAG,OAAO,6BAA6B,KAAK,QAAQ,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,wDAAgD,CAAC;IAEtK,IAAI,6BAA6B,IAAI,IAAI,EAAE;QACzC,GAAG,CAAC,IAAI,CACN,IAAA,+BAAsB,EAAC;YACrB,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,wBAAwB;SACtC,CAAC,CACH,CAAC;KACH;IAED,IAAI,uBAAuB,IAAI,IAAI,EAAE;QACnC,MAAM,sBAAsB,GAAG,OAAO,uBAAuB,KAAK,QAAQ,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,wBAAwB,CAAC;QAChI,GAAG,CAAC,IAAI,CAAC,uDAAuD,CAAC,sBAAsB,CAAC,CAAC,CAAC;KAC3F;IAED,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,CAAC,6BAA6B,IAAI,uBAAuB,CAAC,EAAE;QACtF,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACb,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;gBACxB,MAAM,qBAAqB,EAAE,CAAC;aAC/B;YAED,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,2BAAqB,EAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AA/BD,gEA+BC;AAsBD,SAAgB,gBAAgB,CAAC,MAA+B;IAC9D,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAC5F,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,IAAA,eAAO,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvF,MAAM,WAAW,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAClJ,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAEpE,OAAO,CAAC,KAAqC,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,eAAe,CAAC,IAAA,kCAA0B,EAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAC9E,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAXD,4CAWC;AAED,SAAgB,eAAe,CAAC,KAAyB;IACvD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,4BAAoB,CAAC,CAAC;IAC/D,OAAO,0BAA0B,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AAHD,0CAGC;AAED,SAAgB,qBAAqB;IACnC,OAAO,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAChD,CAAC;AAFD,sDAEC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,IAAe,EAAE,KAAsB;IACtE,OAAO,wBAAwB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAFD,4CAEC;AA2BD;;;;;GAKG;AACH,SAAgB,wBAAwB,CAAC,MAAsC;IAC7E,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACrC,MAAM,KAAK,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,IAAA,qCAAuB,EAAC,KAAK,CAAC,CAAC;IAElD,OAAO,CAAC,IAAe,EAAE,EAAE;QACzB,MAAM,KAAK,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,4BAAoB,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,4BAAoB,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC;QAElE,IAAI,QAAQ,EAAE;YACZ,MAAM,GAAG,MAAM,GAAG,4BAAoB,CAAC,CAAC,oBAAoB;SAC7D;QAED,IAAI,SAAS,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,4BAAoB,CAAC,EAAE;YACrE,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;SAC7C;aAAM;YACL,OAAO,MAAM,CAAC;SACf;IACH,CAAC,CAAC;AACJ,CAAC;AArBD,4DAqBC"}
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/path/path.ts"],"names":[],"mappings":";;;AAAA,sCAAsE;AACtE,0CAAmF;AACnF,sCAAqI;AACrI,oCAAqG;AAErG,sDAA+D;AAElD,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAC3B,QAAA,8BAA8B,GAAG,GAAG,CAAC;AAKrC,QAAA,qCAAqC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE/E;;GAEG;AACU,QAAA,gDAAgD,GAAG,GAAG,CAAC;AAoCpE;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,KAAgB;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,sCAA8B,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3E,IAAI,IAAmB,CAAC;IAExB,QAAQ,QAAQ,EAAE;QAChB,KAAK,CAAC;YACJ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,IAAI,GAAG,SAAS,CAAC;aAClB;iBAAM;gBACL,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAE1C,IAAI,SAAS,KAAK,4BAAoB,EAAE;oBACtC,IAAI,GAAG,QAAQ,CAAC;iBACjB;qBAAM;oBACL,IAAI,GAAG,MAAM,CAAC;iBACf;aACF;YACD,MAAM;QACR,KAAK,CAAC;YACJ,IAAI,GAAG,WAAW,CAAC;YACnB,MAAM;QACR;YACE,IAAI,GAAG,SAAS,CAAC;YACjB,MAAM;KACT;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,sCA2BC;AAED,SAAgB,eAAe,CAAC,KAAa;IAC3C,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,WAAW,CAAC;AACjD,CAAC;AAHD,0CAGC;AAED,SAAgB,oBAAoB,CAAC,KAAa;IAChD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,IAAI,KAAK,WAAW,CAAC;AAC9B,CAAC;AAHD,oDAGC;AAED,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,OAAO,aAAa,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC;AAC3C,CAAC;AAFD,8CAEC;AAED,SAAgB,gBAAgB,CAAC,KAAa;IAC5C,OAAO,aAAa,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAC5C,CAAC;AAFD,4CAEC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,SAAoB;IAChD,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC;AAHD,sCAGC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,SAAoB;IACjD,OAAO,SAAS,CAAC,KAAK,CAAC,4BAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAFD,wCAEC;AAeD,SAAgB,yBAAyB,CAAC,IAAwB;IAChE,IAAI,EAA6B,CAAC;IAElC,QAAQ,IAAI,EAAE;QACZ,KAAK,UAAU;YACb,EAAE,GAAG,4BAA4B,CAAC;YAClC,MAAM;QACR,KAAK,UAAU;YACb,EAAE,GAAG,4BAA4B,CAAC;YAClC,MAAM;QACR,KAAK,KAAK;YACR,EAAE,GAAG,IAAA,2BAAmB,GAAE,CAAC;YAC3B,MAAM;KACT;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAhBD,8DAgBC;AAEY,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC/B,QAAA,sBAAsB,GAAG,MAAM,CAAC;AAChC,QAAA,mCAAmC,GAAG,MAAM,CAAC;AAC7C,QAAA,iBAAiB,GAAG,MAAM,CAAC;AAC3B,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,yCAAyC,GAAG,MAAM,CAAC;AAEhE,SAAgB,4BAA4B,CAAC,KAAgB;IAC3D,6BAA6B;IAC7B,OAAO,KAAK,CAAC,OAAO,CAAC,6BAAqB,EAAE,EAAE,CAAC,CAAC;AAClD,CAAC;AAHD,oEAGC;AAED;;;;GAIG;AACH,SAAgB,4BAA4B,CAAC,KAAgB;IAC3D,mEAAmE;IACnE,OAAO,KAAK,CAAC,UAAU,CAAC,4BAAoB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,6BAAqB,EAAE,4BAAoB,CAAC,CAAC,CAAC,CAAC,GAAG,4BAAoB,GAAG,KAAK,EAAE,CAAC;AACjJ,CAAC;AAHD,oEAGC;AAED,SAAgB,0BAA0B,CAAC,KAAgB;IACzD,OAAO,KAAK,CAAC,OAAO,CAAC,gCAAwB,EAAE,4BAAoB,CAAC,CAAC;AACvE,CAAC;AAFD,gEAEC;AAED,SAAgB,mCAAmC,CAAC,KAAgB;IAClE,OAAO,KAAK,CAAC,OAAO,CAAC,gCAAwB,EAAE,4BAAoB,CAAC,CAAC;AACvE,CAAC;AAFD,kFAEC;AAED,SAAgB,qBAAqB,CAAC,KAAgB;IACpD,OAAO,KAAK,CAAC,OAAO,CAAC,8BAAsB,EAAE,EAAE,CAAC,CAAC;AACnD,CAAC;AAFD,sDAEC;AAED,SAAgB,gCAAgC,CAAC,KAAgB;IAC/D,OAAO,KAAK,CAAC,OAAO,CAAC,2CAAmC,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAFD,4EAEC;AAED;;;;;;GAMG;AACH,SAAgB,+CAA+C,CAAC,KAAgB,EAAE,WAAoB;IACpG,OAAO,uDAAuD,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC;AACrF,CAAC;AAFD,0GAEC;AAED;;;;;;GAMG;AACH,SAAgB,uDAAuD,CAAC,cAAsB,wDAAgD;IAC5I,OAAO,CAAC,KAAgB,EAAE,EAAE;QAC1B,MAAM,uBAAuB,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,sCAA8B,CAAC;QAC3F,MAAM,eAAe,GAAG,uBAAuB,CAAC,CAAC,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAClG,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,wCAA+B,EAAC,eAAe,EAAE,sCAA8B,CAAC,CAAC;QAErH,IAAI,SAAoB,CAAC;QAEzB,QAAQ,UAAU,EAAE;YAClB,KAAK,CAAC;gBACJ,SAAS,GAAG,eAAe,CAAC;gBAC5B,MAAM;YACR,KAAK,CAAC;gBACJ,MAAM,iBAAiB,GAAG,eAAe,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBAE3D,IAAI,iBAAiB,KAAK,CAAC,CAAC,IAAI,iBAAiB,GAAG,IAAI,EAAE;oBACxD,aAAa;oBACb,SAAS,GAAG,eAAe,CAAC;iBAC7B;qBAAM;oBACL,+DAA+D;oBAC/D,SAAS,GAAG,IAAA,oCAA2B,EAAC,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;iBAC7E;gBACD,MAAM;YACR;gBACE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAA,2BAAkB,EAAC,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrE,MAAM,0BAA0B,GAAG,IAAI,CAAC,OAAO,CAAC,iDAAyC,EAAE,WAAW,CAAC,CAAC;gBAExG,SAAS,GAAG,0BAA0B,GAAG,IAAI,CAAC;gBAC9C,MAAM;SACT;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AAjCD,0HAiCC;AAgCD,SAAgB,0BAA0B,CAAC,MAAyC;IAClF,MAAM,EAAE,cAAc,GAAG,6CAAqC,EAAE,wBAAwB,EAAE,6BAA6B,GAAG,IAAI,EAAE,kBAAkB,EAAE,uBAAuB,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAChN,MAAM,GAAG,GAAiC,EAAE,CAAC;IAE7C,MAAM,wBAAwB,GAAG,OAAO,6BAA6B,KAAK,QAAQ,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,wDAAgD,CAAC;IAEtK,IAAI,6BAA6B,IAAI,IAAI,EAAE;QACzC,GAAG,CAAC,IAAI,CACN,IAAA,+BAAsB,EAAC;YACrB,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,wBAAwB;SACtC,CAAC,CACH,CAAC;KACH;IAED,IAAI,uBAAuB,IAAI,IAAI,EAAE;QACnC,MAAM,sBAAsB,GAAG,OAAO,uBAAuB,KAAK,QAAQ,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,wBAAwB,CAAC;QAChI,GAAG,CAAC,IAAI,CAAC,uDAAuD,CAAC,sBAAsB,CAAC,CAAC,CAAC;KAC3F;IAED,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,CAAC,6BAA6B,IAAI,uBAAuB,CAAC,EAAE;QACtF,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACb,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE;gBACxB,MAAM,qBAAqB,EAAE,CAAC;aAC/B;YAED,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,2BAAqB,EAAC,GAAG,CAAC,CAAC;AACpC,CAAC;AA/BD,gEA+BC;AAsBD,SAAgB,gBAAgB,CAAC,MAA+B;IAC9D,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;IAC5F,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,IAAA,eAAO,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvF,MAAM,WAAW,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAClJ,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAEpE,OAAO,CAAC,KAAqC,EAAE,EAAE;QAC/C,MAAM,MAAM,GAAG,eAAe,CAAC,IAAA,kCAA0B,EAAC,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAC9E,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAXD,4CAWC;AAED,SAAgB,eAAe,CAAC,KAAyB;IACvD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,4BAAoB,CAAC,CAAC;IAC/D,OAAO,0BAA0B,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AAHD,0CAGC;AAED,SAAgB,qBAAqB;IACnC,OAAO,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;AAChD,CAAC;AAFD,sDAEC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,IAAe,EAAE,KAAsB;IACtE,OAAO,wBAAwB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACnD,CAAC;AAFD,4CAEC;AA2BD;;;;;GAKG;AACH,SAAgB,wBAAwB,CAAC,MAAsC;IAC7E,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACrC,MAAM,KAAK,GAAG,IAAA,kBAAU,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,UAAU,GAAG,IAAA,qCAAuB,EAAC,KAAK,CAAC,CAAC;IAElD,OAAO,CAAC,IAAe,EAAE,EAAE;QACzB,MAAM,KAAK,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,4BAAoB,CAAC,CAAC;QAC7E,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,4BAAoB,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC;QAElE,IAAI,QAAQ,EAAE;YACZ,MAAM,GAAG,MAAM,GAAG,4BAAoB,CAAC,CAAC,oBAAoB;SAC7D;QAED,IAAI,SAAS,KAAK,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,4BAAoB,CAAC,EAAE;YACrE,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;SAC7C;aAAM;YACL,OAAO,MAAM,CAAC;SACf;IACH,CAAC,CAAC;AACJ,CAAC;AArBD,4DAqBC"}
|
|
@@ -28,3 +28,6 @@ export declare function findStringsRegexString(find: ArrayOrValue<string>): stri
|
|
|
28
28
|
* @param input
|
|
29
29
|
*/
|
|
30
30
|
export declare function escapeStringForRegex(input: string): string;
|
|
31
|
+
export declare type FindAllCharacterOccurencesFunction = (input: string) => number[];
|
|
32
|
+
export declare function findAllCharacterOccurencesFunction(characterSet: Set<string>): FindAllCharacterOccurencesFunction;
|
|
33
|
+
export declare function findAllCharacterOccurences(set: Set<string>, input: string): number[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.escapeStringForRegex = exports.findStringsRegexString = exports.REGEX_SPECIAL_CHARACTERS_SET = exports.REGEX_SPECIAL_CHARACTERS = exports.replaceStringsFunction = void 0;
|
|
3
|
+
exports.findAllCharacterOccurences = exports.findAllCharacterOccurencesFunction = exports.escapeStringForRegex = exports.findStringsRegexString = exports.REGEX_SPECIAL_CHARACTERS_SET = exports.REGEX_SPECIAL_CHARACTERS = exports.replaceStringsFunction = void 0;
|
|
4
4
|
const util_1 = require("@dereekb/util");
|
|
5
5
|
const char_1 = require("./char");
|
|
6
6
|
function replaceStringsFunction(config) {
|
|
@@ -34,13 +34,7 @@ function escapeStringForRegex(input) {
|
|
|
34
34
|
/**
|
|
35
35
|
* index of all occurences in the input to replace/merge together.
|
|
36
36
|
*/
|
|
37
|
-
const occurrences =
|
|
38
|
-
for (let i = 0; i < input.length; i += 1) {
|
|
39
|
-
const char = input[i];
|
|
40
|
-
if (exports.REGEX_SPECIAL_CHARACTERS_SET.has(char)) {
|
|
41
|
-
occurrences.push(i);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
37
|
+
const occurrences = findAllCharacterOccurences(exports.REGEX_SPECIAL_CHARACTERS_SET, input);
|
|
44
38
|
let result;
|
|
45
39
|
function escapeCharacter(char) {
|
|
46
40
|
return `\\${char}`;
|
|
@@ -75,4 +69,21 @@ function escapeStringForRegex(input) {
|
|
|
75
69
|
return result;
|
|
76
70
|
}
|
|
77
71
|
exports.escapeStringForRegex = escapeStringForRegex;
|
|
72
|
+
function findAllCharacterOccurencesFunction(characterSet) {
|
|
73
|
+
return (input) => {
|
|
74
|
+
const occurrences = [];
|
|
75
|
+
for (let i = 0; i < input.length; i += 1) {
|
|
76
|
+
const char = input[i];
|
|
77
|
+
if (characterSet.has(char)) {
|
|
78
|
+
occurrences.push(i);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return occurrences;
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
exports.findAllCharacterOccurencesFunction = findAllCharacterOccurencesFunction;
|
|
85
|
+
function findAllCharacterOccurences(set, input) {
|
|
86
|
+
return findAllCharacterOccurencesFunction(set)(input);
|
|
87
|
+
}
|
|
88
|
+
exports.findAllCharacterOccurences = findAllCharacterOccurences;
|
|
78
89
|
//# sourceMappingURL=replace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/string/replace.ts"],"names":[],"mappings":";;;AAAA,wCAAsD;AAEtD,iCAAqD;AAerD,SAAgB,sBAAsB,CAAC,MAA4B;IACjE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IACtD,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAChE,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;IACzD,OAAO,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;AACrE,CAAC;AALD,wDAKC;AAEY,QAAA,wBAAwB,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AACnG,QAAA,4BAA4B,GAAG,IAAI,GAAG,CAAC,gCAAwB,CAAC,CAAC;AAE9E;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,IAA0B;IAC/D,MAAM,KAAK,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACrD,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC;AAJD,wDAIC;AAED;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,KAAa;IAChD;;OAEG;IACH,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"replace.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/string/replace.ts"],"names":[],"mappings":"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"}
|
package/src/lib/string/url.d.ts
CHANGED
|
@@ -102,6 +102,14 @@ export interface WebsitePathAndQueryPair {
|
|
|
102
102
|
query?: Maybe<WebsiteQueryString>;
|
|
103
103
|
}
|
|
104
104
|
export declare function websitePathAndQueryPair(inputPath: string | WebsitePath): WebsitePathAndQueryPair;
|
|
105
|
+
/**
|
|
106
|
+
* Replaces any extra query parameter "?" characters with an "&" character.
|
|
107
|
+
*
|
|
108
|
+
* Can also choose to replace all instead, incase the input string should be considered the query without.
|
|
109
|
+
*
|
|
110
|
+
* @param input
|
|
111
|
+
*/
|
|
112
|
+
export declare function fixExtraQueryParameters(input: string, replaceAll?: boolean): string;
|
|
105
113
|
/**
|
|
106
114
|
* Reads the website path from the input.
|
|
107
115
|
*
|
package/src/lib/string/url.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.hasHttpPrefix = exports.removeHttpFromUrl = exports.HTTP_OR_HTTPS_REGEX = exports.websiteDomainAndPathPair = exports.websitePathFromWebsiteDomainAndPath = exports.websiteDomainAndPathPairFromWebsiteUrl = exports.websitePathFromWebsiteUrl = exports.websitePathAndQueryPair = exports.isolateWebsitePathFunction = exports.hasWebsiteDomain = exports.WEBSITE_DOMAIN_NAME_REGEX = void 0;
|
|
3
|
+
exports.hasHttpPrefix = exports.removeHttpFromUrl = exports.HTTP_OR_HTTPS_REGEX = exports.websiteDomainAndPathPair = exports.websitePathFromWebsiteDomainAndPath = exports.websiteDomainAndPathPairFromWebsiteUrl = exports.websitePathFromWebsiteUrl = exports.fixExtraQueryParameters = exports.websitePathAndQueryPair = exports.isolateWebsitePathFunction = exports.hasWebsiteDomain = exports.WEBSITE_DOMAIN_NAME_REGEX = void 0;
|
|
4
4
|
const path_1 = require("../path/path");
|
|
5
5
|
const map_1 = require("../value/map");
|
|
6
6
|
const replace_1 = require("./replace");
|
|
@@ -70,13 +70,38 @@ function isolateWebsitePathFunction(config = {}) {
|
|
|
70
70
|
}
|
|
71
71
|
exports.isolateWebsitePathFunction = isolateWebsitePathFunction;
|
|
72
72
|
function websitePathAndQueryPair(inputPath) {
|
|
73
|
-
const [path,
|
|
73
|
+
const [path, rawQuery] = inputPath.split('?', 2);
|
|
74
|
+
const query = rawQuery ? fixExtraQueryParameters(rawQuery, true) : undefined;
|
|
74
75
|
return {
|
|
75
76
|
path: path,
|
|
76
77
|
query: query ? `?${query}` : undefined
|
|
77
78
|
};
|
|
78
79
|
}
|
|
79
80
|
exports.websitePathAndQueryPair = websitePathAndQueryPair;
|
|
81
|
+
/**
|
|
82
|
+
* Replaces any extra query parameter "?" characters with an "&" character.
|
|
83
|
+
*
|
|
84
|
+
* Can also choose to replace all instead, incase the input string should be considered the query without.
|
|
85
|
+
*
|
|
86
|
+
* @param input
|
|
87
|
+
*/
|
|
88
|
+
function fixExtraQueryParameters(input, replaceAll = false) {
|
|
89
|
+
const questionMarkIndexes = (0, replace_1.findAllCharacterOccurences)(new Set('?'), input);
|
|
90
|
+
let indexesToReplace;
|
|
91
|
+
let fixed = input;
|
|
92
|
+
if (replaceAll && questionMarkIndexes.length) {
|
|
93
|
+
indexesToReplace = questionMarkIndexes;
|
|
94
|
+
}
|
|
95
|
+
else if (questionMarkIndexes.length > 1) {
|
|
96
|
+
indexesToReplace = questionMarkIndexes.reverse();
|
|
97
|
+
indexesToReplace.pop(); // remove the "first" so it does not get replaced.
|
|
98
|
+
}
|
|
99
|
+
if (indexesToReplace === null || indexesToReplace === void 0 ? void 0 : indexesToReplace.length) {
|
|
100
|
+
indexesToReplace.forEach((index) => (fixed = (0, char_1.replaceCharacterAtIndexWith)(fixed, index, '&')));
|
|
101
|
+
}
|
|
102
|
+
return fixed;
|
|
103
|
+
}
|
|
104
|
+
exports.fixExtraQueryParameters = fixExtraQueryParameters;
|
|
80
105
|
/**
|
|
81
106
|
* Reads the website path from the input.
|
|
82
107
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/string/url.ts"],"names":[],"mappings":";;;AACA,uCAA4G;AAC5G,sCAAkE;AAElE,
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../../../../../packages/util/src/lib/string/url.ts"],"names":[],"mappings":"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"}
|
package/test/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [9.13.0](https://github.com/dereekb/dbx-components/compare/v9.12.4-dev...v9.13.0) (2022-11-08)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [9.12.4](https://github.com/dereekb/dbx-components/compare/v9.12.3-dev...v9.12.4) (2022-11-08)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
5
13
|
## [9.12.3](https://github.com/dereekb/dbx-components/compare/v9.12.2-dev...v9.12.3) (2022-11-07)
|
|
6
14
|
|
|
7
15
|
|
package/test/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dereekb/util/test",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.13.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"typings": "./src/index.d.ts",
|
|
7
7
|
"dependencies": {},
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@dereekb/util": "9.
|
|
9
|
+
"@dereekb/util": "9.13.0",
|
|
10
10
|
"lodash.isequal": "^4.5.0",
|
|
11
11
|
"make-error": "^1.3.0",
|
|
12
12
|
"class-validator": "^0.13.2",
|