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

package/src/class.ts

@@ -304,6 +304,17 @@ export async function* generateClasses(
     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/src/codec.ts

@@ -6,12 +6,14 @@ import {
   areAllScalarTypes,
   emitOverride,
   getAllProperties,
+  getDataCheck,
   getDecoder,
   getDecoders,
   getEncoders,
   getSubtypes,
   getTypeNames,
   isCompactableType,
+  skipsUnparsable,
 } from "./type.ts";
 
 function* generatePreprocessorBlock(
@@ -591,7 +593,13 @@ export async function* generateDecoder(
     yield `
       const decoded =
     `;
+    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,
@@ -599,6 +607,7 @@ export async function* generateDecoder(
         "options",
         propertyBaseUrl,
       );
+      if (lenient) yield " : undefined";
     } else {
       const decoders = getDecoders(
         property.range,

package/src/property.ts

@@ -477,18 +477,21 @@ async function* generateProperty(
             ${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;
+            }
           }
         }
         `;
@@ -647,18 +650,23 @@ async function* generateProperty(
               ${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;
+              }
             }
           }
         `;

package/src/type.ts

@@ -19,6 +19,12 @@ interface ScalarType {
   compactEncoder?: (variable: string) => string;
   dataCheck(variable: string): string;
   decoder(variable: string, baseUrlVar: string): string;
+  /**
+   * Whether a value that fails `dataCheck()` should be skipped instead of
+   * being handed to `decoder()`.  Set this for types decoded from untrusted
+   * remote input, where one malformed value must not fail the whole object.
+   */
+  skipUnparsable?: boolean;
 }
 
 const scalarTypes: Record<string, ScalarType> = {
@@ -319,13 +325,14 @@ const scalarTypes: Record<string, ScalarType> = {
       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",
@@ -658,6 +665,10 @@ export function getDecoder(
   throw new Error(`Unknown type: ${typeUri}`);
 }
 
+export function skipsUnparsable(typeUri: string): boolean {
+  return scalarTypes[typeUri]?.skipUnparsable ?? false;
+}
+
 export function getDataCheck(
   typeUri: string,
   types: Record<string, TypeSchema>,