@fedify/vocab-runtime 2.1.26 → 2.1.28
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/deno.json +2 -2
- package/dist/mod.cjs +97 -4
- package/dist/mod.d.cts +30 -2
- package/dist/mod.d.ts +30 -2
- package/dist/mod.js +97 -5
- package/dist/tests/{body-BnzEiyNX.mjs → body-BultFAjs.mjs} +1 -1
- package/dist/tests/{body-DZVjD47E.cjs → body-DaC7-w5j.cjs} +1 -1
- package/dist/tests/body.test.cjs +1 -1
- package/dist/tests/body.test.mjs +1 -1
- package/dist/tests/decimal.test.cjs +3 -2
- package/dist/tests/decimal.test.mjs +3 -2
- package/dist/tests/{docloader-B6t23peg.mjs → docloader-C0qWHnfQ.mjs} +49 -3
- package/dist/tests/{docloader-CXABd-sp.cjs → docloader-TXp0Q0s5.cjs} +49 -3
- package/dist/tests/docloader.test.cjs +167 -42
- package/dist/tests/docloader.test.mjs +157 -33
- package/dist/tests/{langstr-DDLc4833.mjs → langstr-ABdAOKlF.mjs} +5 -2
- package/dist/tests/{langstr-BOQHfJDr.cjs → langstr-BsqFJupv.cjs} +5 -2
- package/dist/tests/langstr.test.cjs +8 -1
- package/dist/tests/langstr.test.mjs +9 -2
- package/dist/tests/langtag-DgySESmk.cjs +50 -0
- package/dist/tests/langtag-LDBqlxHv.mjs +45 -0
- package/dist/tests/langtag.test.cjs +46 -0
- package/dist/tests/langtag.test.d.cts +1 -0
- package/dist/tests/langtag.test.d.mts +1 -0
- package/dist/tests/langtag.test.mjs +46 -0
- package/dist/tests/multibase/multibase.test.cjs +7 -7
- package/dist/tests/multibase/multibase.test.mjs +5 -5
- package/dist/tests/{request-BY5xuo0B.cjs → request-B3mTJPu9.cjs} +1 -1
- package/dist/tests/{request-DNWAyq5z.mjs → request-C7KTCpp-.mjs} +1 -1
- package/dist/tests/request.test.cjs +1 -1
- package/dist/tests/request.test.mjs +1 -1
- package/package.json +6 -3
- package/scripts/test-bun.mjs +18 -0
- package/src/contexts/fep-22cd.json +14 -0
- package/src/contexts/fep-6757.json +12 -0
- package/src/contexts/joinmastodon.json +1 -1
- package/src/contexts.ts +16 -0
- package/src/docloader.test.ts +221 -66
- package/src/docloader.ts +2 -0
- package/src/langstr.test.ts +18 -1
- package/src/langstr.ts +6 -2
- package/src/langtag.test.ts +53 -0
- package/src/langtag.ts +76 -0
- package/src/mod.ts +1 -0
- package/src/multibase/multibase.test.ts +5 -5
package/src/docloader.test.ts
CHANGED
|
@@ -2,12 +2,13 @@ import { configure, type LogRecord, reset } from "@logtape/logtape";
|
|
|
2
2
|
import fetchMock from "fetch-mock";
|
|
3
3
|
import { deepStrictEqual, ok, rejects } from "node:assert";
|
|
4
4
|
import dns from "node:dns/promises";
|
|
5
|
-
import { test } from "
|
|
5
|
+
import { test } from "@fedify/fixture";
|
|
6
6
|
import { createServer } from "node:http";
|
|
7
7
|
import { gzipSync } from "node:zlib";
|
|
8
8
|
import preloadedContexts from "./contexts.ts";
|
|
9
9
|
import cidV1Context from "./contexts/cid-v1.json" with { type: "json" };
|
|
10
10
|
import { getDocumentLoader, getRemoteDocument } from "./docloader.ts";
|
|
11
|
+
import jsonld from "./jsonld.ts";
|
|
11
12
|
import { FetchError } from "./request.ts";
|
|
12
13
|
import { UrlError } from "./url.ts";
|
|
13
14
|
|
|
@@ -44,7 +45,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
44
45
|
},
|
|
45
46
|
});
|
|
46
47
|
|
|
47
|
-
await t.
|
|
48
|
+
await t.step("ok", async () => {
|
|
48
49
|
deepStrictEqual(await fetchDocumentLoader("https://example.com/object"), {
|
|
49
50
|
contextUrl: null,
|
|
50
51
|
documentUrl: "https://example.com/object",
|
|
@@ -101,7 +102,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
101
102
|
},
|
|
102
103
|
});
|
|
103
104
|
|
|
104
|
-
await t.
|
|
105
|
+
await t.step("Link header", async () => {
|
|
105
106
|
deepStrictEqual(await fetchDocumentLoader("https://example.com/link-ctx"), {
|
|
106
107
|
contextUrl: "https://www.w3.org/ns/activitystreams",
|
|
107
108
|
documentUrl: "https://example.com/link-ctx",
|
|
@@ -124,7 +125,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
124
125
|
});
|
|
125
126
|
});
|
|
126
127
|
|
|
127
|
-
await t.
|
|
128
|
+
await t.step("Link header relative url", async () => {
|
|
128
129
|
deepStrictEqual(await fetchDocumentLoader("https://example.com/link-ctx"), {
|
|
129
130
|
contextUrl: "https://www.w3.org/ns/activitystreams",
|
|
130
131
|
documentUrl: "https://example.com/link-ctx",
|
|
@@ -150,7 +151,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
150
151
|
);
|
|
151
152
|
});
|
|
152
153
|
|
|
153
|
-
await t.
|
|
154
|
+
await t.step("wrong Link header syntax", async () => {
|
|
154
155
|
deepStrictEqual(
|
|
155
156
|
await fetchDocumentLoader("https://example.com/obj-w-wrong-link"),
|
|
156
157
|
{
|
|
@@ -179,7 +180,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
179
180
|
headers: { "Content-Type": "text/html; charset=utf-8" },
|
|
180
181
|
});
|
|
181
182
|
|
|
182
|
-
await t.
|
|
183
|
+
await t.step("HTML <link>", async () => {
|
|
183
184
|
deepStrictEqual(
|
|
184
185
|
await fetchDocumentLoader("https://example.com/html-link"),
|
|
185
186
|
{
|
|
@@ -208,7 +209,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
208
209
|
headers: { "Content-Type": "application/xhtml+xml; charset=utf-8" },
|
|
209
210
|
});
|
|
210
211
|
|
|
211
|
-
await t.
|
|
212
|
+
await t.step("XHTML <link>", async () => {
|
|
212
213
|
deepStrictEqual(
|
|
213
214
|
await fetchDocumentLoader("https://example.com/xhtml-link"),
|
|
214
215
|
{
|
|
@@ -239,7 +240,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
239
240
|
headers: { "Content-Type": "text/html; charset=utf-8" },
|
|
240
241
|
});
|
|
241
242
|
|
|
242
|
-
await t.
|
|
243
|
+
await t.step("HTML <a>", async () => {
|
|
243
244
|
deepStrictEqual(await fetchDocumentLoader("https://example.com/html-a"), {
|
|
244
245
|
contextUrl: null,
|
|
245
246
|
documentUrl: "https://example.com/object",
|
|
@@ -262,7 +263,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
262
263
|
headers: { "Content-Type": "text/html; charset=utf-8" },
|
|
263
264
|
});
|
|
264
265
|
|
|
265
|
-
await t.
|
|
266
|
+
await t.step("Wrong Content-Type", async () => {
|
|
266
267
|
deepStrictEqual(
|
|
267
268
|
await fetchDocumentLoader("https://example.com/wrong-content-type"),
|
|
268
269
|
{
|
|
@@ -280,7 +281,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
280
281
|
|
|
281
282
|
fetchMock.get("https://example.com/404", { status: 404 });
|
|
282
283
|
|
|
283
|
-
await t.
|
|
284
|
+
await t.step("not ok", async () => {
|
|
284
285
|
await rejects(
|
|
285
286
|
() => fetchDocumentLoader("https://example.com/404"),
|
|
286
287
|
FetchError,
|
|
@@ -288,7 +289,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
288
289
|
);
|
|
289
290
|
});
|
|
290
291
|
|
|
291
|
-
await t.
|
|
292
|
+
await t.step("preloaded contexts", async () => {
|
|
292
293
|
for (const [url, document] of Object.entries(preloadedContexts)) {
|
|
293
294
|
deepStrictEqual(await fetchDocumentLoader(url), {
|
|
294
295
|
contextUrl: null,
|
|
@@ -298,13 +299,37 @@ test("getDocumentLoader()", async (t) => {
|
|
|
298
299
|
}
|
|
299
300
|
});
|
|
300
301
|
|
|
302
|
+
await t.step("preloaded Mastodon attribution domains", async () => {
|
|
303
|
+
const context = [
|
|
304
|
+
"https://www.w3.org/ns/activitystreams",
|
|
305
|
+
"http://joinmastodon.org/ns",
|
|
306
|
+
];
|
|
307
|
+
const expanded = await jsonld.expand({
|
|
308
|
+
"@context": context,
|
|
309
|
+
id: "https://social.example/users/alice",
|
|
310
|
+
type: "Person",
|
|
311
|
+
attributionDomains: ["blog.example"],
|
|
312
|
+
}, { documentLoader: fetchDocumentLoader });
|
|
313
|
+
deepStrictEqual(expanded, [{
|
|
314
|
+
"@id": "https://social.example/users/alice",
|
|
315
|
+
"@type": ["https://www.w3.org/ns/activitystreams#Person"],
|
|
316
|
+
"http://joinmastodon.org/ns#attributionDomains": [
|
|
317
|
+
{ "@value": "blog.example" },
|
|
318
|
+
],
|
|
319
|
+
}]);
|
|
320
|
+
const compacted = await jsonld.compact(expanded, context, {
|
|
321
|
+
documentLoader: fetchDocumentLoader,
|
|
322
|
+
});
|
|
323
|
+
deepStrictEqual(compacted.attributionDomains, ["blog.example"]);
|
|
324
|
+
});
|
|
325
|
+
|
|
301
326
|
// Controlled Identifiers v1.0 requires JSON-LD processors to treat this
|
|
302
327
|
// context URL as already resolved. A temporary W3C outage must not prevent
|
|
303
328
|
// an otherwise valid document from being processed.
|
|
304
329
|
// See: https://www.w3.org/TR/cid-1.0/#json-ld-context
|
|
305
330
|
// https://github.com/fedify-dev/fedify/issues/932
|
|
306
331
|
fetchMock.get("https://www.w3.org/ns/cid/v1", { status: 503 });
|
|
307
|
-
await t.
|
|
332
|
+
await t.step("preloaded CID v1 context", async () => {
|
|
308
333
|
const url = "https://www.w3.org/ns/cid/v1";
|
|
309
334
|
deepStrictEqual(await fetchDocumentLoader(url), {
|
|
310
335
|
contextUrl: null,
|
|
@@ -318,7 +343,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
318
343
|
// document referencing it fails before application handlers run. It has to
|
|
319
344
|
// be resolved from the built-in copy rather than over the network.
|
|
320
345
|
// See: https://github.com/fedify-dev/fedify/issues/982
|
|
321
|
-
await t.
|
|
346
|
+
await t.step("preloaded FEP-ef61 context", async () => {
|
|
322
347
|
const url = "https://w3id.org/fep/ef61";
|
|
323
348
|
ok(url in preloadedContexts);
|
|
324
349
|
deepStrictEqual(await fetchDocumentLoader(url), {
|
|
@@ -341,7 +366,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
341
366
|
// A Codeberg Pages outage must not prevent loading the FEP-7aa9 context.
|
|
342
367
|
// See: https://github.com/fedify-dev/fedify/issues/1078
|
|
343
368
|
fetchMock.get("https://w3id.org/fep/7aa9", { status: 502 });
|
|
344
|
-
await t.
|
|
369
|
+
await t.step("preloaded FEP-7aa9 context", async () => {
|
|
345
370
|
const url = "https://w3id.org/fep/7aa9";
|
|
346
371
|
deepStrictEqual(await fetchDocumentLoader(url), {
|
|
347
372
|
contextUrl: null,
|
|
@@ -375,7 +400,130 @@ test("getDocumentLoader()", async (t) => {
|
|
|
375
400
|
deepStrictEqual(fetchMock.callHistory.calls(url).length, 0);
|
|
376
401
|
});
|
|
377
402
|
|
|
378
|
-
|
|
403
|
+
// A Codeberg Pages outage must not prevent loading or expanding FEP-6757.
|
|
404
|
+
// See: https://github.com/fedify-dev/fedify/issues/1211
|
|
405
|
+
fetchMock.get("https://w3id.org/fep/6757", { status: 502 });
|
|
406
|
+
await t.step("preloaded FEP-6757 context", async () => {
|
|
407
|
+
const url = "https://w3id.org/fep/6757";
|
|
408
|
+
deepStrictEqual(await fetchDocumentLoader(url), {
|
|
409
|
+
contextUrl: null,
|
|
410
|
+
documentUrl: url,
|
|
411
|
+
document: {
|
|
412
|
+
"@context": {
|
|
413
|
+
license: {
|
|
414
|
+
"@id": "http://purl.org/dc/terms/license",
|
|
415
|
+
"@type": "@id",
|
|
416
|
+
},
|
|
417
|
+
preferredLicense: {
|
|
418
|
+
"@id": "https://w3id.org/fep/6757#preferredLicense",
|
|
419
|
+
"@type": "@id",
|
|
420
|
+
},
|
|
421
|
+
},
|
|
422
|
+
},
|
|
423
|
+
});
|
|
424
|
+
deepStrictEqual(
|
|
425
|
+
await jsonld.expand({
|
|
426
|
+
"@context": ["https://www.w3.org/ns/activitystreams", url],
|
|
427
|
+
type: "Person",
|
|
428
|
+
license: "https://creativecommons.org/licenses/by/4.0/",
|
|
429
|
+
preferredLicense: "https://creativecommons.org/licenses/by-nc/4.0/",
|
|
430
|
+
}, { documentLoader: fetchDocumentLoader }),
|
|
431
|
+
[{
|
|
432
|
+
"@type": ["https://www.w3.org/ns/activitystreams#Person"],
|
|
433
|
+
"http://purl.org/dc/terms/license": [{
|
|
434
|
+
"@id": "https://creativecommons.org/licenses/by/4.0/",
|
|
435
|
+
}],
|
|
436
|
+
"https://w3id.org/fep/6757#preferredLicense": [{
|
|
437
|
+
"@id": "https://creativecommons.org/licenses/by-nc/4.0/",
|
|
438
|
+
}],
|
|
439
|
+
}],
|
|
440
|
+
);
|
|
441
|
+
deepStrictEqual(fetchMock.callHistory.calls(url).length, 0);
|
|
442
|
+
});
|
|
443
|
+
|
|
444
|
+
// A Codeberg Pages outage must not prevent expanding translation metadata.
|
|
445
|
+
// See: https://github.com/fedify-dev/fedify/issues/1214
|
|
446
|
+
fetchMock.get("https://w3id.org/fep/22cd", { status: 502 });
|
|
447
|
+
await t.step("preloaded FEP-22cd context", async () => {
|
|
448
|
+
const url = "https://w3id.org/fep/22cd";
|
|
449
|
+
const articleId = "https://example.com/articles/1";
|
|
450
|
+
const translatorId = "https://example.com/users/alice";
|
|
451
|
+
const revisionId = "https://example.com/articles/1/revisions/1";
|
|
452
|
+
deepStrictEqual(await fetchDocumentLoader(url), {
|
|
453
|
+
contextUrl: null,
|
|
454
|
+
documentUrl: url,
|
|
455
|
+
document: {
|
|
456
|
+
"@context": {
|
|
457
|
+
"fep-22cd": "https://w3id.org/fep/22cd#",
|
|
458
|
+
schema: "https://schema.org/",
|
|
459
|
+
xsd: "http://www.w3.org/2001/XMLSchema#",
|
|
460
|
+
translations: {
|
|
461
|
+
"@id": "fep-22cd:translations",
|
|
462
|
+
"@container": "@set",
|
|
463
|
+
},
|
|
464
|
+
Translation: "fep-22cd:Translation",
|
|
465
|
+
sourceUpdated: {
|
|
466
|
+
"@id": "fep-22cd:sourceUpdated",
|
|
467
|
+
"@type": "xsd:dateTime",
|
|
468
|
+
},
|
|
469
|
+
translator: {
|
|
470
|
+
"@id": "schema:translator",
|
|
471
|
+
"@type": "@id",
|
|
472
|
+
"@container": "@set",
|
|
473
|
+
},
|
|
474
|
+
inLanguage: "schema:inLanguage",
|
|
475
|
+
translationOfWork: {
|
|
476
|
+
"@id": "schema:translationOfWork",
|
|
477
|
+
"@type": "@id",
|
|
478
|
+
},
|
|
479
|
+
isBasedOn: { "@id": "schema:isBasedOn", "@type": "@id" },
|
|
480
|
+
},
|
|
481
|
+
},
|
|
482
|
+
});
|
|
483
|
+
deepStrictEqual(
|
|
484
|
+
await jsonld.expand({
|
|
485
|
+
"@context": ["https://www.w3.org/ns/activitystreams", url],
|
|
486
|
+
id: articleId,
|
|
487
|
+
type: "Article",
|
|
488
|
+
contentMap: { en: "Original", ko: "Translation" },
|
|
489
|
+
translations: [{
|
|
490
|
+
type: "Translation",
|
|
491
|
+
inLanguage: "ko",
|
|
492
|
+
translator: [translatorId],
|
|
493
|
+
translationOfWork: articleId,
|
|
494
|
+
sourceUpdated: "2026-09-01T00:00:00Z",
|
|
495
|
+
isBasedOn: revisionId,
|
|
496
|
+
}],
|
|
497
|
+
}, { documentLoader: fetchDocumentLoader }),
|
|
498
|
+
[{
|
|
499
|
+
"@id": articleId,
|
|
500
|
+
"@type": ["https://www.w3.org/ns/activitystreams#Article"],
|
|
501
|
+
"https://www.w3.org/ns/activitystreams#content": [
|
|
502
|
+
{ "@language": "en", "@value": "Original" },
|
|
503
|
+
{ "@language": "ko", "@value": "Translation" },
|
|
504
|
+
],
|
|
505
|
+
"https://w3id.org/fep/22cd#translations": [{
|
|
506
|
+
"@type": ["https://w3id.org/fep/22cd#Translation"],
|
|
507
|
+
"https://schema.org/inLanguage": [{ "@value": "ko" }],
|
|
508
|
+
"https://schema.org/translator": [{ "@id": translatorId }],
|
|
509
|
+
"https://schema.org/translationOfWork": [{ "@id": articleId }],
|
|
510
|
+
"https://w3id.org/fep/22cd#sourceUpdated": [{
|
|
511
|
+
"@type": "http://www.w3.org/2001/XMLSchema#dateTime",
|
|
512
|
+
"@value": "2026-09-01T00:00:00Z",
|
|
513
|
+
}],
|
|
514
|
+
"https://schema.org/isBasedOn": [{ "@id": revisionId }],
|
|
515
|
+
}],
|
|
516
|
+
}],
|
|
517
|
+
);
|
|
518
|
+
deepStrictEqual(fetchMock.callHistory.calls(url).length, 0);
|
|
519
|
+
deepStrictEqual(
|
|
520
|
+
fetchMock.callHistory.calls("https://www.w3.org/ns/activitystreams")
|
|
521
|
+
.length,
|
|
522
|
+
0,
|
|
523
|
+
);
|
|
524
|
+
});
|
|
525
|
+
|
|
526
|
+
await t.step("deny non-HTTP/HTTPS", async () => {
|
|
379
527
|
await rejects(
|
|
380
528
|
() => fetchDocumentLoader("ftp://localhost"),
|
|
381
529
|
UrlError,
|
|
@@ -409,7 +557,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
409
557
|
},
|
|
410
558
|
});
|
|
411
559
|
|
|
412
|
-
await t.
|
|
560
|
+
await t.step("allowPrivateAddress: false", async () => {
|
|
413
561
|
await rejects(
|
|
414
562
|
() => fetchDocumentLoader("https://localhost/object"),
|
|
415
563
|
UrlError,
|
|
@@ -426,7 +574,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
426
574
|
|
|
427
575
|
const fetchDocumentLoader2 = getDocumentLoader({ allowPrivateAddress: true });
|
|
428
576
|
|
|
429
|
-
await t.
|
|
577
|
+
await t.step("allowPrivateAddress: true", async () => {
|
|
430
578
|
const expected = {
|
|
431
579
|
contextUrl: null,
|
|
432
580
|
documentUrl: "https://localhost/object",
|
|
@@ -463,7 +611,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
463
611
|
};
|
|
464
612
|
});
|
|
465
613
|
|
|
466
|
-
await t.
|
|
614
|
+
await t.step("too many redirects", async () => {
|
|
467
615
|
redirectAttempts = 0;
|
|
468
616
|
await rejects(
|
|
469
617
|
() => fetchDocumentLoader("https://example.com/too-many-redirects/0"),
|
|
@@ -489,7 +637,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
489
637
|
};
|
|
490
638
|
});
|
|
491
639
|
|
|
492
|
-
await t.
|
|
640
|
+
await t.step("redirect loop", async () => {
|
|
493
641
|
loopAttempts = 0;
|
|
494
642
|
await rejects(
|
|
495
643
|
() => fetchDocumentLoader("https://example.com/redirect-loop-a"),
|
|
@@ -508,7 +656,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
508
656
|
};
|
|
509
657
|
});
|
|
510
658
|
|
|
511
|
-
await t.
|
|
659
|
+
await t.step("redirect loop with relative location", async () => {
|
|
512
660
|
relativeLoopAttempts = 0;
|
|
513
661
|
await rejects(
|
|
514
662
|
() => fetchDocumentLoader("https://example.com/redirect-loop-relative"),
|
|
@@ -528,7 +676,7 @@ test("getDocumentLoader()", async (t) => {
|
|
|
528
676
|
headers: { "Content-Type": "text/html; charset=utf-8" },
|
|
529
677
|
});
|
|
530
678
|
|
|
531
|
-
await t.
|
|
679
|
+
await t.step("ReDoS resistance (CVE-2025-68475)", async () => {
|
|
532
680
|
const start = performance.now();
|
|
533
681
|
// The malicious HTML will fail JSON parsing, but the important thing is
|
|
534
682
|
// that it should complete quickly (not hang due to ReDoS)
|
|
@@ -677,12 +825,13 @@ test("getDocumentLoader() logs DNS failures as such", async (t) => {
|
|
|
677
825
|
"Deno" in globalThis &&
|
|
678
826
|
(await Deno.permissions.query({ name: "net" })).state !== "granted"
|
|
679
827
|
) {
|
|
680
|
-
|
|
681
|
-
|
|
828
|
+
throw new Error(
|
|
829
|
+
"This DNS test requires Deno network permission (--allow-net).",
|
|
830
|
+
);
|
|
682
831
|
}
|
|
683
832
|
const loader = getDocumentLoader();
|
|
684
833
|
for (const result of ["throws", "empty", "private"] as const) {
|
|
685
|
-
await t.
|
|
834
|
+
await t.step(result, async () => {
|
|
686
835
|
// Stubbing works only because url.ts uses the default node:dns/promises
|
|
687
836
|
// import; see the FIXME there.
|
|
688
837
|
const originalLookup = dns.lookup;
|
|
@@ -738,7 +887,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
|
|
|
738
887
|
const loader = getDocumentLoader({ allowPrivateAddress: true });
|
|
739
888
|
for (const mode of ["header", "html", "mixed"] as const) {
|
|
740
889
|
for (const hops of [20, 21]) {
|
|
741
|
-
await t.
|
|
890
|
+
await t.step(`${mode}: ${hops} hops`, async () => {
|
|
742
891
|
fetchMock.mockGlobal();
|
|
743
892
|
let requests = 0;
|
|
744
893
|
fetchMock.get(`begin:${base}`, ({ url }) => {
|
|
@@ -783,7 +932,7 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
|
|
|
783
932
|
"redirect-intermediate",
|
|
784
933
|
]
|
|
785
934
|
) {
|
|
786
|
-
await t.
|
|
935
|
+
await t.step(`${mode}: cycle`, async () => {
|
|
787
936
|
fetchMock.mockGlobal();
|
|
788
937
|
let requests = 0;
|
|
789
938
|
fetchMock.get(`begin:${base}`, ({ url }) => {
|
|
@@ -817,49 +966,55 @@ test("getDocumentLoader() bounds alternate document chains", async (t) => {
|
|
|
817
966
|
});
|
|
818
967
|
}
|
|
819
968
|
|
|
820
|
-
await t.
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
requests
|
|
825
|
-
|
|
826
|
-
|
|
827
|
-
|
|
828
|
-
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
|
|
832
|
-
await rejects(loader(`${base}0`), (error: unknown) => {
|
|
833
|
-
ok(error instanceof FetchError);
|
|
834
|
-
ok(error.message.includes("Too many redirections (21)"));
|
|
835
|
-
return true;
|
|
969
|
+
await t.step(
|
|
970
|
+
"alternate followed by 20 redirects shares the limit",
|
|
971
|
+
async () => {
|
|
972
|
+
fetchMock.mockGlobal();
|
|
973
|
+
let requests = 0;
|
|
974
|
+
fetchMock.get(`begin:${base}`, ({ url }) => {
|
|
975
|
+
requests++;
|
|
976
|
+
const index = Number(new URL(url).pathname.split("/").at(-1));
|
|
977
|
+
if (index === 21) return Response.json({ done: true });
|
|
978
|
+
return index === 0
|
|
979
|
+
? alternate(`${base}1`, false)
|
|
980
|
+
: Response.redirect(`${base}${index + 1}`, 302);
|
|
836
981
|
});
|
|
837
|
-
|
|
838
|
-
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
|
|
982
|
+
try {
|
|
983
|
+
await rejects(loader(`${base}0`), (error: unknown) => {
|
|
984
|
+
ok(error instanceof FetchError);
|
|
985
|
+
ok(error.message.includes("Too many redirections (21)"));
|
|
986
|
+
return true;
|
|
987
|
+
});
|
|
988
|
+
deepStrictEqual(requests, 21);
|
|
989
|
+
} finally {
|
|
990
|
+
fetchMock.hardReset();
|
|
991
|
+
}
|
|
992
|
+
},
|
|
993
|
+
);
|
|
842
994
|
|
|
843
|
-
await t.
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
|
|
847
|
-
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
995
|
+
await t.step(
|
|
996
|
+
"relative alternate after redirect and isolated calls",
|
|
997
|
+
async () => {
|
|
998
|
+
fetchMock.mockGlobal();
|
|
999
|
+
fetchMock.get(`${base}start`, Response.redirect(`${base}html`, 302));
|
|
1000
|
+
fetchMock.get(`${base}html`, alternate("./document", true));
|
|
1001
|
+
fetchMock.get(`${base}document`, Response.json({ done: true }));
|
|
1002
|
+
try {
|
|
1003
|
+
for (let i = 0; i < 2; i++) {
|
|
1004
|
+
const results = await Promise.all([
|
|
1005
|
+
loader(`${base}start`),
|
|
1006
|
+
loader(`${base}start`),
|
|
1007
|
+
]);
|
|
1008
|
+
for (const result of results) {
|
|
1009
|
+
deepStrictEqual(result.document, { done: true });
|
|
1010
|
+
deepStrictEqual(result.documentUrl, `${base}document`);
|
|
1011
|
+
}
|
|
857
1012
|
}
|
|
1013
|
+
} finally {
|
|
1014
|
+
fetchMock.hardReset();
|
|
858
1015
|
}
|
|
859
|
-
}
|
|
860
|
-
|
|
861
|
-
}
|
|
862
|
-
});
|
|
1016
|
+
},
|
|
1017
|
+
);
|
|
863
1018
|
|
|
864
1019
|
function alternate(next: string, html: boolean): Response {
|
|
865
1020
|
return html
|
|
@@ -882,7 +1037,7 @@ test("getDocumentLoader() preserves cancellation across alternates", async (t) =
|
|
|
882
1037
|
const base = "https://example.com/alternate-abort/";
|
|
883
1038
|
const loader = getDocumentLoader({ allowPrivateAddress: true });
|
|
884
1039
|
for (const html of [false, true]) {
|
|
885
|
-
await t.
|
|
1040
|
+
await t.step(html ? "HTML" : "Link header", async () => {
|
|
886
1041
|
fetchMock.mockGlobal();
|
|
887
1042
|
const controller = new AbortController();
|
|
888
1043
|
let requests = 0;
|
package/src/docloader.ts
CHANGED
|
@@ -281,6 +281,8 @@ export interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
|
|
|
281
281
|
* - <https://w3id.org/security/multikey/v1>
|
|
282
282
|
* - <https://w3id.org/fep/ef61>
|
|
283
283
|
* - <https://w3id.org/fep/7aa9>
|
|
284
|
+
* - <https://w3id.org/fep/6757>
|
|
285
|
+
* - <https://w3id.org/fep/22cd>
|
|
284
286
|
* - <https://purl.archive.org/socialweb/webfinger>
|
|
285
287
|
* - <http://schema.org/>
|
|
286
288
|
* @param options Options for the document loader.
|
package/src/langstr.test.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { deepStrictEqual } from "node:assert";
|
|
1
|
+
import { deepStrictEqual, throws } from "node:assert";
|
|
2
2
|
import { test } from "node:test";
|
|
3
3
|
import util from "node:util";
|
|
4
4
|
import { LanguageString } from "./langstr.ts";
|
|
@@ -11,6 +11,23 @@ test("new LanguageString()", () => {
|
|
|
11
11
|
deepStrictEqual(new LanguageString("Hello", new Intl.Locale("en")), langStr);
|
|
12
12
|
});
|
|
13
13
|
|
|
14
|
+
test("new LanguageString() with extlang tags", () => {
|
|
15
|
+
// Intl.Locale objects have no own enumerable properties, so their base names
|
|
16
|
+
// are compared instead:
|
|
17
|
+
deepStrictEqual(new LanguageString("你好", "zh-YUE").locale.baseName, "yue");
|
|
18
|
+
deepStrictEqual(
|
|
19
|
+
new LanguageString("你好", "zh-yue-HK").locale.baseName,
|
|
20
|
+
"yue-HK",
|
|
21
|
+
);
|
|
22
|
+
// Whether cmn is canonicalized to zh depends on the runtime:
|
|
23
|
+
deepStrictEqual(
|
|
24
|
+
new LanguageString("你好", "zh-cmn-Hant").locale.baseName,
|
|
25
|
+
new Intl.Locale("cmn-Hant").baseName,
|
|
26
|
+
);
|
|
27
|
+
throws(() => new LanguageString("Hello", "en-USA"), RangeError);
|
|
28
|
+
throws(() => new LanguageString("你好", "zh-yue-"), RangeError);
|
|
29
|
+
});
|
|
30
|
+
|
|
14
31
|
test("Deno.inspect(LanguageString)", () => {
|
|
15
32
|
const langStr = new LanguageString("Hello, 'world'", "en");
|
|
16
33
|
deepStrictEqual(
|
package/src/langstr.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { normalizeLanguageTag } from "./langtag.ts";
|
|
2
|
+
|
|
1
3
|
/**
|
|
2
4
|
* A language-tagged string which corresponds to the `rdf:langString` type.
|
|
3
5
|
*/
|
|
@@ -12,12 +14,14 @@ export class LanguageString extends String {
|
|
|
12
14
|
* Constructs a new `LanguageString`.
|
|
13
15
|
* @param value A string value written in the given language.
|
|
14
16
|
* @param language The language of the string. If a string is given, it will
|
|
15
|
-
* be parsed as a `Intl.Locale` object.
|
|
17
|
+
* be parsed as a `Intl.Locale` object. Extended language
|
|
18
|
+
* subtags are normalized first, e.g., `zh-yue` is parsed as
|
|
19
|
+
* `yue`.
|
|
16
20
|
*/
|
|
17
21
|
constructor(value: string, language: Intl.Locale | string) {
|
|
18
22
|
super(value);
|
|
19
23
|
this.locale = typeof language === "string"
|
|
20
|
-
? new Intl.Locale(language)
|
|
24
|
+
? new Intl.Locale(normalizeLanguageTag(language))
|
|
21
25
|
: language;
|
|
22
26
|
}
|
|
23
27
|
}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { deepStrictEqual } from "node:assert";
|
|
2
|
+
import { test } from "node:test";
|
|
3
|
+
import { normalizeLanguageTag } from "./langtag.ts";
|
|
4
|
+
|
|
5
|
+
test("normalizeLanguageTag() removes extlang subtags", () => {
|
|
6
|
+
const cases: [string, string][] = [
|
|
7
|
+
["zh-yue", "yue"],
|
|
8
|
+
["zh-YUE", "yue"],
|
|
9
|
+
["ZH-Yue-hk", "yue-hk"],
|
|
10
|
+
["zh-yue-HK", "yue-HK"],
|
|
11
|
+
["zh-cmn-Hant", "cmn-Hant"],
|
|
12
|
+
["zh-yue-u-nu-hanidec", "yue-u-nu-hanidec"],
|
|
13
|
+
["sgn-ase", "ase"],
|
|
14
|
+
["ar-arz", "arz"],
|
|
15
|
+
["ms-zlm", "zlm"],
|
|
16
|
+
["kok-gom", "gom"],
|
|
17
|
+
["koK-gom", "gom"],
|
|
18
|
+
["lv-ltg", "ltg"],
|
|
19
|
+
["sw-swc", "swc"],
|
|
20
|
+
["uz-uzs", "uzs"],
|
|
21
|
+
// Valid tags never have more than one extlang, so only the first one is
|
|
22
|
+
// removed and the result is still rejected by Intl.Locale:
|
|
23
|
+
["zh-yue-cmn", "yue-cmn"],
|
|
24
|
+
["zh-yue-", "yue-"],
|
|
25
|
+
];
|
|
26
|
+
for (const [input, expected] of cases) {
|
|
27
|
+
deepStrictEqual(normalizeLanguageTag(input), expected, input);
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
test("normalizeLanguageTag() leaves other tags unchanged", () => {
|
|
32
|
+
const tags = [
|
|
33
|
+
"",
|
|
34
|
+
"en",
|
|
35
|
+
"en-US",
|
|
36
|
+
"en-USA",
|
|
37
|
+
"en-yue",
|
|
38
|
+
"zh",
|
|
39
|
+
"zh-Hant-TW",
|
|
40
|
+
"yue",
|
|
41
|
+
"yue-HK",
|
|
42
|
+
"x-private",
|
|
43
|
+
"i-klingon",
|
|
44
|
+
"zh-min-nan",
|
|
45
|
+
"koK-gom",
|
|
46
|
+
"zh-yuK",
|
|
47
|
+
"constructor-yue",
|
|
48
|
+
"toString-yue",
|
|
49
|
+
];
|
|
50
|
+
for (const tag of tags) {
|
|
51
|
+
deepStrictEqual(normalizeLanguageTag(tag), tag, tag);
|
|
52
|
+
}
|
|
53
|
+
});
|
package/src/langtag.ts
ADDED
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Extended language subtags (extlangs) registered in the IANA Language Subtag
|
|
3
|
+
* Registry, grouped by their prefixes. Every extlang record has exactly one
|
|
4
|
+
* prefix and a `Preferred-Value` equal to the extlang subtag itself, so
|
|
5
|
+
* replacing the prefix and the extlang with the extlang alone yields
|
|
6
|
+
* the canonical form.
|
|
7
|
+
*
|
|
8
|
+
* Generated from the registry with File-Date: 2026-09-17.
|
|
9
|
+
*/
|
|
10
|
+
const EXTLANGS: Record<string, string> = {
|
|
11
|
+
ar: "aao abh abv acm acq acw acx acy adf aeb aec afb ajp apc apd arb arq " +
|
|
12
|
+
"ars ary arz auz avl ayh ayl ayn ayp bbz pga shu ssh",
|
|
13
|
+
kok: "gom knn",
|
|
14
|
+
lv: "ltg lvs",
|
|
15
|
+
ms: "bjn btj bve bvu coa dup hji jak jax kvb kvr kxd lce lcf liw max meo " +
|
|
16
|
+
"mfa mfb min mqg msi mui orn ors pel pse tmw urk vkk vkt xmm zlm zmi " +
|
|
17
|
+
"zsm",
|
|
18
|
+
sgn: "ads aed aen afg ajs ase asf asp asq asw bfi bfk bog bqn bqy bvl bzs " +
|
|
19
|
+
"cds csc csd cse csf csg csl csn csq csr csx doq dse dsl dsz dyl ecs " +
|
|
20
|
+
"ehs esl esn eso eth fcs fse fsl fss gds gse gsg gsm gss gus hab haf " +
|
|
21
|
+
"hds hks hos hps hsh hsl icl iks ils inl ins ise isg isr jcs jhs jks " +
|
|
22
|
+
"jls jos jsl jus kgi kvk lbs lgs lls lsb lsc lsg lsl lsn lso lsp lst " +
|
|
23
|
+
"lsv lsw lsy lws mdl mfs mre msd msr mzc mzg mzy nbs ncs nsi nsl nsp " +
|
|
24
|
+
"nsr nzs okl pgz pks prl prz psc psd psg psl pso psp psr pys rib rms " +
|
|
25
|
+
"rnb rsi rsl rsm rsn sdl sfb sfs sgg sgx slf sls sqk sqs sqx ssp ssr " +
|
|
26
|
+
"svk swl syy szs tse tsm tsq tss tsy tza ugn ugy ukl uks vgt vsi vsl " +
|
|
27
|
+
"vsv wbs xki xml xms yds ygs yhs ysl ysm zhk zib zsl",
|
|
28
|
+
sw: "swc swh",
|
|
29
|
+
uz: "uzn uzs",
|
|
30
|
+
zh: "cdo cjy cmn cnp cpx csp czh czo gan hak hnm hsn luh lzh mnp nan sjc " +
|
|
31
|
+
"wuu yue",
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
const EXTLANG_PAIRS: ReadonlySet<string> = new Set(
|
|
35
|
+
Object.entries(EXTLANGS).flatMap(([prefix, extlangs]) =>
|
|
36
|
+
extlangs.split(" ").map((extlang) => `${prefix}-${extlang}`)
|
|
37
|
+
),
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
const PREFIX_PATTERN = /^[A-Za-z]{2,3}$/;
|
|
41
|
+
const EXTLANG_PATTERN = /^[A-Za-z]{3}$/;
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Normalizes a BCP 47 language tag that has an extended language subtag
|
|
45
|
+
* (extlang), such as `zh-yue`, into its canonical form, such as `yue`, as
|
|
46
|
+
* described in [RFC 5646, Section 4.5][1]. `Intl.Locale` rejects extlang
|
|
47
|
+
* tags, so tags should be normalized before being passed to it.
|
|
48
|
+
*
|
|
49
|
+
* Only registered extlangs that follow their registered prefix are removed;
|
|
50
|
+
* any other tag is returned unchanged, so the result still needs to be
|
|
51
|
+
* validated, e.g., by `Intl.Locale`.
|
|
52
|
+
*
|
|
53
|
+
* NOTE: This function is marked as internal in the 2.0.x–2.4.x patch
|
|
54
|
+
* releases. When merging it into the *main* branch, remove the `@internal`
|
|
55
|
+
* tag, formalize it as a public API (`@since 2.5.0`), and add it to
|
|
56
|
+
* the changelog fragment.
|
|
57
|
+
*
|
|
58
|
+
* [1]: https://www.rfc-editor.org/rfc/rfc5646.html#section-4.5
|
|
59
|
+
*
|
|
60
|
+
* @param tag The BCP 47 language tag to normalize.
|
|
61
|
+
* @returns The normalized language tag.
|
|
62
|
+
* @internal
|
|
63
|
+
*/
|
|
64
|
+
export function normalizeLanguageTag(tag: string): string {
|
|
65
|
+
const subtags = tag.split("-");
|
|
66
|
+
if (subtags.length < 2) return tag;
|
|
67
|
+
const [prefix, extlang, ...rest] = subtags;
|
|
68
|
+
// Checked before case folding, since `toLowerCase()` maps some non-ASCII
|
|
69
|
+
// characters (e.g., U+212A KELVIN SIGN) to ASCII letters:
|
|
70
|
+
if (!PREFIX_PATTERN.test(prefix) || !EXTLANG_PATTERN.test(extlang)) {
|
|
71
|
+
return tag;
|
|
72
|
+
}
|
|
73
|
+
const language = extlang.toLowerCase();
|
|
74
|
+
if (!EXTLANG_PAIRS.has(`${prefix.toLowerCase()}-${language}`)) return tag;
|
|
75
|
+
return [language, ...rest].join("-");
|
|
76
|
+
}
|