jspurefix 1.4.1 → 2.0.3

package/dist/util/json-helper.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonHelper = void 0;
-const buffer_1 = require("../buffer");
-const dictionary_1 = require("../dictionary");
+const contained_1 = require("../dictionary/contained");
 const moment = require("moment");
+const tag_type_1 = require("../buffer/tag/tag-type");
 class JsonHelper {
     constructor(definitions) {
         this.definitions = definitions;
+        this.dispatcher = new contained_1.FieldsDispatch();
     }
     static patchSimple(object, field) {
         let name = field.definition.name;
@@ -21,36 +22,36 @@ class JsonHelper {
             return;
         }
         switch (field.definition.tagType) {
-            case buffer_1.TagType.RawData: {
+            case tag_type_1.TagType.RawData: {
                 object[name] = Buffer.from(v, 'utf8');
                 break;
             }
-            case buffer_1.TagType.UtcTimestamp:
+            case tag_type_1.TagType.UtcTimestamp:
                 const m = moment(v);
                 const d = m.toDate();
                 object[name] = d;
                 break;
-            case buffer_1.TagType.UtcDateOnly: {
+            case tag_type_1.TagType.UtcDateOnly: {
                 const m = moment(v);
                 object[name] = m.toDate();
                 break;
             }
-            case buffer_1.TagType.UtcTimeOnly: {
+            case tag_type_1.TagType.UtcTimeOnly: {
                 const m = moment(v);
                 object[name] = m.toDate();
                 break;
             }
-            case buffer_1.TagType.LocalDate: {
+            case tag_type_1.TagType.LocalDate: {
                 const m = moment(v);
                 object[name] = m.toDate();
                 break;
             }
-            case buffer_1.TagType.Float: {
+            case tag_type_1.TagType.Float: {
                 object[name] = parseFloat(v);
                 break;
             }
-            case buffer_1.TagType.Int:
-            case buffer_1.TagType.Length: {
+            case tag_type_1.TagType.Int:
+            case tag_type_1.TagType.Length: {
                 object[name] = parseInt(v, 10);
                 break;
             }
@@ -81,8 +82,8 @@ class JsonHelper {
             group: (gf) => this.patchGroup(object, gf),
             component: (cf) => this.patchComponent(object, cf)
         };
-        dictionary_1.dispatchFields(set.localAttribute, dispatcher);
-        dictionary_1.dispatchFields(set.fields, dispatcher);
+        this.dispatcher.dispatchFields(set.localAttribute, dispatcher);
+        this.dispatcher.dispatchFields(set.fields, dispatcher);
     }
     patchComponent(object, cf) {
         const c = object[cf.name] || object[cf.definition.name];

package/dist/util/json-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"json-helper.js","sourceRoot":"","sources":["../../src/util/json-helper.ts"],"names":[],"mappings":"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","sourcesContent":["import { TagType } from '../buffer'\r\nimport { ILooseObject } from '../collections/collection'\r\nimport { ContainedSimpleField, ContainedFieldSet, ContainedGroupField, ContainedComponentField, dispatchFields, IFieldDispatcher, FixDefinitions, MessageDefinition } from '../dictionary'\r\nimport moment = require('moment')\r\n\r\nexport class JsonHelper {\r\n  constructor (public readonly definitions: FixDefinitions) {\r\n  }\r\n\r\n  private static patchSimple (object: ILooseObject, field: ContainedSimpleField) {\r\n    let name: string = field.definition.name\r\n    let v: any = object[name]\r\n    if (v == null) {\r\n      v = object[field.name]\r\n      if (v !== null) {\r\n        name = field.name\r\n      }\r\n    }\r\n    if (v == null) {\r\n      return\r\n    }\r\n    switch (field.definition.tagType) {\r\n      case TagType.RawData: {\r\n        object[name] = Buffer.from(v, 'utf8')\r\n        break\r\n      }\r\n\r\n      case TagType.UtcTimestamp:\r\n        const m = moment(v)\r\n        const d = m.toDate()\r\n        object[name] = d\r\n        break\r\n\r\n      case TagType.UtcDateOnly: {\r\n        const m = moment(v)\r\n        object[name] = m.toDate()\r\n        break\r\n      }\r\n\r\n      case TagType.UtcTimeOnly: {\r\n        const m = moment(v)\r\n        object[name] = m.toDate()\r\n        break\r\n      }\r\n\r\n      case TagType.LocalDate: {\r\n        const m = moment(v)\r\n        object[name] = m.toDate()\r\n        break\r\n      }\r\n\r\n      case TagType.Float: {\r\n        object[name] = parseFloat(v)\r\n        break\r\n      }\r\n\r\n      case TagType.Int:\r\n      case TagType.Length: {\r\n        object[name] = parseInt(v, 10)\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public fromJson (fileName: string, msgType: string): ILooseObject {\r\n    const msg: ILooseObject = require(fileName)\r\n    const def: MessageDefinition = this.definitions.message.get(msgType)\r\n    if (!def) {\r\n      return msg\r\n    }\r\n    if (msg.Batch) {\r\n      msg.Batch.forEach((m: ILooseObject) => {\r\n        this.patchJsonFields(def, m)\r\n      })\r\n    } else {\r\n      this.patchJsonFields(def, msg)\r\n    }\r\n    return msg\r\n  }\r\n\r\n  public patchJsonFields (set: ContainedFieldSet, object: ILooseObject): void {\r\n    if (!object) {\r\n      return\r\n    }\r\n\r\n    const dispatcher: IFieldDispatcher = {\r\n      simple: (field: ContainedSimpleField) => JsonHelper.patchSimple(object, field),\r\n      group: (gf: ContainedGroupField) => this.patchGroup(object, gf),\r\n      component: (cf: ContainedComponentField) => this.patchComponent(object, cf)\r\n    }\r\n\r\n    dispatchFields(set.localAttribute, dispatcher)\r\n    dispatchFields(set.fields, dispatcher)\r\n  }\r\n\r\n  private patchComponent (object: ILooseObject, cf: ContainedComponentField) {\r\n    const c = object[cf.name] || object[cf.definition.name]\r\n    if (c) {\r\n      this.patchJsonFields(cf.definition, c)\r\n    }\r\n  }\r\n\r\n  private patchGroup (object: ILooseObject, gf: ContainedGroupField) {\r\n    const arr: ILooseObject[] = object[gf.definition.name] || object[gf.name]\r\n    if (arr) {\r\n      arr.forEach((o) => {\r\n        this.patchJsonFields(gf.definition, o)\r\n      })\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"json-helper.js","sourceRoot":"","sources":["../../src/util/json-helper.ts"],"names":[],"mappings":"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","sourcesContent":["import { ILooseObject } from '../collections/collection'\r\nimport {\r\n  ContainedSimpleField,\r\n  ContainedFieldSet,\r\n  ContainedGroupField,\r\n  ContainedComponentField,\r\n  FieldsDispatch\r\n} from '../dictionary/contained'\r\nimport { FixDefinitions, MessageDefinition } from '../dictionary/definition'\r\n\r\nimport moment = require('moment')\r\nimport { IFieldDispatcher } from '../dictionary/contained/field-dispatcher'\r\nimport { TagType } from '../buffer/tag/tag-type'\r\n\r\nexport class JsonHelper {\r\n  dispatcher: FieldsDispatch = new FieldsDispatch()\r\n  constructor (public readonly definitions: FixDefinitions) {\r\n  }\r\n\r\n  private static patchSimple (object: ILooseObject, field: ContainedSimpleField) {\r\n    let name: string = field.definition.name\r\n    let v: any = object[name]\r\n    if (v == null) {\r\n      v = object[field.name]\r\n      if (v !== null) {\r\n        name = field.name\r\n      }\r\n    }\r\n    if (v == null) {\r\n      return\r\n    }\r\n    switch (field.definition.tagType) {\r\n      case TagType.RawData: {\r\n        object[name] = Buffer.from(v, 'utf8')\r\n        break\r\n      }\r\n\r\n      case TagType.UtcTimestamp:\r\n        const m = moment(v)\r\n        const d = m.toDate()\r\n        object[name] = d\r\n        break\r\n\r\n      case TagType.UtcDateOnly: {\r\n        const m = moment(v)\r\n        object[name] = m.toDate()\r\n        break\r\n      }\r\n\r\n      case TagType.UtcTimeOnly: {\r\n        const m = moment(v)\r\n        object[name] = m.toDate()\r\n        break\r\n      }\r\n\r\n      case TagType.LocalDate: {\r\n        const m = moment(v)\r\n        object[name] = m.toDate()\r\n        break\r\n      }\r\n\r\n      case TagType.Float: {\r\n        object[name] = parseFloat(v)\r\n        break\r\n      }\r\n\r\n      case TagType.Int:\r\n      case TagType.Length: {\r\n        object[name] = parseInt(v, 10)\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public fromJson (fileName: string, msgType: string): ILooseObject {\r\n    const msg: ILooseObject = require(fileName)\r\n    const def: MessageDefinition = this.definitions.message.get(msgType)\r\n    if (!def) {\r\n      return msg\r\n    }\r\n    if (msg.Batch) {\r\n      msg.Batch.forEach((m: ILooseObject) => {\r\n        this.patchJsonFields(def, m)\r\n      })\r\n    } else {\r\n      this.patchJsonFields(def, msg)\r\n    }\r\n    return msg\r\n  }\r\n\r\n  public patchJsonFields (set: ContainedFieldSet, object: ILooseObject): void {\r\n    if (!object) {\r\n      return\r\n    }\r\n\r\n    const dispatcher: IFieldDispatcher = {\r\n      simple: (field: ContainedSimpleField) => JsonHelper.patchSimple(object, field),\r\n      group: (gf: ContainedGroupField) => this.patchGroup(object, gf),\r\n      component: (cf: ContainedComponentField) => this.patchComponent(object, cf)\r\n    }\r\n\r\n    this.dispatcher.dispatchFields(set.localAttribute, dispatcher)\r\n    this.dispatcher.dispatchFields(set.fields, dispatcher)\r\n  }\r\n\r\n  private patchComponent (object: ILooseObject, cf: ContainedComponentField) {\r\n    const c = object[cf.name] || object[cf.definition.name]\r\n    if (c) {\r\n      this.patchJsonFields(cf.definition, c)\r\n    }\r\n  }\r\n\r\n  private patchGroup (object: ILooseObject, gf: ContainedGroupField) {\r\n    const arr: ILooseObject[] = object[gf.definition.name] || object[gf.name]\r\n    if (arr) {\r\n      arr.forEach((o) => {\r\n        this.patchJsonFields(gf.definition, o)\r\n      })\r\n    }\r\n  }\r\n}\r\n"]}

package/dist/util/message-generator.d.ts

@@ -1,5 +1,5 @@
 import { ILooseObject } from '../collections/collection';
-import { FixDefinitions, SimpleFieldDefinition } from '../dictionary';
+import { FixDefinitions, SimpleFieldDefinition } from '../dictionary/definition';
 export declare class MessageGenerator {
     readonly words: string[];
     readonly definitions: FixDefinitions;

package/dist/util/message-generator.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageGenerator = void 0;
-const buffer_1 = require("../buffer");
 const dictionary_1 = require("../dictionary");
+const tag_type_1 = require("../buffer/tag/tag-type");
 class MessageGenerator {
     constructor(words, definitions) {
         this.words = words;
@@ -15,13 +15,13 @@ class MessageGenerator {
         const keys = field.enums.keys();
         const choice = keys[Math.floor(Math.random() * keys.length)];
         switch (tagType) {
-            case buffer_1.TagType.Int: {
+            case tag_type_1.TagType.Int: {
                 return parseInt(choice, 10);
             }
-            case buffer_1.TagType.Float: {
+            case tag_type_1.TagType.Float: {
                 return parseFloat(choice);
             }
-            case buffer_1.TagType.Boolean: {
+            case tag_type_1.TagType.Boolean: {
                 return choice === 'Y';
             }
             default: {
@@ -56,7 +56,8 @@ class MessageGenerator {
         return this.toObject(def, density, repeatGroups);
     }
     toObject(set, density, repeatGroups) {
-        return dictionary_1.reduceSet(set, {
+        const reducer = new dictionary_1.SetReduce();
+        return reducer.reduce(set, {
             simple: (a, sf) => {
                 const tag = sf.definition.tag;
                 let include = tag === set.firstSimple.definition.tag || this.length > 0 || Math.random() <= density;
@@ -87,10 +88,10 @@ class MessageGenerator {
     createSimple(field) {
         const tagType = field.definition.tagType;
         switch (tagType) {
-            case buffer_1.TagType.String: {
+            case tag_type_1.TagType.String: {
                 return this.nextString();
             }
-            case buffer_1.TagType.Float: {
+            case tag_type_1.TagType.Float: {
                 this.length = 0;
                 const sign = MessageGenerator.randomIntFromInterval(1, 10) <= 5 ? 1 : -1;
                 const num = sign * MessageGenerator.randomIntFromInterval(1, 100000);
@@ -98,38 +99,38 @@ class MessageGenerator {
                 const r = num * Math.pow(10, -1 * raised);
                 return Math.round(r * 1e7) / 1e7;
             }
-            case buffer_1.TagType.Int: {
+            case tag_type_1.TagType.Int: {
                 this.length = 0;
                 return MessageGenerator.randomIntFromInterval(1, 100000);
             }
-            case buffer_1.TagType.Length: {
+            case tag_type_1.TagType.Length: {
                 this.length = MessageGenerator.randomIntFromInterval(5, 20);
                 return this.length;
             }
-            case buffer_1.TagType.Boolean: {
+            case tag_type_1.TagType.Boolean: {
                 this.length = 0;
                 return MessageGenerator.randomIntFromInterval(1, 2) === 1;
             }
-            case buffer_1.TagType.UtcDateOnly: {
+            case tag_type_1.TagType.UtcDateOnly: {
                 this.length = 0;
                 const now = new Date();
                 return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), 0, 0, 0, 0));
             }
-            case buffer_1.TagType.UtcTimeOnly: {
+            case tag_type_1.TagType.UtcTimeOnly: {
                 this.length = 0;
                 const s = new Date();
                 return new Date(Date.UTC(0, 0, 0, s.getUTCHours(), s.getUTCMinutes(), s.getUTCSeconds(), s.getUTCMilliseconds()));
             }
-            case buffer_1.TagType.UtcTimestamp: {
+            case tag_type_1.TagType.UtcTimestamp: {
                 this.length = 0;
                 const now = new Date();
                 return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds()));
             }
-            case buffer_1.TagType.LocalDate: {
+            case tag_type_1.TagType.LocalDate: {
                 const now = new Date();
                 return new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0, 0);
             }
-            case buffer_1.TagType.RawData: {
+            case tag_type_1.TagType.RawData: {
                 const length = this.length;
                 this.length = 0;
                 return length > 0 ? MessageGenerator.makeBuffer(length) : null;

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 { TagType } from '../buffer'\r\nimport { ILooseObject } from '../collections/collection'\r\nimport { ContainedComponentField, ContainedGroupField, ContainedFieldSet, ContainedSimpleField, FixDefinitions, MessageDefinition, SimpleFieldDefinition, reduceSet } from '../dictionary'\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) {\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 = 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    return reduceSet<ILooseObject>(set, {\r\n      simple: (a: ILooseObject, sf: ContainedSimpleField) => {\r\n        const tag: number = sf.definition.tag\r\n        let 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\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, 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) {\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 = 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        let 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\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/dist/util/replay.d.ts

@@ -1,4 +1,7 @@
 import { MsgView } from '../buffer';
-import { FixDefinitions } from '../dictionary';
-import { ISessionDescription } from '../transport';
-export declare function replayFixFile(definitions: FixDefinitions, sessionDescription: ISessionDescription, replayFile: string, delimiter: number): Promise<MsgView[]>;
+import { IJsFixConfig } from '../config';
+export declare class FileReplayer {
+    readonly config: IJsFixConfig;
+    constructor(config: IJsFixConfig);
+    replayFixFile(replayFile: string): Promise<MsgView[]>;
+}

package/dist/util/replay.js

@@ -1,34 +1,32 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replayFixFile = void 0;
+exports.FileReplayer = void 0;
 const transport_1 = require("../transport");
-const config_1 = require("../config");
-function replayFixFile(definitions, sessionDescription, replayFile, delimiter) {
-    return __awaiter(this, void 0, void 0, function* () {
+const factory_1 = require("../transport/factory");
+class FileReplayer {
+    constructor(config) {
+        this.config = config;
+    }
+    replayFixFile(replayFile) {
         return new Promise((accept, reject) => {
-            const arr = [];
-            const config = new config_1.JsFixConfig(null, definitions, sessionDescription, delimiter);
-            const transport = new transport_1.MsgTransport(1, config, new transport_1.FileDuplex(replayFile));
-            transport.receiver.on('msg', (msgType, m) => {
-                arr.push(m.clone());
-            });
-            transport.receiver.on('end', () => {
-                accept(arr);
-            });
-            transport.receiver.on('error', (e) => {
+            try {
+                const arr = [];
+                const transport = new factory_1.MsgTransport(1, this.config, new transport_1.FileDuplex(replayFile));
+                transport.receiver.on('msg', (msgType, m) => {
+                    arr.push(m.clone());
+                });
+                transport.receiver.on('end', () => {
+                    accept(arr);
+                });
+                transport.receiver.on('error', (e) => {
+                    reject(e);
+                });
+            }
+            catch (e) {
                 reject(e);
-            });
+            }
         });
-    });
+    }
 }
-exports.replayFixFile = replayFixFile;
+exports.FileReplayer = FileReplayer;
 //# sourceMappingURL=replay.js.map

package/dist/util/replay.js.map

@@ -1 +1 @@
-{"version":3,"file":"replay.js","sourceRoot":"","sources":["../../src/util/replay.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,4CAA4E;AAC5E,sCAAuC;AAEvC,SAAsB,aAAa,CAAE,WAA2B,EAC5B,kBAAuC,EACvC,UAAkB,EAClB,SAAiB;;QACnD,OAAO,IAAI,OAAO,CAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAC/C,MAAM,GAAG,GAAc,EAAE,CAAA;YACzB,MAAM,MAAM,GAAG,IAAI,oBAAW,CAAC,IAAI,EAAE,WAAW,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAA;YAChF,MAAM,SAAS,GAAiB,IAAI,wBAAY,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,sBAAU,CAAC,UAAU,CAAC,CAAC,CAAA;YACvF,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,OAAe,EAAE,CAAU,EAAE,EAAE;gBAE3D,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;YACrB,CAAC,CAAC,CAAA;YACF,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBAChC,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC,CAAC,CAAA;YACF,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBACnC,MAAM,CAAC,CAAC,CAAC,CAAA;YACX,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAnBD,sCAmBC","sourcesContent":["import { MsgView } from '../buffer'\r\nimport { FixDefinitions } from '../dictionary'\r\nimport { ISessionDescription, MsgTransport, FileDuplex } from '../transport'\r\nimport { JsFixConfig } from '../config'\r\n\r\nexport async function replayFixFile (definitions: FixDefinitions,\r\n                                    sessionDescription: ISessionDescription,\r\n                                    replayFile: string,\r\n                                    delimiter: number): Promise<MsgView[]> {\r\n  return new Promise<MsgView[]>((accept, reject) => {\r\n    const arr: MsgView[] = []\r\n    const config = new JsFixConfig(null, definitions, sessionDescription, delimiter)\r\n    const transport: MsgTransport = new MsgTransport(1, config, new FileDuplex(replayFile))\r\n    transport.receiver.on('msg', (msgType: string, m: MsgView) => {\r\n      // note must clone if a view is to be saved after this call\r\n      arr.push(m.clone())\r\n    })\r\n    transport.receiver.on('end', () => {\r\n      accept(arr)\r\n    })\r\n    transport.receiver.on('error', (e) => {\r\n      reject(e)\r\n    })\r\n  })\r\n}\r\n"]}
+{"version":3,"file":"replay.js","sourceRoot":"","sources":["../../src/util/replay.ts"],"names":[],"mappings":";;;AACA,4CAAyC;AAEzC,kDAAmD;AAEnD,MAAa,YAAY;IACvB,YAA6B,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;IACjD,CAAC;IAED,aAAa,CAAE,UAAkB;QAC/B,OAAO,IAAI,OAAO,CAAY,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YAC/C,IAAI;gBACF,MAAM,GAAG,GAAc,EAAE,CAAA;gBACzB,MAAM,SAAS,GAAiB,IAAI,sBAAY,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,sBAAU,CAAC,UAAU,CAAC,CAAC,CAAA;gBAC5F,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,OAAe,EAAE,CAAU,EAAE,EAAE;oBAE3D,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;gBACrB,CAAC,CAAC,CAAA;gBACF,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBAChC,MAAM,CAAC,GAAG,CAAC,CAAA;gBACb,CAAC,CAAC,CAAA;gBACF,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACnC,MAAM,CAAC,CAAC,CAAC,CAAA;gBACX,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAA;aACV;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAxBD,oCAwBC","sourcesContent":["import { MsgView } from '../buffer'\r\nimport { FileDuplex } from '../transport'\r\nimport { IJsFixConfig } from '../config'\r\nimport { MsgTransport } from '../transport/factory'\r\n\r\nexport class FileReplayer {\r\n  constructor (public readonly config: IJsFixConfig) {\r\n  }\r\n\r\n  replayFixFile (replayFile: string): Promise<MsgView[]> {\r\n    return new Promise<MsgView[]>((accept, reject) => {\r\n      try {\r\n        const arr: MsgView[] = []\r\n        const transport: MsgTransport = new MsgTransport(1, this.config, new FileDuplex(replayFile))\r\n        transport.receiver.on('msg', (msgType: string, m: MsgView) => {\r\n          // note must clone if a view is to be saved after this call\r\n          arr.push(m.clone())\r\n        })\r\n        transport.receiver.on('end', () => {\r\n          accept(arr)\r\n        })\r\n        transport.receiver.on('error', (e) => {\r\n          reject(e)\r\n        })\r\n      } catch (e) {\r\n        reject(e)\r\n      }\r\n    })\r\n  }\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspurefix",
-  "version": "1.4.1",
+  "version": "2.0.3",
   "description": "pure node js fix engine",
   "keywords": [
     "typescript",
@@ -23,6 +23,7 @@
     "url": "git+https://github.com/TimelordUK/jspurefix.git"
   },
   "scripts": {
+    "circular": "madge --circular --extensions js dist && madge --circular --extensions ts src",
     "test": "jest",
     "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
     "cmd": "cd dist && node jsfix-cmd",
@@ -40,6 +41,7 @@
     "tcp-qf-md": "cd dist/sample/tcp/qf-md && node app",
     "tcp-tls-tc": "cd dist/sample/tcp/tls-trade-capture && node app",
     "tcp-tc": "cd dist/sample/tcp/trade-capture && node app",
+    "tcp-rec-sk": "cd dist/sample/tcp/recovering-skeleton && node app",
     "tcp-sk": "cd dist/sample/tcp/skeleton && node app",
     "http-oms": "cd dist/sample/http/oms && node app",
     "repo40-compile": "cd dist && node jsfix-cmd \"--dict=repo40\" \"--compile\"",
@@ -60,18 +62,20 @@
   "license": "MIT",
   "dependencies": {
     "align-text": "^1.0.2",
-    "express": "^4.17.1",
+    "express": "^4.17.2",
     "lodash": "^4.17.21",
     "log4js": "^6.3.0",
-    "mathjs": "^10.0.0",
+    "mathjs": "^10.0.2",
     "minimist": "^1.2.5",
     "moment": "^2.29.1",
     "node-fs-extra": "^0.8.2",
+    "reflect-metadata": "^0.1.13",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.9",
     "sax": "^1.2.4",
+    "tsyringe": "^4.6.0",
     "uuid": "^8.3.2",
-    "winston": "^3.3.3",
+    "winston": "^3.3.4",
     "word-wrap": "^1.2.3",
     "xml2js": "^0.4.23",
     "xmlbuilder": "^15.1.1",
@@ -79,22 +83,23 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/express-serve-static-core": "^4.17.26",
-    "@types/jest": "^27.0.3",
-    "@types/lodash": "^4.14.177",
+    "@types/express-serve-static-core": "^4.17.27",
+    "@types/jest": "^27.4.0",
+    "@types/lodash": "^4.14.178",
     "@types/mathjs": "^9.4.1",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^16.11.11",
+    "@types/node": "^17.0.8",
     "@types/request-promise-native": "^1.0.18",
-    "@types/sax": "^1.2.3",
-    "@types/uuid": "^8.3.3",
+    "@types/sax": "^1.2.4",
+    "@types/uuid": "^8.3.4",
     "@types/winston": "^2.4.4",
     "@types/xmlbuilder": "0.0.35",
-    "jest": "^27.4.3",
+    "jest": "^27.4.7",
+    "madge": "^5.0.1",
     "standard": "^16.0.4",
-    "ts-jest": "^27.0.7",
+    "ts-jest": "^27.1.2",
     "tslint": "^6.1.3",
     "tslint-config-standard": "^9.0.0",
-    "typescript": "^4.5.2"
+    "typescript": "^4.5.4"
   }
 }

package/script/build.cmd

@@ -3,3 +3,4 @@
  rem install typescript if not installed
  call node_modules\.bin\tsc --version
  call node_modules\.bin\tsc
+ call npm run circular

package/script/build.sh

@@ -3,3 +3,4 @@ npm install
 npm run unzip-repo
 ./node_modules/.bin/tsc --version
 ./node_modules/.bin/tsc
+npm run circular

package/script/test.cmd

@@ -1,3 +1,6 @@
+call npm run repo44-bench-er
 call npm run tcp-tc
 call npm run http-oms
+call npm run tcp-qf-md
+call npm run tcp-rec-sk
 call npm t

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

@@ -1,14 +1,17 @@
 import { ILooseObject } from '../../collections/collection'
-import { ContainedGroupField, ContainedSimpleField,
+import {
+  ContainedGroupField, ContainedSimpleField,
   ContainedFieldSet, ContainedField,
-  ContainedComponentField, SimpleFieldDefinition,
-  FixDefinitions, dispatchFields } from '../../dictionary'
+  ContainedComponentField, FieldsDispatch
+} from '../../dictionary/contained'
+import { SimpleFieldDefinition, FixDefinitions } from '../../dictionary/definition'
 import { MsgEncoder } from '../msg-encoder'
 import { ElasticBuffer } from '../elastic-buffer'
 import { TimeFormatter } from './time-formatter'
 import { ITimeFormatter } from './itime-formatter'
-import { AsciiChars } from '../ascii-chars'
-import { Tags, TagType } from '../tags'
+import { AsciiChars } from './ascii-chars'
+import { Tags } from '../tag/tags'
+import { TagType } from '../tag/tag-type'
 
 export class AsciiEncoder extends MsgEncoder {
 
@@ -55,7 +58,7 @@ export class AsciiEncoder extends MsgEncoder {
 
   private encodeObject (objectToEncode: ILooseObject, set: ContainedFieldSet, state: AsciiEncodeSetSummary): void {
     const fields: ContainedField[] = this.getFields(set, objectToEncode)
-    dispatchFields(fields, {
+    new FieldsDispatch().dispatchFields(fields, {
       simple: (sf: ContainedSimpleField) => {
         const val: any = objectToEncode[sf.name]
         // Empty strings are omitted as they result in empty values for tags, which are considered malformed.

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

@@ -1,16 +1,11 @@
-import { Tags } from '../tags'
-import { MessageDefinition } from '../../dictionary'
+import { Tags } from '../tag/tags'
+import { MessageDefinition } from '../../dictionary/definition'
 import { ElasticBuffer } from '../elastic-buffer'
+import { ParseState } from './parse-state'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
 
-export enum ParseState {
-  BeginField = 1,
-  ParsingTag = 2,
-  ParsingValue = 3,
-  ParsingRawDataLength = 4,
-  ParsingRawData = 5,
-  MsgComplete = 6
-}
-
+@injectable()
 export class AsciiParserState {
   public message: MessageDefinition
   public locations: Tags
@@ -26,7 +21,7 @@ export class AsciiParserState {
   public rawDataRead: number
   public msgType: string
 
-  constructor (public readonly elasticBuffer: ElasticBuffer) {
+  constructor (@inject(DITokens.ParseBuffer) public readonly elasticBuffer: ElasticBuffer) {
   }
 
   public beginTag (pos: number) {

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

@@ -1,37 +1,44 @@
-import { FixDefinitions } from '../../dictionary'
-import { AsciiChars } from '../ascii-chars'
+import { AsciiChars } from './ascii-chars'
 import { AsciiView } from './ascii-view'
 import { AsciiSegmentParser } from './ascii-segment-parser'
-import { AsciiParserState, ParseState } from './ascii-parser-state'
+import { AsciiParserState } from './ascii-parser-state'
 import { Structure } from '../structure'
-import { Tags } from '../tags'
+import { Tags } from '../tag/tags'
 import { MsgParser } from '../msg-parser'
 import { MsgView } from '../msg-view'
 import { Readable } from 'stream'
 import { ElasticBuffer } from '../elastic-buffer'
-import { SegmentDescription, SegmentType } from '../segment-description'
-
+import { SegmentDescription } from '../segment/segment-description'
+import { ParseState } from './parse-state'
+import { IJsFixConfig } from '../../config'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
+import { SegmentType } from '../segment/segment-type'
+
+@injectable()
 export class AsciiParser extends MsgParser {
   private static nextId: number = 0
   public readonly id: number
   public readonly state: AsciiParserState
-  private readonly receivingBuffer: ElasticBuffer
   private readonly segmentParser: AsciiSegmentParser
+  public readonly delimiter: number
+  public readonly writeDelimiter: number
 
   // allocate enough in receive buffer so buffer does not constant resize back after large messages
   // want to keep one slice of memory and constantly reuse it
 
-  constructor (public readonly definitions: FixDefinitions,
-               public readonly readStream: Readable,
-               public readonly delimiter: number,
-               public readonly writeDelimiter: number = delimiter,
-               public readonly maxMessageLen: number = 160 * 1024) {
+  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig,
+               @inject(DITokens.readStream) public readonly readStream: Readable,
+               @inject(DITokens.ParseBuffer) protected readonly receivingBuffer: ElasticBuffer) {
     super()
+
+    this.delimiter = config.delimiter
+    this.writeDelimiter = config.logDelimiter || AsciiChars.Pipe
+    const definitions = config.definitions
     this.id = AsciiParser.nextId++
-    this.segmentParser = new AsciiSegmentParser(definitions)
-    this.receivingBuffer = new ElasticBuffer(maxMessageLen)
-    this.state = new AsciiParserState(this.receivingBuffer)
-    this.state.locations = new Tags(definitions, maxMessageLen / 10)
+    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.beginMessage()
     if (readStream !== null) {
       this.subscribe()

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

@@ -1,21 +1,27 @@
+import { SegmentDescription } from '../segment/segment-description'
+import { Structure } from '../structure'
+import { Tags } from '../tag/tags'
+import {
+  FixDefinitions,
+  MessageDefinition
+} from '../../dictionary/definition'
 import {
   ContainedComponentField,
-  ContainedFieldType,
   ContainedGroupField,
   ContainedSimpleField,
-  FixDefinitions,
-  MessageDefinition
-} from '../..'
-import { SegmentDescription, SegmentType } from '../segment-description'
-import { Structure } from '../structure'
-import { Tags } from '../tags'
+  ContainedFieldType
+} from '../../dictionary/contained'
+import { inject, injectable } from 'tsyringe'
+import { DITokens } from '../../runtime/di-tokens'
+import { SegmentType } from '../segment/segment-type'
 
 // this takes linear time i.e. it constantly makes forward progress
 // one tag at a time
 
+@injectable()
 export class AsciiSegmentParser {
 
-  constructor (public readonly definitions: FixDefinitions) {
+  constructor (@inject(DITokens.Definitions) public readonly definitions: FixDefinitions) {
   }
 
   public parse (msgType: string, tags: Tags, last: number): Structure {