seyfert 4.4.1 → 5.0.0

package/lib/index.js

@@ -14,13 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.WorkerManager = exports.ShardManager = exports.Logger = exports.Formatter = exports.LimitedCollection = exports.Collection = void 0;
+exports.config = exports.WorkerManager = exports.ShardManager = exports.GuildRole = exports.TimestampStyle = exports.SeyfertErrorMessages = exports.SeyfertError = exports.LogLevels = exports.Logger = exports.HeadingLevel = exports.Formatter = exports.EmbedColors = exports.createValidationMetadata = exports.LimitedCollection = exports.Collection = void 0;
 exports.createEvent = createEvent;
 exports.extendContext = extendContext;
 __exportStar(require("./client"), exports);
 const base_1 = require("./client/base");
+const intents_1 = require("./client/intents");
 const common_1 = require("./common");
-const types_1 = require("./types");
 //
 __exportStar(require("./api"), exports);
 __exportStar(require("./builders"), exports);
@@ -31,13 +31,23 @@ Object.defineProperty(exports, "Collection", { enumerable: true, get: function (
 Object.defineProperty(exports, "LimitedCollection", { enumerable: true, get: function () { return collection_1.LimitedCollection; } });
 __exportStar(require("./commands"), exports);
 var common_2 = require("./common");
+Object.defineProperty(exports, "createValidationMetadata", { enumerable: true, get: function () { return common_2.createValidationMetadata; } });
+Object.defineProperty(exports, "EmbedColors", { enumerable: true, get: function () { return common_2.EmbedColors; } });
 Object.defineProperty(exports, "Formatter", { enumerable: true, get: function () { return common_2.Formatter; } });
+Object.defineProperty(exports, "HeadingLevel", { enumerable: true, get: function () { return common_2.HeadingLevel; } });
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return common_2.Logger; } });
+Object.defineProperty(exports, "LogLevels", { enumerable: true, get: function () { return common_2.LogLevels; } });
+Object.defineProperty(exports, "SeyfertError", { enumerable: true, get: function () { return common_2.SeyfertError; } });
+Object.defineProperty(exports, "SeyfertErrorMessages", { enumerable: true, get: function () { return common_2.SeyfertErrorMessages; } });
+Object.defineProperty(exports, "TimestampStyle", { enumerable: true, get: function () { return common_2.TimestampStyle; } });
 __exportStar(require("./components"), exports);
 __exportStar(require("./events"), exports);
 __exportStar(require("./langs"), exports);
 //
 __exportStar(require("./structures"), exports);
+var GuildRole_1 = require("./structures/GuildRole");
+Object.defineProperty(exports, "GuildRole", { enumerable: true, get: function () { return GuildRole_1.GuildRole; } });
+__exportStar(require("./types"), exports);
 //
 var discord_1 = require("./websocket/discord");
 Object.defineProperty(exports, "ShardManager", { enumerable: true, get: function () { return discord_1.ShardManager; } });
@@ -70,11 +80,7 @@ exports.config = {
     bot(data) {
         return {
             ...data,
-            intents: 'intents' in data
-                ? typeof data.intents === 'number'
-                    ? data.intents
-                    : (data.intents?.reduce((pr, acc) => pr | (typeof acc === 'number' ? acc : types_1.GatewayIntentBits[acc]), 0) ?? 0)
-                : 0,
+            intents: (0, intents_1.resolveGatewayIntents)(data.intents),
         };
     },
     /**
@@ -88,7 +94,7 @@ exports.config = {
             port: 8080,
             ...data,
         };
-        if ((0, common_1.isCloudfareWorker)())
+        if ((0, common_1.isCloudflareWorker)())
             base_1.BaseClient._seyfertCfWorkerConfig = obj;
         return obj;
     },

package/lib/langs/handler.d.ts

@@ -1,29 +1,32 @@
 import type { FileLoaded } from '../commands/handler';
-import { BaseHandler } from '../common';
+import { type Awaitable, BaseHandler } from '../common';
 import type { LocaleString } from '../types';
+type LangFileResult = {
+    file: Record<string, any>;
+    locale: string;
+} | false;
 export declare class LangsHandler extends BaseHandler {
     values: Partial<Record<string, any>>;
     private __paths;
     filter: (path: string) => boolean;
     defaultLang?: string;
+    preferGuildLocale: boolean;
     aliases: [string, LocaleString[]][];
+    onReload?: (locale: string, value: Record<string, any>) => void;
     getLocale(locale: string): string;
     getKey(lang: string, message: string): string | undefined;
-    get(userLocale: string): import("./router").__InternalParseLocale<import("..").DefaultLocale> & {
-        get(locale?: string): import("..").DefaultLocale;
-    };
+    get(userLocale: string): import("./router").SeyfertLocale;
     load(dir: string): Promise<void>;
-    parse(file: LangInstance): void;
+    parse(file: LangInstance): void | Promise<void>;
+    private applyParsedFile;
     set(instances: LangInstance[]): void;
-    reload(lang: string): Promise<Record<string, any> | null>;
+    reload(lang: string): Promise<any>;
     reloadAll(stopIfFail?: boolean): Promise<void>;
-    onFile(locale: string, { file }: LangInstance): {
-        file: Record<string, any>;
-        locale: string;
-    } | false;
+    onFile(locale: string, { file, name, path }: LangInstance): Awaitable<LangFileResult>;
 }
 export type LangInstance = {
     name: string;
     file: FileLoaded<Record<string, any>>;
-    path: string;
+    path?: string;
 };
+export {};

package/lib/langs/handler.js

@@ -4,12 +4,17 @@ exports.LangsHandler = void 0;
 const node_path_1 = require("node:path");
 const common_1 = require("../common");
 const router_1 = require("./router");
+function isPromiseLike(value) {
+    return !!value && typeof value.then === 'function';
+}
 class LangsHandler extends common_1.BaseHandler {
     values = {};
     __paths = {};
     filter = (path) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts')) || path.endsWith('.json');
     defaultLang;
+    preferGuildLocale = false;
     aliases = [];
+    onReload;
     getLocale(locale) {
         return this.aliases.find(([_key, aliases]) => aliases.includes(locale))?.[0] ?? locale;
     }
@@ -35,15 +40,21 @@ class LangsHandler extends common_1.BaseHandler {
     async load(dir) {
         const files = await this.loadFilesK(await this.getFiles(dir));
         for (const i of files) {
-            this.parse(i);
+            await this.parse(i);
         }
     }
     parse(file) {
         const oldLocale = file.name.split('.').slice(0, -1).join('.') || file.name;
         const result = this.onFile(oldLocale, file);
+        if (isPromiseLike(result))
+            return result.then(value => this.applyParsedFile(file, value));
+        this.applyParsedFile(file, result);
+        return;
+    }
+    applyParsedFile(file, result) {
         if (!result)
             return;
-        if ('path' in file)
+        if (file.path)
             this.__paths[result.locale] = file.path;
         this.values[result.locale] = result.file;
     }
@@ -53,7 +64,7 @@ class LangsHandler extends common_1.BaseHandler {
         }
     }
     async reload(lang) {
-        if ((0, common_1.isCloudfareWorker)()) {
+        if ((0, common_1.isCloudflareWorker)()) {
             throw new common_1.SeyfertError('RELOAD_NOT_SUPPORTED', {
                 metadata: { detail: 'Reload in Cloudflare worker is not supported' },
             });
@@ -69,7 +80,9 @@ class LangsHandler extends common_1.BaseHandler {
         }));
         if (!value)
             return null;
-        return (this.values[lang] = value.file);
+        this.values[lang] = value.file;
+        this.onReload?.(lang, value.file);
+        return this.values[lang];
     }
     async reloadAll(stopIfFail = true) {
         for (const i in this.__paths) {
@@ -82,13 +95,37 @@ class LangsHandler extends common_1.BaseHandler {
             }
         }
     }
-    onFile(locale, { file }) {
-        return file.default
-            ? {
+    onFile(locale, { file, name, path }) {
+        const modulePath = path ?? name;
+        if ((0, common_1.isObject)(file.default)) {
+            return {
                 file: file.default,
                 locale,
-            }
-            : false;
+            };
+        }
+        if (!(0, common_1.isObject)(file)) {
+            this.logger.warn(`Lang file "${modulePath}" skipped: invalid module value.`, `exports: ${typeof file}`);
+            return false;
+        }
+        const module = file;
+        const isModuleNamespace = module[Symbol.toStringTag] === 'Module' || 'default' in file || '__esModule' in file;
+        if (!isModuleNamespace) {
+            return { file, locale };
+        }
+        const exportNames = Object.keys(file).filter(key => key !== 'default' && key !== '__esModule');
+        const objectExportNames = exportNames.filter(key => (0, common_1.isObject)(file[key]));
+        if (objectExportNames.length === 1 && !('default' in file)) {
+            const exportName = objectExportNames[0];
+            this.logger.warn(`Lang file "${modulePath}" has no default export; using named object export "${exportName}".`, `exports: ${exportNames.join(', ') || '(none)'}`);
+            return {
+                file: file[exportName],
+                locale,
+            };
+        }
+        const invalidDefault = 'default' in file ? 'default' : undefined;
+        const invalidExports = [invalidDefault, ...exportNames].filter((key) => !!key);
+        this.logger.warn(`Lang file "${modulePath}" skipped: ${objectExportNames.length > 1 ? 'ambiguous named object exports' : 'no valid default export'}.`, `exports: ${invalidExports.join(', ') || '(none)'}`);
+        return false;
     }
 }
 exports.LangsHandler = LangsHandler;

package/lib/langs/router.d.ts

@@ -1,7 +1,5 @@
 import type { DefaultLocale } from '../commands';
-export declare const LangRouter: (userLocale: string, defaultLang: string, langs: Partial<Record<string, any>>) => (route?: string[], args?: any[]) => __InternalParseLocale<DefaultLocale> & {
-    get(locale?: string): DefaultLocale;
-};
+export declare const LangRouter: (userLocale: string, defaultLang: string, langs: Partial<Record<string, any>>) => (route?: string[], args?: any[]) => SeyfertLocale;
 export type __InternalParseLocale<T extends Record<string, any>> = {
     [K in keyof T]: T[K] extends (...args: any[]) => any ? (...args: Parameters<T[K]>) => {
         get(locale?: string): ReturnType<T[K]>;
@@ -13,5 +11,14 @@ export type __InternalParseLocale<T extends Record<string, any>> = {
         get(locale?: string): T[K];
     } : never;
 };
+/**
+ * The `ctx.t` / `client.t(...)` accessor type. Kept as a named alias so that inferred return
+ * types (BaseClient.t, the context `t` getters, ...) emit a reference to `DefaultLocale` instead
+ * of eagerly baking it to `{}` at build time (where `SeyfertRegistry` has no `langs`), which left
+ * consumers with an untyped `ctx.t`.
+ */
+export type SeyfertLocale = __InternalParseLocale<DefaultLocale> & {
+    get(locale?: string): DefaultLocale;
+};
 export type ParseLocales<T extends Record<string, any>> = T;
 /**Idea inspiration from: FreeAoi | Fixed by: Drylozu */

package/lib/structures/Application.d.ts

@@ -21,7 +21,7 @@ export declare class Application extends DiscordBase<APIApplication> {
     /**
      * Get an activity instance.
      */
-    getActivityInstance(instanceId: string): Promise<import("../types").RestGetAPIApplicationActivityInstanceResult>;
+    getActivityInstance(instanceId: string): Promise<import("..").RestGetAPIApplicationActivityInstanceResult>;
     emojis: {
         /**
          * Get an application emoji.

package/lib/structures/Emoji.d.ts

@@ -1,6 +1,6 @@
 import type { BaseCDNUrlOptions } from '../api';
 import type { ReturnCache } from '../cache';
-import { type ApplicationEmojiStructure, type GuildEmojiStructure, type GuildStructure, type UserStructure } from '../client';
+import { type ApplicationEmojiStructure, type GuildEmojiStructure, type GuildStructure, type UserStructure } from '../client/transformers';
 import type { UsingClient } from '../commands';
 import { type EmojiShorter, type MethodContext, type ObjectToLower, type When } from '../common';
 import type { APIApplicationEmoji, APIEmoji, RESTPatchAPIApplicationEmojiJSONBody, RESTPatchAPIGuildEmojiJSONBody } from '../types';
@@ -11,7 +11,7 @@ export declare class Emoji<T extends boolean = false> extends DiscordBase {
     user: When<T, UserStructure>;
     constructor(client: UsingClient, data: APIEmoji);
     url(options?: BaseCDNUrlOptions): string;
-    toString(): string;
+    toString(): `<:${string}:${string}>` | `<a:${string}:${string}>`;
     toJSON(): {
         id: string;
         name: string | null;
@@ -41,5 +41,5 @@ export declare class ApplicationEmoji extends Emoji<true> {
     constructor(client: UsingClient, data: APIApplicationEmoji);
     fetch(): Promise<ApplicationEmojiStructure>;
     edit(body: RESTPatchAPIApplicationEmojiJSONBody): Promise<ApplicationEmojiStructure>;
-    delete(): Promise<undefined>;
+    delete(): Promise<void>;
 }

package/lib/structures/Emoji.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationEmoji = exports.GuildEmoji = exports.Emoji = void 0;
-const client_1 = require("../client");
+const transformers_1 = require("../client/transformers");
 const common_1 = require("../common");
 const DiscordBase_1 = require("./extra/DiscordBase");
 class Emoji extends DiscordBase_1.DiscordBase {
     user;
     constructor(client, data) {
         super(client, { ...data, id: data.id });
-        this.user = (data.user && client_1.Transformers.User(client, data.user));
+        this.user = (data.user && transformers_1.Transformers.User(client, data.user));
     }
     url(options) {
         return this.rest.cdn.emojis(this.id).get(options);