jspurefix 1.2.0 → 2.0.0

package/src/dictionary/contained/contained-field.ts

@@ -1,9 +1,4 @@
-
-export enum ContainedFieldType {
-    Component = 0,
-    Group = 1,
-    Simple = 2
-}
+import { ContainedFieldType } from './contained-field-type'
 
 export class ContainedField {
   constructor (public readonly name: string, public readonly position: number,

package/src/dictionary/contained/contained-group-field.ts

@@ -1,5 +1,6 @@
-import { ContainedField, ContainedFieldType } from './contained-field'
+import { ContainedField } from './contained-field'
 import { GroupFieldDefinition } from '../definition'
+import { ContainedFieldType } from './contained-field-type'
 
 export class ContainedGroupField extends ContainedField {
   constructor (public readonly definition: GroupFieldDefinition,

package/src/dictionary/contained/contained-simple-field.ts

@@ -1,5 +1,6 @@
-import { ContainedField, ContainedFieldType } from './contained-field'
+import { ContainedField } from './contained-field'
 import { SimpleFieldDefinition } from '../definition'
+import { ContainedFieldType } from './contained-field-type'
 
 export class ContainedSimpleField extends ContainedField {
   constructor (public readonly definition: SimpleFieldDefinition,

package/src/dictionary/contained/field-dispatcher.ts

@@ -0,0 +1,9 @@
+import { ContainedGroupField } from './contained-group-field'
+import { ContainedSimpleField } from './contained-simple-field'
+import { ContainedComponentField } from './contained-component-field'
+
+export interface IFieldDispatcher {
+  group?: { (field: ContainedGroupField): void }
+  simple?: { (field: ContainedSimpleField): void }
+  component?: { (field: ContainedComponentField): void }
+}

package/src/dictionary/contained/fields-dispatch.ts

@@ -0,0 +1,46 @@
+import { ContainedGroupField } from './contained-group-field'
+import { ContainedSimpleField } from './contained-simple-field'
+import { ContainedField } from './contained-field'
+import { ContainedComponentField } from './contained-component-field'
+import { IFieldDispatcher } from './field-dispatcher'
+import { ContainedFieldType } from './contained-field-type'
+
+export class FieldsDispatch {
+  dispatchField (field: ContainedField, dispatcher: IFieldDispatcher): void {
+    switch (field.type) {
+      case ContainedFieldType.Group: {
+        if (dispatcher.group) {
+          dispatcher.group(field as ContainedGroupField)
+        }
+        break
+      }
+
+      case ContainedFieldType.Simple: {
+        if (dispatcher.simple) {
+          try {
+            dispatcher.simple(field as ContainedSimpleField)
+          } catch (ex) {
+            let x = 0
+          }
+        }
+        break
+      }
+
+      case ContainedFieldType.Component: {
+        if (dispatcher.component) {
+          dispatcher.component(field as ContainedComponentField)
+        }
+        break
+      }
+
+      default:
+        throw new Error(`unknown type ${field.type}`)
+    }
+  }
+
+  dispatchFields (fields: ContainedField[], dispatcher: IFieldDispatcher): void {
+    fields.forEach((field: ContainedField) => {
+      this.dispatchField(field, dispatcher)
+    })
+  }
+}

package/src/dictionary/contained/index.ts

@@ -1,6 +1,8 @@
 export * from './contained-component-field'
+export * from './contained-field-type'
 export * from './contained-field'
 export * from './contained-field-dispatch'
 export * from './contained-field-set'
 export * from './contained-group-field'
 export * from './contained-simple-field'
+export * from './fields-dispatch'

package/src/dictionary/contained-set-type.ts

@@ -0,0 +1,5 @@
+export enum ContainedSetType {
+  Msg,
+  Group,
+  Component
+}

package/src/dictionary/definition/component-field-definition.ts

@@ -1,5 +1,5 @@
 import { ContainedFieldSet } from '../contained'
-import { ContainedSetType } from '../dict-primitive'
+import { ContainedSetType } from '../contained-set-type'
 
 export class ComponentFieldDefinition extends ContainedFieldSet {
   constructor (public readonly name: string,

package/src/dictionary/definition/fix-definitions.ts

@@ -3,9 +3,10 @@ import { Dictionary } from '../../collections'
 import { ComponentFieldDefinition } from './component-field-definition'
 import { MessageDefinition } from './message-definition'
 import { SimpleFieldDefinition } from './simple-field-definition'
-import { FixDefinitionSource, FixVersion } from '../fix-versions'
+import { FixVersion } from '../fix-versions'
 import { CategorySimpleSet } from './category-simple-set'
 import { ContainedFieldSet } from '../contained'
+import { FixDefinitionSource } from '../fix-definition-source'
 
 export class FixDefinitions {
   public readonly simple: Dictionary<SimpleFieldDefinition> = new Dictionary<SimpleFieldDefinition>()

package/src/dictionary/definition/group-field-definition.ts

@@ -1,6 +1,6 @@
 import { ContainedFieldSet } from '../contained'
-import { ContainedSetType } from '../dict-primitive'
 import { SimpleFieldDefinition } from './simple-field-definition'
+import { ContainedSetType } from '../contained-set-type'
 
 export class GroupFieldDefinition extends ContainedFieldSet {
   constructor (public readonly name: string,

package/src/dictionary/definition/index.ts

@@ -1,7 +1,6 @@
 export * from './fix-definitions'
 export * from './category-simple-set'
 export * from './component-field-definition'
-export * from './fix-definitions'
 export * from './group-field-definition'
 export * from './message-definition'
 export * from './simple-field-definition'

package/src/dictionary/definition/message-definition.ts

@@ -1,5 +1,5 @@
 import { ContainedFieldSet } from '../contained'
-import { ContainedSetType } from '../dict-primitive'
+import { ContainedSetType } from '../contained-set-type'
 
 export class MessageDefinition extends ContainedFieldSet {
   constructor (public readonly name: string,

package/src/dictionary/definition/simple-field-definition.ts

@@ -1,7 +1,9 @@
 import { Dictionary } from '../../collections'
 import { FieldEnum } from '../field-enum'
-import { Tags, TagType, AsciiChars } from '../../buffer'
+import { Tags } from '../../buffer/tag/tags'
+import { AsciiChars } from '../../buffer/ascii/ascii-chars'
 import * as _ from 'lodash'
+import { TagType } from '../../buffer/tag/tag-type'
 
 export class SimpleFieldDefinition {
   public readonly tag: number

package/src/dictionary/dict-primitive.ts

@@ -1,20 +1,7 @@
 import { SAXOptions, SAXParser } from 'sax'
 import * as stream from 'stream'
-import { ILooseObject } from '../collections/collection'
 import { FixDefinitions } from './definition'
 
-export enum ContainedSetType {
-    Msg,
-    Group,
-    Component
-}
-
-export interface ISaxNode {
-  readonly name: string
-  readonly attributes: ILooseObject
-  readonly isSelfClosing: boolean
-}
-
 export type IDictDoneCb = (err: Error, done: FixDefinitions) => void
 
 export declare class SAXStream extends stream.Duplex {

package/src/dictionary/fix-definition-source.ts

@@ -0,0 +1,6 @@
+export enum FixDefinitionSource {
+  Unknown = 0,
+  QuickFix = 1,
+  FixmlRepo = 2,
+  FixRepo = 3
+}

package/src/dictionary/fix-versions.ts

@@ -1,4 +1,3 @@
-
 export enum FixVersion {
     Unknown = 1,
     FIX40 = 1,
@@ -11,34 +10,3 @@ export enum FixVersion {
     FIX50SP2 = 8,
     FIXML50SP2 = 9
 }
-
-export enum FixDefinitionSource {
-  Unknown = 0,
-  QuickFix = 1,
-  FixmlRepo = 2,
-  FixRepo = 3
-}
-
-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/dictionary/index.ts

@@ -1,10 +1,6 @@
-export * from './definition'
-export * from './compiler'
-export * from './contained'
-export * from './parser'
 export * from './dict-primitive'
 export * from './field-enum'
-export * from './fields-dispatch'
+export * from './contained/fields-dispatch'
 export * from './fix-parser'
 export * from './fix-versions'
 export * from './set-reduce'

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

@@ -1,8 +1,7 @@
 import { BaseParser } from './base-parser'
-import { RepositoryXmlParser } from './repository-xml-parser'
 
 export class AbbreviationsParser extends BaseParser {
-  constructor (readonly parser: RepositoryXmlParser) {
-    super(parser, 'Abbreviation')
+  constructor () {
+    super('Abbreviation')
   }
 }

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

@@ -1,12 +1,11 @@
 import { ILooseObject } from '../../../collections/collection'
-import { ISaxNode } from '../../dict-primitive'
-import { RepositoryXmlParser } from './repository-xml-parser'
+import { ISaxNode } from '../../sax-node'
 
 export abstract class BaseParser {
   public data: ILooseObject[] = []
   public current: ILooseObject
 
-  protected constructor (public readonly parser: RepositoryXmlParser, public readonly name: string) {
+  protected constructor (public readonly name: string) {
   }
 
   public value (line: number, n: string, v: string): void {

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

@@ -1,8 +1,7 @@
 import { BaseParser } from './base-parser'
-import { RepositoryXmlParser } from './repository-xml-parser'
 
 export class ComponentsParser extends BaseParser {
-  constructor (readonly parser: RepositoryXmlParser) {
-    super(parser, 'Component')
+  constructor () {
+    super('Component')
   }
 }

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

@@ -1,8 +1,7 @@
 import { BaseParser } from './base-parser'
-import { RepositoryXmlParser } from './repository-xml-parser'
 
 export class DataTypesParser extends BaseParser {
-  constructor (readonly parser: RepositoryXmlParser) {
-    super(parser, 'Datatype')
+  constructor () {
+    super('Datatype')
   }
 }

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

@@ -1,8 +1,7 @@
 import { BaseParser } from './base-parser'
-import { RepositoryXmlParser } from './repository-xml-parser'
 
 export class EnumsParser extends BaseParser {
-  constructor (readonly parser: RepositoryXmlParser) {
-    super(parser, 'Enum')
+  constructor () {
+    super('Enum')
   }
 }

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

@@ -1,8 +1,7 @@
 import { BaseParser } from './base-parser'
-import { RepositoryXmlParser } from './repository-xml-parser'
 
 export class FieldsParser extends BaseParser {
-  constructor (readonly parser: RepositoryXmlParser) {
-    super(parser, 'Field')
+  constructor () {
+    super('Field')
   }
 }

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

@@ -1,8 +1,7 @@
 import { BaseParser } from './base-parser'
-import { RepositoryXmlParser } from './repository-xml-parser'
 
 export class MessagesParser extends BaseParser {
-  constructor (readonly parser: RepositoryXmlParser) {
-    super(parser, 'Message')
+  constructor () {
+    super('Message')
   }
 }

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

@@ -1,8 +1,7 @@
 import { BaseParser } from './base-parser'
-import { RepositoryXmlParser } from './repository-xml-parser'
 
 export class MsgContentsParser extends BaseParser {
-  constructor (readonly parser: RepositoryXmlParser) {
-    super(parser, 'MsgContent')
+  constructor () {
+    super('MsgContent')
   }
 }

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

@@ -0,0 +1,6 @@
+import { ILooseObject } from '../../../collections/collection'
+
+export interface IRepositoryAbbreviation extends ILooseObject {
+  Term: string
+  AbbrTerm: string
+}

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

@@ -0,0 +1,11 @@
+import { ILooseObject } from '../../../collections/collection'
+
+export interface IRepositoryComponent extends ILooseObject {
+  ComponentID: string
+  ComponentType: string
+  CategoryID: string
+  Name: string
+  AbbrName: string
+  NotReqXML: string
+  Description: string
+}

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

@@ -0,0 +1,7 @@
+import { ILooseObject } from '../../../collections/collection'
+
+export interface IRepositoryDataType extends ILooseObject {
+  Name: string
+  BaseType: string
+  Description: string
+}

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

@@ -0,0 +1,8 @@
+import { ILooseObject } from '../../../collections/collection'
+
+export interface IRepositoryEnum extends ILooseObject {
+  Tag: string
+  Value: string
+  SymbolicName: string
+  Description: string
+}

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

@@ -0,0 +1,12 @@
+import { ILooseObject } from '../../../collections/collection'
+
+export interface IRepositoryField extends ILooseObject {
+  Tag: string
+  Name: string
+  Type: string
+  Description: string
+  AbbrName: string
+  NotReqXML: string
+  BaseCategory: string
+  BaseCategoryAbbrName: string
+}

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

@@ -0,0 +1,12 @@
+import { ILooseObject } from '../../../collections/collection'
+
+export interface IRepositoryMessage extends ILooseObject {
+  ComponentID: string
+  MsgType: string
+  Name: string
+  CategoryID: string
+  SectionID: string
+  AbbrName: string
+  NotReqXML: string
+  Description: string
+}

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

@@ -0,0 +1,10 @@
+import { ILooseObject } from '../../../collections/collection'
+
+export interface IRepositoryMsgContent extends ILooseObject {
+  ComponentID: string
+  TagText: string
+  Indent: string
+  Position: string
+  Reqd: string
+  Description: string
+}

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

@@ -1,60 +1 @@
-import { ILooseObject } from '../../../collections/collection'
 
-export interface IRepositoryField extends ILooseObject {
-  Tag: string
-  Name: string
-  Type: string
-  Description: string
-  AbbrName: string
-  NotReqXML: string
-  BaseCategory: string
-  BaseCategoryAbbrName: string
-}
-
-export interface IRepositoryEnum extends ILooseObject {
-  Tag: string
-  Value: string
-  SymbolicName: string
-  Description: string
-}
-
-export interface IRepositoryDataType extends ILooseObject {
-  Name: string
-  BaseType: string
-  Description: string
-}
-
-export interface IRepositoryComponent extends ILooseObject {
-  ComponentID: string
-  ComponentType: string
-  CategoryID: string
-  Name: string
-  AbbrName: string
-  NotReqXML: string
-  Description: string
-}
-
-export interface IRepositoryMessage extends ILooseObject {
-  ComponentID: string
-  MsgType: string
-  Name: string
-  CategoryID: string
-  SectionID: string
-  AbbrName: string
-  NotReqXML: string
-  Description: string
-}
-
-export interface IRepositoryMsgContent extends ILooseObject {
-  ComponentID: string
-  TagText: string
-  Indent: string
-  Position: string
-  Reqd: string
-  Description: string
-}
-
-export interface IRepositoryAbbreviation extends ILooseObject {
-  Term: string
-  AbbrTerm: string
-}

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
         }