jspurefix 5.11.1 → 5.11.3

package/README.md

@@ -93,13 +93,16 @@ import {
 
 A minimal session subclasses `AsciiSession` and implements two callbacks: `onReady` (connection up, logon confirmed) and `onApplicationMsg` (a non-session message arrived).
 
+The second argument to `logger()` binds structured fields to every line that logger writes, and `info`/`warning`/`debug`/`error` each take an optional bag of per-call fields. Both are optional and additive — the default console format renders exactly as it always has, and installing `WinstonLogger.ecsOptions()` instead emits one ECS-style JSON object per line for Filebeat. See [docs/instrumentation.md](docs/instrumentation.md).
+
 ```typescript
 class TradeCaptureClient extends AsciiSession {
   constructor (public readonly config: IJsFixConfig) {
     super(config)
     this.logReceivedMsgs = true
     this.fixLog = config.logFactory.plain(`jsfix.${config.description.application.name}.txt`)
-    this.logger = config.logFactory.logger(`${this.me}:TradeCaptureClient`)
+    this.logger = config.logFactory.logger(`${this.me}:TradeCaptureClient`,
+      { component: 'TradeCaptureClient', app: this.me })
   }
 
   protected onReady (view: MsgView): void {
@@ -508,6 +511,13 @@ To add a custom dialect:
 
 See [jspf-md-demo](https://github.com/TimelordUK/jspf-md-demo) for a worked example.
 
+A counterparty that emits a component's tags non-adjacently defeats the parser's positional
+model, and the engine repairs the common case by describing such a component with its tags
+rather than a range. `FragmentSafety.analyse(definitions)` reports whether a dictionary
+lets that repair stay unambiguous — worth running against a house dialect. The
+generalisation to arbitrarily nested scattering, and what it would cost, is in
+[docs/scattered-components.md](docs/scattered-components.md).
+
 ## `jsfix` CLI — log parsing & stats
 
 The `jsfix-cmd` tool parses any FIX log given an appropriate dictionary.
@@ -567,6 +577,8 @@ Numbers below are illustrative — generated messages, single-threaded, parser-o
 
 † The SD and TC fixtures have shrunk since the older measurements were taken (SD was 229 fields / 2 466 chars, TC was 578 fields / 5 741 chars), so the prior numbers aren't comparable with the current fixture and have been dropped from the row. Re-running them on the older hardware would produce a clean third column. Ryzen measurements taken on Node 24 LTS, WSL2.
 
+To measure a change to a hot path rather than the engine as a whole, see [docs/benchmarking.md](docs/benchmarking.md). Measuring a *live* session — throughput, sequence health, session state, at a cost low enough to leave switched on — is not yet possible; the design for it is in [docs/instrumentation.md](docs/instrumentation.md).
+
 ## Developing on jspurefix
 
 Clone and build:

package/dist/buffer/fixml/fixml-parser.js

@@ -36,7 +36,7 @@ let FiXmlParser = class FiXmlParser extends msg_parser_1.MsgParser {
         this.definitions = this.config.definitions;
         const description = config.description;
         const me = (_a = description === null || description === void 0 ? void 0 : description.application) === null || _a === void 0 ? void 0 : _a.name;
-        this.logger = config.logFactory.logger(`${me}:FiXmlParser`);
+        this.logger = config.logFactory.logger(`${me}:FiXmlParser`, { component: 'FixmlParser', app: me });
         this.saxStream = require('sax').createStream(true, {});
         this.locations = new tags_1.Tags(maxMessageLocations);
         this.logger.info('subscribe to stream');

package/dist/buffer/fixml/fixml-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"fixml-parser.js","sourceRoot":"","sources":["../../../src/buffer/fixml/fixml-parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { MsgParser } from '../msg-parser'\nimport { Tags } from '../tag/tags'\nimport { SAXStream } from '../../dictionary'\nimport { FixDefinitions, MessageDefinition } from '../../dictionary/definition'\nimport {\n  ContainedField, ContainedComponentField,\n  ContainedFieldType, ContainedGroupField,\n  ContainedSimpleField, IContainedSet\n} from '../../dictionary/contained'\nimport { SegmentDescription } from '../segment/segment-description'\nimport { IJsFixConfig, IJsFixLogger } from '../../config'\nimport { MsgView } from '../msg-view'\nimport { Structure } from '../structure'\nimport { FixmlView } from './fixml-view'\nimport { Readable } from 'stream'\nimport { inject, injectable } from 'tsyringe'\nimport { DITokens } from '../../runtime/di-tokens'\nimport { ISaxNode } from '../../dictionary/sax-node'\nimport { SegmentType } from '../segment/segment-type'\n\n@injectable()\nexport class FiXmlParser extends MsgParser {\n  private readonly locations: Tags\n  private values: string[] = []\n  private readonly saxStream: SAXStream\n  private readonly definitions: FixDefinitions\n  private readonly segments: SegmentDescription[] = []\n  private readonly segmentStack: SegmentDescription[] = []\n  private readonly logger: IJsFixLogger\n  private last: SegmentDescription | null\n  private raw: string | null\n\n  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig,\n    @inject(DITokens.readStream) public readonly readStream: Readable,\n    @inject(DITokens.maxMessageLocations) public readonly maxMessageLocations: number = 10 * 1024) {\n    super()\n    this.definitions = this.config.definitions\n    const description = config.description\n    const me = description?.application?.name\n    this.logger = config.logFactory.logger(`${me}:FiXmlParser`)\n    this.saxStream = require('sax').createStream(true, {})\n    this.locations = new Tags(maxMessageLocations)\n    this.logger.info('subscribe to stream')\n    this.subscribe()\n  }\n\n  private reset (): void {\n    const segments = this.segments\n    while (segments.length > 0) {\n      segments.pop()\n    }\n    const stack = this.segmentStack\n    this.last = null\n    this.raw = null\n    this.values = []\n    this.locations.reset()\n    while (stack.length) {\n      stack.pop()\n    }\n  }\n\n  private subscribe (): void {\n    const writeStream = this.saxStream\n    const readStream = this.readStream\n    const instance = this\n    readStream.pipe(writeStream).on('ready', () => {\n      this.logger.info('stream close event')\n      this.emit('close')\n    })\n    readStream.on('error', (e) => {\n      this.logger.error(e)\n      this.emit('error', e)\n    })\n    readStream.on('end', () => {\n      this.logger.info('stream end event')\n      this.emit('end')\n    })\n    writeStream.on('data', (i: Buffer) => {\n      if (instance.last) {\n        instance.emit('decoded', instance.last.name, i.toString())\n      } else {\n        this.raw = i.toString()\n      }\n    })\n\n    writeStream.on('opentag', (node) => {\n      const stack = this.segmentStack\n      const saxNode: ISaxNode = node as ISaxNode\n      switch (saxNode.name) {\n        case 'FIXML':\n          this.reset()\n          break\n\n        case 'Batch': {\n          const locations = this.locations\n          const ptr = locations.nextTagPos - 1\n          const segment: SegmentDescription = new SegmentDescription(saxNode.name,\n            -1,\n            null,\n            ptr,\n            stack.length,\n            SegmentType.Batch)\n          segment.startPosition = 0\n          stack.push(segment)\n          break\n        }\n\n        case 'Hdr': {\n          this.hdr(saxNode)\n          break\n        }\n\n        default: {\n          const stack = this.segmentStack\n          const isBatch: boolean = stack.length === 1 && stack[0].type === SegmentType.Batch\n          const isMsg: boolean = stack.length === 0\n          if (isMsg) {\n            // one single message\n            this.msg(saxNode)\n          } else if (isBatch) {\n            // one message within a batch or it\n            this.msgInBatch(saxNode)\n          } else {\n            // or it is a structure within a message\n            this.element(saxNode)\n          }\n        }\n      }\n    })\n    writeStream.on('closetag', (name: string) => {\n      this.pop(name)\n    })\n    writeStream.on('error', (e: Error) => {\n      this.emit('error', e)\n    })\n  }\n\n  private hdr (saxNode: ISaxNode): void {\n    const stack = this.segmentStack\n    if (stack.length === 0) {\n      throw new Error(`Hdr not expected before batch or message ${saxNode.name}`)\n    }\n    const peek: SegmentDescription = stack[stack.length - 1]\n    switch (peek.type) {\n      case SegmentType.Batch: {\n        // manually handle this component\n        const hdr = this.definitions.component.get('StandardHeader')\n        if (hdr) {\n          const segment: SegmentDescription | null = this.parseAttributes(saxNode.name, hdr, saxNode, SegmentType.Component)\n          if (segment) {\n            this.segmentStack.push(segment)\n          }\n        }\n        break\n      }\n\n      case SegmentType.Msg: {\n        this.element(saxNode)\n        break\n      }\n\n      default:\n        throw new Error(`Hdr not expected before batch or message ${saxNode.name}`)\n    }\n  }\n\n  private msgInBatch (saxNode: ISaxNode): void {\n    this.logger.info(` ${saxNode.name}: start batch`)\n    const locations = this.locations\n    const batch = this.segmentStack[0]\n    const ptr = locations.nextTagPos\n    if (!batch.delimiterPositions) {\n      batch.startGroup(-1)\n    }\n    batch.addDelimiterPosition(ptr)\n    this.logger.debug(` ${saxNode.name}: begin parse msg ${batch.delimiterPositions.length} in batch`)\n    this.msg(saxNode, true)\n  }\n\n  private getView (): MsgView {\n    const structure: Structure = new Structure(this.locations, this.segments)\n    const last = structure.segments[structure.segments.length - 1]\n    return new FixmlView(this.definitions, last, this.values, structure)\n  }\n\n  private pop (name: string): SegmentDescription | null {\n    const locations = this.locations\n    const stack = this.segmentStack\n    const segments = this.segments\n    while (stack.length > 0) {\n      const pop = stack.pop()\n      const ptr = locations.nextTagPos - 1\n      pop?.end(segments.length, ptr, locations.tagPos[ptr].tag)\n      if (pop) {\n        segments[segments.length] = pop\n        switch (pop.type) {\n          case SegmentType.Msg: {\n            // raise msg event\n            const last = segments[segments.length - 1]\n            this.last = last\n            this.emit('msg', last.name, this.getView())\n            if (this.raw) {\n              this.emit('decoded', this.last.name, this.raw)\n              this.raw = null\n            }\n            break\n          }\n          case SegmentType.Batch: {\n            const last = segments[segments.length - 1]\n            this.logger.debug(`emit batch with ${pop.delimiterPositions.length} elements`)\n            this.emit('batch', last?.set?.abbreviation, this.getView())\n            break\n          }\n        }\n        if (pop.name === name) {\n          return pop\n        }\n      }\n    }\n    return null\n  }\n\n  private startGroup (saxNode: ISaxNode, gf: ContainedGroupField): void {\n    const locations = this.locations\n    const stack: SegmentDescription[] = this.segmentStack\n    const ptr = locations.nextTagPos\n    const def = gf.definition\n    const segment: SegmentDescription | null = this.parseAttributes(saxNode.name, def, saxNode, SegmentType.Component)\n    if (segment) {\n      const group: SegmentDescription = new SegmentDescription(def.name,\n        locations.tagPos[ptr].tag,\n        def,\n        ptr,\n        stack.length,\n        SegmentType.Group)\n      group.startGroup(locations.tagPos[ptr].tag)\n      group.addDelimiterPosition(ptr)\n      stack.push(group)\n      stack.push(segment)\n    }\n  }\n\n  private getNextField (saxNode: ISaxNode): ContainedField | null {\n    const stack: SegmentDescription[] = this.segmentStack\n    while (stack.length > 0) {\n      const peek: SegmentDescription = stack[stack.length - 1]\n      const field = peek?.set?.localNameToField.get(saxNode.name)\n      if (field) {\n        return field\n      }\n      // if this is a group of the same type as already on stack\n      // take the field from the next level up\n      if (peek.type === SegmentType.Group && stack.length > 1) {\n        const contained = stack[stack.length - 2]?.set?.localNameToField.get(saxNode.name)\n        if (contained instanceof ContainedGroupField) {\n          if (contained.definition.name === peek.name) {\n            // this is the same type for next instance in the same group.\n            return contained\n          }\n        }\n      }\n      // then have ended previous group. Pop and return to see if this field lives on the parent\n      const locations = this.locations\n      const ptr = locations.nextTagPos - 1\n      const pop = stack.pop()\n      const segments = this.segments\n      if (pop) {\n        pop.end(segments.length, ptr, locations.tagPos[ptr].tag)\n        segments[segments.length] = pop\n      }\n    }\n    return null\n  }\n\n  private dispatch (saxNode: ISaxNode, field: ContainedField): void {\n    switch (field.type) {\n      case ContainedFieldType.Component: {\n        const cf: ContainedComponentField = field as ContainedComponentField\n        const segment: SegmentDescription | null = this.parseAttributes(saxNode.name, cf.definition, saxNode, SegmentType.Component)\n        if (segment) {\n          this.segmentStack.push(segment)\n        }\n        break\n      }\n\n      case ContainedFieldType.Group: {\n        this.dispatchGroup(saxNode, field as ContainedGroupField)\n        break\n      }\n    }\n  }\n\n  private dispatchGroup (saxNode: ISaxNode, gf: ContainedGroupField): void {\n    const stack: SegmentDescription[] = this.segmentStack\n    const peek: SegmentDescription = stack[stack.length - 1]\n    switch (peek.type) {\n      case SegmentType.Msg:\n      case SegmentType.Component: {\n        this.startGroup(saxNode, gf)\n        break\n      }\n\n      case SegmentType.Group: {\n        if (gf.name === saxNode.name) {\n          const ptr = this.locations.nextTagPos\n          peek.addDelimiterPosition(ptr)\n          const a = this.parseAttributes(saxNode.name, gf.definition, saxNode, SegmentType.Component)\n          if (a) {\n            stack.push(a)\n          }\n        } else {\n          throw new Error(`expected another group instance of ${gf.name} but got ${saxNode.name}`)\n        }\n        break\n      }\n\n      default:\n        throw new Error(`dispatchGroup has field ${gf.name} peek type ${peek.type}`)\n    }\n  }\n\n  private element (saxNode: ISaxNode): void {\n    // may terminate a group and move fields\n    const field = this.getNextField(saxNode)\n    if (!field) {\n      const stack: SegmentDescription[] = this.segmentStack\n      const peek: SegmentDescription = stack[stack.length - 1]\n      throw new Error(`field ${saxNode.name} not known in set ${peek?.set?.name}`)\n    }\n    this.dispatch(saxNode, field)\n  }\n\n  private msg (saxNode: ISaxNode, inBatch: boolean = false): void {\n    this.logger.debug(`${saxNode.name}: begin parse msg`)\n    const type: string = saxNode.name\n    const def: MessageDefinition | undefined = this.definitions.message.get(type)\n    if (!def) {\n      throw new Error(`unknown message type ${type}`)\n    }\n    if (inBatch) {\n      const batch = this.segmentStack[0]\n      batch.set = def\n    }\n    const segment: SegmentDescription | null = this.parseAttributes(type, def, saxNode, SegmentType.Msg)\n    if (segment) {\n      this.segmentStack.push(segment)\n    }\n  }\n\n  private parseAttributes (name: string, set: IContainedSet, saxNode: ISaxNode, type: SegmentType): SegmentDescription | null {\n    const locations = this.locations\n    const attributes = saxNode.attributes\n    const values = this.values\n    let ptr: number\n    if (attributes) {\n      const keys: string[] = Object.keys(attributes)\n      ptr = keys.length > 0 ? locations.nextTagPos : locations.nextTagPos - 1\n      for (let j: number = 0; j < keys.length; ++j) {\n        const k: string = keys[j]\n        const v: string = attributes[k]\n        const field: ContainedSimpleField = set.localNameToField.get(k) as ContainedSimpleField\n        if (!field) {\n          this.logger.warning(`no field ${k} in set ${set.name}`)\n          locations.store(j, 1, -1)\n        } else {\n          locations.store(j, 1, field.definition.tag)\n        }\n        values[values.length] = v\n      }\n      return new SegmentDescription(name, locations.tagPos[ptr].tag, set, ptr, this.segmentStack.length, type)\n    }\n    return null\n  }\n}\n"]}
+{"version":3,"file":"fixml-parser.js","sourceRoot":"","sources":["../../../src/buffer/fixml/fixml-parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { MsgParser } from '../msg-parser'\nimport { Tags } from '../tag/tags'\nimport { SAXStream } from '../../dictionary'\nimport { FixDefinitions, MessageDefinition } from '../../dictionary/definition'\nimport {\n  ContainedField, ContainedComponentField,\n  ContainedFieldType, ContainedGroupField,\n  ContainedSimpleField, IContainedSet\n} from '../../dictionary/contained'\nimport { SegmentDescription } from '../segment/segment-description'\nimport { IJsFixConfig, IJsFixLogger } from '../../config'\nimport { MsgView } from '../msg-view'\nimport { Structure } from '../structure'\nimport { FixmlView } from './fixml-view'\nimport { Readable } from 'stream'\nimport { inject, injectable } from 'tsyringe'\nimport { DITokens } from '../../runtime/di-tokens'\nimport { ISaxNode } from '../../dictionary/sax-node'\nimport { SegmentType } from '../segment/segment-type'\n\n@injectable()\nexport class FiXmlParser extends MsgParser {\n  private readonly locations: Tags\n  private values: string[] = []\n  private readonly saxStream: SAXStream\n  private readonly definitions: FixDefinitions\n  private readonly segments: SegmentDescription[] = []\n  private readonly segmentStack: SegmentDescription[] = []\n  private readonly logger: IJsFixLogger\n  private last: SegmentDescription | null\n  private raw: string | null\n\n  constructor (@inject(DITokens.IJsFixConfig) public readonly config: IJsFixConfig,\n    @inject(DITokens.readStream) public readonly readStream: Readable,\n    @inject(DITokens.maxMessageLocations) public readonly maxMessageLocations: number = 10 * 1024) {\n    super()\n    this.definitions = this.config.definitions\n    const description = config.description\n    const me = description?.application?.name\n    this.logger = config.logFactory.logger(`${me}:FiXmlParser`, { component: 'FixmlParser', app: me })\n    this.saxStream = require('sax').createStream(true, {})\n    this.locations = new Tags(maxMessageLocations)\n    this.logger.info('subscribe to stream')\n    this.subscribe()\n  }\n\n  private reset (): void {\n    const segments = this.segments\n    while (segments.length > 0) {\n      segments.pop()\n    }\n    const stack = this.segmentStack\n    this.last = null\n    this.raw = null\n    this.values = []\n    this.locations.reset()\n    while (stack.length) {\n      stack.pop()\n    }\n  }\n\n  private subscribe (): void {\n    const writeStream = this.saxStream\n    const readStream = this.readStream\n    const instance = this\n    readStream.pipe(writeStream).on('ready', () => {\n      this.logger.info('stream close event')\n      this.emit('close')\n    })\n    readStream.on('error', (e) => {\n      this.logger.error(e)\n      this.emit('error', e)\n    })\n    readStream.on('end', () => {\n      this.logger.info('stream end event')\n      this.emit('end')\n    })\n    writeStream.on('data', (i: Buffer) => {\n      if (instance.last) {\n        instance.emit('decoded', instance.last.name, i.toString())\n      } else {\n        this.raw = i.toString()\n      }\n    })\n\n    writeStream.on('opentag', (node) => {\n      const stack = this.segmentStack\n      const saxNode: ISaxNode = node as ISaxNode\n      switch (saxNode.name) {\n        case 'FIXML':\n          this.reset()\n          break\n\n        case 'Batch': {\n          const locations = this.locations\n          const ptr = locations.nextTagPos - 1\n          const segment: SegmentDescription = new SegmentDescription(saxNode.name,\n            -1,\n            null,\n            ptr,\n            stack.length,\n            SegmentType.Batch)\n          segment.startPosition = 0\n          stack.push(segment)\n          break\n        }\n\n        case 'Hdr': {\n          this.hdr(saxNode)\n          break\n        }\n\n        default: {\n          const stack = this.segmentStack\n          const isBatch: boolean = stack.length === 1 && stack[0].type === SegmentType.Batch\n          const isMsg: boolean = stack.length === 0\n          if (isMsg) {\n            // one single message\n            this.msg(saxNode)\n          } else if (isBatch) {\n            // one message within a batch or it\n            this.msgInBatch(saxNode)\n          } else {\n            // or it is a structure within a message\n            this.element(saxNode)\n          }\n        }\n      }\n    })\n    writeStream.on('closetag', (name: string) => {\n      this.pop(name)\n    })\n    writeStream.on('error', (e: Error) => {\n      this.emit('error', e)\n    })\n  }\n\n  private hdr (saxNode: ISaxNode): void {\n    const stack = this.segmentStack\n    if (stack.length === 0) {\n      throw new Error(`Hdr not expected before batch or message ${saxNode.name}`)\n    }\n    const peek: SegmentDescription = stack[stack.length - 1]\n    switch (peek.type) {\n      case SegmentType.Batch: {\n        // manually handle this component\n        const hdr = this.definitions.component.get('StandardHeader')\n        if (hdr) {\n          const segment: SegmentDescription | null = this.parseAttributes(saxNode.name, hdr, saxNode, SegmentType.Component)\n          if (segment) {\n            this.segmentStack.push(segment)\n          }\n        }\n        break\n      }\n\n      case SegmentType.Msg: {\n        this.element(saxNode)\n        break\n      }\n\n      default:\n        throw new Error(`Hdr not expected before batch or message ${saxNode.name}`)\n    }\n  }\n\n  private msgInBatch (saxNode: ISaxNode): void {\n    this.logger.info(` ${saxNode.name}: start batch`)\n    const locations = this.locations\n    const batch = this.segmentStack[0]\n    const ptr = locations.nextTagPos\n    if (!batch.delimiterPositions) {\n      batch.startGroup(-1)\n    }\n    batch.addDelimiterPosition(ptr)\n    this.logger.debug(` ${saxNode.name}: begin parse msg ${batch.delimiterPositions.length} in batch`)\n    this.msg(saxNode, true)\n  }\n\n  private getView (): MsgView {\n    const structure: Structure = new Structure(this.locations, this.segments)\n    const last = structure.segments[structure.segments.length - 1]\n    return new FixmlView(this.definitions, last, this.values, structure)\n  }\n\n  private pop (name: string): SegmentDescription | null {\n    const locations = this.locations\n    const stack = this.segmentStack\n    const segments = this.segments\n    while (stack.length > 0) {\n      const pop = stack.pop()\n      const ptr = locations.nextTagPos - 1\n      pop?.end(segments.length, ptr, locations.tagPos[ptr].tag)\n      if (pop) {\n        segments[segments.length] = pop\n        switch (pop.type) {\n          case SegmentType.Msg: {\n            // raise msg event\n            const last = segments[segments.length - 1]\n            this.last = last\n            this.emit('msg', last.name, this.getView())\n            if (this.raw) {\n              this.emit('decoded', this.last.name, this.raw)\n              this.raw = null\n            }\n            break\n          }\n          case SegmentType.Batch: {\n            const last = segments[segments.length - 1]\n            this.logger.debug(`emit batch with ${pop.delimiterPositions.length} elements`)\n            this.emit('batch', last?.set?.abbreviation, this.getView())\n            break\n          }\n        }\n        if (pop.name === name) {\n          return pop\n        }\n      }\n    }\n    return null\n  }\n\n  private startGroup (saxNode: ISaxNode, gf: ContainedGroupField): void {\n    const locations = this.locations\n    const stack: SegmentDescription[] = this.segmentStack\n    const ptr = locations.nextTagPos\n    const def = gf.definition\n    const segment: SegmentDescription | null = this.parseAttributes(saxNode.name, def, saxNode, SegmentType.Component)\n    if (segment) {\n      const group: SegmentDescription = new SegmentDescription(def.name,\n        locations.tagPos[ptr].tag,\n        def,\n        ptr,\n        stack.length,\n        SegmentType.Group)\n      group.startGroup(locations.tagPos[ptr].tag)\n      group.addDelimiterPosition(ptr)\n      stack.push(group)\n      stack.push(segment)\n    }\n  }\n\n  private getNextField (saxNode: ISaxNode): ContainedField | null {\n    const stack: SegmentDescription[] = this.segmentStack\n    while (stack.length > 0) {\n      const peek: SegmentDescription = stack[stack.length - 1]\n      const field = peek?.set?.localNameToField.get(saxNode.name)\n      if (field) {\n        return field\n      }\n      // if this is a group of the same type as already on stack\n      // take the field from the next level up\n      if (peek.type === SegmentType.Group && stack.length > 1) {\n        const contained = stack[stack.length - 2]?.set?.localNameToField.get(saxNode.name)\n        if (contained instanceof ContainedGroupField) {\n          if (contained.definition.name === peek.name) {\n            // this is the same type for next instance in the same group.\n            return contained\n          }\n        }\n      }\n      // then have ended previous group. Pop and return to see if this field lives on the parent\n      const locations = this.locations\n      const ptr = locations.nextTagPos - 1\n      const pop = stack.pop()\n      const segments = this.segments\n      if (pop) {\n        pop.end(segments.length, ptr, locations.tagPos[ptr].tag)\n        segments[segments.length] = pop\n      }\n    }\n    return null\n  }\n\n  private dispatch (saxNode: ISaxNode, field: ContainedField): void {\n    switch (field.type) {\n      case ContainedFieldType.Component: {\n        const cf: ContainedComponentField = field as ContainedComponentField\n        const segment: SegmentDescription | null = this.parseAttributes(saxNode.name, cf.definition, saxNode, SegmentType.Component)\n        if (segment) {\n          this.segmentStack.push(segment)\n        }\n        break\n      }\n\n      case ContainedFieldType.Group: {\n        this.dispatchGroup(saxNode, field as ContainedGroupField)\n        break\n      }\n    }\n  }\n\n  private dispatchGroup (saxNode: ISaxNode, gf: ContainedGroupField): void {\n    const stack: SegmentDescription[] = this.segmentStack\n    const peek: SegmentDescription = stack[stack.length - 1]\n    switch (peek.type) {\n      case SegmentType.Msg:\n      case SegmentType.Component: {\n        this.startGroup(saxNode, gf)\n        break\n      }\n\n      case SegmentType.Group: {\n        if (gf.name === saxNode.name) {\n          const ptr = this.locations.nextTagPos\n          peek.addDelimiterPosition(ptr)\n          const a = this.parseAttributes(saxNode.name, gf.definition, saxNode, SegmentType.Component)\n          if (a) {\n            stack.push(a)\n          }\n        } else {\n          throw new Error(`expected another group instance of ${gf.name} but got ${saxNode.name}`)\n        }\n        break\n      }\n\n      default:\n        throw new Error(`dispatchGroup has field ${gf.name} peek type ${peek.type}`)\n    }\n  }\n\n  private element (saxNode: ISaxNode): void {\n    // may terminate a group and move fields\n    const field = this.getNextField(saxNode)\n    if (!field) {\n      const stack: SegmentDescription[] = this.segmentStack\n      const peek: SegmentDescription = stack[stack.length - 1]\n      throw new Error(`field ${saxNode.name} not known in set ${peek?.set?.name}`)\n    }\n    this.dispatch(saxNode, field)\n  }\n\n  private msg (saxNode: ISaxNode, inBatch: boolean = false): void {\n    this.logger.debug(`${saxNode.name}: begin parse msg`)\n    const type: string = saxNode.name\n    const def: MessageDefinition | undefined = this.definitions.message.get(type)\n    if (!def) {\n      throw new Error(`unknown message type ${type}`)\n    }\n    if (inBatch) {\n      const batch = this.segmentStack[0]\n      batch.set = def\n    }\n    const segment: SegmentDescription | null = this.parseAttributes(type, def, saxNode, SegmentType.Msg)\n    if (segment) {\n      this.segmentStack.push(segment)\n    }\n  }\n\n  private parseAttributes (name: string, set: IContainedSet, saxNode: ISaxNode, type: SegmentType): SegmentDescription | null {\n    const locations = this.locations\n    const attributes = saxNode.attributes\n    const values = this.values\n    let ptr: number\n    if (attributes) {\n      const keys: string[] = Object.keys(attributes)\n      ptr = keys.length > 0 ? locations.nextTagPos : locations.nextTagPos - 1\n      for (let j: number = 0; j < keys.length; ++j) {\n        const k: string = keys[j]\n        const v: string = attributes[k]\n        const field: ContainedSimpleField = set.localNameToField.get(k) as ContainedSimpleField\n        if (!field) {\n          this.logger.warning(`no field ${k} in set ${set.name}`)\n          locations.store(j, 1, -1)\n        } else {\n          locations.store(j, 1, field.definition.tag)\n        }\n        values[values.length] = v\n      }\n      return new SegmentDescription(name, locations.tagPos[ptr].tag, set, ptr, this.segmentStack.length, type)\n    }\n    return null\n  }\n}\n"]}

package/dist/config/empty-log-factory.d.ts

@@ -1,6 +1,6 @@
-import { IJsFixLogger } from './js-fix-logger';
+import { IJsFixLogger, JsFixLogFields } from './js-fix-logger';
 import { JsFixLoggerFactory } from './js-fix-logger-factory';
 export declare class EmptyLogFactory extends JsFixLoggerFactory {
-    logger(type: string): IJsFixLogger;
+    logger(type: string, _?: JsFixLogFields): IJsFixLogger;
     plain(fileName: string, maxSize?: number): IJsFixLogger;
 }

package/dist/config/empty-log-factory.js

@@ -4,7 +4,7 @@ exports.EmptyLogFactory = void 0;
 const js_fix_logger_1 = require("./js-fix-logger");
 const js_fix_logger_factory_1 = require("./js-fix-logger-factory");
 class EmptyLogFactory extends js_fix_logger_factory_1.JsFixLoggerFactory {
-    logger(type) {
+    logger(type, _) {
         return new js_fix_logger_1.EmptyLogger(type);
     }
     plain(fileName, maxSize) {

package/dist/config/empty-log-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"empty-log-factory.js","sourceRoot":"","sources":["../../src/config/empty-log-factory.ts"],"names":[],"mappings":";;;AAAA,mDAA2D;AAC3D,mEAA4D;AAE5D,MAAa,eAAgB,SAAQ,0CAAkB;IAC9C,MAAM,CAAE,IAAY;QACzB,OAAO,IAAI,2BAAW,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAEM,KAAK,CAAE,QAAgB,EAAE,OAAgB;QAC9C,OAAO,IAAI,2BAAW,EAAE,CAAA;IAC1B,CAAC;CACF;AARD,0CAQC","sourcesContent":["import { EmptyLogger, IJsFixLogger } from './js-fix-logger'\nimport { JsFixLoggerFactory } from './js-fix-logger-factory'\n\nexport class EmptyLogFactory extends JsFixLoggerFactory {\n  public logger (type: string): IJsFixLogger {\n    return new EmptyLogger(type)\n  }\n\n  public plain (fileName: string, maxSize?: number): IJsFixLogger {\n    return new EmptyLogger()\n  }\n}\n"]}
+{"version":3,"file":"empty-log-factory.js","sourceRoot":"","sources":["../../src/config/empty-log-factory.ts"],"names":[],"mappings":";;;AAAA,mDAA2E;AAC3E,mEAA4D;AAE5D,MAAa,eAAgB,SAAQ,0CAAkB;IAC9C,MAAM,CAAE,IAAY,EAAE,CAAkB;QAC7C,OAAO,IAAI,2BAAW,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAEM,KAAK,CAAE,QAAgB,EAAE,OAAgB;QAC9C,OAAO,IAAI,2BAAW,EAAE,CAAA;IAC1B,CAAC;CACF;AARD,0CAQC","sourcesContent":["import { EmptyLogger, IJsFixLogger, JsFixLogFields } from './js-fix-logger'\nimport { JsFixLoggerFactory } from './js-fix-logger-factory'\n\nexport class EmptyLogFactory extends JsFixLoggerFactory {\n  public logger (type: string, _?: JsFixLogFields): IJsFixLogger {\n    return new EmptyLogger(type)\n  }\n\n  public plain (fileName: string, maxSize?: number): IJsFixLogger {\n    return new EmptyLogger()\n  }\n}\n"]}

package/dist/config/get-js-fx-logger.d.ts

@@ -1,2 +1,2 @@
-import { IJsFixLogger } from './js-fix-logger';
-export type GetJsFixLogger = (type: string) => IJsFixLogger;
+import { IJsFixLogger, JsFixLogFields } from './js-fix-logger';
+export type GetJsFixLogger = (type: string, context?: JsFixLogFields) => IJsFixLogger;

package/dist/config/get-js-fx-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-js-fx-logger.js","sourceRoot":"","sources":["../../src/config/get-js-fx-logger.ts"],"names":[],"mappings":"","sourcesContent":["import { IJsFixLogger } from './js-fix-logger'\n\nexport type GetJsFixLogger = (type: string) => IJsFixLogger\n"]}
+{"version":3,"file":"get-js-fx-logger.js","sourceRoot":"","sources":["../../src/config/get-js-fx-logger.ts"],"names":[],"mappings":"","sourcesContent":["import { IJsFixLogger, JsFixLogFields } from './js-fix-logger'\n\nexport type GetJsFixLogger = (type: string, context?: JsFixLogFields) => IJsFixLogger\n"]}

package/dist/config/js-fix-logger-factory.d.ts

@@ -1,5 +1,5 @@
-import { IJsFixLogger } from './js-fix-logger';
+import { IJsFixLogger, JsFixLogFields } from './js-fix-logger';
 export declare abstract class JsFixLoggerFactory {
-    abstract logger(type: string): IJsFixLogger;
+    abstract logger(type: string, context?: JsFixLogFields): IJsFixLogger;
     abstract plain(fileName: string, maxSize?: number): IJsFixLogger;
 }

package/dist/config/js-fix-logger-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-fix-logger-factory.js","sourceRoot":"","sources":["../../src/config/js-fix-logger-factory.ts"],"names":[],"mappings":";;;AAEA,MAAsB,kBAAkB;CAGvC;AAHD,gDAGC","sourcesContent":["import { IJsFixLogger } from './js-fix-logger'\n\nexport abstract class JsFixLoggerFactory {\n  public abstract logger (type: string): IJsFixLogger\n  public abstract plain (fileName: string, maxSize?: number): IJsFixLogger\n}\n"]}
+{"version":3,"file":"js-fix-logger-factory.js","sourceRoot":"","sources":["../../src/config/js-fix-logger-factory.ts"],"names":[],"mappings":";;;AAEA,MAAsB,kBAAkB;CASvC;AATD,gDASC","sourcesContent":["import { IJsFixLogger, JsFixLogFields } from './js-fix-logger'\n\nexport abstract class JsFixLoggerFactory {\n  /**\n   * @param type the legacy display name, e.g. 'me:peer:FixSession'.  it is what the\n   * console format renders between brackets, so it is passed verbatim and unchanged\n   * @param context fields bound to every line this logger writes.  an implementation\n   * written before this argument existed keeps compiling and simply ignores it\n   */\n  public abstract logger (type: string, context?: JsFixLogFields): IJsFixLogger\n  public abstract plain (fileName: string, maxSize?: number): IJsFixLogger\n}\n"]}

package/dist/config/js-fix-logger.d.ts

@@ -1,15 +1,16 @@
+export type JsFixLogFields = Record<string, unknown>;
 export interface IJsFixLogger {
-    info: (message: string) => void;
-    warning: (message: string) => void;
-    debug: (message: string) => void;
-    error: (e: Error) => void;
+    info: (message: string, fields?: JsFixLogFields) => void;
+    warning: (message: string, fields?: JsFixLogFields) => void;
+    debug: (message: string, fields?: JsFixLogFields) => void;
+    error: (e: Error, fields?: JsFixLogFields) => void;
 }
 export declare class EmptyLogger implements IJsFixLogger {
     readonly type: string;
     constructor(type?: string);
-    info(_: string): void;
-    warning(_: string): void;
-    debug(_: string): void;
-    error(_: Error): void;
+    info(_: string, __?: JsFixLogFields): void;
+    warning(_: string, __?: JsFixLogFields): void;
+    debug(_: string, __?: JsFixLogFields): void;
+    error(_: Error, __?: JsFixLogFields): void;
 }
 export declare function makeEmptyLogger(type: string): IJsFixLogger;

package/dist/config/js-fix-logger.js

@@ -6,13 +6,13 @@ class EmptyLogger {
     constructor(type = '') {
         this.type = type;
     }
-    info(_) {
+    info(_, __) {
     }
-    warning(_) {
+    warning(_, __) {
     }
-    debug(_) {
+    debug(_, __) {
     }
-    error(_) {
+    error(_, __) {
     }
 }
 exports.EmptyLogger = EmptyLogger;

package/dist/config/js-fix-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-fix-logger.js","sourceRoot":"","sources":["../../src/config/js-fix-logger.ts"],"names":[],"mappings":";;;AA4BA,0CAEC;AAvBD,MAAa,WAAW;IACtB,YAA6B,OAAe,EAAE;QAAjB,SAAI,GAAJ,IAAI,CAAa;IAC9C,CAAC;IAEM,IAAI,CAAE,CAAS;IAEtB,CAAC;IAEM,OAAO,CAAE,CAAS;IAEzB,CAAC;IAEM,KAAK,CAAE,CAAS;IAEvB,CAAC;IAEM,KAAK,CAAE,CAAQ;IAEtB,CAAC;CACF;AAnBD,kCAmBC;AAED,SAAgB,eAAe,CAAE,IAAY;IAC3C,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAA;AAC9B,CAAC","sourcesContent":["export interface IJsFixLogger {\n  info: (message: string) => void\n  warning: (message: string) => void\n  debug: (message: string) => void\n  error: (e: Error) => void\n}\n\nexport class EmptyLogger implements IJsFixLogger {\n  constructor (public readonly type: string = '') {\n  }\n\n  public info (_: string): void {\n    // nothing\n  }\n\n  public warning (_: string): void {\n    // nothing\n  }\n\n  public debug (_: string): void {\n    // nothing\n  }\n\n  public error (_: Error): void {\n    // nothing\n  }\n}\n\nexport function makeEmptyLogger (type: string): IJsFixLogger {\n  return new EmptyLogger(type)\n}\n"]}
+{"version":3,"file":"js-fix-logger.js","sourceRoot":"","sources":["../../src/config/js-fix-logger.ts"],"names":[],"mappings":";;;AA2CA,0CAEC;AAvBD,MAAa,WAAW;IACtB,YAA6B,OAAe,EAAE;QAAjB,SAAI,GAAJ,IAAI,CAAa;IAC9C,CAAC;IAEM,IAAI,CAAE,CAAS,EAAE,EAAmB;IAE3C,CAAC;IAEM,OAAO,CAAE,CAAS,EAAE,EAAmB;IAE9C,CAAC;IAEM,KAAK,CAAE,CAAS,EAAE,EAAmB;IAE5C,CAAC;IAEM,KAAK,CAAE,CAAQ,EAAE,EAAmB;IAE3C,CAAC;CACF;AAnBD,kCAmBC;AAED,SAAgB,eAAe,CAAE,IAAY;IAC3C,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAA;AAC9B,CAAC","sourcesContent":["/**\n * structured fields carried alongside a log message.\n *\n * two kinds travel through the same shape.  *context* is bound once when a logger is made\n * and repeats on every line it writes - the component, the application, the counterparty.\n * *fields* are supplied per call and carry a value worth aggregating on - a msgType, a\n * sequence number, a byte count.\n *\n * they are deliberately kept as a bag rather than spread into the log record, so a caller\n * passing { message: ... } cannot clobber the real message, and so the choice of how to\n * render them belongs to the formatter rather than the engine.  see\n * docs/instrumentation.md.\n */\nexport type JsFixLogFields = Record<string, unknown>\n\nexport interface IJsFixLogger {\n  info: (message: string, fields?: JsFixLogFields) => void\n  warning: (message: string, fields?: JsFixLogFields) => void\n  debug: (message: string, fields?: JsFixLogFields) => void\n  error: (e: Error, fields?: JsFixLogFields) => void\n}\n\nexport class EmptyLogger implements IJsFixLogger {\n  constructor (public readonly type: string = '') {\n  }\n\n  public info (_: string, __?: JsFixLogFields): void {\n    // nothing\n  }\n\n  public warning (_: string, __?: JsFixLogFields): void {\n    // nothing\n  }\n\n  public debug (_: string, __?: JsFixLogFields): void {\n    // nothing\n  }\n\n  public error (_: Error, __?: JsFixLogFields): void {\n    // nothing\n  }\n}\n\nexport function makeEmptyLogger (type: string): IJsFixLogger {\n  return new EmptyLogger(type)\n}\n"]}

package/dist/config/js-fix-winston-log-factory.d.ts

@@ -1,9 +1,9 @@
-import { IJsFixLogger } from './js-fix-logger';
+import { IJsFixLogger, JsFixLogFields } from './js-fix-logger';
 import { JsFixLoggerFactory } from './js-fix-logger-factory';
 export declare class JsFixWinstonLogFactory extends JsFixLoggerFactory {
     readonly options: any;
     private readonly wl;
     constructor(options?: any);
-    logger(type: string): IJsFixLogger;
+    logger(type: string, context?: JsFixLogFields): IJsFixLogger;
     plain(fileName: string, maxSize?: number): IJsFixLogger;
 }

package/dist/config/js-fix-winston-log-factory.js

@@ -9,8 +9,8 @@ class JsFixWinstonLogFactory extends js_fix_logger_factory_1.JsFixLoggerFactory
         this.options = options;
         this.wl = new winston_logger_1.WinstonLogger(options);
     }
-    logger(type) {
-        return this.wl.make(type);
+    logger(type, context) {
+        return this.wl.make(type, context);
     }
     plain(fileName, maxSize) {
         return this.wl.plain(fileName, maxSize);

package/dist/config/js-fix-winston-log-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"js-fix-winston-log-factory.js","sourceRoot":"","sources":["../../src/config/js-fix-winston-log-factory.ts"],"names":[],"mappings":";;;AACA,qDAAgD;AAChD,mEAA4D;AAE5D,MAAa,sBAAuB,SAAQ,0CAAkB;IAG5D,YAA6B,UAAe,8BAAa,CAAC,cAAc,EAAE;QACxE,KAAK,EAAE,CAAA;QADoB,YAAO,GAAP,OAAO,CAAsC;QAExE,IAAI,CAAC,EAAE,GAAG,IAAI,8BAAa,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAEM,MAAM,CAAE,IAAY;QACzB,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC3B,CAAC;IAEM,KAAK,CAAE,QAAgB,EAAE,OAAgB;QAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;CACF;AAfD,wDAeC","sourcesContent":["import { IJsFixLogger } from './js-fix-logger'\nimport { WinstonLogger } from './winston-logger'\nimport { JsFixLoggerFactory } from './js-fix-logger-factory'\n\nexport class JsFixWinstonLogFactory extends JsFixLoggerFactory {\n  private readonly wl: WinstonLogger\n\n  constructor (public readonly options: any = WinstonLogger.consoleOptions()) {\n    super()\n    this.wl = new WinstonLogger(options)\n  }\n\n  public logger (type: string): IJsFixLogger {\n    return this.wl.make(type)\n  }\n\n  public plain (fileName: string, maxSize?: number): IJsFixLogger {\n    return this.wl.plain(fileName, maxSize)\n  }\n}\n"]}
+{"version":3,"file":"js-fix-winston-log-factory.js","sourceRoot":"","sources":["../../src/config/js-fix-winston-log-factory.ts"],"names":[],"mappings":";;;AACA,qDAAgD;AAChD,mEAA4D;AAE5D,MAAa,sBAAuB,SAAQ,0CAAkB;IAG5D,YAA6B,UAAe,8BAAa,CAAC,cAAc,EAAE;QACxE,KAAK,EAAE,CAAA;QADoB,YAAO,GAAP,OAAO,CAAsC;QAExE,IAAI,CAAC,EAAE,GAAG,IAAI,8BAAa,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAEM,MAAM,CAAE,IAAY,EAAE,OAAwB;QACnD,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACpC,CAAC;IAEM,KAAK,CAAE,QAAgB,EAAE,OAAgB;QAC9C,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;CACF;AAfD,wDAeC","sourcesContent":["import { IJsFixLogger, JsFixLogFields } from './js-fix-logger'\nimport { WinstonLogger } from './winston-logger'\nimport { JsFixLoggerFactory } from './js-fix-logger-factory'\n\nexport class JsFixWinstonLogFactory extends JsFixLoggerFactory {\n  private readonly wl: WinstonLogger\n\n  constructor (public readonly options: any = WinstonLogger.consoleOptions()) {\n    super()\n    this.wl = new WinstonLogger(options)\n  }\n\n  public logger (type: string, context?: JsFixLogFields): IJsFixLogger {\n    return this.wl.make(type, context)\n  }\n\n  public plain (fileName: string, maxSize?: number): IJsFixLogger {\n    return this.wl.plain(fileName, maxSize)\n  }\n}\n"]}

package/dist/config/winston-logger.d.ts

@@ -1,12 +1,15 @@
-import { IJsFixLogger } from './js-fix-logger';
+import { IJsFixLogger, JsFixLogFields } from './js-fix-logger';
 export declare class WinstonLogger {
     readonly options: any;
     static readonly appFormat: any;
     static readonly plainFormat: any;
+    static readonly ecsFormat: any;
     private readonly appLogger;
     constructor(options?: any);
     static consoleOptions(level?: string): any;
+    static ecsOptions(level?: string): any;
+    static ecsFileOptions(fileName: string, level?: string, maxSize?: number): any;
     static fileOptions(fileName: string, level?: string, maxSize?: number, format?: any): any;
     plain(fileName: string, maxSize?: number): IJsFixLogger;
-    make(type: string): IJsFixLogger;
+    make(type: string, context?: JsFixLogFields): IJsFixLogger;
 }

package/dist/config/winston-logger.js

@@ -17,6 +17,18 @@ class WinstonLogger {
             ]
         };
     }
+    static ecsOptions(level = 'debug') {
+        return {
+            format: combine(timestamp(), WinstonLogger.ecsFormat(), format.json()),
+            level,
+            transports: [
+                new transports.Console()
+            ]
+        };
+    }
+    static ecsFileOptions(fileName, level = 'debug', maxSize = 50 * 1024 * 1024) {
+        return WinstonLogger.fileOptions(fileName, level, maxSize, combine(timestamp(), WinstonLogger.ecsFormat(), format.json()));
+    }
     static fileOptions(fileName, level = 'debug', maxSize = 50 * 1024 * 1024, format = combine(timestamp(), WinstonLogger.appFormat)) {
         return {
             format,
@@ -60,31 +72,40 @@ class WinstonLogger {
             }
         };
     }
-    make(type) {
+    make(type, context) {
         const logger = this.appLogger;
         return {
-            info: function (msg) {
+            info: function (msg, fields) {
                 logger.info({
                     type,
-                    message: msg
+                    message: msg,
+                    context,
+                    fields
                 });
             },
-            debug: function (msg) {
+            debug: function (msg, fields) {
                 logger.debug({
                     type,
-                    message: msg
+                    message: msg,
+                    context,
+                    fields
                 });
             },
-            warning: function (msg) {
+            warning: function (msg, fields) {
                 logger.warn({
                     type,
-                    message: msg
+                    message: msg,
+                    context,
+                    fields
                 });
             },
-            error: function (e) {
+            error: function (e, fields) {
                 logger.error({
                     type,
-                    message: `${e.message} : ${e.stack}`
+                    message: `${e.message} : ${e.stack}`,
+                    err: e,
+                    context,
+                    fields
                 });
             }
         };
@@ -97,4 +118,31 @@ WinstonLogger.appFormat = printf((info) => {
 WinstonLogger.plainFormat = printf((info) => {
     return `${info.message}`;
 });
+WinstonLogger.ecsFormat = format((info) => {
+    var _a, _b;
+    const context = (_a = info.context) !== null && _a !== void 0 ? _a : {};
+    const fields = (_b = info.fields) !== null && _b !== void 0 ? _b : {};
+    const err = info.err;
+    delete info.context;
+    delete info.fields;
+    delete info.err;
+    delete info.type;
+    info['@timestamp'] = info.timestamp;
+    info['log.level'] = info.level;
+    info['service.name'] = 'jspurefix';
+    delete info.timestamp;
+    delete info.level;
+    if (err) {
+        info['error.message'] = err.message;
+        info['error.stack_trace'] = err.stack;
+        info.message = err.message;
+    }
+    for (const key of Object.keys(context)) {
+        info[`fix.${key}`] = context[key];
+    }
+    for (const key of Object.keys(fields)) {
+        info[`fix.${key}`] = fields[key];
+    }
+    return info;
+});
 //# sourceMappingURL=winston-logger.js.map

package/dist/config/winston-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../../src/config/winston-logger.ts"],"names":[],"mappings":"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","sourcesContent":["import { IJsFixLogger } from './js-fix-logger'\nimport { Logger } from 'winston'\nconst { createLogger, format, transports } = require('winston')\nconst { combine, timestamp, printf } = format\n\nexport class WinstonLogger {\n  public static readonly appFormat = printf((info: any) => {\n    return `${info.timestamp} [${info.type}] ${info.level}: ${info.message}`\n  })\n\n  public static readonly plainFormat = printf((info: any) => {\n    return `${info.message}`\n  })\n\n  private readonly appLogger: Logger\n\n  constructor (public readonly options: any = WinstonLogger.consoleOptions()) {\n    this.appLogger = createLogger(options)\n  }\n\n  public static consoleOptions (level: string = 'debug'): any {\n    return {\n      format: combine(\n        timestamp(),\n        WinstonLogger.appFormat\n      ),\n      level,\n      transports: [\n        new transports.Console()\n      ]\n    }\n  }\n\n  public static fileOptions (fileName: string, level: string = 'debug', maxSize: number = 50 * 1024 * 1024, format: any = combine(\n    timestamp(),\n    WinstonLogger.appFormat\n  )): any {\n    return {\n      format,\n      level,\n      transports: [\n        new transports.File({\n          filename: fileName,\n          maxsize: maxSize\n        })\n      ]\n    }\n  }\n\n  public plain (fileName: string, maxSize: number = 10 * 1024 * 1024): IJsFixLogger {\n    const txtLogger: Logger = createLogger({\n      format: WinstonLogger.plainFormat,\n      level: 'info',\n      transports: [\n        new transports.File({\n          filename: fileName,\n          maxsize: maxSize\n        })\n      ]\n    })\n\n    return {\n      log: function (txt: string) {\n        txtLogger.info({\n          type: 'info',\n          message: txt\n        })\n      },\n\n      info: function (msg: string): void {\n        (this as any).log(msg)\n      },\n      debug: function (msg: string): void {\n        (this as any).log(msg)\n      },\n      warning: function (msg: string): void {\n        (this as any).log(msg)\n      },\n      error: function (): void {\n        // nothing\n      }\n    } as IJsFixLogger\n  }\n\n  public make (type: string): IJsFixLogger {\n    const logger = this.appLogger\n    return {\n      info: function (msg: string): void {\n        logger.info({\n          type,\n          message: msg\n        })\n      },\n      debug: function (msg: string): void {\n        logger.debug({\n          type,\n          message: msg\n        })\n      },\n      warning: function (msg: string): void {\n        logger.warn({\n          type,\n          message: msg\n        })\n      },\n      error: function (e: Error): void {\n        logger.error({\n          type,\n          message: `${e.message} : ${e.stack}`\n        })\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"winston-logger.js","sourceRoot":"","sources":["../../src/config/winston-logger.ts"],"names":[],"mappings":"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","sourcesContent":["import { IJsFixLogger, JsFixLogFields } from './js-fix-logger'\nimport { Logger } from 'winston'\nconst { createLogger, format, transports } = require('winston')\nconst { combine, timestamp, printf } = format\n\nexport class WinstonLogger {\n  /**\n   * the format this engine has emitted since it shipped.  it names exactly four fields, so\n   * the context and fields bags added later are invisible to it and the rendered line is\n   * unchanged - which is the whole reason they travel as separate keys.  covered by a\n   * golden output test; do not widen it.\n   */\n  public static readonly appFormat = printf((info: any) => {\n    return `${info.timestamp} [${info.type}] ${info.level}: ${info.message}`\n  })\n\n  public static readonly plainFormat = printf((info: any) => {\n    return `${info.message}`\n  })\n\n  /**\n   * flattens the context and fields bags to ECS style names for Filebeat and friends.\n   *\n   * this MUST mutate info rather than return a fresh object - a new object loses\n   * Symbol.for('level') and winston then discards the record with no output and no error.\n   */\n  public static readonly ecsFormat = format((info: any) => {\n    const context = info.context ?? {}\n    const fields = info.fields ?? {}\n    const err = info.err\n    delete info.context\n    delete info.fields\n    delete info.err\n    // the legacy display name is redundant once component and app are real fields\n    delete info.type\n    info['@timestamp'] = info.timestamp\n    info['log.level'] = info.level\n    info['service.name'] = 'jspurefix'\n    delete info.timestamp\n    // winston sets its own level, and emitting it beside the ECS name puts the same\n    // value on every line twice.  the transport filters on Symbol.for('level'), not\n    // this property, so dropping it changes nothing about what gets logged\n    delete info.level\n    if (err) {\n      info['error.message'] = err.message\n      info['error.stack_trace'] = err.stack\n      // the record composed for the console carries the stack inside the message,\n      // because that is what has always been rendered there.  here the stack has a\n      // field of its own, so repeating it in the message only doubles the line\n      info.message = err.message\n    }\n    for (const key of Object.keys(context)) {\n      info[`fix.${key}`] = context[key]\n    }\n    for (const key of Object.keys(fields)) {\n      info[`fix.${key}`] = fields[key]\n    }\n    return info\n  })\n\n  private readonly appLogger: Logger\n\n  constructor (public readonly options: any = WinstonLogger.consoleOptions()) {\n    this.appLogger = createLogger(options)\n  }\n\n  public static consoleOptions (level: string = 'debug'): any {\n    return {\n      format: combine(\n        timestamp(),\n        WinstonLogger.appFormat\n      ),\n      level,\n      transports: [\n        new transports.Console()\n      ]\n    }\n  }\n\n  /**\n   * one JSON object per line, ECS style names, ready to be harvested.  opt in - the\n   * console default is deliberately left alone so an upgrade does not move anyone's logs.\n   */\n  public static ecsOptions (level: string = 'debug'): any {\n    return {\n      format: combine(\n        timestamp(),\n        WinstonLogger.ecsFormat(),\n        format.json()\n      ),\n      level,\n      transports: [\n        new transports.Console()\n      ]\n    }\n  }\n\n  public static ecsFileOptions (fileName: string, level: string = 'debug', maxSize: number = 50 * 1024 * 1024): any {\n    return WinstonLogger.fileOptions(fileName, level, maxSize, combine(\n      timestamp(),\n      WinstonLogger.ecsFormat(),\n      format.json()\n    ))\n  }\n\n  public static fileOptions (fileName: string, level: string = 'debug', maxSize: number = 50 * 1024 * 1024, format: any = combine(\n    timestamp(),\n    WinstonLogger.appFormat\n  )): any {\n    return {\n      format,\n      level,\n      transports: [\n        new transports.File({\n          filename: fileName,\n          maxsize: maxSize\n        })\n      ]\n    }\n  }\n\n  public plain (fileName: string, maxSize: number = 10 * 1024 * 1024): IJsFixLogger {\n    const txtLogger: Logger = createLogger({\n      format: WinstonLogger.plainFormat,\n      level: 'info',\n      transports: [\n        new transports.File({\n          filename: fileName,\n          maxsize: maxSize\n        })\n      ]\n    })\n\n    return {\n      log: function (txt: string) {\n        txtLogger.info({\n          type: 'info',\n          message: txt\n        })\n      },\n\n      info: function (msg: string): void {\n        (this as any).log(msg)\n      },\n      debug: function (msg: string): void {\n        (this as any).log(msg)\n      },\n      warning: function (msg: string): void {\n        (this as any).log(msg)\n      },\n      error: function (): void {\n        // nothing\n      }\n    } as IJsFixLogger\n  }\n\n  public make (type: string, context?: JsFixLogFields): IJsFixLogger {\n    const logger = this.appLogger\n    return {\n      info: function (msg: string, fields?: JsFixLogFields): void {\n        logger.info({\n          type,\n          message: msg,\n          context,\n          fields\n        })\n      },\n      debug: function (msg: string, fields?: JsFixLogFields): void {\n        logger.debug({\n          type,\n          message: msg,\n          context,\n          fields\n        })\n      },\n      warning: function (msg: string, fields?: JsFixLogFields): void {\n        logger.warn({\n          type,\n          message: msg,\n          context,\n          fields\n        })\n      },\n      error: function (e: Error, fields?: JsFixLogFields): void {\n        logger.error({\n          type,\n          // composed exactly as it always has been, so the console line does not move.\n          // the ecs format lifts error.message and error.stack_trace off err instead\n          message: `${e.message} : ${e.stack}`,\n          err: e,\n          context,\n          fields\n        })\n      }\n    }\n  }\n}\n"]}

package/dist/dictionary/fragment-safety.d.ts

@@ -0,0 +1,26 @@
+import { IContainedSet } from './contained';
+import { FixDefinitions } from './definition';
+export declare enum FragmentSafetyCode {
+    SiblingTagCollision = "sibling-tag-collision",
+    UnclaimableComponent = "unclaimable-component"
+}
+export interface IFragmentSafetyFinding {
+    readonly code: FragmentSafetyCode;
+    readonly path: string;
+    readonly set: string;
+    readonly tag: number;
+    readonly owners: string[];
+}
+export declare function describeFinding(f: IFragmentSafetyFinding): string;
+export declare class FragmentSafety {
+    private readonly findings;
+    private readonly analysed;
+    private readonly owned;
+    ownTags(set: IContainedSet): number[];
+    static analyse(definitions: FixDefinitions): IFragmentSafetyFinding[];
+    static analyseSet(set: IContainedSet, path?: string): IFragmentSafetyFinding[];
+    private walk;
+    private checkClaimable;
+    private checkSiblings;
+    private claimsOf;
+}