jspurefix 5.10.2 → 5.10.4

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

@@ -125,7 +125,7 @@ export class FixmlEncoder extends MsgEncoder {
     new FieldsDispatch().dispatchFields(fields, {
       group: (g: ContainedGroupField) => { this.complexGroup(o, g, depth) },
       component: (c: ContainedComponentField) => { this.complexComponent(o, c, depth) }
-    } as IFieldDispatcher)
+    })
     if (fields.length) {
       const end: string = `${newLine}${indent}</${name}>`
       buffer.writeString(`${end}`)

package/src/buffer/msg-view.ts

@@ -411,7 +411,7 @@ export abstract class MsgView {
       group: (a: ILooseObject, field: ContainedGroupField) => { this.asLooseGroup(a, field) },
       simple: (a: ILooseObject, field: ContainedSimpleField) => { this.asLooseSimple(a, field) },
       component: (a: ILooseObject, field: ContainedComponentField) => { this.asLooseComponent(a, field) }
-    } as ITypeDispatcher<ILooseObject>, def.localAttribute.reduce<ILooseObject>((a: ILooseObject, sf: ContainedSimpleField) => {
+    }, def.localAttribute.reduce<ILooseObject>((a: ILooseObject, sf: ContainedSimpleField) => {
       const def = sf.definition
       const position: number = this.getPosition(def.tag)
       if (position >= 0) {

package/src/config/winston-logger.ts

@@ -109,6 +109,6 @@ export class WinstonLogger {
           message: `${e.message} : ${e.stack}`
         })
       }
-    } as IJsFixLogger
+    }
   }
 }

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

@@ -6,8 +6,8 @@ export class StandardSnippet {
   }
 
   private static rhsJustify (txt: string, width: number): string {
-    const align = require('align-text')
-    return align(txt, width)
+    const pad = ' '.repeat(Math.max(0, width))
+    return txt.split(/\r\n|\n/).map(line => pad + line).join('\n')
   }
 
   // import { camelName } from './component/name_underscore'

package/src/dictionary/parser/fixml/components-parser.ts

@@ -184,7 +184,7 @@ export class ComponentsParser extends XsdParser {
       this.currentGroup = {
         name: node.attributes.name,
         elements: [] as IElement[]
-      } as IGroup
+      }
     } else if (node.attributes.ref) {
       if (this.currentComplexType) {
         this.currentComplexType.group = node.attributes.ref
@@ -205,7 +205,7 @@ export class ComponentsParser extends XsdParser {
       attributeStack.push({
         name: node.attributes.name,
         attributes: [] as IAttribute[]
-      } as IAttributeGroup)
+      })
     } else if (node.attributes.ref) {
       if (this.currentComplexType) {
         this.currentComplexType.attributeGroup = node.attributes.ref

package/src/dictionary/parser/fixml/fields-parser.ts

@@ -64,7 +64,7 @@ export class FieldsParser extends XsdParser {
       case 'xs:simpleType': {
         this.current = {
           simpleTypeName: node.attributes.name
-        } as ISimpleField
+        }
         break
       }
 

package/src/dictionary/parser/fixml/include-graph.ts

@@ -138,7 +138,7 @@ export class IncludeGraph {
             ordered.push({
               parent: next,
               children: includes
-            } as IInclude)
+            })
             q.push(includes)
           }
         }

package/src/jsfix-bench.ts

@@ -178,7 +178,7 @@ async function main (): Promise<void> {
   }
 
   console.log(`${path.relative(root, fixPath)}  ${perInvocation} msg/pass  dict ${argv.dict}`)
-  const suite = await new BenchRunner(benchOptions).runAll(argv.label, cases as IBenchCase[])
+  const suite = await new BenchRunner(benchOptions).runAll(argv.label, cases)
 
   if (argv.json) {
     console.log(JSON.stringify(suite, null, 2))

package/src/jsfix-cmd.ts

@@ -21,7 +21,7 @@ import { DITokens } from './runtime/di-tokens'
 import buildOptions from 'minimist-options'
 import { QuickFixXmlFileBuilder } from './dictionary/parser/quickfix/quick-fix-xml-file-builder'
 
-const fs = require('node-fs-extra')
+const fs = require('fs')
 
 const options = buildOptions({
   dict: {
@@ -439,7 +439,7 @@ export class JsfixCmd {
 
   async ensureExists (path: string): Promise<any> {
     return await new Promise<any>((resolve, reject) => {
-      fs.mkdirp(path, (err: Error) => {
+      fs.mkdir(path, { recursive: true }, (err: Error) => {
         if (err) {
           reject(err)
         } else {

package/src/runtime/session-container.ts

@@ -8,7 +8,6 @@ import {
   TcpAcceptorListener, RecoveringTcpInitiator,
   TcpInitiatorConnector, TcpInitiator
 } from '../transport/tcp'
-import { HttpInitiator, HttpAcceptorListener, HttpJsonSampleAdapter } from '../transport/http'
 import { ISessionMsgFactory, MsgTransmitter, ISessionDescription } from '../transport'
 import { AsciiMsgTransmitter } from '../transport/ascii/ascii-msg-transmitter'
 import { FixmlMsgTransmitter } from '../transport/fixml/fixml-msg-transmitter'
@@ -18,7 +17,15 @@ import { ElasticBuffer, MsgEncoder, MsgParser } from '../buffer'
 import { AsciiParser, AsciiParserState, AsciiSegmentParser } from '../buffer/ascii'
 import { FixmlEncoder, FiXmlParser } from '../buffer/fixml'
 import { FixEntity } from '../transport/fix-entity'
-import { IHttpAdapter } from '../transport/http/http-adapter'
+import type { IHttpAdapter } from '../transport/http/http-adapter'
+
+/**
+ * The http transport pulls in express.  Only a fixml session registers it, so resolve
+ * it on demand - an ascii application should neither load that tree nor inherit it.
+ */
+function httpTransport (): typeof import('../transport/http') {
+  return require('../transport/http')
+}
 
 /**
  * Supplies the session message factory for a description.  Return null to accept the
@@ -165,10 +172,11 @@ export class SessionContainer {
       useClass: FixmlEncoder
     })
     sessionContainer.registerInstance<ElasticBuffer>(DITokens.TransmitBuffer, new ElasticBuffer(sendSize))
-    sessionContainer.register<HttpAcceptorListener>(HttpAcceptorListener, {
+    const { HttpInitiator, HttpAcceptorListener, HttpJsonSampleAdapter } = httpTransport()
+    sessionContainer.register(HttpAcceptorListener, {
       useClass: HttpAcceptorListener
     })
-    sessionContainer.register<HttpInitiator>(HttpInitiator, {
+    sessionContainer.register(HttpInitiator, {
       useClass: HttpInitiator
     })
     if (this.isInitiator(description)) {

package/src/sample/http/oms/app.ts

@@ -22,7 +22,7 @@ class AppLauncher extends SessionLauncher {
       makeSession: (sessionConfig: IJsFixConfig) => isInitiator
         ? new HttpClient(sessionConfig)
         : new HttpServer(sessionConfig)
-    } as EngineFactory
+    }
   }
 
   async waitFor (ms: number): Promise<any> {

package/src/sample/http/oms/oms-factory.ts

@@ -27,12 +27,12 @@ export class OmsFactory {
       OrdType: OrdType.Limit,
       OrderQtyData: {
         OrderQty: qty
-      } as IOrderQtyData,
+      },
       Instrument: {
         Symbol: symbol,
         SecurityID: '459200101',
         SecurityIDSource: SecurityIDSource.IsinNumber
-      } as IInstrument,
+      },
       TimeInForce: TimeInForce.GoodTillCancelGtc
     } as INewOrderSingle
   }
@@ -53,12 +53,12 @@ export class OmsFactory {
       Price: order.Price,
       OrderQtyData: {
         OrderQty: order?.OrderQtyData?.OrderQty
-      } as IOrderQtyData,
+      },
       Instrument: {
         Symbol: order?.Instrument?.Symbol,
         SecurityID: order?.Instrument?.SecurityID,
         SecurityIDSource: SecurityIDSource.IsinNumber
-      } as IInstrument
+      }
     } as IExecutionReport
   }
 }

package/src/sample/tcp/qf-md/app.ts

@@ -18,7 +18,7 @@ class AppLauncher extends SessionLauncher {
       makeSession: (sessionConfig: IJsFixConfig) => isInitiator
         ? new MDClient(sessionConfig)
         : new MDServer(sessionConfig)
-    } as EngineFactory
+    }
   }
 }
 

package/src/sample/tcp/skeleton/app.ts

@@ -14,7 +14,7 @@ class AppLauncher extends SessionLauncher {
   protected override makeFactory (config: IJsFixConfig): EngineFactory {
     return {
       makeSession: (sessionConfig: IJsFixConfig) => new SkeletonSession(sessionConfig, 45, false)
-    } as EngineFactory
+    }
   }
 }
 

package/src/sample/tcp/trade-capture/app-launcher.ts

@@ -17,6 +17,6 @@ export class AppLauncher extends SessionLauncher {
       makeSession: (sessionConfig: IJsFixConfig) => isInitiator
         ? new TradeCaptureClient(sessionConfig)
         : new TradeCaptureServer(sessionConfig)
-    } as EngineFactory
+    }
   }
 }

package/src/store/fix-msg-memory-store.ts

@@ -104,7 +104,7 @@ export class FixMsgMemoryStore implements IFixMsgStore {
       lastSeq: arr.length > 0 ? arr[arr.length - 1].seqNum : 0,
       id: this.id,
       length: arr.length
-    } as IFixMsgStoreState
+    }
   }
 
   public async getState (): Promise<IFixMsgStoreState> {

package/src/transport/duplex/http-duplex.ts

@@ -1,7 +1,6 @@
 import { FixDuplex } from './fix-duplex'
 import { Readable, Writable } from 'stream'
-import axios from 'axios'
-import { IHttpAdapter } from '../http/http-adapter'
+import type { IHttpAdapter } from '../http/http-adapter'
 
 export class HttpDuplex extends FixDuplex {
   public constructor (public readonly adapter: IHttpAdapter) {
@@ -29,6 +28,9 @@ export class HttpDuplex extends FixDuplex {
           const adapter = this.adapter
           const options = adapter.getOptions(data)
           if (options) {
+            // resolved here rather than at module scope - this file is on the barrel
+            // export, and an ascii application should not load axios to reach it
+            const axios = require('axios').default
             axios(options).then((message: any) => {
               const body = adapter.endMessage(message)
               forward.push(body)

package/src/transport/fixml/fixml-session-msg-factory.ts

@@ -31,7 +31,7 @@ export class FixmlSessionMsgFactory extends ASessionMsgFactory {
       TargetCompID: description.TargetCompID,
       SenderSubID: description.SenderSubID,
       TargetSubID: description.TargetSubID
-    } as IStandardHeader
+    }
     return this.mutate(o, 'StandardHeader')
   }
 
@@ -45,14 +45,14 @@ export class FixmlSessionMsgFactory extends ASessionMsgFactory {
         UserRequestType: UserRequestType.LogOnUser,
         // same escape hatch as the ascii factory - see ISessionDescription.Logon
         ...description.Logon
-      } as IUserRequest
+      }
       return this.mutate(o, MsgType.Logon)
     } else {
       const o: IUserResponse = {
         Username: description.Username,
         UserRequestID: userRequestId,
         UserStatus: UserStatus.LoggedIn
-      } as IUserResponse
+      }
       return this.mutate(o, MsgType.Logon)
     }
   }
@@ -63,14 +63,14 @@ export class FixmlSessionMsgFactory extends ASessionMsgFactory {
         Username: this.description.Username,
         UserRequestID: userRequestId,
         UserRequestType: UserRequestType.LogOffUser
-      } as IUserRequest
+      }
       return this.mutate(o, MsgType.Logout)
     } else {
       const o: IUserResponse = {
         Username: this.description.Username,
         UserRequestID: userRequestId,
         UserStatus: UserStatus.NotLoggedIn
-      } as IUserResponse
+      }
       return this.mutate(o, MsgType.Logout)
     }
   }

package/src/transport/session/clone-session-description.ts

@@ -37,5 +37,5 @@ export function cloneSessionDescription (
  * late binding - i.e. wildcard TargetCompID resolved from the peer's Logon.
  */
 export function asMutable (description: ISessionDescription): MutableSessionDescription {
-  return description as MutableSessionDescription
+  return description
 }

package/src/transport/tcp/tls-options-factory.ts

@@ -36,7 +36,7 @@ export class TlsOptionsFactory {
       tlsOptions = {
         requestCert: TlsOptionsFactory.asBoolean(tls.requestCert),
         rejectUnauthorized: TlsOptionsFactory.asBoolean(tls.rejectUnauthorized)
-      } as TlsOptions
+      }
 
       if (tls.key) {
         tlsOptions.key = TlsOptionsFactory.read(tls.key)
@@ -64,7 +64,7 @@ export class TlsOptionsFactory {
       connectionOptions = {
         port: tcp.port,
         host: tcp.host
-      } as ConnectionOptions
+      }
       if (tls.key) {
         connectionOptions.key = TlsOptionsFactory.read(tcp.tls?.key ?? '')
         connectionOptions.cert = tcp.tls?.cert ? TlsOptionsFactory.read(tcp?.tls?.cert) : undefined