@fedify/vocab-tools 2.4.0 → 2.4.1

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "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";
+var version = "2.4.1";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -303,7 +303,7 @@ const scalarTypes = {
         && typeof ${v}["@value"] === "string" && !("@language" in ${v})`;
 		},
 		decoder(v) {
-			return `new Intl.Locale(${v}["@value"])`;
+			return `new Intl.Locale(normalizeLanguageTag(${v}["@value"]))`;
 		}
 	},
 	"fedify:url": {
@@ -1383,7 +1383,7 @@ async function* generateConstructor(typeUri, types) {
           if (Array.isArray(values.${property.pluralName}) &&
               values.${property.pluralName}.every(v => ${typeGuards})) {
             // @ts-ignore: type is checked above.
-            this.${fieldName} = values.${property.pluralName};
+            this.${fieldName} = values.${property.pluralName}.slice();
       `;
 			if (!allScalarTypes) yield `
             for (let i = 0; i < values.${property.pluralName}.length; i++) {
@@ -1417,7 +1417,8 @@ async function* generateCloner(typeUri, types) {
    *
    * @param values The values to update the clone with.
    * @param options The options to use for cloning.
-   * @returns The cloned instance.
+   * @returns The cloned instance with its own property arrays.  Nested objects
+   *          and URLs are shared with this instance.
    */
   ${emitOverride$1(typeUri, types)} clone(
     values:
@@ -1453,7 +1454,7 @@ async function* generateCloner(typeUri, types) {
 		const fieldName = await getFieldName(property.uri);
 		const trustFieldName = await getFieldName(property.uri, "#_trust");
 		const allScalarTypes = areAllScalarTypes(property.range, types);
-		yield `clone.${fieldName} = this.${fieldName};`;
+		yield `clone.${fieldName} = this.${fieldName}.slice();`;
 		if (!allScalarTypes) yield `clone.${trustFieldName} = new Set(this.${trustFieldName});`;
 		if (hasSingularAccessor(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `values.${property.singularName}`);
@@ -1504,7 +1505,7 @@ async function* generateCloner(typeUri, types) {
           if (Array.isArray(values.${property.pluralName}) &&
               values.${property.pluralName}.every(v => ${typeGuards})) {
             // @ts-ignore: type is checked above.
-            clone.${fieldName} = values.${property.pluralName};
+            clone.${fieldName} = values.${property.pluralName}.slice();
       `;
 			if (!allScalarTypes) yield `
             clone.${trustFieldName} = new Set();
@@ -2336,6 +2337,7 @@ const RUNTIME_IMPORTS = [
 	"isDecimal",
 	"isGatewayUrl",
 	"LanguageString",
+	"normalizeLanguageTag",
 	"parseDecimal",
 	"parseGatewayUrl",
 	"parseIri",
@@ -2548,7 +2550,7 @@ function inspectIri(iri: URL): string {
 	yield `
 function isValidLanguageTag(language: string): boolean {
   try {
-    new Intl.Locale(language);
+    new Intl.Locale(normalizeLanguageTag(language));
     return true;
   } catch (error) {
     if (error instanceof RangeError) return false;

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";
+var version = "2.4.1";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -302,7 +302,7 @@ const scalarTypes = {
         && typeof ${v}["@value"] === "string" && !("@language" in ${v})`;
 		},
 		decoder(v) {
-			return `new Intl.Locale(${v}["@value"])`;
+			return `new Intl.Locale(normalizeLanguageTag(${v}["@value"]))`;
 		}
 	},
 	"fedify:url": {
@@ -1382,7 +1382,7 @@ async function* generateConstructor(typeUri, types) {
           if (Array.isArray(values.${property.pluralName}) &&
               values.${property.pluralName}.every(v => ${typeGuards})) {
             // @ts-ignore: type is checked above.
-            this.${fieldName} = values.${property.pluralName};
+            this.${fieldName} = values.${property.pluralName}.slice();
       `;
 			if (!allScalarTypes) yield `
             for (let i = 0; i < values.${property.pluralName}.length; i++) {
@@ -1416,7 +1416,8 @@ async function* generateCloner(typeUri, types) {
    *
    * @param values The values to update the clone with.
    * @param options The options to use for cloning.
-   * @returns The cloned instance.
+   * @returns The cloned instance with its own property arrays.  Nested objects
+   *          and URLs are shared with this instance.
    */
   ${emitOverride$1(typeUri, types)} clone(
     values:
@@ -1452,7 +1453,7 @@ async function* generateCloner(typeUri, types) {
 		const fieldName = await getFieldName(property.uri);
 		const trustFieldName = await getFieldName(property.uri, "#_trust");
 		const allScalarTypes = areAllScalarTypes(property.range, types);
-		yield `clone.${fieldName} = this.${fieldName};`;
+		yield `clone.${fieldName} = this.${fieldName}.slice();`;
 		if (!allScalarTypes) yield `clone.${trustFieldName} = new Set(this.${trustFieldName});`;
 		if (hasSingularAccessor(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `values.${property.singularName}`);
@@ -1503,7 +1504,7 @@ async function* generateCloner(typeUri, types) {
           if (Array.isArray(values.${property.pluralName}) &&
               values.${property.pluralName}.every(v => ${typeGuards})) {
             // @ts-ignore: type is checked above.
-            clone.${fieldName} = values.${property.pluralName};
+            clone.${fieldName} = values.${property.pluralName}.slice();
       `;
 			if (!allScalarTypes) yield `
             clone.${trustFieldName} = new Set();
@@ -2335,6 +2336,7 @@ const RUNTIME_IMPORTS = [
 	"isDecimal",
 	"isGatewayUrl",
 	"LanguageString",
+	"normalizeLanguageTag",
 	"parseDecimal",
 	"parseGatewayUrl",
 	"parseIri",
@@ -2547,7 +2549,7 @@ function inspectIri(iri: URL): string {
 	yield `
 function isValidLanguageTag(language: string): boolean {
   try {
-    new Intl.Locale(language);
+    new Intl.Locale(normalizeLanguageTag(language));
     return true;
   } catch (error) {
     if (error instanceof RangeError) return false;

package/package.json

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