@fedify/vocab-tools 2.1.16 → 2.1.18

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "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.16";
+var version = "2.1.18";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -199,7 +199,8 @@ const scalarTypes = {
 		dataCheck(v) {
 			return `typeof ${v} === "object" && "@language" in ${v} && "@value" in ${v}
         && typeof ${v}["@language"] === "string"
-        && typeof ${v}["@value"] === "string"`;
+        && typeof ${v}["@value"] === "string"
+        && isValidLanguageTag(${v}["@language"])`;
 		},
 		decoder(v) {
 			return `new LanguageString(${v}["@value"], ${v}["@language"])`;
@@ -1004,6 +1005,9 @@ async function* generateDecoder(typeUri, types) {
       throw new TypeError("Unexpected type: " + instance.constructor.name);
     }
     `;
+	yield `
+    let shouldCacheJsonLd = instance._shouldCacheJsonLd;
+  `;
 	for (const property of type.properties) {
 		const variable = await getFieldName(property.uri, "");
 		yield await generateField(property, types, "const ");
@@ -1037,26 +1041,40 @@ async function* generateDecoder(typeUri, types) {
         continue;
       }
       `;
-		if (property.range.length == 1) yield `${variable}.push(${getDecoder(property.range[0], types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`)})`;
-		else {
-			yield `
+		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 decoders = getDecoders(property.range, types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
 			for (const code of decoders) yield code;
-			yield `
+		}
+		yield `
       ;
-      if (typeof decoded === "undefined") continue;
-      ${variable}.push(decoded);
+    `;
+		if (property.range.length > 1) yield `
+      if (typeof decoded === "undefined") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
       `;
-		}
+		yield `
+      if (!this._shouldCacheDecodedJsonLd(decoded)) {
+        shouldCacheJsonLd = false;
+      }
+      ${variable}.push(decoded);
+    `;
 		yield `
     }
     instance.${await getFieldName(property.uri)} = ${variable};
     `;
 	}
 	yield `
-    if (!("_fromSubclass" in options) || !options._fromSubclass) {
+    instance._shouldCacheJsonLd = shouldCacheJsonLd;
+    if (
+      shouldCacheJsonLd &&
+      (!("_fromSubclass" in options) || !options._fromSubclass)
+    ) {
       try {
         instance._cachedJsonLd = structuredClone(json);
       } catch {
@@ -1823,6 +1841,7 @@ async function* generateClass(typeUri, types) {
       values?: Record<string, unknown>;
     };
     #cachedJsonLd?: unknown;
+    #shouldCacheJsonLd = true;
     readonly id: URL | null;
 
     protected get _documentLoader(): DocumentLoader | undefined {
@@ -1852,6 +1871,20 @@ async function* generateClass(typeUri, types) {
     protected set _cachedJsonLd(value: unknown | undefined) {
       this.#cachedJsonLd = value;
     }
+
+    protected get _shouldCacheJsonLd(): boolean {
+      return this.#shouldCacheJsonLd;
+    }
+
+    protected set _shouldCacheJsonLd(value: boolean) {
+      this.#shouldCacheJsonLd = value;
+    }
+
+    protected static _shouldCacheDecodedJsonLd(value: unknown): boolean {
+      if (value == null || typeof value !== "object") return true;
+      if (!("_shouldCacheJsonLd" in value)) return true;
+      return (value as { _shouldCacheJsonLd: boolean })._shouldCacheJsonLd;
+    }
     `;
 	yield `
     /**
@@ -1904,6 +1937,17 @@ async function* generateClasses(types) {
     isTemporalDuration,
     isTemporalInstant,
 } from "@fedify/vocab-runtime/temporal";\n`;
+	yield `
+function isValidLanguageTag(language: string): boolean {
+  try {
+    new Intl.Locale(language);
+    return true;
+  } catch (error) {
+    if (error instanceof RangeError) return false;
+    throw error;
+  }
+}
+`;
 	yield "\n\n";
 	const sorted = sortTopologically(types);
 	for (const typeUri of sorted) for await (const code of generateClass(typeUri, types)) yield code;

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.16";
+var version = "2.1.18";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -198,7 +198,8 @@ const scalarTypes = {
 		dataCheck(v) {
 			return `typeof ${v} === "object" && "@language" in ${v} && "@value" in ${v}
         && typeof ${v}["@language"] === "string"
-        && typeof ${v}["@value"] === "string"`;
+        && typeof ${v}["@value"] === "string"
+        && isValidLanguageTag(${v}["@language"])`;
 		},
 		decoder(v) {
 			return `new LanguageString(${v}["@value"], ${v}["@language"])`;
@@ -1003,6 +1004,9 @@ async function* generateDecoder(typeUri, types) {
       throw new TypeError("Unexpected type: " + instance.constructor.name);
     }
     `;
+	yield `
+    let shouldCacheJsonLd = instance._shouldCacheJsonLd;
+  `;
 	for (const property of type.properties) {
 		const variable = await getFieldName(property.uri, "");
 		yield await generateField(property, types, "const ");
@@ -1036,26 +1040,40 @@ async function* generateDecoder(typeUri, types) {
         continue;
       }
       `;
-		if (property.range.length == 1) yield `${variable}.push(${getDecoder(property.range[0], types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`)})`;
-		else {
-			yield `
+		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 decoders = getDecoders(property.range, types, "v", "options", `(values["@id"] == null ? options.baseUrl : new URL(values["@id"]))`);
 			for (const code of decoders) yield code;
-			yield `
+		}
+		yield `
       ;
-      if (typeof decoded === "undefined") continue;
-      ${variable}.push(decoded);
+    `;
+		if (property.range.length > 1) yield `
+      if (typeof decoded === "undefined") {
+        shouldCacheJsonLd = false;
+        continue;
+      }
       `;
-		}
+		yield `
+      if (!this._shouldCacheDecodedJsonLd(decoded)) {
+        shouldCacheJsonLd = false;
+      }
+      ${variable}.push(decoded);
+    `;
 		yield `
     }
     instance.${await getFieldName(property.uri)} = ${variable};
     `;
 	}
 	yield `
-    if (!("_fromSubclass" in options) || !options._fromSubclass) {
+    instance._shouldCacheJsonLd = shouldCacheJsonLd;
+    if (
+      shouldCacheJsonLd &&
+      (!("_fromSubclass" in options) || !options._fromSubclass)
+    ) {
       try {
         instance._cachedJsonLd = structuredClone(json);
       } catch {
@@ -1822,6 +1840,7 @@ async function* generateClass(typeUri, types) {
       values?: Record<string, unknown>;
     };
     #cachedJsonLd?: unknown;
+    #shouldCacheJsonLd = true;
     readonly id: URL | null;
 
     protected get _documentLoader(): DocumentLoader | undefined {
@@ -1851,6 +1870,20 @@ async function* generateClass(typeUri, types) {
     protected set _cachedJsonLd(value: unknown | undefined) {
       this.#cachedJsonLd = value;
     }
+
+    protected get _shouldCacheJsonLd(): boolean {
+      return this.#shouldCacheJsonLd;
+    }
+
+    protected set _shouldCacheJsonLd(value: boolean) {
+      this.#shouldCacheJsonLd = value;
+    }
+
+    protected static _shouldCacheDecodedJsonLd(value: unknown): boolean {
+      if (value == null || typeof value !== "object") return true;
+      if (!("_shouldCacheJsonLd" in value)) return true;
+      return (value as { _shouldCacheJsonLd: boolean })._shouldCacheJsonLd;
+    }
     `;
 	yield `
     /**
@@ -1903,6 +1936,17 @@ async function* generateClasses(types) {
     isTemporalDuration,
     isTemporalInstant,
 } from "@fedify/vocab-runtime/temporal";\n`;
+	yield `
+function isValidLanguageTag(language: string): boolean {
+  try {
+    new Intl.Locale(language);
+    return true;
+  } catch (error) {
+    if (error instanceof RangeError) return false;
+    throw error;
+  }
+}
+`;
 	yield "\n\n";
 	const sorted = sortTopologically(types);
 	for (const typeUri of sorted) for await (const code of generateClass(typeUri, types)) yield code;

package/package.json

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