@fedify/vocab 2.4.0-dev.1581 → 2.4.0-dev.1599

package/dist/mod.js

@@ -1,4 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { domainToASCII, domainToUnicode } from "node:url";
@@ -10,7 +10,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.1581+2c99806d";
+var version = "2.4.0-dev.1599+7b19967f";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {

package/dist-tests/{actor-Cxls_bxz.mjs → actor-NhcklZK0.mjs}

@@ -1,7 +1,7 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, G as __toESM, L as Service, U as __commonJSMin, a as Application, k as Organization, v as Group } from "./vocab-DOHLQ4UQ.mjs";
-import { t as getTypeId } from "./type-Cf-vxmre.mjs";
+import { A as Person, G as __toESM, L as Service, U as __commonJSMin, a as Application, k as Organization, v as Group } from "./vocab-BQ8y6QS7.mjs";
+import { t as getTypeId } from "./type-_BlsfT3S.mjs";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { domainToASCII, domainToUnicode } from "node:url";
@@ -1206,7 +1206,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.1581+2c99806d";
+var version = "2.4.0-dev.1599+7b19967f";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, L as Service, W as __exportAll, a as Application, k as Organization, v as Group } from "./vocab-DOHLQ4UQ.mjs";
-import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-Cxls_bxz.mjs";
+import { A as Person, L as Service, W as __exportAll, a as Application, k as Organization, v as Group } from "./vocab-BQ8y6QS7.mjs";
+import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-NhcklZK0.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/cjs.test.mjs

@@ -0,0 +1,28 @@
+import "temporal-polyfill";
+globalThis.addEventListener = () => {};
+import { createRequire } from "node:module";
+import { mockDocumentLoader, test } from "@fedify/fixture";
+import { ok, strictEqual, throws } from "node:assert";
+//#region src/cjs.test.ts
+test("CommonJS entry bundles temporal-polyfill internally", { ignore: "Deno" in globalThis }, async () => {
+	const originalTemporal = globalThis.Temporal;
+	const require = createRequire(import.meta.url);
+	throws(() => require("temporal-polyfill"), (error) => {
+		if (error == null || typeof error !== "object") return false;
+		const { code } = error;
+		return code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || code === "MODULE_NOT_FOUND";
+	});
+	const obj = await require("../dist/mod.cjs").Object.fromJsonLd({
+		"@context": "https://www.w3.org/ns/activitystreams",
+		type: "Object",
+		published: "2025-01-01T12:34:56Z"
+	}, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	});
+	ok(obj.published != null);
+	strictEqual(obj.published.toString(), "2025-01-01T12:34:56Z");
+	strictEqual(globalThis.Temporal, originalTemporal);
+});
+//#endregion
+export {};

package/dist-tests/lookup.test.mjs

@@ -1,9 +1,9 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, E as Object$1, T as Note, o as Collection } from "./vocab-DOHLQ4UQ.mjs";
-import { c as esm_default, i as isActor, o as name, s as version } from "./actor-Cxls_bxz.mjs";
-import { t as getTypeId } from "./type-Cf-vxmre.mjs";
-import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
+import { A as Person, E as Object$1, T as Note, o as Collection } from "./vocab-BQ8y6QS7.mjs";
+import { c as esm_default, i as isActor, o as name, s as version } from "./actor-NhcklZK0.mjs";
+import { t as getTypeId } from "./type-_BlsfT3S.mjs";
+import { t as assertInstanceOf } from "./utils-CQjrpUkt.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, equal, ok, rejects } from "node:assert/strict";
 import { lookupWebFinger } from "@fedify/webfinger";

package/dist-tests/{type-Cf-vxmre.mjs → type-_BlsfT3S.mjs}

@@ -1,4 +1,4 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 globalThis.addEventListener = () => {};
 //#region src/type.ts
 function getTypeId(object) {

package/dist-tests/type.test.mjs

@@ -1,7 +1,7 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, B as getEntityTypeById, C as Link, V as isEntityType } from "./vocab-DOHLQ4UQ.mjs";
-import { t as getTypeId } from "./type-Cf-vxmre.mjs";
+import { A as Person, B as getEntityTypeById, C as Link, V as isEntityType } from "./vocab-BQ8y6QS7.mjs";
+import { t as getTypeId } from "./type-_BlsfT3S.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual } from "node:assert/strict";
 //#region src/type.test.ts

package/dist-tests/{utils-CE8Dk5hm.mjs → utils-CQjrpUkt.mjs}

@@ -1,4 +1,4 @@
-import "@js-temporal/polyfill";
+import "temporal-polyfill";
 globalThis.addEventListener = () => {};
 import { ok } from "node:assert";
 //#region src/utils.ts

package/dist-tests/{vocab-DOHLQ4UQ.mjs → vocab-BQ8y6QS7.mjs}

@@ -1,5 +1,6 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 globalThis.addEventListener = () => {};
+import "node:module";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 import { getLogger } from "@logtape/logtape";

package/dist-tests/vocab.test.mjs

@@ -1,7 +1,7 @@
-import { Temporal } from "@js-temporal/polyfill";
+import { Temporal } from "temporal-polyfill";
 globalThis.addEventListener = () => {};
-import { A as Person, C as Link, D as Offer, E as Object$1, F as QuoteRequest, H as vocab_exports, I as Reject, M as Proposal, N as Question, O as OrderedCollectionPage, P as QuoteAuthorization, R as Source, S as InteractionRule, T as Note, _ as Follow, b as Intent, c as Create, d as Document, f as Endpoints, g as FeaturedItem, h as FeaturedCollection, i as Announce, j as Place, l as CryptographicKey, m as FeatureRequest, n as Activity, o as Collection, p as FeatureAuthorization, r as Agreement, s as Commitment, t as Accept, u as Delete, w as Measure, x as InteractionPolicy, y as Hashtag, z as Tombstone } from "./vocab-DOHLQ4UQ.mjs";
-import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
+import { A as Person, C as Link, D as Offer, E as Object$1, F as QuoteRequest, H as vocab_exports, I as Reject, M as Proposal, N as Question, O as OrderedCollectionPage, P as QuoteAuthorization, R as Source, S as InteractionRule, T as Note, _ as Follow, b as Intent, c as Create, d as Document, f as Endpoints, g as FeaturedItem, h as FeaturedCollection, i as Announce, j as Place, l as CryptographicKey, m as FeatureRequest, n as Activity, o as Collection, p as FeatureAuthorization, r as Agreement, s as Commitment, t as Accept, u as Delete, w as Measure, x as InteractionPolicy, y as Hashtag, z as Tombstone } from "./vocab-BQ8y6QS7.mjs";
+import { t as assertInstanceOf } from "./utils-CQjrpUkt.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { deepStrictEqual, notDeepStrictEqual, ok, rejects, throws } from "node:assert/strict";
 import { configure, reset } from "@logtape/logtape";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.4.0-dev.1581+2c99806d",
+  "version": "2.4.0-dev.1599+7b19967f",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -35,7 +35,6 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@js-temporal/polyfill": "^0.5.1",
     "@multiformats/base-x": "^4.0.1",
     "@logtape/logtape": "^2.2.0",
     "@opentelemetry/api": "^1.9.1",
@@ -43,9 +42,10 @@
     "es-toolkit": "1.46.1",
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.4.0-dev.1581+2c99806d",
-    "@fedify/webfinger": "2.4.0-dev.1581+2c99806d",
-    "@fedify/vocab-runtime": "2.4.0-dev.1581+2c99806d"
+    "temporal-polyfill": "^1.0.1",
+    "@fedify/vocab-tools": "2.4.0-dev.1599+7b19967f",
+    "@fedify/vocab-runtime": "2.4.0-dev.1599+7b19967f",
+    "@fedify/webfinger": "2.4.0-dev.1599+7b19967f"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/src/cjs.test.ts

@@ -0,0 +1,31 @@
+import { ok, strictEqual, throws } from "node:assert";
+import { createRequire } from "node:module";
+import { mockDocumentLoader, test } from "@fedify/fixture";
+
+test("CommonJS entry bundles temporal-polyfill internally", {
+  ignore: "Deno" in globalThis,
+}, async () => {
+  const originalTemporal = globalThis.Temporal;
+
+  const require = createRequire(import.meta.url);
+  throws(
+    () => require("temporal-polyfill"),
+    (error: unknown) => {
+      if (error == null || typeof error !== "object") return false;
+      const { code } = error as { code?: unknown };
+      return code === "ERR_PACKAGE_PATH_NOT_EXPORTED" ||
+        code === "MODULE_NOT_FOUND";
+    },
+  );
+
+  const vocab = require("../dist/mod.cjs");
+  const obj = await vocab.Object.fromJsonLd({
+    "@context": "https://www.w3.org/ns/activitystreams",
+    type: "Object",
+    published: "2025-01-01T12:34:56Z",
+  }, { documentLoader: mockDocumentLoader, contextLoader: mockDocumentLoader });
+
+  ok(obj.published != null);
+  strictEqual(obj.published.toString(), "2025-01-01T12:34:56Z");
+  strictEqual(globalThis.Temporal, originalTemporal);
+});

package/tsdown.config.ts

@@ -1,6 +1,13 @@
 import { glob, mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, join, sep } from "node:path";
 import { defineConfig } from "tsdown";
+import {
+  temporalPolyfillCjsBanner,
+  temporalPolyfillCjsDeps,
+  temporalPolyfillEsmBanner,
+  temporalPolyfillImportPlugin,
+  temporalPolyfillIntro,
+} from "../../scripts/tsdown/temporal.mts";
 
 async function copyFileSafely(
   source: string,
@@ -16,17 +23,21 @@ export default [
       "./src/mod.ts",
     ],
     dts: { compilerOptions: { isolatedDeclarations: true, declaration: true } },
-    format: ["esm", "cjs"],
+    format: {
+      esm: {
+        banner: temporalPolyfillEsmBanner(),
+      },
+      cjs: {
+        deps: temporalPolyfillCjsDeps({
+          neverBundle: [/^node:/],
+        }),
+        plugins: [temporalPolyfillImportPlugin],
+        banner: temporalPolyfillCjsBanner(),
+      },
+    },
     platform: "neutral",
-    deps: { neverBundle: [/^node:/] },
-    banner({ format }) {
-      const js = format === "cjs"
-        ? `const { Temporal } = require("@js-temporal/polyfill");`
-        : `import { Temporal } from "@js-temporal/polyfill";`;
-      return {
-        js,
-        dts: `/// <reference lib="esnext.temporal" />`,
-      };
+    deps: {
+      neverBundle: [/^node:/],
     },
   }),
   defineConfig({
@@ -49,8 +60,7 @@ export default [
       },
     },
     outputOptions: {
-      intro: `
-      import { Temporal } from "@js-temporal/polyfill";
+      intro: `${temporalPolyfillIntro}
       globalThis.addEventListener = () => {};
     `,
     },