jspurefix 2.2.1 → 3.0.0

package/src/dictionary/parser/fixml/fields-parser.ts

@@ -10,8 +10,8 @@ interface ISimpleField extends ILooseObject {
   Protocol: string
   simpleTypeName: string
   name: string
-  ComponentType: string,
-  Tag: string,
+  ComponentType: string
+  Tag: string
   Type: string
   AbbrName: string
   Category: string
@@ -26,7 +26,7 @@ interface IAlias {
 }
 
 export class FieldsParser extends XsdParser {
-  private alias: IAlias[] = []
+  private readonly alias: IAlias[] = []
   public constructor (public readonly definitions: FixDefinitions) {
     super(definitions)
   }
@@ -39,7 +39,7 @@ export class FieldsParser extends XsdParser {
         break
       }
       case 'xs:documentation': {
-        this.current['documentation'] = v
+        this.current.documentation = v
         break
       }
     }
@@ -48,7 +48,7 @@ export class FieldsParser extends XsdParser {
   public close (line: number, node: string): void {
     const current: ISimpleField = this.current as ISimpleField
     switch (node) {
-      case'xs:simpleType': {
+      case 'xs:simpleType': {
         this.data[this.data.length] = current
         break
       }
@@ -62,10 +62,9 @@ export class FieldsParser extends XsdParser {
 
   public open (line: number, node: ISaxNode): void {
     switch (node.name) {
-
       case 'xs:simpleType': {
         this.current = {
-          simpleTypeName: node.attributes['name']
+          simpleTypeName: node.attributes.name
         } as ISimpleField
         break
       }
@@ -76,7 +75,7 @@ export class FieldsParser extends XsdParser {
       }
 
       case 'xs:restriction': {
-        this.current.restrictionBase = node.attributes['base']
+        this.current.restrictionBase = node.attributes.base
         break
       }
 
@@ -84,7 +83,7 @@ export class FieldsParser extends XsdParser {
         if (!this.current.enums) {
           this.current.enums = new Dictionary<string>()
         }
-        this.current.currentEnum = node.attributes['value']
+        this.current.currentEnum = node.attributes.value
         this.pending = node.name
         break
       }
@@ -120,7 +119,7 @@ export class FieldsParser extends XsdParser {
         }
         alias.push({
           name: f.simpleTypeName,
-          mapped: mapped
+          mapped
         })
       }
     })

package/src/dictionary/parser/fixml/fix-xsd-parser.ts

@@ -10,7 +10,6 @@ import { FixDefinitionSource } from '../../fix-definition-source'
 import { FixVersion } from '../../fix-versions'
 
 export class FixXsdParser extends FixParser {
-
   public readonly definitions: FixDefinitions
   private readonly logger: IJsFixLogger
 
@@ -28,7 +27,7 @@ export class FixXsdParser extends FixParser {
     logger.info(`resolve includes ${main} from root ${this.rootPath}`)
     const t = new IncludeGraph(this.rootPath, main)
     await t.build()
-    const resolved: string[] = t.resolve(main)
+    const resolved: string[] = t.resolve(main) ?? []
     const fields: FieldsParser = new FieldsParser(definitions)
     const components: ComponentsParser = new ComponentsParser(definitions)
     const filtered: string[] = resolved.reduce((a: string[], f: string) => {
@@ -38,7 +37,7 @@ export class FixXsdParser extends FixParser {
       return a
     }, [])
 
-    for (let f of filtered) {
+    for (const f of filtered) {
       const parser: XsdParser = f.indexOf('-fields-') > 0 ? fields : components
       logger.info(`parsing file ${f}`)
       await parser.parse(path.join(this.rootPath, f))

package/src/dictionary/parser/fixml/include-graph.ts

@@ -33,8 +33,8 @@ export class IncludeGraph {
     this.getGraph()
   }
 
-  public resolve (file: string): string[] {
-    const label: number = this.nodes.get(file)
+  public resolve (file: string): string[] | null {
+    const label: number | null = this.nodes.get(file)
     if (label == null) {
       return null
     }
@@ -47,18 +47,21 @@ export class IncludeGraph {
 
   private resolve_nodes (label: number, depends: number[]): void {
     const node: IGraphNode = this.graph[label]
-    for (let e of node.edges) {
-      if (depends.indexOf(e) < 0) {
-        this.resolve_nodes(e, depends)
-      }
+    if (node) {
+      node.edges.forEach(e => {
+        if (!depends.includes(e)) {
+          this.resolve_nodes(e, depends)
+        }
+      })
     }
     depends.push(label)
   }
 
-  private getGraph () {
+  private getGraph (): void {
     const nodes = this.nodes
-    this.graph = this.includes.reduce((a: INumericKeyed<IGraphNode>, current: IInclude) => {
-      const parent: number = nodes.get(current.parent)
+    this.graph = this.includes.reduce<INumericKeyed<IGraphNode>>((a: INumericKeyed<IGraphNode>, current: IInclude) => {
+      const parent: number | null = nodes.get(current.parent)
+      if (parent == null) return a
       let parentNode = a[parent]
       if (!parentNode) {
         a[parent] = parentNode = {
@@ -68,16 +71,18 @@ export class IncludeGraph {
         } as IGraphNode
       }
       current.children.forEach((s: string) => {
-        const child: number = nodes.get(s)
-        if (parentNode.edges.indexOf(child) < 0) {
-          parentNode.edges.push(child)
+        const child: number | null = nodes.get(s)
+        if (child) {
+          if (!parentNode.edges.includes(child)) {
+            parentNode.edges.push(child)
+          }
         }
       })
       return a
-    }, {} as INumericKeyed<IGraphNode>)
+    }, {})
   }
 
-  private assignNodes () {
+  private assignNodes (): void {
     let next: number = 0
     this.nodes = this.includes.reduce((a: Dictionary<number>, current: IInclude) => {
       if (!a.containsKey(current.parent)) {
@@ -92,8 +97,8 @@ export class IncludeGraph {
     }, new Dictionary<number>())
   }
 
-  private scanIncludes (file: string): Promise<string[]> {
-    return new Promise<string[]>((accept, reject) => {
+  private async scanIncludes (file: string): Promise<string[]> {
+    return await new Promise<string[]>((resolve, reject) => {
       const includes: string[] = []
       const pass: fs.ReadStream = fs.createReadStream(path.join(this.root, file))
       const saxStream: SAXStream = require('sax').createStream(true, {})
@@ -107,7 +112,7 @@ export class IncludeGraph {
         }
       })
       saxStream.on('ready', () => {
-        accept(includes)
+        resolve(includes)
       })
       saxStream.on('error', (r) => {
         reject(r)
@@ -116,16 +121,16 @@ export class IncludeGraph {
     })
   }
 
-  private getIncludes (main: string): Promise<IInclude[]> {
+  private async getIncludes (main: string): Promise<IInclude[]> {
     const q: any[] = []
     q.push([main])
     const ordered: IInclude[] = []
     const seen: Dictionary<boolean> = new Dictionary<boolean>()
-    return new Promise<IInclude[]>(async (accept, reject) => {
+    return await new Promise<IInclude[]>(async (resolve, reject) => {
       try {
         while (q.length > 0) {
           const batch: string[] = q.pop()
-          for (let next of batch) {
+          for (const next of batch) {
             if (seen.containsKey(next)) {
               continue
             }
@@ -138,7 +143,7 @@ export class IncludeGraph {
             q.push(includes)
           }
         }
-        accept(ordered)
+        resolve(ordered)
       } catch (e) {
         reject(e)
       }

package/src/dictionary/parser/fixml/xsd-parser.ts

@@ -8,13 +8,13 @@ import { ISaxNode } from '../../sax-node'
 export abstract class XsdParser {
   public readonly data: ILooseObject[] = []
   public current: ILooseObject
-  protected pending: string
+  protected pending: string | null
 
   protected constructor (public readonly definitions: FixDefinitions) {
   }
 
-  public parse (file: string): Promise<FixDefinitions> {
-    return new Promise<FixDefinitions>((accept, reject) => {
+  public async parse (file: string): Promise<FixDefinitions> {
+    return await new Promise<FixDefinitions>((resolve, reject) => {
       const pass: fs.ReadStream = fs.createReadStream(file)
       const saxStream: SAXStream = require('sax').createStream(true, {})
       const saxParser: SAXParser = saxStream._parser
@@ -27,7 +27,7 @@ export abstract class XsdParser {
       })
 
       saxStream.on('ready', () => {
-        accept(this.definitions)
+        resolve(this.definitions)
       })
 
       saxStream.on('text', (t: string) => {
@@ -53,7 +53,7 @@ export abstract class XsdParser {
       target = this.current
     }
     const keys: string[] = Object.keys(node.attributes)
-    for (let k of keys) {
+    for (const k of keys) {
       target[k] = node.attributes[k]
     }
   }

package/src/dictionary/parser/quickfix/field-definition-parser.ts

@@ -13,9 +13,9 @@ export class FieldDefinitionParser extends NodeParser {
     switch (node.name) {
       case 'field': {
         this.currentField = new SimpleFieldDefinition(
-                    node.attributes.number,
-                    node.attributes.name,
-                    node.attributes.name,
+          node.attributes.number,
+          node.attributes.name,
+          node.attributes.name,
           null,
           null,
           node.attributes.type,
@@ -32,7 +32,5 @@ export class FieldDefinitionParser extends NodeParser {
   }
 
   public close (line: number, name: string): void {
-    switch (name) {
-    }
   }
 }

package/src/dictionary/parser/quickfix/field-set-parser.ts

@@ -55,14 +55,14 @@ export class FieldSetParser extends NodeParser {
       case 'component':
       case 'header':
       case 'trailer': {
-        const latest: ParseContext = this.parseContexts.pop()
+        const latest: ParseContext | null = this.parseContexts.pop() ?? null
         if (latest == null) {
           throw new Error(`component field ${name} closes yet does not exist.`)
         }
         if (!latest.defining) {
           return
         }
-        const asComponent: ComponentFieldDefinition = latest.asComponent()
+        const asComponent: ComponentFieldDefinition | null = latest.asComponent() ?? null
         if (asComponent != null) {
           this.definitions.addComponentFieldDef(asComponent)
         } else {

package/src/dictionary/parser/quickfix/message-parser.ts

@@ -5,7 +5,6 @@ import { ContainedComponentField } from '../../contained'
 import { ISaxNode } from '../../sax-node'
 
 export class MessageParser extends NodeParser {
-
   constructor (definitions: FixDefinitions, public passes: number) {
     super(definitions, passes)
   }
@@ -17,9 +16,13 @@ export class MessageParser extends NodeParser {
         const msg: MessageDefinition = new MessageDefinition(att.name, att.name, att.msgtype, att.msgcat, null)
         const context: ParseContext = new ParseContext(msg.name, true, msg)
         const hdr = this.definitions.component.get('StandardHeader')
-        const contained = new ContainedComponentField(hdr, msg.fields.length, true)
-        msg.add(contained)
-        this.parseContexts.push(context)
+        const contained = hdr
+          ? new ContainedComponentField(hdr, msg.fields.length, true)
+          : null
+        if (contained) {
+          msg.add(contained)
+          this.parseContexts.push(context)
+        }
         break
       }
 
@@ -47,8 +50,8 @@ export class MessageParser extends NodeParser {
   public close (line: number, name: string): void {
     switch (name) {
       case 'message': {
-        const parent: ParseContext = this.parseContexts.pop()
-        const message: MessageDefinition = parent.asMessage()
+        const parent: ParseContext | null = this.parseContexts.pop() ?? null
+        const message: MessageDefinition | null = parent?.asMessage() ?? null
         if (message != null) {
           this.definitions.addMessage(message)
         }

package/src/dictionary/parser/quickfix/node-parser.ts

@@ -15,31 +15,31 @@ export abstract class NodeParser {
 
   protected addSimple (node: ISaxNode): void {
     if (node.isSelfClosing) {
-      const parent: ParseContext = this.peek()
+      const parent: ParseContext | null = this.peek()
       if (parent == null) {
         throw new Error(`simple field ${node.name} has no parent on which to add.`)
       }
       const fieldName: string = node.attributes.name
-      const fieldDefinition: SimpleFieldDefinition = this.definitions.simple.get(fieldName)
+      const fieldDefinition: SimpleFieldDefinition | null = this.definitions.simple.get(fieldName)
       if (fieldDefinition == null) {
         throw new Error(`simple field ${fieldName} has no declaration in dictionary.`)
       }
       const containedField: ContainedSimpleField = new ContainedSimpleField(fieldDefinition,
-                parent.set.fields.length, node.attributes.required === 'Y', false)
-      parent.set.add(containedField)
+        parent?.set?.fields?.length ?? 0, node.attributes.required === 'Y', false)
+      parent?.set?.add(containedField)
     }
   }
 
   protected addComponentField (componentName: string, node: ISaxNode): void {
-    const parent: ParseContext = this.peek()
+    const parent: ParseContext | null = this.peek()
     if (parent == null) {
       throw new Error(`component ${node.name} has no parent on which to add.`)
     }
-    const fieldDef: ComponentFieldDefinition = this.definitions.component.get(componentName)
+    const fieldDef: ComponentFieldDefinition | null = this.definitions.component.get(componentName)
     if (fieldDef != null) {
       const containedField: ContainedComponentField =
-                new ContainedComponentField(fieldDef, parent.set.fields.length, parent.required)
-      parent.set.add(containedField)
+                new ContainedComponentField(fieldDef, parent?.set?.fields?.length ?? 0, parent.required)
+      parent?.set?.add(containedField)
     } else {
       if (this.passes >= 4) {
         throw new Error(`field ${node.name} includes unknown component ${componentName}.`)
@@ -48,16 +48,18 @@ export abstract class NodeParser {
   }
 
   protected addGroupField (name: string): void {
-    const group: ParseContext = this.parseContexts.pop()
+    const group: ParseContext | null = this.parseContexts.pop() ?? null
     if (group == null) {
       throw new Error(`group field ${name} closes yet does not exist.`)
     }
-    const parent: ParseContext = this.peek()
+    const parent: ParseContext | null = this.peek()
     if (parent != null) {
-      const asGroup: GroupFieldDefinition = group.asGroup()
-      const containedField: ContainedGroupField =
-                new ContainedGroupField(asGroup, parent.set.fields.length, group.required)
-      parent.set.add(containedField)
+      const asGroup: GroupFieldDefinition | null = group.asGroup()
+      if (asGroup) {
+        const containedField: ContainedGroupField =
+          new ContainedGroupField(asGroup, parent?.set?.fields?.length ?? 0, group.required)
+        parent?.set?.add(containedField)
+      }
     } else {
       throw new Error(`group field ${group.name} has no parent on which to add.`)
     }
@@ -65,21 +67,21 @@ export abstract class NodeParser {
 
   protected beginGroupDefinition (node: ISaxNode): void {
     if (!node.isSelfClosing) {
-            // a group should have a field that matches its name
+      // a group should have a field that matches its name
       const groupName: string = node.attributes.name
-      const noOfField: SimpleFieldDefinition = this.definitions.simple.get(groupName)
+      const noOfField: SimpleFieldDefinition | null = this.definitions.simple.get(groupName) ?? null
       if (noOfField == null) {
         const msg: string = `group ${groupName} has no field defined.`
         throw new Error(msg)
       }
-      const set: GroupFieldDefinition = new GroupFieldDefinition(groupName, groupName, null, noOfField,null)
+      const set: GroupFieldDefinition = new GroupFieldDefinition(groupName, groupName, null, noOfField, null)
       const context: ParseContext = new ParseContext(node.attributes.name, true, set)
       context.required = node.attributes.required === 'Y'
       this.parseContexts.push(context)
     }
   }
 
-  private peek (): ParseContext {
+  private peek (): ParseContext | null {
     return this.parseContexts.length > 0 ? this.parseContexts[this.parseContexts.length - 1] : null
   }
 }

package/src/dictionary/parser/quickfix/parse-context.ts

@@ -4,11 +4,11 @@ import { ComponentFieldDefinition, GroupFieldDefinition, MessageDefinition } fro
 export class ParseContext {
   public required: boolean
 
-  constructor (public name: string, public defining: boolean, public set: ContainedFieldSet) {
+  constructor (public name: string, public defining: boolean, public set: ContainedFieldSet | null) {
     this.required = false
   }
 
-  public asMessage (): MessageDefinition {
+  public asMessage (): MessageDefinition | null {
     const res: boolean = this.set != null && this.set instanceof MessageDefinition
     if (res) {
       return (this.set) as MessageDefinition
@@ -17,7 +17,7 @@ export class ParseContext {
     }
   }
 
-  public asComponent (): ComponentFieldDefinition {
+  public asComponent (): ComponentFieldDefinition | null {
     const res: boolean = this.set != null && this.set instanceof ComponentFieldDefinition
     if (res) {
       return (this.set) as ComponentFieldDefinition
@@ -26,7 +26,7 @@ export class ParseContext {
     }
   }
 
-  public asGroup (): GroupFieldDefinition {
+  public asGroup (): GroupFieldDefinition | null {
     const res: boolean = this.set != null && this.set instanceof GroupFieldDefinition
     if (res) {
       return (this.set) as GroupFieldDefinition

package/src/dictionary/parser/quickfix/quick-fix-xml-file-parser.ts

@@ -16,7 +16,6 @@ import { VersionUtil } from '../../version-util'
 import { ParseState } from './parse-state'
 
 export class QuickFixXmlFileParser extends FixParser {
-
   public parseState: ParseState = ParseState.Begin
   public numberPasses: number = 0
   public definitions: FixDefinitions
@@ -27,7 +26,7 @@ export class QuickFixXmlFileParser extends FixParser {
   }
 
   private static subscribe (instance: QuickFixXmlFileParser, saxStream: SAXStream, done: IDictDoneCb): void {
-    let parser: NodeParser
+    let parser: NodeParser | null
 
     instance.numberPasses++
     switch (instance.parseState) {
@@ -79,7 +78,6 @@ export class QuickFixXmlFileParser extends FixParser {
       const saxNode: ISaxNode = node as ISaxNode
 
       switch (saxNode.name) {
-
         case 'fix': {
           switch (instance.parseState) {
             case ParseState.FieldDefinitions: {
@@ -120,9 +118,9 @@ export class QuickFixXmlFileParser extends FixParser {
         }
 
         case 'components': {
-                    // can have a group containing components which contain themselves components of groups
-                    // each step will build forward references to a deeper level to ensure final messages
-                    // have all dependencies correctly defined.
+          // can have a group containing components which contain themselves components of groups
+          // each step will build forward references to a deeper level to ensure final messages
+          // have all dependencies correctly defined.
           switch (instance.parseState) {
             case ParseState.ComponentsFirstPass:
             case ParseState.ComponentsSecondPass:
@@ -175,7 +173,7 @@ export class QuickFixXmlFileParser extends FixParser {
     saxStream.on('ready', () => {
       if (done) {
         parser = null
-        done(null, instance.definitions)
+        done(undefined, instance.definitions)
       }
     })
   }
@@ -187,15 +185,15 @@ export class QuickFixXmlFileParser extends FixParser {
     keys.forEach(k => {
       const message = messages.get(k)
       const trailer = this.definitions.component.get(trailerName)
-      if (trailer && !message.components.containsKey(trailerName)) {
-        const contained = new ContainedComponentField(trailer, message.fields.length, true)
-        message.add(contained)
+      if (trailer && !message?.components.containsKey(trailerName)) {
+        const contained = new ContainedComponentField(trailer, message?.fields?.length ?? 0, true)
+        message?.add(contained)
       }
     })
   }
 
-  public parse (): Promise<FixDefinitions> {
-    return new Promise<FixDefinitions>(async (accept, reject) => {
+  public async parse (): Promise<FixDefinitions> {
+    return await new Promise<FixDefinitions>(async (resolve, reject) => {
       try {
         await this.onePass() // first fetch all field definitions
         await this.onePass() // first pass of components, will not know about forward components.
@@ -203,17 +201,17 @@ export class QuickFixXmlFileParser extends FixParser {
         await this.onePass() // third pass of components all fully resolved i.e. pick up versions from pass above
         await this.onePass() // lastly messages with all dependencies
         this.encloseMessages()
-        accept(this.definitions)
+        resolve(this.definitions)
       } catch (e) {
         reject(e)
       }
     })
   }
 
-  private async onePass (): Promise<FixDefinitions> {
+  private async onePass (): Promise<FixDefinitions | undefined | null> {
     const pass: fs.ReadStream = fs.createReadStream(this.xmlPath)
     const saxStream: SAXStream = require('sax').createStream(true, {})
     pass.pipe(saxStream)
-    return this.singlePass(this, saxStream)
+    return await this.singlePass(this, saxStream)
   }
 }

package/src/dictionary/set-reduce.ts

@@ -1,9 +1,10 @@
-import { ContainedField, ContainedFieldSet,
-  ContainedGroupField, ContainedSimpleField, ContainedComponentField, ContainedFieldType } from './contained'
+import {
+  ContainedField, ContainedFieldSet,
+  ContainedGroupField, ContainedSimpleField, ContainedComponentField, ContainedFieldType
+} from './contained'
 import { ITypeDispatcher } from './type-dispatcher'
 
 export class SetReduce<T> {
-
   reduceField (a: T, field: ContainedField, dispatcher: ITypeDispatcher<T>): void {
     switch (field.type) {
       case ContainedFieldType.Group: {

package/src/dictionary/type-dispatcher.ts

@@ -1,7 +1,7 @@
 import { ContainedComponentField, ContainedGroupField, ContainedSimpleField } from './contained'
 
 export interface ITypeDispatcher<T> {
-  group?: { (a: T, field: ContainedGroupField): void }
-  simple?: { (a: T, field: ContainedSimpleField): void }
-  component?: { (a: T, field: ContainedComponentField): void }
+  group?: (a: T, field: ContainedGroupField) => void
+  simple?: (a: T, field: ContainedSimpleField) => void
+  component?: (a: T, field: ContainedComponentField) => void
 }

package/src/dictionary/version-util.ts

@@ -3,21 +3,21 @@ import { FixVersion } from './fix-versions'
 export abstract class VersionUtil {
   public static resolve (description: string): FixVersion {
     let version: FixVersion = FixVersion.Unknown
-    if (description.indexOf('FIX.4.0') >= 0) {
+    if (description.includes('FIX.4.0')) {
       version = FixVersion.FIX40
-    } else if (description.indexOf('FIX.4.1') >= 0) {
+    } else if (description.includes('FIX.4.1')) {
       version = FixVersion.FIX41
-    } else if (description.indexOf('FIX.4.2') >= 0) {
+    } else if (description.includes('FIX.4.2')) {
       version = FixVersion.FIX42
-    } else if (description.indexOf('FIX.4.3') >= 0) {
+    } else if (description.includes('FIX.4.3')) {
       version = FixVersion.FIX43
-    } else if (description.indexOf('FIX.4.4') >= 0) {
+    } else if (description.includes('FIX.4.4')) {
       version = FixVersion.FIX44
-    } else if (description.indexOf('FIX.5.0') >= 0) {
+    } else if (description.includes('FIX.5.0')) {
       version = FixVersion.FIX50
-    } else if (description.indexOf('FIX.5.0SP1') >= 0) {
+    } else if (description.includes('FIX.5.0SP1')) {
       version = FixVersion.FIX50SP1
-    } else if (description.indexOf('FIX.5.0SP1') >= 0) {
+    } else if (description.includes('FIX.5.0SP1')) {
       version = FixVersion.FIX50SP2
     }
     return version