jspurefix 1.3.0 → 2.0.2

package/src/dictionary/parser/fix-repository/repository-xml-parser.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import { SAXParser } from 'sax'
 import { promisify } from 'util'
-import { IDictDoneCb, ISaxNode, SAXStream } from '../../dict-primitive'
+import { IDictDoneCb, SAXStream } from '../../dict-primitive'
 import { FixDefinitions } from '../../definition'
 import { AbbreviationsParser } from './abbreviations-parser'
 import { BaseParser } from './base-parser'
@@ -13,9 +13,10 @@ import { MessagesParser } from './messages-parser'
 import { MsgContentsParser } from './msg-contents-parser'
 import { Repository } from './repository'
 import { FixParser } from '../../fix-parser'
-import { VersionUtil } from '../../fix-versions'
 import { GetJsFixLogger, IJsFixLogger } from '../../../config'
 import { DataTypesParser } from './data-types-parser'
+import { ISaxNode } from '../../sax-node'
+import { VersionUtil } from '../../version-util'
 
 export class RepositoryXmlParser extends FixParser {
   public readonly repository: Repository
@@ -86,37 +87,37 @@ export class RepositoryXmlParser extends FixParser {
       const saxNode: ISaxNode = node as ISaxNode
       switch (saxNode.name) {
         case 'Datatypes': {
-          parser = new DataTypesParser(instance)
+          parser = new DataTypesParser()
           break
         }
 
         case 'Fields': {
-          parser = new FieldsParser(instance)
+          parser = new FieldsParser()
           break
         }
 
         case 'Enums': {
-          parser = new EnumsParser(instance)
+          parser = new EnumsParser()
           break
         }
 
         case 'Components': {
-          parser = new ComponentsParser(instance)
+          parser = new ComponentsParser()
           break
         }
 
         case 'Messages': {
-          parser = new MessagesParser(instance)
+          parser = new MessagesParser()
           break
         }
 
         case 'MsgContents': {
-          parser = new MsgContentsParser(instance)
+          parser = new MsgContentsParser()
           break
         }
 
         case 'Abbreviations': {
-          parser = new AbbreviationsParser(instance)
+          parser = new AbbreviationsParser()
           break
         }
 

package/src/dictionary/parser/fix-repository/repository.ts

@@ -1,11 +1,19 @@
 import { ILooseObject } from '../../../collections/collection'
-import { SimpleFieldDefinition, GroupFieldDefinition, ComponentFieldDefinition, MessageDefinition, FixDefinitions } from '../../definition'
+import { SimpleFieldDefinition, GroupFieldDefinition, ComponentFieldDefinition,
+  MessageDefinition, FixDefinitions } from '../../definition'
 import { Dictionary } from '../../../collections'
 import { ContainedFieldSet, ContainedComponentField, ContainedGroupField, ContainedSimpleField } from '../../contained'
-import { ContainedSetType } from '../../dict-primitive'
-import { FixDefinitionSource, FixVersion } from '../../fix-versions'
+import { FixVersion } from '../../fix-versions'
 import { GetJsFixLogger, IJsFixLogger } from '../../../config'
-import { IRepositoryEnum, IRepositoryField, IRepositoryDataType, IRepositoryComponent, IRepositoryMessage, IRepositoryMsgContent, IRepositoryAbbreviation } from './repository-type'
+import { FixDefinitionSource } from '../../fix-definition-source'
+import { ContainedSetType } from '../../contained-set-type'
+import { IRepositoryMessage } from './repository-message'
+import { IRepositoryEnum } from './repository-enum'
+import { IRepositoryDataType } from './repository-data-type'
+import { IRepositoryComponent } from './repository-component'
+import { IRepositoryField } from './repository-field'
+import { IRepositoryAbbreviation } from './repository-abbreviation'
+import { IRepositoryMsgContent } from './repository-msg-content'
 
 export class Repository {
   public Enums: IRepositoryEnum[]
@@ -26,20 +34,26 @@ export class Repository {
 
   constructor (public readonly version: FixVersion, public readonly getLogger: GetJsFixLogger) {
     this.logger = getLogger('Repository')
+    this.includesAbbreviations = Repository.doesIncludeAbbreviations(version)
+    this.definitions = new FixDefinitions(FixDefinitionSource.FixRepo, version)
+  }
+
+  private static doesIncludeAbbreviations (version: FixVersion): boolean {
+    let includesAbbreviations: boolean
     switch (version) {
       case FixVersion.FIX44:
       case FixVersion.FIX50:
       case FixVersion.FIX50SP1:
       case FixVersion.FIX50SP2:
-        this.includesAbbreviations = true
+        includesAbbreviations = true
         break
 
       default: {
-        this.includesAbbreviations = false
+        includesAbbreviations = false
         break
       }
     }
-    this.definitions = new FixDefinitions(FixDefinitionSource.FixRepo, version)
+    return includesAbbreviations
   }
 
   public assign (name: string, data: ILooseObject[]): void {
@@ -87,9 +101,10 @@ export class Repository {
 
   private summarise (): void {
     const logger = this.logger
-    logger.info(`definitions: ${this.definitions.simple.count()} fields`)
-    logger.info(`definitions: ${this.definitions.component.count()} components`)
-    logger.info(`definitions: ${this.definitions.message.count()} messages`)
+    const definitions = this.definitions
+    logger.info(`definitions: ${definitions.simple.count()} fields`)
+    logger.info(`definitions: ${definitions.component.count()} components`)
+    logger.info(`definitions: ${definitions.message.count()} messages`)
   }
 
   private toDefinitions (): void {
@@ -121,37 +136,40 @@ export class Repository {
     this.definitions.component.add('trailer', t)
   }
 
-  private fields (): void {
-    this.dataTypeLookup = this.types()
-    const definitions = this.definitions
+  private static isNative (f: IRepositoryField): boolean {
+    return f.Type === 'Boolean' ||
+      f.Type === 'data' ||
+      f.Type === 'LocalMktDate' ||
+      f.Type === 'UTCDateOnly' ||
+      f.Type === 'UTCTimestamp'
+  }
+
+  private static makeSimple (f: IRepositoryField, type: string) {
+    return new SimpleFieldDefinition(
+      f.Tag,
+      f.Name,
+      f.AbbrName ? f.AbbrName : f.Name,
+      f.BaseCategory,
+      f.BaseCategoryAbbrName,
+      type.toUpperCase(),
+      f.Description)
+  }
+
+  private getType (f: IRepositoryField): string {
     const types = this.dataTypeLookup
-    types.remove('boolean')
-    types.remove('data')
-    this.Fields.forEach((f: IRepositoryField) => {
-      const nativeType =
-        f.Type === 'Boolean' ||
-        f.Type === 'data' ||
-        f.Type === 'LocalMktDate' ||
-        f.Type === 'UTCDateOnly' ||
-        f.Type === 'UTCTimestamp'
-      let type = f.Type
-      const mapped = !nativeType && types.get(type)
-      if (mapped) {
-        type = mapped.BaseType ?? type
-      }
-      definitions.addSimpleFieldDef(new SimpleFieldDefinition(
-                f.Tag,
-                f.Name,
-                f.AbbrName ? f.AbbrName : f.Name,
-                f.BaseCategory,
-                f.BaseCategoryAbbrName,
-                type.toUpperCase(),
-                f.Description))
-    })
+    const nativeType = Repository.isNative(f)
+    let type = f.Type
+    const mapped = !nativeType && types.get(type)
+    if (mapped) {
+      type = mapped.BaseType ?? type
+    }
+    return type
+  }
 
+  private fieldEnums () {
+    const definitions = this.definitions
     for (const e of this.Enums) {
-      const field: SimpleFieldDefinition =
-                definitions.tagToSimple[parseInt(e.Tag, 10)]
+      const field: SimpleFieldDefinition = definitions.tagToSimple[parseInt(e.Tag, 10)]
       if (field == null) {
         continue
       }
@@ -161,6 +179,19 @@ export class Repository {
     }
   }
 
+  private fields (): void {
+    this.dataTypeLookup = this.types()
+    const definitions = this.definitions
+    const types = this.dataTypeLookup
+    types.remove('boolean')
+    types.remove('data')
+    this.Fields.forEach((f: IRepositoryField) => {
+      const type = this.getType(f)
+      definitions.addSimpleFieldDef(Repository.makeSimple(f, type))
+    })
+    this.fieldEnums()
+  }
+
   private contents (): Dictionary<IRepositoryMsgContent[]> {
     return this.MsgContents.reduce((a, current) => {
       let content: IRepositoryMsgContent[] = a.get(current.ComponentID)

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

@@ -1,8 +1,11 @@
-import { ISaxNode } from '../../dict-primitive'
+
 import { Dictionary } from '../../../collections'
 import { XsdParser } from './xsd-parser'
-import { ComponentFieldDefinition, SimpleFieldDefinition, GroupFieldDefinition, FixDefinitions, MessageDefinition } from '../../definition'
-import { ContainedSimpleField, ContainedComponentField, ContainedFieldSet, ContainedGroupField } from '../../contained'
+import { ComponentFieldDefinition, SimpleFieldDefinition,
+  GroupFieldDefinition, FixDefinitions, MessageDefinition } from '../../definition'
+import { ContainedSimpleField, ContainedComponentField,
+  ContainedFieldSet, ContainedGroupField } from '../../contained'
+import { ISaxNode } from '../../sax-node'
 
 interface IElement {
   ref: string

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

@@ -1,8 +1,8 @@
 import { ILooseObject } from '../../../collections/collection'
-import { ISaxNode } from '../../dict-primitive'
 import { Dictionary } from '../../../collections'
 import { SimpleFieldDefinition, FixDefinitions } from '../../definition'
 import { XsdParser } from './xsd-parser'
+import { ISaxNode } from '../../sax-node'
 
 interface ISimpleField extends ILooseObject {
   restrictionBase: string

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

@@ -1,12 +1,13 @@
 import { FixDefinitions } from '../../definition'
 import { FixParser } from '../../fix-parser'
-import { FixDefinitionSource, FixVersion } from '../../fix-versions'
 import { FieldsParser } from './fields-parser'
 import { IncludeGraph } from './include-graph'
 import { ComponentsParser } from './components-parser'
 import { XsdParser } from './xsd-parser'
 import { GetJsFixLogger, IJsFixLogger } from '../../../config'
 import * as path from 'path'
+import { FixDefinitionSource } from '../../fix-definition-source'
+import { FixVersion } from '../../fix-versions'
 
 export class FixXsdParser extends FixParser {
 

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

@@ -1,8 +1,9 @@
-import { ISaxNode, SAXStream } from '../../dict-primitive'
+import { SAXStream } from '../../dict-primitive'
 import { Dictionary } from '../../../collections'
 import { INumericKeyed } from '../../../collections/collection'
 import * as path from 'path'
 import * as fs from 'fs'
+import { ISaxNode } from '../../sax-node'
 
 export interface IInclude {
   parent: string

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

@@ -1,8 +1,9 @@
 import { FixDefinitions } from '../../definition'
 import { ILooseObject } from '../../../collections/collection'
-import { ISaxNode, SAXStream } from '../../dict-primitive'
+import { SAXStream } from '../../dict-primitive'
 import * as fs from 'fs'
 import { SAXParser } from 'sax'
+import { ISaxNode } from '../../sax-node'
 
 export abstract class XsdParser {
   public readonly data: ILooseObject[] = []

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

@@ -1,13 +1,12 @@
-import { ISaxNode } from '../../dict-primitive'
-import { SimpleFieldDefinition } from '../../definition'
+import { FixDefinitions, SimpleFieldDefinition } from '../../definition'
 import { NodeParser } from './node-parser'
-import { QuickFixXmlFileParser } from './quick-fix-xml-file-parser'
+import { ISaxNode } from '../../sax-node'
 
 export class FieldDefinitionParser extends NodeParser {
   private currentField: SimpleFieldDefinition
 
-  constructor (public readonly parser: QuickFixXmlFileParser) {
-    super(parser)
+  constructor (definitions: FixDefinitions, public passes: number) {
+    super(definitions, passes)
   }
 
   public open (line: number, node: ISaxNode): void {

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

@@ -1,12 +1,11 @@
-import { ComponentFieldDefinition } from '../../definition'
-import { ISaxNode } from '../../dict-primitive'
+import { ComponentFieldDefinition, FixDefinitions } from '../../definition'
 import { NodeParser } from './node-parser'
 import { ParseContext } from './parse-context'
-import { QuickFixXmlFileParser } from './quick-fix-xml-file-parser'
+import { ISaxNode } from '../../sax-node'
 
 export class FieldSetParser extends NodeParser {
-  constructor (public readonly parser: QuickFixXmlFileParser) {
-    super(parser)
+  constructor (definitions: FixDefinitions, public passes: number) {
+    super(definitions, passes)
   }
 
   public open (line: number, node: ISaxNode): void {

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

@@ -1,14 +1,13 @@
-import { ISaxNode } from '../../dict-primitive'
-import { MessageDefinition } from '../../definition'
+import { FixDefinitions, MessageDefinition } from '../../definition'
 import { NodeParser } from './node-parser'
 import { ParseContext } from './parse-context'
-import { QuickFixXmlFileParser } from './quick-fix-xml-file-parser'
 import { ContainedComponentField } from '../../contained'
+import { ISaxNode } from '../../sax-node'
 
 export class MessageParser extends NodeParser {
 
-  constructor (public readonly parser: QuickFixXmlFileParser) {
-    super(parser)
+  constructor (definitions: FixDefinitions, public passes: number) {
+    super(definitions, passes)
   }
 
   public open (line: number, node: ISaxNode): void {

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

@@ -1,15 +1,12 @@
 import { ContainedGroupField, ContainedSimpleField, ContainedComponentField } from '../../contained'
-import { ISaxNode } from '../../dict-primitive'
 import { FixDefinitions, GroupFieldDefinition, SimpleFieldDefinition, ComponentFieldDefinition } from '../../definition'
 import { ParseContext } from './parse-context'
-import { QuickFixXmlFileParser } from './quick-fix-xml-file-parser'
+import { ISaxNode } from '../../sax-node'
 
 export abstract class NodeParser {
   protected readonly parseContexts: ParseContext[] = []
-  protected readonly definitions: FixDefinitions
 
-  protected constructor (public readonly parser: QuickFixXmlFileParser) {
-    this.definitions = parser.definitions
+  protected constructor (public readonly definitions: FixDefinitions, public passes: number) {
   }
 
   public abstract open (line: number, node: ISaxNode): void
@@ -44,7 +41,7 @@ export abstract class NodeParser {
                 new ContainedComponentField(fieldDef, parent.set.fields.length, parent.required)
       parent.set.add(containedField)
     } else {
-      if (this.parser.numberPasses >= 4) {
+      if (this.passes >= 4) {
         throw new Error(`field ${node.name} includes unknown component ${componentName}.`)
       }
     }

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

@@ -0,0 +1,8 @@
+export enum ParseState {
+  Begin = 1,
+  FieldDefinitions = 2,
+  ComponentsFirstPass = 3,
+  ComponentsSecondPass = 4,
+  ComponentsThirdPass = 5,
+  Messages = 6
+}

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

@@ -1,25 +1,19 @@
 import * as fs from 'fs'
 import { SAXParser } from 'sax'
-import { IDictDoneCb, ISaxNode, SAXStream } from '../../dict-primitive'
+import { IDictDoneCb, SAXStream } from '../../dict-primitive'
 import { FixDefinitions } from '../../definition'
 import { FieldDefinitionParser } from './field-definition-parser'
 import { FieldSetParser } from './field-set-parser'
 import { MessageParser } from './message-parser'
 import { NodeParser } from './node-parser'
 import { FixParser } from '../../fix-parser'
-import { FixDefinitionSource, VersionUtil } from '../../fix-versions'
 import { GetJsFixLogger } from '../../../config'
 import { promisify } from 'util'
 import { ContainedComponentField } from '../../contained'
-
-enum ParseState {
-    Begin = 1,
-    FieldDefinitions = 2,
-    ComponentsFirstPass = 3,
-    ComponentsSecondPass = 4,
-    ComponentsThirdPass = 5,
-    Messages = 6
-}
+import { ISaxNode } from '../../sax-node'
+import { FixDefinitionSource } from '../../fix-definition-source'
+import { VersionUtil } from '../../version-util'
+import { ParseState } from './parse-state'
 
 export class QuickFixXmlFileParser extends FixParser {
 
@@ -102,7 +96,7 @@ export class QuickFixXmlFileParser extends FixParser {
         case 'fields': {
           switch (instance.parseState) {
             case ParseState.FieldDefinitions: {
-              parser = new FieldDefinitionParser(instance)
+              parser = new FieldDefinitionParser(instance.definitions, instance.numberPasses)
               break
             }
             default: {
@@ -115,7 +109,7 @@ export class QuickFixXmlFileParser extends FixParser {
         case 'messages': {
           switch (instance.parseState) {
             case ParseState.Messages: {
-              parser = new MessageParser(instance)
+              parser = new MessageParser(instance.definitions, instance.numberPasses)
               break
             }
 
@@ -133,7 +127,7 @@ export class QuickFixXmlFileParser extends FixParser {
             case ParseState.ComponentsFirstPass:
             case ParseState.ComponentsSecondPass:
             case ParseState.ComponentsThirdPass:
-              parser = new FieldSetParser(instance)
+              parser = new FieldSetParser(instance.definitions, instance.numberPasses)
               break
           }
           break
@@ -168,7 +162,7 @@ export class QuickFixXmlFileParser extends FixParser {
         case 'trailer': {
           switch (instance.parseState) {
             case ParseState.Messages: {
-              parser = new FieldSetParser(instance)
+              parser = new FieldSetParser(instance.definitions, instance.numberPasses)
               parser.open(saxParser.line, node)
               break
             }

package/src/dictionary/sax-node.ts

@@ -0,0 +1,7 @@
+import { ILooseObject } from '../collections/collection'
+
+export interface ISaxNode {
+  readonly name: string
+  readonly attributes: ILooseObject
+  readonly isSelfClosing: boolean
+}

package/src/dictionary/set-reduce.ts

@@ -1,42 +1,41 @@
-import { ContainedField, ContainedFieldType, ContainedFieldSet, ContainedGroupField, ContainedSimpleField, ContainedComponentField } from './contained'
+import { ContainedField, ContainedFieldSet,
+  ContainedGroupField, ContainedSimpleField, ContainedComponentField, ContainedFieldType } from './contained'
+import { ITypeDispatcher } from './type-dispatcher'
 
-export interface ITypeDispatcher<T> {
-  group?: { (a: T, field: ContainedGroupField): void }
-  simple?: { (a: T, field: ContainedSimpleField): void }
-  component?: { (a: T, field: ContainedComponentField): void }
-}
+export class SetReduce<T> {
 
-function reduceField<T> (a: T, field: ContainedField, dispatcher: ITypeDispatcher<T>): void {
-  switch (field.type) {
-    case ContainedFieldType.Group: {
-      if (dispatcher.group) {
-        dispatcher.group(a, field as ContainedGroupField)
+  reduceField (a: T, field: ContainedField, dispatcher: ITypeDispatcher<T>): void {
+    switch (field.type) {
+      case ContainedFieldType.Group: {
+        if (dispatcher.group) {
+          dispatcher.group(a, field as ContainedGroupField)
+        }
+        break
       }
-      break
-    }
 
-    case ContainedFieldType.Simple: {
-      if (dispatcher.simple) {
-        dispatcher.simple(a, field as ContainedSimpleField)
+      case ContainedFieldType.Simple: {
+        if (dispatcher.simple) {
+          dispatcher.simple(a, field as ContainedSimpleField)
+        }
+        break
       }
-      break
-    }
 
-    case ContainedFieldType.Component: {
-      if (dispatcher.component) {
-        dispatcher.component(a, field as ContainedComponentField)
+      case ContainedFieldType.Component: {
+        if (dispatcher.component) {
+          dispatcher.component(a, field as ContainedComponentField)
+        }
+        break
       }
-      break
-    }
 
-    default:
-      throw new Error(`unknown type ${field.type}`)
+      default:
+        throw new Error(`unknown type ${field.type}`)
+    }
   }
-}
 
-export function reduceSet<T> (def: ContainedFieldSet, dispatcher: ITypeDispatcher<T>, init: T): T {
-  return def.fields.reduce((a: any, field: ContainedField) => {
-    reduceField<T>(a, field, dispatcher)
-    return a
-  }, init)
+  reduce (def: ContainedFieldSet, dispatcher: ITypeDispatcher<T>, init: T): T {
+    return def.fields.reduce((a: any, field: ContainedField) => {
+      this.reduceField(a, field, dispatcher)
+      return a
+    }, init)
+  }
 }

package/src/dictionary/type-dispatcher.ts

@@ -0,0 +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 }
+}

package/src/dictionary/version-util.ts

@@ -0,0 +1,25 @@
+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) {
+      version = FixVersion.FIX40
+    } else if (description.indexOf('FIX.4.1') >= 0) {
+      version = FixVersion.FIX41
+    } else if (description.indexOf('FIX.4.2') >= 0) {
+      version = FixVersion.FIX42
+    } else if (description.indexOf('FIX.4.3') >= 0) {
+      version = FixVersion.FIX43
+    } else if (description.indexOf('FIX.4.4') >= 0) {
+      version = FixVersion.FIX44
+    } else if (description.indexOf('FIX.5.0') >= 0) {
+      version = FixVersion.FIX50
+    } else if (description.indexOf('FIX.5.0SP1') >= 0) {
+      version = FixVersion.FIX50SP1
+    } else if (description.indexOf('FIX.5.0SP1') >= 0) {
+      version = FixVersion.FIX50SP2
+    }
+    return version
+  }
+}

package/src/index.ts

@@ -1,3 +1,4 @@
+export * from './runtime'
 export * from './dictionary'
 export * from './buffer'
 export * from './transport'