@fedify/vocab-tools 2.4.0-dev.2155 → 2.4.0-dev.2159

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0-dev.2155+2ccc5085",
+  "version": "2.4.0-dev.2159+bb072eda",
   "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.2155+2ccc5085";
+var version = "2.4.0-dev.2159+bb072eda";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -318,13 +318,14 @@ const scalarTypes = {
 			return `formatIri(${v})`;
 		},
 		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 `parseIri(${v}["@value"])`;
-		}
+			return `decodeIri(typeof ${v}["@id"] === "string" ? ${v}["@id"] : ${v}["@value"])`;
+		},
+		skipUnparsable: true
 	},
 	"fedify:gatewayUrl": {
 		name: "URL",
@@ -558,6 +559,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) {
@@ -1198,8 +1202,15 @@ async function* generateDecoder(typeUri, types, moduleVarNames) {
 		yield `
       const decoded =
     `;
-		if (property.range.length == 1) yield getDecoder(property.range[0], types, "v", "options", propertyBaseUrl);
-		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", propertyBaseUrl);
+			if (lenient) yield " : undefined";
+		} else {
 			const decoders = getDecoders(property.range, types, "v", "options", propertyBaseUrl);
 			for (const code of decoders) yield code;
 		}
@@ -2041,8 +2052,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           return fetched;
         }
       `;
-			if (property.compactName != null) {
-				yield `
+			if (property.compactName != null) yield `
         if (
           this._cachedJsonLd != null &&
           typeof this._cachedJsonLd === "object" &&
@@ -2053,22 +2063,24 @@ async function* generateProperty(type, property, types, moduleVarNames) {
             ${JSON.stringify(property.compactName)}];
           const doc = Array.isArray(prop) ? prop[0] : prop;
           if (doc != null && typeof doc === "object" && "@context" in doc) {
-      `;
-				yield `
-            v = await this.#${property.singularName}_fromJsonLd(doc, {
-              ...options,
-              // Embedded objects get this object's own default, whether or
-              // not they carry their own @context, as when this object was
-              // parsed:
-              verifyPortableObject: this._verifyPortableObject,
-              baseUrl: ${cachedPropertyBaseUrl},
-            });
-      `;
-				yield `
+            try {
+              v = await this.#${property.singularName}_fromJsonLd(doc, {
+                ...options,
+                // Keep the parent default for embedded objects.
+                verifyPortableObject: this._verifyPortableObject,
+                baseUrl: ${cachedPropertyBaseUrl},
+              });
+            } 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;
+            }
           }
         }
         `;
-			}
 			yield `
         if (v?.id != null &&
             ((${type.trustEmbeddedObjects === false ? "" : "this.id != null && "}!isTrustedIriOrigin(options, v.id, ${trustOwner})) ||
@@ -2197,8 +2209,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
             continue;
           }
       `;
-			if (property.compactName != null) {
-				yield `
+			if (property.compactName != null) yield `
           if (
             this._cachedJsonLd != null &&
             typeof this._cachedJsonLd === "object" &&
@@ -2209,22 +2220,24 @@ async function* generateProperty(type, property, types, moduleVarNames) {
               ${JSON.stringify(property.compactName)}];
             const obj = Array.isArray(prop) ? prop[i] : prop;
             if (obj != null && typeof obj === "object" && "@context" in obj) {
-      `;
-				yield `
-              v = await this.#${property.singularName}_fromJsonLd(obj, {
-                ...options,
-                // Embedded objects get this object's own default, whether or
-                // not they carry their own @context, as when this object was
-                // parsed:
+              try {
+                v = await this.#${property.singularName}_fromJsonLd(obj, {
+                  ...options,
+                // Keep the parent default for embedded objects.
                 verifyPortableObject: this._verifyPortableObject,
-                baseUrl: ${cachedPropertyBaseUrl},
-              });
-      `;
-				yield `
+                  baseUrl: ${cachedPropertyBaseUrl},
+                });
+              } 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;
+              }
             }
           }
         `;
-			}
 			yield `
           if (v?.id != null &&
               ((${type.trustEmbeddedObjects === false ? "" : "this.id != null && "}!isTrustedIriOrigin(options, v.id, ${trustOwner})) ||
@@ -2505,6 +2518,17 @@ async function* generateClasses(types) {
     isTemporalInstant,
 } from "@fedify/vocab-runtime/temporal";\n`;
 	yield `
+function canDecodeIri(iri: string): boolean {
+  try { parseIri(iri); return true; } catch { return iri.startsWith("at://"); }
+}
+
+function decodeIri(iri: string): URL {
+  return !URL.canParse(iri) && iri.startsWith("at://")
+    ? new URL("at://" + encodeURIComponent(iri.substring(5)))
+    : parseIri(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.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2159+bb072eda";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -317,13 +317,14 @@ const scalarTypes = {
 			return `formatIri(${v})`;
 		},
 		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 `parseIri(${v}["@value"])`;
-		}
+			return `decodeIri(typeof ${v}["@id"] === "string" ? ${v}["@id"] : ${v}["@value"])`;
+		},
+		skipUnparsable: true
 	},
 	"fedify:gatewayUrl": {
 		name: "URL",
@@ -557,6 +558,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) {
@@ -1197,8 +1201,15 @@ async function* generateDecoder(typeUri, types, moduleVarNames) {
 		yield `
       const decoded =
     `;
-		if (property.range.length == 1) yield getDecoder(property.range[0], types, "v", "options", propertyBaseUrl);
-		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", propertyBaseUrl);
+			if (lenient) yield " : undefined";
+		} else {
 			const decoders = getDecoders(property.range, types, "v", "options", propertyBaseUrl);
 			for (const code of decoders) yield code;
 		}
@@ -2040,8 +2051,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
           return fetched;
         }
       `;
-			if (property.compactName != null) {
-				yield `
+			if (property.compactName != null) yield `
         if (
           this._cachedJsonLd != null &&
           typeof this._cachedJsonLd === "object" &&
@@ -2052,22 +2062,24 @@ async function* generateProperty(type, property, types, moduleVarNames) {
             ${JSON.stringify(property.compactName)}];
           const doc = Array.isArray(prop) ? prop[0] : prop;
           if (doc != null && typeof doc === "object" && "@context" in doc) {
-      `;
-				yield `
-            v = await this.#${property.singularName}_fromJsonLd(doc, {
-              ...options,
-              // Embedded objects get this object's own default, whether or
-              // not they carry their own @context, as when this object was
-              // parsed:
-              verifyPortableObject: this._verifyPortableObject,
-              baseUrl: ${cachedPropertyBaseUrl},
-            });
-      `;
-				yield `
+            try {
+              v = await this.#${property.singularName}_fromJsonLd(doc, {
+                ...options,
+                // Keep the parent default for embedded objects.
+                verifyPortableObject: this._verifyPortableObject,
+                baseUrl: ${cachedPropertyBaseUrl},
+              });
+            } 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;
+            }
           }
         }
         `;
-			}
 			yield `
         if (v?.id != null &&
             ((${type.trustEmbeddedObjects === false ? "" : "this.id != null && "}!isTrustedIriOrigin(options, v.id, ${trustOwner})) ||
@@ -2196,8 +2208,7 @@ async function* generateProperty(type, property, types, moduleVarNames) {
             continue;
           }
       `;
-			if (property.compactName != null) {
-				yield `
+			if (property.compactName != null) yield `
           if (
             this._cachedJsonLd != null &&
             typeof this._cachedJsonLd === "object" &&
@@ -2208,22 +2219,24 @@ async function* generateProperty(type, property, types, moduleVarNames) {
               ${JSON.stringify(property.compactName)}];
             const obj = Array.isArray(prop) ? prop[i] : prop;
             if (obj != null && typeof obj === "object" && "@context" in obj) {
-      `;
-				yield `
-              v = await this.#${property.singularName}_fromJsonLd(obj, {
-                ...options,
-                // Embedded objects get this object's own default, whether or
-                // not they carry their own @context, as when this object was
-                // parsed:
+              try {
+                v = await this.#${property.singularName}_fromJsonLd(obj, {
+                  ...options,
+                // Keep the parent default for embedded objects.
                 verifyPortableObject: this._verifyPortableObject,
-                baseUrl: ${cachedPropertyBaseUrl},
-              });
-      `;
-				yield `
+                  baseUrl: ${cachedPropertyBaseUrl},
+                });
+              } 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;
+              }
             }
           }
         `;
-			}
 			yield `
           if (v?.id != null &&
               ((${type.trustEmbeddedObjects === false ? "" : "this.id != null && "}!isTrustedIriOrigin(options, v.id, ${trustOwner})) ||
@@ -2504,6 +2517,17 @@ async function* generateClasses(types) {
     isTemporalInstant,
 } from "@fedify/vocab-runtime/temporal";\n`;
 	yield `
+function canDecodeIri(iri: string): boolean {
+  try { parseIri(iri); return true; } catch { return iri.startsWith("at://"); }
+}
+
+function decodeIri(iri: string): URL {
+  return !URL.canParse(iri) && iri.startsWith("at://")
+    ? new URL("at://" + encodeURIComponent(iri.substring(5)))
+    : parseIri(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.4.0-dev.2155+2ccc5085",
+  "version": "2.4.0-dev.2159+bb072eda",
   "description": "Code generator for Activity Vocabulary APIs",
   "homepage": "https://fedify.dev/",
   "repository": {