Skip to content

Commit

Permalink
fix: types again
Browse files Browse the repository at this point in the history
  • Loading branch information
JadlionHD committed Oct 13, 2024
1 parent da9f232 commit 72b44d8
Show file tree
Hide file tree
Showing 17 changed files with 61 additions and 133 deletions.
22 changes: 15 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@
"name": "growtopia.js",
"version": "1.6.2",
"description": "A package to create a growtopia private servers.",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
"type": "module",
"exports": {
".": {
"types": "./dist/index.d.ts",
"bun": "./dist/index.js",
"import": "./dist/index.js",
"require": "./dist/index.js"
}
},
"scripts": {
"test": "npm run build:prebuild && npm run build:ts && node test/basic.js",
"dev": "rimraf dist && npm run build && npm run build:ts && node test/basic-example/index.js",
Expand All @@ -13,7 +21,7 @@
"build:prebuild": "prebuildify --napi",
"build": "node-gyp-build",
"build:gyp": "node-gyp configure rebuild",
"build:ts": "tsc",
"build:ts": "rimraf dist && tsc && cp -r src/types dist/types",
"install": "node-gyp-build"
},
"homepage": "https://github.com/JadlionHD/growtopia.js#readme",
Expand Down Expand Up @@ -42,16 +50,16 @@
"npm": ">=7.0.0"
},
"dependencies": {
"@types/node": "^20.1.5",
"eventemitter3": "^5.0.1",
"node-addon-api": "^8.0.0",
"node-gyp": "^10.1.0",
"node-gyp-build": "^4.8.1",
"typescript": "^5.0.4"
"node-gyp-build": "^4.8.1"
},
"devDependencies": {
"@types/node": "^22.7.5",
"prebuildify": "^6.0.1",
"rimraf": "^5.0.1",
"typedoc": "^0.26.5"
"typedoc": "^0.26.5",
"typescript": "^5.6.3"
}
}
30 changes: 15 additions & 15 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified prebuilds/win32-x64/growtopia.js.node
Binary file not shown.
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export type * from "./types/index";
export * from "./structures/Client.js";
export * from "./structures/Peer.js";
export * from "./structures/ItemsDat.js";
Expand All @@ -6,4 +7,3 @@ export * from "./util/Utils.js";
export * from "./packets/TankPacket.js";
export * from "./packets/TextPacket.js";
export * from "./packets/Variant.js";
export type * from "../types/index";
2 changes: 1 addition & 1 deletion src/packets/TankPacket.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Tank } from "../../types";
import type { Tank } from "../types";

const TANK_HEADER_SIZE = 60;

Expand Down
2 changes: 1 addition & 1 deletion src/packets/Variant.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TankPacket } from "./TankPacket.js";

// Types
import type { VariantArg, VariantArray, VariantOptions } from "../../types/packets.js";
import type { VariantArg, VariantArray, VariantOptions } from "../types/packets.js";
import { VariantTypes } from "../util/Constants.js";

/**
Expand Down
4 changes: 2 additions & 2 deletions src/structures/Client.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import EventEmitter from "eventemitter3";
import type { Caching, ClientOptions, ClientType } from "../../types";
import type { Caching, ClientOptions, ClientType } from "../types";
import { PacketTypes } from "../util/Constants.js";
import { parseText } from "../util/Utils.js";
import { Peer } from "./Peer.js";
import type { ActionEvent, LoginInfo, PeerData } from "../../types";
import type { ActionEvent, LoginInfo, PeerData } from "../types";
import { TankPacket } from "../packets/TankPacket.js";
import { dirname, join } from "path";
import { fileURLToPath } from "url";
Expand Down
2 changes: 1 addition & 1 deletion src/structures/ItemsDat.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ExtendString, ItemDefinition, ItemsDatMeta, StringOptions } from "../../types";
import type { ExtendString, ItemDefinition, ItemsDatMeta, StringOptions } from "../types";

export class ItemsDat {
private mempos = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/structures/Peer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ClientType, PeerData, Sendable } from "../../types";
import type { ClientType, PeerData, Sendable } from "../types";
import { Variant } from "../packets/Variant.js";
import { Client } from "./Client.js";

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion types/items.d.ts → src/types/items.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export interface StringOptions {
}

export interface ItemDefinition {
[key: string]: string;
[key: string]: any;
id?: number;
flags?: number;
flagsCategory?: number;
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions test/basic.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { Client, TextPacket, Peer, Tank } from "../dist/index";
import { Client, TextPacket, Peer } from "../dist/index.js";
const client = new Client({
enet: {
ip: "0.0.0.0"
}
});

client.on("ready", () => {
console.log(`ENet server: port ${client.config.enet.port} on ${client.config.enet.ip}`);
console.log(`ENet server port ${client.config.enet?.port}`);
process.exit(0);
});

client.on("error", (err) => {
Expand All @@ -26,7 +27,6 @@ client.on("disconnect", (netID) => {
client.on("raw", (netID, data) => {
const peer = new Peer(client, netID);
console.log("raw", data);
console.log(peer.ping, peer.state);
});

client.listen();
120 changes: 20 additions & 100 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,105 +1,25 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */

/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "ESNext" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */

/* Modules */
"module": "ES2022" /* Specify what module code is generated. */,
// "rootDir": "./", /* Specify the root folder within your source files. */
"moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
// "resolveJsonModule": true, /* Enable importing .json files. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */

/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */

/* Emit */
"declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
// "declarationMap": true /* Create sourcemaps for d.ts files. */,
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
"outDir": "./dist" /* Specify an output folder for all emitted files. */,
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */

/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,

/* Type Checking */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
"outDir": "dist",
"lib": ["ES2015", "ES2016", "ES2017", "ES2018", "ES2019", "ES2020", "ES2021", "ES2022"],
"module": "ES2022",
"target": "ES2022",
"noFallthroughCasesInSwitch": true,
"strict": true,
"esModuleInterop": true,
"skipLibCheck": false,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "node",
"allowUnusedLabels": false,
"allowUnreachableCode": false,
"checkJs": true,
"strictPropertyInitialization": true,
"strictBindCallApply": true,
"declaration": true,
"noEmitOnError": true,
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true
},
"exclude": ["node_modules/**/*", "lib/**/*"],
"include": ["src/**/*", "types/**/*", "types"]
"include": ["src/**/*", "src/types/**/*"]
}

0 comments on commit 72b44d8

Please sign in to comment.