@fedify/vocab-tools 2.1.24 → 2.1.26

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "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.1.24";
+var version = "2.1.26";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -331,13 +331,16 @@ const scalarTypes = {
 			return `${v}.href`;
 		},
 		dataCheck(v) {
-			return `typeof ${v} === "object" && "@value" in ${v}
-        && typeof ${v}["@value"] === "string"
-        && ${v}["@value"] !== "" && ${v}["@value"] !== "/"`;
+			return `typeof ${v} === "object" &&
+      ((typeof ${v}["@id"] === "string" && canDecodeIri(${v}["@id"])) ||
+       (typeof ${v}["@value"] === "string" && canDecodeIri(${v}["@value"])))`;
 		},
 		decoder(v) {
-			return `new URL(${v}["@value"])`;
-		}
+			return `decodeIri(
+        typeof ${v}["@id"] === "string" ? ${v}["@id"] : ${v}["@value"]
+      )`;
+		},
+		skipUnparsable: true
 	},
 	"fedify:publicKey": {
 		name: "CryptoKey",
@@ -519,6 +522,9 @@ function getDecoder(typeUri, types, variable, optionsVariable, baseUrlVariable)
     )`;
 	throw new Error(`Unknown type: ${typeUri}`);
 }
+function skipsUnparsable(typeUri) {
+	return scalarTypes[typeUri]?.skipUnparsable ?? false;
+}
 function getDataCheck(typeUri, types, variable) {
 	if (typeUri in scalarTypes) return scalarTypes[typeUri].dataCheck(variable);
 	if (typeUri in types) {
@@ -1044,15 +1050,22 @@ async function* generateDecoder(typeUri, types) {
 		yield `
       const decoded =
     `;
-		if (property.range.length == 1) yield getDecoder(property.range[0], types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
-		else {
+		const lenient = property.range.length == 1 && skipsUnparsable(property.range[0]);
+		if (property.range.length == 1) {
+			if (lenient) {
+				yield getDataCheck(property.range[0], types, "v");
+				yield " ? ";
+			}
+			yield getDecoder(property.range[0], types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
+			if (lenient) yield " : undefined";
+		} else {
 			const decoders = getDecoders(property.range, types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
 			for (const code of decoders) yield code;
 		}
 		yield `
       ;
     `;
-		if (property.range.length > 1) yield `
+		if (property.range.length > 1 || lenient) yield `
       if (typeof decoded === "undefined") {
         shouldCacheJsonLd = false;
         continue;
@@ -1665,7 +1678,16 @@ async function* generateProperty(type, property, types) {
             ${JSON.stringify(property.compactName)}];
           const doc = Array.isArray(prop) ? prop[0] : prop;
           if (doc != null && typeof doc === "object" && "@context" in doc) {
-            v = await this.#${property.singularName}_fromJsonLd(doc, options);
+            try {
+              v = await this.#${property.singularName}_fromJsonLd(doc, options);
+            } catch (error) {
+              if (!options.suppressError) throw error;
+              getLogger(["fedify", "vocab"]).debug(
+                "Failed to parse embedded value of {property}: {error}",
+                { property: ${JSON.stringify(property.uri)}, error },
+              );
+              return null;
+            }
           }
         }
         `;
@@ -1762,7 +1784,16 @@ async function* generateProperty(type, property, types) {
               ${JSON.stringify(property.compactName)}];
             const obj = Array.isArray(prop) ? prop[i] : prop;
             if (obj != null && typeof obj === "object" && "@context" in obj) {
-              v = await this.#${property.singularName}_fromJsonLd(obj, options);
+              try {
+                v = await this.#${property.singularName}_fromJsonLd(obj, options);
+              } catch (error) {
+                if (!options.suppressError) throw error;
+                getLogger(["fedify", "vocab"]).debug(
+                  "Failed to parse embedded value of {property} at index {index}: {error}",
+                  { property: ${JSON.stringify(property.uri)}, index: i, error },
+                );
+                continue;
+              }
             }
           }
         `;
@@ -1938,6 +1969,17 @@ async function* generateClasses(types) {
     isTemporalInstant,
 } from "@fedify/vocab-runtime/temporal";\n`;
 	yield `
+function canDecodeIri(iri: string): boolean {
+  return URL.canParse(iri) || iri.startsWith("at://");
+}
+
+function decodeIri(iri: string): URL {
+  return !URL.canParse(iri) && iri.startsWith("at://")
+    ? new URL("at://" + encodeURIComponent(iri.substring(5)))
+    : new URL(iri);
+}
+`;
+	yield `
 function isValidLanguageTag(language: string): boolean {
   try {
     new Intl.Locale(language);

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.1.24";
+var version = "2.1.26";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -330,13 +330,16 @@ const scalarTypes = {
 			return `${v}.href`;
 		},
 		dataCheck(v) {
-			return `typeof ${v} === "object" && "@value" in ${v}
-        && typeof ${v}["@value"] === "string"
-        && ${v}["@value"] !== "" && ${v}["@value"] !== "/"`;
+			return `typeof ${v} === "object" &&
+      ((typeof ${v}["@id"] === "string" && canDecodeIri(${v}["@id"])) ||
+       (typeof ${v}["@value"] === "string" && canDecodeIri(${v}["@value"])))`;
 		},
 		decoder(v) {
-			return `new URL(${v}["@value"])`;
-		}
+			return `decodeIri(
+        typeof ${v}["@id"] === "string" ? ${v}["@id"] : ${v}["@value"]
+      )`;
+		},
+		skipUnparsable: true
 	},
 	"fedify:publicKey": {
 		name: "CryptoKey",
@@ -518,6 +521,9 @@ function getDecoder(typeUri, types, variable, optionsVariable, baseUrlVariable)
     )`;
 	throw new Error(`Unknown type: ${typeUri}`);
 }
+function skipsUnparsable(typeUri) {
+	return scalarTypes[typeUri]?.skipUnparsable ?? false;
+}
 function getDataCheck(typeUri, types, variable) {
 	if (typeUri in scalarTypes) return scalarTypes[typeUri].dataCheck(variable);
 	if (typeUri in types) {
@@ -1043,15 +1049,22 @@ async function* generateDecoder(typeUri, types) {
 		yield `
       const decoded =
     `;
-		if (property.range.length == 1) yield getDecoder(property.range[0], types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
-		else {
+		const lenient = property.range.length == 1 && skipsUnparsable(property.range[0]);
+		if (property.range.length == 1) {
+			if (lenient) {
+				yield getDataCheck(property.range[0], types, "v");
+				yield " ? ";
+			}
+			yield getDecoder(property.range[0], types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
+			if (lenient) yield " : undefined";
+		} else {
 			const decoders = getDecoders(property.range, types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
 			for (const code of decoders) yield code;
 		}
 		yield `
       ;
     `;
-		if (property.range.length > 1) yield `
+		if (property.range.length > 1 || lenient) yield `
       if (typeof decoded === "undefined") {
         shouldCacheJsonLd = false;
         continue;
@@ -1664,7 +1677,16 @@ async function* generateProperty(type, property, types) {
             ${JSON.stringify(property.compactName)}];
           const doc = Array.isArray(prop) ? prop[0] : prop;
           if (doc != null && typeof doc === "object" && "@context" in doc) {
-            v = await this.#${property.singularName}_fromJsonLd(doc, options);
+            try {
+              v = await this.#${property.singularName}_fromJsonLd(doc, options);
+            } catch (error) {
+              if (!options.suppressError) throw error;
+              getLogger(["fedify", "vocab"]).debug(
+                "Failed to parse embedded value of {property}: {error}",
+                { property: ${JSON.stringify(property.uri)}, error },
+              );
+              return null;
+            }
           }
         }
         `;
@@ -1761,7 +1783,16 @@ async function* generateProperty(type, property, types) {
               ${JSON.stringify(property.compactName)}];
             const obj = Array.isArray(prop) ? prop[i] : prop;
             if (obj != null && typeof obj === "object" && "@context" in obj) {
-              v = await this.#${property.singularName}_fromJsonLd(obj, options);
+              try {
+                v = await this.#${property.singularName}_fromJsonLd(obj, options);
+              } catch (error) {
+                if (!options.suppressError) throw error;
+                getLogger(["fedify", "vocab"]).debug(
+                  "Failed to parse embedded value of {property} at index {index}: {error}",
+                  { property: ${JSON.stringify(property.uri)}, index: i, error },
+                );
+                continue;
+              }
             }
           }
         `;
@@ -1937,6 +1968,17 @@ async function* generateClasses(types) {
     isTemporalInstant,
 } from "@fedify/vocab-runtime/temporal";\n`;
 	yield `
+function canDecodeIri(iri: string): boolean {
+  return URL.canParse(iri) || iri.startsWith("at://");
+}
+
+function decodeIri(iri: string): URL {
+  return !URL.canParse(iri) && iri.startsWith("at://")
+    ? new URL("at://" + encodeURIComponent(iri.substring(5)))
+    : new URL(iri);
+}
+`;
+	yield `
 function isValidLanguageTag(language: string): boolean {
   try {
     new Intl.Locale(language);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "description": "Code generator for Activity Vocabulary APIs",
   "homepage": "https://fedify.dev/",
   "repository": {