diff --git a/.gitignore b/.gitignore index 6c3a2a5..9a4cd4f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ dist/ .argo/ .vscode/settings.json _test.ts +types/ +tsconfig.tsbuildinfo diff --git a/package-lock.json b/package-lock.json index d813a70..d8d73e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1210,9 +1210,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", + "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2253,9 +2253,9 @@ } }, "node_modules/semver": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz", - "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -3385,9 +3385,9 @@ } }, "eslint-visitor-keys": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz", - "integrity": "sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", + "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", "dev": true }, "espree": { @@ -4082,9 +4082,9 @@ } }, "semver": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz", - "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", "dev": true, "requires": { "lru-cache": "^6.0.0" diff --git a/package.json b/package.json index 523c704..ab6327d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "main": "./dist/index.js", "types": "./src/index.ts", "scripts": { - "build": "tsup && tsc --declaration --emitDeclarationOnly --declarationDir dist --noEmit false", + "build": "tsup && tsc --emitDeclarationOnly --declarationDir types --noEmit false", "lint": "eslint src --fix", "prettier": "prettier --write src/**/*.ts", "start": "npm run build && node --trace-warnings --enable-source-maps .", diff --git a/src/types/general.ts b/src/types/general.ts index 2419819..32cc1ea 100644 --- a/src/types/general.ts +++ b/src/types/general.ts @@ -98,14 +98,11 @@ export type ClientOptions = Partial< } >; export type Jsonify = D extends true - ? Jsonify< - T extends { - toJSON(): infer J; - } - ? J - : T, - false - > + ? T extends { + toJSON(): infer J; + } + ? Jsonify + : Jsonify : T extends boolean | number | string | null ? T : T extends bigint diff --git a/src/util/importData.ts b/src/util/importData.ts index 6a2064d..7eb3442 100644 --- a/src/util/importData.ts +++ b/src/util/importData.ts @@ -11,7 +11,7 @@ import { AuthFolder } from ".."; export const importData = async ( name: T, path = AuthFolder -): Promise | undefined> => +) => readFile(join(path, `${name}.json`), { encoding: "utf8", }) diff --git a/tsconfig.json b/tsconfig.json index 1e5b637..2acbee5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,11 @@ { - "include": ["src/**/*"], + "include": ["src"], "extends": "@tsconfig/node18/tsconfig.json", "compilerOptions": { "allowSyntheticDefaultImports": true, "allowUnreachableCode": false, "alwaysStrict": true, + "composite": true, "esModuleInterop": true, "isolatedModules": true, "module": "ESNext", @@ -19,6 +20,7 @@ "outDir": "dist", "pretty": true, "resolveJsonModule": true, + "rootDir": "src", "sourceMap": true } }