@fedify/vocab-tools 2.0.29-dev.2062 → 2.0.29-dev.2068

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.0.29-dev.2062+34489455",
+  "version": "2.0.29-dev.2068+bb645217",
   "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.0.29-dev.2062+34489455";
+var version = "2.0.29-dev.2068+bb645217";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -307,13 +307,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",
@@ -495,6 +498,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) {
@@ -1000,15 +1006,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;
@@ -1888,6 +1901,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.0.29-dev.2062+34489455";
+var version = "2.0.29-dev.2068+bb645217";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -306,13 +306,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",
@@ -494,6 +497,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) {
@@ -999,15 +1005,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;
@@ -1887,6 +1900,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.0.29-dev.2062+34489455",
+  "version": "2.0.29-dev.2068+bb645217",
   "description": "Code generator for Activity Vocabulary APIs",
   "homepage": "https://fedify.dev/",
   "repository": {

package/src/__snapshots__/class.test.ts.deno.snap

@@ -23,6 +23,16 @@ import {
     isTemporalInstant,
 } from \\"@fedify/vocab-runtime/temporal\\";
 
+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);
+}
+
 function isValidLanguageTag(language: string): boolean {
   try {
     new Intl.Locale(language);
@@ -12236,9 +12246,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -29346,9 +29365,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -52519,9 +52547,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -71062,9 +71099,18 @@ instruments?: (Object | URL)[];exclusiveOptions?: (Object | URL)[];inclusiveOpti
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }

package/src/__snapshots__/class.test.ts.node.snap

@@ -21,6 +21,16 @@ import {
     isTemporalInstant,
 } from \\"@fedify/vocab-runtime/temporal\\";
 
+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);
+}
+
 function isValidLanguageTag(language: string): boolean {
   try {
     new Intl.Locale(language);
@@ -12234,9 +12244,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -29344,9 +29363,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -52517,9 +52545,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -71060,9 +71097,18 @@ instruments?: (Object | URL)[];exclusiveOptions?: (Object | URL)[];inclusiveOpti
       if (v == null) continue;
     
       const decoded =
-    new URL(v[\\"@value\\"])
+    typeof v === \\"object\\" &&
+      ((typeof v[\\"@id\\"] === \\"string\\" && canDecodeIri(v[\\"@id\\"])) ||
+       (typeof v[\\"@value\\"] === \\"string\\" && canDecodeIri(v[\\"@value\\"]))) ? decodeIri(
+        typeof v[\\"@id\\"] === \\"string\\" ? v[\\"@id\\"] : v[\\"@value\\"]
+      ) : undefined
       ;
     
+      if (typeof decoded === \\"undefined\\") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }

package/src/__snapshots__/class.test.ts.snap

@@ -23,6 +23,16 @@ import {
     isTemporalInstant,
 } from "@fedify/vocab-runtime/temporal";
 
+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);
+}
+
 function isValidLanguageTag(language: string): boolean {
   try {
     new Intl.Locale(language);
@@ -12236,9 +12246,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v["@value"])
+    typeof v === "object" &&
+      ((typeof v["@id"] === "string" && canDecodeIri(v["@id"])) ||
+       (typeof v["@value"] === "string" && canDecodeIri(v["@value"]))) ? decodeIri(
+        typeof v["@id"] === "string" ? v["@id"] : v["@value"]
+      ) : undefined
       ;
     
+      if (typeof decoded === "undefined") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -29346,9 +29365,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v["@value"])
+    typeof v === "object" &&
+      ((typeof v["@id"] === "string" && canDecodeIri(v["@id"])) ||
+       (typeof v["@value"] === "string" && canDecodeIri(v["@value"]))) ? decodeIri(
+        typeof v["@id"] === "string" ? v["@id"] : v["@value"]
+      ) : undefined
       ;
     
+      if (typeof decoded === "undefined") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -52519,9 +52547,18 @@ proofs?: (DataIntegrityProof | URL)[];quoteUrl?: URL | null;}
       if (v == null) continue;
     
       const decoded =
-    new URL(v["@value"])
+    typeof v === "object" &&
+      ((typeof v["@id"] === "string" && canDecodeIri(v["@id"])) ||
+       (typeof v["@value"] === "string" && canDecodeIri(v["@value"]))) ? decodeIri(
+        typeof v["@id"] === "string" ? v["@id"] : v["@value"]
+      ) : undefined
       ;
     
+      if (typeof decoded === "undefined") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }
@@ -71062,9 +71099,18 @@ instruments?: (Object | URL)[];exclusiveOptions?: (Object | URL)[];inclusiveOpti
       if (v == null) continue;
     
       const decoded =
-    new URL(v["@value"])
+    typeof v === "object" &&
+      ((typeof v["@id"] === "string" && canDecodeIri(v["@id"])) ||
+       (typeof v["@value"] === "string" && canDecodeIri(v["@value"]))) ? decodeIri(
+        typeof v["@id"] === "string" ? v["@id"] : v["@value"]
+      ) : undefined
       ;
     
+      if (typeof decoded === "undefined") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
+      
       if (!this._shouldCacheDecodedJsonLd(decoded)) {
         shouldCacheJsonLd = false;
       }

package/src/class.ts

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

@@ -6,11 +6,13 @@ import {
   areAllScalarTypes,
   emitOverride,
   getAllProperties,
+  getDataCheck,
   getDecoder,
   getDecoders,
   getEncoders,
   getSubtypes,
   isCompactableType,
+  skipsUnparsable,
 } from "./type.ts";
 
 export async function* generateEncoder(
@@ -441,7 +443,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,
@@ -449,6 +457,7 @@ export async function* generateDecoder(
         "options",
         `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`,
       );
+      if (lenient) yield " : undefined";
     } else {
       const decoders = getDecoders(
         property.range,
@@ -462,7 +471,7 @@ export async function* generateDecoder(
     yield `
       ;
     `;
-    if (property.range.length > 1) {
+    if (property.range.length > 1 || lenient) {
       yield `
       if (typeof decoded === "undefined") {
         shouldCacheJsonLd = false;

package/src/type.ts

@@ -17,6 +17,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> = {
@@ -308,13 +314,16 @@ const scalarTypes: Record<string, ScalarType> = {
       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",
@@ -595,6 +604,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>,