3.1 was a fricking nightmare

Signed-off-by: RedGuy12 <[email protected]>

.gitignore

@@ -1,4 +1,3 @@
 .vscode
 dist/
 node_modules/
-package-lock.json

README.md

@@ -369,6 +369,7 @@ This guide references the following imported values in inline code blocks:
 
 ```js
 import {
+	ApplicationCommandType,
 	type ApplicationCommandOptionType
 	type AutocompleteInteraction,
 	type Awaitable,
@@ -377,10 +378,8 @@ import {
 	type RepliableInteraction,
 	type Snowflake,
 	type SelectMenuType,
-	ApplicationCommandType,
 } from "discord.js";
 import {
-	type ClientEvent,
 	defineButton,
 	defineChatCommand,
 	defineSubcommands,
@@ -389,6 +388,7 @@ import {
 	defineEvent,
 	defineModal,
 	defineSelect,
+	type ClientEvent,
 } from "strife.js";
 import path from "node:path";
 import url from "node:url";

package.json

@@ -1,14 +1,8 @@
 {
 	"name": "strife.js",
-	"version": "3.1.3",
-	"exports": {
-		".": {
-			"types": "./dist/types/index.d.ts",
-			"require": "./dist/cjs/index.js",
-			"import": "./dist/esm/index.js",
-			"default": "./dist/esm/index.js"
-		}
-	},
+	"version": "4.0.0",
+	"type": "module",
+	"main": "./dist/index.js",
 	"files": [
 		"dist",
 		"src",
@@ -17,11 +11,14 @@
 		"LICENSE"
 	],
 	"scripts": {
-		"build": "rm -rf dist && tsc --build tsconfig.cjs.json tsconfig.esm.json tsconfig.types.json && echo {\"type\":\"module\"} > ./dist/esm/package.json",
+		"build": "rm -rf dist && tsc --build tsconfig.json",
 		"dev": "npm run build && tsc --project tsconfig.esm.json --watch",
 		"format": "prettier --write \"**\" \"!dist/**\" --ignore-unknown"
 	},
 	"prettier": "@redguy12/prettier-config",
+	"dependencies": {
+		"tslib": "2.6.2"
+	},
 	"devDependencies": {
 		"@redguy12/prettier-config": "2.0.2",
 		"@types/node": "<=18.11.1",

src/definition/commands.ts

@@ -64,10 +64,7 @@ export function transformOptions(
 
 			if (option.choices)
 				transformed.choices = Object.entries(option.choices)
-					.map(([choice, value]) => ({
-						name: choice,
-						value, // todo: oops
-					}))
+					.map(([value, name]) => ({ value, name }))
 					.sort((one, two) => one.name.localeCompare(two.name));
 
 			transformed.channelTypes = option.channelTypes ?? [

src/index.ts

@@ -1,6 +1,9 @@
+import { login } from "./client.js";
+export default login;
+
+export * from "./client.js";
 export * from "./definition/commands/index.js";
 export * from "./definition/commands.js";
 export * from "./definition/components.js";
 export * from "./definition/events.js";
-export * from "./client.js";
 export * from "./util.js";

src/util.ts

@@ -1,4 +1,4 @@
-import { type CacheType } from "discord.js";
+import type { CacheType } from "discord.js";
 
 export type CacheReducer<InGuild extends boolean> = InGuild extends true
 	? "cached" | "raw"

tsconfig.json

@@ -1,27 +1,28 @@
 {
 	"compilerOptions": {
 		"allowJs": true,
-		"baseUrl": "./",
-		"checkJs": true,
 		"allowUnreachableCode": false,
 		"allowUnusedLabels": false,
+		"baseUrl": "./",
+		"checkJs": true,
+		"declaration": true,
+		"declarationMap": true,
 		"esModuleInterop": true,
-		"experimentalDecorators": true,
 		"forceConsistentCasingInFileNames": true,
-		"isolatedModules": true,
-		"jsx": "preserve",
-		"lib": ["ESNext", "DOM"],
-		"maxNodeModuleJsDepth": 0,
+		"importHelpers": true,
+		"module": "NodeNext",
 		"noEmitOnError": true,
 		"noErrorTruncation": true,
 		"noFallthroughCasesInSwitch": true,
 		"noImplicitOverride": true,
 		"noUncheckedIndexedAccess": true,
 		"noUnusedLocals": true,
 		"noUnusedParameters": true,
+		"outDir": "dist",
+		"resolveJsonModule": true,
 		"sourceMap": true,
 		"strict": true,
-		"stripInternal": true
+		"target": "es2021",		"verbatimModuleSyntax": true
 	},
 	"exclude": ["node_modules", ".git", "dist"],
 	"typeAcquisition": { "enable": true }