Add some additional formatting rules

CasperTech · Sep 23, 2021 · c24dc40 · c24dc40
1 parent 50dea8f
commit c24dc40
Show file tree

Hide file tree

Showing 100 changed files with 195 additions and 174 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -20,6 +20,28 @@
         "error",
         "allman"
     ],
+    "@typescript-eslint/object-curly-spacing": [
+      "error",
+      "always"
+    ],
+    "@typescript-eslint/space-before-function-paren": [
+      "error",
+      "never"
+    ],
+    "@typescript-eslint/naming-convention": [
+      "error",
+      {
+        "selector": "enumMember",
+        "format": null
+      }
+    ],
+    "@typescript-eslint/keyword-spacing": [
+      "error",
+      {
+        "before": true,
+        "after": true
+      }
+    ],
     "@angular-eslint/component-class-suffix": "error",
     "@angular-eslint/component-selector": [
         "error",
@@ -63,7 +85,6 @@
       }
     ],
     "@typescript-eslint/member-ordering": "off",
-    "@typescript-eslint/naming-convention": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-empty-interface": "error",
     "@typescript-eslint/no-inferrable-types": [

diff --git a/lib/Bot.ts b/lib/Bot.ts
@@ -322,7 +322,7 @@ export class Bot
 
         this.lastSuccessfulPing = new Date().getTime();
 
-        this.ping = setInterval(async () =>
+        this.ping = setInterval(async() =>
         {
             this.pingNumber++;
             if (this.pingNumber % 12 === 0 && this.stay)

diff --git a/lib/classes/Agent.ts b/lib/classes/Agent.ts
@@ -42,12 +42,12 @@ export class Agent
     regionAccess: string;
     agentAccess: string;
     currentRegion: Region;
-    chatSessions: {[key: string]: {
+    chatSessions: { [key: string]: {
             [key: string]: {
                 hasVoice: boolean,
                 isModerator: boolean
             }
-        }} = {};
+        } } = {};
     controlFlags: ControlFlags = 0;
     openID: {
         'token'?: string,

diff --git a/lib/classes/AssetMap.ts b/lib/classes/AssetMap.ts
@@ -92,5 +92,5 @@ export class AssetMap
     byUUID: {
         [key: string]: InventoryItem
     } = {};
-    pending: {[key: string]: boolean} = {};
+    pending: { [key: string]: boolean } = {};
 }
diff --git a/lib/classes/Caps.ts b/lib/classes/Caps.ts
@@ -13,7 +13,7 @@ import * as url from 'url';
 
 export class Caps
 {
-    static CAP_INVOCATION_DELAY_MS: {[key: string]: number} = {
+    static CAP_INVOCATION_DELAY_MS: { [key: string]: number } = {
         'NewFileAgentInventory': 2000,
         'FetchInventory2': 200
     };
@@ -24,7 +24,7 @@ export class Caps
     private clientEvents: ClientEvents;
     private agent: Agent;
     private active = false;
-    private timeLastCapExecuted: {[key: string]: number} = {};
+    private timeLastCapExecuted: { [key: string]: number } = {};
     eventQueueClient: EventQueueClient | null = null;
 
     constructor(agent: Agent, seedURL: string, clientEvents: ClientEvents)
@@ -209,7 +209,7 @@ export class Caps
                 }
                 else
                 {
-                    resolve({status: res.statusCode, body: body});
+                    resolve({ status: res.statusCode, body: body });
                 }
             });
         });
@@ -236,7 +236,7 @@ export class Caps
                 }
                 else
                 {
-                    resolve({status: res.statusCode, body: body});
+                    resolve({ status: res.statusCode, body: body });
                 }
             });
         });
@@ -258,7 +258,7 @@ export class Caps
                 }
                 else
                 {
-                    resolve({status: res.statusCode, body: body});
+                    resolve({ status: res.statusCode, body: body });
                 }
             });
         });
@@ -280,7 +280,7 @@ export class Caps
                 }
                 else
                 {
-                    resolve({status: res.statusCode, body: body});
+                    resolve({ status: res.statusCode, body: body });
                 }
             });
         });
@@ -403,10 +403,10 @@ export class Caps
 
     capsPerformXMLPost(capURL: string, data: any): Promise<any>
     {
-        return new Promise<any>(async (resolve, reject) =>
+        return new Promise<any>(async(resolve, reject) =>
         {
             const xml = LLSD.LLSD.formatXML(data);
-            this.request(capURL, xml, 'application/llsd+xml').then(async (resp: ICapResponse) =>
+            this.request(capURL, xml, 'application/llsd+xml').then(async(resp: ICapResponse) =>
             {
                 let result: any = null;
                 try
@@ -443,7 +443,7 @@ export class Caps
 
     capsPerformXMLPut(capURL: string, data: any): Promise<any>
     {
-        return new Promise<any>(async (resolve, reject) =>
+        return new Promise<any>(async(resolve, reject) =>
         {
             const xml = LLSD.LLSD.formatXML(data);
             this.requestPut(capURL, xml, 'application/llsd+xml').then((resp: ICapResponse) =>
@@ -479,7 +479,7 @@ export class Caps
 
     capsPerformXMLGet(capURL: string): Promise<any>
     {
-        return new Promise<any>(async (resolve, reject) =>
+        return new Promise<any>(async(resolve, reject) =>
         {
             this.requestGet(capURL).then((resp: ICapResponse) =>
             {
@@ -512,10 +512,10 @@ export class Caps
         });
     }
 
-    async capsGetXML(capability: string | [string, {[key: string]: string}]): Promise<any>
+    async capsGetXML(capability: string | [string, { [key: string]: string }]): Promise<any>
     {
         let capName = '';
-        let queryParams: {[key: string]: string} = {};
+        let queryParams: { [key: string]: string } = {};
         if (typeof capability === 'string')
         {
             capName = capability;
@@ -550,10 +550,10 @@ export class Caps
         }
     }
 
-    async capsPostXML(capability: string | [string, {[key: string]: string}], data: any): Promise<any>
+    async capsPostXML(capability: string | [string, { [key: string]: string }], data: any): Promise<any>
     {
         let capName = '';
-        let queryParams: {[key: string]: string} = {};
+        let queryParams: { [key: string]: string } = {};
         if (typeof capability === 'string')
         {
             capName = capability;
@@ -588,10 +588,10 @@ export class Caps
         }
     }
 
-    async capsPutXML(capability: string | [string, {[key: string]: string}], data: any): Promise<any>
+    async capsPutXML(capability: string | [string, { [key: string]: string }], data: any): Promise<any>
     {
         let capName = '';
-        let queryParams: {[key: string]: string} = {};
+        let queryParams: { [key: string]: string } = {};
         if (typeof capability === 'string')
         {
             capName = capability;

diff --git a/lib/classes/Circuit.ts b/lib/classes/Circuit.ts
@@ -85,7 +85,7 @@ export class Circuit
         return packet.sequenceNumber;
     }
 
-    private sendXferPacket(xferID: Long, packetID: number, data: Buffer, pos: {position: number}): void
+    private sendXferPacket(xferID: Long, packetID: number, data: Buffer, pos: { position: number }): void
     {
         const sendXfer = new SendXferPacketMessage();
         let final = false;

diff --git a/lib/classes/CoalescedGameObject.ts b/lib/classes/CoalescedGameObject.ts
@@ -61,6 +61,6 @@ export class CoalescedGameObject
 
     async exportXML(rootNode?: string): Promise<string>
     {
-        return (await this.exportXMLElement(rootNode)).end({pretty: true, allowEmpty: true});
+        return (await this.exportXMLElement(rootNode)).end({ pretty: true, allowEmpty: true });
     }
 }
diff --git a/lib/classes/Inventory.ts b/lib/classes/Inventory.ts
@@ -10,20 +10,20 @@ import { InventoryLibrary } from '../enums/InventoryLibrary';
 export class Inventory
 {
     main: {
-        skeleton:  {[key: string]: InventoryFolder},
+        skeleton:  { [key: string]: InventoryFolder },
         root?: UUID
     } = {
         skeleton: {}
     };
     library: {
         owner?: UUID,
-        skeleton: {[key: string]: InventoryFolder},
+        skeleton: { [key: string]: InventoryFolder },
         root?: UUID
     } = {
         skeleton: {}
     };
 
-    itemsByID: {[key: string]: InventoryItem} = {};
+    itemsByID: { [key: string]: InventoryItem } = {};
 
     // @ts-ignore
     private clientEvents: ClientEvents;

diff --git a/lib/classes/InventoryFolder.ts b/lib/classes/InventoryFolder.ts
@@ -417,7 +417,7 @@ export class InventoryFolder
 
     private uploadInventoryAssetLegacy(assetType: AssetType, inventoryType: InventoryType, data: Buffer, name: string, description: string, flags: InventoryItemFlags): Promise<UUID>
     {
-        return new Promise<UUID>(async (resolve, reject) =>
+        return new Promise<UUID>(async(resolve, reject) =>
         {
             // Send an AssetUploadRequest and a CreateInventoryRequest simultaneously
             const msg = new AssetUploadRequestMessage();

diff --git a/lib/classes/InventoryItem.ts b/lib/classes/InventoryItem.ts
@@ -70,7 +70,7 @@ export class InventoryItem
         groupOwned: false
     };
 
-    static fromAsset(lineObj: {lines: string[], lineNum: number}, container?: GameObject | InventoryFolder, agent?: Agent): InventoryItem
+    static fromAsset(lineObj: { lines: string[], lineNum: number }, container?: GameObject | InventoryFolder, agent?: Agent): InventoryItem
     {
         const item: InventoryItem = new InventoryItem(container, agent);
         while (lineObj.lineNum < lineObj.lines.length)
@@ -673,7 +673,7 @@ export class InventoryItem
         document.ele('Flags', this.flags);
         document.ele('GroupID', this.permissions.group.toString());
         document.ele('GroupOwned', this.permissions.groupOwned);
-        return document.end({pretty: true, allowEmpty: true});
+        return document.end({ pretty: true, allowEmpty: true });
     }
 
     async detachFromAvatar(): Promise<void>
@@ -760,7 +760,7 @@ export class InventoryItem
 
     rezGroupInWorld(position: Vector3): Promise<GameObject[]>
     {
-        return new Promise<GameObject[]>(async (resolve, reject) =>
+        return new Promise<GameObject[]>(async(resolve, reject) =>
         {
             if (this.agent === undefined)
             {
@@ -818,7 +818,7 @@ export class InventoryItem
 
             const gotObjects: GameObject[] = [];
 
-            objSub = this.agent.currentRegion.clientEvents.onNewObjectEvent.subscribe(async (evt: NewObjectEvent) =>
+            objSub = this.agent.currentRegion.clientEvents.onNewObjectEvent.subscribe(async(evt: NewObjectEvent) =>
             {
                 if (evt.createSelected && !evt.object.resolvedAt)
                 {
@@ -863,7 +863,7 @@ export class InventoryItem
 
     rezInWorld(position: Vector3, objectScale?: Vector3): Promise<GameObject>
     {
-        return new Promise<GameObject>(async (resolve, reject) =>
+        return new Promise<GameObject>(async(resolve, reject) =>
         {
             if (this.agent === undefined)
             {
@@ -932,7 +932,7 @@ export class InventoryItem
             }, 10000);
             let claimedPrim = false;
             const agent = this.agent;
-            objSub = this.agent.currentRegion.clientEvents.onNewObjectEvent.subscribe(async (evt: NewObjectEvent) =>
+            objSub = this.agent.currentRegion.clientEvents.onNewObjectEvent.subscribe(async(evt: NewObjectEvent) =>
             {
                 if (evt.createSelected && !evt.object.resolvedAt)
                 {

diff --git a/lib/classes/LLLindenText.ts b/lib/classes/LLLindenText.ts
@@ -13,7 +13,7 @@ export class LLLindenText
     };
 
     body = '';
-    embeddedItems: {[key: number]: InventoryItem} = {};
+    embeddedItems: { [key: number]: InventoryItem } = {};
 
     constructor(data?: Buffer)
     {

diff --git a/lib/classes/LLWearable.ts b/lib/classes/LLWearable.ts
@@ -8,8 +8,8 @@ export class LLWearable
 {
     name: string;
     type: WearableType;
-    parameters: {[key: number]: number} = {};
-    textures: {[key: number]: UUID} = {};
+    parameters: { [key: number]: number } = {};
+    textures: { [key: number]: UUID } = {};
     permission: {
         baseMask: number,
         ownerMask: number,

diff --git a/lib/classes/Logger.ts b/lib/classes/Logger.ts
@@ -2,7 +2,7 @@ import * as logger from 'winston';
 import * as winston from 'winston';
 import * as moment from 'moment';
 import * as chalk from 'chalk';
-import {TransformableInfo} from 'logform';
+import { TransformableInfo } from 'logform';
 
 const formatLevel = function(text: string, level: string): string
 {

diff --git a/lib/classes/MessageClasses.ts b/lib/classes/MessageClasses.ts
@@ -481,7 +481,7 @@ export * from './messages/JoinGroupRequestExtended';
 export * from './messages/CreateGroupRequestExtended';
 import { Message } from '../enums/Message';
 
-const messages: {[index: number]: string} = {};
+const messages: { [index: number]: string } = {};
 messages[<number>Message.TestMessage] = 'TestMessageMessage';
 messages[<number>Message.PacketAck] = 'PacketAckMessage';
 messages[<number>Message.OpenCircuit] = 'OpenCircuitMessage';

diff --git a/lib/classes/ObjectResolver.ts b/lib/classes/ObjectResolver.ts
@@ -9,7 +9,7 @@ import * as LLSD from '@caspertech/llsd';
 
 export class ObjectResolver
 {
-    private objectsInQueue: {[key: number]: IResolveJob} = {};
+    private objectsInQueue: { [key: number]: IResolveJob } = {};
 
     private queue: number[] = [];
 
@@ -33,7 +33,7 @@ export class ObjectResolver
             }
 
             // First, create a map of all object IDs
-            const objs: {[key: number]: GameObject} = {};
+            const objs: { [key: number]: GameObject } = {};
             const failed: GameObject[] = [];
             for (const obj of objects)
             {
@@ -202,7 +202,7 @@ export class ObjectResolver
         });
     }
 
-    private scanObject(obj: GameObject, map: {[key: number]: GameObject}): void
+    private scanObject(obj: GameObject, map: { [key: number]: GameObject }): void
     {
         const localID = obj.ID;
         if (!map[localID])