jspurefix 4.1.2 → 5.0.0

package/BACKPORT_PLAN.md

@@ -0,0 +1,214 @@
+# Backport Plan: C# cspurefix → TypeScript jspurefix
+
+## Background
+
+The C# dotnet core port (`~/dev/cs/cspurefix`) has accumulated significant improvements over the TypeScript version which has had no real improvements for some time. The two codebases are structurally very similar, making incremental backporting feasible. The goal is to bring the TS version up to the same quality level through careful, non-disruptive changes.
+
+A standalone demo at `~/dev/cs/purefix-standalone-demo` demonstrates the C# store/recovery working end-to-end including restart scenarios and extended soak testing.
+
+---
+
+## Phase 1: Non-Contiguous Tag Parsing (Correctness Fix)
+
+**Priority: Highest | Risk: Medium | Scope: Contained to `src/buffer/`**
+
+### Problem
+
+The TS segment parser assumes component tags appear in a contiguous block within the message body. Some brokers (discovered when using the C# engine) send messages where root-level component tags are scattered. For example, an Instrument component's tags (Symbol=55, SecurityIDSource=22, SecurityID=48) can be interleaved with non-Instrument tags (HandlInst=21, OrderQty=38, OrdType=40, Price=44, Side=54).
+
+This is valid FIX — the spec does not require component tags to be contiguous at the root level. The TS parser fails to correctly resolve these messages.
+
+### Example (from fixsim-examples.txt NewOrderSingle)
+
+```
+8=FIX.4.4|9=193|35=D|34=5|49=FIXSIMDEMO|52=20241013-14:09:45.126|56=sjames8888@gmail_com|
+11=567638644253361428000|15=GBP|21=2|22=5|38=100|40=2|44=100|48=VOD.L|54=1|55=VOD.L|
+59=0|60=20241013-14:09:45.126|388=1|10=091|
+```
+
+Instrument tags (15, 22, 48, 55) are scattered among order tags (21, 38, 40, 44, 54, 59, 60).
+
+### C# Solution
+
+| File | Purpose |
+|------|---------|
+| `PureFix.Buffer/Ascii/AsciiSegmentParser.cs` | Stack-based parser with fragment detection |
+| `PureFix.Buffer/Ascii/AsciiSegmentParser.Context.cs` | Parse state with `ExitedDepth1Components` and `FragmentedComponents` tracking |
+| `PureFix.Buffer/Ascii/TagIndex.cs` | Indexes tags for non-contiguous access via `_tagSpans` dictionary |
+| `PureFix.Buffer/Segment/SegmentView.cs` | Transparent access to scattered tags as if contiguous |
+| `PureFix.Buffer/Segment/SegmentDescription.cs` | Segment metadata with position tracking |
+
+**Algorithm:**
+
+1. **Discovery**: Stack-based recursive descent through tags. When a depth-1 component is popped from the stack, it's added to `ExitedDepth1Components`.
+2. **Fragment Detection**: If a tag belonging to an already-exited depth-1 component is encountered, that component is added to `FragmentedComponents`.
+3. **Optimised Access**: Only fragmented components get expensive `SegmentView` construction via `TagIndex`. Non-fragmented components use simple position ranges (no overhead).
+
+### TS Files to Modify
+
+| File | Change |
+|------|--------|
+| `src/buffer/ascii/ascii-segment-parser.ts` | Add fragment detection (ExitedDepth1Components, FragmentedComponents tracking) |
+| `src/buffer/segment/segment-description.ts` | May need SegmentView reference for fragmented components |
+| New: `src/buffer/segment/segment-view.ts` | Port SegmentView for non-contiguous tag access |
+| New: `src/buffer/ascii/tag-index.ts` | Port TagIndex for tag span indexing |
+
+### Test Data
+
+Port from `~/dev/cs/cspurefix/PureFix.Test.ModularTypes/Data/examples/FIX.4.4/fixsim-examples.txt` — 46 real FIX messages including fragmented Instrument components. Write a failing test first to prove the problem, then fix.
+
+### C# Test Reference
+
+`~/dev/cs/cspurefix/PureFix.Test.ModularTypes/FixSimTest.cs` — parses all 46 messages, verifies type counts, deserialises ExecutionReport to strongly-typed object.
+
+---
+
+## Phase 2: Parser Reset on Disconnect (Quick Win)
+
+**Priority: High | Risk: Low | Scope: Small**
+
+### Problem
+
+When a TCP connection drops mid-message, the ASCII parser retains partial buffer state. On reconnect, the stale buffer can corrupt the next message parse. The C# version explicitly resets the parser during reconnection preparation.
+
+### C# Solution
+
+In `FixSession.cs` → `PrepareForReconnect()`:
+```csharp
+m_parser.Reset();
+```
+
+Also resets transient coordinator state (logon retry count, timeout recovery attempts) while preserving sequence numbers.
+
+### TS Files to Modify
+
+| File | Change |
+|------|--------|
+| `src/transport/session/fix-session.ts` | Add parser reset in reconnection path |
+| `src/buffer/ascii/ascii-parser.ts` | Ensure `reset()` method clears all partial state |
+
+---
+
+## Phase 3: SessionSequenceCoordinator (Foundation)
+
+**Priority: High | Risk: Medium | Scope: Medium**
+
+### Problem
+
+The TS version has sequence state scattered across `fix-session-state.ts` and `ascii-session.ts` with no single source of truth. This makes it hard to reason about recovery, reset, and reconnect behaviour. The C# version centralises all of this.
+
+### C# Solution
+
+| File | Purpose |
+|------|---------|
+| `PureFix.Transport/Session/SessionSequenceCoordinator.cs` | Single source of truth for sender/target sequences |
+
+**Key capabilities missing from TS:**
+
+- `PrepareForReconnect()` — resets transient state, preserves sequences
+- `HandlePeerReset()` — coordinates ResetSeqNumFlag=Y from peer
+- `ResetAsAcceptor()` — acceptor-initiated reset
+- `PossDupFlag` handling — messages with PossDupFlag=Y bypass normal sequence checks
+- Logon retry with `MaxLogonRetries=100`
+- Timeout recovery with `MaxTimeoutRecoveryAttempts=3` (handles sleep/wake scenarios)
+- `ResendRequestManager` integration — storm protection, pending request tracking
+- Delayed message acceptance — out-of-order messages that fill pending gap ranges
+
+### TS Files to Modify
+
+| File | Change |
+|------|--------|
+| New: `src/transport/session/session-sequence-coordinator.ts` | Port coordinator |
+| `src/transport/session/fix-session.ts` | Integrate coordinator as sequence authority |
+| `src/transport/ascii/ascii-session.ts` | Replace inline sequence logic with coordinator calls |
+| `src/transport/session/fix-session-state.ts` | May reduce scope — coordinator takes over sequence tracking |
+
+---
+
+## Phase 4: Persistent Message Store
+
+**Priority: Medium-High | Risk: Medium | Scope: Medium**
+
+### Problem
+
+The TS version only has `FixMsgMemoryStore` — all message history and sequence state is lost on process restart. The C# version has a QuickFix-compatible file store that persists across restarts.
+
+### C# Solution
+
+| File | Purpose |
+|------|---------|
+| `PureFix.Transport/Store/IFixSessionStore.cs` | Unified persistence interface |
+| `PureFix.Transport/Store/FileSessionStore.cs` | QuickFix-compatible file storage |
+| `PureFix.Transport/Store/MemorySessionStore.cs` | In-memory implementation |
+| `PureFix.Transport/Store/FileSessionStoreFactory.cs` | Factory pattern for store creation |
+| `PureFix.Transport/Store/FixMsgStoreRecord.cs` | Persisted message record |
+
+**QuickFix file format:**
+- `.seqnums` — 20-char padded sender:target sequence numbers
+- `.session` — creation timestamp
+- `.header` — seqnum,offset,length index
+- `.body` — raw FIX message bytes
+
+### Key Integration Points
+
+- `StoreEncodedMessage()` — persist every sent message
+- `InitializeSessionStore()` — load state on startup
+- Store factory in config — deferred creation
+- Store reset on `ResetSeqNumFlag=Y`
+- Resender recreation after reset
+
+### TS Files to Modify
+
+| File | Change |
+|------|--------|
+| New: `src/store/fix-session-store.ts` | Port IFixSessionStore interface |
+| New: `src/store/file-session-store.ts` | Port FileSessionStore |
+| New: `src/store/file-session-store-factory.ts` | Port factory |
+| `src/store/fix-msg-memory-store.ts` | Align with IFixSessionStore interface |
+| `src/transport/ascii/ascii-session.ts` | Integrate store lifecycle |
+| `src/config/js-fix-config.ts` | Add SessionStoreFactory to config |
+
+---
+
+## Phase 5: Resend Request Improvements
+
+**Priority: Medium | Risk: Low-Medium | Scope: Small**
+
+### Problem
+
+The TS version sends a simple ResendRequest on gap detection with no protection against request storms or tracking of pending requests.
+
+### C# Solution
+
+`ResendRequestManager` in the coordinator provides:
+- Pending request tracking (`PendingResendRequests` collection)
+- Storm protection — after N requests without response, accepts the gap
+- Delayed message detection — clears pending requests when gap-filling messages arrive
+- `ResendGapFillOnly` mode — sends GapFill instead of replaying stored messages (prevents duplicate executions)
+
+### TS Files to Modify
+
+| File | Change |
+|------|--------|
+| New: `src/transport/session/resend-request-manager.ts` | Port manager |
+| `src/transport/ascii/ascii-session.ts` | Integrate with gap detection |
+
+---
+
+## Phase 6: Message Generator / XML Parser (Future)
+
+**Priority: Low | Risk: Medium | Scope: Large**
+
+- C# uses nested types for groups (sub-types) in generated code
+- QuickFix XML parser has improved design with better error tracking
+- Nice to align for maintenance but not critical
+
+---
+
+## General Principles
+
+1. **Incremental PRs** — one phase at a time, smallest safe changes
+2. **Test first** — port test data and write failing tests before fixing
+3. **Maintain compatibility** — existing tests must continue to pass
+4. **Align code structure** — where reasonable, keep TS looking similar to C# for easier future maintenance
+5. **No big bang** — each phase should be independently mergeable and useful

package/data/examples/FIX.4.4/fixsim/fix.txt

@@ -0,0 +1,46 @@
+8=FIX.4.4|9=0000095|35=A|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=1|57=|52=20241013-14:03:55.006|98=0|108=30|141=Y|10=000|
+8=FIX.4.4|9=95|35=0|34=1|49=FIXSIMDEMO|52=20241013-14:04:31.878|56=sjames8888@gmail_com|112=0.824042533442398|10=088|
+8=FIX.4.4|9=0000111|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=2|57=|52=20241013-14:04:32.430|112=heartbeat-10/13/2024 14:04:32|10=248|
+8=FIX.4.4|9=0000111|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=3|57=|52=20241013-14:05:02.038|112=heartbeat-10/13/2024 14:05:02|10=249|
+8=FIX.4.4|9=0000111|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=4|57=|52=20241013-14:05:32.041|112=heartbeat-10/13/2024 14:05:32|10=250|
+8=FIX.4.4|9=0000111|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=5|57=|52=20241013-14:06:02.041|112=heartbeat-10/13/2024 14:06:02|10=247|
+8=FIX.4.4|9=151|35=6|34=2|49=FIXSIMDEMO|52=20241013-14:06:17.412|56=sjames8888@gmail_com|15=GBP|22=5|23=566638644251319700000|27=100|28=N|44=40|48=VOD.L|54=1|55=VOD.L|10=156|
+8=FIX.4.4|9=0000111|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=6|57=|52=20241013-14:06:32.037|112=heartbeat-10/13/2024 14:06:32|10=003|
+8=FIX.4.4|9=0000111|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=7|57=|52=20241013-14:07:02.042|112=heartbeat-10/13/2024 14:07:02|10=252|
+8=FIX.4.4|9=0000111|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=8|57=|52=20241013-14:07:32.029|112=heartbeat-10/13/2024 14:07:32|10=008|
+8=FIX.4.4|9=95|35=1|34=3|49=FIXSIMDEMO|52=20241013-14:07:35.444|56=sjames8888@gmail_com|112=0.349266975815067|10=104|
+8=FIX.4.4|9=0000099|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=9|57=|52=20241013-14:07:35.930|112=0.349266975815067|10=011|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=10|57=|52=20241013-14:08:05.043|112=heartbeat-10/13/2024 14:08:05|10=048|
+8=FIX.4.4|9=141|35=V|34=4|49=FIXSIMDEMO|52=20241013-14:08:12.728|56=sjames8888@gmail_com|262=VOD.L|263=1|264=1|146=1|55=VOD.L|167=CS|267=3|269=0|269=1|269=2|10=128|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=11|57=|52=20241013-14:08:35.030|112=heartbeat-10/13/2024 14:08:35|10=051|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=12|57=|52=20241013-14:09:05.043|112=heartbeat-10/13/2024 14:09:05|10=052|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=13|57=|52=20241013-14:09:35.037|112=heartbeat-10/13/2024 14:09:35|10=062|
+8=FIX.4.4|9=193|35=D|34=5|49=FIXSIMDEMO|52=20241013-14:09:45.126|56=sjames8888@gmail_com|11=567638644253361428000|15=GBP|21=2|22=5|38=100|40=2|44=100|48=VOD.L|54=1|55=VOD.L|59=0|60=20241013-14:09:45.126|388=1|10=091|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=14|57=|52=20241013-14:10:05.041|112=heartbeat-10/13/2024 14:10:05|10=036|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=15|57=|52=20241013-14:10:35.043|112=heartbeat-10/13/2024 14:10:35|10=045|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=16|57=|52=20241013-14:11:05.038|112=heartbeat-10/13/2024 14:11:05|10=046|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=17|57=|52=20241013-14:11:35.031|112=heartbeat-10/13/2024 14:11:35|10=046|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=18|57=|52=20241013-14:12:05.041|112=heartbeat-10/13/2024 14:12:05|10=044|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=19|57=|52=20241013-14:12:35.043|112=heartbeat-10/13/2024 14:12:35|10=053|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=20|57=|52=20241013-14:13:05.028|112=heartbeat-10/13/2024 14:13:05|10=044|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=21|57=|52=20241013-14:13:35.029|112=heartbeat-10/13/2024 14:13:35|10=052|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=22|57=|52=20241013-14:14:05.041|112=heartbeat-10/13/2024 14:14:05|10=043|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=23|57=|52=20241013-14:14:35.028|112=heartbeat-10/13/2024 14:14:35|10=055|
+8=FIX.4.4|9=261|35=8|34=6|49=FIXSIMDEMO|52=20241013-14:15:00.746|56=sjames8888@gmail_com|6=100|14=100|15=GBP|17=41638644256253512000|18=VOD.L|21=2|22=5|31=100|32=100|37=638644257007460000|38=100|39=2|40=2|44=100|48=VOD.L|54=1|55=VOD.L|59=0|60=20241013-14:15:00.746|150=2|151=0|10=207|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=24|57=|52=20241013-14:15:05.030|112=heartbeat-10/13/2024 14:15:05|10=045|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=25|57=|52=20241013-14:15:35.034|112=heartbeat-10/13/2024 14:15:35|10=056|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=26|57=|52=20241013-14:16:05.033|112=heartbeat-10/13/2024 14:16:05|10=052|
+8=FIX.4.4|9=119|35=R|34=7|49=FIXSIMDEMO|52=20241013-14:16:23.036|56=sjames8888@gmail_com|131=569638644257643472000|146=1|55=VOD.L|54=1|10=113|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=27|57=|52=20241013-14:16:35.037|112=heartbeat-10/13/2024 14:16:35|10=063|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=28|57=|52=20241013-14:17:05.033|112=heartbeat-10/13/2024 14:17:05|10=056|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=29|57=|52=20241013-14:17:35.038|112=heartbeat-10/13/2024 14:17:35|10=068|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=30|57=|52=20241013-14:18:05.037|112=heartbeat-10/13/2024 14:18:05|10=055|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=31|57=|52=20241013-14:18:35.029|112=heartbeat-10/13/2024 14:18:35|10=063|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=32|57=|52=20241013-14:19:05.040|112=heartbeat-10/13/2024 14:19:05|10=053|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=33|57=|52=20241013-14:19:35.029|112=heartbeat-10/13/2024 14:19:35|10=067|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=34|57=|52=20241013-14:20:05.031|112=heartbeat-10/13/2024 14:20:05|10=039|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=35|57=|52=20241013-14:20:35.029|112=heartbeat-10/13/2024 14:20:35|10=053|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=36|57=|52=20241013-14:21:05.036|112=heartbeat-10/13/2024 14:21:05|10=048|
+8=FIX.4.4|9=0000112|35=0|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=37|57=|52=20241013-14:21:35.043|112=heartbeat-10/13/2024 14:21:35|10=053|
+8=FIX.4.4|9=0000095|35=A|49=sjames8888@gmail_com|56=FIXSIMDEMO|34=1|57=|52=20241013-14:31:31.938|98=0|108=30|141=Y|10=009|
+8=FIX.4.4|9=96|35=0|34=8|49=FIXSIMDEMO|52=20241013-14:31:36.182|56=sjames8888@gmail_com|112=0.0534090264949058|10=144|

package/data/session/fixsim-qf44-initiator.json

@@ -0,0 +1,21 @@
+{
+  "application": {
+    "type": "initiator",
+    "name": "test_client",
+    "tcp": {
+      "host": "localhost",
+      "port": 2344
+    },
+    "protocol": "ascii",
+    "dictionary": "data/FIX44.xml"
+  },
+  "Username": "",
+  "Password": "",
+  "EncryptMethod": 0,
+  "ResetSeqNumFlag": true,
+  "HeartBtInt": 30,
+  "SenderCompId": "sjames8888@gmail_com",
+  "TargetCompID": "FIXSIMDEMO",
+  "TargetSubID": "",
+  "BeginString": "FIX.4.4"
+}

package/dist/buffer/ascii/ascii-segment-parser.js

@@ -21,6 +21,7 @@ const tsyringe_1 = require("tsyringe");
 const di_tokens_1 = require("../../runtime/di-tokens");
 const segment_type_1 = require("../segment/segment-type");
 const ascii_segment_parser_error_1 = require("./ascii-segment-parser-error");
+const tag_index_1 = require("./tag-index");
 let AsciiSegmentParser = class AsciiSegmentParser {
     constructor(definitions) {
         this.definitions = definitions;
@@ -34,6 +35,8 @@ let AsciiSegmentParser = class AsciiSegmentParser {
         const structureStack = [];
         let currentTagPosition = 0;
         let peek;
+        const exitedDepth1Components = new Set();
+        const fragmentedComponents = new Set();
         function unwind(tag) {
             var _a;
             while (structureStack.length > 1) {
@@ -42,6 +45,9 @@ let AsciiSegmentParser = class AsciiSegmentParser {
                     continue;
                 done.end(segments.length, currentTagPosition - 1, tags.tagPos[currentTagPosition - 1].tag);
                 segments.push(done);
+                if (done.depth === 1 && done.name) {
+                    exitedDepth1Components.add(done.name);
+                }
                 peek = structureStack[structureStack.length - 1];
                 if ((_a = peek.set) === null || _a === void 0 ? void 0 : _a.containedTag[tag]) {
                     break;
@@ -78,6 +84,9 @@ let AsciiSegmentParser = class AsciiSegmentParser {
                 }
                 case contained_1.ContainedFieldType.Component: {
                     const cf = currentField;
+                    if (structureStack.length === 1 && exitedDepth1Components.has(cf.name)) {
+                        fragmentedComponents.add(cf.name);
+                    }
                     structure = new segment_description_1.SegmentDescription(cf.name, tag, cf.definition, currentTagPosition, structureStack.length, segment_type_1.SegmentType.Component);
                     break;
                 }
@@ -150,10 +159,37 @@ let AsciiSegmentParser = class AsciiSegmentParser {
             segments[m1] = segments[m2];
             segments[m2] = tmp;
         }
+        function fragments() {
+            if (fragmentedComponents.size === 0)
+                return;
+            const ti = new tag_index_1.TagIndex(msgDefinition, tags, last + 1);
+            const seen = new Set();
+            for (let i = 1; i < segments.length - 1; i++) {
+                const seg = segments[i];
+                if (seg.depth !== 1)
+                    continue;
+                if (!seg.name)
+                    continue;
+                if (seg.segmentView)
+                    continue;
+                if (seen.has(seg.name))
+                    continue;
+                if (!fragmentedComponents.has(seg.name))
+                    continue;
+                if (ti.isComponentGroupWrapper(seg.name))
+                    continue;
+                const v = ti.getInstance(seg.name);
+                if (!v)
+                    continue;
+                seen.add(seg.name);
+                seg.addSegmentView(v);
+            }
+        }
         const msgStructure = new segment_description_1.SegmentDescription(msgDefinition.name, tags.tagPos[0].tag, msgDefinition, currentTagPosition, structureStack.length, segment_type_1.SegmentType.Msg);
         structureStack.push(msgStructure);
         discover();
         clean();
+        fragments();
         return new structure_1.Structure(tags, segments);
     }
 };

package/dist/buffer/ascii/ascii-segment-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ascii-segment-parser.js","sourceRoot":"","sources":["../../../src/buffer/ascii/ascii-segment-parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { SegmentDescription } from '../segment/segment-description'\nimport { Structure } from '../structure'\nimport { Tags } from '../tag/tags'\nimport {\n  FixDefinitions,\n  MessageDefinition\n} from '../../dictionary/definition'\nimport {\n  ContainedComponentField,\n  ContainedGroupField,\n  ContainedSimpleField,\n  ContainedFieldType\n} from '../../dictionary/contained'\nimport { inject, injectable } from 'tsyringe'\nimport { DITokens } from '../../runtime/di-tokens'\nimport { SegmentType } from '../segment/segment-type'\nimport { AsciiParserError } from './ascii-segment-parser-error'\nimport { AsciiSegmentParserSummary } from './ascii-segment-parser-summary'\n\n// this takes linear time i.e. it constantly makes forward progress\n// one tag at a time\n\n@injectable()\nexport class AsciiSegmentParser {\n  constructor (@inject(DITokens.Definitions) public readonly definitions: FixDefinitions) {\n  }\n\n  public parse (msgType: string, tags: Tags, last: number): Structure | null {\n    // completed segments in that they are fully parsed\n    const segments: SegmentDescription[] = []\n    const msgDefinition: MessageDefinition | undefined = this.definitions.message.get(msgType)\n    if (!msgDefinition) {\n      return null\n    }\n    // in process of being discovered and may have any amount of depth\n    // i.e. a component containing a repeated group of components\n    // with sub-groups of components\n    const structureStack: SegmentDescription[] = []\n    let currentTagPosition: number = 0\n    let peek: SegmentDescription\n\n    // having finished one segments keep unwinding until tag matches further up stack\n    function unwind (tag: number): void {\n      while (structureStack.length > 1) {\n        const done = structureStack.pop()\n        if (!done) continue\n        done.end(segments.length, currentTagPosition - 1, tags.tagPos[currentTagPosition - 1].tag)\n        segments.push(done)\n        peek = structureStack[structureStack.length - 1]\n        if (peek.set?.containedTag[tag]) {\n          // unwound to point this tag lives in this set.\n          break\n        }\n        if (peek.type === SegmentType.Msg) {\n          // this is unknown tag and it is not part of trailer so raise unknown\n          break\n        }\n      }\n    }\n\n    function summarise (): AsciiSegmentParserSummary {\n      return <AsciiSegmentParserSummary>{\n        msgType,\n        tags: tags.clone().tagPos,\n        last,\n        msgDefinition: msgDefinition?.toString(),\n        currentTagPosition,\n        peek: peek.toString(),\n        segments: segments.map(s => s.toString()),\n        structureStack: structureStack.map(s => s.toString())\n      }\n    }\n\n    function examine (tag: number): SegmentDescription | null {\n      let structure: SegmentDescription | null = null\n      const currentField = peek.currentField\n      if (!currentField) return null\n      switch (currentField.type) {\n        case ContainedFieldType.Simple: {\n          const sf: ContainedSimpleField = currentField as ContainedSimpleField\n          if (sf.definition.tag === tag) {\n            currentTagPosition = currentTagPosition + 1\n          }\n          break\n        }\n        // moving deeper into structure, start a new context\n        case ContainedFieldType.Component: {\n          const cf: ContainedComponentField = currentField as ContainedComponentField\n          structure = new SegmentDescription(cf.name, tag, cf.definition,\n            currentTagPosition, structureStack.length, SegmentType.Component)\n          break\n        }\n        // for a group also need to know where all delimiters are positioned\n        case ContainedFieldType.Group: {\n          const gf: ContainedComponentField = currentField as ContainedGroupField\n          structure = new SegmentDescription(gf.name, tag, gf.definition,\n            currentTagPosition, structureStack.length, SegmentType.Group)\n          currentTagPosition = currentTagPosition + 1\n          structure.startGroup(tags.tagPos[currentTagPosition].tag)\n          break\n        }\n\n        default: {\n          const c = summarise()\n          throw new AsciiParserError(`examine unknown type for tag = ${tag}`, c)\n        }\n      }\n      return structure\n    }\n\n    function groupDelimiter (tag: number): boolean {\n      let delimiter: boolean = false\n      if (tag === peek.delimiterTag) {\n        peek.addDelimiterPosition(currentTagPosition)\n      } else if (structureStack.length > 1) {\n        // if a group is represented by a repeated component, then the tag representing delimiter\n        // needs to be added further up stack to group itself.\n        delimiter = structureStack[structureStack.length - 2].groupAddDelimiter(tag, currentTagPosition)\n      }\n      return delimiter\n    }\n\n    function gap (tag: number): void {\n      const gap = new SegmentDescription('.undefined', tag, peek.set,\n        currentTagPosition, structureStack.length, SegmentType.Gap)\n      gap.end(segments.length, currentTagPosition, tag)\n      segments.push(gap)\n      currentTagPosition++\n    }\n\n    function discover (): void {\n      while (currentTagPosition <= last) {\n        const tag: number = tags.tagPos[currentTagPosition].tag\n        peek = structureStack[structureStack.length - 1]\n        peek.setCurrentField(tag)\n        if (!peek.set?.containedTag[tag] || groupDelimiter(tag)) {\n          // unravelled all way back to root hence this is not recognised\n          const unknown = peek.type === SegmentType.Msg\n          if (unknown) {\n            gap(tag)\n          } else if (structureStack.length > 1) {\n            // move back up the segments and save the finished group / component\n            unwind(tag)\n          }\n          continue\n        }\n        if (!peek.currentField || !peek.set) {\n          throw new AsciiParserError(`discover no currentField or set for tag = ${tag}`, summarise())\n        }\n        const structure = examine(tag)\n        if (structure) {\n          structureStack.push(structure)\n        }\n      }\n    }\n\n    function clean (): void {\n      // any remainder components can be closed.\n      while (structureStack.length > 0) {\n        const done = structureStack.pop()\n        if (!done) continue\n        done.end(segments.length, currentTagPosition - 1, tags.tagPos[currentTagPosition - 1].tag)\n        segments[segments.length] = done\n      }\n      // logically reverse the trailer and message so trailer is last in list.\n      const m1 = segments.length - 1\n      const m2 = segments.length - 2\n      const tmp = segments[m1]\n      segments[m1] = segments[m2]\n      segments[m2] = tmp\n    }\n\n    const msgStructure = new SegmentDescription(msgDefinition.name, tags.tagPos[0].tag, msgDefinition,\n      currentTagPosition, structureStack.length, SegmentType.Msg)\n    structureStack.push(msgStructure)\n    discover()\n    clean()\n\n    // now know where all components and groups are positioned within message\n    return new Structure(tags, segments)\n  }\n}\n"]}
+{"version":3,"file":"ascii-segment-parser.js","sourceRoot":"","sources":["../../../src/buffer/ascii/ascii-segment-parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { SegmentDescription } from '../segment/segment-description'\nimport { Structure } from '../structure'\nimport { Tags } from '../tag/tags'\nimport {\n  FixDefinitions,\n  MessageDefinition\n} from '../../dictionary/definition'\nimport {\n  ContainedComponentField,\n  ContainedGroupField,\n  ContainedSimpleField,\n  ContainedFieldType\n} from '../../dictionary/contained'\nimport { inject, injectable } from 'tsyringe'\nimport { DITokens } from '../../runtime/di-tokens'\nimport { SegmentType } from '../segment/segment-type'\nimport { AsciiParserError } from './ascii-segment-parser-error'\nimport { AsciiSegmentParserSummary } from './ascii-segment-parser-summary'\nimport { TagIndex } from './tag-index'\n\n// this takes linear time i.e. it constantly makes forward progress\n// one tag at a time\n\n@injectable()\nexport class AsciiSegmentParser {\n  constructor (@inject(DITokens.Definitions) public readonly definitions: FixDefinitions) {\n  }\n\n  public parse (msgType: string, tags: Tags, last: number): Structure | null {\n    // completed segments in that they are fully parsed\n    const segments: SegmentDescription[] = []\n    const msgDefinition: MessageDefinition | undefined = this.definitions.message.get(msgType)\n    if (!msgDefinition) {\n      return null\n    }\n    // in process of being discovered and may have any amount of depth\n    // i.e. a component containing a repeated group of components\n    // with sub-groups of components\n    const structureStack: SegmentDescription[] = []\n    let currentTagPosition: number = 0\n    let peek: SegmentDescription\n\n    // track depth-1 components that have been exited for fragmentation detection\n    const exitedDepth1Components: Set<string> = new Set()\n    const fragmentedComponents: Set<string> = new Set()\n\n    // having finished one segments keep unwinding until tag matches further up stack\n    function unwind (tag: number): void {\n      while (structureStack.length > 1) {\n        const done = structureStack.pop()\n        if (!done) continue\n        done.end(segments.length, currentTagPosition - 1, tags.tagPos[currentTagPosition - 1].tag)\n        segments.push(done)\n\n        // track when we exit depth-1 components for fragmentation detection\n        if (done.depth === 1 && done.name) {\n          exitedDepth1Components.add(done.name)\n        }\n\n        peek = structureStack[structureStack.length - 1]\n        if (peek.set?.containedTag[tag]) {\n          // unwound to point this tag lives in this set.\n          break\n        }\n        if (peek.type === SegmentType.Msg) {\n          // this is unknown tag and it is not part of trailer so raise unknown\n          break\n        }\n      }\n    }\n\n    function summarise (): AsciiSegmentParserSummary {\n      return <AsciiSegmentParserSummary>{\n        msgType,\n        tags: tags.clone().tagPos,\n        last,\n        msgDefinition: msgDefinition?.toString(),\n        currentTagPosition,\n        peek: peek.toString(),\n        segments: segments.map(s => s.toString()),\n        structureStack: structureStack.map(s => s.toString())\n      }\n    }\n\n    function examine (tag: number): SegmentDescription | null {\n      let structure: SegmentDescription | null = null\n      const currentField = peek.currentField\n      if (!currentField) return null\n      switch (currentField.type) {\n        case ContainedFieldType.Simple: {\n          const sf: ContainedSimpleField = currentField as ContainedSimpleField\n          if (sf.definition.tag === tag) {\n            currentTagPosition = currentTagPosition + 1\n          }\n          break\n        }\n        // moving deeper into structure, start a new context\n        case ContainedFieldType.Component: {\n          const cf: ContainedComponentField = currentField as ContainedComponentField\n          // detect fragmentation: re-entering a depth-1 component we already exited\n          if (structureStack.length === 1 && exitedDepth1Components.has(cf.name)) {\n            fragmentedComponents.add(cf.name)\n          }\n          structure = new SegmentDescription(cf.name, tag, cf.definition,\n            currentTagPosition, structureStack.length, SegmentType.Component)\n          break\n        }\n        // for a group also need to know where all delimiters are positioned\n        case ContainedFieldType.Group: {\n          const gf: ContainedComponentField = currentField as ContainedGroupField\n          structure = new SegmentDescription(gf.name, tag, gf.definition,\n            currentTagPosition, structureStack.length, SegmentType.Group)\n          currentTagPosition = currentTagPosition + 1\n          structure.startGroup(tags.tagPos[currentTagPosition].tag)\n          break\n        }\n\n        default: {\n          const c = summarise()\n          throw new AsciiParserError(`examine unknown type for tag = ${tag}`, c)\n        }\n      }\n      return structure\n    }\n\n    function groupDelimiter (tag: number): boolean {\n      let delimiter: boolean = false\n      if (tag === peek.delimiterTag) {\n        peek.addDelimiterPosition(currentTagPosition)\n      } else if (structureStack.length > 1) {\n        // if a group is represented by a repeated component, then the tag representing delimiter\n        // needs to be added further up stack to group itself.\n        delimiter = structureStack[structureStack.length - 2].groupAddDelimiter(tag, currentTagPosition)\n      }\n      return delimiter\n    }\n\n    function gap (tag: number): void {\n      const gap = new SegmentDescription('.undefined', tag, peek.set,\n        currentTagPosition, structureStack.length, SegmentType.Gap)\n      gap.end(segments.length, currentTagPosition, tag)\n      segments.push(gap)\n      currentTagPosition++\n    }\n\n    function discover (): void {\n      while (currentTagPosition <= last) {\n        const tag: number = tags.tagPos[currentTagPosition].tag\n        peek = structureStack[structureStack.length - 1]\n        peek.setCurrentField(tag)\n        if (!peek.set?.containedTag[tag] || groupDelimiter(tag)) {\n          // unravelled all way back to root hence this is not recognised\n          const unknown = peek.type === SegmentType.Msg\n          if (unknown) {\n            gap(tag)\n          } else if (structureStack.length > 1) {\n            // move back up the segments and save the finished group / component\n            unwind(tag)\n          }\n          continue\n        }\n        if (!peek.currentField || !peek.set) {\n          throw new AsciiParserError(`discover no currentField or set for tag = ${tag}`, summarise())\n        }\n        const structure = examine(tag)\n        if (structure) {\n          structureStack.push(structure)\n        }\n      }\n    }\n\n    function clean (): void {\n      // any remainder components can be closed.\n      while (structureStack.length > 0) {\n        const done = structureStack.pop()\n        if (!done) continue\n        done.end(segments.length, currentTagPosition - 1, tags.tagPos[currentTagPosition - 1].tag)\n        segments[segments.length] = done\n      }\n      // logically reverse the trailer and message so trailer is last in list.\n      const m1 = segments.length - 1\n      const m2 = segments.length - 2\n      const tmp = segments[m1]\n      segments[m1] = segments[m2]\n      segments[m2] = tmp\n    }\n\n    function fragments (): void {\n      // only build SegmentViews for components detected as fragmented during discover\n      // non-fragmented components use their position ranges directly (zero overhead)\n      if (fragmentedComponents.size === 0) return\n      const ti = new TagIndex(msgDefinition!, tags, last + 1)\n      const seen: Set<string> = new Set()\n      for (let i = 1; i < segments.length - 1; i++) {\n        const seg = segments[i]\n        if (seg.depth !== 1) continue\n        if (!seg.name) continue\n        if (seg.segmentView) continue\n        if (seen.has(seg.name)) continue\n        if (!fragmentedComponents.has(seg.name)) continue\n        if (ti.isComponentGroupWrapper(seg.name)) continue\n        const v = ti.getInstance(seg.name)\n        if (!v) continue\n        seen.add(seg.name)\n        seg.addSegmentView(v)\n      }\n    }\n\n    const msgStructure = new SegmentDescription(msgDefinition.name, tags.tagPos[0].tag, msgDefinition,\n      currentTagPosition, structureStack.length, SegmentType.Msg)\n    structureStack.push(msgStructure)\n    discover()\n    clean()\n    fragments()\n\n    // now know where all components and groups are positioned within message\n    return new Structure(tags, segments)\n  }\n}\n"]}

package/dist/buffer/ascii/tag-index.d.ts

@@ -0,0 +1,20 @@
+import { IContainedSet } from '../../dictionary/contained';
+import { SegmentView } from '../segment/segment-view';
+import { Tags } from '../tag/tags';
+export interface TagSpan {
+    start: number;
+    end: number;
+}
+export declare class TagIndex {
+    readonly set: IContainedSet;
+    private readonly sortedTagPos;
+    private readonly tagSpans;
+    private readonly componentGroupWrappers;
+    private readonly cache;
+    constructor(set: IContainedSet, tags: Tags, count: number);
+    private populateTagSpans;
+    private calcGroups;
+    private findParentComponent;
+    getInstance(name: string): SegmentView | null;
+    isComponentGroupWrapper(name: string): boolean;
+}

package/dist/buffer/ascii/tag-index.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TagIndex = void 0;
+const segment_view_1 = require("../segment/segment-view");
+const tag_pos_1 = require("../tag/tag-pos");
+class TagIndex {
+    constructor(set, tags, count) {
+        this.set = set;
+        this.tagSpans = new Map();
+        this.componentGroupWrappers = new Set();
+        this.cache = new Map();
+        this.sortedTagPos = new Array(count);
+        for (let i = 0; i < count; i++) {
+            this.sortedTagPos[i] = tags.tagPos[i];
+        }
+        this.sortedTagPos.sort(tag_pos_1.TagPos.compare);
+        this.populateTagSpans();
+        this.calcGroups(tags, count);
+    }
+    populateTagSpans() {
+        for (let i = 0; i < this.sortedTagPos.length; i++) {
+            const t = this.sortedTagPos[i];
+            const existing = this.tagSpans.get(t.tag);
+            if (existing) {
+                existing.end = i;
+            }
+            else {
+                this.tagSpans.set(t.tag, { start: i, end: i });
+            }
+        }
+    }
+    calcGroups(tags, count) {
+        for (let i = 0; i < count; i++) {
+            const tag = tags.tagPos[i];
+            const field = this.set.tagToField[tag.tag];
+            if (!field)
+                continue;
+            const component = this.findParentComponent(tag.tag);
+            if (component) {
+                const componentSet = this.set.components.get(component);
+                if (componentSet && componentSet.fields.length === 1) {
+                    this.componentGroupWrappers.add(component);
+                }
+            }
+        }
+    }
+    findParentComponent(tag) {
+        for (const [name, componentSet] of this.set.components) {
+            if (componentSet.containedTag[tag]) {
+                return name;
+            }
+        }
+        return null;
+    }
+    getInstance(name) {
+        const cached = this.cache.get(name);
+        if (cached !== undefined) {
+            return cached;
+        }
+        const componentSet = this.set.components.get(name);
+        if (!componentSet) {
+            this.cache.set(name, null);
+            return null;
+        }
+        const view = new segment_view_1.SegmentView(name, componentSet);
+        const flatTags = componentSet.flattenedTag;
+        for (let x = 0; x < flatTags.length; x++) {
+            const t = flatTags[x];
+            const span = this.tagSpans.get(t);
+            if (!span)
+                continue;
+            if (span.start === span.end) {
+                view.add(this.sortedTagPos[span.start]);
+            }
+            else {
+                for (let j = span.start; j <= span.end; j++) {
+                    view.add(this.sortedTagPos[j]);
+                }
+            }
+        }
+        this.cache.set(name, view);
+        return view;
+    }
+    isComponentGroupWrapper(name) {
+        return this.componentGroupWrappers.has(name);
+    }
+}
+exports.TagIndex = TagIndex;
+//# sourceMappingURL=tag-index.js.map

package/dist/buffer/ascii/tag-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tag-index.js","sourceRoot":"","sources":["../../../src/buffer/ascii/tag-index.ts"],"names":[],"mappings":"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","sourcesContent":["import { IContainedSet } from '../../dictionary/contained'\nimport { SegmentView } from '../segment/segment-view'\nimport { TagPos } from '../tag/tag-pos'\nimport { Tags } from '../tag/tags'\n\nexport interface TagSpan {\n  start: number\n  end: number\n}\n\nexport class TagIndex {\n  private readonly sortedTagPos: TagPos[]\n  private readonly tagSpans: Map<number, TagSpan> = new Map()\n  private readonly componentGroupWrappers: Set<string> = new Set()\n  private readonly cache: Map<string, SegmentView | null> = new Map()\n\n  constructor (\n    public readonly set: IContainedSet,\n    tags: Tags,\n    count: number) {\n    this.sortedTagPos = new Array(count)\n    for (let i = 0; i < count; i++) {\n      this.sortedTagPos[i] = tags.tagPos[i]\n    }\n    this.sortedTagPos.sort(TagPos.compare)\n    this.populateTagSpans()\n    this.calcGroups(tags, count)\n  }\n\n  private populateTagSpans (): void {\n    for (let i = 0; i < this.sortedTagPos.length; i++) {\n      const t = this.sortedTagPos[i]\n      const existing = this.tagSpans.get(t.tag)\n      if (existing) {\n        existing.end = i\n      } else {\n        this.tagSpans.set(t.tag, { start: i, end: i })\n      }\n    }\n  }\n\n  private calcGroups (tags: Tags, count: number): void {\n    for (let i = 0; i < count; i++) {\n      const tag = tags.tagPos[i]\n      const field = this.set.tagToField[tag.tag]\n      if (!field) continue\n      // detect component group wrappers (single-field components containing a group)\n      const component = this.findParentComponent(tag.tag)\n      if (component) {\n        const componentSet = this.set.components.get(component)\n        if (componentSet && componentSet.fields.length === 1) {\n          this.componentGroupWrappers.add(component)\n        }\n      }\n    }\n  }\n\n  private findParentComponent (tag: number): string | null {\n    for (const [name, componentSet] of this.set.components) {\n      if (componentSet.containedTag[tag]) {\n        return name\n      }\n    }\n    return null\n  }\n\n  public getInstance (name: string): SegmentView | null {\n    const cached = this.cache.get(name)\n    if (cached !== undefined) {\n      return cached\n    }\n\n    const componentSet = this.set.components.get(name)\n    if (!componentSet) {\n      this.cache.set(name, null)\n      return null\n    }\n\n    const view = new SegmentView(name, componentSet)\n    const flatTags = componentSet.flattenedTag\n    for (let x = 0; x < flatTags.length; x++) {\n      const t = flatTags[x]\n      const span = this.tagSpans.get(t)\n      if (!span) continue\n      if (span.start === span.end) {\n        view.add(this.sortedTagPos[span.start])\n      } else {\n        for (let j = span.start; j <= span.end; j++) {\n          view.add(this.sortedTagPos[j])\n        }\n      }\n    }\n\n    this.cache.set(name, view)\n    return view\n  }\n\n  public isComponentGroupWrapper (name: string): boolean {\n    return this.componentGroupWrappers.has(name)\n  }\n}\n"]}

package/dist/buffer/msg-view.js

@@ -234,8 +234,15 @@ class MsgView {
     allStrings() {
         const segment = this.segment;
         const range = [];
-        for (let i = segment.startPosition; i <= segment.endPosition; ++i) {
-            range[range.length] = i;
+        if (segment.segmentView) {
+            for (const tp of segment.segmentView.tags) {
+                range[range.length] = tp.position;
+            }
+        }
+        else {
+            for (let i = segment.startPosition; i <= segment.endPosition; ++i) {
+                range[range.length] = i;
+            }
         }
         return range.map((i) => this.stringAtPosition(i));
     }
@@ -334,8 +341,14 @@ class MsgView {
         let forwards = this.sortedTagPosForwards;
         if (!forwards) {
             const segment = this.segment;
-            forwards = this.sortedTagPosForwards = this.structure.tags.tagPos.slice(segment.startPosition, segment.endPosition + 1);
-            forwards.sort(tag_pos_1.TagPos.compare);
+            if (segment.segmentView) {
+                forwards = this.sortedTagPosForwards = segment.segmentView.tags.slice();
+                forwards.sort(tag_pos_1.TagPos.compare);
+            }
+            else {
+                forwards = this.sortedTagPosForwards = this.structure.tags.tagPos.slice(segment.startPosition, segment.endPosition + 1);
+                forwards.sort(tag_pos_1.TagPos.compare);
+            }
             this.sortedTagPosBackwards = forwards.slice().reverse();
         }
         return tag_pos_1.TagPos.binarySearch(forwards, tag);