jspurefix 3.4.0 → 4.0.0

package/dist/util/message-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-generator.js","sourceRoot":"","sources":["../../src/util/message-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILooseObject } from '../collections/collection'\r\nimport { ContainedComponentField, ContainedGroupField, ContainedFieldSet, ContainedSimpleField } from '../dictionary/contained'\r\nimport { FixDefinitions, MessageDefinition, SimpleFieldDefinition } from '../dictionary/definition'\r\nimport { SetReduce } from '../dictionary'\r\nimport { TagType } from '../buffer/tag/tag-type'\r\n\r\nexport class MessageGenerator {\r\n  private word: number = 0\r\n  private length: number = 0\r\n\r\n  constructor (public readonly words: string[], public readonly definitions: FixDefinitions) {\r\n  }\r\n\r\n  public static getRandomEnum (field: SimpleFieldDefinition): any {\r\n    const tagType: TagType = field.tagType\r\n    const keys: string[] = field.enums.keys()\r\n    const choice: string = keys[Math.floor(Math.random() * keys.length)]\r\n    switch (tagType) {\r\n      case TagType.Int: {\r\n        return parseInt(choice, 10)\r\n      }\r\n      case TagType.Float: {\r\n        return parseFloat(choice)\r\n      }\r\n      case TagType.Boolean: {\r\n        return choice === 'Y'\r\n      }\r\n      default: {\r\n        return choice\r\n      }\r\n    }\r\n  }\r\n\r\n  private static randomIntFromInterval (min: number, max: number): number {\r\n    return Math.floor(Math.random() * (max - min + 1) + min)\r\n  }\r\n\r\n  private static makeRandomString (len: number): string {\r\n    let text: string = ''\r\n    const possible: string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'\r\n\r\n    for (let i: number = 0; i < len; i++) {\r\n      text += possible.charAt(Math.floor(Math.random() * possible.length))\r\n    }\r\n\r\n    return text\r\n  }\r\n\r\n  private static makeBuffer (len: number): Buffer {\r\n    return Buffer.from(MessageGenerator.makeRandomString(len))\r\n  }\r\n\r\n  public generate (msgType: string, density?: number, repeatGroups: boolean = true): ILooseObject {\r\n    if (!density) {\r\n      density = 1.0\r\n    }\r\n    density = Math.max(0.2, density)\r\n    density = Math.min(1.0, density)\r\n    const def: MessageDefinition | null = this.definitions.message.get(msgType)\r\n    if (!def) {\r\n      throw new Error(`definitions do not contain type ${msgType}`)\r\n    }\r\n    return this.toObject(def, density, repeatGroups)\r\n  }\r\n\r\n  private toObject (set: ContainedFieldSet, density: number, repeatGroups: boolean): ILooseObject {\r\n    const reducer = new SetReduce<ILooseObject>()\r\n    return reducer.reduce(set, {\r\n      simple: (a: ILooseObject, sf: ContainedSimpleField) => {\r\n        const tag: number = sf.definition.tag\r\n        const include = tag === set.firstSimple?.definition.tag || this.length > 0 || Math.random() <= density\r\n        if (include) {\r\n          const val: any = sf.definition.isEnum() ? MessageGenerator.getRandomEnum(sf.definition) : this.createSimple(sf)\r\n          if (val != null) {\r\n            a[sf.name] = val\r\n          }\r\n        }\r\n      },\r\n      component: (a: ILooseObject, cf: ContainedComponentField) => {\r\n        if (cf.name !== 'StandardHeader' && cf.name !== 'StandardTrailer') {\r\n          a[cf.name] = this.toObject(cf.definition, density, repeatGroups)\r\n        }\r\n      },\r\n      group: (a: ILooseObject, gf: ContainedGroupField) => {\r\n        if (repeatGroups) {\r\n          const numberGroups: number = MessageGenerator.randomIntFromInterval(1, 3)\r\n          const arr: ILooseObject[] = new Array(numberGroups)\r\n          a[gf.name] = arr\r\n          for (let j: number = 0; j < numberGroups; ++j) {\r\n            arr[j] = this.toObject(gf.definition, density, repeatGroups)\r\n          }\r\n        }\r\n      }\r\n    }, {})\r\n  }\r\n\r\n  private createSimple (field: ContainedSimpleField): any {\r\n    const tagType: TagType = field.definition.tagType\r\n    switch (tagType) {\r\n      case TagType.String: {\r\n        return this.nextString()\r\n      }\r\n\r\n      case TagType.Float: {\r\n        this.length = 0\r\n        const sign = MessageGenerator.randomIntFromInterval(1, 10) <= 5 ? 1 : -1\r\n        const num = sign * MessageGenerator.randomIntFromInterval(1, 100000)\r\n        const raised = MessageGenerator.randomIntFromInterval(1, 8)\r\n        const r = num * Math.pow(10, -1 * raised)\r\n        // console.log(`sign = ${sign} num = ${num} raised = ${raised} r = ${r} ret = ${ret}`)\r\n        return Math.round(r * 1e7) / 1e7\r\n      }\r\n\r\n      case TagType.Int: {\r\n        this.length = 0\r\n        return MessageGenerator.randomIntFromInterval(1, 100000)\r\n      }\r\n\r\n      case TagType.Length: {\r\n        this.length = MessageGenerator.randomIntFromInterval(5, 20)\r\n        return this.length\r\n      }\r\n\r\n      case TagType.Boolean: {\r\n        this.length = 0\r\n        return MessageGenerator.randomIntFromInterval(1, 2) === 1\r\n      }\r\n\r\n      case TagType.UtcDateOnly: {\r\n        this.length = 0\r\n        const now: Date = new Date()\r\n        return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()\r\n          , 0, 0, 0, 0))\r\n      }\r\n\r\n      case TagType.UtcTimeOnly: {\r\n        this.length = 0\r\n        const s: Date = new Date()\r\n        return new Date(Date.UTC(0, 0, 0, s.getUTCHours(), s.getUTCMinutes(),\r\n          s.getUTCSeconds(), s.getUTCMilliseconds()))\r\n      }\r\n\r\n      case TagType.UtcTimestamp: {\r\n        this.length = 0\r\n        const now: Date = new Date()\r\n        return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(),\r\n          now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds()))\r\n      }\r\n\r\n      case TagType.LocalDate: {\r\n        const now = new Date()\r\n        return new Date(now.getFullYear(), now.getMonth(), now.getDate()\r\n          , 0, 0, 0, 0)\r\n      }\r\n\r\n      case TagType.RawData: {\r\n        const length = this.length\r\n        this.length = 0\r\n        return length > 0 ? MessageGenerator.makeBuffer(length) : null\r\n      }\r\n\r\n      default: {\r\n        throw new Error(`cannot manage type ${tagType}`)\r\n      }\r\n    }\r\n  }\r\n\r\n  private nextString (): string {\r\n    const words: string[] = this.words\r\n    const w: string = words[this.word++]\r\n    if (this.word === words.length) {\r\n      this.word = 0\r\n    }\r\n    return w\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"message-generator.js","sourceRoot":"","sources":["../../src/util/message-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILooseObject } from '../collections/collection'\r\nimport { ContainedComponentField, ContainedGroupField, IContainedSet, ContainedSimpleField } from '../dictionary/contained'\r\nimport { FixDefinitions, MessageDefinition, SimpleFieldDefinition } from '../dictionary/definition'\r\nimport { SetReduce } from '../dictionary'\r\nimport { TagType } from '../buffer/tag/tag-type'\r\n\r\nexport class MessageGenerator {\r\n  private word: number = 0\r\n  private length: number = 0\r\n\r\n  constructor (public readonly words: string[], public readonly definitions: FixDefinitions) {\r\n  }\r\n\r\n  public static getRandomEnum (field: SimpleFieldDefinition): any {\r\n    const tagType: TagType = field.tagType\r\n    const keys: string[] = Array.from(field.enums.keys())\r\n    const choice: string = keys[Math.floor(Math.random() * keys.length)]\r\n    switch (tagType) {\r\n      case TagType.Int: {\r\n        return parseInt(choice, 10)\r\n      }\r\n      case TagType.Float: {\r\n        return parseFloat(choice)\r\n      }\r\n      case TagType.Boolean: {\r\n        return choice === 'Y'\r\n      }\r\n      default: {\r\n        return choice\r\n      }\r\n    }\r\n  }\r\n\r\n  private static randomIntFromInterval (min: number, max: number): number {\r\n    return Math.floor(Math.random() * (max - min + 1) + min)\r\n  }\r\n\r\n  private static makeRandomString (len: number): string {\r\n    let text: string = ''\r\n    const possible: string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'\r\n\r\n    for (let i: number = 0; i < len; i++) {\r\n      text += possible.charAt(Math.floor(Math.random() * possible.length))\r\n    }\r\n\r\n    return text\r\n  }\r\n\r\n  private static makeBuffer (len: number): Buffer {\r\n    return Buffer.from(MessageGenerator.makeRandomString(len))\r\n  }\r\n\r\n  public generate (msgType: string, density?: number, repeatGroups: boolean = true): ILooseObject {\r\n    if (!density) {\r\n      density = 1.0\r\n    }\r\n    density = Math.max(0.2, density)\r\n    density = Math.min(1.0, density)\r\n    const def: MessageDefinition | undefined = this.definitions.message.get(msgType)\r\n    if (!def) {\r\n      throw new Error(`definitions do not contain type ${msgType}`)\r\n    }\r\n    return this.toObject(def, density, repeatGroups)\r\n  }\r\n\r\n  private toObject (set: IContainedSet, density: number, repeatGroups: boolean): ILooseObject {\r\n    const reducer = new SetReduce<ILooseObject>()\r\n    return reducer.reduce(set, {\r\n      simple: (a: ILooseObject, sf: ContainedSimpleField) => {\r\n        const tag: number = sf.definition.tag\r\n        const include = tag === set.firstSimple?.definition.tag || this.length > 0 || Math.random() <= density\r\n        if (include) {\r\n          const val: any = sf.definition.isEnum() ? MessageGenerator.getRandomEnum(sf.definition) : this.createSimple(sf)\r\n          if (val != null) {\r\n            a[sf.name] = val\r\n          }\r\n        }\r\n      },\r\n      component: (a: ILooseObject, cf: ContainedComponentField) => {\r\n        if (cf.name !== 'StandardHeader' && cf.name !== 'StandardTrailer') {\r\n          a[cf.name] = this.toObject(cf.definition, density, repeatGroups)\r\n        }\r\n      },\r\n      group: (a: ILooseObject, gf: ContainedGroupField) => {\r\n        if (repeatGroups) {\r\n          const numberGroups: number = MessageGenerator.randomIntFromInterval(1, 3)\r\n          const arr: ILooseObject[] = new Array(numberGroups)\r\n          a[gf.name] = arr\r\n          for (let j: number = 0; j < numberGroups; ++j) {\r\n            arr[j] = this.toObject(gf.definition, density, repeatGroups)\r\n          }\r\n        }\r\n      }\r\n    }, {})\r\n  }\r\n\r\n  private createSimple (field: ContainedSimpleField): any {\r\n    const tagType: TagType = field.definition.tagType\r\n    switch (tagType) {\r\n      case TagType.String: {\r\n        return this.nextString()\r\n      }\r\n\r\n      case TagType.Float: {\r\n        this.length = 0\r\n        const sign = MessageGenerator.randomIntFromInterval(1, 10) <= 5 ? 1 : -1\r\n        const num = sign * MessageGenerator.randomIntFromInterval(1, 100000)\r\n        const raised = MessageGenerator.randomIntFromInterval(1, 8)\r\n        const r = num * Math.pow(10, -1 * raised)\r\n        // console.log(`sign = ${sign} num = ${num} raised = ${raised} r = ${r} ret = ${ret}`)\r\n        return Math.round(r * 1e7) / 1e7\r\n      }\r\n\r\n      case TagType.Int: {\r\n        this.length = 0\r\n        return MessageGenerator.randomIntFromInterval(1, 100000)\r\n      }\r\n\r\n      case TagType.Length: {\r\n        this.length = MessageGenerator.randomIntFromInterval(5, 20)\r\n        return this.length\r\n      }\r\n\r\n      case TagType.Boolean: {\r\n        this.length = 0\r\n        return MessageGenerator.randomIntFromInterval(1, 2) === 1\r\n      }\r\n\r\n      case TagType.UtcDateOnly: {\r\n        this.length = 0\r\n        const now: Date = new Date()\r\n        return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()\r\n          , 0, 0, 0, 0))\r\n      }\r\n\r\n      case TagType.UtcTimeOnly: {\r\n        this.length = 0\r\n        const s: Date = new Date()\r\n        return new Date(Date.UTC(0, 0, 0, s.getUTCHours(), s.getUTCMinutes(),\r\n          s.getUTCSeconds(), s.getUTCMilliseconds()))\r\n      }\r\n\r\n      case TagType.UtcTimestamp: {\r\n        this.length = 0\r\n        const now: Date = new Date()\r\n        return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(),\r\n          now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds()))\r\n      }\r\n\r\n      case TagType.LocalDate: {\r\n        const now = new Date()\r\n        return new Date(now.getFullYear(), now.getMonth(), now.getDate()\r\n          , 0, 0, 0, 0)\r\n      }\r\n\r\n      case TagType.RawData: {\r\n        const length = this.length\r\n        this.length = 0\r\n        return length > 0 ? MessageGenerator.makeBuffer(length) : null\r\n      }\r\n\r\n      default: {\r\n        throw new Error(`cannot manage type ${tagType}`)\r\n      }\r\n    }\r\n  }\r\n\r\n  private nextString (): string {\r\n    const words: string[] = this.words\r\n    const w: string = words[this.word++]\r\n    if (this.word === words.length) {\r\n      this.word = 0\r\n    }\r\n    return w\r\n  }\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspurefix",
-  "version": "3.4.0",
+  "version": "4.0.0",
   "description": "pure node js fix engine",
   "keywords": [
     "typescript",
@@ -75,42 +75,42 @@
   "license": "MIT",
   "dependencies": {
     "align-text": "^1.0.2",
-    "axios": "^1.6.2",
-    "express": "^4.18.2",
+    "axios": "^1.7.5",
+    "express": "^4.19.2",
     "lodash": "^4.17.21",
-    "mathjs": "^12.1.0",
+    "mathjs": "^13.0.3",
     "minimist": "^1.2.8",
     "minimist-options": "^4.1.0",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "node-fs-extra": "^0.8.2",
-    "reflect-metadata": "^0.1.13",
-    "sax": "^1.3.0",
+    "reflect-metadata": "^0.2.2",
+    "sax": "^1.4.1",
     "tsyringe": "^4.8.0",
     "uuid": "^9.0.1",
-    "winston": "^3.11.0",
+    "winston": "^3.14.2",
     "word-wrap": "^1.2.5",
-    "yauzl": "^2.10.0"
+    "yauzl": "^3.1.3"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
-    "@types/express-serve-static-core": "^4.17.41",
-    "@types/jest": "^29.5.10",
-    "@types/lodash": "^4.14.202",
-    "@types/mathjs": "^9.4.1",
+    "@types/express-serve-static-core": "^4.19.5",
+    "@types/jest": "^29.5.12",
+    "@types/lodash": "^4.17.7",
+    "@types/mathjs": "^9.4.2",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.10.1",
+    "@types/node": "^22.5.0",
     "@types/request-promise-native": "^1.0.21",
     "@types/sax": "^1.2.7",
     "@types/uuid": "^9.0.7",
     "@types/winston": "^2.4.4",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "@typescript-eslint/parser": "^6.13.1",
-    "eslint": "^8.54.0",
-    "eslint-config-standard-with-typescript": "^40.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
+    "eslint": "^8.56.0",
+    "eslint-config-standard-with-typescript": "^43.0.1",
     "jest": "^29.7.0",
-    "madge": "^6.1.0",
+    "madge": "^8.0.0",
     "standard": "^17.1.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.2"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.5.4"
   }
 }

package/src/buffer/ascii/ascii-encoder.ts

@@ -1,7 +1,7 @@
 import { ILooseObject } from '../../collections/collection'
 import {
   ContainedGroupField, ContainedSimpleField,
-  ContainedFieldSet, ContainedField,
+  IContainedSet, ContainedField,
   ContainedComponentField, FieldsDispatch
 } from '../../dictionary/contained'
 import { SimpleFieldDefinition, FixDefinitions } from '../../dictionary/definition'
@@ -26,7 +26,7 @@ export class AsciiEncoder extends MsgEncoder {
     public readonly delimiter: number = AsciiChars.Soh,
     public readonly logDelimiter: number = AsciiChars.Pipe) {
     super(definitions)
-    this.tags = new Tags(definitions)
+    this.tags = new Tags()
   }
 
   public trim (): Buffer {
@@ -51,12 +51,12 @@ export class AsciiEncoder extends MsgEncoder {
     this.tags.reset()
   }
 
-  public encodeSet (objectToEncode: ILooseObject, set: ContainedFieldSet): void {
+  public encodeSet (objectToEncode: ILooseObject, set: IContainedSet): void {
     const summary: AsciiEncodeSetSummary = new AsciiEncodeSetSummary()
     this.encodeObject(objectToEncode, set, summary)
   }
 
-  private encodeObject (objectToEncode: ILooseObject, set: ContainedFieldSet, state: AsciiEncodeSetSummary): void {
+  private encodeObject (objectToEncode: ILooseObject, set: IContainedSet, state: AsciiEncodeSetSummary): void {
     const fields: ContainedField[] = this.getFields(set, objectToEncode)
     this.dispatcher.dispatchFields(fields, {
       simple: (sf: ContainedSimpleField) => {
@@ -83,11 +83,11 @@ export class AsciiEncoder extends MsgEncoder {
     })
   }
 
-  private getFields (set: ContainedFieldSet, o: ILooseObject): ContainedField[] {
+  private getFields (set: IContainedSet, o: ILooseObject): ContainedField[] {
     const keys: string[] = Object.keys(o)
     let j: number = 0
     const fields: ContainedField[] = keys.reduce((a: ContainedField[], current: string) => {
-      const field: ContainedField | null = set.localNameToField.get(current)
+      const field = set.localNameToField.get(current)
       if (field) {
         a[j++] = field
       }
@@ -140,7 +140,7 @@ export class AsciiEncoder extends MsgEncoder {
     buffer.writeChar(delimiter)
   }
 
-  private encodeSimple (o: ILooseObject, set: ContainedFieldSet, sf: ContainedSimpleField, val: any): void {
+  private encodeSimple (o: ILooseObject, set: IContainedSet, sf: ContainedSimpleField, val: any): void {
     const definition = sf.definition
     const tag: number = definition.tag
     const buffer = this.buffer

package/src/buffer/ascii/ascii-parser-state.ts

@@ -1,5 +1,5 @@
 import { Tags } from '../tag/tags'
-import { MessageDefinition } from '../../dictionary/definition'
+import { FixDefinitions, MessageDefinition } from '../../dictionary/definition'
 import { ElasticBuffer } from '../elastic-buffer'
 import { ParseState } from './parse-state'
 import { inject, injectable } from 'tsyringe'
@@ -7,7 +7,7 @@ import { DITokens } from '../../runtime/di-tokens'
 
 @injectable()
 export class AsciiParserState {
-  public message: MessageDefinition | null
+  public message: MessageDefinition | undefined
   public locations: Tags
   public parseState: ParseState
   public bodyLen: number
@@ -19,6 +19,7 @@ export class AsciiParserState {
   public currentTag: number
   public rawDataLen: number
   public rawDataRead: number
+  public definitions: FixDefinitions
   public msgType: string | null
 
   constructor (@inject(DITokens.ParseBuffer) public readonly elasticBuffer: ElasticBuffer) {
@@ -126,7 +127,7 @@ export class AsciiParserState {
           throw new Error(`MsgTag: not expected at position [${nextTagPos}]`)
         }
         this.msgType = buffer.getString(equalPos + 1, valueEndPos)
-        this.message = locations.definitions.message.get(this.msgType)
+        this.message = this.definitions.message.get(this.msgType)
         break
       }
 
@@ -181,7 +182,6 @@ export class AsciiParserState {
     this.rawDataRead = 0
     this.rawDataLen = 0
     this.bodyLen = 0
-    this.message = null
     this.msgType = null
   }
 }

package/src/buffer/ascii/ascii-parser.ts

@@ -10,7 +10,7 @@ import { Readable } from 'stream'
 import { ElasticBuffer } from '../elastic-buffer'
 import { SegmentDescription } from '../segment/segment-description'
 import { ParseState } from './parse-state'
-import { IJsFixConfig } from '../../config'
+import { IJsFixConfig } from '../../config/js-fix-config'
 import { inject, injectable } from 'tsyringe'
 import { DITokens } from '../../runtime/di-tokens'
 import { SegmentType } from '../segment/segment-type'
@@ -35,11 +35,11 @@ export class AsciiParser extends MsgParser {
 
     this.delimiter = config.delimiter ?? AsciiChars.Soh
     this.writeDelimiter = config.logDelimiter ?? AsciiChars.Pipe
-    const definitions = config.definitions
     this.id = AsciiParser.nextId++
     this.segmentParser = config.sessionContainer.resolve<AsciiSegmentParser>(AsciiSegmentParser)
     this.state = config.sessionContainer.resolve<AsciiParserState>(AsciiParserState)
-    this.state.locations = new Tags(definitions, this.receivingBuffer.size / 10)
+    this.state.locations = new Tags(this.receivingBuffer.size / 10)
+    this.state.definitions = this.config.definitions
     this.state.beginMessage()
     if (readStream !== null) {
       this.subscribe()
@@ -181,6 +181,7 @@ export class AsciiParser extends MsgParser {
     const locations = state.locations
     const source = this.receivingBuffer
     const delimiter = this.delimiter
+    const definitions = this.config.definitions
     const replace = this.writeDelimiter
     const msgType = state.msgType ?? null
     if (!msgType) return null
@@ -189,7 +190,7 @@ export class AsciiParser extends MsgParser {
         const structure: Structure | null = this.segmentParser.parse(msgType, locations,
           locations.nextTagPos - 1)
         if (!structure) return null
-        return new AsciiView(structure.msg(),
+        return new AsciiView(definitions, structure.msg(),
           source,
           structure,
           ptr,
@@ -207,6 +208,6 @@ export class AsciiParser extends MsgParser {
     const structure = new Structure(locations, [])
     const segment = new SegmentDescription('unknown', locations.tagPos[0].tag, null, 0, 1, SegmentType.Unknown)
     segment.endPosition = locations.nextTagPos - 1
-    return new AsciiView(segment, source, structure, ptr, delimiter, replace)
+    return new AsciiView(this.config.definitions, segment, source, structure, ptr, delimiter, replace)
   }
 }

package/src/buffer/ascii/ascii-segment-parser.ts

@@ -28,7 +28,7 @@ export class AsciiSegmentParser {
   public parse (msgType: string, tags: Tags, last: number): Structure | null {
     // completed segments in that they are fully parsed
     const segments: SegmentDescription[] = []
-    const msgDefinition: MessageDefinition | null = this.definitions.message.get(msgType)
+    const msgDefinition: MessageDefinition | undefined = this.definitions.message.get(msgType)
     if (!msgDefinition) {
       return null
     }
@@ -58,7 +58,7 @@ export class AsciiSegmentParser {
       }
     }
 
-    function summarise (): any {
+    function summarise (): AsciiSegmentParserSummary {
       return <AsciiSegmentParserSummary>{
         msgType,
         tags: tags.clone().tagPos,

package/src/buffer/ascii/ascii-view.ts

@@ -1,4 +1,4 @@
-import { SimpleFieldDefinition } from '../../dictionary/definition'
+import { FixDefinitions, SimpleFieldDefinition } from '../../dictionary/definition'
 import { SegmentDescription } from '../segment/segment-description'
 import { Structure } from '../structure'
 import { MsgView } from '../msg-view'
@@ -11,13 +11,13 @@ import { TagType } from '../tag/tag-type'
 
 export class AsciiView extends MsgView {
   private readonly timeFormatter: ITimeFormatter = new TimeFormatter(this.buffer)
-  constructor (public readonly segment: SegmentDescription,
+  constructor (public readonly definitions: FixDefinitions, public readonly segment: SegmentDescription,
     public readonly buffer: ElasticBuffer,
     public readonly structure: Structure | null,
     public readonly ptr: number,
     public readonly delimiter: number,
     public readonly writeDelimiter: number) {
-    super(segment, structure)
+    super(definitions, segment, structure)
   }
 
   // if the view is to be kept beyond the event on which it arrives, must be cloned
@@ -26,11 +26,12 @@ export class AsciiView extends MsgView {
     const buffer = this.buffer.clone()
     const segment = this.segment
     const delimiter = this.delimiter
+    const definitions = this.definitions
     const writeDelimiter = this.writeDelimiter
     if (structure) {
-      return new AsciiView(segment, buffer, new Structure(structure.tags.clone(), structure.segments), this.ptr, delimiter, writeDelimiter)
+      return new AsciiView(definitions, segment, buffer, new Structure(structure.tags.clone(), structure.segments), this.ptr, delimiter, writeDelimiter)
     }
-    return new AsciiView(segment, buffer, null, this.ptr, delimiter, writeDelimiter)
+    return new AsciiView(definitions, segment, buffer, null, this.ptr, delimiter, writeDelimiter)
   }
 
   private replaceDelimiter (viewBuffer: Buffer, replaceDelimiter?: number): void {
@@ -71,7 +72,7 @@ export class AsciiView extends MsgView {
     return cs % 256
   }
 
-  protected toTyped (field: SimpleFieldDefinition): any {
+  protected toTyped (field: SimpleFieldDefinition): (boolean | string | number | Date | Buffer | null) {
     const position: number = this.getPosition(field.tag)
     if (position >= 0) {
       switch (field.tagType) {
@@ -117,10 +118,11 @@ export class AsciiView extends MsgView {
         }
       }
     }
+    return null
   }
 
   protected create (singleton: SegmentDescription): MsgView {
-    return new AsciiView(singleton,
+    return new AsciiView(this.definitions, singleton,
       this.buffer,
       this.structure,
       this.ptr,

package/src/buffer/encode-proxy.ts

@@ -3,7 +3,7 @@ import { FixDefinitions, MessageDefinition, SimpleFieldDefinition } from '../dic
 import {
   ContainedComponentField,
   ContainedField,
-  ContainedFieldSet,
+  IContainedSet,
   ContainedFieldType,
   ContainedGroupField,
   ContainedSimpleField
@@ -17,7 +17,7 @@ export class EncodeProxy {
   private static SimpleFieldCheck (field: ContainedSimpleField, val: any): void {
     const definition: SimpleFieldDefinition = field.definition
     if (definition.isEnum()) {
-      const resolved: boolean = definition.containsEnum(val)
+      const resolved: boolean = definition.containsEnum(String(val))
       if (!resolved) {
         throw new Error(`enum field ${field.name} does not support "${val}"`)
       }
@@ -59,7 +59,7 @@ export class EncodeProxy {
       case TagType.Int:
       case TagType.Float:
       case TagType.Length: {
-        if (isNaN(val)) {
+        if (isNaN(val as number)) {
           throw new Error(`field ${field.name} expects number but receives "${typeof val}"`)
         }
         break
@@ -80,17 +80,17 @@ export class EncodeProxy {
     if (!isComplex) {
       throw new Error(`type ${field.name} is a component but is given type "${typeof val}"`)
     }
-    return EncodeProxy.checkProperties(new Proxy({}, EncodeProxy.handler(field.definition)), val)
+    return EncodeProxy.checkProperties(new Proxy({}, EncodeProxy.handler(field.definition)), val as ILooseObject)
   }
 
   private static GroupFieldCheck (field: ContainedGroupField, val: any): object {
-    const accepted: boolean = Array.isArray(val) || !isNaN(val)
+    const accepted: boolean = Array.isArray(val) || !isNaN(val as number)
     if (!accepted) {
       throw new Error(`type ${field.name} is a group and needs array or number, not "${typeof val}"`)
     }
     const gf: ContainedComponentField = field as ContainedComponentField
     const j: number = val
-    const isNumber: boolean = !isNaN(val)
+    const isNumber: boolean = !isNaN(val as number)
     if (isNumber) {
       const arr: ILooseObject[] = new Array(j)
       for (let i: number = 0; i < j; ++i) {
@@ -106,10 +106,10 @@ export class EncodeProxy {
     }
   }
 
-  private static handler (set: ContainedFieldSet): Object {
+  private static handler (set: IContainedSet): Object {
     return {
       set (target: ILooseObject, prop: string, val: any): boolean {
-        const field: ContainedField | null = set.localNameToField.get(prop)
+        const field: ContainedField | undefined = set.localNameToField.get(prop)
         if (!field) {
           throw new Error(`type ${set.name} has no field named ${prop}`)
         }
@@ -140,7 +140,7 @@ export class EncodeProxy {
   }
 
   public wrap (msgName: string): ILooseObject {
-    const msg: MessageDefinition | null = this.definitions.message.get(msgName)
+    const msg: MessageDefinition | undefined = this.definitions.message.get(msgName)
     if (!msg) {
       throw new Error(`no message defined for type ${msgName}`)
     }

package/src/buffer/fixml/fixml-encoder.ts

@@ -1,7 +1,11 @@
 import { ILooseObject } from '../../collections/collection'
 import {
-  ContainedFieldSet, ContainedField, ContainedGroupField,
-  ContainedComponentField, ContainedSimpleField, FieldsDispatch
+  IContainedSet,
+  ContainedField,
+  ContainedGroupField,
+  ContainedComponentField,
+  ContainedSimpleField,
+  FieldsDispatch
 } from '../../dictionary/contained'
 import { AsciiChars } from '../ascii'
 import { MsgEncoder } from '../msg-encoder'
@@ -66,7 +70,7 @@ export class FixmlEncoder extends MsgEncoder {
     return ''
   }
 
-  public encodeSet (o: ILooseObject, set: ContainedFieldSet): void {
+  public encodeSet (o: ILooseObject, set: IContainedSet): void {
     const batch: ILooseObject[] = o.Batch
     const toWrite: ILooseObject[] = batch || [o]
     const depth = batch ? 1 : 0
@@ -91,11 +95,11 @@ export class FixmlEncoder extends MsgEncoder {
     buffer.writeString(this.endDoc)
   }
 
-  private batchStart (o: ILooseObject, set: ContainedFieldSet, depth: number): void {
+  private batchStart (o: ILooseObject, set: IContainedSet, depth: number): void {
     const buffer = this.buffer
     const indent: string = '\t'
     const beginBatch = this.beginBatch
-    const hdr = o.StandardHeader
+    const hdr: ILooseObject = o.StandardHeader
     const eol = this.eol
     buffer.writeString(`${indent}${beginBatch}`)
     if (hdr) {
@@ -105,7 +109,7 @@ export class FixmlEncoder extends MsgEncoder {
     }
   }
 
-  private toXml (o: ILooseObject, name: string, set: ContainedFieldSet, depth: number): void {
+  private toXml (o: ILooseObject, name: string, set: IContainedSet, depth: number): void {
     const buffer = this.buffer
     const selfClose: string = '/>'
     const close: string = '>'
@@ -128,11 +132,11 @@ export class FixmlEncoder extends MsgEncoder {
     }
   }
 
-  private getPopulatedFields (set: ContainedFieldSet, o: ILooseObject): ContainedField[] {
+  private getPopulatedFields (set: IContainedSet, o: ILooseObject): ContainedField[] {
     const keys: string[] = Object.keys(o)
     const fields: ContainedField[] = keys.reduce((a: ContainedField[], current: string) => {
-      const field: ContainedField | null = set.localNameToField.get(current)
-      if (field && !set.nameToLocalAttribute.containsKey(current)) {
+      const field: ContainedField | undefined = set.localNameToField.get(current)
+      if (field && !set.nameToLocalAttribute.has(current)) {
         a.push(field)
       }
       return a
@@ -153,7 +157,7 @@ export class FixmlEncoder extends MsgEncoder {
     buffer.writeChar(AsciiChars.Dq)
   }
 
-  private attributes (o: ILooseObject, set: ContainedFieldSet, depth: number, attributePerLine: boolean): void {
+  private attributes (o: ILooseObject, set: IContainedSet, depth: number, attributePerLine: boolean): void {
     const newLine = this.eol
     const indent: string = '\t'.repeat(depth + 1)
     const attributes = set.localAttribute

package/src/buffer/fixml/fixml-parser.ts

@@ -5,7 +5,7 @@ import { FixDefinitions, MessageDefinition } from '../../dictionary/definition'
 import {
   ContainedField, ContainedComponentField,
   ContainedFieldType, ContainedGroupField,
-  ContainedSimpleField, ContainedFieldSet
+  ContainedSimpleField, IContainedSet
 } from '../../dictionary/contained'
 import { SegmentDescription } from '../segment/segment-description'
 import { IJsFixConfig, IJsFixLogger } from '../../config'
@@ -39,7 +39,7 @@ export class FiXmlParser extends MsgParser {
     const me = description?.application?.name
     this.logger = config.logFactory.logger(`${me}:FiXmlParser`)
     this.saxStream = require('sax').createStream(true, {})
-    this.locations = new Tags(this.definitions, maxMessageLocations)
+    this.locations = new Tags(maxMessageLocations)
     this.logger.info('subscribe to stream')
     this.subscribe()
   }
@@ -180,7 +180,7 @@ export class FiXmlParser extends MsgParser {
   private getView (): MsgView {
     const structure: Structure = new Structure(this.locations, this.segments)
     const last = structure.segments[structure.segments.length - 1]
-    return new FixmlView(last, this.values, structure)
+    return new FixmlView(this.definitions, last, this.values, structure)
   }
 
   private pop (name: string): SegmentDescription | null {
@@ -333,7 +333,7 @@ export class FiXmlParser extends MsgParser {
   private msg (saxNode: ISaxNode, inBatch: boolean = false): void {
     this.logger.debug(`${saxNode.name}: begin parse msg`)
     const type: string = saxNode.name
-    const def: MessageDefinition | null = this.definitions.message.get(type)
+    const def: MessageDefinition | undefined = this.definitions.message.get(type)
     if (!def) {
       throw new Error(`unknown message type ${type}`)
     }
@@ -347,7 +347,7 @@ export class FiXmlParser extends MsgParser {
     }
   }
 
-  private parseAttributes (name: string, set: ContainedFieldSet, saxNode: ISaxNode, type: SegmentType): SegmentDescription | null {
+  private parseAttributes (name: string, set: IContainedSet, saxNode: ISaxNode, type: SegmentType): SegmentDescription | null {
     const locations = this.locations
     const attributes = saxNode.attributes
     const values = this.values

package/src/buffer/fixml/fixml-view.ts

@@ -1,5 +1,5 @@
 import { MsgView } from '../msg-view'
-import { SimpleFieldDefinition } from '../../dictionary/definition'
+import { FixDefinitions, SimpleFieldDefinition } from '../../dictionary/definition'
 import { Structure } from '../structure'
 import { SegmentDescription } from '../segment/segment-description'
 import { AsciiChars } from '../ascii/'
@@ -7,10 +7,10 @@ import * as moment from 'moment'
 import { TagType } from '../tag/tag-type'
 
 export class FixmlView extends MsgView {
-  constructor (public readonly segment: SegmentDescription,
+  constructor (public definitions: FixDefinitions, public readonly segment: SegmentDescription,
     public readonly values: string[],
     public readonly structure: Structure) {
-    super(segment, structure)
+    super(definitions, segment, structure)
   }
 
   private static getTimestamp (s: string, useUtc: boolean): Date {
@@ -37,7 +37,7 @@ export class FixmlView extends MsgView {
 
   // if the view is to be kept beyond the event on which it arrives, must be cloned
   public clone (): MsgView {
-    return new FixmlView(this.segment, this.values, new Structure(this.structure.tags.clone(), this.structure.segments))
+    return new FixmlView(this.definitions, this.segment, this.values, new Structure(this.structure.tags.clone(), this.structure.segments))
   }
 
   public checksum (): number {
@@ -45,7 +45,7 @@ export class FixmlView extends MsgView {
   }
 
   protected create (singleton: SegmentDescription): FixmlView {
-    return new FixmlView(singleton,
+    return new FixmlView(this.definitions, singleton,
       this.values,
       this.structure)
   }

package/src/buffer/msg-encoder.ts

@@ -1,6 +1,6 @@
 import { ILooseObject } from '../collections/collection'
 import { FixDefinitions } from '../dictionary/definition'
-import { ContainedFieldSet } from '../dictionary/contained'
+import { IContainedSet } from '../dictionary/contained'
 import * as events from 'events'
 
 export abstract class MsgEncoder extends events.EventEmitter {
@@ -9,7 +9,7 @@ export abstract class MsgEncoder extends events.EventEmitter {
   }
 
   public encode (o: ILooseObject, name: string): void {
-    const set: ContainedFieldSet | null = this.definitions.message.get(name) ??
+    const set: IContainedSet | undefined = this.definitions.message.get(name) ??
       this.definitions.component.get(name)
     if (!set) {
       return
@@ -19,5 +19,5 @@ export abstract class MsgEncoder extends events.EventEmitter {
 
   public abstract reset (): void
   public abstract trim (): Buffer
-  public abstract encodeSet (o: ILooseObject, set: ContainedFieldSet): void
+  public abstract encodeSet (o: ILooseObject, set: IContainedSet): void
 }