jspurefix 2.2.0 → 2.2.1

package/script/genkey.ps1

@@ -1,179 +1,179 @@
-
-function read-or-default {
-    Param
-    (
-         [Parameter(Mandatory=$true, Position=0)]
-         [string] $text,
-         [Parameter(Mandatory=$true, Position=1)]
-         [string] $default
-    )
-    $a = Read-Host "$text [$default]"
-    if ($a.Length -eq 0) {
-        $a = $default
-    } 
-    $a
-}
-Function Test-CommandExists {
-    Param ($command)
-    $oldPreference = $ErrorActionPreference
-    $ErrorActionPreference = ‘stop’
-    try {
-        if (Get-Command $command) {
-            1
-        }
-    }
-    Catch {
-        0
-    }
-    Finally {
-        $ErrorActionPreference = $oldPreference
-    }
-} #end function test-CommandExists
-
-if (-Not (Test-CommandExists "openssl")) {
-    Write-Output "openssl does not appear to be in path."
-    exit -1
-}
-
-function New-Folder {
-    param (
-        [Parameter(Mandatory=$true, Position=0)]
-        [string] $name
-    )
-    if (-Not (Test-Path -PathType Container $Name)) {
-        New-Item -Type Directory -p $Name
-    }        
-}
-
-$ROOTPATH = read-or-default "rootpath" "." 
-
-$PATH_CA = "$ROOTPATH/certs/ca"
-$PATH_SERVER = "$ROOTPATH/certs/server"
-$PATH_CLIENT = "$ROOTPATH/certs/client"
-$PATH_TMP = "$ROOTPATH/certs/tmp"
-
-New-Folder($PATH_CA)
-New-Folder($PATH_SERVER)
-New-Folder($PATH_CLIENT)
-New-Folder($PATH_TMP)
-
-Write-Output ""
-Write-Output  "      _____      _  __        _____ _                      _                   "
-Write-Output  "     /  ___|    | |/ _|      /  ___(_)                    | |                  "
-Write-Output  "     \ \`--.  ___| | |_ ______\ \`--. _  __ _ _ __   ___  __| |                "
-Write-Output  "      \`--. \/ _ \ |  _|______|\`--. \ |/ _\` | '_ \ / _ \/ _\` |              "
-Write-Output  "     /\__/ /  __/ | |        /\__/ / | (_| | | | |  __/ (_| |                  "
-Write-Output  "     \____/ \___|_|_|        \____/|_|\__, |_| |_|\___|\__,_|                  "
-Write-Output  "                                       __/ |                                   "
-Write-Output  "                                      |___/                                    "
-Write-Output  "    _____           _         _____                           _                "
-Write-Output  "   /  __ \         | |       |  __ \                         | |               "
-Write-Output  "   | /  \/ ___ _ __| |_ ___  | |  \/ ___ _ __   ___ _ __ __ _| |_ ___  _ __    "
-Write-Output  "   | |    / _ \ '__| __/ __| | | __ / _ \ '_ \ / _ \ '__/ _\` | __/ _ \| '__|  "
-Write-Output  "   | \__/\  __/ |  | |_\__ \ | |_\ \  __/ | | |  __/ | | (_| | || (_) | |      "
-Write-Output  "    \____/\___|_|   \__|___/  \____/\___|_| |_|\___|_|  \__,_|\__\___/|_|      "
-Write-Output  "                                                                               "
-Write-Output  ""
-
-Write-Output  ""
-Write-Output  " Global conf "
-Write-Output  ""
-
-$RSABITS = read-or-default "RSA bit length" "4096" 
-$EXPIREDAYS  = read-or-default "Expire days" "365" 
-
-$PASSWORD = "."
-while ($PASSWORD.Length -lt 4) {
-    $PASSWORD = read-or-default "Password for certs" "jspurefix" 
-    if ($PASSWORD.Length -lt 4) {
-        Write-Output "Password length cannot be lower than 4 chars"
-    }
-}
-
-Write-Output  ""
-Write-Output  " OpenSSL conf "
-Write-Output  ""
-
-# Classic openssl prompt
-
-$GK_C = read-or-default "(C) Country Name (2 letter code)" "US" 
-$GK_ST = read-or-default "(ST) State or Province Name (full name)" "." 
-$GK_L = read-or-default "(L) Locality Name (eg, city)" "city"
-$GK_O  = read-or-default "(O) Organization Name (eg, company)" "ACME Signing Authority Inc" 
-$GK_OU  = read-or-default "(OU) Organizational Unit Name (eg, section) " "." 
-$GK_CN  = read-or-default "(CN) Common Name (eg, your name or your server's hostname) " "localhost" 
-
-$GK_emailAddress = Read-Host "(emailAddress) Email Address []:"
-if ($GK_emailAddress.Length -gt 0) {
-    $GK_emailAddress = "/emailAddress=$GK_emailAddress"
-}
-
-Write-Output "Please enter the following 'extra' attributes"
-Write-Output "to be sent with your certificate request"
-$GK_unstructuredName = Read-Host "(unstructuredName) An optional company name []:" 
-if ($GK_unstructuredName.Length -gt 0) {
-    $GK_unstructuredName = "/unstructuredName=$GK_unstructuredName"
-}
-
-$OTHER_FIELDS = ""
-$ADD_OTHER_FIELD = "Y"
-while ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
-    $ADD_OTHER_FIELD = read-or-default "Add other field [y/N]" "N"
-    if ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
-        $OTHER_FIELD_NAME = Read-Host "Field name: "
-        $OTHER_FIELD_VALUE = Read-Host "Field value: "
-        if ($OTHER_FIELD_VALUE.Length -eq 0) {
-            OTHER_FIELD_VALUE="."
-        }
-        $OTHER_FIELDS = "$OTHER_FIELDS/$OTHER_FIELD_NAME=$OTHER_FIELD_VALUE"
-    }
-}
-
-Write-Output  ""
-Write-Output  "Generate certs "
-Write-Output  ""
-
-# CA 
-Write-Output  ""
-Write-Output  "CA"
-Write-Output  ""
-
-openssl genrsa -des3 -passout "pass:$PASSWORD" -out "$PATH_CA/ca.key" $RSABITS
-
-# Create Authority Certificate
-openssl req -new -x509 -days "$EXPIREDAYS" -key "$PATH_CA/ca.key" -out "$PATH_CA/ca.crt" -passin "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=.$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
-
-# SERVER 
-Write-Output  ""
-Write-Output  "Server"
-Write-Output  ""
-
-# Generate server key
-openssl genrsa -out "$PATH_SERVER/server.key" $RSABITS
-
-# Generate server cert
-openssl req -new -key "$PATH_SERVER/server.key" -out "$PATH_TMP/server.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=$GK_CN$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
-
-# Sign server cert with self-signed cert
-openssl x509 -req -days "$EXPIREDAYS" -passin "pass:$PASSWORD" -in "$PATH_TMP/server.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_SERVER/server.crt"
-
-# CLIENT 
-
-Write-Output  ""
-Write-Output  "Client"
-Write-Output  ""
-
-openssl genrsa -out "$PATH_CLIENT/client.key" $RSABITS
-
-openssl req -new -key "$PATH_CLIENT/client.key" -out "$PATH_TMP/client.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=CLIENT$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
-
-openssl x509 -req -days 365 -passin "pass:$PASSWORD" -in "$PATH_TMP/client.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_CLIENT/client.crt"
-
-# Clean tmp dir
-
-Remove-Item -Recurse $PATH_TMP
-
-Write-Output  ""
-Write-Output  "Done !"
-
-exit 0
+
+function read-or-default {
+    Param
+    (
+         [Parameter(Mandatory=$true, Position=0)]
+         [string] $text,
+         [Parameter(Mandatory=$true, Position=1)]
+         [string] $default
+    )
+    $a = Read-Host "$text [$default]"
+    if ($a.Length -eq 0) {
+        $a = $default
+    } 
+    $a
+}
+Function Test-CommandExists {
+    Param ($command)
+    $oldPreference = $ErrorActionPreference
+    $ErrorActionPreference = ‘stop’
+    try {
+        if (Get-Command $command) {
+            1
+        }
+    }
+    Catch {
+        0
+    }
+    Finally {
+        $ErrorActionPreference = $oldPreference
+    }
+} #end function test-CommandExists
+
+if (-Not (Test-CommandExists "openssl")) {
+    Write-Output "openssl does not appear to be in path."
+    exit -1
+}
+
+function New-Folder {
+    param (
+        [Parameter(Mandatory=$true, Position=0)]
+        [string] $name
+    )
+    if (-Not (Test-Path -PathType Container $Name)) {
+        New-Item -Type Directory -p $Name
+    }        
+}
+
+$ROOTPATH = read-or-default "rootpath" "." 
+
+$PATH_CA = "$ROOTPATH/certs/ca"
+$PATH_SERVER = "$ROOTPATH/certs/server"
+$PATH_CLIENT = "$ROOTPATH/certs/client"
+$PATH_TMP = "$ROOTPATH/certs/tmp"
+
+New-Folder($PATH_CA)
+New-Folder($PATH_SERVER)
+New-Folder($PATH_CLIENT)
+New-Folder($PATH_TMP)
+
+Write-Output ""
+Write-Output  "      _____      _  __        _____ _                      _                   "
+Write-Output  "     /  ___|    | |/ _|      /  ___(_)                    | |                  "
+Write-Output  "     \ \`--.  ___| | |_ ______\ \`--. _  __ _ _ __   ___  __| |                "
+Write-Output  "      \`--. \/ _ \ |  _|______|\`--. \ |/ _\` | '_ \ / _ \/ _\` |              "
+Write-Output  "     /\__/ /  __/ | |        /\__/ / | (_| | | | |  __/ (_| |                  "
+Write-Output  "     \____/ \___|_|_|        \____/|_|\__, |_| |_|\___|\__,_|                  "
+Write-Output  "                                       __/ |                                   "
+Write-Output  "                                      |___/                                    "
+Write-Output  "    _____           _         _____                           _                "
+Write-Output  "   /  __ \         | |       |  __ \                         | |               "
+Write-Output  "   | /  \/ ___ _ __| |_ ___  | |  \/ ___ _ __   ___ _ __ __ _| |_ ___  _ __    "
+Write-Output  "   | |    / _ \ '__| __/ __| | | __ / _ \ '_ \ / _ \ '__/ _\` | __/ _ \| '__|  "
+Write-Output  "   | \__/\  __/ |  | |_\__ \ | |_\ \  __/ | | |  __/ | | (_| | || (_) | |      "
+Write-Output  "    \____/\___|_|   \__|___/  \____/\___|_| |_|\___|_|  \__,_|\__\___/|_|      "
+Write-Output  "                                                                               "
+Write-Output  ""
+
+Write-Output  ""
+Write-Output  " Global conf "
+Write-Output  ""
+
+$RSABITS = read-or-default "RSA bit length" "4096" 
+$EXPIREDAYS  = read-or-default "Expire days" "365" 
+
+$PASSWORD = "."
+while ($PASSWORD.Length -lt 4) {
+    $PASSWORD = read-or-default "Password for certs" "jspurefix" 
+    if ($PASSWORD.Length -lt 4) {
+        Write-Output "Password length cannot be lower than 4 chars"
+    }
+}
+
+Write-Output  ""
+Write-Output  " OpenSSL conf "
+Write-Output  ""
+
+# Classic openssl prompt
+
+$GK_C = read-or-default "(C) Country Name (2 letter code)" "US" 
+$GK_ST = read-or-default "(ST) State or Province Name (full name)" "." 
+$GK_L = read-or-default "(L) Locality Name (eg, city)" "city"
+$GK_O  = read-or-default "(O) Organization Name (eg, company)" "ACME Signing Authority Inc" 
+$GK_OU  = read-or-default "(OU) Organizational Unit Name (eg, section) " "." 
+$GK_CN  = read-or-default "(CN) Common Name (eg, your name or your server's hostname) " "localhost" 
+
+$GK_emailAddress = Read-Host "(emailAddress) Email Address []:"
+if ($GK_emailAddress.Length -gt 0) {
+    $GK_emailAddress = "/emailAddress=$GK_emailAddress"
+}
+
+Write-Output "Please enter the following 'extra' attributes"
+Write-Output "to be sent with your certificate request"
+$GK_unstructuredName = Read-Host "(unstructuredName) An optional company name []:" 
+if ($GK_unstructuredName.Length -gt 0) {
+    $GK_unstructuredName = "/unstructuredName=$GK_unstructuredName"
+}
+
+$OTHER_FIELDS = ""
+$ADD_OTHER_FIELD = "Y"
+while ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
+    $ADD_OTHER_FIELD = read-or-default "Add other field [y/N]" "N"
+    if ($ADD_OTHER_FIELD -eq "y" || $ADD_OTHER_FIELD -eq "Y") {
+        $OTHER_FIELD_NAME = Read-Host "Field name: "
+        $OTHER_FIELD_VALUE = Read-Host "Field value: "
+        if ($OTHER_FIELD_VALUE.Length -eq 0) {
+            OTHER_FIELD_VALUE="."
+        }
+        $OTHER_FIELDS = "$OTHER_FIELDS/$OTHER_FIELD_NAME=$OTHER_FIELD_VALUE"
+    }
+}
+
+Write-Output  ""
+Write-Output  "Generate certs "
+Write-Output  ""
+
+# CA 
+Write-Output  ""
+Write-Output  "CA"
+Write-Output  ""
+
+openssl genrsa -des3 -passout "pass:$PASSWORD" -out "$PATH_CA/ca.key" $RSABITS
+
+# Create Authority Certificate
+openssl req -new -x509 -days "$EXPIREDAYS" -key "$PATH_CA/ca.key" -out "$PATH_CA/ca.crt" -passin "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=.$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
+
+# SERVER 
+Write-Output  ""
+Write-Output  "Server"
+Write-Output  ""
+
+# Generate server key
+openssl genrsa -out "$PATH_SERVER/server.key" $RSABITS
+
+# Generate server cert
+openssl req -new -key "$PATH_SERVER/server.key" -out "$PATH_TMP/server.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=$GK_CN$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
+
+# Sign server cert with self-signed cert
+openssl x509 -req -days "$EXPIREDAYS" -passin "pass:$PASSWORD" -in "$PATH_TMP/server.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_SERVER/server.crt"
+
+# CLIENT 
+
+Write-Output  ""
+Write-Output  "Client"
+Write-Output  ""
+
+openssl genrsa -out "$PATH_CLIENT/client.key" $RSABITS
+
+openssl req -new -key "$PATH_CLIENT/client.key" -out "$PATH_TMP/client.csr" -passout "pass:$PASSWORD" -subj "/C=$GK_C/ST=$GK_ST/L=$GK_L/O=$GK_O/OU=$GK_OU/CN=CLIENT$GK_unstructuredName$GK_emailAddress$GK_subjectAltName$OTHER_FIELDS"
+
+openssl x509 -req -days 365 -passin "pass:$PASSWORD" -in "$PATH_TMP/client.csr" -CA "$PATH_CA/ca.crt" -CAkey "$PATH_CA/ca.key" -set_serial 01 -out "$PATH_CLIENT/client.crt"
+
+# Clean tmp dir
+
+Remove-Item -Recurse $PATH_TMP
+
+Write-Output  ""
+Write-Output  "Done !"
+
+exit 0

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

@@ -34,6 +34,26 @@ export class AsciiView extends MsgView {
     return new AsciiView(segment, buffer, null, this.ptr, delimiter, writeDelimiter)
   }
 
+  private replaceDelimiter (viewBuffer: Buffer, replaceDelimiter?: number): void {
+    const delimiter = replaceDelimiter ?? this.delimiter
+    if (delimiter !== this.writeDelimiter) {
+      const structure = this.structure
+      const tags = structure.tags.tagPos
+      for (let i = 0; i < structure.tags.nextTagPos; ++i) {
+        const tag: TagPos = tags[i]
+        const p: number = tag.start + tag.len
+        viewBuffer.writeUInt8(delimiter, p)
+      }
+    }
+  }
+
+  // turn our view back to a raw msg
+  public toBuffer (replaceDelimiter?: number): Buffer {
+    const viewBuffer = this.buffer.slice()
+    this.replaceDelimiter(viewBuffer, replaceDelimiter)
+    return viewBuffer
+  }
+
   public checksum (): number {
     const t = this.getPosition(MsgTag.CheckSum)
     const structure = this.structure

package/src/buffer/elastic-buffer.ts

@@ -44,7 +44,7 @@ export class ElasticBuffer {
 
   public setPos (ptr: number): number {
     const r = this.ptr
-    if (ptr >= 0 && ptr < this.size) {
+    if (ptr >= 0 && ptr <= this.size) {
       this.ptr = ptr
     }
     return r

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

@@ -2,7 +2,13 @@ import { ElasticBuffer, Tags } from '../../buffer'
 import { AsciiChars } from '../../buffer/ascii/'
 import { ICompilerSettings } from './compiler-settings'
 import { FixDefinitions } from '../definition'
-import { ContainedGroupField, ContainedSimpleField, ContainedComponentField, FieldsDispatch } from '../contained'
+import {
+  ContainedComponentField,
+  ContainedFieldSet,
+  ContainedGroupField,
+  ContainedSimpleField,
+  FieldsDispatch
+} from '../contained'
 import { StandardSnippet } from './standard-snippet'
 import { CompilerType } from './compiler-type'
 import { Dictionary } from '../../collections'
@@ -12,6 +18,10 @@ import * as Util from 'util'
 import * as Path from 'path'
 import { SetReduce } from '../set-reduce'
 import { ContainedSetType } from '../contained-set-type'
+import { TagType } from '../../buffer/tag/tag-type'
+
+const newLine = require('os').EOL
+const justifiedWidth: number = 50
 
 export class MsgCompiler {
   readonly queue: CompilerType[] = []
@@ -71,7 +81,6 @@ export class MsgCompiler {
       prev.push(`export * from '${current.snaked}'`)
       return prev
     }, [`export * from './enum'`] as string[])
-    const newLine = require('os').EOL
     exports.sort()
     exports.push('')
     const api: string = exports.join(newLine)
@@ -86,7 +95,6 @@ export class MsgCompiler {
     const buffer: ElasticBuffer = this.buffer
     buffer.reset()
     const snippets = this.snippets
-    const newLine = require('os').EOL
     // a single class with dependencies included
     let ptr: number = this.imports(compilerType)
     if (ptr > 0) {
@@ -127,32 +135,58 @@ export class MsgCompiler {
     const snippets = this.snippets
     const settings = this.settings
     const buffer = this.buffer
-    const newLine = require('os').EOL
     const len = buffer.writeString(snippets.simple(simple.name, Tags.toJSType(simple), simple.required, 1))
     if (settings.tags) {
-      buffer.writeString(snippets.commentLine(`${simple.definition.tag}`, 50 - len))
+      buffer.writeString(snippets.commentLine(`[${simple.position + 1}] ${simple.definition.tag} (${TagType[simple.definition.tagType]})`, justifiedWidth - len))
     }
     buffer.writeString(newLine)
   }
 
   private fieldGroup (groupField: ContainedGroupField, compilerType: CompilerType): void {
-    const newLine = require('os').EOL
     const buffer = this.buffer
     const snippets = this.snippets
     // for a group its field name is as defined in type, its type is qualified to avoid collisions
     const extended: string = compilerType.getExtended(groupField)
-    buffer.writeString(snippets.group(compilerType.getFieldGroupName(groupField), extended, groupField.required, 1))
+    const len = buffer.writeString(snippets.group(compilerType.getFieldGroupName(groupField), extended, groupField.required, 1))
+    this.setComment(groupField.definition, groupField.position, len)
     this.enqueue(new CompilerType(this.definitions, groupField.definition, extended))
     buffer.writeString(newLine)
   }
 
+  private tagSummary (definition: ContainedFieldSet, max: number = 3): string {
+    function tagTxt (tag: number) {
+      const name = definition.getFieldName(tag)
+      return `${name}.${tag}`
+    }
+
+    function setTxt (flattened: number[]) {
+      return flattened.map(f => tagTxt(f)).join(', ')
+    }
+
+    const flattened = definition.flattenedTag
+    if (max >= flattened.length) {
+      return setTxt(flattened)
+    }
+
+    const front = setTxt(flattened.slice(0, max - 1))
+    return `${front} .. ${tagTxt(flattened[flattened.length - 1])}`
+  }
+
+  private setComment (set: ContainedFieldSet, position: number, len: number): void {
+    if (this.settings.tags) {
+      const tagTxt = this.tagSummary(set)
+      const buffer = this.buffer
+      buffer.writeString(this.snippets.commentLine(`[${position + 1}] ${tagTxt}`, justifiedWidth - len))
+    }
+  }
+
   private fieldComponent (componentField: ContainedComponentField, compilerType: CompilerType): void {
-    const newLine = require('os').EOL
     const buffer = this.buffer
     const snippets = this.snippets
     const extended: string = compilerType.getExtended(componentField)
-    buffer.writeString(snippets.component(extended, componentField.required, 1))
+    const len = buffer.writeString(snippets.component(extended, componentField.required, 1))
     this.enqueue(new CompilerType(this.definitions, componentField.definition, extended))
+    this.setComment(componentField.definition, componentField.position, len)
     buffer.writeString(newLine)
   }
 
@@ -167,13 +201,12 @@ export class MsgCompiler {
 
   private attributes (compilerType: CompilerType): void {
     const settings = this.settings
-    const newLine = require('os').EOL
     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))
       if (settings.tags) {
-        buffer.writeString(snippets.commentLine(`${simple.definition.tag}`, 50 - len))
+        buffer.writeString(snippets.commentLine(`${simple.definition.tag}`, justifiedWidth - len))
       }
       buffer.writeString(newLine)
     })
@@ -194,6 +227,6 @@ export class MsgCompiler {
       }
     }, [])
 
-    return this.buffer.writeString(imports.join(require('os').EOL))
+    return this.buffer.writeString(imports.join(newLine))
   }
 }

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

@@ -17,6 +17,8 @@ export abstract class ContainedFieldSet {
   public readonly fields: ContainedField[] = []
     // any tag at any level i.e. does this set contain a tag
   public readonly containedTag: INumericKeyed<boolean> = {}
+    // 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
@@ -57,6 +59,18 @@ export abstract class ContainedFieldSet {
 
   public abstract getPrefix (): string
 
+  public getFieldName (tag: number) {
+    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)
@@ -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)
@@ -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/transport/tcp/tls-options-factory.ts

@@ -26,7 +26,7 @@ export class TlsOptionsFactory {
         tlsOptions.key = TlsOptionsFactory.read(tls.key)
         tlsOptions.cert = TlsOptionsFactory.read(tls.cert)
       }
-      
+
       if (tls.ca && tls.ca.length > 0) {
         tlsOptions.ca = tls.ca.map(i => TlsOptionsFactory.read(i))
       }

package/src/types/FIX4.2/quickfix/advertisement.ts

@@ -0,0 +1,41 @@
+import { IStandardHeader } from './set/standard_header'
+import { IStandardTrailer } from './set/standard_trailer'
+
+export interface IAdvertisement {
+  StandardHeader: IStandardHeader// [1] BeginString.8, BodyLength.9 .. OnBehalfOfSendingTime.370
+  AdvId: string// [2] 2 (String)
+  AdvTransType: string// [3] 5 (String)
+  AdvRefID?: string// [4] 3 (String)
+  Symbol: string// [5] 55 (String)
+  SymbolSfx?: string// [6] 65 (String)
+  SecurityID?: string// [7] 48 (String)
+  IDSource?: string// [8] 22 (String)
+  SecurityType?: string// [9] 167 (String)
+  MaturityMonthYear?: string// [10] 200 (String)
+  MaturityDay?: string// [11] 205 (String)
+  PutOrCall?: number// [12] 201 (Int)
+  StrikePrice?: number// [13] 202 (Float)
+  OptAttribute?: string// [14] 206 (String)
+  ContractMultiplier?: number// [15] 231 (Float)
+  CouponRate?: number// [16] 223 (Float)
+  SecurityExchange?: string// [17] 207 (String)
+  Issuer?: string// [18] 106 (String)
+  EncodedIssuerLen?: number// [19] 348 (Length)
+  EncodedIssuer?: Buffer// [20] 349 (RawData)
+  SecurityDesc?: string// [21] 107 (String)
+  EncodedSecurityDescLen?: number// [22] 350 (Length)
+  EncodedSecurityDesc?: Buffer// [23] 351 (RawData)
+  AdvSide: string// [24] 4 (String)
+  Shares: number// [25] 53 (Float)
+  Price?: number// [26] 44 (Float)
+  Currency?: string// [27] 15 (String)
+  TradeDate?: Date// [28] 75 (LocalDate)
+  TransactTime?: Date// [29] 60 (UtcTimestamp)
+  Text?: string// [30] 58 (String)
+  EncodedTextLen?: number// [31] 354 (Length)
+  EncodedText?: Buffer// [32] 355 (RawData)
+  URLLink?: string// [33] 149 (String)
+  LastMkt?: string// [34] 30 (String)
+  TradingSessionID?: string// [35] 336 (String)
+  StandardTrailer: IStandardTrailer// [36] SignatureLength.93, Signature.89, CheckSum.10
+}