Use vocab-runtime jsonld subpath

Move the jsonld ESM shim into @fedify/vocab-runtime and expose it
through the new jsonld subpath export. This avoids fragile relative
imports in generated vocab sources while keeping JSR-safe packaging for
the deep jsonld ESM entrypoint. Update Fedify's Linked Data signature
code, the vocab code generator, snapshots, and CHANGES.md to use the
shared runtime module.

#639 (comment)

Co-Authored-By: OpenAI Codex <codex@openai.com>

Author: dahlia

.gitignore

@@ -3,6 +3,7 @@
 .pnpm-store/
 .vocab-codegen.lock/
 dist/
+dist-tests/
 node_modules/
 package-lock.json
 repomix-output.xml

CHANGES.md

@@ -10,12 +10,13 @@ To be released.
 
 ### @fedify/fedify
 
- -  Switched Fedify's JSR-facing JSON-LD imports to jsonld's ESM entrypoint
-    so source-based runtimes such as Deno, Cloudflare Workers, and Fresh 2's
-    Vite SSR pipeline do not have to evaluate the package through CommonJS
-    interop when loading Linked Data signature support.  Fresh 2 development
-    mode has been verified on Deno 2.7.7 after an upstream Deno 2.7.6 dev
-    server regression was fixed.  [[#621], [#639]]
+ -  Switched Fedify's source-based JSON-LD loading to the new
+    `@fedify/vocab-runtime/jsonld` subpath so generated vocabulary code and
+    Linked Data signature support no longer have to evaluate `jsonld` through
+    a CommonJS-sensitive package root in Fresh 2, Deno, and other ESM-first
+    runtimes.  Fresh 2 development mode has been verified on Deno 2.7.7
+    after an upstream Deno 2.7.6 dev server regression was fixed.
+    [[#621], [#639]]
 
 [#621]: https://github.com/fedify-dev/fedify/issues/621
 [#639]: https://github.com/fedify-dev/fedify/pull/639
@@ -28,6 +29,11 @@ To be released.
     `TypeError: varint.encode is not a function`.  Fresh 2 no longer needs a
     Vite externalization workaround for Fedify.  [[#621], [#639]]
 
+ -  Added the new `@fedify/vocab-runtime/jsonld` subpath export so generated
+    vocabulary code and other Fedify runtime code can share a JSR-safe wrapper
+    around `jsonld`'s ESM entrypoint instead of depending on fragile relative
+    shims or the package-root import path.  [[#621], [#639]]
+
 ### @fedify/init
 
  -  Revived removed `fedify init` options.  [[#632], [#638] by ChanHaeng Lee]

deno.lock

@@ -1,11 +1,10 @@
 import { Activity, CryptographicKey, getTypeId, Object } from "@fedify/vocab";
 import { type DocumentLoader, getDocumentLoader } from "@fedify/vocab-runtime";
+import jsonld from "@fedify/vocab-runtime/jsonld";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace, type TracerProvider } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { encodeHex } from "byte-encodings/hex";
-// @ts-ignore TS7016
-import jsonld from "jsonld/dist/jsonld.esm.js";
 import metadata from "../../deno.json" with { type: "json" };
 import { fetchKey, type KeyCache, validateCryptoKey } from "./key.ts";
 

packages/fedify/src/sig/ld.ts

@@ -7,6 +7,7 @@
   },
   "exclude": [
     "dist",
+    "dist-tests",
     "node_modules"
   ],
   "tasks": {

packages/fixture/deno.json

@@ -49,7 +49,7 @@
     "prepack": "pnpm build",
     "prepublish": "pnpm build",
     "pretest": "pnpm build",
-    "test": "cd dist/ && node --test"
+    "test": "cd dist-tests && node --test"
   },
   "private": true
 }

packages/fixture/package.json

@@ -1,7 +1,15 @@
-import { cp, glob } from "node:fs/promises";
-import { join, sep } from "node:path";
+import { glob, mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join, sep } from "node:path";
 import { defineConfig } from "tsdown";
 
+async function copyFileSafely(
+  source: string,
+  destination: string,
+): Promise<void> {
+  await mkdir(dirname(destination), { recursive: true });
+  await writeFile(destination, await readFile(source));
+}
+
 export default [
   defineConfig({
     entry: ["src/mod.ts"],
@@ -12,18 +20,19 @@ export default [
     hooks: {
       "build:done": async (ctx) => {
         for await (const file of glob("src/fixtures/**/*.json")) {
-          await cp(
+          await copyFileSafely(
             file,
             join(ctx.options.outDir, file.replace(`src${sep}`, "")),
-            { force: true },
           );
         }
       },
     },
   }),
   defineConfig({
+    outDir: "dist-tests",
     entry: (await Array.fromAsync(glob(`src/**/*.test.ts`)))
       .map((f) => f.replace(sep, "/")),
+    dts: false,
     format: ["esm", "cjs"],
     platform: "node",
     external: [

packages/fixture/tsdown.config.ts

@@ -3,7 +3,8 @@
   "version": "2.0.7",
   "license": "MIT",
   "exports": {
-    ".": "./src/mod.ts"
+    ".": "./src/mod.ts",
+    "./jsonld": "./src/jsonld.ts"
   },
   "description": "Runtime library for @fedify/vocab",
   "author": {
@@ -16,6 +17,7 @@
     "asn1js": "npm:asn1js@^3.0.6",
     "byte-encodings": "npm:byte-encodings@^1.0.11",
     "fetch-mock": "npm:fetch-mock@^12.5.4",
+    "jsonld": "npm:jsonld@^9.0.0",
     "pkijs": "npm:pkijs@^3.2.5"
   },
   "exclude": [

packages/vocab-runtime/deno.json

@@ -35,6 +35,16 @@
       "require": "./dist/mod.cjs",
       "default": "./dist/mod.js"
     },
+    "./jsonld": {
+      "types": {
+        "import": "./dist/jsonld.d.ts",
+        "require": "./dist/jsonld.d.cts",
+        "default": "./dist/jsonld.d.ts"
+      },
+      "import": "./dist/jsonld.js",
+      "require": "./dist/jsonld.cjs",
+      "default": "./dist/jsonld.js"
+    },
     "./package.json": "./package.json"
   },
   "scripts": {
@@ -68,6 +78,7 @@
     "@opentelemetry/api": "catalog:",
     "asn1js": "catalog:",
     "byte-encodings": "catalog:",
+    "jsonld": "^9.0.0",
     "pkijs": "catalog:"
   }
 }

packages/vocab-runtime/package.json

@@ -0,0 +1,4 @@
+// @ts-ignore TS7016
+import jsonld from "jsonld/dist/jsonld.esm.js";
+
+export default jsonld as typeof import("jsonld");