@fedify/vocab 2.4.0-dev.1431 → 2.4.0-dev.1488

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.4.0-dev.1431+9ef6f5e8",
+  "version": "2.4.0-dev.1488+a9fe1094",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/mod.cjs

@@ -33,7 +33,7 @@ let _fedify_vocab_runtime_temporal = require("@fedify/vocab-runtime/temporal");
 let es_toolkit = require("es-toolkit");
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.1431+9ef6f5e8";
+var version = "2.4.0-dev.1488+a9fe1094";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {

package/dist/mod.js

@@ -9,7 +9,7 @@ import { isTemporalDuration, isTemporalInstant } from "@fedify/vocab-runtime/tem
 import { delay } from "es-toolkit";
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.1431+9ef6f5e8";
+var version = "2.4.0-dev.1488+a9fe1094";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {

package/dist-tests/{actor-0UbrRRrx.mjs → actor-Cw0Y6V0k.mjs}

@@ -1206,7 +1206,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.1431+9ef6f5e8";
+var version = "2.4.0-dev.1488+a9fe1094";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
 import { B as __exportAll, E as Person, N as Service, T as Organization, a as Application, m as Group } from "./vocab-XnSGFOqq.mjs";
-import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-0UbrRRrx.mjs";
+import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-Cw0Y6V0k.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
 //#region ../../node_modules/.pnpm/fast-check@3.23.2/node_modules/fast-check/lib/esm/check/precondition/PreconditionFailure.js

package/dist-tests/lookup.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
 import { E as Person, S as Object$1, o as Collection, x as Note } from "./vocab-XnSGFOqq.mjs";
-import { c as esm_default, i as isActor, o as name, s as version } from "./actor-0UbrRRrx.mjs";
+import { c as esm_default, i as isActor, o as name, s as version } from "./actor-Cw0Y6V0k.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.4.0-dev.1431+9ef6f5e8",
+  "version": "2.4.0-dev.1488+a9fe1094",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -10,10 +10,7 @@
   "bugs": {
     "url": "https://github.com/fedify-dev/fedify/issues"
   },
-  "funding": [
-    "https://opencollective.com/fedify",
-    "https://github.com/sponsors/dahlia"
-  ],
+  "funding": "https://opencollective.com/fedify",
   "engines": {
     "deno": ">=2.0.0",
     "node": ">=22.0.0",
@@ -46,9 +43,9 @@
     "es-toolkit": "1.46.1",
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.4.0-dev.1431+9ef6f5e8",
-    "@fedify/webfinger": "2.4.0-dev.1431+9ef6f5e8",
-    "@fedify/vocab-runtime": "2.4.0-dev.1431+9ef6f5e8"
+    "@fedify/webfinger": "2.4.0-dev.1488+a9fe1094",
+    "@fedify/vocab-runtime": "2.4.0-dev.1488+a9fe1094",
+    "@fedify/vocab-tools": "2.4.0-dev.1488+a9fe1094"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/scripts/codegen.ts

@@ -7,36 +7,49 @@ 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.
+ * Get the latest mtime among files under a directory tree (recursively),
+ * limited to the given file extensions.  Returns 0 if the directory is absent.
  */
-async function getLatestSourceMtime(schemaDir: Path): Promise<number> {
+async function getLatestMtimeUnder(
+  dir: Path,
+  exts: readonly string[],
+): Promise<number> {
+  if (!(await dir.exists())) return 0;
   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();
+  for await (const entry of Deno.readDir(dir.toString())) {
+    const child = dir.join(entry.name);
+    if (entry.isDirectory) {
+      const mtime = await getLatestMtimeUnder(child, exts);
+      if (mtime > latestMtime) latestMtime = mtime;
+    } else if (entry.isFile && exts.some((ext) => entry.name.endsWith(ext))) {
+      const fileStat = await child.stat();
+      const mtime = fileStat?.mtime?.getTime() ?? 0;
+      if (mtime > latestMtime) latestMtime = mtime;
     }
   }
   return latestMtime;
 }
 
 /**
- * Check if the generated file is up to date compared to source files.
+ * Check if the generated file is up to date compared to its source files,
+ * including the generator itself (`@fedify/vocab-tools` and this codegen
+ * script): changing the generator changes the generated output, so the
+ * generated file must be at least as new as those too.
  */
 async function isUpToDate(
   schemaDir: Path,
   generatedPath: Path,
+  generatorMtime: number,
 ): Promise<boolean> {
   try {
     const [sourceMtime, generatedStat] = await Promise.all([
-      getLatestSourceMtime(schemaDir),
+      // Match loadSchemaFiles()'s /\.ya?ml$/i: a .yml schema is a real input.
+      getLatestMtimeUnder(schemaDir, [".yaml", ".yml"]),
       generatedPath.stat(),
     ]);
     if (!generatedStat?.mtime) return false;
-    return generatedStat.mtime.getTime() >= sourceMtime;
+    return generatedStat.mtime.getTime() >=
+      Math.max(sourceMtime, generatorMtime);
   } catch {
     // If generated file doesn't exist, it's not up to date
     return false;
@@ -117,8 +130,20 @@ async function codegen() {
   // Acquire lock to prevent concurrent codegen
   const lock = await acquireLock(lockPath);
   try {
+    // The generated vocab.ts depends not only on the YAML schemas but on the
+    // generator itself: @fedify/vocab-tools and this codegen script.  Sample
+    // its mtime inside the lock so that a generator edit made while we were
+    // waiting for the lock is not missed by the freshness check below.
+    const generatorMtime = Math.max(
+      await getLatestMtimeUnder(
+        packageDir.parent()!.join("vocab-tools", "src"),
+        [".ts", ".yaml", ".yml"],
+      ),
+      await getLatestMtimeUnder(scriptsDir, [".ts"]),
+    );
+
     // Check if regeneration is needed (after acquiring lock)
-    if (await isUpToDate(schemaDir, realPath)) {
+    if (await isUpToDate(schemaDir, realPath, generatorMtime)) {
       $.log("vocab.ts is up to date, skipping codegen");
       return;
     }