@adviser/cement 0.4.3 → 0.4.5
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/{chunk-FZHQTSQU.js → chunk-Z724JFU6.js} +80 -9
- package/chunk-Z724JFU6.js.map +1 -0
- package/{index-BpBCVun3.d.cts → index-BJwthmNK.d.cts} +10 -2
- package/{index-Dnurrov8.d.ts → index-Bh_2ZgIk.d.ts} +10 -2
- package/index.cjs +93 -14
- package/index.cjs.map +1 -1
- package/index.d.cts +2 -2
- package/index.d.ts +2 -2
- package/index.js +15 -7
- package/index.js.map +1 -1
- package/metafile-cjs.json +1 -1
- package/metafile-esm.json +1 -1
- package/package.json +1 -1
- package/src/jsr.json +1 -1
- package/src/path-ops.ts +21 -6
- package/src/uri.ts +93 -9
- package/test/index.cjs +79 -8
- package/test/index.cjs.map +1 -1
- package/test/index.d.cts +1 -1
- package/test/index.d.ts +1 -1
- package/test/index.js +1 -1
- package/ts/src/path-ops.d.ts.map +1 -1
- package/ts/src/path-ops.js +17 -6
- package/ts/src/path-ops.js.map +1 -1
- package/ts/src/path-ops.test.js +20 -4
- package/ts/src/path-ops.test.js.map +1 -1
- package/ts/src/uri.d.ts +10 -2
- package/ts/src/uri.d.ts.map +1 -1
- package/ts/src/uri.js +79 -5
- package/ts/src/uri.js.map +1 -1
- package/ts/src/uri.test.js +97 -0
- package/ts/src/uri.test.js.map +1 -1
- package/chunk-FZHQTSQU.js.map +0 -1
package/test/index.d.cts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
export { p as LogCollector, o as LogWriteStream, q as MockLogger, M as MockLoggerReturn } from '../index-
|
1
|
+
export { p as LogCollector, o as LogWriteStream, q as MockLogger, M as MockLoggerReturn } from '../index-BJwthmNK.cjs';
|
2
2
|
import '../get-params-result-4xHM5s4_.cjs';
|
3
3
|
import '../stripper-BpBUUZ9p.cjs';
|
4
4
|
import '../sys-abstraction-DDAwGTnk.cjs';
|
package/test/index.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
export { p as LogCollector, o as LogWriteStream, q as MockLogger, M as MockLoggerReturn } from '../index-
|
1
|
+
export { p as LogCollector, o as LogWriteStream, q as MockLogger, M as MockLoggerReturn } from '../index-Bh_2ZgIk.js';
|
2
2
|
import '../get-params-result-4xHM5s4_.js';
|
3
3
|
import '../stripper-BpBUUZ9p.js';
|
4
4
|
import '../sys-abstraction-CeAxxg9H.js';
|
package/test/index.js
CHANGED
package/ts/src/path-ops.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"path-ops.d.ts","sourceRoot":"","sources":["../../../src/path-ops.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAChC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;
|
1
|
+
{"version":3,"file":"path-ops.d.ts","sourceRoot":"","sources":["../../../src/path-ops.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAChC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAwCD,eAAO,MAAM,OAAO,EAAE,OAA2B,CAAC"}
|
package/ts/src/path-ops.js
CHANGED
@@ -9,7 +9,11 @@ class pathOpsImpl {
|
|
9
9
|
_pathOpsImpl_instances.add(this);
|
10
10
|
}
|
11
11
|
join(...paths) {
|
12
|
-
|
12
|
+
const parts = __classPrivateFieldGet(this, _pathOpsImpl_instances, "m", _pathOpsImpl_parts).call(this, paths.filter((i) => i).join("/"));
|
13
|
+
if (parts.dirname === "" || parts.dirname === ".") {
|
14
|
+
return parts.basename ? parts.basename : ".";
|
15
|
+
}
|
16
|
+
return parts.dirname + "/" + parts.basename;
|
13
17
|
}
|
14
18
|
dirname(path) {
|
15
19
|
return __classPrivateFieldGet(this, _pathOpsImpl_instances, "m", _pathOpsImpl_parts).call(this, path).dirname;
|
@@ -19,14 +23,21 @@ class pathOpsImpl {
|
|
19
23
|
}
|
20
24
|
}
|
21
25
|
_pathOpsImpl_instances = new WeakSet(), _pathOpsImpl_parts = function _pathOpsImpl_parts(path) {
|
26
|
+
path = path
|
27
|
+
.replace(/\/+/g, "/")
|
28
|
+
.replace(/(\/\.\/)+/g, "/")
|
29
|
+
.replace(/\/+$/, "");
|
22
30
|
const splitted = path.split("/");
|
23
|
-
|
24
|
-
|
25
|
-
|
31
|
+
if (splitted.length === 1) {
|
32
|
+
return {
|
33
|
+
dirname: ".",
|
34
|
+
basename: splitted[0] === "." ? "" : splitted[0],
|
35
|
+
};
|
26
36
|
}
|
37
|
+
const basename = splitted.pop();
|
27
38
|
return {
|
28
|
-
dirname:
|
29
|
-
basename
|
39
|
+
dirname: splitted.join("/").replace(/^\.\//, ""),
|
40
|
+
basename,
|
30
41
|
};
|
31
42
|
};
|
32
43
|
export const pathOps = new pathOpsImpl();
|
package/ts/src/path-ops.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"path-ops.js","sourceRoot":"","sources":["../../../src/path-ops.ts"],"names":[],"mappings":";;;;;;AAMA,MAAM,WAAW;IAAjB;;
|
1
|
+
{"version":3,"file":"path-ops.js","sourceRoot":"","sources":["../../../src/path-ops.ts"],"names":[],"mappings":";;;;;;AAMA,MAAM,WAAW;IAAjB;;IAoCA,CAAC;IAnCC,IAAI,CAAC,GAAG,KAAe;QACrB,MAAM,KAAK,GAAG,uBAAA,IAAI,kDAAO,MAAX,IAAI,EAAQ,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5D,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE,IAAI,KAAK,CAAC,OAAO,KAAK,GAAG,EAAE,CAAC;YAClD,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;QAC/C,CAAC;QACD,OAAO,KAAK,CAAC,OAAO,GAAG,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC;IAC9C,CAAC;IAuBD,OAAO,CAAC,IAAY;QAClB,OAAO,uBAAA,IAAI,kDAAO,MAAX,IAAI,EAAQ,IAAI,CAAC,CAAC,OAAO,CAAC;IACnC,CAAC;IACD,QAAQ,CAAC,IAAY;QACnB,OAAO,uBAAA,IAAI,kDAAO,MAAX,IAAI,EAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC;IACpC,CAAC;CACF;yFA5BQ,IAAY;IAKjB,IAAI,GAAG,IAAI;SACR,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC;SAC1B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,GAAG;YACZ,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;SACjD,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,EAAY,CAAC;IAC1C,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,QAAQ;KACT,CAAC;AACJ,CAAC;AASH,MAAM,CAAC,MAAM,OAAO,GAAY,IAAI,WAAW,EAAE,CAAC"}
|
package/ts/src/path-ops.test.js
CHANGED
@@ -4,20 +4,36 @@ it("basename", () => {
|
|
4
4
|
expect(pathOps.basename("a/b/c/")).toBe("c");
|
5
5
|
expect(pathOps.basename("c")).toBe("c");
|
6
6
|
expect(pathOps.basename("c/")).toBe("c");
|
7
|
+
expect(pathOps.basename("/a/b/c")).toBe("c");
|
8
|
+
expect(pathOps.basename("/a/b/c/")).toBe("c");
|
9
|
+
expect(pathOps.basename("/c")).toBe("c");
|
10
|
+
expect(pathOps.basename("/c/")).toBe("c");
|
7
11
|
expect(pathOps.basename("")).toBe("");
|
8
12
|
});
|
9
13
|
it("dirname", () => {
|
10
14
|
expect(pathOps.dirname("a/b/c")).toBe("a/b");
|
15
|
+
expect(pathOps.dirname("/a/b/c")).toBe("/a/b");
|
11
16
|
expect(pathOps.dirname("a/b/c/")).toBe("a/b");
|
12
|
-
expect(pathOps.dirname("c")).toBe("");
|
13
|
-
expect(pathOps.dirname("c/")).toBe("");
|
14
|
-
expect(pathOps.dirname("")).toBe("");
|
17
|
+
expect(pathOps.dirname("/a/b/c/")).toBe("/a/b");
|
18
|
+
expect(pathOps.dirname("///a///b/./c/")).toBe("/a/b");
|
19
|
+
expect(pathOps.dirname("c")).toBe(".");
|
20
|
+
expect(pathOps.dirname("./c/d")).toBe("c");
|
21
|
+
expect(pathOps.dirname("c/")).toBe(".");
|
22
|
+
expect(pathOps.dirname("")).toBe(".");
|
23
|
+
expect(pathOps.dirname("./yyy/./a")).toBe("yyy");
|
15
24
|
});
|
16
25
|
it("join", () => {
|
17
26
|
expect(pathOps.join("a", "b", "c")).toBe("a/b/c");
|
18
27
|
expect(pathOps.join("a", "b", "c/")).toBe("a/b/c");
|
28
|
+
expect(pathOps.join("", "a", "", "b", "", "c/")).toBe("a/b/c");
|
19
29
|
expect(pathOps.join("c")).toBe("c");
|
20
30
|
expect(pathOps.join("c/")).toBe("c");
|
21
|
-
expect(pathOps.join("")).toBe("");
|
31
|
+
expect(pathOps.join("")).toBe(".");
|
32
|
+
expect(pathOps.join(".", "yyy")).toBe("yyy");
|
33
|
+
expect(pathOps.join(".", "yyy", ".", "a")).toBe("yyy/a");
|
34
|
+
expect(pathOps.join("./")).toBe(".");
|
35
|
+
expect(pathOps.join(".")).toBe(".");
|
36
|
+
expect(pathOps.join(".", ".")).toBe(".");
|
37
|
+
expect(pathOps.join(".", ".", ".", "c")).toBe("c");
|
22
38
|
});
|
23
39
|
//# sourceMappingURL=path-ops.test.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"path-ops.test.js","sourceRoot":"","sources":["../../../src/path-ops.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;IAClB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;IACjB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,
|
1
|
+
{"version":3,"file":"path-ops.test.js","sourceRoot":"","sources":["../../../src/path-ops.test.ts"],"names":[],"mappings":"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"}
|
package/ts/src/uri.d.ts
CHANGED
@@ -46,7 +46,6 @@ export declare class MutableURL extends URL {
|
|
46
46
|
private _protocol;
|
47
47
|
private _pathname;
|
48
48
|
private _hasHostpart;
|
49
|
-
readonly hash: string;
|
50
49
|
constructor(urlStr: string);
|
51
50
|
[customInspectSymbol](): string;
|
52
51
|
clone(): MutableURL;
|
@@ -59,7 +58,10 @@ export declare class MutableURL extends URL {
|
|
59
58
|
get pathname(): string;
|
60
59
|
get protocol(): string;
|
61
60
|
set protocol(p: string);
|
61
|
+
get hash(): string;
|
62
|
+
set hash(h: string);
|
62
63
|
get searchParams(): URLSearchParams;
|
64
|
+
get search(): string;
|
63
65
|
toString(): string;
|
64
66
|
}
|
65
67
|
export declare class BuildURI implements URIInterface<BuildURI> {
|
@@ -72,9 +74,11 @@ export declare class BuildURI implements URIInterface<BuildURI> {
|
|
72
74
|
hostname(h: string): BuildURI;
|
73
75
|
protocol(p: string): BuildURI;
|
74
76
|
pathname(p: string): BuildURI;
|
77
|
+
hash(h: string): BuildURI;
|
75
78
|
resolve(p: CoerceURI): BuildURI;
|
76
79
|
appendRelative(p: CoerceURI): BuildURI;
|
77
|
-
cleanParams(): BuildURI;
|
80
|
+
cleanParams(...remove: (string | string[])[]): BuildURI;
|
81
|
+
hashParams(val: Record<string, string | number | boolean | Date | null | undefined>, mode?: "reset" | "merge"): BuildURI;
|
78
82
|
delParam(key: string): BuildURI;
|
79
83
|
defParam(key: string, str: string): BuildURI;
|
80
84
|
setParam(key: string, str: string): BuildURI;
|
@@ -83,6 +87,7 @@ export declare class BuildURI implements URIInterface<BuildURI> {
|
|
83
87
|
getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
|
84
88
|
getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
|
85
89
|
getParamsResult(...keys: KeysParam): Result<Record<string, string>>;
|
90
|
+
getHashParams(...keys: KeysParam): Result<Record<string, string>>;
|
86
91
|
toString(): string;
|
87
92
|
toJSON(): string;
|
88
93
|
asURL(): URL;
|
@@ -104,15 +109,18 @@ export declare class URI implements URIInterface<URI> {
|
|
104
109
|
private constructor();
|
105
110
|
build(): BuildURI;
|
106
111
|
get hostname(): string;
|
112
|
+
get local(): string;
|
107
113
|
get port(): string;
|
108
114
|
get host(): string;
|
109
115
|
get protocol(): string;
|
110
116
|
get pathname(): string;
|
117
|
+
get hash(): string;
|
111
118
|
get getParams(): Iterable<[string, string]>;
|
112
119
|
hasParam(key: string): boolean;
|
113
120
|
getParam<T extends string | undefined>(key: string | OneKey<string>, def?: T): T extends string ? string : string | undefined;
|
114
121
|
getParamResult(key: string, msgFn?: (key: string) => string): Result<string>;
|
115
122
|
getParamsResult(...keys: KeysParam): Result<Record<string, string>>;
|
123
|
+
getHashParams(...keys: KeysParam): Result<Record<string, string>>;
|
116
124
|
clone(): URI;
|
117
125
|
asURL(): URL;
|
118
126
|
toString(): string;
|
package/ts/src/uri.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"uri.d.ts","sourceRoot":"","sources":["../../../src/uri.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,MAAM,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAmB,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAY,MAAM,qBAAqB,CAAC;AAG7D,KAAK,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;AAEpC,KAAK,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAoBzD,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,YAAY,CAAC,CAAC,CAAC;IAMrD,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAC/B,QAAQ,CAAC,CAAC,SAAS,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC9H,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7E,eAAe,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,KAAK,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAAC;IACrC,KAAK,IAAI,CAAC,CAAC;IACX,KAAK,IAAI,GAAG,CAAC;IACb,QAAQ,IAAI,MAAM,CAAC;IACnB,MAAM,IAAI,MAAM,CAAC;IACjB,KAAK,CAAC,GAAG,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACzC;
|
1
|
+
{"version":3,"file":"uri.d.ts","sourceRoot":"","sources":["../../../src/uri.ts"],"names":[],"mappings":"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"}
|
package/ts/src/uri.js
CHANGED
@@ -61,6 +61,15 @@ function coerceKey(key, def) {
|
|
61
61
|
}
|
62
62
|
return { key, def: def };
|
63
63
|
}
|
64
|
+
function resolveHash(hash) {
|
65
|
+
const searchParams = new URLSearchParams(hash.replace(/^#/, ""));
|
66
|
+
return {
|
67
|
+
getParam: (k) => {
|
68
|
+
const ret = searchParams.get(k);
|
69
|
+
return ret === null ? undefined : ret;
|
70
|
+
},
|
71
|
+
};
|
72
|
+
}
|
64
73
|
function falsy2undef(value) {
|
65
74
|
return value === undefined || value === null ? undefined : value;
|
66
75
|
}
|
@@ -113,7 +122,6 @@ export class MutableURL extends URL {
|
|
113
122
|
else {
|
114
123
|
this._pathname = urlStr.replace(new RegExp(`^${this._protocol}//`), "").replace(/[#?].*$/, "");
|
115
124
|
}
|
116
|
-
this.hash = this._sysURL.hash;
|
117
125
|
}
|
118
126
|
[customInspectSymbol]() {
|
119
127
|
return this.toString();
|
@@ -166,16 +174,26 @@ export class MutableURL extends URL {
|
|
166
174
|
}
|
167
175
|
this._protocol = p;
|
168
176
|
}
|
177
|
+
get hash() {
|
178
|
+
return this._sysURL.hash;
|
179
|
+
}
|
180
|
+
set hash(h) {
|
181
|
+
this._sysURL.hash = h;
|
182
|
+
}
|
169
183
|
get searchParams() {
|
170
184
|
return this._sysURL.searchParams;
|
171
185
|
}
|
172
|
-
|
186
|
+
get search() {
|
173
187
|
let search = "";
|
174
188
|
if (this._sysURL.searchParams.size) {
|
175
189
|
for (const [key, value] of Array.from(this._sysURL.searchParams.entries()).sort((a, b) => a[0].localeCompare(b[0]))) {
|
176
190
|
search += `${!search.length ? "?" : "&"}${key}=${encodeURIComponent(value)}`;
|
177
191
|
}
|
178
192
|
}
|
193
|
+
return search;
|
194
|
+
}
|
195
|
+
toString() {
|
196
|
+
const search = this.search;
|
179
197
|
let hostpart = "";
|
180
198
|
if (this._hasHostpart) {
|
181
199
|
hostpart = this._sysURL.hostname;
|
@@ -186,7 +204,7 @@ export class MutableURL extends URL {
|
|
186
204
|
hostpart += "/";
|
187
205
|
}
|
188
206
|
}
|
189
|
-
return `${this._protocol}//${hostpart}${this._pathname}${search}`;
|
207
|
+
return `${this._protocol}//${hostpart}${this._pathname}${search}${this.hash}`;
|
190
208
|
}
|
191
209
|
}
|
192
210
|
function from(fac, strURLUri, defaultProtocol) {
|
@@ -251,6 +269,10 @@ export class BuildURI {
|
|
251
269
|
this._url.pathname = p;
|
252
270
|
return this;
|
253
271
|
}
|
272
|
+
hash(h) {
|
273
|
+
this._url.hash = h;
|
274
|
+
return this;
|
275
|
+
}
|
254
276
|
resolve(p) {
|
255
277
|
if (!p) {
|
256
278
|
return this;
|
@@ -277,12 +299,52 @@ export class BuildURI {
|
|
277
299
|
}
|
278
300
|
return this;
|
279
301
|
}
|
280
|
-
cleanParams() {
|
302
|
+
cleanParams(...remove) {
|
303
|
+
const keys = new Set(remove.flat());
|
281
304
|
for (const key of Array.from(this._url.searchParams.keys())) {
|
282
|
-
|
305
|
+
if (keys.size === 0 || keys.has(key)) {
|
306
|
+
this._url.searchParams.delete(key);
|
307
|
+
}
|
283
308
|
}
|
284
309
|
return this;
|
285
310
|
}
|
311
|
+
hashParams(val, mode = "reset") {
|
312
|
+
let preset;
|
313
|
+
switch (mode) {
|
314
|
+
case "reset":
|
315
|
+
this._url.hash = "";
|
316
|
+
preset = {};
|
317
|
+
break;
|
318
|
+
case "merge":
|
319
|
+
default:
|
320
|
+
preset = Object.fromEntries(new URLSearchParams(this._url.hash.replace(/^#/, "")).entries());
|
321
|
+
break;
|
322
|
+
}
|
323
|
+
const out = new URLSearchParams("");
|
324
|
+
for (const [key, value] of Object.entries({ ...preset, ...val }).sort((a, b) => a[0].localeCompare(b[0]))) {
|
325
|
+
switch (typeof value) {
|
326
|
+
case "string":
|
327
|
+
out.set(key, value);
|
328
|
+
break;
|
329
|
+
case "number":
|
330
|
+
out.set(key, value.toString());
|
331
|
+
break;
|
332
|
+
case "boolean":
|
333
|
+
out.set(key, value ? "true" : "false");
|
334
|
+
break;
|
335
|
+
default:
|
336
|
+
if (value instanceof Date) {
|
337
|
+
out.set(key, value.toISOString());
|
338
|
+
}
|
339
|
+
else {
|
340
|
+
console.error(`unsupported type: ${typeof value} ignore key: ${key}`);
|
341
|
+
}
|
342
|
+
break;
|
343
|
+
}
|
344
|
+
}
|
345
|
+
this._url.hash = out.toString();
|
346
|
+
return this;
|
347
|
+
}
|
286
348
|
delParam(key) {
|
287
349
|
this._url.searchParams.delete(key);
|
288
350
|
return this;
|
@@ -317,6 +379,9 @@ export class BuildURI {
|
|
317
379
|
getParamsResult(...keys) {
|
318
380
|
return getParamsResult(keys, this);
|
319
381
|
}
|
382
|
+
getHashParams(...keys) {
|
383
|
+
return getParamsResult(keys, resolveHash(this._url.hash));
|
384
|
+
}
|
320
385
|
toString() {
|
321
386
|
this._url.searchParams.sort();
|
322
387
|
return this._url.toString();
|
@@ -402,6 +467,9 @@ export class URI {
|
|
402
467
|
get hostname() {
|
403
468
|
return this._url.hostname;
|
404
469
|
}
|
470
|
+
get local() {
|
471
|
+
return this._url.pathname + this._url.search;
|
472
|
+
}
|
405
473
|
get port() {
|
406
474
|
return this._url.port;
|
407
475
|
}
|
@@ -414,6 +482,9 @@ export class URI {
|
|
414
482
|
get pathname() {
|
415
483
|
return this._url.pathname;
|
416
484
|
}
|
485
|
+
get hash() {
|
486
|
+
return this._url.hash;
|
487
|
+
}
|
417
488
|
get getParams() {
|
418
489
|
return this._url.searchParams.entries();
|
419
490
|
}
|
@@ -434,6 +505,9 @@ export class URI {
|
|
434
505
|
getParamsResult(...keys) {
|
435
506
|
return getParamsResult(keys, this);
|
436
507
|
}
|
508
|
+
getHashParams(...keys) {
|
509
|
+
return getParamsResult(keys, resolveHash(this._url.hash));
|
510
|
+
}
|
437
511
|
clone() {
|
438
512
|
return new URI(this._url);
|
439
513
|
}
|
package/ts/src/uri.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"uri.js","sourceRoot":"","sources":["../../../src/uri.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"uri.js","sourceRoot":"","sources":["../../../src/uri.ts"],"names":[],"mappings":"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"}
|
package/ts/src/uri.test.js
CHANGED
@@ -451,5 +451,102 @@ describe("URI", () => {
|
|
451
451
|
const ref = URI.from("yttp://ed?x=3&y=4&o=4");
|
452
452
|
expect(ref.match("xttp://ab/cd?x=4&y=4&o=4").score).toBe(2);
|
453
453
|
});
|
454
|
+
it("pathname + search + hash", () => {
|
455
|
+
const refUnk = URI.from("yttp://ed/bla?y=4&x=3");
|
456
|
+
expect(refUnk.local).toBe("ed/bla?x=3&y=4");
|
457
|
+
const refHttp = URI.from("http://host/ed/bla?x=3&y=4");
|
458
|
+
expect(refHttp.local).toBe("/ed/bla?x=3&y=4");
|
459
|
+
const refFile = URI.from("file:///ed/bla?x=3&y=4");
|
460
|
+
expect(refFile.local).toBe("/ed/bla?x=3&y=4");
|
461
|
+
});
|
462
|
+
it("cleanParams all", () => {
|
463
|
+
const uri = BuildURI.from("http://key.bag?a=1&b=2&c=3").cleanParams();
|
464
|
+
expect(Array.from(uri.getParams)).toEqual([]);
|
465
|
+
});
|
466
|
+
it("cleanParams not matching", () => {
|
467
|
+
const uri = BuildURI.from("http://key.bag?a=1&b=2&c=3").cleanParams(["A"], "B");
|
468
|
+
expect(Array.from(uri.getParams)).toEqual([
|
469
|
+
["a", "1"],
|
470
|
+
["b", "2"],
|
471
|
+
["c", "3"],
|
472
|
+
]);
|
473
|
+
});
|
474
|
+
it("cleanParams not matching", () => {
|
475
|
+
const uri = BuildURI.from("http://key.bag?a=1&b=2&c=3").cleanParams(["A"], "B", "a", "a", "b");
|
476
|
+
expect(Array.from(uri.getParams)).toEqual([["c", "3"]]);
|
477
|
+
});
|
478
|
+
it("cleanParams not matching", () => {
|
479
|
+
const uri = BuildURI.from("http://key.bag?a=1&b=2&c=3").cleanParams(["c", "b", "a"]);
|
480
|
+
expect(Array.from(uri.getParams)).toEqual([]);
|
481
|
+
});
|
482
|
+
it("common hash", () => {
|
483
|
+
const uri = URI.from("http://key.bag?a=1&b=2&c=3#hash");
|
484
|
+
expect(uri.hash).toBe("#hash");
|
485
|
+
const buri = BuildURI.from("http://key.bag?a=1&b=2&c=3").hash("hash").URI();
|
486
|
+
expect(buri.hash).toBe("#hash");
|
487
|
+
const hashuri = BuildURI.from("http://key.bag?a=1&b=2&c=3").hash("#hash").URI();
|
488
|
+
expect(hashuri.hash).toBe("#hash");
|
489
|
+
});
|
490
|
+
it("get hashParams", () => {
|
491
|
+
const uri = BuildURI.from("http://key.bag?a=1&b=2&c=3")
|
492
|
+
.hashParams({
|
493
|
+
c: true,
|
494
|
+
a: 1,
|
495
|
+
b: "5",
|
496
|
+
d: new Date("2021-01-01T00:00:00.000Z"),
|
497
|
+
})
|
498
|
+
.URI();
|
499
|
+
expect(uri.hash).toBe("#a=1&b=5&c=true&d=2021-01-01T00%3A00%3A00.000Z");
|
500
|
+
const mergeUri = BuildURI.from("http://key.bag?a=1&b=2&c=3#c=true&a=4&d=9")
|
501
|
+
.hashParams({
|
502
|
+
a: 1,
|
503
|
+
b: "5",
|
504
|
+
d: new Date("2021-01-01T00:00:00.000Z"),
|
505
|
+
}, "merge")
|
506
|
+
.URI();
|
507
|
+
expect(mergeUri.hash).toBe("#a=1&b=5&c=true&d=2021-01-01T00%3A00%3A00.000Z");
|
508
|
+
});
|
509
|
+
it("get hashParams", () => {
|
510
|
+
const buri = BuildURI.from("http://key.bag?a=1&b=2&c=3").hashParams({
|
511
|
+
c: true,
|
512
|
+
a: 1,
|
513
|
+
b: "5",
|
514
|
+
d: new Date("2021-01-01T00:00:00.000Z"),
|
515
|
+
});
|
516
|
+
expect(buri.toString()).toBe("http://key.bag/?a=1&b=2&c=3#a=1&b=5&c=true&d=2021-01-01T00%3A00%3A00.000Z");
|
517
|
+
const rbParam = buri.getHashParams({
|
518
|
+
d: param.REQUIRED,
|
519
|
+
e: "default",
|
520
|
+
f: param.OPTIONAL,
|
521
|
+
});
|
522
|
+
expect(rbParam.Ok()).toEqual({
|
523
|
+
d: "2021-01-01T00:00:00.000Z",
|
524
|
+
e: "default",
|
525
|
+
});
|
526
|
+
const rParam = buri.URI().getHashParams({
|
527
|
+
d: param.REQUIRED,
|
528
|
+
e: "default",
|
529
|
+
f: param.OPTIONAL,
|
530
|
+
});
|
531
|
+
expect(rParam.Ok()).toEqual({
|
532
|
+
d: "2021-01-01T00:00:00.000Z",
|
533
|
+
e: "default",
|
534
|
+
});
|
535
|
+
});
|
536
|
+
it("error hashParams", () => {
|
537
|
+
const buri = BuildURI.from("http://key.bag?a=1&b=2&c=3").hashParams({
|
538
|
+
c: true,
|
539
|
+
a: 1,
|
540
|
+
b: "5",
|
541
|
+
d: new Date("2021-01-01T00:00:00.000Z"),
|
542
|
+
});
|
543
|
+
const rerrParam = buri.getHashParams({
|
544
|
+
a: param.REQUIRED,
|
545
|
+
e: "default",
|
546
|
+
f: param.OPTIONAL,
|
547
|
+
g: param.REQUIRED,
|
548
|
+
});
|
549
|
+
expect(rerrParam.Err().message).toBe("missing parameters: g");
|
550
|
+
});
|
454
551
|
});
|
455
552
|
//# sourceMappingURL=uri.test.js.map
|