@fedify/vocab 2.0.0-dev.237 → 2.0.0-dev.279

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.0.0-dev.237+7f2bb1de",
+  "version": "2.0.0-dev.279+ce1bdc22",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"
@@ -23,9 +23,16 @@
     "src/*.yaml",
     "!src/vocab.ts"
   ],
+  "publish": {
+    "exclude": [
+      "**/*.test.ts",
+      "tsdown.config.ts",
+      "scripts/"
+    ]
+  },
   "tasks": {
     "check": "deno fmt --check && deno lint && deno check src/*.ts",
-    "compile": "deno run --allow-read --allow-write --allow-env --check scripts/codegen.ts && deno fmt src/vocab.ts && deno cache src/vocab.ts && deno check src/vocab.ts",
+    "compile": "deno run --allow-read --allow-write --allow-env --allow-run scripts/codegen.ts",
     "test": "deno test --allow-read --allow-write --allow-env --unstable-kv --trace-leaks --parallel"
   }
 }

package/dist/actor.test.js

@@ -3,8 +3,8 @@
       globalThis.addEventListener = () => {};
     
 import { __export } from "./chunk-BeeFIeNn.js";
-import { Application, Group, Organization, Person, Service, test } from "./vocab-BCNCvjVX.js";
-import { deno_default, esm_default } from "./deno-DZVL5ko5.js";
+import { Application, Group, Organization, Person, Service, test } from "./vocab-fPKUeh35.js";
+import { deno_default, esm_default } from "./deno-y1THYur-.js";
 import { getTypeId } from "./type-Dnf0m2yO.js";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";

package/dist/{deno-DZVL5ko5.js → deno-y1THYur-.js}

@@ -1240,7 +1240,7 @@ var esm_default = FetchMock_default;
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.0.0-dev.237+7f2bb1de";
+var version = "2.0.0-dev.279+ce1bdc22";
 var license = "MIT";
 var exports = { ".": "./src/mod.ts" };
 var description = "Vocabularies library for @fedify/fedify";
@@ -1261,9 +1261,14 @@ var exclude = [
 	"src/*.yaml",
 	"!src/vocab.ts"
 ];
+var publish = { "exclude": [
+	"**/*.test.ts",
+	"tsdown.config.ts",
+	"scripts/"
+] };
 var tasks = {
 	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"compile": "deno run --allow-read --allow-write --allow-env --check scripts/codegen.ts && deno fmt src/vocab.ts && deno cache src/vocab.ts && deno check src/vocab.ts",
+	"compile": "deno run --allow-read --allow-write --allow-env --allow-run scripts/codegen.ts",
 	"test": "deno test --allow-read --allow-write --allow-env --unstable-kv --trace-leaks --parallel"
 };
 var deno_default = {
@@ -1275,6 +1280,7 @@ var deno_default = {
 	author,
 	imports,
 	exclude,
+	publish,
 	tasks
 };
 

package/dist/lookup.test.js

@@ -2,8 +2,8 @@
       import { Temporal } from "@js-temporal/polyfill";
       globalThis.addEventListener = () => {};
     
-import { Collection, Note, Object as Object$1, Person, createTestTracerProvider, getDocumentLoader, mockDocumentLoader, test } from "./vocab-BCNCvjVX.js";
-import { deno_default, esm_default } from "./deno-DZVL5ko5.js";
+import { Collection, Note, Object as Object$1, Person, createTestTracerProvider, getDocumentLoader, mockDocumentLoader, test } from "./vocab-fPKUeh35.js";
+import { deno_default, esm_default } from "./deno-y1THYur-.js";
 import { getTypeId } from "./type-Dnf0m2yO.js";
 import { assertInstanceOf } from "./utils-Dm0Onkcz.js";
 import { getLogger } from "@logtape/logtape";

package/dist/mod.cjs

@@ -41,7 +41,7 @@ const es_toolkit = __toESM(require("es-toolkit"));
 
 //#region deno.json
 var name$1 = "@fedify/vocab";
-var version$1 = "2.0.0-dev.237+7f2bb1de";
+var version$1 = "2.0.0-dev.279+ce1bdc22";
 var license$1 = "MIT";
 var exports$2 = { ".": "./src/mod.ts" };
 var description$1 = "Vocabularies library for @fedify/fedify";
@@ -62,9 +62,14 @@ var exclude$1 = [
 	"src/*.yaml",
 	"!src/vocab.ts"
 ];
+var publish$1 = { "exclude": [
+	"**/*.test.ts",
+	"tsdown.config.ts",
+	"scripts/"
+] };
 var tasks$1 = {
 	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"compile": "deno run --allow-read --allow-write --allow-env --check scripts/codegen.ts && deno fmt src/vocab.ts && deno cache src/vocab.ts && deno check src/vocab.ts",
+	"compile": "deno run --allow-read --allow-write --allow-env --allow-run scripts/codegen.ts",
 	"test": "deno test --allow-read --allow-write --allow-env --unstable-kv --trace-leaks --parallel"
 };
 var deno_default = {
@@ -76,6 +81,7 @@ var deno_default = {
 	author: author$1,
 	imports: imports$1,
 	exclude: exclude$1,
+	publish: publish$1,
 	tasks: tasks$1
 };
 
@@ -4356,7 +4362,7 @@ const preloadedContexts = {
 };
 var contexts_default = preloadedContexts;
 var name = "@fedify/vocab-runtime";
-var version = "2.0.0-dev.237+7f2bb1de";
+var version = "2.0.0-dev.279+ce1bdc22";
 var license = "MIT";
 var exports$1 = { ".": "./src/mod.ts" };
 var description = "Runtime library for @fedify/vocab";
@@ -4374,7 +4380,7 @@ var imports = {
 	"pkijs": "npm:pkijs@^3.2.5"
 };
 var exclude = ["dist", "node_modules"];
-var publish = { "exclude": ["**/*.test.ts"] };
+var publish = { "exclude": ["**/*.test.ts", "tsdown.config.ts"] };
 var tasks = {
 	"check": "deno fmt --check && deno lint && deno check src/*.ts",
 	"test": "deno test"
@@ -4796,7 +4802,7 @@ async function getRemoteDocument(url, response, fetch$1) {
 * Creates a JSON-LD document loader that utilizes the browser's `fetch` API.
 *
 * The created loader preloads the below frequently used contexts by default
-* (unless `options.ignorePreloadedContexts` is set to `true`):
+* (unless `options.skipPreloadedContexts` is set to `true`):
 *
 * - <https://www.w3.org/ns/activitystreams>
 * - <https://w3id.org/security/v1>
@@ -5319,8 +5325,8 @@ var LanguageString = class extends String {
 	/**
 	* Constructs a new `LanguageString`.
 	* @param value A string value written in the given language.
-	* @param locale The language of the string.  If a string is given, it will
-	*               be parsed as a `Intl.Locale` object.
+	* @param language The language of the string.  If a string is given, it will
+	*                 be parsed as a `Intl.Locale` object.
 	*/
 	constructor(value, language) {
 		super(value);

package/dist/mod.js

@@ -18,7 +18,7 @@ import { delay } from "es-toolkit";
 
 //#region deno.json
 var name$1 = "@fedify/vocab";
-var version$1 = "2.0.0-dev.237+7f2bb1de";
+var version$1 = "2.0.0-dev.279+ce1bdc22";
 var license$1 = "MIT";
 var exports$1 = { ".": "./src/mod.ts" };
 var description$1 = "Vocabularies library for @fedify/fedify";
@@ -39,9 +39,14 @@ var exclude$1 = [
 	"src/*.yaml",
 	"!src/vocab.ts"
 ];
+var publish$1 = { "exclude": [
+	"**/*.test.ts",
+	"tsdown.config.ts",
+	"scripts/"
+] };
 var tasks$1 = {
 	"check": "deno fmt --check && deno lint && deno check src/*.ts",
-	"compile": "deno run --allow-read --allow-write --allow-env --check scripts/codegen.ts && deno fmt src/vocab.ts && deno cache src/vocab.ts && deno check src/vocab.ts",
+	"compile": "deno run --allow-read --allow-write --allow-env --allow-run scripts/codegen.ts",
 	"test": "deno test --allow-read --allow-write --allow-env --unstable-kv --trace-leaks --parallel"
 };
 var deno_default = {
@@ -53,6 +58,7 @@ var deno_default = {
 	author: author$1,
 	imports: imports$1,
 	exclude: exclude$1,
+	publish: publish$1,
 	tasks: tasks$1
 };
 
@@ -4333,7 +4339,7 @@ const preloadedContexts = {
 };
 var contexts_default = preloadedContexts;
 var name = "@fedify/vocab-runtime";
-var version = "2.0.0-dev.237+7f2bb1de";
+var version = "2.0.0-dev.279+ce1bdc22";
 var license = "MIT";
 var exports = { ".": "./src/mod.ts" };
 var description = "Runtime library for @fedify/vocab";
@@ -4351,7 +4357,7 @@ var imports = {
 	"pkijs": "npm:pkijs@^3.2.5"
 };
 var exclude = ["dist", "node_modules"];
-var publish = { "exclude": ["**/*.test.ts"] };
+var publish = { "exclude": ["**/*.test.ts", "tsdown.config.ts"] };
 var tasks = {
 	"check": "deno fmt --check && deno lint && deno check src/*.ts",
 	"test": "deno test"
@@ -4773,7 +4779,7 @@ async function getRemoteDocument(url, response, fetch$1) {
 * Creates a JSON-LD document loader that utilizes the browser's `fetch` API.
 *
 * The created loader preloads the below frequently used contexts by default
-* (unless `options.ignorePreloadedContexts` is set to `true`):
+* (unless `options.skipPreloadedContexts` is set to `true`):
 *
 * - <https://www.w3.org/ns/activitystreams>
 * - <https://w3id.org/security/v1>
@@ -5296,8 +5302,8 @@ var LanguageString = class extends String {
 	/**
 	* Constructs a new `LanguageString`.
 	* @param value A string value written in the given language.
-	* @param locale The language of the string.  If a string is given, it will
-	*               be parsed as a `Intl.Locale` object.
+	* @param language The language of the string.  If a string is given, it will
+	*                 be parsed as a `Intl.Locale` object.
 	*/
 	constructor(value, language) {
 		super(value);

package/dist/type.test.js

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
       globalThis.addEventListener = () => {};
     
-import { Person, test } from "./vocab-BCNCvjVX.js";
+import { Person, test } from "./vocab-fPKUeh35.js";
 import { getTypeId } from "./type-Dnf0m2yO.js";
 import { deepStrictEqual } from "node:assert/strict";
 

package/dist/{vocab-BCNCvjVX.js → vocab-fPKUeh35.js}

@@ -10561,7 +10561,7 @@ const preloadedContexts = {
 };
 var contexts_default = preloadedContexts;
 var name = "@fedify/vocab-runtime";
-var version = "2.0.0-dev.237+7f2bb1de";
+var version = "2.0.0-dev.279+ce1bdc22";
 var license = "MIT";
 var exports$1 = { ".": "./src/mod.ts" };
 var description = "Runtime library for @fedify/vocab";
@@ -10579,7 +10579,7 @@ var imports = {
 	"pkijs": "npm:pkijs@^3.2.5"
 };
 var exclude = ["dist", "node_modules"];
-var publish = { "exclude": ["**/*.test.ts"] };
+var publish = { "exclude": ["**/*.test.ts", "tsdown.config.ts"] };
 var tasks = {
 	"check": "deno fmt --check && deno lint && deno check src/*.ts",
 	"test": "deno test"
@@ -11001,7 +11001,7 @@ async function getRemoteDocument(url, response, fetch$1) {
 * Creates a JSON-LD document loader that utilizes the browser's `fetch` API.
 *
 * The created loader preloads the below frequently used contexts by default
-* (unless `options.ignorePreloadedContexts` is set to `true`):
+* (unless `options.skipPreloadedContexts` is set to `true`):
 *
 * - <https://www.w3.org/ns/activitystreams>
 * - <https://w3id.org/security/v1>
@@ -11524,8 +11524,8 @@ var LanguageString = class extends String {
 	/**
 	* Constructs a new `LanguageString`.
 	* @param value A string value written in the given language.
-	* @param locale The language of the string.  If a string is given, it will
-	*               be parsed as a `Intl.Locale` object.
+	* @param language The language of the string.  If a string is given, it will
+	*                 be parsed as a `Intl.Locale` object.
 	*/
 	constructor(value, language) {
 		super(value);

package/dist/vocab.test.js

@@ -2,7 +2,7 @@
       import { Temporal } from "@js-temporal/polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Announce, Collection, Create, CryptographicKey, Follow, Hashtag, LanguageString, Link, Note, Object as Object$1, OrderedCollectionPage, Person, Place, Question, Source, decodeMultibase, mockDocumentLoader, test, vocab_exports } from "./vocab-BCNCvjVX.js";
+import { Activity, Announce, Collection, Create, CryptographicKey, Follow, Hashtag, LanguageString, Link, Note, Object as Object$1, OrderedCollectionPage, Person, Place, Question, Source, decodeMultibase, mockDocumentLoader, test, vocab_exports } from "./vocab-fPKUeh35.js";
 import { assertInstanceOf } from "./utils-Dm0Onkcz.js";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, throws } from "node:assert/strict";
 import { pascalCase } from "es-toolkit";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.0.0-dev.237+7f2bb1de",
+  "version": "2.0.0-dev.279+ce1bdc22",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -47,8 +47,8 @@
     "jsonld": "^9.0.0",
     "multicodec": "^3.2.1",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.0.0-dev.237+7f2bb1de",
-    "@fedify/webfinger": "2.0.0-dev.237+7f2bb1de"
+    "@fedify/vocab-tools": "2.0.0-dev.279+ce1bdc22",
+    "@fedify/webfinger": "2.0.0-dev.279+ce1bdc22"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",
@@ -57,7 +57,7 @@
     "tsdown": "^0.12.9",
     "typescript": "^5.9.3",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-runtime": "2.0.0-dev.237+7f2bb1de"
+    "@fedify/vocab-runtime": "2.0.0-dev.279+ce1bdc22"
   },
   "keywords": [
     "Fedify",
@@ -71,9 +71,12 @@
   },
   "license": "MIT",
   "scripts": {
-    "build": "tsdown",
+    "build:self": "deno task compile && tsdown",
+    "build": "pnpm --filter @fedify/vocab... run build:self",
     "prepublish": "pnpm build",
-    "test": "pnpm build && cd dist/ && node --test",
-    "test:bun": "pnpm build && cd dist/ && bun test --timeout 60000"
+    "pretest": "pnpm build",
+    "test": "cd dist/ && node --test",
+    "pretest:bun": "pnpm build",
+    "test:bun": "cd dist/ && bun test --timeout 60000"
   }
 }

package/scripts/codegen.ts

@@ -1,18 +1,154 @@
+import $ from "@david/dax";
+import type { Path } from "@david/dax";
 import { generateVocab } from "@fedify/vocab-tools";
-import { rename } from "node:fs/promises";
-import { dirname, join } from "node:path";
 
-async function codegen() {
-  const scriptsDir = import.meta.dirname;
-  if (!scriptsDir) {
-    throw new Error("Could not determine schema directory");
+const LOCK_STALE_MS = 5 * 60 * 1000; // 5 minutes
+const LOCK_RETRY_MS = 100;
+const LOCK_TIMEOUT_MS = 60 * 1000; // 1 minute
+
+/**
+ * Get the latest mtime from all YAML files in the schema directory.
+ */
+async function getLatestSourceMtime(schemaDir: Path): Promise<number> {
+  let latestMtime = 0;
+  for await (const entry of schemaDir.readDir()) {
+    if (!entry.isFile) continue;
+    if (!entry.name.match(/\.ya?ml$/i)) continue;
+    if (entry.name === "schema.yaml") continue;
+    const fileStat = await schemaDir.join(entry.name).stat();
+    if (fileStat?.mtime && fileStat.mtime.getTime() > latestMtime) {
+      latestMtime = fileStat.mtime.getTime();
+    }
+  }
+  return latestMtime;
+}
+
+/**
+ * Check if the generated file is up to date compared to source files.
+ */
+async function isUpToDate(
+  schemaDir: Path,
+  generatedPath: Path,
+): Promise<boolean> {
+  try {
+    const [sourceMtime, generatedStat] = await Promise.all([
+      getLatestSourceMtime(schemaDir),
+      generatedPath.stat(),
+    ]);
+    if (!generatedStat?.mtime) return false;
+    return generatedStat.mtime.getTime() >= sourceMtime;
+  } catch {
+    // If generated file doesn't exist, it's not up to date
+    return false;
+  }
+}
+
+interface Lock {
+  release(): Promise<void>;
+}
+
+/**
+ * Acquire a directory-based lock. mkdir is atomic on POSIX systems.
+ */
+async function acquireLock(lockPath: Path): Promise<Lock> {
+  const startTime = Date.now();
+
+  while (true) {
+    try {
+      // Use Deno.mkdir directly because dax's mkdir() is recursive by default
+      await Deno.mkdir(lockPath.toString());
+      // Write PID and timestamp for stale lock detection
+      const infoPath = lockPath.join("info");
+      await infoPath.writeJsonPretty({ pid: Deno.pid, timestamp: Date.now() });
+      return {
+        async release() {
+          try {
+            await lockPath.remove({ recursive: true });
+          } catch {
+            // Ignore errors during cleanup
+          }
+        },
+      };
+    } catch (e) {
+      if (!(e instanceof Deno.errors.AlreadyExists)) {
+        throw e;
+      }
+
+      // Check if lock is stale
+      try {
+        const infoPath = lockPath.join("info");
+        const infoStat = await infoPath.stat();
+        if (
+          infoStat?.mtime &&
+          Date.now() - infoStat.mtime.getTime() > LOCK_STALE_MS
+        ) {
+          console.warn("Removing stale lock:", lockPath.toString());
+          await lockPath.remove({ recursive: true });
+          continue;
+        }
+      } catch {
+        // If we can't read the info file, try to remove the lock
+        try {
+          await lockPath.remove({ recursive: true });
+          continue;
+        } catch {
+          // Ignore
+        }
+      }
+
+      // Check timeout
+      if (Date.now() - startTime > LOCK_TIMEOUT_MS) {
+        throw new Error(`Timeout waiting for lock: ${lockPath}`);
+      }
+
+      // Wait and retry
+      await $.sleep(LOCK_RETRY_MS);
+    }
   }
-  const schemaDir = join(dirname(scriptsDir), "src");
-  const generatedPath = join(schemaDir, `vocab-${crypto.randomUUID()}.ts`);
-  const realPath = join(schemaDir, "vocab.ts");
+}
+
+async function codegen() {
+  const scriptsDir = $.path(import.meta.dirname!);
+  const packageDir = scriptsDir.parent()!;
+  const schemaDir = packageDir.join("src");
+  const realPath = schemaDir.join("vocab.ts");
+  const lockPath = packageDir.join(".vocab-codegen.lock");
+
+  // Acquire lock to prevent concurrent codegen
+  const lock = await acquireLock(lockPath);
+  try {
+    // Check if regeneration is needed (after acquiring lock)
+    if (await isUpToDate(schemaDir, realPath)) {
+      $.log("vocab.ts is up to date, skipping codegen");
+      return;
+    }
 
-  await generateVocab(schemaDir, generatedPath);
-  await rename(generatedPath, realPath);
+    $.logStep("Generating", "vocab.ts...");
+
+    // Generate to a temporary file first
+    const generatedPath = schemaDir.join(`vocab-${crypto.randomUUID()}.ts`);
+    try {
+      await generateVocab(schemaDir.toString(), generatedPath.toString());
+      await generatedPath.rename(realPath);
+    } catch (e) {
+      // Clean up temp file on error
+      await generatedPath.remove().catch(() => {});
+      throw e;
+    }
+
+    $.logStep("Formatting", "vocab.ts...");
+    await $`deno fmt ${realPath}`;
+
+    $.logStep("Caching", "vocab.ts...");
+    await $`deno cache ${realPath}`;
+
+    $.logStep("Type checking", "vocab.ts...");
+    await $`deno check ${realPath}`;
+
+    $.logStep("Codegen", "completed successfully");
+  } finally {
+    await lock.release();
+  }
 }
 
 if (import.meta.main) {