@fedify/fedify 1.10.0-dev.5 → 2.0.0-dev.12

package/dist/src/vocab/organization.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Organization
 compactName: Organization
 uri: "https://www.w3.org/ns/activitystreams#Organization"

package/dist/src/vocab/page.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Page
 compactName: Page
 uri: "https://www.w3.org/ns/activitystreams#Page"

package/dist/src/vocab/person.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Person
 compactName: Person
 uri: "https://www.w3.org/ns/activitystreams#Person"

package/dist/src/vocab/place.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Place
 compactName: Place
 uri: "https://www.w3.org/ns/activitystreams#Place"

package/dist/src/vocab/profile.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Profile
 compactName: Profile
 uri: "https://www.w3.org/ns/activitystreams#Profile"

package/dist/src/vocab/propertyvalue.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: PropertyValue
 compactName: PropertyValue
 # The below URI intentionally lacks a path slash due to Mastodon's mistake:

package/dist/src/vocab/question.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Question
 compactName: Question
 uri: "https://www.w3.org/ns/activitystreams#Question"

package/dist/src/vocab/read.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Read
 compactName: Read
 uri: "https://www.w3.org/ns/activitystreams#Read"

package/dist/src/vocab/reject.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Reject
 compactName: Reject
 uri: "https://www.w3.org/ns/activitystreams#Reject"

package/dist/src/vocab/relationship.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Relationship
 compactName: Relationship
 uri: "https://www.w3.org/ns/activitystreams#Relationship"

package/dist/src/vocab/remove.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Remove
 compactName: Remove
 uri: "https://www.w3.org/ns/activitystreams#Remove"

package/dist/src/vocab/service.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Service
 compactName: Service
 uri: "https://www.w3.org/ns/activitystreams#Service"

package/dist/src/vocab/source.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Source
 compactName: as:Source
 uri: "https://www.w3.org/ns/activitystreams#Source"

package/dist/src/vocab/tentativeaccept.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: TentativeAccept
 compactName: TentativeAccept
 uri: "https://www.w3.org/ns/activitystreams#TentativeAccept"

package/dist/src/vocab/tentativereject.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: TentativeReject
 compactName: TentativeReject
 uri: "https://www.w3.org/ns/activitystreams#TentativeReject"

package/dist/src/vocab/tombstone.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Tombstone
 compactName: Tombstone
 uri: "https://www.w3.org/ns/activitystreams#Tombstone"

package/dist/src/vocab/travel.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Travel
 compactName: Travel
 uri: "https://www.w3.org/ns/activitystreams#Travel"

package/dist/src/vocab/undo.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Undo
 compactName: Undo
 uri: "https://www.w3.org/ns/activitystreams#Undo"

package/dist/src/vocab/update.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Update
 compactName: Update
 uri: "https://www.w3.org/ns/activitystreams#Update"

package/dist/src/vocab/video.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: Video
 compactName: Video
 uri: "https://www.w3.org/ns/activitystreams#Video"

package/dist/src/vocab/view.yaml

@@ -1,4 +1,4 @@
-$schema: ../codegen/schema.yaml
+$schema: ../../../vocab-tools/schema.yaml
 name: View
 compactName: View
 uri: "https://www.w3.org/ns/activitystreams#View"

package/dist/testing/docloader.test.js

@@ -3,17 +3,15 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-BBugK2n5.js";
+import "../lookup-C7SSHgK7.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../lookup-DSMnJERg.js";
-import { mockDocumentLoader, test } from "../testing-J7AQVhyi.js";
-import "../std__assert-X-_kMxKM.js";
-import "../assert_rejects-DiIiJbZn.js";
-import "../assert_is_error-BPGph1Jx.js";
-import "../assert_not_equals-f3m3epl3.js";
-import "../assert_throws-BOO88avQ.js";
+import { mockDocumentLoader, test } from "../testing-D-nLIHkh.js";
+import "../std__assert-DWivtrGR.js";
+import "../assert_rejects-Ce45JcFg.js";
+import "../assert_throws-BNXdRGWP.js";
+import "../assert_not_equals-C80BG-_5.js";
 
 //#region src/testing/docloader.test.ts
 test("mockDocumentLoader()", async () => {

package/dist/testing/mod.d.ts

@@ -1,102 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
+import { DocumentLoader, GetUserAgentOptions, LanguageString } from "@fedify/vocab-runtime";
 import { Span, TracerProvider } from "@opentelemetry/api";
-import { LanguageTag } from "@phensley/language-tag";
 
-//#region src/runtime/docloader.d.ts
-/**
- * A remote JSON-LD document and its context fetched by
- * a {@link DocumentLoader}.
- */
-interface RemoteDocument {
-  /**
-   * The URL of the context document.
-   */
-  contextUrl: string | null;
-  /**
-   * The fetched JSON-LD document.
-   */
-  document: unknown;
-  /**
-   * The URL of the fetched document.
-   */
-  documentUrl: string;
-}
-/**
- * Options for {@link DocumentLoader}.
- * @since 1.8.0
- */
-interface DocumentLoaderOptions {
-  /**
-   * An `AbortSignal` for cancellation.
-   * @since 1.8.0
-   */
-  signal?: AbortSignal;
-}
-/**
- * A JSON-LD document loader that fetches documents from the Web.
- * @param url The URL of the document to load.
- * @param options The options for the document loader.
- * @returns The loaded remote document.
- */
-type DocumentLoader = (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>;
-/**
- * A factory function that creates a {@link DocumentLoader} with options.
- * @param options The options for the document loader.
- * @returns The document loader.
- * @since 1.4.0
- */
-
-/**
- * Options for making `User-Agent` string.
- * @see {@link getUserAgent}
- * @since 1.3.0
- */
-interface GetUserAgentOptions {
-  /**
-   * An optional software name and version, e.g., `"Hollo/1.0.0"`.
-   */
-  software?: string | null;
-  /**
-   * An optional URL to append to the user agent string.
-   * Usually the URL of the ActivityPub instance.
-   */
-  url?: string | URL | null;
-}
-/**
- * Gets the user agent string for the given application and URL.
- * @param options The options for making the user agent string.
- * @returns The user agent string.
- * @since 1.3.0
- */
-//#endregion
-//#region src/nodeinfo/semver.d.ts
-/**
- * A SemVer object parsed into its constituent parts.
- * @since 1.2.0
- */
-interface SemVer {
-  /** The major version */
-  major: number;
-  /** The minor version */
-  minor: number;
-  /** The patch version */
-  patch: number;
-  /**
-   * The prerelease version
-   *
-   * @default {[]}
-   */
-  prerelease?: (string | number)[];
-  /**
-   * The build metadata
-   *
-   * @default {[]}
-   */
-  build?: string[];
-}
-//#endregion
 //#region src/nodeinfo/types.d.ts
 /**
  * The type of the result of parsing JSON.
@@ -146,9 +53,8 @@ interface Software {
   name: string;
   /**
    * The version of this server software.
-   * @see {@link parseSemVer}
    */
-  version: SemVer;
+  version: string;
   /**
    * The URL of the source code repository of this server software.
    */
@@ -276,21 +182,6 @@ interface GetNodeInfoOptions {
  * @since 1.2.0
  */
 //#endregion
-//#region src/runtime/langstr.d.ts
-/**
- * A language-tagged string which corresponds to the `rdf:langString` type.
- */
-declare class LanguageString extends String {
-  readonly language: LanguageTag;
-  /**
-   * Constructs a new `LanguageString`.
-   * @param value A string value written in the given language.
-   * @param language The language of the string.  If a string is given, it will
-   *                 be parsed as a `LanguageTag`.
-   */
-  constructor(value: string, language: LanguageTag | string);
-}
-//#endregion
 //#region src/vocab/vocab.d.ts
 /** Describes an object of any kind. The Object type serves as the base type for
  * most of the other kinds of objects defined in the Activity Vocabulary,
@@ -4229,7 +4120,7 @@ declare class Link {
     mediaType?: string | null;
     name?: string | LanguageString | null;
     names?: ((string | LanguageString))[];
-    language?: LanguageTag | null;
+    language?: Intl.Locale | null;
     height?: number | null;
     width?: number | null;
     previews?: (Link | Object$1 | URL)[];
@@ -4252,7 +4143,7 @@ declare class Link {
     mediaType?: string | null;
     name?: string | LanguageString | null;
     names?: ((string | LanguageString))[];
-    language?: LanguageTag | null;
+    language?: Intl.Locale | null;
     height?: number | null;
     width?: number | null;
     previews?: (Link | Object$1 | URL)[];
@@ -4296,7 +4187,7 @@ declare class Link {
   /** Hints as to the language used by the target resource.
    * Value MUST be a BCP 47 Language-Tag.
    */
-  get language(): LanguageTag | null;
+  get language(): Intl.Locale | null;
   /** On a {@link Link}, specifies a hint as to the rendering height in
    * device-independent pixels of the linked resource.
    */
@@ -4383,7 +4274,7 @@ declare class Hashtag extends Link {
     mediaType?: string | null;
     name?: string | LanguageString | null;
     names?: ((string | LanguageString))[];
-    language?: LanguageTag | null;
+    language?: Intl.Locale | null;
     height?: number | null;
     width?: number | null;
     previews?: (Link | Object$1 | URL)[];
@@ -4406,7 +4297,7 @@ declare class Hashtag extends Link {
     mediaType?: string | null;
     name?: string | LanguageString | null;
     names?: ((string | LanguageString))[];
-    language?: LanguageTag | null;
+    language?: Intl.Locale | null;
     height?: number | null;
     width?: number | null;
     previews?: (Link | Object$1 | URL)[];
@@ -8127,13 +8018,13 @@ interface CollectionCallbackSetters<TContext extends Context<TContextData>, TCon
  *
  *  -  `"per-origin"`: Activities are deduplicated per receiving server's origin.
  *     The same activity ID will be processed only once on each receiving server,
- *     but can be processed separately on different receiving servers. This was
- *     the default behavior in Fedify 1.x versions.
+ *     but can be processed separately on different receiving servers. This had
+ *     been the default behavior in Fedify 1.x versions.
  *
  *  -  `"per-inbox"`: Activities are deduplicated per inbox. The same activity
  *     ID can be processed once per inbox, allowing the same activity to be
  *     delivered to multiple inboxes independently.  This follows standard
- *     ActivityPub behavior and will be the default in Fedify 2.0.
+ *     ActivityPub behavior and is the default strategy since Fedify 2.0.0.
  *
  * @since 1.9.0
  */

package/dist/testing/mod.js

@@ -3,8 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-BBugK2n5.js";
-import "../lookup-DSMnJERg.js";
-import { createInboxContext, createRequestContext, test, testDefinitions } from "../testing-J7AQVhyi.js";
+import "../lookup-C7SSHgK7.js";
+import { createInboxContext, createRequestContext, test, testDefinitions } from "../testing-D-nLIHkh.js";
 
 export { createInboxContext, createRequestContext, test, testDefinitions };

package/dist/{testing-J7AQVhyi.js → testing-D-nLIHkh.js}

@@ -3,8 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { __require, lookupWebFinger } from "./type-BBugK2n5.js";
-import { RouterError, lookupObject, traverseCollection } from "./lookup-DSMnJERg.js";
+import { RouterError, __require, lookupObject, lookupWebFinger, traverseCollection } from "./lookup-C7SSHgK7.js";
 import { configure, getConsoleSink, getLogger, reset } from "@logtape/logtape";
 import { trace } from "@opentelemetry/api";
 

package/dist/{types-C-qRy7Sr.js → types-BtUjyi5y.js}

@@ -2,152 +2,9 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { getUserAgent } from "./docloader-Bmu3XCd9.js";
 import { getLogger } from "@logtape/logtape";
+import { getUserAgent } from "@fedify/vocab-runtime";
 
-//#region src/nodeinfo/semver.ts
-const MAX_LENGTH = 256;
-/**
-* A single `0`, or a non-zero digit followed by zero or more digits.
-*/
-const NUMERIC_IDENTIFIER = "0|[1-9]\\d*";
-/**
-* Zero or more digits, followed by a letter or hyphen, and then zero or more letters, digits, or hyphens.
-*/
-const NON_NUMERIC_IDENTIFIER = "\\d*[a-zA-Z-][a-zA-Z0-9-]*";
-/**
-* Three dot-separated numeric identifiers.
-*/
-const VERSION_CORE = `(?<major>${NUMERIC_IDENTIFIER})\\.(?<minor>${NUMERIC_IDENTIFIER})\\.(?<patch>${NUMERIC_IDENTIFIER})`;
-/**
-* A numeric identifier, or a non-numeric identifier.
-*/
-const PRERELEASE_IDENTIFIER = `(?:${NUMERIC_IDENTIFIER}|${NON_NUMERIC_IDENTIFIER})`;
-/**
-* A hyphen, followed by one or more dot-separated pre-release version identifiers.
-* @example "-pre.release"
-*/
-const PRERELEASE = `(?:-(?<prerelease>${PRERELEASE_IDENTIFIER}(?:\\.${PRERELEASE_IDENTIFIER})*))`;
-/**
-* Any combination of digits, letters, or hyphens.
-*/
-const BUILD_IDENTIFIER = "[0-9A-Za-z-]+";
-/**
-* A plus sign, followed by one or more period-separated build metadata identifiers.
-* @example "+build.meta"
-*/
-const BUILD = `(?:\\+(?<buildmetadata>${BUILD_IDENTIFIER}(?:\\.${BUILD_IDENTIFIER})*))`;
-/**
-* A version, followed optionally by a pre-release version and build metadata.
-*/
-const FULL_VERSION = `v?${VERSION_CORE}${PRERELEASE}?${BUILD}?`;
-const FULL_REGEXP = /* @__PURE__ */ new RegExp(`^${FULL_VERSION}$`);
-/**
-* Attempt to parse a string as a semantic version, returning a SemVer object.
-*
-* @example Usage
-* ```ts
-* import { parseSemVer } from "@fedify/fedify/nodeinfo";
-* import { assertEquals } from "@std/assert";
-*
-* const version = parseSemVer("1.2.3");
-* assertEquals(version, {
-*   major: 1,
-*   minor: 2,
-*   patch: 3,
-*   prerelease: [],
-*   build: [],
-* });
-* ```
-*
-* @throws {TypeError} If the input string is invalid.
-* @param value The version string to parse
-* @returns A valid SemVer
-* @since 1.2.0
-*/
-function parseSemVer(value) {
-	if (typeof value !== "string") throw new TypeError(`Cannot parse version as version must be a string: received ${typeof value}`);
-	if (value.length > MAX_LENGTH) throw new TypeError(`Cannot parse version as version length is too long: length is ${value.length}, max length is ${MAX_LENGTH}`);
-	value = value.trim();
-	const groups = value.match(FULL_REGEXP)?.groups;
-	if (!groups) throw new TypeError(`Cannot parse version: ${value}`);
-	const major = parseNumber(groups.major, `Cannot parse version ${value}: invalid major version`);
-	const minor = parseNumber(groups.minor, `Cannot parse version ${value}: invalid minor version`);
-	const patch = parseNumber(groups.patch, `Cannot parse version ${value}: invalid patch version`);
-	const prerelease = groups.prerelease ? parsePrerelease(groups.prerelease) : [];
-	const build = groups.buildmetadata ? parseBuild(groups.buildmetadata) : [];
-	return {
-		major,
-		minor,
-		patch,
-		prerelease,
-		build
-	};
-}
-/**
-* Returns true if the value is a valid SemVer number.
-*
-* Must be a number. Must not be NaN. Can be positive or negative infinity.
-* Can be between 0 and MAX_SAFE_INTEGER.
-* @param value The value to check
-* @returns True if its a valid semver number
-*/
-function isValidNumber(value) {
-	return typeof value === "number" && !Number.isNaN(value) && (!Number.isFinite(value) || 0 <= value && value <= Number.MAX_SAFE_INTEGER);
-}
-const NUMERIC_IDENTIFIER_REGEXP = /* @__PURE__ */ new RegExp(`^${NUMERIC_IDENTIFIER}$`);
-function parsePrerelease(prerelease) {
-	return prerelease.split(".").filter(Boolean).map((id) => {
-		if (NUMERIC_IDENTIFIER_REGEXP.test(id)) {
-			const number = Number(id);
-			if (isValidNumber(number)) return number;
-		}
-		return id;
-	});
-}
-function parseBuild(buildmetadata) {
-	return buildmetadata.split(".").filter(Boolean);
-}
-function parseNumber(input, errorMessage) {
-	const number = Number(input);
-	if (!isValidNumber(number)) throw new TypeError(errorMessage);
-	return number;
-}
-function formatNumber(value) {
-	return value.toFixed(0);
-}
-/**
-* Format a SemVer object into a string.
-*
-* @example Usage
-* ```ts
-* import { formatSemVer } from "@fedify/fedify/nodeinfo";
-* import { assertEquals } from "@std/assert";
-*
-* const semver = {
-*   major: 1,
-*   minor: 2,
-*   patch: 3,
-* };
-* assertEquals(formatSemVer(semver), "1.2.3");
-* ```
-*
-* @param version The SemVer to format
-* @returns The string representation of a semantic version.
-* @since 1.2.0
-*/
-function formatSemVer(version) {
-	const major = formatNumber(version.major);
-	const minor = formatNumber(version.minor);
-	const patch = formatNumber(version.patch);
-	const pre = version.prerelease?.join(".") ?? "";
-	const build = version.build?.join(".") ?? "";
-	const primary = `${major}.${minor}.${patch}`;
-	const release = [primary, pre].filter((v) => v).join("-");
-	return [release, build].filter((v) => v).join("+");
-}
-
-//#endregion
 //#region src/nodeinfo/client.ts
 const logger = getLogger([
 	"fedify",
@@ -274,28 +131,10 @@ function parseSoftware(data, options = {}) {
 		name = data.name.trim().toLowerCase();
 	} else return null;
 	let version;
-	if ("version" in data && typeof data.version === "string") try {
-		version = parseSemVer(data.version);
-	} catch {
-		if (!options.tryBestEffort) return null;
-		const parts = data.version.split(".").map((p) => parseInt(p, 10));
-		version = {
-			major: !isNaN(parts[0]) ? parts[0] : 0,
-			minor: !isNaN(parts[1]) ? parts[1] : 0,
-			patch: !isNaN(parts[2]) ? parts[2] : 0,
-			build: [],
-			prerelease: []
-		};
-	}
+	if ("version" in data) version = String(data.version);
 	else {
 		if (!options.tryBestEffort) return null;
-		version = {
-			major: 0,
-			minor: 0,
-			patch: 0,
-			build: [],
-			prerelease: []
-		};
+		version = "0.0.0";
 	}
 	let repository;
 	if ("repository" in data) {
@@ -432,7 +271,7 @@ function nodeInfoToJson(nodeInfo) {
 		version: "2.1",
 		software: {
 			name: nodeInfo.software.name,
-			version: formatSemVer(nodeInfo.software.version),
+			version: nodeInfo.software.version,
 			repository: nodeInfo.software.repository?.href,
 			homepage: nodeInfo.software.homepage?.href
 		},
@@ -455,4 +294,4 @@ function nodeInfoToJson(nodeInfo) {
 }
 
 //#endregion
-export { formatSemVer, getNodeInfo, nodeInfoToJson, parseNodeInfo, parseSemVer };
+export { getNodeInfo, nodeInfoToJson, parseNodeInfo };

package/dist/{types-BIgY6c-l.js → types-C2XVl6gj.js}

@@ -3,8 +3,6 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { formatSemVer } from "./semver-dArNLkR9.js";
-
 //#region src/nodeinfo/types.ts
 /**
 * Converts a {@link NodeInfo} object to a JSON value.
@@ -25,7 +23,7 @@ function nodeInfoToJson(nodeInfo) {
 		version: "2.1",
 		software: {
 			name: nodeInfo.software.name,
-			version: formatSemVer(nodeInfo.software.version),
+			version: nodeInfo.software.version,
 			repository: nodeInfo.software.repository?.href,
 			homepage: nodeInfo.software.homepage?.href
 		},