@fedify/vocab 2.4.0-dev.2219 → 2.4.0-dev.2233

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.4.0-dev.2219+eb70f060",
+  "version": "2.4.0-dev.2233+abb4a6b2",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/mod.cjs

@@ -36,7 +36,7 @@ let _fedify_vocab_runtime_temporal = require("@fedify/vocab-runtime/temporal");
 let es_toolkit = require("es-toolkit");
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.2219+eb70f060";
+var version = "2.4.0-dev.2233+abb4a6b2";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {

package/dist/mod.js

@@ -12,7 +12,7 @@ import { isTemporalDuration, isTemporalInstant } from "@fedify/vocab-runtime/tem
 import { delay } from "es-toolkit";
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.2219+eb70f060";
+var version = "2.4.0-dev.2233+abb4a6b2";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {

package/dist-tests/{actor-DzLs-X1G.mjs → actor-C8V9Eu9k.mjs}

@@ -8,7 +8,7 @@ import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { domainToASCII, domainToUnicode } from "node:url";
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.2219+eb70f060";
+var version = "2.4.0-dev.2233+abb4a6b2";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [

package/dist-tests/actor.test.mjs

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { F as Person, P as Organization, Q as __exportAll, U as Service, a as Application, b as Group } from "./vocab-D3C791xF.mjs";
 import { t as esm_default } from "./esm-2_Uqq_my.mjs";
-import { a as normalizeActorHandle, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-DzLs-X1G.mjs";
+import { a as normalizeActorHandle, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-C8V9Eu9k.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
 //#region ../../node_modules/.pnpm/fast-check@3.23.2/node_modules/fast-check/lib/esm/check/precondition/PreconditionFailure.js

package/dist-tests/gateway.test.mjs

@@ -2,11 +2,11 @@ import "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { F as Person, M as OrderedCollection, S as Image, c as CollectionPage, k as Note, s as Collection, u as Create } from "./vocab-D3C791xF.mjs";
 import { t as esm_default } from "./esm-2_Uqq_my.mjs";
-import { n as traverseCollection, t as lookupObject } from "./lookup-DckWWZgA.mjs";
+import { n as traverseCollection, t as lookupObject } from "./lookup-2QrSuQR0.mjs";
 import { t as assertInstanceOf } from "./utils-Df2odC27.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
-import { FetchError, getDocumentLoader, parseIri } from "@fedify/vocab-runtime";
+import { FetchError, getDocumentLoader, parseIri, withGatewayHints } from "@fedify/vocab-runtime";
 //#region src/gateway.test.ts
 const did = "did:key:z6Mkabc";
 const objectId = `ap+ef61://${did}/objects/1`;
@@ -1887,5 +1887,20 @@ test("accessors pass the verifier of a call on to the objects they fetch", async
 		for (const item of optedOut) ok(getDefaultVerifier(item) == null);
 	});
 });
+test("getObject() follows location hints made by withGatewayHints()", async () => {
+	const json = await new Create({
+		id: parseIri(`ap://${did}/activities/1`),
+		object: withGatewayHints(objectId, ["https://gw1.example", "https://gw2.example"])
+	}).toJsonLd({ contextLoader: mockDocumentLoader });
+	deepStrictEqual(json.object, `${objectId}?@gateway=https%3A%2F%2Fgw1.example&@gateway=https%3A%2F%2Fgw2.example`);
+	const parsed = await Create.fromJsonLd(json, { contextLoader: mockDocumentLoader });
+	const documentLoader = createLoader({ [`https://gw2.example${gatewayPath}`]: note() });
+	assertInstanceOf(await parsed.getObject({
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		verifyPortableObject: createVerifier()
+	}), Note);
+	deepStrictEqual(documentLoader.fetched, [`https://gw1.example${gatewayPath}`, `https://gw2.example${gatewayPath}`]);
+});
 //#endregion
 export {};

package/dist-tests/{lookup-DckWWZgA.mjs → lookup-2QrSuQR0.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { A as Object$1 } from "./vocab-D3C791xF.mjs";
-import { i as isActor, o as name, s as version } from "./actor-DzLs-X1G.mjs";
+import { i as isActor, o as name, s as version } from "./actor-C8V9Eu9k.mjs";
 import { t as getTypeId } from "./type-BMdjm4Eg.mjs";
 import { canonicalizePortableUri, formatIri, getDocumentLoader, haveSameFe34Origin, haveSameIriOrigin, parseIri } from "@fedify/vocab-runtime";
 import { lookupWebFinger } from "@fedify/webfinger";

package/dist-tests/lookup.test.mjs

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { A as Object$1, F as Person, k as Note, s as Collection } from "./vocab-D3C791xF.mjs";
 import { t as esm_default } from "./esm-2_Uqq_my.mjs";
-import { n as traverseCollection, t as lookupObject } from "./lookup-DckWWZgA.mjs";
+import { n as traverseCollection, t as lookupObject } from "./lookup-2QrSuQR0.mjs";
 import { t as assertInstanceOf } from "./utils-Df2odC27.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, equal, ok, rejects } from "node:assert/strict";

package/dist-tests/portable-lookup.test.mjs

@@ -2,8 +2,8 @@ import "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { F as Person } from "./vocab-D3C791xF.mjs";
 import { t as esm_default } from "./esm-2_Uqq_my.mjs";
-import { n as getActorHandle } from "./actor-DzLs-X1G.mjs";
-import { t as lookupObject } from "./lookup-DckWWZgA.mjs";
+import { n as getActorHandle } from "./actor-C8V9Eu9k.mjs";
+import { t as lookupObject } from "./lookup-2QrSuQR0.mjs";
 import { t as assertInstanceOf } from "./utils-Df2odC27.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, equal, rejects } from "node:assert/strict";

package/dist-tests/translation.test.mjs

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { A as Object$1, E as Link, F as Person, K as Translation, L as PropertyValue, P as Organization, U as Service, a as Application, b as Group, k as Note, o as Article, q as Update, s as Collection, u as Create } from "./vocab-D3C791xF.mjs";
-import "./actor-DzLs-X1G.mjs";
-import "./lookup-DckWWZgA.mjs";
+import "./actor-C8V9Eu9k.mjs";
+import "./lookup-2QrSuQR0.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 import { LanguageString as LanguageString$1, getDocumentLoader, preloadedContexts } from "@fedify/vocab-runtime";

package/dist-tests/vocab.test.mjs

@@ -473,7 +473,9 @@ test("FEP-ef61: actor gateways must be HTTP(S) base URIs", async () => {
 		"https://user@server.example/",
 		"https://server.example/path",
 		"https://server.example/?x=1",
-		"https://server.example/#fragment"
+		"https://server.example/?",
+		"https://server.example/#fragment",
+		"https://server.example/#"
 	]) {
 		throws(() => new Person({
 			id: new URL("ap+ef61://did%3Akey%3Az6Mkabc/actor"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.4.0-dev.2219+eb70f060",
+  "version": "2.4.0-dev.2233+abb4a6b2",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -43,9 +43,9 @@
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
     "temporal-polyfill": "^1.0.1",
-    "@fedify/webfinger": "2.4.0-dev.2219+eb70f060",
-    "@fedify/vocab-tools": "2.4.0-dev.2219+eb70f060",
-    "@fedify/vocab-runtime": "2.4.0-dev.2219+eb70f060"
+    "@fedify/vocab-tools": "2.4.0-dev.2233+abb4a6b2",
+    "@fedify/vocab-runtime": "2.4.0-dev.2233+abb4a6b2",
+    "@fedify/webfinger": "2.4.0-dev.2233+abb4a6b2"
   },
   "devDependencies": {
     "@types/node": "^24.12.2",

package/src/gateway.test.ts

@@ -12,6 +12,7 @@ import {
   type PortableObjectVerifier,
   type PortableObjectVerifierOptions,
   type RemoteDocument,
+  withGatewayHints,
 } from "@fedify/vocab-runtime";
 import fetchMock from "fetch-mock";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
@@ -2599,3 +2600,35 @@ test("accessors pass the verifier of a call on to the objects they fetch", async
     for (const item of optedOut) ok(getDefaultVerifier(item) == null);
   });
 });
+
+test("getObject() follows location hints made by withGatewayHints()", async () => {
+  const activity = new Create({
+    id: parseIri(`ap://${did}/activities/1`),
+    object: withGatewayHints(objectId, [
+      "https://gw1.example",
+      "https://gw2.example",
+    ]),
+  });
+  const json = await activity.toJsonLd({ contextLoader: mockDocumentLoader });
+  deepStrictEqual(
+    (json as Record<string, unknown>).object,
+    `${objectId}?@gateway=https%3A%2F%2Fgw1.example` +
+      "&@gateway=https%3A%2F%2Fgw2.example",
+  );
+  const parsed = await Create.fromJsonLd(json, {
+    contextLoader: mockDocumentLoader,
+  });
+  const documentLoader = createLoader({
+    [`https://gw2.example${gatewayPath}`]: note(),
+  });
+  const object = await parsed.getObject({
+    documentLoader,
+    contextLoader: mockDocumentLoader,
+    verifyPortableObject: createVerifier(),
+  });
+  assertInstanceOf(object, Note);
+  deepStrictEqual(documentLoader.fetched, [
+    `https://gw1.example${gatewayPath}`,
+    `https://gw2.example${gatewayPath}`,
+  ]);
+});

package/src/vocab.test.ts

@@ -763,7 +763,9 @@ test("FEP-ef61: actor gateways must be HTTP(S) base URIs", async () => {
       "https://user@server.example/",
       "https://server.example/path",
       "https://server.example/?x=1",
+      "https://server.example/?",
       "https://server.example/#fragment",
+      "https://server.example/#",
     ]
   ) {
     throws(