@fedify/vocab-tools 2.4.0-dev.2127 → 2.4.0-dev.2141

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0-dev.2127+c41ce2eb",
+  "version": "2.4.0-dev.2141+881cc858",
   "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.2127+c41ce2eb";
+var version = "2.4.0-dev.2141+881cc858";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -1670,6 +1670,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         crossOrigin?: "ignore" | "throw" | "trust";
         gateways?: readonly (string | URL)[];
         verifyPortableObject?: PortableObjectVerifier;
+        inheritPortableObjectVerifier?: boolean;
       } = {},
     ): Promise<${getTypeNames(property.range, types)} | null> {
       const documentLoader =
@@ -1682,6 +1683,12 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         ${JSON.stringify(name)},
         ${JSON.stringify(version)},
       );
+      // The fetched object uses the verifier given to this call (which falls
+      // back to the parent's own default) for its accessors by default,
+      // unless the call keeps its verifier to itself:
+      const childVerifier = options.inheritPortableObjectVerifier === false
+        ? this._verifyPortableObject
+        : options.verifyPortableObject;
       return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
         const dereferencePortable = async (
           portableUrl: URL,
@@ -1712,9 +1719,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
                   documentLoader,
                   contextLoader: parseOptions.contextLoader,
                   tracerProvider,
-                  // Only the parent's own default is inherited, never the
-                  // verifier given to this call:
-                  verifyPortableObject: this._verifyPortableObject,
+                  verifyPortableObject: childVerifier,
                   baseUrl: parseOptions.baseUrl,
                 }),
             });
@@ -1794,7 +1799,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
                 documentLoader,
                 contextLoader: scopedContext.loader,
                 tracerProvider,
-                verifyPortableObject: this._verifyPortableObject,
+                verifyPortableObject: childVerifier,
                 baseUrl,
               }
             );
@@ -1975,6 +1980,19 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           crossOrigin?: "ignore" | "throw" | "trust";
           gateways?: readonly (string | URL)[];
           verifyPortableObject?: PortableObjectVerifier;
+          /**
+           * Whether objects that this call newly fetches use the
+           * \`verifyPortableObject\` option of this call as their default
+           * verifier.  Defaults to \`true\`.  If \`false\`, the option
+           * applies to this call only, and fetched objects use this object's
+           * own default verifier, if any, as their default instead.  Pass
+           * \`false\` for a temporary verifier, e.g., one that accepts
+           * everything.  Objects that were already cached in this object or
+           * embedded in it keep their defaults either way, and this option
+           * itself is not passed on.
+           * @since 2.4.0
+           */
+          inheritPortableObjectVerifier?: boolean;
         } = {}
       ): Promise<${getTypeNames(property.range, types)} | null> {
         if (this._warning != null) {
@@ -2039,6 +2057,9 @@ async function* generateProperty(type, property, types, moduleVarNames) {
 				yield `
             v = await this.#${property.singularName}_fromJsonLd(doc, {
               ...options,
+              // Embedded objects get this object's own default, whether or
+              // not they carry their own @context, as when this object was
+              // parsed:
               verifyPortableObject: this._verifyPortableObject,
               baseUrl: ${cachedPropertyBaseUrl},
             });
@@ -2110,6 +2131,19 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           crossOrigin?: "ignore" | "throw" | "trust";
           gateways?: readonly (string | URL)[];
           verifyPortableObject?: PortableObjectVerifier;
+          /**
+           * Whether objects that this call newly fetches use the
+           * \`verifyPortableObject\` option of this call as their default
+           * verifier.  Defaults to \`true\`.  If \`false\`, the option
+           * applies to this call only, and fetched objects use this object's
+           * own default verifier, if any, as their default instead.  Pass
+           * \`false\` for a temporary verifier, e.g., one that accepts
+           * everything.  Objects that were already cached in this object or
+           * embedded in it keep their defaults either way, and this option
+           * itself is not passed on.
+           * @since 2.4.0
+           */
+          inheritPortableObjectVerifier?: boolean;
         } = {}
       ): AsyncIterable<${getTypeNames(property.range, types)}> {
         if (this._warning != null) {
@@ -2179,6 +2213,9 @@ async function* generateProperty(type, property, types, moduleVarNames) {
 				yield `
               v = await this.#${property.singularName}_fromJsonLd(obj, {
                 ...options,
+                // Embedded objects get this object's own default, whether or
+                // not they carry their own @context, as when this object was
+                // parsed:
                 verifyPortableObject: this._verifyPortableObject,
                 baseUrl: ${cachedPropertyBaseUrl},
               });

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.2127+c41ce2eb";
+var version = "2.4.0-dev.2141+881cc858";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -1669,6 +1669,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         crossOrigin?: "ignore" | "throw" | "trust";
         gateways?: readonly (string | URL)[];
         verifyPortableObject?: PortableObjectVerifier;
+        inheritPortableObjectVerifier?: boolean;
       } = {},
     ): Promise<${getTypeNames(property.range, types)} | null> {
       const documentLoader =
@@ -1681,6 +1682,12 @@ async function* generateProperty(type, property, types, moduleVarNames) {
         ${JSON.stringify(name)},
         ${JSON.stringify(version)},
       );
+      // The fetched object uses the verifier given to this call (which falls
+      // back to the parent's own default) for its accessors by default,
+      // unless the call keeps its verifier to itself:
+      const childVerifier = options.inheritPortableObjectVerifier === false
+        ? this._verifyPortableObject
+        : options.verifyPortableObject;
       return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
         const dereferencePortable = async (
           portableUrl: URL,
@@ -1711,9 +1718,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
                   documentLoader,
                   contextLoader: parseOptions.contextLoader,
                   tracerProvider,
-                  // Only the parent's own default is inherited, never the
-                  // verifier given to this call:
-                  verifyPortableObject: this._verifyPortableObject,
+                  verifyPortableObject: childVerifier,
                   baseUrl: parseOptions.baseUrl,
                 }),
             });
@@ -1793,7 +1798,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
                 documentLoader,
                 contextLoader: scopedContext.loader,
                 tracerProvider,
-                verifyPortableObject: this._verifyPortableObject,
+                verifyPortableObject: childVerifier,
                 baseUrl,
               }
             );
@@ -1974,6 +1979,19 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           crossOrigin?: "ignore" | "throw" | "trust";
           gateways?: readonly (string | URL)[];
           verifyPortableObject?: PortableObjectVerifier;
+          /**
+           * Whether objects that this call newly fetches use the
+           * \`verifyPortableObject\` option of this call as their default
+           * verifier.  Defaults to \`true\`.  If \`false\`, the option
+           * applies to this call only, and fetched objects use this object's
+           * own default verifier, if any, as their default instead.  Pass
+           * \`false\` for a temporary verifier, e.g., one that accepts
+           * everything.  Objects that were already cached in this object or
+           * embedded in it keep their defaults either way, and this option
+           * itself is not passed on.
+           * @since 2.4.0
+           */
+          inheritPortableObjectVerifier?: boolean;
         } = {}
       ): Promise<${getTypeNames(property.range, types)} | null> {
         if (this._warning != null) {
@@ -2038,6 +2056,9 @@ async function* generateProperty(type, property, types, moduleVarNames) {
 				yield `
             v = await this.#${property.singularName}_fromJsonLd(doc, {
               ...options,
+              // Embedded objects get this object's own default, whether or
+              // not they carry their own @context, as when this object was
+              // parsed:
               verifyPortableObject: this._verifyPortableObject,
               baseUrl: ${cachedPropertyBaseUrl},
             });
@@ -2109,6 +2130,19 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           crossOrigin?: "ignore" | "throw" | "trust";
           gateways?: readonly (string | URL)[];
           verifyPortableObject?: PortableObjectVerifier;
+          /**
+           * Whether objects that this call newly fetches use the
+           * \`verifyPortableObject\` option of this call as their default
+           * verifier.  Defaults to \`true\`.  If \`false\`, the option
+           * applies to this call only, and fetched objects use this object's
+           * own default verifier, if any, as their default instead.  Pass
+           * \`false\` for a temporary verifier, e.g., one that accepts
+           * everything.  Objects that were already cached in this object or
+           * embedded in it keep their defaults either way, and this option
+           * itself is not passed on.
+           * @since 2.4.0
+           */
+          inheritPortableObjectVerifier?: boolean;
         } = {}
       ): AsyncIterable<${getTypeNames(property.range, types)}> {
         if (this._warning != null) {
@@ -2178,6 +2212,9 @@ async function* generateProperty(type, property, types, moduleVarNames) {
 				yield `
               v = await this.#${property.singularName}_fromJsonLd(obj, {
                 ...options,
+                // Embedded objects get this object's own default, whether or
+                // not they carry their own @context, as when this object was
+                // parsed:
                 verifyPortableObject: this._verifyPortableObject,
                 baseUrl: ${cachedPropertyBaseUrl},
               });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0-dev.2127+c41ce2eb",
+  "version": "2.4.0-dev.2141+881cc858",
   "description": "Code generator for Activity Vocabulary APIs",
   "homepage": "https://fedify.dev/",
   "repository": {