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

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0-dev.2247+4fe1b8c3",
+  "version": "2.4.0-dev.2256+683c50ba",
   "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.2247+4fe1b8c3";
+var version = "2.4.0-dev.2256+683c50ba";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -333,10 +333,10 @@ const scalarTypes = {
 			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" &&
@@ -1165,7 +1165,7 @@ async function* generateDecoder(typeUri, types, moduleVarNames) {
 		yield await generateField(property, types, "const ");
 		const arrayVariable = `${variable}__array`;
 		yield `
-    let ${arrayVariable} = values[${JSON.stringify(property.uri)}];
+    let ${arrayVariable} = ${property.uri === "https://w3id.org/fep/ef61/gateways" ? "getPortableActorGateways(values) as typeof values[string]" : `values[${JSON.stringify(property.uri)}]`};
     `;
 		if (property.functional && property.redundantProperties != null) for (const prop of property.redundantProperties) yield `
         if (${arrayVariable} == null || ${arrayVariable}.length < 1) {
@@ -1542,12 +1542,12 @@ async function* generateInspector(typeUri, types) {
         [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),
       };
     }
     `;
@@ -1563,12 +1563,12 @@ async function* generateInspector(typeUri, types) {
               [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);
     `;
@@ -2285,6 +2285,7 @@ const INTERNAL_RUNTIME_IMPORTS = [
 	"compactJsonLdCache",
 	"createScopedContextLoader",
 	"getJsonLdContext",
+	"getPortableActorGateways",
 	"isTrustedIriOrigin",
 	"normalizeJsonLdIris"
 ].join(",\n    ");
@@ -2527,6 +2528,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/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.2247+4fe1b8c3";
+var version = "2.4.0-dev.2256+683c50ba";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -332,10 +332,10 @@ const scalarTypes = {
 			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" &&
@@ -1164,7 +1164,7 @@ async function* generateDecoder(typeUri, types, moduleVarNames) {
 		yield await generateField(property, types, "const ");
 		const arrayVariable = `${variable}__array`;
 		yield `
-    let ${arrayVariable} = values[${JSON.stringify(property.uri)}];
+    let ${arrayVariable} = ${property.uri === "https://w3id.org/fep/ef61/gateways" ? "getPortableActorGateways(values) as typeof values[string]" : `values[${JSON.stringify(property.uri)}]`};
     `;
 		if (property.functional && property.redundantProperties != null) for (const prop of property.redundantProperties) yield `
         if (${arrayVariable} == null || ${arrayVariable}.length < 1) {
@@ -1541,12 +1541,12 @@ async function* generateInspector(typeUri, types) {
         [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),
       };
     }
     `;
@@ -1562,12 +1562,12 @@ async function* generateInspector(typeUri, types) {
               [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);
     `;
@@ -2284,6 +2284,7 @@ const INTERNAL_RUNTIME_IMPORTS = [
 	"compactJsonLdCache",
 	"createScopedContextLoader",
 	"getJsonLdContext",
+	"getPortableActorGateways",
 	"isTrustedIriOrigin",
 	"normalizeJsonLdIris"
 ].join(",\n    ");
@@ -2526,6 +2527,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0-dev.2247+4fe1b8c3",
+  "version": "2.4.0-dev.2256+683c50ba",
   "description": "Code generator for Activity Vocabulary APIs",
   "homepage": "https://fedify.dev/",
   "repository": {