jspurefix 3.5.0 → 4.0.0

package/src/buffer/encode-proxy.ts

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

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

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

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

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

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

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

package/src/buffer/msg-encoder.ts

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

package/src/buffer/msg-view.ts

@@ -1,19 +1,18 @@
 import { TagPos } from './tag/tag-pos'
 import { SegmentDescription } from './segment/segment-description'
 import { Structure } from './structure'
-import { Dictionary } from '../collections'
 import { Tags } from './tag/tags'
 import {
   ContainedComponentField,
   ContainedField,
-  ContainedFieldSet,
+  IContainedSet,
   ContainedGroupField,
   ContainedSimpleField
 } from '../dictionary/contained'
 import { SetReduce } from '../dictionary'
 import { ILooseObject } from '../collections/collection'
 import { ElasticBuffer } from './elastic-buffer'
-import { GroupFieldDefinition, SimpleFieldDefinition } from '../dictionary/definition'
+import { FixDefinitions, GroupFieldDefinition, SimpleFieldDefinition } from '../dictionary/definition'
 import { ITypeDispatcher } from '../dictionary/type-dispatcher'
 import { ContainedSetType } from '../dictionary/contained-set-type'
 
@@ -22,7 +21,7 @@ export abstract class MsgView {
   protected sortedTagPosBackwards: TagPos[]
   private readonly reducer: SetReduce<ILooseObject> = new SetReduce<ILooseObject>()
 
-  protected constructor (public readonly segment: SegmentDescription, public readonly structure: Structure | null) {
+  protected constructor (public readonly definitions: FixDefinitions, public readonly segment: SegmentDescription, public readonly structure: Structure | null) {
   }
 
   protected static asVerbose = (field: SimpleFieldDefinition, val: string, i: number, count: number, tp: TagPos): string => {
@@ -185,12 +184,12 @@ export abstract class MsgView {
    * returns typed value of a sinple field within this view
    * @param tagOrName the name or tag of required field e.g. 8, BeginString
    */
-  public getTyped (tagOrName: number | string): any {
+  public getTyped (tagOrName: number | string): (boolean | string | number | Date | Buffer | null) {
     const tag: number = this.resolveTag(tagOrName)
     if (tag == null) {
       return null
     }
-    const field: SimpleFieldDefinition | null = this.structure?.tags.definitions.tagToSimple[tag] ?? null
+    const field: SimpleFieldDefinition | null = this.definitions.tagToSimple[tag] ?? null
     if (field == null) {
       return null
     }
@@ -201,7 +200,7 @@ export abstract class MsgView {
    * use a varargs list of tags or tag names to fetch typed values for those fields within this view.
    * @param tagOrNames list of tags e.g. 'BeginString', 'BodyLength', ...
    */
-  public getTypedList (...tagOrNames: Array<number | string>): Array<boolean | string | number | Date | null> {
+  public getTypedList (...tagOrNames: Array<number | string>): Array<boolean | string | number | Date | Buffer | null> {
     return tagOrNames.map((s) => this.getTyped(s))
   }
 
@@ -209,7 +208,7 @@ export abstract class MsgView {
    * use an array of tags or tag names to fetch typed values for those fields within this view.
    * @param tagOrName the list of params as array ['BeginString','BodyLength', 'MsgType']
    */
-  public getTypedTags (tagOrName: Array<string | number>): Array<boolean | string | number | Date | null> {
+  public getTypedTags (tagOrName: Array<string | number>): Array<boolean | string | number | Date | Buffer | null> {
     return tagOrName.map((s) => this.getTyped(s))
   }
 
@@ -297,14 +296,15 @@ export abstract class MsgView {
 
   protected abstract stringAtPosition (position: number): string | null
 
-  protected abstract toTyped (field: SimpleFieldDefinition): boolean | string | number | Date
+  protected abstract toTyped (field: SimpleFieldDefinition): boolean | string | number | Date | Buffer | null
 
   protected resolveTag (tagOrName: number | string): number {
     let tag: number
+    const set = this.segment.set
     if (typeof (tagOrName) === 'string') {
-      if (this.segment.set == null) return 0
-      const cf = this.segment.set.simple.get(tagOrName)
-      const f: SimpleFieldDefinition | null = cf ? cf.definition : this.structure?.tags.definitions.simple.get(tagOrName) ?? null
+      if (set == null) return 0
+      const cf = set.simple.get(tagOrName)
+      const f: SimpleFieldDefinition | null = cf ? cf.definition : this.definitions.simple.get(tagOrName) ?? null
       if (f == null) {
         return -1
       }
@@ -382,7 +382,7 @@ export abstract class MsgView {
     return groupArray
   }
 
-  private asLoose (def: ContainedFieldSet): ILooseObject {
+  private asLoose (def: IContainedSet): ILooseObject {
     // eslint-disable-next-line
     return this.reducer.reduce(def, {
       group: (a: ILooseObject, field: ContainedGroupField) => { this.asLooseGroup(a, field) },
@@ -398,7 +398,7 @@ export abstract class MsgView {
     }, {}))
   }
 
-  private missingRequired (def: ContainedFieldSet, tags: number []): number[] {
+  private missingRequired (def: IContainedSet, tags: number []): number[] {
     const reducer = new SetReduce<number[]>()
     const dispatcher: ITypeDispatcher<number[]> = {
       group: (a: number[], field: ContainedGroupField) => { this.missingGroup(def, field, a) },
@@ -421,7 +421,7 @@ export abstract class MsgView {
     }
   }
 
-  private missingGroup (def: ContainedFieldSet, gf: ContainedGroupField, tags: number []): void {
+  private missingGroup (def: IContainedSet, gf: ContainedGroupField, tags: number []): void {
     const name = gf.definition.noOfField ? gf.definition.noOfField.name : def.name
     const groupView: MsgView | null = this.getView(name) ?? this.getView(gf.definition.name)
     if (groupView == null) {
@@ -448,7 +448,7 @@ export abstract class MsgView {
     const def = sf.definition
     const position: number = this.getPosition(def.tag)
     if (position >= 0) {
-      const asSimple: boolean | string | number | Date = this.toTyped(def)
+      const asSimple: boolean | string | number | Date | Buffer | null = this.toTyped(def)
       if (asSimple != null) { // beware, may be false value
         a[sf.name] = asSimple
       }
@@ -483,11 +483,11 @@ export abstract class MsgView {
     if (structure == null) return ''
     const tags: Tags = structure.tags
     const count: number = segment.endPosition - segment.startPosition
-    const simple: Dictionary<SimpleFieldDefinition> = tags.definitions.simple
+    const simple: Map<string, SimpleFieldDefinition> = this.definitions.simple
 
     for (let i: number = segment.startPosition; i <= segment.endPosition; ++i) {
       const tagPos: TagPos = tags.tagPos[i]
-      const field: SimpleFieldDefinition | null = simple.get(tagPos.tag.toString())
+      const field: SimpleFieldDefinition | undefined = simple.get(tagPos.tag.toString())
       const val: string | null = this.stringAtPosition(i) ?? ''
       // [0] 8 (BeginString) = FIX4.4
       const token = field ? getToken(field, val, i - segment.startPosition, count, tagPos) : `[${i}] ${tagPos.tag} (unknown) = ${val}, `

package/src/buffer/segment/segment-description.ts

@@ -1,5 +1,5 @@
 import { INumericKeyed } from '../../collections/collection'
-import { ContainedField, ContainedFieldSet } from '../../dictionary/contained'
+import { ContainedField, IContainedSet } from '../../dictionary/contained'
 import { GroupFieldDefinition } from '../../dictionary/definition'
 import { SegmentType } from './segment-type'
 import { ElasticBuffer } from '../elastic-buffer'
@@ -16,7 +16,7 @@ export class SegmentDescription {
   constructor (
     public name: string,
     public startTag: number,
-    public set: ContainedFieldSet | null,
+    public set: IContainedSet | null,
     public startPosition: number,
     public readonly depth: number,
     public readonly type: SegmentType) {

package/src/buffer/tag/tags.ts

@@ -1,5 +1,3 @@
-import { FixDefinitions } from '../../dictionary/definition'
-import { ContainedSimpleField } from '../../dictionary/contained'
 import { TagPos } from './tag-pos'
 import { MsgTag } from '../../types'
 import { TagType } from './tag-type'
@@ -13,11 +11,11 @@ export class Tags {
   public tagPos: TagPos[] = new Array(this.startingLength)
   public nextTagPos: number = 0
 
-  constructor (public readonly definitions: FixDefinitions, public readonly startingLength: number = 30 * 1000) {
+  constructor (public readonly startingLength: number = 30 * 1000) {
   }
 
-  public static toJSType (simple: ContainedSimpleField): string {
-    switch (simple.definition.tagType) {
+  public static toJSType (tagType: TagType): string {
+    switch (tagType) {
       case TagType.String:
         return 'string'
 
@@ -103,7 +101,7 @@ export class Tags {
 
   public clone (): Tags {
     const next: number = this.nextTagPos
-    const cloned: Tags = new Tags(this.definitions, next)
+    const cloned: Tags = new Tags(next)
     cloned.nextTagPos = next
     for (let i = 0; i < next; ++i) {
       cloned.tagPos[i] = this.tagPos[i].clone()

package/src/collections/collection.ts

@@ -2,4 +2,3 @@ export type INumericKeyed<T> = Record<number, T>
 
 export type ILooseObject = Record<string, any>
 
-export type IDictIteratorCb<T> = (key: string, val: T) => void

package/src/collections/index.ts

@@ -1 +1 @@
-export * from './dictionary'
+

package/src/config/js-fix-config.ts

@@ -1,8 +1,9 @@
 import { FixDefinitions } from '../dictionary/definition'
-import { ISessionDescription, ISessionMsgFactory } from '../transport'
+import { ISessionDescription } from '../transport/session/session-description'
+import { ISessionMsgFactory } from '../transport/session/session-msg-factory'
 import { JsFixLoggerFactory } from './js-fix-logger-factory'
 import { EmptyLogFactory } from './empty-log-factory'
-import { AsciiChars } from '../buffer/ascii'
+import { AsciiChars } from '../buffer/ascii/ascii-chars'
 import { DependencyContainer } from 'tsyringe'
 
 export interface IJsFixConfig {

package/src/dictionary/compiler/compiler-type.ts

@@ -1,4 +1,10 @@
-import { ContainedField, ContainedFieldSet, ContainedGroupField, ContainedComponentField, ContainedFieldType } from '../contained'
+import {
+  ContainedField,
+  ContainedGroupField,
+  ContainedComponentField,
+  ContainedFieldType,
+  IContainedSet
+} from '../contained'
 import { FixDefinitions } from '../definition'
 
 import _ = require('lodash')
@@ -7,7 +13,7 @@ import { FixDefinitionSource } from '../fix-definition-source'
 
 export class CompilerType {
   public readonly snaked: string
-  constructor (public readonly definitions: FixDefinitions, public readonly set: ContainedFieldSet, public readonly qualifiedName: string) {
+  constructor (public readonly definitions: FixDefinitions, public readonly set: IContainedSet, public readonly qualifiedName: string) {
     const snake = _.snakeCase(this.qualifiedName)
     if (set.type === ContainedSetType.Msg) {
       this.snaked = `./${snake}`

package/src/dictionary/compiler/enum-compiler.ts

@@ -73,7 +73,7 @@ export class EnumCompiler {
     }
     return this.create(field.name, field.description, () => {
       const newLine = require('os').EOL
-      return field.enums.keys().reduce((a: number, latest: string, i: number, arr: string[]) => {
+      return Array.from(field.enums.keys()).reduce((a: number, latest: string, i: number, arr: string[]) => {
         const k = field.resolveEnum(latest)
         let v: any = latest
         switch (field.tagType) {
@@ -120,7 +120,7 @@ export class EnumCompiler {
 
   private toDo (): SimpleFieldDefinition[] {
     const done: ILooseObject = {}
-    return this.definitions.simple.values().reduce((a: SimpleFieldDefinition[], latest: SimpleFieldDefinition) => {
+    return Array.from(this.definitions.simple.values()).reduce((a: SimpleFieldDefinition[], latest: SimpleFieldDefinition) => {
       if (latest.isEnum() && !done[latest.name]) {
         done[latest.name] = true
         a.push(latest)

package/src/dictionary/compiler/msg-compiler.ts

@@ -4,14 +4,13 @@ import { ICompilerSettings } from './compiler-settings'
 import { FixDefinitions } from '../definition'
 import {
   ContainedComponentField,
-  ContainedFieldSet,
+  IContainedSet,
   ContainedGroupField,
   ContainedSimpleField,
   FieldsDispatch
 } from '../contained'
 import { StandardSnippet } from './standard-snippet'
 import { CompilerType } from './compiler-type'
-import { Dictionary } from '../../collections'
 
 import * as fs from 'fs'
 import * as Util from 'util'
@@ -20,22 +19,22 @@ import { SetReduce } from '../set-reduce'
 import { ContainedSetType } from '../contained-set-type'
 import { TagType } from '../../buffer/tag/tag-type'
 
-const newLine = require('os').EOL
+const newLine: string = require('os').EOL
 const justifiedWidth: number = 50
 
 export class MsgCompiler {
   readonly queue: CompilerType[] = []
   readonly snippets: StandardSnippet
   readonly buffer: ElasticBuffer = new ElasticBuffer()
-  readonly completed: Dictionary<CompilerType>
+  readonly completed: Map<string, CompilerType>
 
   constructor (public readonly definitions: FixDefinitions, public readonly settings: ICompilerSettings) {
-    this.completed = new Dictionary<CompilerType>()
+    this.completed = new Map<string, CompilerType>()
     this.snippets = new StandardSnippet(this.settings)
   }
 
   public async generate (): Promise<void> {
-    const types: string[] = this.settings.types ?? this.definitions.message.keys()
+    const types: string[] = this.settings.types ?? Array.from(this.definitions.message.keys())
     await this.createTypes(types)
   }
 
@@ -76,7 +75,7 @@ export class MsgCompiler {
     const writeFile = Util.promisify(fs.writeFile)
     const settings = this.settings
     const fileName = 'index.ts'
-    const done = this.completed.values()
+    const done = Array.from(this.completed.values())
     const exports: string[] = done.reduce<string[]>((prev: string[], current: CompilerType) => {
       prev.push(`export * from '${current.snaked}'`)
       return prev
@@ -126,7 +125,7 @@ export class MsgCompiler {
       return
     }
     this.queue.push(ct)
-    completed.addUpdate(fullName, ct)
+    completed.set(fullName, ct)
   }
 
   private simpleComment (simple: ContainedSimpleField): string {
@@ -137,7 +136,7 @@ export class MsgCompiler {
     const snippets = this.snippets
     const settings = this.settings
     const buffer = this.buffer
-    const len = buffer.writeString(snippets.simple(simple.name, Tags.toJSType(simple), simple.required, 1))
+    const len = buffer.writeString(snippets.simple(simple.name, Tags.toJSType(simple.definition.tagType), simple.required, 1))
     if (settings.tags) {
       buffer.writeString(snippets.commentLine(this.simpleComment(simple), justifiedWidth - len))
     }
@@ -155,7 +154,7 @@ export class MsgCompiler {
     buffer.writeString(newLine)
   }
 
-  private tagSummary (definition: ContainedFieldSet, max: number = 3): string {
+  private tagSummary (definition: IContainedSet, max: number = 3): string {
     function tagTxt (tag: number): string {
       const name = definition.getFieldName(tag)
       return `${name}.${tag}`
@@ -174,7 +173,7 @@ export class MsgCompiler {
     return `${front} .. ${tagTxt(flattened[flattened.length - 1])}`
   }
 
-  private setComment (set: ContainedFieldSet, position: number, len: number): void {
+  private setComment (set: IContainedSet, position: number, len: number): void {
     if (this.settings.tags) {
       const tagTxt = this.tagSummary(set)
       const buffer = this.buffer
@@ -206,7 +205,7 @@ export class MsgCompiler {
     const snippets = this.snippets
     const buffer = this.buffer
     compilerType.set.localAttribute.forEach((simple: ContainedSimpleField) => {
-      const len = buffer.writeString(snippets.simple(simple.definition.name, Tags.toJSType(simple), simple.required, 1))
+      const len = buffer.writeString(snippets.simple(simple.definition.name, Tags.toJSType(simple.definition.tagType), simple.required, 1))
       if (settings.tags) {
         buffer.writeString(snippets.commentLine(this.simpleComment(simple), justifiedWidth - len))
       }

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

@@ -1,4 +1,4 @@
-import { ComponentFieldDefinition } from '../definition'
+import { ComponentFieldDefinition } from '../definition/component-field-definition'
 import { ContainedField } from './contained-field'
 import { ContainedFieldType } from './contained-field-type'