@fedify/vocab-tools 2.4.0-dev.2247 → 2.4.0-dev.2256

package/src/class.ts

@@ -16,6 +16,7 @@ const INTERNAL_RUNTIME_IMPORTS = [
   "compactJsonLdCache",
   "createScopedContextLoader",
   "getJsonLdContext",
+  "getPortableActorGateways",
   "isTrustedIriOrigin",
   "normalizeJsonLdIris",
 ].join(",\n    ");
@@ -313,6 +314,12 @@ function decodeIri(iri: string): URL {
     ? new URL("at://" + encodeURIComponent(iri.substring(5)))
     : parseIri(iri);
 }
+
+function inspectIri(iri: URL): string {
+  // Inspecting an object must not throw, even for a URL that cannot be
+  // formatted as an IRI, e.g., a malformed portable ID:
+  try { return formatIri(iri); } catch { return iri.href; }
+}
 `;
   yield `
 function isValidLanguageTag(language: string): boolean {

package/src/codec.ts

@@ -538,8 +538,11 @@ export async function* generateDecoder(
     const variable = await getFieldName(property.uri, "");
     yield await generateField(property, types, "const ");
     const arrayVariable = `${variable}__array`;
+    const propertyValues = property.uri === "https://w3id.org/fep/ef61/gateways"
+      ? "getPortableActorGateways(values) as typeof values[string]"
+      : `values[${JSON.stringify(property.uri)}]`;
     yield `
-    let ${arrayVariable} = values[${JSON.stringify(property.uri)}];
+    let ${arrayVariable} = ${propertyValues};
     `;
     if (property.functional && property.redundantProperties != null) {
       for (const prop of property.redundantProperties) {

package/src/inspector.ts

@@ -21,12 +21,12 @@ export async function* generateInspector(
         [Symbol.for("Deno.customInspect")]: (
           inspect: typeof Deno.inspect,
           options: Deno.InspectOptions,
-        ): string => "URL " + inspect(this.id!.href, options),
+        ): string => "URL " + inspect(inspectIri(this.id!), options),
         [Symbol.for("nodejs.util.inspect.custom")]: (
           _depth: number,
           options: unknown,
           inspect: (value: unknown, options: unknown) => string,
-        ): string => "URL " + inspect(this.id!.href, options),
+        ): string => "URL " + inspect(inspectIri(this.id!), options),
       };
     }
     `;
@@ -44,12 +44,12 @@ export async function* generateInspector(
               [Symbol.for("Deno.customInspect")]: (
                 inspect: typeof Deno.inspect,
                 options: Deno.InspectOptions,
-              ): string => "URL " + inspect(v.href, options),
+              ): string => "URL " + inspect(inspectIri(v), options),
               [Symbol.for("nodejs.util.inspect.custom")]: (
                 _depth: number,
                 options: unknown,
                 inspect: (value: unknown, options: unknown) => string,
-              ): string => "URL " + inspect(v.href, options),
+              ): string => "URL " + inspect(inspectIri(v), options),
             }
           : v);
     `;

package/src/type.ts

@@ -340,10 +340,10 @@ const scalarTypes: Record<string, ScalarType> = {
       return `${v} instanceof URL && isGatewayUrl(${v})`;
     },
     encoder(v) {
-      return `{ "@id": formatIri(${v}) }`;
+      return `{ "@id": ${v}.origin }`;
     },
     compactEncoder(v) {
-      return `formatIri(${v})`;
+      return `${v}.origin`;
     },
     dataCheck(v) {
       return `${v} != null && typeof ${v} === "object" &&