jspurefix 2.2.0 → 3.0.0

package/dist/dictionary/parser/fixml/include-graph.js

@@ -38,10 +38,12 @@ class IncludeGraph {
     }
     resolve_nodes(label, depends) {
         const node = this.graph[label];
-        for (let e of node.edges) {
-            if (depends.indexOf(e) < 0) {
-                this.resolve_nodes(e, depends);
-            }
+        if (node) {
+            node.edges.forEach(e => {
+                if (!depends.includes(e)) {
+                    this.resolve_nodes(e, depends);
+                }
+            });
         }
         depends.push(label);
     }
@@ -49,6 +51,8 @@ class IncludeGraph {
         const nodes = this.nodes;
         this.graph = this.includes.reduce((a, current) => {
             const parent = nodes.get(current.parent);
+            if (parent == null)
+                return a;
             let parentNode = a[parent];
             if (!parentNode) {
                 a[parent] = parentNode = {
@@ -59,8 +63,10 @@ class IncludeGraph {
             }
             current.children.forEach((s) => {
                 const child = nodes.get(s);
-                if (parentNode.edges.indexOf(child) < 0) {
-                    parentNode.edges.push(child);
+                if (child) {
+                    if (!parentNode.edges.includes(child)) {
+                        parentNode.edges.push(child);
+                    }
                 }
             });
             return a;
@@ -81,56 +87,60 @@ class IncludeGraph {
         }, new collections_1.Dictionary());
     }
     scanIncludes(file) {
-        return new Promise((accept, reject) => {
-            const includes = [];
-            const pass = fs.createReadStream(path.join(this.root, file));
-            const saxStream = require('sax').createStream(true, {});
-            saxStream.on('opentag', (node) => {
-                const saxNode = node;
-                switch (saxNode.name) {
-                    case 'xs:include': {
-                        includes.push(saxNode.attributes.schemaLocation);
-                        break;
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield new Promise((resolve, reject) => {
+                const includes = [];
+                const pass = fs.createReadStream(path.join(this.root, file));
+                const saxStream = require('sax').createStream(true, {});
+                saxStream.on('opentag', (node) => {
+                    const saxNode = node;
+                    switch (saxNode.name) {
+                        case 'xs:include': {
+                            includes.push(saxNode.attributes.schemaLocation);
+                            break;
+                        }
                     }
-                }
+                });
+                saxStream.on('ready', () => {
+                    resolve(includes);
+                });
+                saxStream.on('error', (r) => {
+                    reject(r);
+                });
+                pass.pipe(saxStream);
             });
-            saxStream.on('ready', () => {
-                accept(includes);
-            });
-            saxStream.on('error', (r) => {
-                reject(r);
-            });
-            pass.pipe(saxStream);
         });
     }
     getIncludes(main) {
-        const q = [];
-        q.push([main]);
-        const ordered = [];
-        const seen = new collections_1.Dictionary();
-        return new Promise((accept, reject) => __awaiter(this, void 0, void 0, function* () {
-            try {
-                while (q.length > 0) {
-                    const batch = q.pop();
-                    for (let next of batch) {
-                        if (seen.containsKey(next)) {
-                            continue;
+        return __awaiter(this, void 0, void 0, function* () {
+            const q = [];
+            q.push([main]);
+            const ordered = [];
+            const seen = new collections_1.Dictionary();
+            return yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    while (q.length > 0) {
+                        const batch = q.pop();
+                        for (const next of batch) {
+                            if (seen.containsKey(next)) {
+                                continue;
+                            }
+                            seen.add(next, true);
+                            const includes = yield this.scanIncludes(next);
+                            ordered.push({
+                                parent: next,
+                                children: includes
+                            });
+                            q.push(includes);
                         }
-                        seen.add(next, true);
-                        const includes = yield this.scanIncludes(next);
-                        ordered.push({
-                            parent: next,
-                            children: includes
-                        });
-                        q.push(includes);
                     }
+                    resolve(ordered);
                 }
-                accept(ordered);
-            }
-            catch (e) {
-                reject(e);
-            }
-        }));
+                catch (e) {
+                    reject(e);
+                }
+            }));
+        });
     }
 }
 exports.IncludeGraph = IncludeGraph;

package/dist/dictionary/parser/fixml/include-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"include-graph.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/fixml/include-graph.ts"],"names":[],"mappings":"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","sourcesContent":["import { SAXStream } from '../../dict-primitive'\r\nimport { Dictionary } from '../../../collections'\r\nimport { INumericKeyed } from '../../../collections/collection'\r\nimport * as path from 'path'\r\nimport * as fs from 'fs'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport interface IInclude {\r\n  parent: string\r\n  children: string[]\r\n}\r\n\r\nexport interface IGraphNode {\r\n  file: string\r\n  node: number\r\n  edges: number[]\r\n}\r\n\r\n/*\r\n  construct a dependency graph from all the xsd files to compute an order to build the definition\r\n */\r\n\r\nexport class IncludeGraph {\r\n  private nodes: Dictionary<number>\r\n  private includes: IInclude[]\r\n  private graph: INumericKeyed<IGraphNode>\r\n  constructor (public readonly root: string, public readonly main: string) {\r\n  }\r\n\r\n  public async build (): Promise<any> {\r\n    this.includes = await this.getIncludes(this.main)\r\n    this.assignNodes()\r\n    this.getGraph()\r\n  }\r\n\r\n  public resolve (file: string): string[] {\r\n    const label: number = this.nodes.get(file)\r\n    if (label == null) {\r\n      return null\r\n    }\r\n    const depends: number[] = []\r\n    this.resolve_nodes(label, depends)\r\n    return depends.map((i: number) => {\r\n      return this.graph[i].file\r\n    })\r\n  }\r\n\r\n  private resolve_nodes (label: number, depends: number[]): void {\r\n    const node: IGraphNode = this.graph[label]\r\n    for (let e of node.edges) {\r\n      if (depends.indexOf(e) < 0) {\r\n        this.resolve_nodes(e, depends)\r\n      }\r\n    }\r\n    depends.push(label)\r\n  }\r\n\r\n  private getGraph () {\r\n    const nodes = this.nodes\r\n    this.graph = this.includes.reduce((a: INumericKeyed<IGraphNode>, current: IInclude) => {\r\n      const parent: number = nodes.get(current.parent)\r\n      let parentNode = a[parent]\r\n      if (!parentNode) {\r\n        a[parent] = parentNode = {\r\n          file: current.parent,\r\n          node: parent,\r\n          edges: []\r\n        } as IGraphNode\r\n      }\r\n      current.children.forEach((s: string) => {\r\n        const child: number = nodes.get(s)\r\n        if (parentNode.edges.indexOf(child) < 0) {\r\n          parentNode.edges.push(child)\r\n        }\r\n      })\r\n      return a\r\n    }, {} as INumericKeyed<IGraphNode>)\r\n  }\r\n\r\n  private assignNodes () {\r\n    let next: number = 0\r\n    this.nodes = this.includes.reduce((a: Dictionary<number>, current: IInclude) => {\r\n      if (!a.containsKey(current.parent)) {\r\n        a.add(current.parent, next++)\r\n      }\r\n      current.children.forEach((c: string) => {\r\n        if (!a.containsKey(c)) {\r\n          a.add(c, next++)\r\n        }\r\n      })\r\n      return a\r\n    }, new Dictionary<number>())\r\n  }\r\n\r\n  private scanIncludes (file: string): Promise<string[]> {\r\n    return new Promise<string[]>((accept, reject) => {\r\n      const includes: string[] = []\r\n      const pass: fs.ReadStream = fs.createReadStream(path.join(this.root, file))\r\n      const saxStream: SAXStream = require('sax').createStream(true, {})\r\n      saxStream.on('opentag', (node) => {\r\n        const saxNode: ISaxNode = node\r\n        switch (saxNode.name) {\r\n          case 'xs:include': {\r\n            includes.push(saxNode.attributes.schemaLocation)\r\n            break\r\n          }\r\n        }\r\n      })\r\n      saxStream.on('ready', () => {\r\n        accept(includes)\r\n      })\r\n      saxStream.on('error', (r) => {\r\n        reject(r)\r\n      })\r\n      pass.pipe(saxStream)\r\n    })\r\n  }\r\n\r\n  private getIncludes (main: string): Promise<IInclude[]> {\r\n    const q: any[] = []\r\n    q.push([main])\r\n    const ordered: IInclude[] = []\r\n    const seen: Dictionary<boolean> = new Dictionary<boolean>()\r\n    return new Promise<IInclude[]>(async (accept, reject) => {\r\n      try {\r\n        while (q.length > 0) {\r\n          const batch: string[] = q.pop()\r\n          for (let next of batch) {\r\n            if (seen.containsKey(next)) {\r\n              continue\r\n            }\r\n            seen.add(next, true)\r\n            const includes: string[] = await this.scanIncludes(next)\r\n            ordered.push({\r\n              parent: next,\r\n              children: includes\r\n            } as IInclude)\r\n            q.push(includes)\r\n          }\r\n        }\r\n        accept(ordered)\r\n      } catch (e) {\r\n        reject(e)\r\n      }\r\n    })\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"include-graph.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/fixml/include-graph.ts"],"names":[],"mappings":"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","sourcesContent":["import { SAXStream } from '../../dict-primitive'\r\nimport { Dictionary } from '../../../collections'\r\nimport { INumericKeyed } from '../../../collections/collection'\r\nimport * as path from 'path'\r\nimport * as fs from 'fs'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport interface IInclude {\r\n  parent: string\r\n  children: string[]\r\n}\r\n\r\nexport interface IGraphNode {\r\n  file: string\r\n  node: number\r\n  edges: number[]\r\n}\r\n\r\n/*\r\n  construct a dependency graph from all the xsd files to compute an order to build the definition\r\n */\r\n\r\nexport class IncludeGraph {\r\n  private nodes: Dictionary<number>\r\n  private includes: IInclude[]\r\n  private graph: INumericKeyed<IGraphNode>\r\n  constructor (public readonly root: string, public readonly main: string) {\r\n  }\r\n\r\n  public async build (): Promise<any> {\r\n    this.includes = await this.getIncludes(this.main)\r\n    this.assignNodes()\r\n    this.getGraph()\r\n  }\r\n\r\n  public resolve (file: string): string[] | null {\r\n    const label: number | null = this.nodes.get(file)\r\n    if (label == null) {\r\n      return null\r\n    }\r\n    const depends: number[] = []\r\n    this.resolve_nodes(label, depends)\r\n    return depends.map((i: number) => {\r\n      return this.graph[i].file\r\n    })\r\n  }\r\n\r\n  private resolve_nodes (label: number, depends: number[]): void {\r\n    const node: IGraphNode = this.graph[label]\r\n    if (node) {\r\n      node.edges.forEach(e => {\r\n        if (!depends.includes(e)) {\r\n          this.resolve_nodes(e, depends)\r\n        }\r\n      })\r\n    }\r\n    depends.push(label)\r\n  }\r\n\r\n  private getGraph (): void {\r\n    const nodes = this.nodes\r\n    this.graph = this.includes.reduce<INumericKeyed<IGraphNode>>((a: INumericKeyed<IGraphNode>, current: IInclude) => {\r\n      const parent: number | null = nodes.get(current.parent)\r\n      if (parent == null) return a\r\n      let parentNode = a[parent]\r\n      if (!parentNode) {\r\n        a[parent] = parentNode = {\r\n          file: current.parent,\r\n          node: parent,\r\n          edges: []\r\n        } as IGraphNode\r\n      }\r\n      current.children.forEach((s: string) => {\r\n        const child: number | null = nodes.get(s)\r\n        if (child) {\r\n          if (!parentNode.edges.includes(child)) {\r\n            parentNode.edges.push(child)\r\n          }\r\n        }\r\n      })\r\n      return a\r\n    }, {})\r\n  }\r\n\r\n  private assignNodes (): void {\r\n    let next: number = 0\r\n    this.nodes = this.includes.reduce((a: Dictionary<number>, current: IInclude) => {\r\n      if (!a.containsKey(current.parent)) {\r\n        a.add(current.parent, next++)\r\n      }\r\n      current.children.forEach((c: string) => {\r\n        if (!a.containsKey(c)) {\r\n          a.add(c, next++)\r\n        }\r\n      })\r\n      return a\r\n    }, new Dictionary<number>())\r\n  }\r\n\r\n  private async scanIncludes (file: string): Promise<string[]> {\r\n    return await new Promise<string[]>((resolve, reject) => {\r\n      const includes: string[] = []\r\n      const pass: fs.ReadStream = fs.createReadStream(path.join(this.root, file))\r\n      const saxStream: SAXStream = require('sax').createStream(true, {})\r\n      saxStream.on('opentag', (node) => {\r\n        const saxNode: ISaxNode = node\r\n        switch (saxNode.name) {\r\n          case 'xs:include': {\r\n            includes.push(saxNode.attributes.schemaLocation)\r\n            break\r\n          }\r\n        }\r\n      })\r\n      saxStream.on('ready', () => {\r\n        resolve(includes)\r\n      })\r\n      saxStream.on('error', (r) => {\r\n        reject(r)\r\n      })\r\n      pass.pipe(saxStream)\r\n    })\r\n  }\r\n\r\n  private async getIncludes (main: string): Promise<IInclude[]> {\r\n    const q: any[] = []\r\n    q.push([main])\r\n    const ordered: IInclude[] = []\r\n    const seen: Dictionary<boolean> = new Dictionary<boolean>()\r\n    return await new Promise<IInclude[]>(async (resolve, reject) => {\r\n      try {\r\n        while (q.length > 0) {\r\n          const batch: string[] = q.pop()\r\n          for (const next of batch) {\r\n            if (seen.containsKey(next)) {\r\n              continue\r\n            }\r\n            seen.add(next, true)\r\n            const includes: string[] = await this.scanIncludes(next)\r\n            ordered.push({\r\n              parent: next,\r\n              children: includes\r\n            } as IInclude)\r\n            q.push(includes)\r\n          }\r\n        }\r\n        resolve(ordered)\r\n      } catch (e) {\r\n        reject(e)\r\n      }\r\n    })\r\n  }\r\n}\r\n"]}

package/dist/dictionary/parser/fixml/xsd-parser.d.ts

@@ -5,7 +5,7 @@ export declare abstract class XsdParser {
     readonly definitions: FixDefinitions;
     readonly data: ILooseObject[];
     current: ILooseObject;
-    protected pending: string;
+    protected pending: string | null;
     protected constructor(definitions: FixDefinitions);
     parse(file: string): Promise<FixDefinitions>;
     abstract close(line: number, node: string): void;

package/dist/dictionary/parser/fixml/xsd-parser.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XsdParser = void 0;
 const fs = require("fs");
@@ -8,29 +17,31 @@ class XsdParser {
         this.data = [];
     }
     parse(file) {
-        return new Promise((accept, reject) => {
-            const pass = fs.createReadStream(file);
-            const saxStream = require('sax').createStream(true, {});
-            const saxParser = saxStream._parser;
-            saxStream.on('opentag', (node) => {
-                this.open(saxParser.line, node);
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield new Promise((resolve, reject) => {
+                const pass = fs.createReadStream(file);
+                const saxStream = require('sax').createStream(true, {});
+                const saxParser = saxStream._parser;
+                saxStream.on('opentag', (node) => {
+                    this.open(saxParser.line, node);
+                });
+                saxStream.on('closetag', (name) => {
+                    this.close(saxParser.line, name);
+                });
+                saxStream.on('ready', () => {
+                    resolve(this.definitions);
+                });
+                saxStream.on('text', (t) => {
+                    t = t.trim();
+                    if (t.length > 0 && this.pending) {
+                        this.value(saxParser.line, this.pending, t);
+                    }
+                });
+                saxStream.on('error', (r) => {
+                    reject(r);
+                });
+                pass.pipe(saxStream);
             });
-            saxStream.on('closetag', (name) => {
-                this.close(saxParser.line, name);
-            });
-            saxStream.on('ready', () => {
-                accept(this.definitions);
-            });
-            saxStream.on('text', (t) => {
-                t = t.trim();
-                if (t.length > 0 && this.pending) {
-                    this.value(saxParser.line, this.pending, t);
-                }
-            });
-            saxStream.on('error', (r) => {
-                reject(r);
-            });
-            pass.pipe(saxStream);
         });
     }
     assign(node, target) {
@@ -38,7 +49,7 @@ class XsdParser {
             target = this.current;
         }
         const keys = Object.keys(node.attributes);
-        for (let k of keys) {
+        for (const k of keys) {
             target[k] = node.attributes[k];
         }
     }

package/dist/dictionary/parser/fixml/xsd-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"xsd-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/fixml/xsd-parser.ts"],"names":[],"mappings":";;;AAGA,yBAAwB;AAIxB,MAAsB,SAAS;IAK7B,YAAuC,WAA2B;QAA3B,gBAAW,GAAX,WAAW,CAAgB;QAJlD,SAAI,GAAmB,EAAE,CAAA;IAKzC,CAAC;IAEM,KAAK,CAAE,IAAY;QACxB,OAAO,IAAI,OAAO,CAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;YACpD,MAAM,IAAI,GAAkB,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;YACrD,MAAM,SAAS,GAAc,OAAO,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YAClE,MAAM,SAAS,GAAc,SAAS,CAAC,OAAO,CAAA;YAC9C,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC/B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;YAEF,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,IAAY,EAAE,EAAE;gBACxC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAClC,CAAC,CAAC,CAAA;YAEF,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACzB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC1B,CAAC,CAAC,CAAA;YAEF,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE;gBACjC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;gBACZ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;iBAC5C;YACH,CAAC,CAAC,CAAA;YAEF,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBAC1B,MAAM,CAAC,CAAC,CAAC,CAAA;YACX,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACtB,CAAC,CAAC,CAAA;IACJ,CAAC;IAMS,MAAM,CAAE,IAAc,EAAE,MAAqB;QACrD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;SACtB;QACD,MAAM,IAAI,GAAa,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACnD,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;YAClB,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;SAC/B;IACH,CAAC;CACF;AApDD,8BAoDC","sourcesContent":["import { FixDefinitions } from '../../definition'\r\nimport { ILooseObject } from '../../../collections/collection'\r\nimport { SAXStream } from '../../dict-primitive'\r\nimport * as fs from 'fs'\r\nimport { SAXParser } from 'sax'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport abstract class XsdParser {\r\n  public readonly data: ILooseObject[] = []\r\n  public current: ILooseObject\r\n  protected pending: string\r\n\r\n  protected constructor (public readonly definitions: FixDefinitions) {\r\n  }\r\n\r\n  public parse (file: string): Promise<FixDefinitions> {\r\n    return new Promise<FixDefinitions>((accept, reject) => {\r\n      const pass: fs.ReadStream = fs.createReadStream(file)\r\n      const saxStream: SAXStream = require('sax').createStream(true, {})\r\n      const saxParser: SAXParser = saxStream._parser\r\n      saxStream.on('opentag', (node) => {\r\n        this.open(saxParser.line, node)\r\n      })\r\n\r\n      saxStream.on('closetag', (name: string) => {\r\n        this.close(saxParser.line, name)\r\n      })\r\n\r\n      saxStream.on('ready', () => {\r\n        accept(this.definitions)\r\n      })\r\n\r\n      saxStream.on('text', (t: string) => {\r\n        t = t.trim()\r\n        if (t.length > 0 && this.pending) {\r\n          this.value(saxParser.line, this.pending, t)\r\n        }\r\n      })\r\n\r\n      saxStream.on('error', (r) => {\r\n        reject(r)\r\n      })\r\n      pass.pipe(saxStream)\r\n    })\r\n  }\r\n\r\n  public abstract close (line: number, node: string): void\r\n  public abstract open (line: number, node: ISaxNode): void\r\n  public abstract value (line: number, n: string, v: string): void\r\n\r\n  protected assign (node: ISaxNode, target?: ILooseObject): void {\r\n    if (!target) {\r\n      target = this.current\r\n    }\r\n    const keys: string[] = Object.keys(node.attributes)\r\n    for (let k of keys) {\r\n      target[k] = node.attributes[k]\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"xsd-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/fixml/xsd-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,yBAAwB;AAIxB,MAAsB,SAAS;IAK7B,YAAuC,WAA2B;QAA3B,gBAAW,GAAX,WAAW,CAAgB;QAJlD,SAAI,GAAmB,EAAE,CAAA;IAKzC,CAAC;IAEY,KAAK,CAAE,IAAY;;YAC9B,OAAO,MAAM,IAAI,OAAO,CAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC3D,MAAM,IAAI,GAAkB,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAA;gBACrD,MAAM,SAAS,GAAc,OAAO,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;gBAClE,MAAM,SAAS,GAAc,SAAS,CAAC,OAAO,CAAA;gBAC9C,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC/B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBACjC,CAAC,CAAC,CAAA;gBAEF,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,IAAY,EAAE,EAAE;oBACxC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;gBAClC,CAAC,CAAC,CAAA;gBAEF,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;oBACzB,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC3B,CAAC,CAAC,CAAA;gBAEF,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE;oBACjC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;oBACZ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;wBAChC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;qBAC5C;gBACH,CAAC,CAAC,CAAA;gBAEF,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBAC1B,MAAM,CAAC,CAAC,CAAC,CAAA;gBACX,CAAC,CAAC,CAAA;gBACF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YACtB,CAAC,CAAC,CAAA;QACJ,CAAC;KAAA;IAMS,MAAM,CAAE,IAAc,EAAE,MAAqB;QACrD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;SACtB;QACD,MAAM,IAAI,GAAa,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACnD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;YACpB,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;SAC/B;IACH,CAAC;CACF;AApDD,8BAoDC","sourcesContent":["import { FixDefinitions } from '../../definition'\r\nimport { ILooseObject } from '../../../collections/collection'\r\nimport { SAXStream } from '../../dict-primitive'\r\nimport * as fs from 'fs'\r\nimport { SAXParser } from 'sax'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport abstract class XsdParser {\r\n  public readonly data: ILooseObject[] = []\r\n  public current: ILooseObject\r\n  protected pending: string | null\r\n\r\n  protected constructor (public readonly definitions: FixDefinitions) {\r\n  }\r\n\r\n  public async parse (file: string): Promise<FixDefinitions> {\r\n    return await new Promise<FixDefinitions>((resolve, reject) => {\r\n      const pass: fs.ReadStream = fs.createReadStream(file)\r\n      const saxStream: SAXStream = require('sax').createStream(true, {})\r\n      const saxParser: SAXParser = saxStream._parser\r\n      saxStream.on('opentag', (node) => {\r\n        this.open(saxParser.line, node)\r\n      })\r\n\r\n      saxStream.on('closetag', (name: string) => {\r\n        this.close(saxParser.line, name)\r\n      })\r\n\r\n      saxStream.on('ready', () => {\r\n        resolve(this.definitions)\r\n      })\r\n\r\n      saxStream.on('text', (t: string) => {\r\n        t = t.trim()\r\n        if (t.length > 0 && this.pending) {\r\n          this.value(saxParser.line, this.pending, t)\r\n        }\r\n      })\r\n\r\n      saxStream.on('error', (r) => {\r\n        reject(r)\r\n      })\r\n      pass.pipe(saxStream)\r\n    })\r\n  }\r\n\r\n  public abstract close (line: number, node: string): void\r\n  public abstract open (line: number, node: ISaxNode): void\r\n  public abstract value (line: number, n: string, v: string): void\r\n\r\n  protected assign (node: ISaxNode, target?: ILooseObject): void {\r\n    if (!target) {\r\n      target = this.current\r\n    }\r\n    const keys: string[] = Object.keys(node.attributes)\r\n    for (const k of keys) {\r\n      target[k] = node.attributes[k]\r\n    }\r\n  }\r\n}\r\n"]}

package/dist/dictionary/parser/quickfix/field-definition-parser.js

@@ -22,8 +22,6 @@ class FieldDefinitionParser extends node_parser_1.NodeParser {
         }
     }
     close(line, name) {
-        switch (name) {
-        }
     }
 }
 exports.FieldDefinitionParser = FieldDefinitionParser;

package/dist/dictionary/parser/quickfix/field-definition-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"field-definition-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/field-definition-parser.ts"],"names":[],"mappings":";;;AAAA,iDAAwE;AACxE,+CAA0C;AAG1C,MAAa,qBAAsB,SAAQ,wBAAU;IAGnD,YAAa,WAA2B,EAAS,MAAc;QAC7D,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QADqB,WAAM,GAAN,MAAM,CAAQ;IAE/D,CAAC;IAEM,IAAI,CAAE,IAAY,EAAE,IAAc;QACvC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,YAAY,GAAG,IAAI,kCAAqB,CACjC,IAAI,CAAC,UAAU,CAAC,MAAM,EACtB,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,CAAC,UAAU,CAAC,IAAI,EAC9B,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,CAAC,CAAA;gBACP,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBACrD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;gBAC5E,MAAK;aACN;SACF;IACH,CAAC;IAEM,KAAK,CAAE,IAAY,EAAE,IAAY;QACtC,QAAQ,IAAI,EAAE;SACb;IACH,CAAC;CACF;AAjCD,sDAiCC","sourcesContent":["import { FixDefinitions, SimpleFieldDefinition } from '../../definition'\r\nimport { NodeParser } from './node-parser'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport class FieldDefinitionParser extends NodeParser {\r\n  private currentField: SimpleFieldDefinition\r\n\r\n  constructor (definitions: FixDefinitions, public passes: number) {\r\n    super(definitions, passes)\r\n  }\r\n\r\n  public open (line: number, node: ISaxNode): void {\r\n    switch (node.name) {\r\n      case 'field': {\r\n        this.currentField = new SimpleFieldDefinition(\r\n                    node.attributes.number,\r\n                    node.attributes.name,\r\n                    node.attributes.name,\r\n          null,\r\n          null,\r\n          node.attributes.type,\r\n          null)\r\n        this.definitions.addSimpleFieldDef(this.currentField)\r\n        break\r\n      }\r\n\r\n      case 'value': {\r\n        this.currentField.addEnum(node.attributes.enum, node.attributes.description)\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public close (line: number, name: string): void {\r\n    switch (name) {\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"field-definition-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/field-definition-parser.ts"],"names":[],"mappings":";;;AAAA,iDAAwE;AACxE,+CAA0C;AAG1C,MAAa,qBAAsB,SAAQ,wBAAU;IAGnD,YAAa,WAA2B,EAAS,MAAc;QAC7D,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QADqB,WAAM,GAAN,MAAM,CAAQ;IAE/D,CAAC;IAEM,IAAI,CAAE,IAAY,EAAE,IAAc;QACvC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,YAAY,GAAG,IAAI,kCAAqB,CAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,EACtB,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,UAAU,CAAC,IAAI,EACpB,IAAI,CAAC,CAAA;gBACP,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBACrD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;gBAC5E,MAAK;aACN;SACF;IACH,CAAC;IAEM,KAAK,CAAE,IAAY,EAAE,IAAY;IACxC,CAAC;CACF;AA/BD,sDA+BC","sourcesContent":["import { FixDefinitions, SimpleFieldDefinition } from '../../definition'\r\nimport { NodeParser } from './node-parser'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport class FieldDefinitionParser extends NodeParser {\r\n  private currentField: SimpleFieldDefinition\r\n\r\n  constructor (definitions: FixDefinitions, public passes: number) {\r\n    super(definitions, passes)\r\n  }\r\n\r\n  public open (line: number, node: ISaxNode): void {\r\n    switch (node.name) {\r\n      case 'field': {\r\n        this.currentField = new SimpleFieldDefinition(\r\n          node.attributes.number,\r\n          node.attributes.name,\r\n          node.attributes.name,\r\n          null,\r\n          null,\r\n          node.attributes.type,\r\n          null)\r\n        this.definitions.addSimpleFieldDef(this.currentField)\r\n        break\r\n      }\r\n\r\n      case 'value': {\r\n        this.currentField.addEnum(node.attributes.enum, node.attributes.description)\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public close (line: number, name: string): void {\r\n  }\r\n}\r\n"]}

package/dist/dictionary/parser/quickfix/field-set-parser.js

@@ -45,6 +45,7 @@ class FieldSetParser extends node_parser_1.NodeParser {
         }
     }
     close(line, name) {
+        var _a, _b;
         switch (name) {
             case 'group': {
                 this.addGroupField(name);
@@ -53,14 +54,14 @@ class FieldSetParser extends node_parser_1.NodeParser {
             case 'component':
             case 'header':
             case 'trailer': {
-                const latest = this.parseContexts.pop();
+                const latest = (_a = this.parseContexts.pop()) !== null && _a !== void 0 ? _a : null;
                 if (latest == null) {
                     throw new Error(`component field ${name} closes yet does not exist.`);
                 }
                 if (!latest.defining) {
                     return;
                 }
-                const asComponent = latest.asComponent();
+                const asComponent = (_b = latest.asComponent()) !== null && _b !== void 0 ? _b : null;
                 if (asComponent != null) {
                     this.definitions.addComponentFieldDef(asComponent);
                 }

package/dist/dictionary/parser/quickfix/field-set-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"field-set-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/field-set-parser.ts"],"names":[],"mappings":";;;AAAA,iDAA2E;AAC3E,+CAA0C;AAC1C,mDAA8C;AAG9C,MAAa,cAAe,SAAQ,wBAAU;IAC5C,YAAa,WAA2B,EAAS,MAAc;QAC7D,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QADqB,WAAM,GAAN,MAAM,CAAQ;IAE/D,CAAC;IAEM,IAAI,CAAE,IAAY,EAAE,IAAc;QACvC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,WAAW,CAAC;YACjB,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,aAAa,GAAW,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAA;gBAC/D,IAAI,QAAQ,GAAG,aAAa,CAAA;gBAC5B,IAAI,aAAa,KAAK,QAAQ,EAAE;oBAC9B,QAAQ,GAAG,gBAAgB,CAAA;iBAC5B;qBAAM,IAAI,aAAa,KAAK,SAAS,EAAE;oBACtC,QAAQ,GAAG,iBAAiB,CAAA;iBAC7B;gBAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACvB,MAAM,GAAG,GAA6B,IAAI,qCAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;oBACvG,MAAM,OAAO,GAAiB,IAAI,4BAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;oBACnE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBACjC;qBAAM;oBACL,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;oBACtC,MAAM,OAAO,GAAiB,IAAI,4BAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;oBACrE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBACjC;gBACD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gBACpB,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;gBAC/B,MAAK;aACN;SACF;IACH,CAAC;IAEM,KAAK,CAAE,IAAY,EAAE,IAAY;QACtC,QAAQ,IAAI,EAAE;YACZ,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBACxB,MAAK;aACN;YAED,KAAK,WAAW,CAAC;YACjB,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,MAAM,GAAiB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAA;gBACrD,IAAI,MAAM,IAAI,IAAI,EAAE;oBAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,6BAA6B,CAAC,CAAA;iBACtE;gBACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACpB,OAAM;iBACP;gBACD,MAAM,WAAW,GAA6B,MAAM,CAAC,WAAW,EAAE,CAAA;gBAClE,IAAI,WAAW,IAAI,IAAI,EAAE;oBACvB,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;iBACnD;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,CAAC,IAAI,GAAG,CAAC,CAAA;iBAC1E;gBAED,MAAK;aACN;SACF;IACH,CAAC;CACF;AAtED,wCAsEC","sourcesContent":["import { ComponentFieldDefinition, FixDefinitions } from '../../definition'\r\nimport { NodeParser } from './node-parser'\r\nimport { ParseContext } from './parse-context'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport class FieldSetParser extends NodeParser {\r\n  constructor (definitions: FixDefinitions, public passes: number) {\r\n    super(definitions, passes)\r\n  }\r\n\r\n  public open (line: number, node: ISaxNode): void {\r\n    switch (node.name) {\r\n      case 'component':\r\n      case 'header':\r\n      case 'trailer': {\r\n        const componentName: string = node.attributes.name || node.name\r\n        let fullName = componentName\r\n        if (componentName === 'header') {\r\n          fullName = 'StandardHeader'\r\n        } else if (componentName === 'trailer') {\r\n          fullName = 'StandardTrailer'\r\n        }\r\n\r\n        if (!node.isSelfClosing) {\r\n          const set: ComponentFieldDefinition = new ComponentFieldDefinition(fullName, componentName, null, null)\r\n          const context: ParseContext = new ParseContext(fullName, true, set)\r\n          this.parseContexts.push(context)\r\n        } else {\r\n          this.addComponentField(fullName, node)\r\n          const context: ParseContext = new ParseContext(fullName, false, null)\r\n          this.parseContexts.push(context)\r\n        }\r\n        break\r\n      }\r\n\r\n      case 'field': {\r\n        this.addSimple(node)\r\n        break\r\n      }\r\n\r\n      case 'group': {\r\n        this.beginGroupDefinition(node)\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public close (line: number, name: string): void {\r\n    switch (name) {\r\n      case 'group': {\r\n        this.addGroupField(name)\r\n        break\r\n      }\r\n\r\n      case 'component':\r\n      case 'header':\r\n      case 'trailer': {\r\n        const latest: ParseContext = this.parseContexts.pop()\r\n        if (latest == null) {\r\n          throw new Error(`component field ${name} closes yet does not exist.`)\r\n        }\r\n        if (!latest.defining) {\r\n          return\r\n        }\r\n        const asComponent: ComponentFieldDefinition = latest.asComponent()\r\n        if (asComponent != null) {\r\n          this.definitions.addComponentFieldDef(asComponent)\r\n        } else {\r\n          throw new Error(`latest not instance of component field ${latest.name} `)\r\n        }\r\n\r\n        break\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"field-set-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/field-set-parser.ts"],"names":[],"mappings":";;;AAAA,iDAA2E;AAC3E,+CAA0C;AAC1C,mDAA8C;AAG9C,MAAa,cAAe,SAAQ,wBAAU;IAC5C,YAAa,WAA2B,EAAS,MAAc;QAC7D,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QADqB,WAAM,GAAN,MAAM,CAAQ;IAE/D,CAAC;IAEM,IAAI,CAAE,IAAY,EAAE,IAAc;QACvC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,WAAW,CAAC;YACjB,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,aAAa,GAAW,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAA;gBAC/D,IAAI,QAAQ,GAAG,aAAa,CAAA;gBAC5B,IAAI,aAAa,KAAK,QAAQ,EAAE;oBAC9B,QAAQ,GAAG,gBAAgB,CAAA;iBAC5B;qBAAM,IAAI,aAAa,KAAK,SAAS,EAAE;oBACtC,QAAQ,GAAG,iBAAiB,CAAA;iBAC7B;gBAED,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACvB,MAAM,GAAG,GAA6B,IAAI,qCAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;oBACvG,MAAM,OAAO,GAAiB,IAAI,4BAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;oBACnE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBACjC;qBAAM;oBACL,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;oBACtC,MAAM,OAAO,GAAiB,IAAI,4BAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;oBACrE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBACjC;gBACD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gBACpB,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;gBAC/B,MAAK;aACN;SACF;IACH,CAAC;IAEM,KAAK,CAAE,IAAY,EAAE,IAAY;;QACtC,QAAQ,IAAI,EAAE;YACZ,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBACxB,MAAK;aACN;YAED,KAAK,WAAW,CAAC;YACjB,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,MAAM,GAAwB,MAAA,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,mCAAI,IAAI,CAAA;gBACpE,IAAI,MAAM,IAAI,IAAI,EAAE;oBAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,6BAA6B,CAAC,CAAA;iBACtE;gBACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACpB,OAAM;iBACP;gBACD,MAAM,WAAW,GAAoC,MAAA,MAAM,CAAC,WAAW,EAAE,mCAAI,IAAI,CAAA;gBACjF,IAAI,WAAW,IAAI,IAAI,EAAE;oBACvB,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;iBACnD;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,CAAC,IAAI,GAAG,CAAC,CAAA;iBAC1E;gBAED,MAAK;aACN;SACF;IACH,CAAC;CACF;AAtED,wCAsEC","sourcesContent":["import { ComponentFieldDefinition, FixDefinitions } from '../../definition'\r\nimport { NodeParser } from './node-parser'\r\nimport { ParseContext } from './parse-context'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport class FieldSetParser extends NodeParser {\r\n  constructor (definitions: FixDefinitions, public passes: number) {\r\n    super(definitions, passes)\r\n  }\r\n\r\n  public open (line: number, node: ISaxNode): void {\r\n    switch (node.name) {\r\n      case 'component':\r\n      case 'header':\r\n      case 'trailer': {\r\n        const componentName: string = node.attributes.name || node.name\r\n        let fullName = componentName\r\n        if (componentName === 'header') {\r\n          fullName = 'StandardHeader'\r\n        } else if (componentName === 'trailer') {\r\n          fullName = 'StandardTrailer'\r\n        }\r\n\r\n        if (!node.isSelfClosing) {\r\n          const set: ComponentFieldDefinition = new ComponentFieldDefinition(fullName, componentName, null, null)\r\n          const context: ParseContext = new ParseContext(fullName, true, set)\r\n          this.parseContexts.push(context)\r\n        } else {\r\n          this.addComponentField(fullName, node)\r\n          const context: ParseContext = new ParseContext(fullName, false, null)\r\n          this.parseContexts.push(context)\r\n        }\r\n        break\r\n      }\r\n\r\n      case 'field': {\r\n        this.addSimple(node)\r\n        break\r\n      }\r\n\r\n      case 'group': {\r\n        this.beginGroupDefinition(node)\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public close (line: number, name: string): void {\r\n    switch (name) {\r\n      case 'group': {\r\n        this.addGroupField(name)\r\n        break\r\n      }\r\n\r\n      case 'component':\r\n      case 'header':\r\n      case 'trailer': {\r\n        const latest: ParseContext | null = this.parseContexts.pop() ?? null\r\n        if (latest == null) {\r\n          throw new Error(`component field ${name} closes yet does not exist.`)\r\n        }\r\n        if (!latest.defining) {\r\n          return\r\n        }\r\n        const asComponent: ComponentFieldDefinition | null = latest.asComponent() ?? null\r\n        if (asComponent != null) {\r\n          this.definitions.addComponentFieldDef(asComponent)\r\n        } else {\r\n          throw new Error(`latest not instance of component field ${latest.name} `)\r\n        }\r\n\r\n        break\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}

package/dist/dictionary/parser/quickfix/message-parser.js

@@ -17,9 +17,13 @@ class MessageParser extends node_parser_1.NodeParser {
                 const msg = new definition_1.MessageDefinition(att.name, att.name, att.msgtype, att.msgcat, null);
                 const context = new parse_context_1.ParseContext(msg.name, true, msg);
                 const hdr = this.definitions.component.get('StandardHeader');
-                const contained = new contained_1.ContainedComponentField(hdr, msg.fields.length, true);
-                msg.add(contained);
-                this.parseContexts.push(context);
+                const contained = hdr
+                    ? new contained_1.ContainedComponentField(hdr, msg.fields.length, true)
+                    : null;
+                if (contained) {
+                    msg.add(contained);
+                    this.parseContexts.push(context);
+                }
                 break;
             }
             case 'field': {
@@ -41,10 +45,11 @@ class MessageParser extends node_parser_1.NodeParser {
         }
     }
     close(line, name) {
+        var _a, _b;
         switch (name) {
             case 'message': {
-                const parent = this.parseContexts.pop();
-                const message = parent.asMessage();
+                const parent = (_a = this.parseContexts.pop()) !== null && _a !== void 0 ? _a : null;
+                const message = (_b = parent === null || parent === void 0 ? void 0 : parent.asMessage()) !== null && _b !== void 0 ? _b : null;
                 if (message != null) {
                     this.definitions.addMessage(message);
                 }

package/dist/dictionary/parser/quickfix/message-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/message-parser.ts"],"names":[],"mappings":";;;AAAA,iDAAoE;AACpE,+CAA0C;AAC1C,mDAA8C;AAC9C,+CAAyD;AAGzD,MAAa,aAAc,SAAQ,wBAAU;IAE3C,YAAa,WAA2B,EAAS,MAAc;QAC7D,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QADqB,WAAM,GAAN,MAAM,CAAQ;IAE/D,CAAC;IAEM,IAAI,CAAE,IAAY,EAAE,IAAc;QACvC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,GAAG,GAAQ,IAAI,CAAC,UAAU,CAAA;gBAChC,MAAM,GAAG,GAAsB,IAAI,8BAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACvG,MAAM,OAAO,GAAiB,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;gBACnE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;gBAC5D,MAAM,SAAS,GAAG,IAAI,mCAAuB,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC3E,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;gBAClB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAChC,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gBACpB,MAAK;aACN;YAED,KAAK,WAAW,CAAC,CAAC;gBAChB,IAAI,IAAI,CAAC,aAAa,EAAE;oBACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;iBACnD;gBACD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACvB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;iBAChC;gBACD,MAAK;aACN;SACF;IACH,CAAC;IAEM,KAAK,CAAE,IAAY,EAAE,IAAY;QACtC,QAAQ,IAAI,EAAE;YACZ,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,MAAM,GAAiB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAA;gBACrD,MAAM,OAAO,GAAsB,MAAM,CAAC,SAAS,EAAE,CAAA;gBACrD,IAAI,OAAO,IAAI,IAAI,EAAE;oBACnB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;iBACrC;gBACD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBACxB,MAAK;aACN;SACF;IACH,CAAC;CACF;AAzDD,sCAyDC","sourcesContent":["import { FixDefinitions, MessageDefinition } from '../../definition'\r\nimport { NodeParser } from './node-parser'\r\nimport { ParseContext } from './parse-context'\r\nimport { ContainedComponentField } from '../../contained'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport class MessageParser extends NodeParser {\r\n\r\n  constructor (definitions: FixDefinitions, public passes: number) {\r\n    super(definitions, passes)\r\n  }\r\n\r\n  public open (line: number, node: ISaxNode): void {\r\n    switch (node.name) {\r\n      case 'message': {\r\n        const att: any = node.attributes\r\n        const msg: MessageDefinition = new MessageDefinition(att.name, att.name, att.msgtype, att.msgcat, null)\r\n        const context: ParseContext = new ParseContext(msg.name, true, msg)\r\n        const hdr = this.definitions.component.get('StandardHeader')\r\n        const contained = new ContainedComponentField(hdr, msg.fields.length, true)\r\n        msg.add(contained)\r\n        this.parseContexts.push(context)\r\n        break\r\n      }\r\n\r\n      case 'field': {\r\n        this.addSimple(node)\r\n        break\r\n      }\r\n\r\n      case 'component': {\r\n        if (node.isSelfClosing) {\r\n          this.addComponentField(node.attributes.name, node)\r\n        }\r\n        break\r\n      }\r\n\r\n      case 'group': {\r\n        if (!node.isSelfClosing) {\r\n          this.beginGroupDefinition(node)\r\n        }\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public close (line: number, name: string): void {\r\n    switch (name) {\r\n      case 'message': {\r\n        const parent: ParseContext = this.parseContexts.pop()\r\n        const message: MessageDefinition = parent.asMessage()\r\n        if (message != null) {\r\n          this.definitions.addMessage(message)\r\n        }\r\n        break\r\n      }\r\n\r\n      case 'group': {\r\n        this.addGroupField(name)\r\n        break\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"message-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/message-parser.ts"],"names":[],"mappings":";;;AAAA,iDAAoE;AACpE,+CAA0C;AAC1C,mDAA8C;AAC9C,+CAAyD;AAGzD,MAAa,aAAc,SAAQ,wBAAU;IAC3C,YAAa,WAA2B,EAAS,MAAc;QAC7D,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QADqB,WAAM,GAAN,MAAM,CAAQ;IAE/D,CAAC;IAEM,IAAI,CAAE,IAAY,EAAE,IAAc;QACvC,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,GAAG,GAAQ,IAAI,CAAC,UAAU,CAAA;gBAChC,MAAM,GAAG,GAAsB,IAAI,8BAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;gBACvG,MAAM,OAAO,GAAiB,IAAI,4BAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;gBACnE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;gBAC5D,MAAM,SAAS,GAAG,GAAG;oBACnB,CAAC,CAAC,IAAI,mCAAuB,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC;oBAC3D,CAAC,CAAC,IAAI,CAAA;gBACR,IAAI,SAAS,EAAE;oBACb,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;oBAClB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBACjC;gBACD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;gBACpB,MAAK;aACN;YAED,KAAK,WAAW,CAAC,CAAC;gBAChB,IAAI,IAAI,CAAC,aAAa,EAAE;oBACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;iBACnD;gBACD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACvB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;iBAChC;gBACD,MAAK;aACN;SACF;IACH,CAAC;IAEM,KAAK,CAAE,IAAY,EAAE,IAAY;;QACtC,QAAQ,IAAI,EAAE;YACZ,KAAK,SAAS,CAAC,CAAC;gBACd,MAAM,MAAM,GAAwB,MAAA,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,mCAAI,IAAI,CAAA;gBACpE,MAAM,OAAO,GAA6B,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE,mCAAI,IAAI,CAAA;gBACrE,IAAI,OAAO,IAAI,IAAI,EAAE;oBACnB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;iBACrC;gBACD,MAAK;aACN;YAED,KAAK,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;gBACxB,MAAK;aACN;SACF;IACH,CAAC;CACF;AA5DD,sCA4DC","sourcesContent":["import { FixDefinitions, MessageDefinition } from '../../definition'\r\nimport { NodeParser } from './node-parser'\r\nimport { ParseContext } from './parse-context'\r\nimport { ContainedComponentField } from '../../contained'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport class MessageParser extends NodeParser {\r\n  constructor (definitions: FixDefinitions, public passes: number) {\r\n    super(definitions, passes)\r\n  }\r\n\r\n  public open (line: number, node: ISaxNode): void {\r\n    switch (node.name) {\r\n      case 'message': {\r\n        const att: any = node.attributes\r\n        const msg: MessageDefinition = new MessageDefinition(att.name, att.name, att.msgtype, att.msgcat, null)\r\n        const context: ParseContext = new ParseContext(msg.name, true, msg)\r\n        const hdr = this.definitions.component.get('StandardHeader')\r\n        const contained = hdr\r\n          ? new ContainedComponentField(hdr, msg.fields.length, true)\r\n          : null\r\n        if (contained) {\r\n          msg.add(contained)\r\n          this.parseContexts.push(context)\r\n        }\r\n        break\r\n      }\r\n\r\n      case 'field': {\r\n        this.addSimple(node)\r\n        break\r\n      }\r\n\r\n      case 'component': {\r\n        if (node.isSelfClosing) {\r\n          this.addComponentField(node.attributes.name, node)\r\n        }\r\n        break\r\n      }\r\n\r\n      case 'group': {\r\n        if (!node.isSelfClosing) {\r\n          this.beginGroupDefinition(node)\r\n        }\r\n        break\r\n      }\r\n    }\r\n  }\r\n\r\n  public close (line: number, name: string): void {\r\n    switch (name) {\r\n      case 'message': {\r\n        const parent: ParseContext | null = this.parseContexts.pop() ?? null\r\n        const message: MessageDefinition | null = parent?.asMessage() ?? null\r\n        if (message != null) {\r\n          this.definitions.addMessage(message)\r\n        }\r\n        break\r\n      }\r\n\r\n      case 'group': {\r\n        this.addGroupField(name)\r\n        break\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}

package/dist/dictionary/parser/quickfix/node-parser.js

@@ -11,6 +11,7 @@ class NodeParser {
         this.parseContexts = [];
     }
     addSimple(node) {
+        var _a, _b, _c, _d;
         if (node.isSelfClosing) {
             const parent = this.peek();
             if (parent == null) {
@@ -21,19 +22,20 @@ class NodeParser {
             if (fieldDefinition == null) {
                 throw new Error(`simple field ${fieldName} has no declaration in dictionary.`);
             }
-            const containedField = new contained_1.ContainedSimpleField(fieldDefinition, parent.set.fields.length, node.attributes.required === 'Y', false);
-            parent.set.add(containedField);
+            const containedField = new contained_1.ContainedSimpleField(fieldDefinition, (_c = (_b = (_a = parent === null || parent === void 0 ? void 0 : parent.set) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0, node.attributes.required === 'Y', false);
+            (_d = parent === null || parent === void 0 ? void 0 : parent.set) === null || _d === void 0 ? void 0 : _d.add(containedField);
         }
     }
     addComponentField(componentName, node) {
+        var _a, _b, _c, _d;
         const parent = this.peek();
         if (parent == null) {
             throw new Error(`component ${node.name} has no parent on which to add.`);
         }
         const fieldDef = this.definitions.component.get(componentName);
         if (fieldDef != null) {
-            const containedField = new contained_1.ContainedComponentField(fieldDef, parent.set.fields.length, parent.required);
-            parent.set.add(containedField);
+            const containedField = new contained_1.ContainedComponentField(fieldDef, (_c = (_b = (_a = parent === null || parent === void 0 ? void 0 : parent.set) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0, parent.required);
+            (_d = parent === null || parent === void 0 ? void 0 : parent.set) === null || _d === void 0 ? void 0 : _d.add(containedField);
         }
         else {
             if (this.passes >= 4) {
@@ -42,24 +44,28 @@ class NodeParser {
         }
     }
     addGroupField(name) {
-        const group = this.parseContexts.pop();
+        var _a, _b, _c, _d, _e;
+        const group = (_a = this.parseContexts.pop()) !== null && _a !== void 0 ? _a : null;
         if (group == null) {
             throw new Error(`group field ${name} closes yet does not exist.`);
         }
         const parent = this.peek();
         if (parent != null) {
             const asGroup = group.asGroup();
-            const containedField = new contained_1.ContainedGroupField(asGroup, parent.set.fields.length, group.required);
-            parent.set.add(containedField);
+            if (asGroup) {
+                const containedField = new contained_1.ContainedGroupField(asGroup, (_d = (_c = (_b = parent === null || parent === void 0 ? void 0 : parent.set) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0, group.required);
+                (_e = parent === null || parent === void 0 ? void 0 : parent.set) === null || _e === void 0 ? void 0 : _e.add(containedField);
+            }
         }
         else {
             throw new Error(`group field ${group.name} has no parent on which to add.`);
         }
     }
     beginGroupDefinition(node) {
+        var _a;
         if (!node.isSelfClosing) {
             const groupName = node.attributes.name;
-            const noOfField = this.definitions.simple.get(groupName);
+            const noOfField = (_a = this.definitions.simple.get(groupName)) !== null && _a !== void 0 ? _a : null;
             if (noOfField == null) {
                 const msg = `group ${groupName} has no field defined.`;
                 throw new Error(msg);

package/dist/dictionary/parser/quickfix/node-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/node-parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { ContainedGroupField, ContainedSimpleField, ContainedComponentField } from '../../contained'\r\nimport { FixDefinitions, GroupFieldDefinition, SimpleFieldDefinition, ComponentFieldDefinition } from '../../definition'\r\nimport { ParseContext } from './parse-context'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport abstract class NodeParser {\r\n  protected readonly parseContexts: ParseContext[] = []\r\n\r\n  protected constructor (public readonly definitions: FixDefinitions, public passes: number) {\r\n  }\r\n\r\n  public abstract open (line: number, node: ISaxNode): void\r\n\r\n  public abstract close (line: number, node: string): void\r\n\r\n  protected addSimple (node: ISaxNode): void {\r\n    if (node.isSelfClosing) {\r\n      const parent: ParseContext = this.peek()\r\n      if (parent == null) {\r\n        throw new Error(`simple field ${node.name} has no parent on which to add.`)\r\n      }\r\n      const fieldName: string = node.attributes.name\r\n      const fieldDefinition: SimpleFieldDefinition = this.definitions.simple.get(fieldName)\r\n      if (fieldDefinition == null) {\r\n        throw new Error(`simple field ${fieldName} has no declaration in dictionary.`)\r\n      }\r\n      const containedField: ContainedSimpleField = new ContainedSimpleField(fieldDefinition,\r\n                parent.set.fields.length, node.attributes.required === 'Y', false)\r\n      parent.set.add(containedField)\r\n    }\r\n  }\r\n\r\n  protected addComponentField (componentName: string, node: ISaxNode): void {\r\n    const parent: ParseContext = this.peek()\r\n    if (parent == null) {\r\n      throw new Error(`component ${node.name} has no parent on which to add.`)\r\n    }\r\n    const fieldDef: ComponentFieldDefinition = this.definitions.component.get(componentName)\r\n    if (fieldDef != null) {\r\n      const containedField: ContainedComponentField =\r\n                new ContainedComponentField(fieldDef, parent.set.fields.length, parent.required)\r\n      parent.set.add(containedField)\r\n    } else {\r\n      if (this.passes >= 4) {\r\n        throw new Error(`field ${node.name} includes unknown component ${componentName}.`)\r\n      }\r\n    }\r\n  }\r\n\r\n  protected addGroupField (name: string): void {\r\n    const group: ParseContext = this.parseContexts.pop()\r\n    if (group == null) {\r\n      throw new Error(`group field ${name} closes yet does not exist.`)\r\n    }\r\n    const parent: ParseContext = this.peek()\r\n    if (parent != null) {\r\n      const asGroup: GroupFieldDefinition = group.asGroup()\r\n      const containedField: ContainedGroupField =\r\n                new ContainedGroupField(asGroup, parent.set.fields.length, group.required)\r\n      parent.set.add(containedField)\r\n    } else {\r\n      throw new Error(`group field ${group.name} has no parent on which to add.`)\r\n    }\r\n  }\r\n\r\n  protected beginGroupDefinition (node: ISaxNode): void {\r\n    if (!node.isSelfClosing) {\r\n            // a group should have a field that matches its name\r\n      const groupName: string = node.attributes.name\r\n      const noOfField: SimpleFieldDefinition = this.definitions.simple.get(groupName)\r\n      if (noOfField == null) {\r\n        const msg: string = `group ${groupName} has no field defined.`\r\n        throw new Error(msg)\r\n      }\r\n      const set: GroupFieldDefinition = new GroupFieldDefinition(groupName, groupName, null, noOfField,null)\r\n      const context: ParseContext = new ParseContext(node.attributes.name, true, set)\r\n      context.required = node.attributes.required === 'Y'\r\n      this.parseContexts.push(context)\r\n    }\r\n  }\r\n\r\n  private peek (): ParseContext {\r\n    return this.parseContexts.length > 0 ? this.parseContexts[this.parseContexts.length - 1] : null\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"node-parser.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/node-parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { ContainedGroupField, ContainedSimpleField, ContainedComponentField } from '../../contained'\r\nimport { FixDefinitions, GroupFieldDefinition, SimpleFieldDefinition, ComponentFieldDefinition } from '../../definition'\r\nimport { ParseContext } from './parse-context'\r\nimport { ISaxNode } from '../../sax-node'\r\n\r\nexport abstract class NodeParser {\r\n  protected readonly parseContexts: ParseContext[] = []\r\n\r\n  protected constructor (public readonly definitions: FixDefinitions, public passes: number) {\r\n  }\r\n\r\n  public abstract open (line: number, node: ISaxNode): void\r\n\r\n  public abstract close (line: number, node: string): void\r\n\r\n  protected addSimple (node: ISaxNode): void {\r\n    if (node.isSelfClosing) {\r\n      const parent: ParseContext | null = this.peek()\r\n      if (parent == null) {\r\n        throw new Error(`simple field ${node.name} has no parent on which to add.`)\r\n      }\r\n      const fieldName: string = node.attributes.name\r\n      const fieldDefinition: SimpleFieldDefinition | null = this.definitions.simple.get(fieldName)\r\n      if (fieldDefinition == null) {\r\n        throw new Error(`simple field ${fieldName} has no declaration in dictionary.`)\r\n      }\r\n      const containedField: ContainedSimpleField = new ContainedSimpleField(fieldDefinition,\r\n        parent?.set?.fields?.length ?? 0, node.attributes.required === 'Y', false)\r\n      parent?.set?.add(containedField)\r\n    }\r\n  }\r\n\r\n  protected addComponentField (componentName: string, node: ISaxNode): void {\r\n    const parent: ParseContext | null = this.peek()\r\n    if (parent == null) {\r\n      throw new Error(`component ${node.name} has no parent on which to add.`)\r\n    }\r\n    const fieldDef: ComponentFieldDefinition | null = this.definitions.component.get(componentName)\r\n    if (fieldDef != null) {\r\n      const containedField: ContainedComponentField =\r\n                new ContainedComponentField(fieldDef, parent?.set?.fields?.length ?? 0, parent.required)\r\n      parent?.set?.add(containedField)\r\n    } else {\r\n      if (this.passes >= 4) {\r\n        throw new Error(`field ${node.name} includes unknown component ${componentName}.`)\r\n      }\r\n    }\r\n  }\r\n\r\n  protected addGroupField (name: string): void {\r\n    const group: ParseContext | null = this.parseContexts.pop() ?? null\r\n    if (group == null) {\r\n      throw new Error(`group field ${name} closes yet does not exist.`)\r\n    }\r\n    const parent: ParseContext | null = this.peek()\r\n    if (parent != null) {\r\n      const asGroup: GroupFieldDefinition | null = group.asGroup()\r\n      if (asGroup) {\r\n        const containedField: ContainedGroupField =\r\n          new ContainedGroupField(asGroup, parent?.set?.fields?.length ?? 0, group.required)\r\n        parent?.set?.add(containedField)\r\n      }\r\n    } else {\r\n      throw new Error(`group field ${group.name} has no parent on which to add.`)\r\n    }\r\n  }\r\n\r\n  protected beginGroupDefinition (node: ISaxNode): void {\r\n    if (!node.isSelfClosing) {\r\n      // a group should have a field that matches its name\r\n      const groupName: string = node.attributes.name\r\n      const noOfField: SimpleFieldDefinition | null = this.definitions.simple.get(groupName) ?? null\r\n      if (noOfField == null) {\r\n        const msg: string = `group ${groupName} has no field defined.`\r\n        throw new Error(msg)\r\n      }\r\n      const set: GroupFieldDefinition = new GroupFieldDefinition(groupName, groupName, null, noOfField, null)\r\n      const context: ParseContext = new ParseContext(node.attributes.name, true, set)\r\n      context.required = node.attributes.required === 'Y'\r\n      this.parseContexts.push(context)\r\n    }\r\n  }\r\n\r\n  private peek (): ParseContext | null {\r\n    return this.parseContexts.length > 0 ? this.parseContexts[this.parseContexts.length - 1] : null\r\n  }\r\n}\r\n"]}

package/dist/dictionary/parser/quickfix/parse-context.d.ts

@@ -3,10 +3,10 @@ import { ComponentFieldDefinition, GroupFieldDefinition, MessageDefinition } fro
 export declare class ParseContext {
     name: string;
     defining: boolean;
-    set: ContainedFieldSet;
+    set: ContainedFieldSet | null;
     required: boolean;
-    constructor(name: string, defining: boolean, set: ContainedFieldSet);
-    asMessage(): MessageDefinition;
-    asComponent(): ComponentFieldDefinition;
-    asGroup(): GroupFieldDefinition;
+    constructor(name: string, defining: boolean, set: ContainedFieldSet | null);
+    asMessage(): MessageDefinition | null;
+    asComponent(): ComponentFieldDefinition | null;
+    asGroup(): GroupFieldDefinition | null;
 }

package/dist/dictionary/parser/quickfix/parse-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-context.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/parse-context.ts"],"names":[],"mappings":";;;AACA,iDAAoG;AAEpG,MAAa,YAAY;IAGvB,YAAoB,IAAY,EAAS,QAAiB,EAAS,GAAsB;QAArE,SAAI,GAAJ,IAAI,CAAQ;QAAS,aAAQ,GAAR,QAAQ,CAAS;QAAS,QAAG,GAAH,GAAG,CAAmB;QACvF,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;IACvB,CAAC;IAEM,SAAS;QACd,MAAM,GAAG,GAAY,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,YAAY,8BAAiB,CAAA;QAC9E,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,CAAsB,CAAA;SACvC;aAAM;YACL,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAEM,WAAW;QAChB,MAAM,GAAG,GAAY,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,YAAY,qCAAwB,CAAA;QACrF,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,CAA6B,CAAA;SAC9C;aAAM;YACL,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAEM,OAAO;QACZ,MAAM,GAAG,GAAY,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,YAAY,iCAAoB,CAAA;QACjF,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,CAAyB,CAAA;SAC1C;aAAM;YACL,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;CACF;AAjCD,oCAiCC","sourcesContent":["import { ContainedFieldSet } from '../../contained'\r\nimport { ComponentFieldDefinition, GroupFieldDefinition, MessageDefinition } from '../../definition'\r\n\r\nexport class ParseContext {\r\n  public required: boolean\r\n\r\n  constructor (public name: string, public defining: boolean, public set: ContainedFieldSet) {\r\n    this.required = false\r\n  }\r\n\r\n  public asMessage (): MessageDefinition {\r\n    const res: boolean = this.set != null && this.set instanceof MessageDefinition\r\n    if (res) {\r\n      return (this.set) as MessageDefinition\r\n    } else {\r\n      return null\r\n    }\r\n  }\r\n\r\n  public asComponent (): ComponentFieldDefinition {\r\n    const res: boolean = this.set != null && this.set instanceof ComponentFieldDefinition\r\n    if (res) {\r\n      return (this.set) as ComponentFieldDefinition\r\n    } else {\r\n      return null\r\n    }\r\n  }\r\n\r\n  public asGroup (): GroupFieldDefinition {\r\n    const res: boolean = this.set != null && this.set instanceof GroupFieldDefinition\r\n    if (res) {\r\n      return (this.set) as GroupFieldDefinition\r\n    } else {\r\n      return null\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"parse-context.js","sourceRoot":"","sources":["../../../../src/dictionary/parser/quickfix/parse-context.ts"],"names":[],"mappings":";;;AACA,iDAAoG;AAEpG,MAAa,YAAY;IAGvB,YAAoB,IAAY,EAAS,QAAiB,EAAS,GAA6B;QAA5E,SAAI,GAAJ,IAAI,CAAQ;QAAS,aAAQ,GAAR,QAAQ,CAAS;QAAS,QAAG,GAAH,GAAG,CAA0B;QAC9F,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;IACvB,CAAC;IAEM,SAAS;QACd,MAAM,GAAG,GAAY,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,YAAY,8BAAiB,CAAA;QAC9E,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,CAAsB,CAAA;SACvC;aAAM;YACL,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAEM,WAAW;QAChB,MAAM,GAAG,GAAY,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,YAAY,qCAAwB,CAAA;QACrF,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,CAA6B,CAAA;SAC9C;aAAM;YACL,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;IAEM,OAAO;QACZ,MAAM,GAAG,GAAY,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,YAAY,iCAAoB,CAAA;QACjF,IAAI,GAAG,EAAE;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,CAAyB,CAAA;SAC1C;aAAM;YACL,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;CACF;AAjCD,oCAiCC","sourcesContent":["import { ContainedFieldSet } from '../../contained'\r\nimport { ComponentFieldDefinition, GroupFieldDefinition, MessageDefinition } from '../../definition'\r\n\r\nexport class ParseContext {\r\n  public required: boolean\r\n\r\n  constructor (public name: string, public defining: boolean, public set: ContainedFieldSet | null) {\r\n    this.required = false\r\n  }\r\n\r\n  public asMessage (): MessageDefinition | null {\r\n    const res: boolean = this.set != null && this.set instanceof MessageDefinition\r\n    if (res) {\r\n      return (this.set) as MessageDefinition\r\n    } else {\r\n      return null\r\n    }\r\n  }\r\n\r\n  public asComponent (): ComponentFieldDefinition | null {\r\n    const res: boolean = this.set != null && this.set instanceof ComponentFieldDefinition\r\n    if (res) {\r\n      return (this.set) as ComponentFieldDefinition\r\n    } else {\r\n      return null\r\n    }\r\n  }\r\n\r\n  public asGroup (): GroupFieldDefinition | null {\r\n    const res: boolean = this.set != null && this.set instanceof GroupFieldDefinition\r\n    if (res) {\r\n      return (this.set) as GroupFieldDefinition\r\n    } else {\r\n      return null\r\n    }\r\n  }\r\n}\r\n"]}