@fedify/vocab-tools 2.0.7 → 2.0.9

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/mod.cjs

@@ -1,70 +1,14 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-const node_fs_promises = __toESM(require("node:fs/promises"));
-const byte_encodings_base58 = __toESM(require("byte-encodings/base58"));
-const __cfworker_json_schema = __toESM(require("@cfworker/json-schema"));
-const node_path = __toESM(require("node:path"));
-const node_url = __toESM(require("node:url"));
-const yaml = __toESM(require("yaml"));
-const es_toolkit = __toESM(require("es-toolkit"));
-
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let node_fs_promises = require("node:fs/promises");
+let byte_encodings_base58 = require("byte-encodings/base58");
+let _cfworker_json_schema = require("@cfworker/json-schema");
+let node_path = require("node:path");
+let node_url = require("node:url");
+let yaml = require("yaml");
+let es_toolkit = require("es-toolkit");
 //#region deno.json
 var name = "@fedify/vocab-tools";
-var version = "2.0.7";
-var license = "MIT";
-var exports$1 = { ".": "./src/mod.ts" };
-var author = {
-	"name": "Hong Minhee",
-	"email": "hong@minhee.org",
-	"url": "https://hongminhee.org/"
-};
-var imports = {
-	"@cfworker/json-schema": "npm:@cfworker/json-schema@^4.1.1",
-	"yaml": "npm:yaml@^2.8.1"
-};
-var exclude = [
-	"dist",
-	"node_modules",
-	"src/schema.yaml"
-];
-var publish = { "exclude": ["**/*.test.ts", "tsdown.config.ts"] };
-var tasks = {
-	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"test": "deno test -A"
-};
-var deno_default = {
-	name,
-	version,
-	license,
-	exports: exports$1,
-	author,
-	imports,
-	exclude,
-	publish,
-	tasks
-};
-
+var version = "2.0.9";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -474,7 +418,7 @@ function getTypeNames(typeUris, types, parentheses = false) {
 	if (typeUris.length < 1) return "never";
 	else if (typeUris.length === 1) return getTypeName(typeUris[0], types);
 	let typeNames = typeUris.map((typeUri) => getTypeName(typeUri, types));
-	typeNames = typeNames.filter((t$1, i) => typeNames.indexOf(t$1) === i);
+	typeNames = typeNames.filter((t, i) => typeNames.indexOf(t) === i);
 	const t = typeNames.join(" | ");
 	return parentheses && typeNames.length > 1 ? `(${t})` : t;
 }
@@ -499,10 +443,7 @@ function isCompactableType(typeUri, types) {
 }
 function getSubtypes(typeUri, types, excludeSelf = false) {
 	const subtypes = excludeSelf ? [] : [typeUri];
-	for (const uri in types) {
-		const type = types[uri];
-		if (type.extends === typeUri) subtypes.push(...getSubtypes(uri, types));
-	}
+	for (const uri in types) if (types[uri].extends === typeUri) subtypes.push(...getSubtypes(uri, types));
 	return subtypes.filter((t, i) => subtypes.indexOf(t) === i);
 }
 function getSupertypes(typeUri, types, excludeSelf = false) {
@@ -572,11 +513,10 @@ function* getDecoders(typeUris, types, variable, optionsVariable, baseUrlVariabl
 	}
 	yield "undefined";
 }
-function emitOverride(typeUri, types) {
+function emitOverride$1(typeUri, types) {
 	if (types[typeUri].extends == null) return "";
 	return "override";
 }
-
 //#endregion
 //#region src/field.ts
 async function getFieldName(propertyUri, prefix = "#") {
@@ -588,20 +528,15 @@ async function getFieldName(propertyUri, prefix = "#") {
 async function generateField(property, types, prefix = "#") {
 	const fieldName = await getFieldName(property.uri, prefix);
 	if (areAllScalarTypes(property.range, types)) return `${fieldName}: (${getTypeNames(property.range, types, true)})[] = [];\n`;
-	else {
-		const typeNames = getTypeNames(property.range, types);
-		const trustFieldName = await getFieldName(property.uri, `${prefix}_trust`);
-		return `
-      ${fieldName}: (${typeNames} | URL)[] = [];
-      ${trustFieldName}: Set<number> = new Set();
+	else return `
+      ${fieldName}: (${getTypeNames(property.range, types)} | URL)[] = [];
+      ${await getFieldName(property.uri, `${prefix}_trust`)}: Set<number> = new Set();
     `;
-	}
 }
 async function* generateFields(typeUri, types) {
 	const type = types[typeUri];
 	for (const property of type.properties) yield await generateField(property, types);
 }
-
 //#endregion
 //#region src/fs.ts
 /**
@@ -616,7 +551,6 @@ async function* readDirRecursive(dir) {
 		for await (const subentry of readDirRecursive(path)) yield (0, node_path.join)(entry.name, subentry);
 	} else yield entry.name;
 }
-
 //#endregion
 //#region src/schema.ts
 /**
@@ -654,17 +588,13 @@ async function loadSchemaValidator() {
 	const thisFile = require("url").pathToFileURL(__filename).href;
 	const schemaFile = new URL(node_path.posix.join(node_path.posix.dirname(thisFile), "schema.yaml"));
 	let content;
-	if (schemaFile.protocol !== "file:") {
-		const response = await fetch(schemaFile);
-		content = await response.text();
-	} else content = await (0, node_fs_promises.readFile)((0, node_url.fileURLToPath)(schemaFile), { encoding: "utf-8" });
-	const schemaObject = (0, yaml.parse)(content);
-	return new __cfworker_json_schema.Validator(schemaObject);
+	if (schemaFile.protocol !== "file:") content = await (await fetch(schemaFile)).text();
+	else content = await (0, node_fs_promises.readFile)((0, node_url.fileURLToPath)(schemaFile), { encoding: "utf-8" });
+	return new _cfworker_json_schema.Validator((0, yaml.parse)(content));
 }
 let schemaValidator = void 0;
 async function loadSchema(path) {
-	const content = await (0, node_fs_promises.readFile)(path, { encoding: "utf-8" });
-	const schema = (0, yaml.parse)(content);
+	const schema = (0, yaml.parse)(await (0, node_fs_promises.readFile)(path, { encoding: "utf-8" }));
 	if (schemaValidator == null) schemaValidator = await loadSchemaValidator();
 	const result = schemaValidator.validate(schema);
 	const errors = [];
@@ -704,7 +634,6 @@ async function loadSchemaFiles(dir) {
 	entries.sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
 	return Object.fromEntries(entries);
 }
-
 //#endregion
 //#region src/codec.ts
 async function* generateEncoder(typeUri, types) {
@@ -720,7 +649,7 @@ async function* generateEncoder(typeUri, types) {
                       when \`format\` is set to \`'expand'\`.
    * @returns The JSON-LD representation of this object.
    */
-  ${emitOverride(typeUri, types)} async toJsonLd(options: {
+  ${emitOverride$1(typeUri, types)} async toJsonLd(options: {
     format?: "compact" | "expand",
     contextLoader?: DocumentLoader,
     context?: string | Record<string, string> | (string | Record<string, string>)[],
@@ -894,7 +823,7 @@ async function* generateEncoder(typeUri, types) {
     return compacted;
   }
 
-  protected ${emitOverride(typeUri, types)} isCompactable(): boolean {
+  protected ${emitOverride$1(typeUri, types)} isCompactable(): boolean {
 `;
 	for (const property of type.properties) if (!property.range.every((r) => isCompactableType(r, types))) yield `
       if (
@@ -921,7 +850,7 @@ async function* generateDecoder(typeUri, types) {
    * @returns The object of this type.
    * @throws {TypeError} If the given \`json\` is invalid.
    */
-  static ${emitOverride(typeUri, types)} async fromJsonLd(
+  static ${emitOverride$1(typeUri, types)} async fromJsonLd(
     json: unknown,
     options: {
       documentLoader?: DocumentLoader,
@@ -932,8 +861,8 @@ async function* generateDecoder(typeUri, types) {
   ): Promise<${type.name}> {
     const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
     const tracer = tracerProvider.getTracer(
-      ${JSON.stringify(deno_default.name)},
-      ${JSON.stringify(deno_default.version)},
+      ${JSON.stringify(name)},
+      ${JSON.stringify(version)},
     );
     return await tracer.startActiveSpan(
       "activitypub.parse_object",
@@ -1097,7 +1026,6 @@ async function* generateDecoder(typeUri, types) {
   }
   `;
 }
-
 //#endregion
 //#region src/constructor.ts
 function generateParameterType(property, types) {
@@ -1166,8 +1094,7 @@ async function* generateConstructor(typeUri, types) {
 		if (hasSingularAccessor(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `values.${property.singularName}`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || values.${property.singularName} instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1192,8 +1119,7 @@ async function* generateConstructor(typeUri, types) {
 		if (isNonFunctionalProperty(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `v`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || v instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1243,7 +1169,7 @@ async function* generateCloner(typeUri, types) {
    * @param options The options to use for cloning.
    * @returns The cloned instance.
    */
-  ${emitOverride(typeUri, types)} clone(
+  ${emitOverride$1(typeUri, types)} clone(
     values:
   `;
 	for await (const code of generateParametersType(typeUri, types)) yield code;
@@ -1280,8 +1206,7 @@ async function* generateCloner(typeUri, types) {
 		if (hasSingularAccessor(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `values.${property.singularName}`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || values.${property.singularName} instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1306,8 +1231,7 @@ async function* generateCloner(typeUri, types) {
 		if (isNonFunctionalProperty(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `v`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || v instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1352,13 +1276,12 @@ async function* generateCloner(typeUri, types) {
   }
   `;
 }
-
 //#endregion
 //#region src/inspector.ts
 async function* generateInspector(typeUri, types) {
 	const type = types[typeUri];
 	yield `
-  protected ${emitOverride(typeUri, types)} _getCustomInspectProxy(): Record<string, unknown> {
+  protected ${emitOverride$1(typeUri, types)} _getCustomInspectProxy(): Record<string, unknown> {
   `;
 	if (type.extends == null) yield `
     const proxy: Record<string, unknown> = {};
@@ -1450,12 +1373,10 @@ async function* generateInspectorPostClass(typeUri, types) {
   };
   `;
 }
-
 //#endregion
 //#region src/property.ts
-function emitOverride$1(typeUri, types, property) {
-	const type = types[typeUri];
-	let supertypeUri = type.extends;
+function emitOverride(typeUri, types, property) {
+	let supertypeUri = types[typeUri].extends;
 	while (supertypeUri != null) {
 		const st = types[supertypeUri];
 		if (st.properties.find((p) => p.singularName === property.singularName)) return "override";
@@ -1464,7 +1385,7 @@ function emitOverride$1(typeUri, types, property) {
 	return "";
 }
 async function* generateProperty(type, property, types) {
-	const override = emitOverride$1(type.uri, types, property);
+	const override = emitOverride(type.uri, types, property);
 	const doc = `\n/** ${property.description.replaceAll("\n", "\n * ")}\n */\n`;
 	if (areAllScalarTypes(property.range, types)) {
 		if (hasSingularAccessor(property)) {
@@ -1507,8 +1428,8 @@ async function* generateProperty(type, property, types) {
       const tracerProvider = options.tracerProvider ??
         this._tracerProvider ?? trace.getTracerProvider();
       const tracer = tracerProvider.getTracer(
-        ${JSON.stringify(deno_default.name)},
-        ${JSON.stringify(deno_default.version)},
+        ${JSON.stringify(name)},
+        ${JSON.stringify(version)},
       );
       return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
         let fetchResult: RemoteDocument;
@@ -1600,10 +1521,9 @@ async function* generateProperty(type, property, types) {
     `;
 		for (const range of property.range) {
 			if (!(range in types)) continue;
-			const rangeType = types[range];
 			yield `
         try {
-          return await ${rangeType.name}.fromJsonLd(
+          return await ${types[range].name}.fromJsonLd(
             jsonLd,
             { documentLoader, contextLoader, tracerProvider, baseUrl },
           );
@@ -1818,7 +1738,6 @@ async function* generateProperties(typeUri, types) {
 	const type = types[typeUri];
 	for (const property of type.properties) yield* generateProperty(type, property, types);
 }
-
 //#endregion
 //#region src/class.ts
 /**
@@ -1894,7 +1813,7 @@ async function* generateClass(typeUri, types) {
     /**
      * The type URI of {@link ${type.name}}: \`${typeUri}\`.
      */
-    static ${emitOverride(typeUri, types)} get typeId(): URL {
+    static ${emitOverride$1(typeUri, types)} get typeId(): URL {
       return new URL(${JSON.stringify(typeUri)});
     }
   `;
@@ -1935,7 +1854,6 @@ async function* generateClasses(types) {
 	const sorted = sortTopologically(types);
 	for (const typeUri of sorted) for await (const code of generateClass(typeUri, types)) yield code;
 }
-
 //#endregion
 //#region src/generate.ts
 async function generateVocab(schemaDir, generatedPath) {
@@ -1950,8 +1868,7 @@ async function generateVocab(schemaDir, generatedPath) {
 		writer.end();
 	});
 }
-
 //#endregion
 exports.areAllScalarTypes = areAllScalarTypes;
 exports.generateVocab = generateVocab;
-exports.loadSchemaFiles = loadSchemaFiles;
+exports.loadSchemaFiles = loadSchemaFiles;

package/dist/mod.d.cts

@@ -174,7 +174,6 @@ type TermDefinition = Uri | Record<string, Uri | "@id">;
 /**
 * Type guard to check if a property is not functional (has pluralName).
 */
-
 /**
 * Loads all schema files in the directory.
 * @param dir The path of the directory to load schema files from.
@@ -187,4 +186,4 @@ declare function loadSchemaFiles(dir: string): Promise<Record<string, TypeSchema
 //#region src/type.d.ts
 declare function areAllScalarTypes(typeUris: string[], types: Record<string, TypeSchema>): boolean;
 //#endregion
-export { PropertySchema, TypeSchema, areAllScalarTypes, generateVocab, loadSchemaFiles };
+export { type PropertySchema, type TypeSchema, areAllScalarTypes, generateVocab, loadSchemaFiles };

package/dist/mod.d.ts

@@ -174,7 +174,6 @@ type TermDefinition = Uri | Record<string, Uri | "@id">;
 /**
 * Type guard to check if a property is not functional (has pluralName).
 */
-
 /**
 * Loads all schema files in the directory.
 * @param dir The path of the directory to load schema files from.
@@ -187,4 +186,4 @@ declare function loadSchemaFiles(dir: string): Promise<Record<string, TypeSchema
 //#region src/type.d.ts
 declare function areAllScalarTypes(typeUris: string[], types: Record<string, TypeSchema>): boolean;
 //#endregion
-export { PropertySchema, TypeSchema, areAllScalarTypes, generateVocab, loadSchemaFiles };
+export { type PropertySchema, type TypeSchema, areAllScalarTypes, generateVocab, loadSchemaFiles };

package/dist/mod.js

@@ -5,43 +5,9 @@ import { join, posix } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parse } from "yaml";
 import { pascalCase } from "es-toolkit";
-
 //#region deno.json
 var name = "@fedify/vocab-tools";
-var version = "2.0.7";
-var license = "MIT";
-var exports = { ".": "./src/mod.ts" };
-var author = {
-	"name": "Hong Minhee",
-	"email": "hong@minhee.org",
-	"url": "https://hongminhee.org/"
-};
-var imports = {
-	"@cfworker/json-schema": "npm:@cfworker/json-schema@^4.1.1",
-	"yaml": "npm:yaml@^2.8.1"
-};
-var exclude = [
-	"dist",
-	"node_modules",
-	"src/schema.yaml"
-];
-var publish = { "exclude": ["**/*.test.ts", "tsdown.config.ts"] };
-var tasks = {
-	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"test": "deno test -A"
-};
-var deno_default = {
-	name,
-	version,
-	license,
-	exports,
-	author,
-	imports,
-	exclude,
-	publish,
-	tasks
-};
-
+var version = "2.0.9";
 //#endregion
 //#region src/type.ts
 const HEURISTICS_CONTEXTS = [
@@ -451,7 +417,7 @@ function getTypeNames(typeUris, types, parentheses = false) {
 	if (typeUris.length < 1) return "never";
 	else if (typeUris.length === 1) return getTypeName(typeUris[0], types);
 	let typeNames = typeUris.map((typeUri) => getTypeName(typeUri, types));
-	typeNames = typeNames.filter((t$1, i) => typeNames.indexOf(t$1) === i);
+	typeNames = typeNames.filter((t, i) => typeNames.indexOf(t) === i);
 	const t = typeNames.join(" | ");
 	return parentheses && typeNames.length > 1 ? `(${t})` : t;
 }
@@ -476,10 +442,7 @@ function isCompactableType(typeUri, types) {
 }
 function getSubtypes(typeUri, types, excludeSelf = false) {
 	const subtypes = excludeSelf ? [] : [typeUri];
-	for (const uri in types) {
-		const type = types[uri];
-		if (type.extends === typeUri) subtypes.push(...getSubtypes(uri, types));
-	}
+	for (const uri in types) if (types[uri].extends === typeUri) subtypes.push(...getSubtypes(uri, types));
 	return subtypes.filter((t, i) => subtypes.indexOf(t) === i);
 }
 function getSupertypes(typeUri, types, excludeSelf = false) {
@@ -549,11 +512,10 @@ function* getDecoders(typeUris, types, variable, optionsVariable, baseUrlVariabl
 	}
 	yield "undefined";
 }
-function emitOverride(typeUri, types) {
+function emitOverride$1(typeUri, types) {
 	if (types[typeUri].extends == null) return "";
 	return "override";
 }
-
 //#endregion
 //#region src/field.ts
 async function getFieldName(propertyUri, prefix = "#") {
@@ -565,20 +527,15 @@ async function getFieldName(propertyUri, prefix = "#") {
 async function generateField(property, types, prefix = "#") {
 	const fieldName = await getFieldName(property.uri, prefix);
 	if (areAllScalarTypes(property.range, types)) return `${fieldName}: (${getTypeNames(property.range, types, true)})[] = [];\n`;
-	else {
-		const typeNames = getTypeNames(property.range, types);
-		const trustFieldName = await getFieldName(property.uri, `${prefix}_trust`);
-		return `
-      ${fieldName}: (${typeNames} | URL)[] = [];
-      ${trustFieldName}: Set<number> = new Set();
+	else return `
+      ${fieldName}: (${getTypeNames(property.range, types)} | URL)[] = [];
+      ${await getFieldName(property.uri, `${prefix}_trust`)}: Set<number> = new Set();
     `;
-	}
 }
 async function* generateFields(typeUri, types) {
 	const type = types[typeUri];
 	for (const property of type.properties) yield await generateField(property, types);
 }
-
 //#endregion
 //#region src/fs.ts
 /**
@@ -593,7 +550,6 @@ async function* readDirRecursive(dir) {
 		for await (const subentry of readDirRecursive(path)) yield join(entry.name, subentry);
 	} else yield entry.name;
 }
-
 //#endregion
 //#region src/schema.ts
 /**
@@ -631,17 +587,13 @@ async function loadSchemaValidator() {
 	const thisFile = import.meta.url;
 	const schemaFile = new URL(posix.join(posix.dirname(thisFile), "schema.yaml"));
 	let content;
-	if (schemaFile.protocol !== "file:") {
-		const response = await fetch(schemaFile);
-		content = await response.text();
-	} else content = await readFile(fileURLToPath(schemaFile), { encoding: "utf-8" });
-	const schemaObject = parse(content);
-	return new Validator(schemaObject);
+	if (schemaFile.protocol !== "file:") content = await (await fetch(schemaFile)).text();
+	else content = await readFile(fileURLToPath(schemaFile), { encoding: "utf-8" });
+	return new Validator(parse(content));
 }
 let schemaValidator = void 0;
 async function loadSchema(path) {
-	const content = await readFile(path, { encoding: "utf-8" });
-	const schema = parse(content);
+	const schema = parse(await readFile(path, { encoding: "utf-8" }));
 	if (schemaValidator == null) schemaValidator = await loadSchemaValidator();
 	const result = schemaValidator.validate(schema);
 	const errors = [];
@@ -681,7 +633,6 @@ async function loadSchemaFiles(dir) {
 	entries.sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
 	return Object.fromEntries(entries);
 }
-
 //#endregion
 //#region src/codec.ts
 async function* generateEncoder(typeUri, types) {
@@ -697,7 +648,7 @@ async function* generateEncoder(typeUri, types) {
                       when \`format\` is set to \`'expand'\`.
    * @returns The JSON-LD representation of this object.
    */
-  ${emitOverride(typeUri, types)} async toJsonLd(options: {
+  ${emitOverride$1(typeUri, types)} async toJsonLd(options: {
     format?: "compact" | "expand",
     contextLoader?: DocumentLoader,
     context?: string | Record<string, string> | (string | Record<string, string>)[],
@@ -871,7 +822,7 @@ async function* generateEncoder(typeUri, types) {
     return compacted;
   }
 
-  protected ${emitOverride(typeUri, types)} isCompactable(): boolean {
+  protected ${emitOverride$1(typeUri, types)} isCompactable(): boolean {
 `;
 	for (const property of type.properties) if (!property.range.every((r) => isCompactableType(r, types))) yield `
       if (
@@ -898,7 +849,7 @@ async function* generateDecoder(typeUri, types) {
    * @returns The object of this type.
    * @throws {TypeError} If the given \`json\` is invalid.
    */
-  static ${emitOverride(typeUri, types)} async fromJsonLd(
+  static ${emitOverride$1(typeUri, types)} async fromJsonLd(
     json: unknown,
     options: {
       documentLoader?: DocumentLoader,
@@ -909,8 +860,8 @@ async function* generateDecoder(typeUri, types) {
   ): Promise<${type.name}> {
     const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
     const tracer = tracerProvider.getTracer(
-      ${JSON.stringify(deno_default.name)},
-      ${JSON.stringify(deno_default.version)},
+      ${JSON.stringify(name)},
+      ${JSON.stringify(version)},
     );
     return await tracer.startActiveSpan(
       "activitypub.parse_object",
@@ -1074,7 +1025,6 @@ async function* generateDecoder(typeUri, types) {
   }
   `;
 }
-
 //#endregion
 //#region src/constructor.ts
 function generateParameterType(property, types) {
@@ -1143,8 +1093,7 @@ async function* generateConstructor(typeUri, types) {
 		if (hasSingularAccessor(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `values.${property.singularName}`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || values.${property.singularName} instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1169,8 +1118,7 @@ async function* generateConstructor(typeUri, types) {
 		if (isNonFunctionalProperty(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `v`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || v instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1220,7 +1168,7 @@ async function* generateCloner(typeUri, types) {
    * @param options The options to use for cloning.
    * @returns The cloned instance.
    */
-  ${emitOverride(typeUri, types)} clone(
+  ${emitOverride$1(typeUri, types)} clone(
     values:
   `;
 	for await (const code of generateParametersType(typeUri, types)) yield code;
@@ -1257,8 +1205,7 @@ async function* generateCloner(typeUri, types) {
 		if (hasSingularAccessor(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `values.${property.singularName}`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || values.${property.singularName} instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1283,8 +1230,7 @@ async function* generateCloner(typeUri, types) {
 		if (isNonFunctionalProperty(property)) {
 			let typeGuards = getTypeGuards(property.range, types, `v`);
 			let typeNames = getTypeNames(property.range, types);
-			const scalar = areAllScalarTypes(property.range, types);
-			if (!scalar) {
+			if (!areAllScalarTypes(property.range, types)) {
 				typeGuards = `${typeGuards} || v instanceof URL`;
 				typeNames = `${typeNames} | URL`;
 			}
@@ -1329,13 +1275,12 @@ async function* generateCloner(typeUri, types) {
   }
   `;
 }
-
 //#endregion
 //#region src/inspector.ts
 async function* generateInspector(typeUri, types) {
 	const type = types[typeUri];
 	yield `
-  protected ${emitOverride(typeUri, types)} _getCustomInspectProxy(): Record<string, unknown> {
+  protected ${emitOverride$1(typeUri, types)} _getCustomInspectProxy(): Record<string, unknown> {
   `;
 	if (type.extends == null) yield `
     const proxy: Record<string, unknown> = {};
@@ -1427,12 +1372,10 @@ async function* generateInspectorPostClass(typeUri, types) {
   };
   `;
 }
-
 //#endregion
 //#region src/property.ts
-function emitOverride$1(typeUri, types, property) {
-	const type = types[typeUri];
-	let supertypeUri = type.extends;
+function emitOverride(typeUri, types, property) {
+	let supertypeUri = types[typeUri].extends;
 	while (supertypeUri != null) {
 		const st = types[supertypeUri];
 		if (st.properties.find((p) => p.singularName === property.singularName)) return "override";
@@ -1441,7 +1384,7 @@ function emitOverride$1(typeUri, types, property) {
 	return "";
 }
 async function* generateProperty(type, property, types) {
-	const override = emitOverride$1(type.uri, types, property);
+	const override = emitOverride(type.uri, types, property);
 	const doc = `\n/** ${property.description.replaceAll("\n", "\n * ")}\n */\n`;
 	if (areAllScalarTypes(property.range, types)) {
 		if (hasSingularAccessor(property)) {
@@ -1484,8 +1427,8 @@ async function* generateProperty(type, property, types) {
       const tracerProvider = options.tracerProvider ??
         this._tracerProvider ?? trace.getTracerProvider();
       const tracer = tracerProvider.getTracer(
-        ${JSON.stringify(deno_default.name)},
-        ${JSON.stringify(deno_default.version)},
+        ${JSON.stringify(name)},
+        ${JSON.stringify(version)},
       );
       return await tracer.startActiveSpan("activitypub.lookup_object", async (span) => {
         let fetchResult: RemoteDocument;
@@ -1577,10 +1520,9 @@ async function* generateProperty(type, property, types) {
     `;
 		for (const range of property.range) {
 			if (!(range in types)) continue;
-			const rangeType = types[range];
 			yield `
         try {
-          return await ${rangeType.name}.fromJsonLd(
+          return await ${types[range].name}.fromJsonLd(
             jsonLd,
             { documentLoader, contextLoader, tracerProvider, baseUrl },
           );
@@ -1795,7 +1737,6 @@ async function* generateProperties(typeUri, types) {
 	const type = types[typeUri];
 	for (const property of type.properties) yield* generateProperty(type, property, types);
 }
-
 //#endregion
 //#region src/class.ts
 /**
@@ -1871,7 +1812,7 @@ async function* generateClass(typeUri, types) {
     /**
      * The type URI of {@link ${type.name}}: \`${typeUri}\`.
      */
-    static ${emitOverride(typeUri, types)} get typeId(): URL {
+    static ${emitOverride$1(typeUri, types)} get typeId(): URL {
       return new URL(${JSON.stringify(typeUri)});
     }
   `;
@@ -1912,7 +1853,6 @@ async function* generateClasses(types) {
 	const sorted = sortTopologically(types);
 	for (const typeUri of sorted) for await (const code of generateClass(typeUri, types)) yield code;
 }
-
 //#endregion
 //#region src/generate.ts
 async function generateVocab(schemaDir, generatedPath) {
@@ -1927,6 +1867,5 @@ async function generateVocab(schemaDir, generatedPath) {
 		writer.end();
 	});
 }
-
 //#endregion
-export { areAllScalarTypes, generateVocab, loadSchemaFiles };
+export { areAllScalarTypes, generateVocab, loadSchemaFiles };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-tools",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "Code generator for Activity Vocabulary APIs",
   "homepage": "https://fedify.dev/",
   "repository": {
@@ -50,8 +50,8 @@
   "license": "MIT",
   "devDependencies": {
     "@types/node": "^22.17.0",
-    "tsdown": "^0.12.9",
-    "typescript": "^5.9.3"
+    "tsdown": "^0.21.6",
+    "typescript": "^5.9.2"
   },
   "dependencies": {
     "@cfworker/json-schema": "^4.1.1",

package/tsdown.config.ts

@@ -13,7 +13,7 @@ export default defineConfig({
       await cp(
         join("src", "schema.yaml"),
         join(ctx.options.outDir, "schema.yaml"),
-        { force: true },
+        { force: false, errorOnExist: false },
       );
     },
   },