From 821de65b86c7e6d6873b633ace1139694c2c5295 Mon Sep 17 00:00:00 2001 From: Jacob Nguyen <76754747+jacoobes@users.noreply.github.com> Date: Mon, 29 Apr 2024 00:08:57 -0500 Subject: [PATCH] internal namespace --- package.json | 10 +++------- src/_internal.ts | 2 +- src/core/index.ts | 4 ---- src/core/ioc/container.ts | 2 +- src/handlers/dispatchers.ts | 2 +- src/handlers/event-utils.ts | 3 ++- src/handlers/interaction-event.ts | 2 +- src/handlers/message-event.ts | 2 +- src/index.ts | 6 ++++-- src/types/core-modules.ts | 2 +- src/types/core-plugin.ts | 3 ++- src/types/utility.ts | 2 +- 12 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 src/core/index.ts diff --git a/package.json b/package.json index 1161279..db2658a 100644 --- a/package.json +++ b/package.json @@ -5,18 +5,14 @@ "description": "A complete, customizable, typesafe, & reactive framework for discord bots.", "main": "./dist/index.js", "module": "./dist/index.js", - "types": "./dist/index.d.ts", "exports": { ".": { "import": "./dist/index.js", - "require": "./dist/index.js", - "types": "./dist/index.d.ts" + "require": "./dist/index.js" }, "./internal": { "import": "./dist/_internal.js", - "require": "./dist/_internal.js", - "types": "./dist/_internal.d.ts" - + "require": "./dist/_internal.js" } }, "scripts": { @@ -25,7 +21,7 @@ "format": "eslint src/**/*.ts --fix", "build:dev": "tsup --metafile", "build:prod": "tsup ", - "prepare": "npm run build:prod", + "prepare": "tsc", "pretty": "prettier --write .", "tdd": "vitest", "test": "vitest --run", diff --git a/src/_internal.ts b/src/_internal.ts index 93382d9..94cb21c 100644 --- a/src/_internal.ts +++ b/src/_internal.ts @@ -1,6 +1,6 @@ import type { Interaction } from 'discord.js'; import { mergeMap, merge, concatMap } from 'rxjs'; -import { PayloadType } from './core'; +import { PayloadType } from './core/structures/enums'; import { isAutocomplete, isCommand, diff --git a/src/core/index.ts b/src/core/index.ts deleted file mode 100644 index 079589f..0000000 --- a/src/core/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './interfaces'; -export * from './create-plugins'; -export * from './structures'; -export * from './ioc'; diff --git a/src/core/ioc/container.ts b/src/core/ioc/container.ts index b063aca..085f05b 100644 --- a/src/core/ioc/container.ts +++ b/src/core/ioc/container.ts @@ -1,5 +1,5 @@ import { Container } from 'iti'; -import { Disposable } from '../'; +import type { Disposable } from '../interfaces'; import * as assert from 'node:assert'; import { Subject } from 'rxjs'; import { __Services } from '../_internal'; diff --git a/src/handlers/dispatchers.ts b/src/handlers/dispatchers.ts index 8bf6cff..9471884 100644 --- a/src/handlers/dispatchers.ts +++ b/src/handlers/dispatchers.ts @@ -10,7 +10,7 @@ import { } from '../core/_internal'; import { createResultResolver } from './event-utils'; import { BaseInteraction, Message } from 'discord.js'; -import { CommandType, Context } from '../core'; +import { CommandType, Context } from '../core/structures'; import type { Args } from '../types/utility'; import { inspect } from 'node:util' import type { CommandModule, Module, Processed } from '../types/core-modules'; diff --git a/src/handlers/event-utils.ts b/src/handlers/event-utils.ts index 6902021..9b7ffa1 100644 --- a/src/handlers/event-utils.ts +++ b/src/handlers/event-utils.ts @@ -22,7 +22,8 @@ import { VoidResult, resultPayload, } from '../core/_internal'; -import { Emitter, ErrorHandling, Logging, PayloadType } from '../core'; +import { Emitter, ErrorHandling, Logging } from '../core/interfaces'; +import { PayloadType } from '../core/structures/enums' import { contextArgs, createDispatcher } from './dispatchers'; import { ObservableInput, pipe } from 'rxjs'; import { Err, Ok, Result } from 'ts-results-es'; diff --git a/src/handlers/interaction-event.ts b/src/handlers/interaction-event.ts index 62a125a..a1def25 100644 --- a/src/handlers/interaction-event.ts +++ b/src/handlers/interaction-event.ts @@ -1,6 +1,6 @@ import { Interaction } from 'discord.js'; import { mergeMap, merge, concatMap } from 'rxjs'; -import { PayloadType } from '../core'; +import { PayloadType } from '../core/structures/enums'; import { isAutocomplete, isCommand, diff --git a/src/handlers/message-event.ts b/src/handlers/message-event.ts index cc6fda1..6342bc4 100644 --- a/src/handlers/message-event.ts +++ b/src/handlers/message-event.ts @@ -1,6 +1,6 @@ import { mergeMap, EMPTY, concatMap } from 'rxjs'; import type { Message } from 'discord.js'; -import { PayloadType } from '../core'; +import { PayloadType } from '../core/structures/enums'; import { sharedEventStream, SernError, filterTap, resultPayload } from '../core/_internal'; import { createMessageHandler, executeModule, makeModuleExecutor } from './event-utils'; import type { DependencyList } from '../types/ioc'; diff --git a/src/index.ts b/src/index.ts index 06a2ccd..a391ac5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,4 @@ export * as Sern from './sern'; -export * from './core'; export type { CommandModule, EventModule, @@ -51,4 +50,7 @@ export { } from './core/modules'; export * from './core/presences' - +export * from './core/interfaces' +export * from './core/create-plugins'; +export * from './core/structures'; +export * from './core/ioc'; diff --git a/src/types/core-modules.ts b/src/types/core-modules.ts index 1cad72f..5151079 100644 --- a/src/types/core-modules.ts +++ b/src/types/core-modules.ts @@ -15,7 +15,7 @@ import type { UserContextMenuCommandInteraction, UserSelectMenuInteraction, } from 'discord.js'; -import { CommandType, Context, EventType } from '../../src/core'; +import type { CommandType, Context, EventType } from '../core/structures'; import { AnyCommandPlugin, AnyEventPlugin, ControlPlugin, InitPlugin } from './core-plugin'; import { Awaitable, Args, SlashOptions, SernEventsMapping } from './utility'; diff --git a/src/types/core-plugin.ts b/src/types/core-plugin.ts index 3d08899..0576236 100644 --- a/src/types/core-plugin.ts +++ b/src/types/core-plugin.ts @@ -34,7 +34,8 @@ import type { UserSelectCommand, } from './core-modules'; import type { Args, Awaitable, Payload, SlashOptions } from './utility'; -import type { CommandType, Context, EventType, PluginType } from '../core'; +import type { CommandType, EventType, PluginType } from '../core/structures/enums' +import type { Context } from '../core/structures/context' import type { ButtonInteraction, ChannelSelectMenuInteraction, diff --git a/src/types/utility.ts b/src/types/utility.ts index 90339e4..3b05e34 100644 --- a/src/types/utility.ts +++ b/src/types/utility.ts @@ -1,5 +1,5 @@ import type { CommandInteractionOptionResolver, InteractionReplyOptions, MessageReplyOptions } from 'discord.js'; -import type { PayloadType } from '../core'; +import type { PayloadType } from '../core/structures/enums'; import type { AnyModule } from './core-modules'; export type Awaitable = PromiseLike | T;