@fedify/vocab-runtime 2.4.0-dev.2084 → 2.4.0-dev.2093

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.2084+4b8bd325",
+  "version": "2.4.0-dev.2093+e9706a54",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/internal/portable-dereference.cjs

@@ -634,7 +634,8 @@ async function checkPortableObjectId(document, expectedId, contextLoader) {
 	if (typeof id !== "string") throw new PortableObjectRejection("it has an invalid @id");
 	let actualId;
 	try {
-		actualId = require_url.canonicalizePortableUri(id);
+		const portable = require_url.fromCompatibleEf61Id(id);
+		actualId = require_url.canonicalizePortableUri(portable == null ? id : require_url.formatIri(portable));
 	} catch (error) {
 		if (!(error instanceof TypeError)) throw error;
 		actualId = null;

package/dist/internal/portable-dereference.js

@@ -633,7 +633,8 @@ async function checkPortableObjectId(document, expectedId, contextLoader) {
 	if (typeof id !== "string") throw new PortableObjectRejection("it has an invalid @id");
 	let actualId;
 	try {
-		actualId = canonicalizePortableUri(id);
+		const portable = fromCompatibleEf61Id(id);
+		actualId = canonicalizePortableUri(portable == null ? id : formatIri(portable));
 	} catch (error) {
 		if (!(error instanceof TypeError)) throw error;
 		actualId = null;

package/dist/mod.cjs

@@ -16,7 +16,7 @@ let _multiformats_base_x = require("@multiformats/base-x");
 _multiformats_base_x = require_rolldown_runtime.__toESM(_multiformats_base_x, 1);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2084+4b8bd325";
+var version = "2.4.0-dev.2093+e9706a54";
 //#endregion
 //#region src/request.ts
 /**

package/dist/mod.js

@@ -12,7 +12,7 @@ import { PublicKeyInfo } from "pkijs";
 import baseX from "@multiformats/base-x";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2084+4b8bd325";
+var version = "2.4.0-dev.2093+e9706a54";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{body-Dpj8Xxm6.mjs → body-BURgzAYi.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-IYJ6yDYh.mjs";
+import { t as FetchError } from "./request-CSERGIGa.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/{body-BUhZcrY2.cjs → body-NoUX4nMc.cjs}

@@ -1,4 +1,4 @@
-const require_request = require("./request-CeMryLGw.cjs");
+const require_request = require("./request-Dd6hDDKM.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/body.test.cjs

@@ -1,4 +1,4 @@
-const require_body = require("./body-BUhZcrY2.cjs");
+const require_body = require("./body-NoUX4nMc.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");

package/dist/tests/body.test.mjs

@@ -1,4 +1,4 @@
-import { r as readBoundedText, t as BodyTooLargeError } from "./body-Dpj8Xxm6.mjs";
+import { r as readBoundedText, t as BodyTooLargeError } from "./body-BURgzAYi.mjs";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 import { test } from "node:test";
 import { gunzipSync, gzipSync } from "node:zlib";

package/dist/tests/decimal.test.cjs

@@ -1,5 +1,5 @@
 require("./url-BqlldzT8.cjs");
-require("./docloader-DhcNgLAk.cjs");
+require("./docloader-BgGwkPXY.cjs");
 require("./key-8Qg2SbZi.cjs");
 require("./multibase-B5Mea7Ip.cjs");
 require("./digest-3FeH2Y-Q.cjs");

package/dist/tests/decimal.test.mjs

@@ -1,5 +1,5 @@
 import "./url-DgJM9WJn.mjs";
-import "./docloader-CCoCuiGy.mjs";
+import "./docloader-DW7nFmpR.mjs";
 import "./key-C7MNhlkO.mjs";
 import "./multibase-BPnF_L4e.mjs";
 import "./digest-COC7xDiQ.mjs";

package/dist/tests/{docloader-DhcNgLAk.cjs → docloader-BgGwkPXY.cjs}

@@ -1,5 +1,5 @@
-const require_request = require("./request-CeMryLGw.cjs");
-const require_body = require("./body-BUhZcrY2.cjs");
+const require_request = require("./request-Dd6hDDKM.cjs");
+const require_body = require("./body-NoUX4nMc.cjs");
 const require_contexts = require("./contexts-Ch3v2Cgu.cjs");
 const require_link = require("./link-DlKm8bEr.cjs");
 const require_url = require("./url-BqlldzT8.cjs");

package/dist/tests/{docloader-CCoCuiGy.mjs → docloader-DW7nFmpR.mjs}

@@ -1,5 +1,5 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-IYJ6yDYh.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText, t as BodyTooLargeError } from "./body-Dpj8Xxm6.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-CSERGIGa.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText, t as BodyTooLargeError } from "./body-BURgzAYi.mjs";
 import { t as preloadedContexts } from "./contexts-BBX_qhBL.mjs";
 import { t as HttpHeaderLink } from "./link-Cevmc87v.mjs";
 import { t as UrlError, v as validatePublicUrl } from "./url-DgJM9WJn.mjs";

package/dist/tests/docloader.test.cjs

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.cjs");
-const require_request = require("./request-CeMryLGw.cjs");
+const require_request = require("./request-Dd6hDDKM.cjs");
 const require_contexts = require("./contexts-Ch3v2Cgu.cjs");
 const require_url = require("./url-BqlldzT8.cjs");
-const require_docloader = require("./docloader-DhcNgLAk.cjs");
+const require_docloader = require("./docloader-BgGwkPXY.cjs");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");
 let node_assert = require("node:assert");

package/dist/tests/docloader.test.mjs

@@ -1,7 +1,7 @@
-import { t as FetchError } from "./request-IYJ6yDYh.mjs";
+import { t as FetchError } from "./request-CSERGIGa.mjs";
 import { n as cid_v1_default, t as preloadedContexts } from "./contexts-BBX_qhBL.mjs";
 import { t as UrlError } from "./url-DgJM9WJn.mjs";
-import { n as getRemoteDocument, t as getDocumentLoader } from "./docloader-CCoCuiGy.mjs";
+import { n as getRemoteDocument, t as getDocumentLoader } from "./docloader-DW7nFmpR.mjs";
 import { test } from "node:test";
 import { gzipSync } from "node:zlib";
 import { deepStrictEqual, ok, rejects } from "node:assert";

package/dist/tests/{request-IYJ6yDYh.mjs → request-CSERGIGa.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2084+4b8bd325";
+var version = "2.4.0-dev.2093+e9706a54";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-CeMryLGw.cjs → request-Dd6hDDKM.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2084+4b8bd325";
+var version = "2.4.0-dev.2093+e9706a54";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/request.test.cjs

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.cjs");
-const require_request = require("./request-CeMryLGw.cjs");
+const require_request = require("./request-Dd6hDDKM.cjs");
 let node_test = require("node:test");
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);

package/dist/tests/request.test.mjs

@@ -1,4 +1,4 @@
-import { n as createActivityPubRequest, o as version, r as getUserAgent } from "./request-IYJ6yDYh.mjs";
+import { n as createActivityPubRequest, o as version, r as getUserAgent } from "./request-CSERGIGa.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.2084+4b8bd325",
+  "version": "2.4.0-dev.2093+e9706a54",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/internal/portable-dereference.ts

@@ -918,10 +918,15 @@ async function checkPortableObjectId(
     throw new PortableObjectRejection("it has an invalid @id");
   }
   // Compare the raw @id rather than a parsed URL, because URL parsing
-  // normalizes opaque path segments (e.g., dot segments):
+  // normalizes opaque path segments (e.g., dot segments).  A document may
+  // also use a compatible identifier as its @id, e.g., one on the gateway it
+  // was served from, which stands for the portable ID it contains:
   let actualId: string | null;
   try {
-    actualId = canonicalizePortableUri(id);
+    const portable = fromCompatibleEf61Id(id);
+    actualId = canonicalizePortableUri(
+      portable == null ? id : formatIri(portable),
+    );
   } catch (error) {
     if (!(error instanceof TypeError)) throw error;
     actualId = null;