diff --git a/federation/http/index.ts b/federation/http/index.ts index 5e42f8f..8d7ccac 100644 --- a/federation/http/index.ts +++ b/federation/http/index.ts @@ -10,8 +10,8 @@ import type { ServerMetadata, Undo, User, -} from "@/federation/schemas"; -import type { EntityValidator } from "@/federation/validator/index"; +} from "../schemas"; +import type { EntityValidator } from "../validator/index"; type MaybePromise = T | Promise; diff --git a/federation/index.ts b/federation/index.ts index 0498f2d..78c7dde 100644 --- a/federation/index.ts +++ b/federation/index.ts @@ -5,18 +5,15 @@ * @see module:federation/schemas/base */ -import { - SignatureConstructor, - SignatureValidator, -} from "@/federation/cryptography"; -import { RequestParserHandler } from "@/federation/http"; +import type { ValidationError } from "zod-validation-error"; +import { SignatureConstructor, SignatureValidator } from "./cryptography"; +import { RequestParserHandler } from "./http"; import { FederationRequester, type Output, ResponseError, -} from "@/federation/requester/index"; -import { EntityValidator } from "@/federation/validator/index"; -import type { ValidationError } from "zod-validation-error"; +} from "./requester/index"; +import { EntityValidator } from "./validator/index"; export { EntityValidator, diff --git a/federation/requester/constants.ts b/federation/requester/constants.ts index 552e37f..f9bbf3a 100644 --- a/federation/requester/constants.ts +++ b/federation/requester/constants.ts @@ -1,3 +1,3 @@ -import pkg from "@/federation/package.json" with { type: "json" }; +import pkg from "../package.json" with { type: "json" }; export const DEFAULT_UA = `LysandFederation/${pkg.version} (+${pkg.homepage})`; diff --git a/federation/requester/index.ts b/federation/requester/index.ts index 2f6a37f..0048e03 100644 --- a/federation/requester/index.ts +++ b/federation/requester/index.ts @@ -1,8 +1,8 @@ -import type { SignatureConstructor } from "@/federation/cryptography"; -import { DEFAULT_UA } from "@/federation/requester/constants"; -import type { User } from "@/federation/schemas"; -import { WebFingerSchema } from "@/federation/schemas/webfinger"; import { fromZodError } from "zod-validation-error"; +import type { SignatureConstructor } from "../cryptography"; +import type { User } from "../schemas"; +import { WebFingerSchema } from "../schemas/webfinger"; +import { DEFAULT_UA } from "./constants"; type HttpVerb = "GET" | "POST" | "PUT" | "PATCH" | "DELETE"; diff --git a/federation/schemas.ts b/federation/schemas.ts index d7f55bc..15d9122 100644 --- a/federation/schemas.ts +++ b/federation/schemas.ts @@ -1,3 +1,4 @@ +import type { z } from "zod"; import type { ActionSchema, ActorPublicKeyDataSchema, @@ -20,8 +21,7 @@ import type { UserSchema, VanityExtensionSchema, VisibilitySchema, -} from "@/federation/schemas/base"; -import type { z } from "zod"; +} from "./schemas/base"; // biome-ignore lint/suspicious/noExplicitAny: Used only as a base type type AnyZod = z.ZodType; diff --git a/federation/schemas/base.ts b/federation/schemas/base.ts index 748deb8..b907fca 100644 --- a/federation/schemas/base.ts +++ b/federation/schemas/base.ts @@ -1,9 +1,9 @@ -import { ContentFormatSchema } from "@/federation/schemas/content_format"; -import { ExtensionPropertySchema } from "@/federation/schemas/extensions"; -import { CustomEmojiExtensionSchema } from "@/federation/schemas/extensions/custom_emojis"; -import { VanityExtensionSchema } from "@/federation/schemas/extensions/vanity"; -import { extensionTypeRegex } from "@/federation/schemas/regex"; import { z } from "zod"; +import { ContentFormatSchema } from "./content_format"; +import { ExtensionPropertySchema } from "./extensions"; +import { CustomEmojiExtensionSchema } from "./extensions/custom_emojis"; +import { VanityExtensionSchema } from "./extensions/vanity"; +import { extensionTypeRegex } from "./regex"; const EntitySchema = z.object({ id: z.string().uuid(), diff --git a/federation/schemas/extensions.ts b/federation/schemas/extensions.ts index e1518c2..7078bde 100644 --- a/federation/schemas/extensions.ts +++ b/federation/schemas/extensions.ts @@ -1,5 +1,5 @@ -import { CustomEmojiExtensionSchema } from "@/federation/schemas/extensions/custom_emojis"; import { z } from "zod"; +import { CustomEmojiExtensionSchema } from "./extensions/custom_emojis"; export const ExtensionPropertySchema = z.object({ "org.lysand:custom_emojis": diff --git a/federation/schemas/extensions/custom_emojis.ts b/federation/schemas/extensions/custom_emojis.ts index ed8812d..fb4ac0f 100644 --- a/federation/schemas/extensions/custom_emojis.ts +++ b/federation/schemas/extensions/custom_emojis.ts @@ -1,5 +1,3 @@ -import { ContentFormatSchema } from "@/federation/schemas/content_format"; -import { emojiRegex } from "@/federation/schemas/regex"; /** * Custom emojis extension. * @module federation/schemas/extensions/custom_emojis @@ -7,6 +5,8 @@ import { emojiRegex } from "@/federation/schemas/regex"; * @see https://lysand.org/extensions/custom-emojis */ import { z } from "zod"; +import { ContentFormatSchema } from "../content_format"; +import { emojiRegex } from "../regex"; /** * @description Used to validate the properties the extension's custom field diff --git a/federation/schemas/extensions/polls.ts b/federation/schemas/extensions/polls.ts index a6cab65..7d5c7b3 100644 --- a/federation/schemas/extensions/polls.ts +++ b/federation/schemas/extensions/polls.ts @@ -1,5 +1,3 @@ -import { ExtensionSchema } from "@/federation/schemas/base"; -import { ContentFormatSchema } from "@/federation/schemas/content_format"; /** * Polls extension * @module federation/schemas/extensions/polls @@ -7,6 +5,8 @@ import { ContentFormatSchema } from "@/federation/schemas/content_format"; * @see https://lysand.org/extensions/polls */ import { z } from "zod"; +import { ExtensionSchema } from "../base"; +import { ContentFormatSchema } from "../content_format"; /** * @description Poll extension entity diff --git a/federation/schemas/extensions/reactions.ts b/federation/schemas/extensions/reactions.ts index ef3a8a6..5475309 100644 --- a/federation/schemas/extensions/reactions.ts +++ b/federation/schemas/extensions/reactions.ts @@ -1,4 +1,3 @@ -import { ExtensionSchema } from "@/federation/schemas/base"; /** * Reactions extension * @module federation/schemas/extensions/reactions @@ -6,6 +5,7 @@ import { ExtensionSchema } from "@/federation/schemas/base"; * @see https://lysand.org/extensions/reactions */ import { z } from "zod"; +import { ExtensionSchema } from "../base"; /** * @description Reaction extension entity diff --git a/federation/schemas/extensions/vanity.ts b/federation/schemas/extensions/vanity.ts index 31e905f..059de6d 100644 --- a/federation/schemas/extensions/vanity.ts +++ b/federation/schemas/extensions/vanity.ts @@ -5,8 +5,8 @@ * @see https://lysand.org/extensions/vanity */ -import { ContentFormatSchema } from "@/federation/schemas/content_format"; import { z } from "zod"; +import { ContentFormatSchema } from "../content_format"; /** * @description Vanity extension entity diff --git a/federation/validator/index.ts b/federation/validator/index.ts index 6fb6096..5c7c527 100644 --- a/federation/validator/index.ts +++ b/federation/validator/index.ts @@ -1,3 +1,5 @@ +import type { z } from "zod"; +import { fromError } from "zod-validation-error"; import { ActionSchema, ActorPublicKeyDataSchema, @@ -20,9 +22,7 @@ import { UserSchema, VanityExtensionSchema, VisibilitySchema, -} from "@/federation/schemas/base"; -import type { z } from "zod"; -import { fromError } from "zod-validation-error"; +} from "../schemas/base"; // biome-ignore lint/suspicious/noExplicitAny: Used only as a base type type AnyZod = z.ZodType; diff --git a/tsconfig.json b/tsconfig.json index 9253cb5..1cf67a4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,11 +22,7 @@ "experimentalDecorators": true, "verbatimModuleSyntax": true, "noUnusedLocals": true, - "noUnusedParameters": true, - "paths": { - "@/federation/*": ["./federation/*"], - "@/client/*": ["./client/*"] - } + "noUnusedParameters": true }, "include": ["*.ts", "*.d.ts", "**/*.ts", "**/*.d.ts"] }