Merge pull request #5 from Kikorono/develop

Modularization, dependency updates, new package commands, and more ByteBuffer functionality

Author: Tynarus

.npmignore

@@ -1,4 +1,5 @@
 tsconfig.json
 src
 .idea
-test.*
+test.js
+test.ts

package-lock.json

@@ -1,18 +1,29 @@
 {
     "name": "@runejs/common",
-    "version": "2.0.0-rc.5",
+    "version": "2.0.0-rc.9",
     "description": "Common logging, networking, compression, and other functionality for RuneJS applications.",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
+    "main": "./index.js",
+    "types": "./index.d.ts",
+    "exports": {
+        ".": "./index.js",
+        "./buffer": "./buffer/index.js",
+        "./color": "./color/index.js",
+        "./compression": "./compression/index.js",
+        "./fs": "./fs/index.js",
+        "./logger": "./logger/index.js",
+        "./net": "./net/index.js",
+        "./util": "./util/index.js"
+    },
     "scripts": {
         "build": "tsc",
         "start": "ts-node src/test.ts",
         "lint": "eslint --ext .ts src",
         "lint:fix": "eslint --ext .ts src --fix",
-        "copy-documents": "cp package.json lib && cp README.md lib && cp .npmignore lib && cp LICENSE lib",
-        "copy-documents:windows": "copy package.json lib && copy README.md lib && copy .npmignore lib && copy LICENSE lib",
-        "package": "rimraf lib && npm run build && npm run copy-documents && cd lib && npm publish --dry-run",
-        "package:windows": "rimraf lib && npm run build && npm run copy-documents:windows && cd lib && npm publish --dry-run"
+        "copy-documents": "copyfiles package.json README.md .npmignore LICENSE lib",
+        "package": "rimraf lib && npm i && npm run build && npm run copy-documents && cd lib && npm publish --dry-run",
+        "publish:next": "npm run package && cd lib && npm publish -tag next",
+        "publish:beta": "npm run package && cd lib && npm publish -tag beta",
+        "publish:rc": "npm run package && cd lib && npm publish -tag rc"
     },
     "repository": {
         "type": "git",
@@ -46,9 +57,10 @@
         "@types/pino": "^6.3.11",
         "@typescript-eslint/eslint-plugin": "^4.29.3",
         "@typescript-eslint/parser": "^4.29.3",
+        "copyfiles": "^2.4.1",
         "eslint": "^7.32.0",
         "rimraf": "^3.0.2",
-        "ts-node": "^10.3.0",
+        "ts-node-dev": "^1.1.8",
         "typescript": "^4.4.4"
     },
     "eslintConfig": {

package.json

@@ -60,7 +60,7 @@ export class ByteBuffer extends Uint8Array {
 
     public readInt8: (offset: number) => number;
     public readUInt8: (offset: number) => number;
-    public copy: (targetBuffer: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number) => number;
+    public copy: (targetBuffer: Uint8Array | ByteBuffer, targetStart?: number, sourceStart?: number, sourceEnd?: number) => number;
 
     private _writerIndex: number = 0;
     private _readerIndex: number = 0;
@@ -165,8 +165,21 @@ export class ByteBuffer extends Uint8Array {
         return null;
     }
 
-    public at(index: number, signed: Signedness = 'signed'): number {
-        return ByteBuffer.getSignage(signed) === 'S' ? this.readInt8(index) : this.readUInt8(index);
+    public at(index: number): number;
+    public at(index: number, type: Extract<DataType, 'string' | 'STRING'>): string;
+    public at(index: number, type: Extract<DataType, 'long' | 'LONG'>, signed?: Signedness, endian?: Endianness): bigint;
+    public at(index: number, type: Exclude<DataType, 'string' | 'STRING' | 'long' | 'LONG'>, signed?: Signedness, endian?: Endianness): number;
+    public at(index: number, type?: DataType, signed?: Signedness, endian?: Endianness): number | bigint | string;
+    public at(index: number, type: DataType = 'byte', signed: Signedness = 'signed', endian: Endianness = 'be'): number | bigint | string {
+        const readerIndex = this.readerIndex;
+        this.readerIndex = index;
+
+        const value = this.get(type, signed, endian);
+
+        // Reset to the original reader index
+        this.readerIndex = readerIndex;
+
+        return value;
     }
 
     public getSlice(position: number, length: number): ByteBuffer {

src/buffer/byte-buffer.ts

@@ -1 +1,2 @@
 export * from './logger';
+export * from './buffer';

src/encryption/file-encryption.ts

@@ -9,18 +9,14 @@
         "esModuleInterop": true,
         "allowSyntheticDefaultImports": true,
         "sourceMap": true,
-        "baseUrl": ".",
+        "baseUrl": "./src",
         "allowJs": true,
         "declaration": true,
         "outDir": "./lib",
         "types": [
             "node"
         ]
     },
-    "include": [
-        "src/**/*.ts"
-    ],
-    "exclude": [
-        "node_modules"
-    ]
+    "include": [ "src/" ],
+    "exclude": [ "!src/" ]
 }