@adviser/cement 0.4.33 → 0.4.34
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/cjs/cli/patch-version-cmd.cjs +1 -1
- package/cjs/cli/patch-version-cmd.cjs.map +1 -1
- package/cjs/index.cjs +1 -0
- package/cjs/index.cjs.map +1 -1
- package/cjs/index.d.ts +1 -0
- package/cjs/index.d.ts.map +1 -1
- package/cjs/load-asset.cjs +6 -5
- package/cjs/load-asset.cjs.map +1 -1
- package/cjs/load-asset.d.ts.map +1 -1
- package/cjs/logger.cjs +2 -2
- package/cjs/logger.cjs.map +1 -1
- package/cjs/logger.d.ts.map +1 -1
- package/cjs/logger.test.cjs +1 -1
- package/cjs/logger.test.cjs.map +1 -1
- package/cjs/mutable-url.cjs +281 -0
- package/cjs/mutable-url.cjs.map +1 -0
- package/cjs/mutable-url.d.ts +72 -0
- package/cjs/mutable-url.d.ts.map +1 -0
- package/cjs/mutable-url.test.cjs +452 -0
- package/cjs/mutable-url.test.cjs.map +1 -0
- package/cjs/mutable-url.test.d.ts +2 -0
- package/cjs/mutable-url.test.d.ts.map +1 -0
- package/cjs/uri.cjs +32 -161
- package/cjs/uri.cjs.map +1 -1
- package/cjs/uri.d.ts +4 -30
- package/cjs/uri.d.ts.map +1 -1
- package/cjs/uri.test.cjs +24 -36
- package/cjs/uri.test.cjs.map +1 -1
- package/cjs/utils/coerce-uint8.cjs.map +1 -1
- package/cjs/utils/coerce-uint8.d.ts.map +1 -1
- package/cjs/version.cjs +1 -1
- package/deno.json +1 -1
- package/esm/cli/patch-version-cmd.js +1 -1
- package/esm/cli/patch-version-cmd.js.map +1 -1
- package/esm/index.d.ts +1 -0
- package/esm/index.d.ts.map +1 -1
- package/esm/index.js +1 -0
- package/esm/index.js.map +1 -1
- package/esm/load-asset.d.ts.map +1 -1
- package/esm/load-asset.js +7 -6
- package/esm/load-asset.js.map +1 -1
- package/esm/logger.d.ts.map +1 -1
- package/esm/logger.js +2 -2
- package/esm/logger.js.map +1 -1
- package/esm/logger.test.js +2 -2
- package/esm/logger.test.js.map +1 -1
- package/esm/mutable-url.d.ts +72 -0
- package/esm/mutable-url.d.ts.map +1 -0
- package/esm/mutable-url.js +275 -0
- package/esm/mutable-url.js.map +1 -0
- package/esm/mutable-url.test.d.ts +2 -0
- package/esm/mutable-url.test.d.ts.map +1 -0
- package/esm/mutable-url.test.js +450 -0
- package/esm/mutable-url.test.js.map +1 -0
- package/esm/uri.d.ts +4 -30
- package/esm/uri.d.ts.map +1 -1
- package/esm/uri.js +26 -154
- package/esm/uri.js.map +1 -1
- package/esm/uri.test.js +25 -37
- package/esm/uri.test.js.map +1 -1
- package/esm/utils/coerce-uint8.d.ts.map +1 -1
- package/esm/utils/coerce-uint8.js.map +1 -1
- package/esm/version.js +1 -1
- package/package.json +2 -1
- package/src/cli/patch-version-cmd.ts +1 -1
- package/src/index.ts +1 -0
- package/src/load-asset.ts +7 -6
- package/src/logger.ts +3 -2
- package/src/mutable-url.ts +365 -0
- package/src/uri.ts +51 -195
- package/src/utils/coerce-uint8.ts +1 -2
- package/ts/cjs/cli/patch-version-cmd.js +1 -1
- package/ts/cjs/cli/patch-version-cmd.js.map +1 -1
- package/ts/cjs/index.d.ts +1 -0
- package/ts/cjs/index.d.ts.map +1 -1
- package/ts/cjs/index.js +1 -0
- package/ts/cjs/index.js.map +1 -1
- package/ts/cjs/load-asset.d.ts.map +1 -1
- package/ts/cjs/load-asset.js +6 -5
- package/ts/cjs/load-asset.js.map +1 -1
- package/ts/cjs/logger.d.ts.map +1 -1
- package/ts/cjs/logger.js +2 -2
- package/ts/cjs/logger.js.map +1 -1
- package/ts/cjs/logger.test.js +1 -1
- package/ts/cjs/logger.test.js.map +1 -1
- package/ts/cjs/mutable-url.d.ts +72 -0
- package/ts/cjs/mutable-url.d.ts.map +1 -0
- package/ts/cjs/mutable-url.js +281 -0
- package/ts/cjs/mutable-url.js.map +1 -0
- package/ts/cjs/mutable-url.test.d.ts +2 -0
- package/ts/cjs/mutable-url.test.d.ts.map +1 -0
- package/ts/cjs/mutable-url.test.js +452 -0
- package/ts/cjs/mutable-url.test.js.map +1 -0
- package/ts/cjs/uri.d.ts +4 -30
- package/ts/cjs/uri.d.ts.map +1 -1
- package/ts/cjs/uri.js +32 -161
- package/ts/cjs/uri.js.map +1 -1
- package/ts/cjs/uri.test.js +24 -36
- package/ts/cjs/uri.test.js.map +1 -1
- package/ts/cjs/utils/coerce-uint8.d.ts.map +1 -1
- package/ts/cjs/utils/coerce-uint8.js.map +1 -1
- package/ts/cjs/version.js +1 -1
- package/ts/esm/cli/patch-version-cmd.js +1 -1
- package/ts/esm/cli/patch-version-cmd.js.map +1 -1
- package/ts/esm/index.d.ts +1 -0
- package/ts/esm/index.d.ts.map +1 -1
- package/ts/esm/index.js +1 -0
- package/ts/esm/index.js.map +1 -1
- package/ts/esm/load-asset.d.ts.map +1 -1
- package/ts/esm/load-asset.js +7 -6
- package/ts/esm/load-asset.js.map +1 -1
- package/ts/esm/logger.d.ts.map +1 -1
- package/ts/esm/logger.js +2 -2
- package/ts/esm/logger.js.map +1 -1
- package/ts/esm/logger.test.js +2 -2
- package/ts/esm/logger.test.js.map +1 -1
- package/ts/esm/mutable-url.d.ts +72 -0
- package/ts/esm/mutable-url.d.ts.map +1 -0
- package/ts/esm/mutable-url.js +275 -0
- package/ts/esm/mutable-url.js.map +1 -0
- package/ts/esm/mutable-url.test.d.ts +2 -0
- package/ts/esm/mutable-url.test.d.ts.map +1 -0
- package/ts/esm/mutable-url.test.js +450 -0
- package/ts/esm/mutable-url.test.js.map +1 -0
- package/ts/esm/uri.d.ts +4 -30
- package/ts/esm/uri.d.ts.map +1 -1
- package/ts/esm/uri.js +26 -154
- package/ts/esm/uri.js.map +1 -1
- package/ts/esm/uri.test.js +25 -37
- package/ts/esm/uri.test.js.map +1 -1
- package/ts/esm/utils/coerce-uint8.d.ts.map +1 -1
- package/ts/esm/utils/coerce-uint8.js.map +1 -1
- package/ts/esm/version.js +1 -1
package/src/uri.ts
CHANGED
@@ -3,6 +3,8 @@ import { exception2Result, Result } from "./result.js";
|
|
3
3
|
import { getParamsResult, KeysParam } from "./utils/get-params-result.js";
|
4
4
|
import { relativePath } from "./utils/relative-path.js";
|
5
5
|
import { StripCommand, stripper } from "./utils/stripper.js";
|
6
|
+
import { ReadonlyURL, URLSearchParamsEntries, WritableURL } from "./mutable-url.js";
|
7
|
+
import { KeyedResolvOnce } from "./resolve-once.js";
|
6
8
|
// import { param } from "./types.js";
|
7
9
|
|
8
10
|
type NullOrUndef = null | undefined;
|
@@ -84,7 +86,7 @@ function match(iref: CoerceURI, ioth: CoerceURI): MatchResult {
|
|
84
86
|
mr.score += 1;
|
85
87
|
mr.port = true;
|
86
88
|
}
|
87
|
-
} catch (
|
89
|
+
} catch (_e) {
|
88
90
|
// ignore
|
89
91
|
}
|
90
92
|
if (ref.pathname.length && ref.pathname !== "/") {
|
@@ -149,18 +151,24 @@ function falsy2undef<T>(value: T | NullOrUndef): T | undefined {
|
|
149
151
|
return value === undefined || value === null ? undefined : value;
|
150
152
|
}
|
151
153
|
|
152
|
-
function ensureURLWithDefaultProto(
|
154
|
+
function ensureURLWithDefaultProto<T>(
|
155
|
+
url: string | URL,
|
156
|
+
defaultProtocol: string,
|
157
|
+
action: {
|
158
|
+
fromThrow: (urlStr: string) => T;
|
159
|
+
},
|
160
|
+
): T {
|
153
161
|
if (!url) {
|
154
|
-
return
|
162
|
+
return action.fromThrow(`${defaultProtocol}//`);
|
155
163
|
}
|
156
164
|
if (typeof url === "string") {
|
157
165
|
try {
|
158
|
-
return
|
159
|
-
} catch (
|
160
|
-
return
|
166
|
+
return action.fromThrow(url);
|
167
|
+
} catch (_e) {
|
168
|
+
return action.fromThrow(`${defaultProtocol}//${url}`);
|
161
169
|
}
|
162
170
|
} else {
|
163
|
-
return
|
171
|
+
return action.fromThrow(url.toString());
|
164
172
|
}
|
165
173
|
}
|
166
174
|
|
@@ -174,180 +182,26 @@ export function isURL(value: unknown): value is URL {
|
|
174
182
|
);
|
175
183
|
}
|
176
184
|
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
// private readonly _urlStr: string;
|
186
|
-
|
187
|
-
private _protocol: string;
|
188
|
-
private _pathname: string;
|
189
|
-
private _hasHostpart: boolean;
|
190
|
-
|
191
|
-
// override readonly hash: string;
|
192
|
-
|
193
|
-
static fromThrow(urlStr: string): MutableURL {
|
194
|
-
return new MutableURL(urlStr);
|
195
|
-
}
|
196
|
-
|
197
|
-
static from(urlStr: string): Result<MutableURL> {
|
198
|
-
if (urlRegex.test(urlStr)) {
|
199
|
-
return exception2Result(() => new MutableURL(urlStr));
|
200
|
-
}
|
201
|
-
return Result.Err(`Invalid URL: ${urlStr}`);
|
202
|
-
}
|
203
|
-
|
204
|
-
private constructor(urlStr: string) {
|
205
|
-
super("defect://does.not.exist");
|
206
|
-
const partedURL = urlStr.split(":");
|
207
|
-
this._hasHostpart = hasHostPartProtocols.has(partedURL[0]);
|
208
|
-
let hostPartUrl = ["http", ...partedURL.slice(1)].join(":");
|
209
|
-
if (!this._hasHostpart) {
|
210
|
-
const pathname = hostPartUrl.replace(/http:\/\/[/]*/, "").replace(/[#?].*$/, "");
|
211
|
-
hostPartUrl = hostPartUrl.replace(/http:\/\//, `http://localhost/${pathname}`);
|
212
|
-
}
|
213
|
-
try {
|
214
|
-
this._sysURL = new URL(hostPartUrl);
|
215
|
-
} catch (ie) {
|
216
|
-
const e = ie as Error;
|
217
|
-
e.message = `${e.message} for URL: ${urlStr}`;
|
218
|
-
throw e;
|
219
|
-
}
|
220
|
-
this._protocol = `${partedURL[0]}:`; // this._sysURL.protocol.replace(new RegExp("^cement-"), "");
|
221
|
-
if (this._hasHostpart) {
|
222
|
-
this._pathname = this._sysURL.pathname;
|
223
|
-
} else {
|
224
|
-
this._pathname = urlStr.replace(new RegExp(`^${this._protocol}//`), "").replace(/[#?].*$/, "");
|
225
|
-
}
|
226
|
-
// this.hash = this._sysURL.hash;
|
227
|
-
}
|
228
|
-
|
229
|
-
override toJSON(): string {
|
230
|
-
throw new Error("toJSON: Method not implemented.");
|
231
|
-
}
|
232
|
-
|
233
|
-
[customInspectSymbol](): string {
|
234
|
-
// make node inspect to show the URL and not crash if URI is not http/https/file
|
235
|
-
return this.toString();
|
236
|
-
}
|
237
|
-
|
238
|
-
clone(): MutableURL {
|
239
|
-
return new MutableURL(this.toString());
|
240
|
-
}
|
241
|
-
|
242
|
-
override get host(): string {
|
243
|
-
if (!this._hasHostpart) {
|
244
|
-
throw new Error(
|
245
|
-
`you can use hostname only if protocol is ${this.toString()} ${JSON.stringify(Array.from(hasHostPartProtocols.keys()))}`,
|
246
|
-
);
|
247
|
-
}
|
248
|
-
return this._sysURL.host;
|
249
|
-
}
|
250
|
-
|
251
|
-
override get port(): string {
|
252
|
-
if (!this._hasHostpart) {
|
253
|
-
throw new Error(`you can use hostname only if protocol is ${JSON.stringify(Array.from(hasHostPartProtocols.keys()))}`);
|
254
|
-
}
|
255
|
-
return this._sysURL.port;
|
256
|
-
}
|
257
|
-
|
258
|
-
override set port(p: string) {
|
259
|
-
if (!this._hasHostpart) {
|
260
|
-
throw new Error(`you can use port only if protocol is ${JSON.stringify(Array.from(hasHostPartProtocols.keys()))}`);
|
261
|
-
}
|
262
|
-
this._sysURL.port = p;
|
263
|
-
}
|
264
|
-
|
265
|
-
override get hostname(): string {
|
266
|
-
if (!this._hasHostpart) {
|
267
|
-
throw new Error(`you can use hostname only if protocol is ${JSON.stringify(Array.from(hasHostPartProtocols.keys()))}`);
|
268
|
-
}
|
269
|
-
return this._sysURL.hostname;
|
270
|
-
}
|
271
|
-
|
272
|
-
override set hostname(h: string) {
|
273
|
-
if (!this._hasHostpart) {
|
274
|
-
throw new Error(`you can use hostname only if protocol is ${JSON.stringify(Array.from(hasHostPartProtocols.keys()))}`);
|
275
|
-
}
|
276
|
-
this._sysURL.hostname = h;
|
277
|
-
}
|
278
|
-
|
279
|
-
override set pathname(p: string) {
|
280
|
-
this._pathname = p;
|
281
|
-
}
|
282
|
-
|
283
|
-
override get pathname(): string {
|
284
|
-
return this._pathname;
|
285
|
-
}
|
286
|
-
|
287
|
-
override get protocol(): string {
|
288
|
-
return this._protocol;
|
289
|
-
}
|
290
|
-
|
291
|
-
override set protocol(p: string) {
|
292
|
-
if (!p.endsWith(":")) {
|
293
|
-
p = `${p}:`;
|
294
|
-
}
|
295
|
-
this._protocol = p;
|
296
|
-
}
|
297
|
-
|
298
|
-
override get hash(): string {
|
299
|
-
return this._sysURL.hash;
|
300
|
-
}
|
301
|
-
|
302
|
-
override set hash(h: string) {
|
303
|
-
this._sysURL.hash = h;
|
304
|
-
}
|
305
|
-
|
306
|
-
override get searchParams(): URLSearchParams {
|
307
|
-
return this._sysURL.searchParams;
|
308
|
-
}
|
309
|
-
|
310
|
-
override get search(): string {
|
311
|
-
let search = "";
|
312
|
-
if (this._sysURL.searchParams.size) {
|
313
|
-
for (const [key, value] of Array.from(URLSearchParamsEntries(this._sysURL.searchParams)).sort((a, b) =>
|
314
|
-
a[0].localeCompare(b[0]),
|
315
|
-
)) {
|
316
|
-
search += `${!search.length ? "?" : "&"}${key}=${encodeURIComponent(value)}`;
|
317
|
-
}
|
318
|
-
}
|
319
|
-
return search;
|
320
|
-
}
|
321
|
-
|
322
|
-
override toString(): string {
|
323
|
-
const search = this.search;
|
324
|
-
let hostpart = "";
|
325
|
-
if (this._hasHostpart) {
|
326
|
-
hostpart = this._sysURL.hostname;
|
327
|
-
if (this._sysURL.port) {
|
328
|
-
hostpart += `:${this._sysURL.port}`;
|
329
|
-
}
|
330
|
-
if (!this._pathname.startsWith("/")) {
|
331
|
-
hostpart += "/";
|
332
|
-
}
|
333
|
-
}
|
334
|
-
return `${this._protocol}//${hostpart}${this._pathname}${search}${this.hash}`;
|
335
|
-
}
|
336
|
-
}
|
337
|
-
|
338
|
-
function from<T>(fac: (url: MutableURL) => T, strURLUri: CoerceURI | undefined, defaultProtocol: string): T {
|
185
|
+
function from<R, T extends ReadonlyURL | WritableURL>(
|
186
|
+
fac: (url: T) => R,
|
187
|
+
strURLUri: CoerceURI | undefined,
|
188
|
+
defaultProtocol: string,
|
189
|
+
action: {
|
190
|
+
fromThrow: (urlStr: string) => T;
|
191
|
+
},
|
192
|
+
): R {
|
339
193
|
switch (typeof falsy2undef(strURLUri)) {
|
340
194
|
case "undefined":
|
341
|
-
return fac(
|
195
|
+
return fac(action.fromThrow(`${defaultProtocol}///`));
|
342
196
|
case "string":
|
343
|
-
return fac(ensureURLWithDefaultProto(strURLUri as string, defaultProtocol));
|
197
|
+
return fac(ensureURLWithDefaultProto(strURLUri as string, defaultProtocol, action));
|
344
198
|
case "object":
|
345
199
|
if (BuildURI.is(strURLUri)) {
|
346
|
-
return fac(
|
200
|
+
return fac(action.fromThrow(strURLUri._url.toString()));
|
347
201
|
} else if (URI.is(strURLUri)) {
|
348
|
-
return fac(
|
202
|
+
return fac(action.fromThrow(strURLUri._url.toString()));
|
349
203
|
} else if (isURL(strURLUri)) {
|
350
|
-
return fac(
|
204
|
+
return fac(action.fromThrow(strURLUri.toString()));
|
351
205
|
}
|
352
206
|
throw new Error(`unknown object type: ${strURLUri}`);
|
353
207
|
default:
|
@@ -368,17 +222,6 @@ function getParamResult(
|
|
368
222
|
return Result.Ok(val);
|
369
223
|
}
|
370
224
|
|
371
|
-
// there are deno which does not have URLSearchParams.entries() in types
|
372
|
-
function* URLSearchParamsEntries(src: URLSearchParams): IterableIterator<[string, string]> {
|
373
|
-
const entries: [string, string][] = [];
|
374
|
-
src.forEach((v, k) => {
|
375
|
-
entries.push([k, v]);
|
376
|
-
});
|
377
|
-
for (const [key, value] of entries) {
|
378
|
-
yield [key, value];
|
379
|
-
}
|
380
|
-
}
|
381
|
-
|
382
225
|
function setParams(
|
383
226
|
src: string,
|
384
227
|
val: Record<string, string | number | boolean | Date | null | undefined>,
|
@@ -421,8 +264,8 @@ function setParams(
|
|
421
264
|
}
|
422
265
|
|
423
266
|
export class BuildURI implements URIInterface<BuildURI> {
|
424
|
-
_url:
|
425
|
-
private constructor(url:
|
267
|
+
_url: WritableURL; // pathname needs this
|
268
|
+
private constructor(url: WritableURL) {
|
426
269
|
this._url = url;
|
427
270
|
}
|
428
271
|
|
@@ -433,7 +276,7 @@ export class BuildURI implements URIInterface<BuildURI> {
|
|
433
276
|
);
|
434
277
|
}
|
435
278
|
static from(strURLUri?: CoerceURI, defaultProtocol = "file:"): BuildURI {
|
436
|
-
return from((url) => new BuildURI(url), strURLUri, defaultProtocol);
|
279
|
+
return from((url) => new BuildURI(url), strURLUri, defaultProtocol, { fromThrow: WritableURL.fromThrow });
|
437
280
|
}
|
438
281
|
|
439
282
|
match(other: CoerceURI): MatchResult {
|
@@ -484,7 +327,7 @@ export class BuildURI implements URIInterface<BuildURI> {
|
|
484
327
|
return this.appendRelative(p);
|
485
328
|
}
|
486
329
|
}
|
487
|
-
this._url =
|
330
|
+
this._url = WritableURL.fromThrow(p.toString());
|
488
331
|
return this;
|
489
332
|
}
|
490
333
|
|
@@ -623,7 +466,7 @@ export class BuildURI implements URIInterface<BuildURI> {
|
|
623
466
|
}
|
624
467
|
}
|
625
468
|
|
626
|
-
export type CoerceURI = string | URI |
|
469
|
+
export type CoerceURI = string | URI | ReadonlyURL | WritableURL | URL | BuildURI | NullOrUndef;
|
627
470
|
|
628
471
|
export function isCoerceURI(value: unknown): value is CoerceURI {
|
629
472
|
if (!value) {
|
@@ -647,6 +490,9 @@ export function isCoerceURI(value: unknown): value is CoerceURI {
|
|
647
490
|
|
648
491
|
export const hasHostPartProtocols: Set<string> = new Set<string>(["http", "https", "ws", "wss"]);
|
649
492
|
|
493
|
+
const uriInstances = new KeyedResolvOnce<URI>({
|
494
|
+
lru: { maxEntries: 1000 },
|
495
|
+
});
|
650
496
|
// non mutable URL Implementation
|
651
497
|
export class URI implements URIInterface<URI> {
|
652
498
|
static protocolHasHostpart(protocol: string): () => void {
|
@@ -689,15 +535,25 @@ export class URI implements URIInterface<URI> {
|
|
689
535
|
|
690
536
|
// if no protocol is provided, default to file:
|
691
537
|
static from(strURLUri?: CoerceURI, defaultProtocol = "file:"): URI {
|
692
|
-
|
538
|
+
// this is not optimal, but it is a start
|
539
|
+
// the problem is that from creates ReadonlyURLs which we then use to sort
|
540
|
+
// the params and render as string --> this instance is only shortlived but
|
541
|
+
// it's some extra cost.
|
542
|
+
return from((url) => uriInstances.get(url.toString()).once(() => new URI(url)), strURLUri, defaultProtocol, {
|
543
|
+
fromThrow: ReadonlyURL.fromThrow,
|
544
|
+
});
|
693
545
|
}
|
694
546
|
|
695
547
|
static fromResult(strURLUri?: CoerceURI, defaultProtocol = "file:"): Result<URI> {
|
696
|
-
return exception2Result(() =>
|
548
|
+
return exception2Result(() =>
|
549
|
+
from((url) => uriInstances.get(url.toString()).once(() => new URI(url)), strURLUri, defaultProtocol, {
|
550
|
+
fromThrow: ReadonlyURL.fromThrow,
|
551
|
+
}),
|
552
|
+
) as Result<URI>;
|
697
553
|
}
|
698
554
|
|
699
|
-
readonly _url:
|
700
|
-
private constructor(url:
|
555
|
+
readonly _url: ReadonlyURL;
|
556
|
+
private constructor(url: ReadonlyURL) {
|
701
557
|
this._url = url.clone();
|
702
558
|
}
|
703
559
|
|
@@ -797,7 +653,7 @@ export class URI implements URIInterface<URI> {
|
|
797
653
|
asURL(): URL {
|
798
654
|
// const url = new URL(this._url.toString());
|
799
655
|
// url.searchParams.sort();
|
800
|
-
return this._url.clone() as unknown as URL;
|
656
|
+
return this._url.clone(); // as unknown as URL;
|
801
657
|
}
|
802
658
|
|
803
659
|
toString(): string {
|
@@ -4,8 +4,7 @@ import { Result } from "../result.js";
|
|
4
4
|
|
5
5
|
interface GlobalBuffer {
|
6
6
|
Buffer?: {
|
7
|
-
|
8
|
-
isBuffer: (obj: any) => obj is {
|
7
|
+
isBuffer: (obj: unknown) => obj is {
|
9
8
|
buffer: ArrayBufferLike;
|
10
9
|
byteOffset: number;
|
11
10
|
byteLength: number;
|
@@ -162,7 +162,7 @@ function patchVersionCmd() {
|
|
162
162
|
function setupDenoJson(packageJsonFile, jsrJsonFile) {
|
163
163
|
const packageJson = JSON.parse(fs.readFileSync(packageJsonFile).toString());
|
164
164
|
const jsrJson = JSON.parse(fs.readFileSync(jsrJsonFile).toString());
|
165
|
-
jsrJson.imports = Object.fromEntries(Array.from(Object.entries(packageJson.dependencies)).map(([k, v]) => [k, `npm:${k}@${v.replace(/^npm:/, "")}`]));
|
165
|
+
jsrJson.imports = Object.fromEntries(Array.from(Object.entries(packageJson.dependencies ?? {})).map(([k, v]) => [k, `npm:${k}@${v.replace(/^npm:/, "")}`]));
|
166
166
|
fs.writeFileSync(jsrJsonFile, JSON.stringify(jsrJson, undefined, 2) + "\n");
|
167
167
|
}
|
168
168
|
function setUpDenoJsonCmd() {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"patch-version-cmd.js","sourceRoot":"","sources":["../../../../src/cli/patch-version-cmd.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"patch-version-cmd.js","sourceRoot":"","sources":["../../../../src/cli/patch-version-cmd.ts"],"names":[],"mappings":"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"}
|
package/ts/cjs/index.d.ts
CHANGED
@@ -27,5 +27,6 @@ export * from "./coerce-binary.js";
|
|
27
27
|
export * from "./is-promise.js";
|
28
28
|
export * from "./app-context.js";
|
29
29
|
export * from "./load-asset.js";
|
30
|
+
export * from "./mutable-url.js";
|
30
31
|
export * as utils from "./utils/index.js";
|
31
32
|
//# sourceMappingURL=index.d.ts.map
|
package/ts/cjs/index.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AAGjC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAC"}
|
package/ts/cjs/index.js
CHANGED
@@ -66,5 +66,6 @@ __exportStar(require("./coerce-binary.js"), exports);
|
|
66
66
|
__exportStar(require("./is-promise.js"), exports);
|
67
67
|
__exportStar(require("./app-context.js"), exports);
|
68
68
|
__exportStar(require("./load-asset.js"), exports);
|
69
|
+
__exportStar(require("./mutable-url.js"), exports);
|
69
70
|
exports.utils = __importStar(require("./utils/index.js"));
|
70
71
|
//# sourceMappingURL=index.js.map
|
package/ts/cjs/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,8CAA4B;AAC5B,uDAAqC;AACrC,+CAA6B;AAC7B,4CAA0B;AAC1B,kDAAgC;AAChC,sDAAoC;AACpC,sDAAoC;AACpC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,oDAAkC;AAClC,+CAA6B;AAC7B,2CAAyB;AACzB,8CAA4B;AAC5B,4DAA0C;AAC1C,gDAA8B;AAC9B,+CAA6B;AAC7B,mDAAiC;AACjC,gDAA8B;AAC9B,uDAAqC;AACrC,6CAA2B;AAC3B,mDAAiC;AACjC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AACjC,kDAAgC;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,8CAA4B;AAC5B,uDAAqC;AACrC,+CAA6B;AAC7B,4CAA0B;AAC1B,kDAAgC;AAChC,sDAAoC;AACpC,sDAAoC;AACpC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,oDAAkC;AAClC,+CAA6B;AAC7B,2CAAyB;AACzB,8CAA4B;AAC5B,4DAA0C;AAC1C,gDAA8B;AAC9B,+CAA6B;AAC7B,mDAAiC;AACjC,gDAA8B;AAC9B,uDAAqC;AACrC,6CAA2B;AAC3B,mDAAiC;AACjC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AACjC,kDAAgC;AAChC,mDAAiC;AAGjC,QAAY,KAAK,6CAAyB"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"load-asset.d.ts","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAGvD,OAAO,
|
1
|
+
{"version":3,"file":"load-asset.d.ts","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAoB,MAAM,aAAa,CAAC;AAGvD,OAAO,EAAY,SAAS,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpD,UAAU,aAAa;IACrB,KAAK,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAC/B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACpD;AAeD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,QAAQ,KAAK,MAAM,CAAC;IAC/F,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;CACvC;AAGD,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,MAAM,CAAA;CAAE,CAAC;AAc9F,wBAAgB,UAAU,CAAC,GAAG,EAAE,SAAS,GAAG,GAAG,CAI9C;AAED,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAU/F"}
|
package/ts/cjs/load-asset.js
CHANGED
@@ -97,23 +97,24 @@ async function loadAssetReal(baseUrl, localPath, opts) {
|
|
97
97
|
}
|
98
98
|
return result_js_1.Result.Err(`cannot load file: ${baseUrl.url.toString()} from ${baseUrl.src}`);
|
99
99
|
}
|
100
|
+
const urlToFetch = uri_js_1.BuildURI.from(baseUrl.url);
|
100
101
|
switch (baseUrl.src) {
|
101
102
|
case "opts.fallBackUrl":
|
102
|
-
|
103
|
+
urlToFetch.pathname(opts.pathCleaner(baseUrl.url.pathname, localPath, "fallback"));
|
103
104
|
break;
|
104
105
|
case "import.meta.url":
|
105
|
-
|
106
|
+
urlToFetch.pathname(opts.pathCleaner(baseUrl.url.pathname, localPath, "normal"));
|
106
107
|
break;
|
107
108
|
}
|
108
109
|
const rRes = await (0, result_js_1.exception2Result)(() => {
|
109
|
-
if (!
|
110
|
+
if (!urlToFetch) {
|
110
111
|
throw Error(`base url not found from ${baseUrl.src}`);
|
111
112
|
}
|
112
|
-
return callFetch(opts.mock)(
|
113
|
+
return callFetch(opts.mock)(urlToFetch.asURL());
|
113
114
|
});
|
114
115
|
if (rRes.isErr()) {
|
115
116
|
if (baseUrl.src === "import.meta.url") {
|
116
|
-
console.warn(`fetch failed for: ${
|
117
|
+
console.warn(`fetch failed for: ${urlToFetch.toString()}`);
|
117
118
|
return loadAssetReal(fallBackBaseUrl(opts), localPath, opts);
|
118
119
|
}
|
119
120
|
return result_js_1.Result.Err(rRes);
|
package/ts/cjs/load-asset.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"load-asset.js","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAwC;AACxC,2CAAuD;AACvD,6CAAyC;AACzC,2DAA4D;AAC5D,
|
1
|
+
{"version":3,"file":"load-asset.js","sourceRoot":"","sources":["../../../src/load-asset.ts"],"names":[],"mappings":"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"}
|
package/ts/cjs/logger.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/logger.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,YAAY,EAAyB,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,SAAS,
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/logger.ts"],"names":[],"mappings":"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"}
|
package/ts/cjs/logger.js
CHANGED
@@ -7,8 +7,8 @@ exports.IsLogger = IsLogger;
|
|
7
7
|
const is_promise_js_1 = require("./is-promise.js");
|
8
8
|
const bin2text_js_1 = require("./bin2text.js");
|
9
9
|
const txt_en_decoder_js_1 = require("./txt-en-decoder.js");
|
10
|
-
const uri_js_1 = require("./uri.js");
|
11
10
|
const is_json_js_1 = require("./is-json.js");
|
11
|
+
const mutable_url_js_1 = require("./mutable-url.js");
|
12
12
|
exports.Level = {
|
13
13
|
WARN: "warn",
|
14
14
|
DEBUG: "debug",
|
@@ -58,7 +58,7 @@ function logValueInternal(val, ctx) {
|
|
58
58
|
return logValueInternal(ret, ctx);
|
59
59
|
}
|
60
60
|
}
|
61
|
-
const resIsURI =
|
61
|
+
const resIsURI = mutable_url_js_1.ReadonlyURL.from(val);
|
62
62
|
if (resIsURI.isOk()) {
|
63
63
|
return new LogValue(() => resIsURI.Ok().toString());
|
64
64
|
}
|
package/ts/cjs/logger.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/logger.ts"],"names":[],"mappings":";;;;;;AACA,mDAA4C;AAC5C,+CAA2C;AAG3C,2DAA0E;
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/logger.ts"],"names":[],"mappings":"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"}
|
package/ts/cjs/logger.test.js
CHANGED
@@ -514,7 +514,7 @@ describe("TestLogger", () => {
|
|
514
514
|
});
|
515
515
|
it("url", async () => {
|
516
516
|
const log = logger;
|
517
|
-
const url = cement_1.
|
517
|
+
const url = cement_1.ReadonlyURL.fromThrow("http://localhost:8080");
|
518
518
|
log.Info().Url(url).Msg("1");
|
519
519
|
url.searchParams.set("test", "1");
|
520
520
|
log.Info().Url(url).Msg("2");
|