jspurefix 2.2.0 → 3.0.0

package/src/dictionary/compiler/standard-snippet.ts

@@ -5,8 +5,8 @@ export class StandardSnippet {
   constructor (public readonly settings: ICompilerSettings) {
   }
 
-  private static rhsJustify (txt: string, width: number) {
-    let align = require('align-text')
+  private static rhsJustify (txt: string, width: number): string {
+    const align = require('align-text')
     return align(txt, width)
   }
 
@@ -18,27 +18,27 @@ export class StandardSnippet {
     return `${spaces}import { I${name} } from '${path}'`
   }
 
-  public interface (name: string, indent: number) {
+  public interface (name: string, indent: number): string {
     const spaces: string = this.spaces(indent)
     return `${spaces}export interface I${name}`
   }
 
-  public startBlockComment (indent: number) {
+  public startBlockComment (indent: number): string {
     const spaces: string = this.spaces(indent)
     return `${spaces}/*`
   }
 
-  public endBlockComment (indent: number) {
+  public endBlockComment (indent: number): string {
     const spaces: string = this.spaces(indent)
     return `${spaces}*/`
   }
 
-  public startBlock (indent: number) {
+  public startBlock (indent: number): string {
     const spaces: string = this.spaces(indent)
     return `${spaces}{`
   }
 
-  public endBlock (indent: number) {
+  public endBlock (indent: number): string {
     const spaces: string = this.spaces(indent)
     return `${spaces}}`
   }
@@ -58,50 +58,51 @@ export class StandardSnippet {
     return `${spaces}${name}${required ? '' : '?'}: ${type}`
   }
 
-  public enum (name: string, indent: number) {
+  public enum (name: string, indent: number): string {
     const spaces: string = this.spaces(indent)
     return `export ${spaces}enum ${name}`
   }
 
-  public enumValue (name: string, val: any, indent: number) {
+  public enumValue (name: string, val: any, indent: number): string {
     const spaces: string = this.spaces(indent)
-    if (typeof(val) === 'string') {
+    if (typeof (val) === 'string') {
       return `${spaces}${name} = '${val}'`
     }
     return `${spaces}${name} = ${val}`
   }
 
-  public spaces (indent: number) {
+  public spaces (indent: number): string {
     return ' '.repeat(this.settings.spaces * indent)
   }
 
-  public commentLine (line: string, justify: number) {
+  public commentLine (line: string, justify: number): string {
     return StandardSnippet.rhsJustify(`// ${line}`, justify)
   }
 
-  public commentBox (str: string) {
-
-    let wrap = require('word-wrap')
-    let text = wrap(str, {
+  public commentBox (str: string): string {
+    const wrap = require('word-wrap')
+    const text = wrap(str, {
       width: 60,
-      indent: ' '}
-      )
+      indent: ' '
+    }
+    )
     let lines = text.split('\n').map((a: string) => a.trim())
-    let max = this.longest(lines).length + 2
-    const newLine = require('os').EOL
+    const max = this.longest(lines).length + 2
+    const newLine: string = require('os').EOL
     lines = lines.map(function (line: string) {
       line = ` ${line} `
-      let diff = max - line.length
+      const diff = max - line.length
       return '*' + line + ' '.repeat(diff) + '*'
     })
-    let stars = '*'.repeat(lines[0].length)
-    return stars + newLine
-      + lines.join(newLine)
-      + newLine
-      + stars
+    const stars: string = '*'.repeat(lines[0].length)
+    const joined: string = lines.join(newLine)
+    return stars + newLine +
+      joined +
+      newLine +
+      stars
   }
 
-  private longest (arr: string[]) {
+  private longest (arr: string[]): string {
     return arr.reduce(function (a, b) {
       return a.length > b.length ? a : b
     })

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

@@ -4,11 +4,12 @@ import { ContainedFieldType } from './contained-field-type'
 
 export class ContainedComponentField extends ContainedField {
   constructor (public readonly definition: ComponentFieldDefinition,
-               public position: number,
-               public readonly required: boolean,
-               public readonly override?: string) {
-    super(override || definition.name, position, ContainedFieldType.Component, required)
+    public position: number,
+    public readonly required: boolean,
+    public readonly override?: string) {
+    super(override ?? definition.name, position, ContainedFieldType.Component, required)
   }
+
   public toString (): string {
     return `[${this.position}]=C.${this.definition.fields.length} (${this.name})`
   }

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

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

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

@@ -13,43 +13,45 @@ export abstract class ContainedFieldSet {
   public readonly groups: Dictionary<ContainedGroupField> = new Dictionary<ContainedGroupField>()
   public readonly components: Dictionary<ContainedComponentField> = new Dictionary<ContainedComponentField>()
   public readonly simple: Dictionary<ContainedSimpleField> = new Dictionary<ContainedSimpleField>()
-    // sequence of fields representing this type - can be simple, group or component
+  // sequence of fields representing this type - can be simple, group or component
   public readonly fields: ContainedField[] = []
-    // any tag at any level i.e. does this set contain a tag
+  // any tag at any level i.e. does this set contain a tag
   public readonly containedTag: INumericKeyed<boolean> = {}
-    // any data tags contained length within this set.
+  // any tag at any level ordered ie. all tags flattened to list
+  public readonly flattenedTag: number[] = []
+  // any data tags contained length within this set.
   public readonly containedLength: INumericKeyed<boolean> = {}
-    // tags only in repository at this level, not from any at deeper levels
+  // tags only in repository at this level, not from any at deeper levels
   public readonly localTag: INumericKeyed<ContainedSimpleField> = {}
   // tags marked required at this level only
   public readonly localRequired: INumericKeyed<ContainedSimpleField> = {}
-    // all tags contained within this field set flattened from all levels
+  // all tags contained within this field set flattened from all levels
   public readonly tagToSimple: INumericKeyed<ContainedSimpleField> = {}
-    // direct any tag contained within this set to field one level down where it belongs.
+  // direct any tag contained within this set to field one level down where it belongs.
   public readonly tagToField: INumericKeyed<ContainedField> = {}
-    // only repository directly in this set indexed by name
+  // only repository directly in this set indexed by name
   public readonly localNameToField: Dictionary<ContainedField> = new Dictionary<ContainedField>()
-    // for FixMl notation this set of fields appear as attributes i.e. <Pty ID="323" R="38">
+  // for FixMl notation this set of fields appear as attributes i.e. <Pty ID="323" R="38">
   public readonly nameToLocalAttribute: Dictionary<ContainedSimpleField> = new Dictionary<ContainedSimpleField>()
-    // all attributes in order of being declared
+  // all attributes in order of being declared
   public readonly localAttribute: ContainedSimpleField[] = []
-    // at any level on this set, first declared simple field
+  // at any level on this set, first declared simple field
   public firstSimple: ContainedSimpleField
-    // parser needs to know about raw fields
+  // parser needs to know about raw fields
   public containsRaw: boolean = false
 
   protected constructor (public readonly type: ContainedSetType,
-               public readonly name: string,
-               public readonly category: string,
-               public readonly abbreviation: string,
-               public readonly description: string) {
+    public readonly name: string,
+    public readonly category: string | null,
+    public readonly abbreviation: string | null,
+    public readonly description: string | null) {
   }
 
-  public toString () {
+  public toString (): string {
     const buffer = new ElasticBuffer(2 * 1024)
     const fields = this.fields
     buffer.writeString(`Set: ${this.name}(${this.getPrefix()}) fields [${fields.length}]: `)
-    const set = fields.map(f => f.toString())
+    const set: string[] = fields.map((f: ContainedField) => f.toString())
     const s = set.join(', ')
     buffer.writeString(s)
     return buffer.toString()
@@ -57,6 +59,18 @@ export abstract class ContainedFieldSet {
 
   public abstract getPrefix (): string
 
+  public getFieldName (tag: number): string {
+    const s = this.tagToSimple[tag]
+    if (s == null) {
+      const gf = this.tagToField[tag] as ContainedGroupField
+      if (gf !== null) {
+        return `${gf.definition.name}`
+      }
+      return `${tag}`
+    }
+    return s.name
+  }
+
   public add (field: ContainedField): void {
     this.fields.push(field)
     this.localNameToField.addUpdate(field.name, field)
@@ -94,7 +108,7 @@ export abstract class ContainedFieldSet {
     }
   }
 
-  private addLocalSimple (field: ContainedSimpleField) {
+  private addLocalSimple (field: ContainedSimpleField): void {
     const definition = field.definition
     if (definition.abbreviation && definition.abbreviation !== definition.name) {
       this.localNameToField.addUpdate(definition.abbreviation, field)
@@ -149,8 +163,11 @@ export abstract class ContainedFieldSet {
     }
     const definition = groupField.definition
     this.groups.add(groupField.name, groupField)
-    if (definition.noOfField) {
-      this.containedTag[definition.noOfField.tag] = true
+    const nof = definition.noOfField
+    if (nof) {
+      const tag = nof.tag
+      this.containedTag[tag] = true
+      this.flattenedTag.push(tag)
     }
     this.addAllFields(definition)
     this.mapAllBelow(definition, groupField)
@@ -177,7 +194,7 @@ export abstract class ContainedFieldSet {
   }
 
   private mapAllBelow (set: ContainedFieldSet, field: ContainedField): void {
-        // point all tags in this component to this field.
+    // point all tags in this component to this field.
     const tagsBelow: number[] = set.keys()
     for (const t of tagsBelow) {
       this.tagToField[t] = field
@@ -206,6 +223,7 @@ export abstract class ContainedFieldSet {
     const tag = field.definition.tag
     this.simple.add(field.name, field)
     this.containedTag[tag] = true
+    this.flattenedTag.push(tag)
     this.tagToSimple[tag] = field
   }
 }

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

@@ -2,7 +2,10 @@ import { ContainedFieldType } from './contained-field-type'
 
 export class ContainedField {
   constructor (public readonly name: string, public readonly position: number,
-                public readonly type: ContainedFieldType, readonly required: boolean) {
+    public readonly type: ContainedFieldType, readonly required: boolean) {
+  }
 
+  public toString (): string {
+    return this.name
   }
 }

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

@@ -4,10 +4,10 @@ import { ContainedFieldType } from './contained-field-type'
 
 export class ContainedGroupField extends ContainedField {
   constructor (public readonly definition: GroupFieldDefinition,
-               public readonly position: number,
-               public readonly required: boolean,
-               public readonly override?: string) {
-    super(override || definition.name, position, ContainedFieldType.Group, required)
+    public readonly position: number,
+    public readonly required: boolean,
+    public readonly override?: string) {
+    super(override ?? definition.name, position, ContainedFieldType.Group, required)
   }
 
   public toString (): string {

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

@@ -4,11 +4,11 @@ import { ContainedFieldType } from './contained-field-type'
 
 export class ContainedSimpleField extends ContainedField {
   constructor (public readonly definition: SimpleFieldDefinition,
-               public readonly position: number,
-               public readonly required: boolean,
-               public readonly attribute: boolean,
-               public readonly override?: string) {
-    super(override || definition.name, position, ContainedFieldType.Simple, required)
+    public readonly position: number,
+    public readonly required: boolean,
+    public readonly attribute: boolean,
+    public readonly override?: string) {
+    super(override ?? definition.name, position, ContainedFieldType.Simple, required)
   }
 
   public toString (): string {

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

@@ -3,7 +3,7 @@ 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 }
+  group?: (field: ContainedGroupField) => void
+  simple?: (field: ContainedSimpleField) => void
+  component?: (field: ContainedComponentField) => void
 }

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

@@ -20,7 +20,6 @@ export class FieldsDispatch {
           try {
             dispatcher.simple(field as ContainedSimpleField)
           } catch (ex) {
-            let x = 0
           }
         }
         break

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

@@ -3,13 +3,13 @@ import { ContainedSetType } from '../contained-set-type'
 
 export class ComponentFieldDefinition extends ContainedFieldSet {
   constructor (public readonly name: string,
-               public readonly abbreviation: string,
-               public readonly category: string,
-               public readonly description: string) {
+    public readonly abbreviation: string,
+    public readonly category: string | null,
+    public readonly description: string | null) {
     super(ContainedSetType.Component, name, abbreviation, category, description)
   }
 
   public getPrefix (): string {
-    return `C`
+    return 'C'
   }
 }

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

@@ -18,8 +18,8 @@ export class FixDefinitions {
   constructor (public readonly source: FixDefinitionSource, public readonly version: FixVersion) {
   }
 
-  public containedSet (type: string): ContainedFieldSet {
-    return this.message.get(type) || this.component.get(type)
+  public containedSet (type: string): ContainedFieldSet | null {
+    return this.message.get(type) ?? this.component.get(type)
   }
 
   public addMessage (message: MessageDefinition): void {
@@ -39,10 +39,10 @@ export class FixDefinitions {
     this.component.addUpdate(field.name, field)
   }
 
-  public getSimple (name: string, cat?: string): SimpleFieldDefinition {
-    let sf: SimpleFieldDefinition = null
+  public getSimple (name: string, cat?: string | null): SimpleFieldDefinition | null {
+    let sf: SimpleFieldDefinition | null = null
     if (cat) {
-      let category: CategorySimpleSet = this.categorySimple.get(cat)
+      const category: CategorySimpleSet | null = this.categorySimple.get(cat)
       if (category) {
         sf = category.simple.get(name)
       }
@@ -60,7 +60,7 @@ export class FixDefinitions {
     }
   }
 
-  public addSimpleFieldDef (field: SimpleFieldDefinition, typeName: string = null): void {
+  public addSimpleFieldDef (field: SimpleFieldDefinition, typeName: string | null = null): void {
     this.assignCategory(field)
     const simple = this.simple
     simple.addUpdate(field.num, field)
@@ -76,9 +76,9 @@ export class FixDefinitions {
     }
   }
 
-  private assignCategory (field: SimpleFieldDefinition) {
+  private assignCategory (field: SimpleFieldDefinition): void {
     if (field.baseCategory && field.baseCategoryAbbreviation) {
-      let category: CategorySimpleSet = this.categorySimple.get(field.baseCategory)
+      let category: CategorySimpleSet | null = this.categorySimple.get(field.baseCategory)
       if (!category) {
         category = new CategorySimpleSet(field.baseCategory)
         this.categorySimple.add(field.baseCategory, category)

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

@@ -4,10 +4,10 @@ import { ContainedSetType } from '../contained-set-type'
 
 export class GroupFieldDefinition extends ContainedFieldSet {
   constructor (public readonly name: string,
-               public readonly abbreviation: string,
-               public readonly category: string,
-               public readonly noOfField: SimpleFieldDefinition,
-               public readonly description: string) {
+    public readonly abbreviation: string,
+    public readonly category: string | null,
+    public readonly noOfField: SimpleFieldDefinition | null,
+    public readonly description: string | null) {
     super(ContainedSetType.Group, name, abbreviation, category, description)
     if (this.noOfField) {
       this.containedTag[this.noOfField.tag] = true
@@ -15,6 +15,6 @@ export class GroupFieldDefinition extends ContainedFieldSet {
   }
 
   public getPrefix (): string {
-    return `G`
+    return 'G'
   }
 }

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

@@ -3,10 +3,10 @@ import { ContainedSetType } from '../contained-set-type'
 
 export class MessageDefinition extends ContainedFieldSet {
   constructor (public readonly name: string,
-               public readonly abbreviation: string,
-               public readonly msgType: string,
-               public readonly category: string,
-               public readonly description: string) {
+    public readonly abbreviation: string,
+    public readonly msgType: string,
+    public readonly category: string,
+    public readonly description: string | null) {
     super(ContainedSetType.Msg, name, category, abbreviation, description)
   }
 

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

@@ -12,12 +12,12 @@ export class SimpleFieldDefinition {
   public enumVals: Dictionary<boolean>
 
   constructor (public readonly num: string,
-                public readonly name: string,
-                public readonly abbreviation: string,
-                public readonly baseCategory: string,
-                public readonly baseCategoryAbbreviation: string,
-                public readonly type: string,
-                public readonly description: string) {
+    public readonly name: string,
+    public readonly abbreviation: string,
+    public readonly baseCategory: string | null,
+    public readonly baseCategoryAbbreviation: string | null,
+    public readonly type: string,
+    public readonly description: string | null) {
     this.tag = parseInt(num, 10)
     this.tagType = Tags.toType(type)
   }
@@ -39,7 +39,7 @@ export class SimpleFieldDefinition {
     if (!enums) {
       return key
     }
-    const e: FieldEnum = enums.get(key)
+    const e: FieldEnum | null = enums.get(key)
     if (e) {
       return e.val
     }
@@ -69,7 +69,7 @@ export class SimpleFieldDefinition {
       this.enumVals = enumVals = new Dictionary<boolean>()
     }
     val = this.patchEnumValue(val)
-    enums.add(key, new FieldEnum(key, val, description))
+    enums.add(key, new FieldEnum(key, val, description ?? ''))
     enumVals.add(val, true)
   }
 
@@ -85,6 +85,6 @@ export class SimpleFieldDefinition {
     if (baseCategoryAbbreviation.length > 0 && this.baseCategory) {
       baseCategoryAbbreviation = `${this.baseCategory} ${baseCategoryAbbreviation}`
     }
-    return `${this.num} ${this.name} ${abbreviation} ${baseCategoryAbbreviation} ${this.type} ${this.description || ''} ${this.enums ? `enumerated = [ ${this.enums.toString()} ]` : ''}`
+    return `${this.num} ${this.name} ${abbreviation} ${baseCategoryAbbreviation} ${this.type} ${this.description ?? ''} ${this.enums ? `enumerated = [ ${this.enums.toString()} ]` : ''}`
   }
 }

package/src/dictionary/dict-primitive.ts

@@ -2,9 +2,9 @@ import { SAXOptions, SAXParser } from 'sax'
 import * as stream from 'stream'
 import { FixDefinitions } from './definition'
 
-export type IDictDoneCb = (err: Error, done: FixDefinitions) => void
+export type IDictDoneCb = (err?: Error, done?: FixDefinitions | null) => void
 
 export declare class SAXStream extends stream.Duplex {
   public _parser: SAXParser
-  constructor (strict: boolean, opt: SAXOptions);
+  constructor (strict: boolean, opt: SAXOptions)
 }

package/src/dictionary/field-enum.ts

@@ -1,8 +1,9 @@
 export class FieldEnum {
   constructor (public readonly key: string,
-                public readonly val: string,
-                public readonly description: string) {
+    public readonly val: string,
+    public readonly description: string) {
   }
+
   public toString (): string {
     return `${this.key} = ${this.val}`
   }

package/src/dictionary/fix-versions.ts

@@ -1,12 +1,12 @@
 export enum FixVersion {
-    Unknown = 1,
-    FIX40 = 1,
-    FIX41 = 2,
-    FIX42 = 3,
-    FIX43 = 4,
-    FIX44 = 5,
-    FIX50 = 6,
-    FIX50SP1 = 7,
-    FIX50SP2 = 8,
-    FIXML50SP2 = 9
+  Unknown = 1,
+  FIX40 = 1,
+  FIX41 = 2,
+  FIX42 = 3,
+  FIX43 = 4,
+  FIX44 = 5,
+  FIX50 = 6,
+  FIX50SP1 = 7,
+  FIX50SP2 = 8,
+  FIXML50SP2 = 9
 }

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

@@ -30,8 +30,8 @@ export class RepositoryXmlParser extends FixParser {
   }
 
   private static subscribe (instance: RepositoryXmlParser, saxStream: SAXStream, done: IDictDoneCb): void {
-    let parser: BaseParser
-    let pending: string
+    let parser: BaseParser | null
+    let pending: string | null
     const saxParser: SAXParser = saxStream._parser
 
     saxStream.on('error', (e: Error) => {
@@ -39,7 +39,6 @@ export class RepositoryXmlParser extends FixParser {
     })
 
     saxStream.on('closetag', (name) => {
-
       switch (name) {
         case 'Datatypes':
         case 'Abbreviations':
@@ -79,7 +78,7 @@ export class RepositoryXmlParser extends FixParser {
     saxStream.on('text', (t: string) => {
       t = t.trim()
       if (pending) {
-        parser.value(saxParser.line, pending, t)
+        parser?.value(saxParser.line, pending, t)
       }
     })
 
@@ -143,13 +142,13 @@ export class RepositoryXmlParser extends FixParser {
     saxStream.on('ready', () => {
       if (done) {
         parser = null
-        done(null, instance.repository.definitions)
+        done(undefined, instance.repository.definitions)
       }
     })
   }
 
-  public parse (): Promise<FixDefinitions> {
-    return new Promise<FixDefinitions>(async (accept, reject) => {
+  public async parse (): Promise<FixDefinitions> {
+    return await new Promise<FixDefinitions>(async (resolve, reject) => {
       try {
         await this.onePass('Datatypes.xml')
         await this.onePass('Fields.xml')
@@ -160,7 +159,7 @@ export class RepositoryXmlParser extends FixParser {
         if (this.repository.includesAbbreviations) {
           await this.onePass('Abbreviations.xml')
         }
-        accept(this.repository.definitions)
+        resolve(this.repository.definitions)
       } catch (e) {
         reject(e)
       }