@fedify/vocab-tools 2.4.0-dev.2030 → 2.4.0-dev.2047

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0-dev.2030+e6b3de3d",
+  "version": "2.4.0-dev.2047+140b94db",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/mod.cjs

@@ -8,7 +8,7 @@ let yaml = require("yaml");
 let es_toolkit = require("es-toolkit");
 //#region deno.json
 var name = "@fedify/vocab-tools";
-var version = "2.4.0-dev.2030+e6b3de3d";
+var version = "2.4.0-dev.2047+140b94db";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -1657,6 +1657,8 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         suppressError?: boolean,
         tracerProvider?: TracerProvider,
         crossOrigin?: "ignore" | "throw" | "trust";
+        gateways?: readonly (string | URL)[];
+        verifyPortableObject?: PortableObjectVerifier;
       } = {},
     ): Promise<${getTypeNames(property.range, types)} | null> {
       const documentLoader =
@@ -1670,6 +1672,44 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         ${JSON.stringify(version)},
       );
       return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
+        if (isPortableIri(url)) {
+          try {
+            const obj = await dereferencePortableIri(url, {
+              documentLoader,
+              contextLoader,
+              tracerProvider,
+              gateways: options.gateways,
+              verifyPortableObject: options.verifyPortableObject,
+              suppressError: options.suppressError,
+              crossOrigin: options.crossOrigin,
+              span,
+              parse: (document, parseOptions) =>
+                this.#${property.singularName}_fromJsonLd(document, {
+                  documentLoader,
+                  contextLoader: parseOptions.contextLoader,
+                  tracerProvider,
+                  baseUrl: parseOptions.baseUrl,
+                }),
+            });
+            if (obj != null) {
+              span.setAttribute("activitypub.object.id", (obj.id ?? url).href);
+              span.setAttribute(
+                "activitypub.object.type",
+                // @ts-ignore: obj.constructor always has a typeId.
+                obj.constructor.typeId.href
+              );
+            }
+            return obj;
+          } catch (e) {
+            span.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: String(e),
+            });
+            throw e;
+          } finally {
+            span.end();
+          }
+        }
         const lookupUrl = formatIri(url);
         let fetchResult: RemoteDocument;
         try {
@@ -1835,6 +1875,8 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           suppressError?: boolean,
           tracerProvider?: TracerProvider,
           crossOrigin?: "ignore" | "throw" | "trust";
+          gateways?: readonly (string | URL)[];
+          verifyPortableObject?: PortableObjectVerifier;
         } = {}
       ): Promise<${getTypeNames(property.range, types)} | null> {
         if (this._warning != null) {
@@ -1940,6 +1982,8 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           suppressError?: boolean,
           tracerProvider?: TracerProvider,
           crossOrigin?: "ignore" | "throw" | "trust";
+          gateways?: readonly (string | URL)[];
+          verifyPortableObject?: PortableObjectVerifier;
         } = {}
       ): AsyncIterable<${getTypeNames(property.range, types)}> {
         if (this._warning != null) {
@@ -2036,6 +2080,7 @@ const INTERNAL_RUNTIME_IMPORTS = [
 	"isTrustedIriOrigin",
 	"normalizeJsonLdIris"
 ].join(",\n    ");
+const PORTABLE_DEREFERENCE_IMPORTS = ["dereferencePortableIri", "isPortableIri"].join(",\n    ");
 const SIGNED_REPRESENTATION_IMPORTS = [
 	"enterSignedValueScope",
 	"resolveSignedValues",
@@ -2060,6 +2105,7 @@ const RUNTIME_IMPORTS = [
 	"parseGatewayUrl",
 	"parseIri",
 	"parseJsonLdId",
+	"type PortableObjectVerifier",
 	"type RemoteDocument"
 ].join(",\n    ");
 /**
@@ -2236,6 +2282,7 @@ async function* generateClasses(types) {
     from "@opentelemetry/api";\n`;
 	yield `import {\n    ${RUNTIME_IMPORTS}\n} from "@fedify/vocab-runtime";\n`;
 	yield `import {\n    ${INTERNAL_RUNTIME_IMPORTS}\n} from "@fedify/vocab-runtime/internal/jsonld-cache";\n`;
+	yield `import {\n    ${PORTABLE_DEREFERENCE_IMPORTS}\n} from "@fedify/vocab-runtime/internal/portable-dereference";\n`;
 	yield `import {\n    ${SIGNED_REPRESENTATION_IMPORTS}\n} from "@fedify/vocab-runtime/internal/signed-representation";\n`;
 	yield `import {
     isTemporalDuration,

package/dist/mod.js

@@ -7,7 +7,7 @@ import { parse } from "yaml";
 import { pascalCase } from "es-toolkit";
 //#region deno.json
 var name = "@fedify/vocab-tools";
-var version = "2.4.0-dev.2030+e6b3de3d";
+var version = "2.4.0-dev.2047+140b94db";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -1656,6 +1656,8 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         suppressError?: boolean,
         tracerProvider?: TracerProvider,
         crossOrigin?: "ignore" | "throw" | "trust";
+        gateways?: readonly (string | URL)[];
+        verifyPortableObject?: PortableObjectVerifier;
       } = {},
     ): Promise<${getTypeNames(property.range, types)} | null> {
       const documentLoader =
@@ -1669,6 +1671,44 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         ${JSON.stringify(version)},
       );
       return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
+        if (isPortableIri(url)) {
+          try {
+            const obj = await dereferencePortableIri(url, {
+              documentLoader,
+              contextLoader,
+              tracerProvider,
+              gateways: options.gateways,
+              verifyPortableObject: options.verifyPortableObject,
+              suppressError: options.suppressError,
+              crossOrigin: options.crossOrigin,
+              span,
+              parse: (document, parseOptions) =>
+                this.#${property.singularName}_fromJsonLd(document, {
+                  documentLoader,
+                  contextLoader: parseOptions.contextLoader,
+                  tracerProvider,
+                  baseUrl: parseOptions.baseUrl,
+                }),
+            });
+            if (obj != null) {
+              span.setAttribute("activitypub.object.id", (obj.id ?? url).href);
+              span.setAttribute(
+                "activitypub.object.type",
+                // @ts-ignore: obj.constructor always has a typeId.
+                obj.constructor.typeId.href
+              );
+            }
+            return obj;
+          } catch (e) {
+            span.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: String(e),
+            });
+            throw e;
+          } finally {
+            span.end();
+          }
+        }
         const lookupUrl = formatIri(url);
         let fetchResult: RemoteDocument;
         try {
@@ -1834,6 +1874,8 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           suppressError?: boolean,
           tracerProvider?: TracerProvider,
           crossOrigin?: "ignore" | "throw" | "trust";
+          gateways?: readonly (string | URL)[];
+          verifyPortableObject?: PortableObjectVerifier;
         } = {}
       ): Promise<${getTypeNames(property.range, types)} | null> {
         if (this._warning != null) {
@@ -1939,6 +1981,8 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           suppressError?: boolean,
           tracerProvider?: TracerProvider,
           crossOrigin?: "ignore" | "throw" | "trust";
+          gateways?: readonly (string | URL)[];
+          verifyPortableObject?: PortableObjectVerifier;
         } = {}
       ): AsyncIterable<${getTypeNames(property.range, types)}> {
         if (this._warning != null) {
@@ -2035,6 +2079,7 @@ const INTERNAL_RUNTIME_IMPORTS = [
 	"isTrustedIriOrigin",
 	"normalizeJsonLdIris"
 ].join(",\n    ");
+const PORTABLE_DEREFERENCE_IMPORTS = ["dereferencePortableIri", "isPortableIri"].join(",\n    ");
 const SIGNED_REPRESENTATION_IMPORTS = [
 	"enterSignedValueScope",
 	"resolveSignedValues",
@@ -2059,6 +2104,7 @@ const RUNTIME_IMPORTS = [
 	"parseGatewayUrl",
 	"parseIri",
 	"parseJsonLdId",
+	"type PortableObjectVerifier",
 	"type RemoteDocument"
 ].join(",\n    ");
 /**
@@ -2235,6 +2281,7 @@ async function* generateClasses(types) {
     from "@opentelemetry/api";\n`;
 	yield `import {\n    ${RUNTIME_IMPORTS}\n} from "@fedify/vocab-runtime";\n`;
 	yield `import {\n    ${INTERNAL_RUNTIME_IMPORTS}\n} from "@fedify/vocab-runtime/internal/jsonld-cache";\n`;
+	yield `import {\n    ${PORTABLE_DEREFERENCE_IMPORTS}\n} from "@fedify/vocab-runtime/internal/portable-dereference";\n`;
 	yield `import {\n    ${SIGNED_REPRESENTATION_IMPORTS}\n} from "@fedify/vocab-runtime/internal/signed-representation";\n`;
 	yield `import {
     isTemporalDuration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0-dev.2030+e6b3de3d",
+  "version": "2.4.0-dev.2047+140b94db",
   "description": "Code generator for Activity Vocabulary APIs",
   "homepage": "https://fedify.dev/",
   "repository": {
@@ -46,7 +46,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^22.17.0",
+    "@types/node": "^24.12.2",
     "tsdown": "^0.22.0",
     "typescript": "^6.0.0"
   },