style: improve eslint config (#172)

Author: giladgd

.eslintrc.json

@@ -42,6 +42,25 @@
             "semi": ["off"],
             "@typescript-eslint/semi": ["warn", "always"],
             "@typescript-eslint/no-inferrable-types": ["off"],
+            "@typescript-eslint/member-ordering": ["warn", {
+                "default": ["field", "constructor", "method", "signature"],
+                "typeLiterals": []
+            }],
+            "@typescript-eslint/parameter-properties": ["warn", {
+                "allow": []
+            }],
+            "@typescript-eslint/explicit-member-accessibility": ["warn"],
+            "@typescript-eslint/member-delimiter-style": ["warn", {
+                "multiline": {
+                    "delimiter": "comma",
+                    "requireLast": false
+                },
+                "singleline": {
+                    "delimiter": "comma",
+                    "requireLast": false
+                },
+                "multilineDetection": "brackets"
+            }],
             "jsdoc/require-param": ["off"],
             "jsdoc/check-param-names": ["warn", {
                 "checkDestructured": false

src/bindings/AddonTypes.ts

@@ -17,12 +17,12 @@ export type BindingModule = {
             batchSize?: number,
             logitsAll?: boolean,
             embedding?: boolean,
-            threads?: number,
-        }): AddonContext,
+            threads?: number
+        }): AddonContext
     },
     AddonGrammar: {
         new (grammarPath: string, params?: {
-            printGrammar?: boolean,
+            printGrammar?: boolean
         }): AddonGrammar
     },
     AddonGrammarEvaluationState: {
@@ -60,7 +60,7 @@ export type AddonModel = {
 
 export type AddonContext = {
     dispose(): void,
-    getContextSize(): number
+    getContextSize(): number,
     initBatch(size: number): void, // size must be less or equal to batchSize
     addToBatch(
         sequenceId: number,

src/bindings/Llama.ts

@@ -39,7 +39,7 @@ export class Llama {
     private constructor({
         bindings, metal, cuda, vulkan, logLevel, logger, buildType, cmakeOptions, llamaCppRelease
     }: {
-        bindings: BindingModule
+        bindings: BindingModule,
         metal: boolean,
         cuda: boolean,
         vulkan: boolean,
@@ -209,11 +209,11 @@ export class Llama {
     public static async _create({
         bindings, buildType, buildMetadata, logLevel, logger
     }: {
-        bindings: BindingModule
+        bindings: BindingModule,
         buildType: "localBuild" | "prebuilt",
         buildMetadata: BuildMetadataFile,
         logLevel: LlamaLogLevel,
-        logger: (level: LlamaLogLevel, message: string) => void,
+        logger: (level: LlamaLogLevel, message: string) => void
     }) {
         return new Llama({
             bindings,

src/evaluator/LlamaChat/LlamaChat.ts

@@ -866,8 +866,8 @@ async function compressHistoryToFitContextSize({
 }: {
     history: ChatHistoryItem[],
     contextShiftSize: number,
-    contextShiftStrategy: LLamaChatContextShiftOptions["strategy"]
-    contextShiftLastEvaluationMetadata: LLamaChatContextShiftOptions["lastEvaluationMetadata"]
+    contextShiftStrategy: LLamaChatContextShiftOptions["strategy"],
+    contextShiftLastEvaluationMetadata: LLamaChatContextShiftOptions["lastEvaluationMetadata"],
     contextSize: number,
     tokenizer: Tokenizer,
     chatWrapper: ChatWrapper,

src/evaluator/LlamaEmbeddingContext.ts

@@ -18,7 +18,7 @@ export type LlamaEmbeddingContextOptions = {
      * number of threads to use to evaluate tokens.
      * set to 0 to use the maximum threads supported by the current machine hardware
      */
-    threads?: number,
+    threads?: number
 };
 
 export class LlamaEmbeddingContext {

src/evaluator/LlamaGrammar.ts

@@ -14,7 +14,7 @@ export type LlamaGrammarOptions = {
     grammar: string,
 
     /** print the grammar to stdout */
-    printGrammar?: boolean
+    printGrammar?: boolean,
 
     /** Consider any of these as EOS for the generated text. Only supported by `LlamaChat` and `LlamaChatSession` */
     stopGenerationTriggers?: readonly (StopGenerationTrigger | LlamaText)[],

src/evaluator/LlamaGrammarEvaluationState.ts

@@ -4,7 +4,7 @@ import {LlamaGrammar} from "./LlamaGrammar.js";
 
 
 export type LlamaGrammarEvaluationStateOptions = {
-    grammar: LlamaGrammar,
+    grammar: LlamaGrammar
 };
 
 /**

src/types.ts

@@ -2,12 +2,12 @@ import {GbnfJsonSchema, GbnfJsonSchemaToType} from "./utils/gbnfJson/types.js";
 import {BuiltinSpecialTokenValue} from "./utils/LlamaText.js";
 
 export type Token = number & {
-    __token: never;
+    __token: never
 };
 
 export type Tokenizer = {
-    tokenize(text: string, specialTokens?: boolean): Token[];
-    tokenize(text: BuiltinSpecialTokenValue, specialTokens: "builtin"): Token[];
+    tokenize(text: string, specialTokens?: boolean): Token[],
+    tokenize(text: BuiltinSpecialTokenValue, specialTokens: "builtin"): Token[]
 }["tokenize"];
 
 

src/utils/findCharacterRemovalCountToFitChatHistoryInContext.ts

@@ -13,7 +13,7 @@ export async function findCharacterRemovalCountToFitChatHistoryInContext({
 }: {
     compressChatHistory(options: {
         chatHistory: readonly ChatHistoryItem[], charactersToRemove: number
-    }): ChatHistoryItem[] | Promise<ChatHistoryItem[]>
+    }): ChatHistoryItem[] | Promise<ChatHistoryItem[]>,
     chatHistory: ChatHistoryItem[],
     tokensCountToFit: number,
     tokenizer: Tokenizer,

src/utils/gbnfJson/GbnfTerminal.ts

@@ -14,7 +14,7 @@ export abstract class GbnfTerminal {
         return ruleName;
     }
 
-    abstract getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
+    public abstract getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
 
     public resolve(grammarGenerator: GbnfGrammarGenerator): string {
         const ruleName = this.getRuleName(grammarGenerator);