@fedify/fedify 0.11.0-dev.241 → 0.11.0-dev.243

package/esm/vocab/vocab.js

@@ -3034,8 +3034,9 @@ export class Object {
                 : await v.toJsonLd(options);
             array.push({ "@graph": element });
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["https://w3id.org/security#proof"] = array;
+        }
         values["@type"] = ["https://www.w3.org/ns/activitystreams#Object"];
         if (this.id)
             values["@id"] = this.id.href;
@@ -4684,8 +4685,9 @@ export class PropertyValue {
             };
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://schema.org#value"] = array;
+        }
         values["@type"] = ["http://schema.org#PropertyValue"];
         if (this.id)
             values["@id"] = this.id.href;
@@ -5131,8 +5133,9 @@ export class DataIntegrityProof {
             };
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://purl.org/dc/terms/created"] = array;
+        }
         values["@type"] = ["https://w3id.org/security#DataIntegrityProof"];
         if (this.id)
             values["@id"] = this.id.href;
@@ -5517,8 +5520,9 @@ export class CryptographicKey {
                                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["https://w3id.org/security#owner"] = array;
+        }
         array = [];
         for (const v of this.#_2fE2QMDdg6KFGqa4NEC3TmjApSAD) {
             const element = { "@value": await exportSpki(v) };
@@ -6047,6 +6051,10 @@ export class Activity extends Object {
     }
     #_2DjTTboo3CNHU2a2JQqUSE2dbv9D = [];
     #_2MH19yxjn1wnHsNfa5n4JBhJzxyc = [];
+    #_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = [];
+    #_u4QGFbRFcYmPEKGbPv1hpBR9r5G = [];
+    #_25zu2s3VxVujgEKqrDycjE284XQR = [];
+    #_3c5t2x7DYRo2shwTxpkd4kYSS5WQ = [];
     /**
      * Constructs a new instance of Activity with the given values.
      * @param values The values to initialize the instance with.
@@ -6111,6 +6119,110 @@ export class Activity extends Object {
                     "Object | URL" + ".");
             }
         }
+        if ("target" in values && values.target != null) {
+            if (values.target instanceof Object || values.target instanceof URL) {
+                // @ts-ignore: type is checked above.
+                this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = [values.target];
+            }
+            else {
+                throw new TypeError("The target must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("targets" in values && values.targets != null) {
+            if ("target" in values &&
+                values.target != null) {
+                throw new TypeError("Cannot initialize both target and " +
+                    "targets at the same time.");
+            }
+            if (Array.isArray(values.targets) &&
+                values.targets.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = values.targets;
+            }
+            else {
+                throw new TypeError("The targets must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("result" in values && values.result != null) {
+            if (values.result instanceof Object || values.result instanceof URL) {
+                // @ts-ignore: type is checked above.
+                this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G = [values.result];
+            }
+            else {
+                throw new TypeError("The result must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("results" in values && values.results != null) {
+            if ("result" in values &&
+                values.result != null) {
+                throw new TypeError("Cannot initialize both result and " +
+                    "results at the same time.");
+            }
+            if (Array.isArray(values.results) &&
+                values.results.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G = values.results;
+            }
+            else {
+                throw new TypeError("The results must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("origin" in values && values.origin != null) {
+            if (values.origin instanceof Object || values.origin instanceof URL) {
+                // @ts-ignore: type is checked above.
+                this.#_25zu2s3VxVujgEKqrDycjE284XQR = [values.origin];
+            }
+            else {
+                throw new TypeError("The origin must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("origins" in values && values.origins != null) {
+            if ("origin" in values &&
+                values.origin != null) {
+                throw new TypeError("Cannot initialize both origin and " +
+                    "origins at the same time.");
+            }
+            if (Array.isArray(values.origins) &&
+                values.origins.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                this.#_25zu2s3VxVujgEKqrDycjE284XQR = values.origins;
+            }
+            else {
+                throw new TypeError("The origins must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("instrument" in values && values.instrument != null) {
+            if (values.instrument instanceof Object || values.instrument instanceof URL) {
+                // @ts-ignore: type is checked above.
+                this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ = [values.instrument];
+            }
+            else {
+                throw new TypeError("The instrument must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("instruments" in values && values.instruments != null) {
+            if ("instrument" in values &&
+                values.instrument != null) {
+                throw new TypeError("Cannot initialize both instrument and " +
+                    "instruments at the same time.");
+            }
+            if (Array.isArray(values.instruments) &&
+                values.instruments.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ = values.instruments;
+            }
+            else {
+                throw new TypeError("The instruments must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
     }
     /**
      * Clones this instance, optionally updating it with the given values.
@@ -6179,6 +6291,114 @@ export class Activity extends Object {
                     "Object | URL" + ".");
             }
         }
+        clone.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF;
+        if ("target" in values && values.target != null) {
+            if (values.target instanceof Object || values.target instanceof URL) {
+                // @ts-ignore: type is checked above.
+                clone.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = [values.target];
+            }
+            else {
+                throw new TypeError("The target must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("targets" in values && values.targets != null) {
+            if ("target" in values &&
+                values.target != null) {
+                throw new TypeError("Cannot update both target and " +
+                    "targets at the same time.");
+            }
+            if (Array.isArray(values.targets) &&
+                values.targets.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                clone.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = values.targets;
+            }
+            else {
+                throw new TypeError("The targets must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        clone.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G = this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G;
+        if ("result" in values && values.result != null) {
+            if (values.result instanceof Object || values.result instanceof URL) {
+                // @ts-ignore: type is checked above.
+                clone.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G = [values.result];
+            }
+            else {
+                throw new TypeError("The result must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("results" in values && values.results != null) {
+            if ("result" in values &&
+                values.result != null) {
+                throw new TypeError("Cannot update both result and " +
+                    "results at the same time.");
+            }
+            if (Array.isArray(values.results) &&
+                values.results.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                clone.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G = values.results;
+            }
+            else {
+                throw new TypeError("The results must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        clone.#_25zu2s3VxVujgEKqrDycjE284XQR = this.#_25zu2s3VxVujgEKqrDycjE284XQR;
+        if ("origin" in values && values.origin != null) {
+            if (values.origin instanceof Object || values.origin instanceof URL) {
+                // @ts-ignore: type is checked above.
+                clone.#_25zu2s3VxVujgEKqrDycjE284XQR = [values.origin];
+            }
+            else {
+                throw new TypeError("The origin must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("origins" in values && values.origins != null) {
+            if ("origin" in values &&
+                values.origin != null) {
+                throw new TypeError("Cannot update both origin and " +
+                    "origins at the same time.");
+            }
+            if (Array.isArray(values.origins) &&
+                values.origins.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                clone.#_25zu2s3VxVujgEKqrDycjE284XQR = values.origins;
+            }
+            else {
+                throw new TypeError("The origins must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        clone.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ = this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ;
+        if ("instrument" in values && values.instrument != null) {
+            if (values.instrument instanceof Object || values.instrument instanceof URL) {
+                // @ts-ignore: type is checked above.
+                clone.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ = [values.instrument];
+            }
+            else {
+                throw new TypeError("The instrument must be of type " +
+                    "Object | URL" + ".");
+            }
+        }
+        if ("instruments" in values && values.instruments != null) {
+            if ("instrument" in values &&
+                values.instrument != null) {
+                throw new TypeError("Cannot update both instrument and " +
+                    "instruments at the same time.");
+            }
+            if (Array.isArray(values.instruments) &&
+                values.instruments.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                clone.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ = values.instruments;
+            }
+            else {
+                throw new TypeError("The instruments must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
         return clone;
     }
     async #fetchActor(url, options = {}) {
@@ -6383,6 +6603,348 @@ export class Activity extends Object {
             yield v;
         }
     }
+    async #fetchTarget(url, options = {}) {
+        const documentLoader = options.documentLoader ?? this._documentLoader ??
+            fetchDocumentLoader;
+        const contextLoader = options.contextLoader ?? this._contextLoader ??
+            fetchDocumentLoader;
+        let fetchResult;
+        try {
+            fetchResult = await documentLoader(url.href);
+        }
+        catch (error) {
+            if (options.suppressError) {
+                getLogger(["fedify", "vocab"]).error("Failed to fetch {url}: {error}", { error, url: url.href });
+                return null;
+            }
+            throw error;
+        }
+        const { document } = fetchResult;
+        try {
+            return await Object.fromJsonLd(document, { documentLoader, contextLoader });
+        }
+        catch (e) {
+            if (!(e instanceof TypeError))
+                throw e;
+        }
+        throw new TypeError("Expected an object of any type of: " +
+            ["https://www.w3.org/ns/activitystreams#Object"].join(", "));
+    }
+    /**
+     * Similar to
+     * {@link Activity.getTarget},
+     * but returns its `@id` URL instead of the object itself.
+     */
+    get targetId() {
+        if (this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.length < 1)
+            return null;
+        const v = this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF[0];
+        if (v instanceof URL)
+            return v;
+        return v.id;
+    }
+    /** Describes the indirect object, or target, of the activity.  The precise
+     * meaning of the target is largely dependent on the type of action being
+     * described but will often be the object of the English preposition "to".
+     * For instance, in the activity "John added a movie to his wishlist",
+     * the target of the activity is John's wishlist.  An activity can have more
+     * than one target.
+     */
+    async getTarget(options = {}) {
+        if (this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.length < 1)
+            return null;
+        const v = this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF[0];
+        if (v instanceof URL) {
+            const fetched = await this.#fetchTarget(v, options);
+            if (fetched == null)
+                return null;
+            this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF[0] = fetched;
+            return fetched;
+        }
+        return v;
+    }
+    /**
+     * Similar to
+     * {@link Activity.getTargets},
+     * but returns their `@id`s instead of the objects themselves.
+     */
+    get targetIds() {
+        return this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.map((v) => v instanceof URL ? v : v.id).filter((id) => id !== null);
+    }
+    /** Describes the indirect object, or target, of the activity.  The precise
+     * meaning of the target is largely dependent on the type of action being
+     * described but will often be the object of the English preposition "to".
+     * For instance, in the activity "John added a movie to his wishlist",
+     * the target of the activity is John's wishlist.  An activity can have more
+     * than one target.
+     */
+    async *getTargets(options = {}) {
+        const vs = this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF;
+        for (let i = 0; i < vs.length; i++) {
+            const v = vs[i];
+            if (v instanceof URL) {
+                const fetched = await this.#fetchTarget(v, options);
+                if (fetched == null)
+                    continue;
+                vs[i] = fetched;
+                yield fetched;
+                continue;
+            }
+            yield v;
+        }
+    }
+    async #fetchResult(url, options = {}) {
+        const documentLoader = options.documentLoader ?? this._documentLoader ??
+            fetchDocumentLoader;
+        const contextLoader = options.contextLoader ?? this._contextLoader ??
+            fetchDocumentLoader;
+        let fetchResult;
+        try {
+            fetchResult = await documentLoader(url.href);
+        }
+        catch (error) {
+            if (options.suppressError) {
+                getLogger(["fedify", "vocab"]).error("Failed to fetch {url}: {error}", { error, url: url.href });
+                return null;
+            }
+            throw error;
+        }
+        const { document } = fetchResult;
+        try {
+            return await Object.fromJsonLd(document, { documentLoader, contextLoader });
+        }
+        catch (e) {
+            if (!(e instanceof TypeError))
+                throw e;
+        }
+        throw new TypeError("Expected an object of any type of: " +
+            ["https://www.w3.org/ns/activitystreams#Object"].join(", "));
+    }
+    /**
+     * Similar to
+     * {@link Activity.getResult},
+     * but returns its `@id` URL instead of the object itself.
+     */
+    get resultId() {
+        if (this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G.length < 1)
+            return null;
+        const v = this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G[0];
+        if (v instanceof URL)
+            return v;
+        return v.id;
+    }
+    /** Describes the result of the activity.  For instance, if a particular action
+     * results in the creation of a new resource, the result property can be used
+     * to describe that new resource.
+     */
+    async getResult(options = {}) {
+        if (this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G.length < 1)
+            return null;
+        const v = this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G[0];
+        if (v instanceof URL) {
+            const fetched = await this.#fetchResult(v, options);
+            if (fetched == null)
+                return null;
+            this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G[0] = fetched;
+            return fetched;
+        }
+        return v;
+    }
+    /**
+     * Similar to
+     * {@link Activity.getResults},
+     * but returns their `@id`s instead of the objects themselves.
+     */
+    get resultIds() {
+        return this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G.map((v) => v instanceof URL ? v : v.id).filter((id) => id !== null);
+    }
+    /** Describes the result of the activity.  For instance, if a particular action
+     * results in the creation of a new resource, the result property can be used
+     * to describe that new resource.
+     */
+    async *getResults(options = {}) {
+        const vs = this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G;
+        for (let i = 0; i < vs.length; i++) {
+            const v = vs[i];
+            if (v instanceof URL) {
+                const fetched = await this.#fetchResult(v, options);
+                if (fetched == null)
+                    continue;
+                vs[i] = fetched;
+                yield fetched;
+                continue;
+            }
+            yield v;
+        }
+    }
+    async #fetchOrigin(url, options = {}) {
+        const documentLoader = options.documentLoader ?? this._documentLoader ??
+            fetchDocumentLoader;
+        const contextLoader = options.contextLoader ?? this._contextLoader ??
+            fetchDocumentLoader;
+        let fetchResult;
+        try {
+            fetchResult = await documentLoader(url.href);
+        }
+        catch (error) {
+            if (options.suppressError) {
+                getLogger(["fedify", "vocab"]).error("Failed to fetch {url}: {error}", { error, url: url.href });
+                return null;
+            }
+            throw error;
+        }
+        const { document } = fetchResult;
+        try {
+            return await Object.fromJsonLd(document, { documentLoader, contextLoader });
+        }
+        catch (e) {
+            if (!(e instanceof TypeError))
+                throw e;
+        }
+        throw new TypeError("Expected an object of any type of: " +
+            ["https://www.w3.org/ns/activitystreams#Object"].join(", "));
+    }
+    /**
+     * Similar to
+     * {@link Activity.getOrigin},
+     * but returns its `@id` URL instead of the object itself.
+     */
+    get originId() {
+        if (this.#_25zu2s3VxVujgEKqrDycjE284XQR.length < 1)
+            return null;
+        const v = this.#_25zu2s3VxVujgEKqrDycjE284XQR[0];
+        if (v instanceof URL)
+            return v;
+        return v.id;
+    }
+    /** Describes an indirect object of the activity from which the activity is
+     * directed.  The precise meaning of the origin is the object of the English
+     * preposition "from". For instance, in the activity "John moved an item to
+     * List B from List A", the origin of the activity is "List A".
+     */
+    async getOrigin(options = {}) {
+        if (this.#_25zu2s3VxVujgEKqrDycjE284XQR.length < 1)
+            return null;
+        const v = this.#_25zu2s3VxVujgEKqrDycjE284XQR[0];
+        if (v instanceof URL) {
+            const fetched = await this.#fetchOrigin(v, options);
+            if (fetched == null)
+                return null;
+            this.#_25zu2s3VxVujgEKqrDycjE284XQR[0] = fetched;
+            return fetched;
+        }
+        return v;
+    }
+    /**
+     * Similar to
+     * {@link Activity.getOrigins},
+     * but returns their `@id`s instead of the objects themselves.
+     */
+    get originIds() {
+        return this.#_25zu2s3VxVujgEKqrDycjE284XQR.map((v) => v instanceof URL ? v : v.id).filter((id) => id !== null);
+    }
+    /** Describes an indirect object of the activity from which the activity is
+     * directed.  The precise meaning of the origin is the object of the English
+     * preposition "from". For instance, in the activity "John moved an item to
+     * List B from List A", the origin of the activity is "List A".
+     */
+    async *getOrigins(options = {}) {
+        const vs = this.#_25zu2s3VxVujgEKqrDycjE284XQR;
+        for (let i = 0; i < vs.length; i++) {
+            const v = vs[i];
+            if (v instanceof URL) {
+                const fetched = await this.#fetchOrigin(v, options);
+                if (fetched == null)
+                    continue;
+                vs[i] = fetched;
+                yield fetched;
+                continue;
+            }
+            yield v;
+        }
+    }
+    async #fetchInstrument(url, options = {}) {
+        const documentLoader = options.documentLoader ?? this._documentLoader ??
+            fetchDocumentLoader;
+        const contextLoader = options.contextLoader ?? this._contextLoader ??
+            fetchDocumentLoader;
+        let fetchResult;
+        try {
+            fetchResult = await documentLoader(url.href);
+        }
+        catch (error) {
+            if (options.suppressError) {
+                getLogger(["fedify", "vocab"]).error("Failed to fetch {url}: {error}", { error, url: url.href });
+                return null;
+            }
+            throw error;
+        }
+        const { document } = fetchResult;
+        try {
+            return await Object.fromJsonLd(document, { documentLoader, contextLoader });
+        }
+        catch (e) {
+            if (!(e instanceof TypeError))
+                throw e;
+        }
+        throw new TypeError("Expected an object of any type of: " +
+            ["https://www.w3.org/ns/activitystreams#Object"].join(", "));
+    }
+    /**
+     * Similar to
+     * {@link Activity.getInstrument},
+     * but returns its `@id` URL instead of the object itself.
+     */
+    get instrumentId() {
+        if (this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ.length < 1)
+            return null;
+        const v = this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ[0];
+        if (v instanceof URL)
+            return v;
+        return v.id;
+    }
+    /** Identifies one or more objects used (or to be used) in the completion of
+     * an {@link Activity}.
+     */
+    async getInstrument(options = {}) {
+        if (this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ.length < 1)
+            return null;
+        const v = this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ[0];
+        if (v instanceof URL) {
+            const fetched = await this.#fetchInstrument(v, options);
+            if (fetched == null)
+                return null;
+            this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ[0] = fetched;
+            return fetched;
+        }
+        return v;
+    }
+    /**
+     * Similar to
+     * {@link Activity.getInstruments},
+     * but returns their `@id`s instead of the objects themselves.
+     */
+    get instrumentIds() {
+        return this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ.map((v) => v instanceof URL ? v : v.id).filter((id) => id !== null);
+    }
+    /** Identifies one or more objects used (or to be used) in the completion of
+     * an {@link Activity}.
+     */
+    async *getInstruments(options = {}) {
+        const vs = this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ;
+        for (let i = 0; i < vs.length; i++) {
+            const v = vs[i];
+            if (v instanceof URL) {
+                const fetched = await this.#fetchInstrument(v, options);
+                if (fetched == null)
+                    continue;
+                vs[i] = fetched;
+                yield fetched;
+                continue;
+            }
+            yield v;
+        }
+    }
     /**
      * Converts this object to a JSON-LD structure.
      * @returns The JSON-LD representation of this object.
@@ -6427,6 +6989,46 @@ export class Activity extends Object {
         if (array.length > 0) {
             values["https://www.w3.org/ns/activitystreams#object"] = array;
         }
+        array = [];
+        for (const v of this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF) {
+            const element = v instanceof URL
+                ? { "@id": v.href }
+                : await v.toJsonLd(options);
+            array.push(element);
+        }
+        if (array.length > 0) {
+            values["https://www.w3.org/ns/activitystreams#target"] = array;
+        }
+        array = [];
+        for (const v of this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G) {
+            const element = v instanceof URL
+                ? { "@id": v.href }
+                : await v.toJsonLd(options);
+            array.push(element);
+        }
+        if (array.length > 0) {
+            values["https://www.w3.org/ns/activitystreams#result"] = array;
+        }
+        array = [];
+        for (const v of this.#_25zu2s3VxVujgEKqrDycjE284XQR) {
+            const element = v instanceof URL
+                ? { "@id": v.href }
+                : await v.toJsonLd(options);
+            array.push(element);
+        }
+        if (array.length > 0) {
+            values["https://www.w3.org/ns/activitystreams#origin"] = array;
+        }
+        array = [];
+        for (const v of this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ) {
+            const element = v instanceof URL
+                ? { "@id": v.href }
+                : await v.toJsonLd(options);
+            array.push(element);
+        }
+        if (array.length > 0) {
+            values["https://www.w3.org/ns/activitystreams#instrument"] = array;
+        }
         values["@type"] = ["https://www.w3.org/ns/activitystreams#Activity"];
         if (this.id)
             values["@id"] = this.id.href;
@@ -6588,21 +7190,70 @@ export class Activity extends Object {
                                 : undefined;
             if (typeof decoded === "undefined")
                 continue;
-            _2DjTTboo3CNHU2a2JQqUSE2dbv9D.push(decoded);
+            _2DjTTboo3CNHU2a2JQqUSE2dbv9D.push(decoded);
+        }
+        instance.#_2DjTTboo3CNHU2a2JQqUSE2dbv9D = _2DjTTboo3CNHU2a2JQqUSE2dbv9D;
+        const _2MH19yxjn1wnHsNfa5n4JBhJzxyc = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#object"] ?? []) {
+            if (v == null)
+                continue;
+            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
+                globalThis.Object.keys(v).length === 1) {
+                _2MH19yxjn1wnHsNfa5n4JBhJzxyc.push(new URL(v["@id"]));
+                continue;
+            }
+            _2MH19yxjn1wnHsNfa5n4JBhJzxyc.push(await Object.fromJsonLd(v, options));
+        }
+        instance.#_2MH19yxjn1wnHsNfa5n4JBhJzxyc = _2MH19yxjn1wnHsNfa5n4JBhJzxyc;
+        const _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#target"] ?? []) {
+            if (v == null)
+                continue;
+            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
+                globalThis.Object.keys(v).length === 1) {
+                _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.push(new URL(v["@id"]));
+                continue;
+            }
+            _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.push(await Object.fromJsonLd(v, options));
         }
-        instance.#_2DjTTboo3CNHU2a2JQqUSE2dbv9D = _2DjTTboo3CNHU2a2JQqUSE2dbv9D;
-        const _2MH19yxjn1wnHsNfa5n4JBhJzxyc = [];
-        for (const v of values["https://www.w3.org/ns/activitystreams#object"] ?? []) {
+        instance.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF;
+        const _u4QGFbRFcYmPEKGbPv1hpBR9r5G = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#result"] ?? []) {
             if (v == null)
                 continue;
             if (typeof v === "object" && "@id" in v && !("@type" in v) &&
                 globalThis.Object.keys(v).length === 1) {
-                _2MH19yxjn1wnHsNfa5n4JBhJzxyc.push(new URL(v["@id"]));
+                _u4QGFbRFcYmPEKGbPv1hpBR9r5G.push(new URL(v["@id"]));
                 continue;
             }
-            _2MH19yxjn1wnHsNfa5n4JBhJzxyc.push(await Object.fromJsonLd(v, options));
+            _u4QGFbRFcYmPEKGbPv1hpBR9r5G.push(await Object.fromJsonLd(v, options));
         }
-        instance.#_2MH19yxjn1wnHsNfa5n4JBhJzxyc = _2MH19yxjn1wnHsNfa5n4JBhJzxyc;
+        instance.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G = _u4QGFbRFcYmPEKGbPv1hpBR9r5G;
+        const _25zu2s3VxVujgEKqrDycjE284XQR = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#origin"] ?? []) {
+            if (v == null)
+                continue;
+            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
+                globalThis.Object.keys(v).length === 1) {
+                _25zu2s3VxVujgEKqrDycjE284XQR.push(new URL(v["@id"]));
+                continue;
+            }
+            _25zu2s3VxVujgEKqrDycjE284XQR.push(await Object.fromJsonLd(v, options));
+        }
+        instance.#_25zu2s3VxVujgEKqrDycjE284XQR = _25zu2s3VxVujgEKqrDycjE284XQR;
+        const _3c5t2x7DYRo2shwTxpkd4kYSS5WQ = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#instrument"] ??
+            []) {
+            if (v == null)
+                continue;
+            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
+                globalThis.Object.keys(v).length === 1) {
+                _3c5t2x7DYRo2shwTxpkd4kYSS5WQ.push(new URL(v["@id"]));
+                continue;
+            }
+            _3c5t2x7DYRo2shwTxpkd4kYSS5WQ.push(await Object.fromJsonLd(v, options));
+        }
+        instance.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ = _3c5t2x7DYRo2shwTxpkd4kYSS5WQ;
         return instance;
     }
     _getCustomInspectProxy() {
@@ -6639,6 +7290,70 @@ export class Activity extends Object {
                 _2MH19yxjn1wnHsNfa5n4JBhJzxyc.length > 0) {
             proxy.objects = _2MH19yxjn1wnHsNfa5n4JBhJzxyc;
         }
+        const _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF = this.#_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF
+            // deno-lint-ignore no-explicit-any
+            .map((v) => v instanceof URL
+            ? {
+                [Symbol.for("Deno.customInspect")]: (inspect, options) => "URL " + inspect(v.href, options),
+                [Symbol.for("nodejs.util.inspect.custom")]: (_depth, options, inspect) => "URL " + inspect(v.href, options),
+            }
+            : v);
+        if (_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.length == 1) {
+            proxy.target = _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF[0];
+        }
+        if (_3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.length > 1 ||
+            !("target" in proxy) &&
+                _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF.length > 0) {
+            proxy.targets = _3JQCmF2Ww56Ag9EWRYoSZRDNCYtF;
+        }
+        const _u4QGFbRFcYmPEKGbPv1hpBR9r5G = this.#_u4QGFbRFcYmPEKGbPv1hpBR9r5G
+            // deno-lint-ignore no-explicit-any
+            .map((v) => v instanceof URL
+            ? {
+                [Symbol.for("Deno.customInspect")]: (inspect, options) => "URL " + inspect(v.href, options),
+                [Symbol.for("nodejs.util.inspect.custom")]: (_depth, options, inspect) => "URL " + inspect(v.href, options),
+            }
+            : v);
+        if (_u4QGFbRFcYmPEKGbPv1hpBR9r5G.length == 1) {
+            proxy.result = _u4QGFbRFcYmPEKGbPv1hpBR9r5G[0];
+        }
+        if (_u4QGFbRFcYmPEKGbPv1hpBR9r5G.length > 1 ||
+            !("result" in proxy) &&
+                _u4QGFbRFcYmPEKGbPv1hpBR9r5G.length > 0) {
+            proxy.results = _u4QGFbRFcYmPEKGbPv1hpBR9r5G;
+        }
+        const _25zu2s3VxVujgEKqrDycjE284XQR = this.#_25zu2s3VxVujgEKqrDycjE284XQR
+            // deno-lint-ignore no-explicit-any
+            .map((v) => v instanceof URL
+            ? {
+                [Symbol.for("Deno.customInspect")]: (inspect, options) => "URL " + inspect(v.href, options),
+                [Symbol.for("nodejs.util.inspect.custom")]: (_depth, options, inspect) => "URL " + inspect(v.href, options),
+            }
+            : v);
+        if (_25zu2s3VxVujgEKqrDycjE284XQR.length == 1) {
+            proxy.origin = _25zu2s3VxVujgEKqrDycjE284XQR[0];
+        }
+        if (_25zu2s3VxVujgEKqrDycjE284XQR.length > 1 ||
+            !("origin" in proxy) &&
+                _25zu2s3VxVujgEKqrDycjE284XQR.length > 0) {
+            proxy.origins = _25zu2s3VxVujgEKqrDycjE284XQR;
+        }
+        const _3c5t2x7DYRo2shwTxpkd4kYSS5WQ = this.#_3c5t2x7DYRo2shwTxpkd4kYSS5WQ
+            // deno-lint-ignore no-explicit-any
+            .map((v) => v instanceof URL
+            ? {
+                [Symbol.for("Deno.customInspect")]: (inspect, options) => "URL " + inspect(v.href, options),
+                [Symbol.for("nodejs.util.inspect.custom")]: (_depth, options, inspect) => "URL " + inspect(v.href, options),
+            }
+            : v);
+        if (_3c5t2x7DYRo2shwTxpkd4kYSS5WQ.length == 1) {
+            proxy.instrument = _3c5t2x7DYRo2shwTxpkd4kYSS5WQ[0];
+        }
+        if (_3c5t2x7DYRo2shwTxpkd4kYSS5WQ.length > 1 ||
+            !("instrument" in proxy) &&
+                _3c5t2x7DYRo2shwTxpkd4kYSS5WQ.length > 0) {
+            proxy.instruments = _3c5t2x7DYRo2shwTxpkd4kYSS5WQ;
+        }
         return proxy;
     }
     [Symbol.for("Deno.customInspect")](inspect, options) {
@@ -8176,8 +8891,9 @@ export class Application extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["https://w3id.org/security#publicKey"] = array;
+        }
         array = [];
         for (const v of this.#_4EHQFWZSz1k1d4LmPrQiMba2GbP3) {
             const element = v instanceof URL
@@ -8203,8 +8919,9 @@ export class Application extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://www.w3.org/ns/ldp#inbox"] = array;
+        }
         array = [];
         for (const v of this.#_41QwhqJouoLg3h8dRPKat21brynC) {
             const element = v instanceof URL
@@ -8252,8 +8969,9 @@ export class Application extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#featured"] = array;
+        }
         array = [];
         for (const v of this.#_3sG2Hdwn9qzKGu9mpYkqakAMUkH9) {
             const element = v instanceof URL
@@ -8293,8 +9011,9 @@ export class Application extends Object {
             const element = { "@value": v };
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#memorial"] = array;
+        }
         array = [];
         for (const v of this.#_2diCorzqPGQQqftp6e4SrCEwEnyk) {
             const element = { "@value": v };
@@ -9720,46 +10439,44 @@ export class Collection extends Object {
         }
         if ("current" in values && values.current != null) {
             if (values.current instanceof CollectionPage ||
-                values.current instanceof Link || values.current instanceof URL) {
+                values.current instanceof URL) {
                 // @ts-ignore: type is checked above.
                 this.#_3UyUdxnyn6cDn53QKrh4MBiearma = [values.current];
             }
             else {
                 throw new TypeError("The current must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         if ("first" in values && values.first != null) {
-            if (values.first instanceof CollectionPage ||
-                values.first instanceof Link || values.first instanceof URL) {
+            if (values.first instanceof CollectionPage || values.first instanceof URL) {
                 // @ts-ignore: type is checked above.
                 this.#_J52RqweMe6hhv7RnLJMC8BExTE5 = [values.first];
             }
             else {
                 throw new TypeError("The first must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         if ("last" in values && values.last != null) {
-            if (values.last instanceof CollectionPage || values.last instanceof Link ||
-                values.last instanceof URL) {
+            if (values.last instanceof CollectionPage || values.last instanceof URL) {
                 // @ts-ignore: type is checked above.
                 this.#_gyJJnyEFnuNVi1HFZKfAn3Hfn26 = [values.last];
             }
             else {
                 throw new TypeError("The last must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         if ("items" in values && values.items != null) {
             if (Array.isArray(values.items) &&
-                values.items.every((v) => v instanceof Object || v instanceof Link || v instanceof URL)) {
+                values.items.every((v) => v instanceof Object || v instanceof URL)) {
                 // @ts-ignore: type is checked above.
                 this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = values.items;
             }
             else {
                 throw new TypeError("The items must be an array of type " +
-                    "Object | Link | URL" + ".");
+                    "Object | URL" + ".");
             }
         }
     }
@@ -9786,49 +10503,47 @@ export class Collection extends Object {
         clone.#_3UyUdxnyn6cDn53QKrh4MBiearma = this.#_3UyUdxnyn6cDn53QKrh4MBiearma;
         if ("current" in values && values.current != null) {
             if (values.current instanceof CollectionPage ||
-                values.current instanceof Link || values.current instanceof URL) {
+                values.current instanceof URL) {
                 // @ts-ignore: type is checked above.
                 clone.#_3UyUdxnyn6cDn53QKrh4MBiearma = [values.current];
             }
             else {
                 throw new TypeError("The current must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         clone.#_J52RqweMe6hhv7RnLJMC8BExTE5 = this.#_J52RqweMe6hhv7RnLJMC8BExTE5;
         if ("first" in values && values.first != null) {
-            if (values.first instanceof CollectionPage ||
-                values.first instanceof Link || values.first instanceof URL) {
+            if (values.first instanceof CollectionPage || values.first instanceof URL) {
                 // @ts-ignore: type is checked above.
                 clone.#_J52RqweMe6hhv7RnLJMC8BExTE5 = [values.first];
             }
             else {
                 throw new TypeError("The first must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         clone.#_gyJJnyEFnuNVi1HFZKfAn3Hfn26 = this.#_gyJJnyEFnuNVi1HFZKfAn3Hfn26;
         if ("last" in values && values.last != null) {
-            if (values.last instanceof CollectionPage || values.last instanceof Link ||
-                values.last instanceof URL) {
+            if (values.last instanceof CollectionPage || values.last instanceof URL) {
                 // @ts-ignore: type is checked above.
                 clone.#_gyJJnyEFnuNVi1HFZKfAn3Hfn26 = [values.last];
             }
             else {
                 throw new TypeError("The last must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         clone.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg;
         if ("items" in values && values.items != null) {
             if (Array.isArray(values.items) &&
-                values.items.every((v) => v instanceof Object || v instanceof Link || v instanceof URL)) {
+                values.items.every((v) => v instanceof Object || v instanceof URL)) {
                 // @ts-ignore: type is checked above.
                 clone.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = values.items;
             }
             else {
                 throw new TypeError("The items must be an array of type " +
-                    "Object | Link | URL" + ".");
+                    "Object | URL" + ".");
             }
         }
         return clone;
@@ -9866,18 +10581,8 @@ export class Collection extends Object {
             if (!(e instanceof TypeError))
                 throw e;
         }
-        try {
-            return await Link.fromJsonLd(document, { documentLoader, contextLoader });
-        }
-        catch (e) {
-            if (!(e instanceof TypeError))
-                throw e;
-        }
         throw new TypeError("Expected an object of any type of: " +
-            [
-                "https://www.w3.org/ns/activitystreams#CollectionPage",
-                "https://www.w3.org/ns/activitystreams#Link",
-            ].join(", "));
+            ["https://www.w3.org/ns/activitystreams#CollectionPage"].join(", "));
     }
     /**
      * Similar to
@@ -9932,18 +10637,8 @@ export class Collection extends Object {
             if (!(e instanceof TypeError))
                 throw e;
         }
-        try {
-            return await Link.fromJsonLd(document, { documentLoader, contextLoader });
-        }
-        catch (e) {
-            if (!(e instanceof TypeError))
-                throw e;
-        }
         throw new TypeError("Expected an object of any type of: " +
-            [
-                "https://www.w3.org/ns/activitystreams#CollectionPage",
-                "https://www.w3.org/ns/activitystreams#Link",
-            ].join(", "));
+            ["https://www.w3.org/ns/activitystreams#CollectionPage"].join(", "));
     }
     /**
      * Similar to
@@ -9998,18 +10693,8 @@ export class Collection extends Object {
             if (!(e instanceof TypeError))
                 throw e;
         }
-        try {
-            return await Link.fromJsonLd(document, { documentLoader, contextLoader });
-        }
-        catch (e) {
-            if (!(e instanceof TypeError))
-                throw e;
-        }
         throw new TypeError("Expected an object of any type of: " +
-            [
-                "https://www.w3.org/ns/activitystreams#CollectionPage",
-                "https://www.w3.org/ns/activitystreams#Link",
-            ].join(", "));
+            ["https://www.w3.org/ns/activitystreams#CollectionPage"].join(", "));
     }
     /**
      * Similar to
@@ -10064,18 +10749,8 @@ export class Collection extends Object {
             if (!(e instanceof TypeError))
                 throw e;
         }
-        try {
-            return await Link.fromJsonLd(document, { documentLoader, contextLoader });
-        }
-        catch (e) {
-            if (!(e instanceof TypeError))
-                throw e;
-        }
         throw new TypeError("Expected an object of any type of: " +
-            [
-                "https://www.w3.org/ns/activitystreams#Object",
-                "https://www.w3.org/ns/activitystreams#Link",
-            ].join(", "));
+            ["https://www.w3.org/ns/activitystreams#Object"].join(", "));
     }
     /**
      * Similar to
@@ -10134,9 +10809,7 @@ export class Collection extends Object {
         for (const v of this.#_3UyUdxnyn6cDn53QKrh4MBiearma) {
             const element = v instanceof URL
                 ? { "@id": v.href }
-                : v instanceof CollectionPage
-                    ? await v.toJsonLd(options)
-                    : await v.toJsonLd(options);
+                : await v.toJsonLd(options);
             array.push(element);
         }
         if (array.length > 0) {
@@ -10146,9 +10819,7 @@ export class Collection extends Object {
         for (const v of this.#_J52RqweMe6hhv7RnLJMC8BExTE5) {
             const element = v instanceof URL
                 ? { "@id": v.href }
-                : v instanceof CollectionPage
-                    ? await v.toJsonLd(options)
-                    : await v.toJsonLd(options);
+                : await v.toJsonLd(options);
             array.push(element);
         }
         if (array.length > 0) {
@@ -10158,9 +10829,7 @@ export class Collection extends Object {
         for (const v of this.#_gyJJnyEFnuNVi1HFZKfAn3Hfn26) {
             const element = v instanceof URL
                 ? { "@id": v.href }
-                : v instanceof CollectionPage
-                    ? await v.toJsonLd(options)
-                    : await v.toJsonLd(options);
+                : await v.toJsonLd(options);
             array.push(element);
         }
         if (array.length > 0) {
@@ -10170,9 +10839,7 @@ export class Collection extends Object {
         for (const v of this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg) {
             const element = v instanceof URL
                 ? { "@id": v.href }
-                : v instanceof Object
-                    ? await v.toJsonLd(options)
-                    : await v.toJsonLd(options);
+                : await v.toJsonLd(options);
             array.push(element);
         }
         if (array.length > 0) {
@@ -10255,25 +10922,7 @@ export class Collection extends Object {
                 _3UyUdxnyn6cDn53QKrh4MBiearma.push(new URL(v["@id"]));
                 continue;
             }
-            const decoded = typeof v === "object" && "@type" in v &&
-                Array.isArray(v["@type"]) &&
-                [
-                    "https://www.w3.org/ns/activitystreams#CollectionPage",
-                    "https://www.w3.org/ns/activitystreams#OrderedCollectionPage",
-                ].some((t) => v["@type"].includes(t))
-                ? await CollectionPage.fromJsonLd(v, options)
-                : typeof v === "object" && "@type" in v &&
-                    Array.isArray(v["@type"]) &&
-                    [
-                        "https://www.w3.org/ns/activitystreams#Link",
-                        "https://www.w3.org/ns/activitystreams#Hashtag",
-                        "https://www.w3.org/ns/activitystreams#Mention",
-                    ].some((t) => v["@type"].includes(t))
-                    ? await Link.fromJsonLd(v, options)
-                    : undefined;
-            if (typeof decoded === "undefined")
-                continue;
-            _3UyUdxnyn6cDn53QKrh4MBiearma.push(decoded);
+            _3UyUdxnyn6cDn53QKrh4MBiearma.push(await CollectionPage.fromJsonLd(v, options));
         }
         instance.#_3UyUdxnyn6cDn53QKrh4MBiearma = _3UyUdxnyn6cDn53QKrh4MBiearma;
         const _J52RqweMe6hhv7RnLJMC8BExTE5 = [];
@@ -10285,126 +10934,31 @@ export class Collection extends Object {
                 _J52RqweMe6hhv7RnLJMC8BExTE5.push(new URL(v["@id"]));
                 continue;
             }
-            const decoded = typeof v === "object" && "@type" in v &&
-                Array.isArray(v["@type"]) &&
-                [
-                    "https://www.w3.org/ns/activitystreams#CollectionPage",
-                    "https://www.w3.org/ns/activitystreams#OrderedCollectionPage",
-                ].some((t) => v["@type"].includes(t))
-                ? await CollectionPage.fromJsonLd(v, options)
-                : typeof v === "object" && "@type" in v &&
-                    Array.isArray(v["@type"]) &&
-                    [
-                        "https://www.w3.org/ns/activitystreams#Link",
-                        "https://www.w3.org/ns/activitystreams#Hashtag",
-                        "https://www.w3.org/ns/activitystreams#Mention",
-                    ].some((t) => v["@type"].includes(t))
-                    ? await Link.fromJsonLd(v, options)
-                    : undefined;
-            if (typeof decoded === "undefined")
-                continue;
-            _J52RqweMe6hhv7RnLJMC8BExTE5.push(decoded);
-        }
-        instance.#_J52RqweMe6hhv7RnLJMC8BExTE5 = _J52RqweMe6hhv7RnLJMC8BExTE5;
-        const _gyJJnyEFnuNVi1HFZKfAn3Hfn26 = [];
-        for (const v of values["https://www.w3.org/ns/activitystreams#last"] ?? []) {
-            if (v == null)
-                continue;
-            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
-                globalThis.Object.keys(v).length === 1) {
-                _gyJJnyEFnuNVi1HFZKfAn3Hfn26.push(new URL(v["@id"]));
-                continue;
-            }
-            const decoded = typeof v === "object" && "@type" in v &&
-                Array.isArray(v["@type"]) &&
-                [
-                    "https://www.w3.org/ns/activitystreams#CollectionPage",
-                    "https://www.w3.org/ns/activitystreams#OrderedCollectionPage",
-                ].some((t) => v["@type"].includes(t))
-                ? await CollectionPage.fromJsonLd(v, options)
-                : typeof v === "object" && "@type" in v &&
-                    Array.isArray(v["@type"]) &&
-                    [
-                        "https://www.w3.org/ns/activitystreams#Link",
-                        "https://www.w3.org/ns/activitystreams#Hashtag",
-                        "https://www.w3.org/ns/activitystreams#Mention",
-                    ].some((t) => v["@type"].includes(t))
-                    ? await Link.fromJsonLd(v, options)
-                    : undefined;
-            if (typeof decoded === "undefined")
-                continue;
-            _gyJJnyEFnuNVi1HFZKfAn3Hfn26.push(decoded);
+            _J52RqweMe6hhv7RnLJMC8BExTE5.push(await CollectionPage.fromJsonLd(v, options));
         }
-        instance.#_gyJJnyEFnuNVi1HFZKfAn3Hfn26 = _gyJJnyEFnuNVi1HFZKfAn3Hfn26;
-        const _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = [];
-        for (const v of values["https://www.w3.org/ns/activitystreams#items"] ?? []) {
-            if (v == null)
-                continue;
-            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
-                globalThis.Object.keys(v).length === 1) {
-                _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.push(new URL(v["@id"]));
-                continue;
-            }
-            const decoded = typeof v === "object" && "@type" in v &&
-                Array.isArray(v["@type"]) &&
-                [
-                    "https://www.w3.org/ns/activitystreams#Object",
-                    "http://joinmastodon.org/ns#Emoji",
-                    "https://www.w3.org/ns/activitystreams#Activity",
-                    "https://www.w3.org/ns/activitystreams#Accept",
-                    "https://www.w3.org/ns/activitystreams#Add",
-                    "https://www.w3.org/ns/activitystreams#Announce",
-                    "https://www.w3.org/ns/activitystreams#Create",
-                    "https://www.w3.org/ns/activitystreams#Delete",
-                    "https://www.w3.org/ns/activitystreams#Dislike",
-                    "https://www.w3.org/ns/activitystreams#Flag",
-                    "https://www.w3.org/ns/activitystreams#Follow",
-                    "https://www.w3.org/ns/activitystreams#Ignore",
-                    "https://www.w3.org/ns/activitystreams#Block",
-                    "https://www.w3.org/ns/activitystreams#IntransitiveActivity",
-                    "https://www.w3.org/ns/activitystreams#Arrive",
-                    "https://www.w3.org/ns/activitystreams#Question",
-                    "https://www.w3.org/ns/activitystreams#Like",
-                    "https://www.w3.org/ns/activitystreams#Offer",
-                    "https://www.w3.org/ns/activitystreams#Reject",
-                    "https://www.w3.org/ns/activitystreams#Remove",
-                    "https://www.w3.org/ns/activitystreams#Undo",
-                    "https://www.w3.org/ns/activitystreams#Update",
-                    "https://www.w3.org/ns/activitystreams#Application",
-                    "https://www.w3.org/ns/activitystreams#Article",
-                    "https://www.w3.org/ns/activitystreams#Collection",
-                    "https://www.w3.org/ns/activitystreams#CollectionPage",
-                    "https://www.w3.org/ns/activitystreams#OrderedCollectionPage",
-                    "https://www.w3.org/ns/activitystreams#OrderedCollection",
-                    "https://www.w3.org/ns/activitystreams#Document",
-                    "https://www.w3.org/ns/activitystreams#Audio",
-                    "https://www.w3.org/ns/activitystreams#Image",
-                    "https://www.w3.org/ns/activitystreams#Page",
-                    "https://www.w3.org/ns/activitystreams#Video",
-                    "https://www.w3.org/ns/activitystreams#Event",
-                    "https://www.w3.org/ns/activitystreams#Group",
-                    "https://www.w3.org/ns/activitystreams#Note",
-                    "https://www.w3.org/ns/activitystreams#Organization",
-                    "https://www.w3.org/ns/activitystreams#Person",
-                    "https://www.w3.org/ns/activitystreams#Place",
-                    "https://www.w3.org/ns/activitystreams#Profile",
-                    "https://www.w3.org/ns/activitystreams#Relationship",
-                    "https://www.w3.org/ns/activitystreams#Service",
-                    "https://www.w3.org/ns/activitystreams#Tombstone",
-                ].some((t) => v["@type"].includes(t))
-                ? await Object.fromJsonLd(v, options)
-                : typeof v === "object" && "@type" in v &&
-                    Array.isArray(v["@type"]) &&
-                    [
-                        "https://www.w3.org/ns/activitystreams#Link",
-                        "https://www.w3.org/ns/activitystreams#Hashtag",
-                        "https://www.w3.org/ns/activitystreams#Mention",
-                    ].some((t) => v["@type"].includes(t))
-                    ? await Link.fromJsonLd(v, options)
-                    : undefined;
-            if (typeof decoded === "undefined")
+        instance.#_J52RqweMe6hhv7RnLJMC8BExTE5 = _J52RqweMe6hhv7RnLJMC8BExTE5;
+        const _gyJJnyEFnuNVi1HFZKfAn3Hfn26 = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#last"] ?? []) {
+            if (v == null)
+                continue;
+            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
+                globalThis.Object.keys(v).length === 1) {
+                _gyJJnyEFnuNVi1HFZKfAn3Hfn26.push(new URL(v["@id"]));
+                continue;
+            }
+            _gyJJnyEFnuNVi1HFZKfAn3Hfn26.push(await CollectionPage.fromJsonLd(v, options));
+        }
+        instance.#_gyJJnyEFnuNVi1HFZKfAn3Hfn26 = _gyJJnyEFnuNVi1HFZKfAn3Hfn26;
+        const _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#items"] ?? []) {
+            if (v == null)
+                continue;
+            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
+                globalThis.Object.keys(v).length === 1) {
+                _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.push(new URL(v["@id"]));
                 continue;
-            _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.push(decoded);
+            }
+            _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.push(await Object.fromJsonLd(v, options));
         }
         instance.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg;
         return instance;
@@ -10501,36 +11055,33 @@ export class CollectionPage extends Collection {
     constructor(values, { documentLoader, contextLoader, } = {}) {
         super(values, { documentLoader, contextLoader });
         if ("partOf" in values && values.partOf != null) {
-            if (values.partOf instanceof Link || values.partOf instanceof Collection ||
-                values.partOf instanceof URL) {
+            if (values.partOf instanceof Collection || values.partOf instanceof URL) {
                 // @ts-ignore: type is checked above.
                 this.#_2kWgBhQKjEauxx8C6qF3ZQamK4Le = [values.partOf];
             }
             else {
                 throw new TypeError("The partOf must be of type " +
-                    "Link | Collection | URL" + ".");
+                    "Collection | URL" + ".");
             }
         }
         if ("next" in values && values.next != null) {
-            if (values.next instanceof _b || values.next instanceof Link ||
-                values.next instanceof URL) {
+            if (values.next instanceof _b || values.next instanceof URL) {
                 // @ts-ignore: type is checked above.
                 this.#_3BT4kQLcXhHx7TAWaNDKh8nFn9eY = [values.next];
             }
             else {
                 throw new TypeError("The next must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         if ("prev" in values && values.prev != null) {
-            if (values.prev instanceof _b || values.prev instanceof Link ||
-                values.prev instanceof URL) {
+            if (values.prev instanceof _b || values.prev instanceof URL) {
                 // @ts-ignore: type is checked above.
                 this.#_3b8yG8tDNzQFFEnWhCc13G8eHooA = [values.prev];
             }
             else {
                 throw new TypeError("The prev must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
     }
@@ -10544,38 +11095,35 @@ export class CollectionPage extends Collection {
         const clone = super.clone(values, options);
         clone.#_2kWgBhQKjEauxx8C6qF3ZQamK4Le = this.#_2kWgBhQKjEauxx8C6qF3ZQamK4Le;
         if ("partOf" in values && values.partOf != null) {
-            if (values.partOf instanceof Link || values.partOf instanceof Collection ||
-                values.partOf instanceof URL) {
+            if (values.partOf instanceof Collection || values.partOf instanceof URL) {
                 // @ts-ignore: type is checked above.
                 clone.#_2kWgBhQKjEauxx8C6qF3ZQamK4Le = [values.partOf];
             }
             else {
                 throw new TypeError("The partOf must be of type " +
-                    "Link | Collection | URL" + ".");
+                    "Collection | URL" + ".");
             }
         }
         clone.#_3BT4kQLcXhHx7TAWaNDKh8nFn9eY = this.#_3BT4kQLcXhHx7TAWaNDKh8nFn9eY;
         if ("next" in values && values.next != null) {
-            if (values.next instanceof _b || values.next instanceof Link ||
-                values.next instanceof URL) {
+            if (values.next instanceof _b || values.next instanceof URL) {
                 // @ts-ignore: type is checked above.
                 clone.#_3BT4kQLcXhHx7TAWaNDKh8nFn9eY = [values.next];
             }
             else {
                 throw new TypeError("The next must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         clone.#_3b8yG8tDNzQFFEnWhCc13G8eHooA = this.#_3b8yG8tDNzQFFEnWhCc13G8eHooA;
         if ("prev" in values && values.prev != null) {
-            if (values.prev instanceof _b || values.prev instanceof Link ||
-                values.prev instanceof URL) {
+            if (values.prev instanceof _b || values.prev instanceof URL) {
                 // @ts-ignore: type is checked above.
                 clone.#_3b8yG8tDNzQFFEnWhCc13G8eHooA = [values.prev];
             }
             else {
                 throw new TypeError("The prev must be of type " +
-                    "CollectionPage | Link | URL" + ".");
+                    "CollectionPage | URL" + ".");
             }
         }
         return clone;
@@ -10597,13 +11145,6 @@ export class CollectionPage extends Collection {
             throw error;
         }
         const { document } = fetchResult;
-        try {
-            return await Link.fromJsonLd(document, { documentLoader, contextLoader });
-        }
-        catch (e) {
-            if (!(e instanceof TypeError))
-                throw e;
-        }
         try {
             return await Collection.fromJsonLd(document, { documentLoader, contextLoader });
         }
@@ -10612,10 +11153,7 @@ export class CollectionPage extends Collection {
                 throw e;
         }
         throw new TypeError("Expected an object of any type of: " +
-            [
-                "https://www.w3.org/ns/activitystreams#Link",
-                "https://www.w3.org/ns/activitystreams#Collection",
-            ].join(", "));
+            ["https://www.w3.org/ns/activitystreams#Collection"].join(", "));
     }
     /**
      * Similar to
@@ -10670,18 +11208,8 @@ export class CollectionPage extends Collection {
             if (!(e instanceof TypeError))
                 throw e;
         }
-        try {
-            return await Link.fromJsonLd(document, { documentLoader, contextLoader });
-        }
-        catch (e) {
-            if (!(e instanceof TypeError))
-                throw e;
-        }
         throw new TypeError("Expected an object of any type of: " +
-            [
-                "https://www.w3.org/ns/activitystreams#CollectionPage",
-                "https://www.w3.org/ns/activitystreams#Link",
-            ].join(", "));
+            ["https://www.w3.org/ns/activitystreams#CollectionPage"].join(", "));
     }
     /**
      * Similar to
@@ -10735,18 +11263,8 @@ export class CollectionPage extends Collection {
             if (!(e instanceof TypeError))
                 throw e;
         }
-        try {
-            return await Link.fromJsonLd(document, { documentLoader, contextLoader });
-        }
-        catch (e) {
-            if (!(e instanceof TypeError))
-                throw e;
-        }
         throw new TypeError("Expected an object of any type of: " +
-            [
-                "https://www.w3.org/ns/activitystreams#CollectionPage",
-                "https://www.w3.org/ns/activitystreams#Link",
-            ].join(", "));
+            ["https://www.w3.org/ns/activitystreams#CollectionPage"].join(", "));
     }
     /**
      * Similar to
@@ -10796,9 +11314,7 @@ export class CollectionPage extends Collection {
         for (const v of this.#_2kWgBhQKjEauxx8C6qF3ZQamK4Le) {
             const element = v instanceof URL
                 ? { "@id": v.href }
-                : v instanceof Link
-                    ? await v.toJsonLd(options)
-                    : await v.toJsonLd(options);
+                : await v.toJsonLd(options);
             array.push(element);
         }
         if (array.length > 0) {
@@ -10808,9 +11324,7 @@ export class CollectionPage extends Collection {
         for (const v of this.#_3BT4kQLcXhHx7TAWaNDKh8nFn9eY) {
             const element = v instanceof URL
                 ? { "@id": v.href }
-                : v instanceof _b
-                    ? await v.toJsonLd(options)
-                    : await v.toJsonLd(options);
+                : await v.toJsonLd(options);
             array.push(element);
         }
         if (array.length > 0) {
@@ -10820,9 +11334,7 @@ export class CollectionPage extends Collection {
         for (const v of this.#_3b8yG8tDNzQFFEnWhCc13G8eHooA) {
             const element = v instanceof URL
                 ? { "@id": v.href }
-                : v instanceof _b
-                    ? await v.toJsonLd(options)
-                    : await v.toJsonLd(options);
+                : await v.toJsonLd(options);
             array.push(element);
         }
         if (array.length > 0) {
@@ -10889,27 +11401,7 @@ export class CollectionPage extends Collection {
                 _2kWgBhQKjEauxx8C6qF3ZQamK4Le.push(new URL(v["@id"]));
                 continue;
             }
-            const decoded = typeof v === "object" && "@type" in v &&
-                Array.isArray(v["@type"]) &&
-                [
-                    "https://www.w3.org/ns/activitystreams#Link",
-                    "https://www.w3.org/ns/activitystreams#Hashtag",
-                    "https://www.w3.org/ns/activitystreams#Mention",
-                ].some((t) => v["@type"].includes(t))
-                ? await Link.fromJsonLd(v, options)
-                : typeof v === "object" && "@type" in v &&
-                    Array.isArray(v["@type"]) &&
-                    [
-                        "https://www.w3.org/ns/activitystreams#Collection",
-                        "https://www.w3.org/ns/activitystreams#CollectionPage",
-                        "https://www.w3.org/ns/activitystreams#OrderedCollectionPage",
-                        "https://www.w3.org/ns/activitystreams#OrderedCollection",
-                    ].some((t) => v["@type"].includes(t))
-                    ? await Collection.fromJsonLd(v, options)
-                    : undefined;
-            if (typeof decoded === "undefined")
-                continue;
-            _2kWgBhQKjEauxx8C6qF3ZQamK4Le.push(decoded);
+            _2kWgBhQKjEauxx8C6qF3ZQamK4Le.push(await Collection.fromJsonLd(v, options));
         }
         instance.#_2kWgBhQKjEauxx8C6qF3ZQamK4Le = _2kWgBhQKjEauxx8C6qF3ZQamK4Le;
         const _3BT4kQLcXhHx7TAWaNDKh8nFn9eY = [];
@@ -10921,25 +11413,7 @@ export class CollectionPage extends Collection {
                 _3BT4kQLcXhHx7TAWaNDKh8nFn9eY.push(new URL(v["@id"]));
                 continue;
             }
-            const decoded = typeof v === "object" && "@type" in v &&
-                Array.isArray(v["@type"]) &&
-                [
-                    "https://www.w3.org/ns/activitystreams#CollectionPage",
-                    "https://www.w3.org/ns/activitystreams#OrderedCollectionPage",
-                ].some((t) => v["@type"].includes(t))
-                ? await _b.fromJsonLd(v, options)
-                : typeof v === "object" && "@type" in v &&
-                    Array.isArray(v["@type"]) &&
-                    [
-                        "https://www.w3.org/ns/activitystreams#Link",
-                        "https://www.w3.org/ns/activitystreams#Hashtag",
-                        "https://www.w3.org/ns/activitystreams#Mention",
-                    ].some((t) => v["@type"].includes(t))
-                    ? await Link.fromJsonLd(v, options)
-                    : undefined;
-            if (typeof decoded === "undefined")
-                continue;
-            _3BT4kQLcXhHx7TAWaNDKh8nFn9eY.push(decoded);
+            _3BT4kQLcXhHx7TAWaNDKh8nFn9eY.push(await _b.fromJsonLd(v, options));
         }
         instance.#_3BT4kQLcXhHx7TAWaNDKh8nFn9eY = _3BT4kQLcXhHx7TAWaNDKh8nFn9eY;
         const _3b8yG8tDNzQFFEnWhCc13G8eHooA = [];
@@ -10951,25 +11425,7 @@ export class CollectionPage extends Collection {
                 _3b8yG8tDNzQFFEnWhCc13G8eHooA.push(new URL(v["@id"]));
                 continue;
             }
-            const decoded = typeof v === "object" && "@type" in v &&
-                Array.isArray(v["@type"]) &&
-                [
-                    "https://www.w3.org/ns/activitystreams#CollectionPage",
-                    "https://www.w3.org/ns/activitystreams#OrderedCollectionPage",
-                ].some((t) => v["@type"].includes(t))
-                ? await _b.fromJsonLd(v, options)
-                : typeof v === "object" && "@type" in v &&
-                    Array.isArray(v["@type"]) &&
-                    [
-                        "https://www.w3.org/ns/activitystreams#Link",
-                        "https://www.w3.org/ns/activitystreams#Hashtag",
-                        "https://www.w3.org/ns/activitystreams#Mention",
-                    ].some((t) => v["@type"].includes(t))
-                    ? await Link.fromJsonLd(v, options)
-                    : undefined;
-            if (typeof decoded === "undefined")
-                continue;
-            _3b8yG8tDNzQFFEnWhCc13G8eHooA.push(decoded);
+            _3b8yG8tDNzQFFEnWhCc13G8eHooA.push(await _b.fromJsonLd(v, options));
         }
         instance.#_3b8yG8tDNzQFFEnWhCc13G8eHooA = _3b8yG8tDNzQFFEnWhCc13G8eHooA;
         return instance;
@@ -13361,8 +13817,9 @@ export class Group extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["https://w3id.org/security#publicKey"] = array;
+        }
         array = [];
         for (const v of this.#_4EHQFWZSz1k1d4LmPrQiMba2GbP3) {
             const element = v instanceof URL
@@ -13388,8 +13845,9 @@ export class Group extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://www.w3.org/ns/ldp#inbox"] = array;
+        }
         array = [];
         for (const v of this.#_41QwhqJouoLg3h8dRPKat21brynC) {
             const element = v instanceof URL
@@ -13437,8 +13895,9 @@ export class Group extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#featured"] = array;
+        }
         array = [];
         for (const v of this.#_3sG2Hdwn9qzKGu9mpYkqakAMUkH9) {
             const element = v instanceof URL
@@ -13478,8 +13937,9 @@ export class Group extends Object {
             const element = { "@value": v };
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#memorial"] = array;
+        }
         array = [];
         for (const v of this.#_2diCorzqPGQQqftp6e4SrCEwEnyk) {
             const element = { "@value": v };
@@ -15432,6 +15892,7 @@ export class OrderedCollection extends Collection {
     static get typeId() {
         return new URL("https://www.w3.org/ns/activitystreams#OrderedCollection");
     }
+    #_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = [];
     /**
      * Constructs a new instance of OrderedCollection with the given values.
      * @param values The values to initialize the instance with.
@@ -15439,6 +15900,17 @@ export class OrderedCollection extends Collection {
      */
     constructor(values, { documentLoader, contextLoader, } = {}) {
         super(values, { documentLoader, contextLoader });
+        if ("items" in values && values.items != null) {
+            if (Array.isArray(values.items) &&
+                values.items.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = values.items;
+            }
+            else {
+                throw new TypeError("The items must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
     }
     /**
      * Clones this instance, optionally updating it with the given values.
@@ -15448,8 +15920,73 @@ export class OrderedCollection extends Collection {
      */
     clone(values = {}, options = {}) {
         const clone = super.clone(values, options);
+        clone.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg;
+        if ("items" in values && values.items != null) {
+            if (Array.isArray(values.items) &&
+                values.items.every((v) => v instanceof Object || v instanceof URL)) {
+                // @ts-ignore: type is checked above.
+                clone.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = values.items;
+            }
+            else {
+                throw new TypeError("The items must be an array of type " +
+                    "Object | URL" + ".");
+            }
+        }
         return clone;
     }
+    async #fetchItem(url, options = {}) {
+        const documentLoader = options.documentLoader ?? this._documentLoader ??
+            fetchDocumentLoader;
+        const contextLoader = options.contextLoader ?? this._contextLoader ??
+            fetchDocumentLoader;
+        let fetchResult;
+        try {
+            fetchResult = await documentLoader(url.href);
+        }
+        catch (error) {
+            if (options.suppressError) {
+                getLogger(["fedify", "vocab"]).error("Failed to fetch {url}: {error}", { error, url: url.href });
+                return null;
+            }
+            throw error;
+        }
+        const { document } = fetchResult;
+        try {
+            return await Object.fromJsonLd(document, { documentLoader, contextLoader });
+        }
+        catch (e) {
+            if (!(e instanceof TypeError))
+                throw e;
+        }
+        throw new TypeError("Expected an object of any type of: " +
+            ["https://www.w3.org/ns/activitystreams#Object"].join(", "));
+    }
+    /**
+     * Similar to
+     * {@link OrderedCollection.getItems},
+     * but returns their `@id`s instead of the objects themselves.
+     */
+    get itemIds() {
+        return this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.map((v) => v instanceof URL ? v : v.id).filter((id) => id !== null);
+    }
+    /** Identifies the items contained in a collection.  The items might be ordered
+     * or unordered.
+     */
+    async *getItems(options = {}) {
+        const vs = this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg;
+        for (let i = 0; i < vs.length; i++) {
+            const v = vs[i];
+            if (v instanceof URL) {
+                const fetched = await this.#fetchItem(v, options);
+                if (fetched == null)
+                    continue;
+                vs[i] = fetched;
+                yield fetched;
+                continue;
+            }
+            yield v;
+        }
+    }
     /**
      * Converts this object to a JSON-LD structure.
      * @returns The JSON-LD representation of this object.
@@ -15466,6 +16003,18 @@ export class OrderedCollection extends Collection {
             expand: true,
         });
         const values = baseValues[0];
+        array = [];
+        for (const v of this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg) {
+            const element = v instanceof URL
+                ? { "@id": v.href }
+                : await v.toJsonLd(options);
+            array.push(element);
+        }
+        if (array.length > 0) {
+            values["https://www.w3.org/ns/activitystreams#items"] = {
+                "@list": array,
+            };
+        }
         values["@type"] = [
             "https://www.w3.org/ns/activitystreams#OrderedCollection",
         ];
@@ -15516,10 +16065,35 @@ export class OrderedCollection extends Collection {
         if (!(instance instanceof OrderedCollection)) {
             throw new TypeError("Unexpected type: " + instance.constructor.name);
         }
+        const _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = [];
+        for (const v of values["https://www.w3.org/ns/activitystreams#items"] ?? []) {
+            if (v == null)
+                continue;
+            if (typeof v === "object" && "@id" in v && !("@type" in v) &&
+                globalThis.Object.keys(v).length === 1) {
+                _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.push(new URL(v["@id"]));
+                continue;
+            }
+            _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.push(await Object.fromJsonLd(v, options));
+        }
+        instance.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg;
         return instance;
     }
     _getCustomInspectProxy() {
         const proxy = super._getCustomInspectProxy();
+        const _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg = this.#_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg
+            // deno-lint-ignore no-explicit-any
+            .map((v) => v instanceof URL
+            ? {
+                [Symbol.for("Deno.customInspect")]: (inspect, options) => "URL " + inspect(v.href, options),
+                [Symbol.for("nodejs.util.inspect.custom")]: (_depth, options, inspect) => "URL " + inspect(v.href, options),
+            }
+            : v);
+        if (_2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.length > 1 ||
+            !("item" in proxy) &&
+                _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg.length > 0) {
+            proxy.items = _2JPCKWTcfBmTCcW8Tv3TpRaLVaqg;
+        }
         return proxy;
     }
     [Symbol.for("Deno.customInspect")](inspect, options) {
@@ -16886,8 +17460,9 @@ export class Organization extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["https://w3id.org/security#publicKey"] = array;
+        }
         array = [];
         for (const v of this.#_4EHQFWZSz1k1d4LmPrQiMba2GbP3) {
             const element = v instanceof URL
@@ -16913,8 +17488,9 @@ export class Organization extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://www.w3.org/ns/ldp#inbox"] = array;
+        }
         array = [];
         for (const v of this.#_41QwhqJouoLg3h8dRPKat21brynC) {
             const element = v instanceof URL
@@ -16962,8 +17538,9 @@ export class Organization extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#featured"] = array;
+        }
         array = [];
         for (const v of this.#_3sG2Hdwn9qzKGu9mpYkqakAMUkH9) {
             const element = v instanceof URL
@@ -17003,8 +17580,9 @@ export class Organization extends Object {
             const element = { "@value": v };
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#memorial"] = array;
+        }
         array = [];
         for (const v of this.#_2diCorzqPGQQqftp6e4SrCEwEnyk) {
             const element = { "@value": v };
@@ -18749,8 +19327,9 @@ export class Person extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["https://w3id.org/security#publicKey"] = array;
+        }
         array = [];
         for (const v of this.#_4EHQFWZSz1k1d4LmPrQiMba2GbP3) {
             const element = v instanceof URL
@@ -18776,8 +19355,9 @@ export class Person extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://www.w3.org/ns/ldp#inbox"] = array;
+        }
         array = [];
         for (const v of this.#_41QwhqJouoLg3h8dRPKat21brynC) {
             const element = v instanceof URL
@@ -18825,8 +19405,9 @@ export class Person extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#featured"] = array;
+        }
         array = [];
         for (const v of this.#_3sG2Hdwn9qzKGu9mpYkqakAMUkH9) {
             const element = v instanceof URL
@@ -18866,8 +19447,9 @@ export class Person extends Object {
             const element = { "@value": v };
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#memorial"] = array;
+        }
         array = [];
         for (const v of this.#_2diCorzqPGQQqftp6e4SrCEwEnyk) {
             const element = { "@value": v };
@@ -22362,8 +22944,9 @@ export class Service extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["https://w3id.org/security#publicKey"] = array;
+        }
         array = [];
         for (const v of this.#_4EHQFWZSz1k1d4LmPrQiMba2GbP3) {
             const element = v instanceof URL
@@ -22389,8 +22972,9 @@ export class Service extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://www.w3.org/ns/ldp#inbox"] = array;
+        }
         array = [];
         for (const v of this.#_41QwhqJouoLg3h8dRPKat21brynC) {
             const element = v instanceof URL
@@ -22438,8 +23022,9 @@ export class Service extends Object {
                 : await v.toJsonLd(options);
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#featured"] = array;
+        }
         array = [];
         for (const v of this.#_3sG2Hdwn9qzKGu9mpYkqakAMUkH9) {
             const element = v instanceof URL
@@ -22479,8 +23064,9 @@ export class Service extends Object {
             const element = { "@value": v };
             array.push(element);
         }
-        if (array.length > 0)
+        if (array.length > 0) {
             values["http://joinmastodon.org/ns#memorial"] = array;
+        }
         array = [];
         for (const v of this.#_2diCorzqPGQQqftp6e4SrCEwEnyk) {
             const element = { "@value": v };