@gisce/ooui 0.4.0 → 0.4.1

package/dist/Graph/GraphChart.d.ts

@@ -3,7 +3,7 @@ import { Graph, GraphType } from "./Graph";
 export declare class GraphChart extends Graph {
     _x: GraphAxis | undefined;
     get x(): GraphAxis | undefined;
-    _y: GraphAxis | undefined;
-    get y(): GraphAxis | undefined;
+    _y: GraphAxis[] | undefined;
+    get y(): GraphAxis[] | undefined;
     constructor(type: GraphType, element: HTMLElement);
 }

package/dist/Graph/graphHelper.d.ts

@@ -1,6 +1,6 @@
 import { GraphAxis } from ".";
 export declare type XYAxis = {
-    x: GraphAxis;
-    y: GraphAxis;
+    x: GraphAxis | undefined;
+    y: GraphAxis[];
 };
 export declare const parseXYAxis: (nodes: NodeListOf<ChildNode>) => XYAxis;

package/dist/Graph/graphHelper.js

@@ -1,6 +1,6 @@
 import { GraphAxis } from ".";
 export var parseXYAxis = function (nodes) {
-    var xyAxis = {};
+    var xyAxis = { x: undefined, y: [] };
     Array.prototype.forEach.call(nodes, function (child) {
         if (child.nodeType === child.ELEMENT_NODE) {
             if (child.nodeName === "field") {
@@ -25,7 +25,7 @@ export var parseXYAxis = function (nodes) {
                 xyAxis.x = graphAxis;
             }
             else if (axis === "y") {
-                xyAxis.y = graphAxis;
+                xyAxis.y.push(graphAxis);
             }
         }
     });

package/dist/Graph/graphHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphHelper.js","sourceRoot":"","sources":["../../src/Graph/graphHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAY,MAAM,GAAG,CAAC;AAQ9C,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,KAA4B;IACtD,IAAM,MAAM,GAAQ,EAAE,CAAC;IAEvB,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,KAAc;QACjD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,EAAE;YACzC,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;aAC/B;YACD,IAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAChD,IAAM,MAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAE1C,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,WAAS,MAAI,0BAAuB,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,MAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;aACrD;YAED,IAAM,SAAS,GAAG,IAAI,SAAS,CAAC;gBAC9B,IAAI,EAAE,IAAY;gBAClB,IAAI,QAAA;gBACJ,QAAQ,EAAE,QAAoB;gBAC9B,KAAK,EAAE,KAAK,IAAI,SAAS;aAC1B,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,GAAG,EAAE;gBAChB,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;aACtB;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE;gBACvB,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;aACtB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAgB,CAAC;AAC1B,CAAC,CAAC"}
+{"version":3,"file":"graphHelper.js","sourceRoot":"","sources":["../../src/Graph/graphHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAY,MAAM,GAAG,CAAC;AAO9C,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,KAA4B;IACtD,IAAM,MAAM,GAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;IAE/C,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,KAAc;QACjD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,EAAE;YACzC,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;aAC/B;YACD,IAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAChD,IAAM,MAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YACxC,IAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAE1C,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,WAAS,MAAI,0BAAuB,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,MAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;aACrD;YAED,IAAM,SAAS,GAAG,IAAI,SAAS,CAAC;gBAC9B,IAAI,EAAE,IAAY;gBAClB,IAAI,QAAA;gBACJ,QAAQ,EAAE,QAAoB;gBAC9B,KAAK,EAAE,KAAK,IAAI,SAAS;aAC1B,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,GAAG,EAAE;gBAChB,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;aACtB;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE;gBACvB,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC1B;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAgB,CAAC;AAC1B,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "dependencies": {},
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Graph/GraphChart.ts

@@ -8,8 +8,8 @@ export class GraphChart extends Graph {
     return this._x;
   }
 
-  _y: GraphAxis | undefined;
-  get y(): GraphAxis | undefined {
+  _y: GraphAxis[] | undefined;
+  get y(): GraphAxis[] | undefined {
     return this._y;
   }
   constructor(type: GraphType, element: HTMLElement) {

package/src/Graph/graphHelper.ts

@@ -1,13 +1,12 @@
 import { Axis, GraphAxis, Operator } from ".";
-import { Label } from "..";
 
 export type XYAxis = {
-  x: GraphAxis;
-  y: GraphAxis;
+  x: GraphAxis | undefined;
+  y: GraphAxis[];
 };
 
 export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
-  const xyAxis: any = {};
+  const xyAxis: XYAxis = { x: undefined, y: [] };
 
   Array.prototype.forEach.call(nodes, (child: Element) => {
     if (child.nodeType === child.ELEMENT_NODE) {
@@ -36,7 +35,7 @@ export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
       if (axis === "x") {
         xyAxis.x = graphAxis;
       } else if (axis === "y") {
-        xyAxis.y = graphAxis;
+        xyAxis.y.push(graphAxis);
       }
     }
   });

package/src/spec/Graph.spec.ts

@@ -1,4 +1,4 @@
-import { GraphIndicator, GraphChart, parseGraph } from "..";
+import { GraphIndicator, GraphChart, parseGraph, GraphAxis } from "..";
 
 describe("A Graph", () => {
   it("should parse a basic XML title and type indicator", () => {
@@ -22,14 +22,16 @@ describe("A Graph", () => {
     `;
 
     const graph = parseGraph(xml) as GraphChart;
+    const y: GraphAxis = graph.y![0];
+
     expect(graph.type).toBe("line");
     expect(graph.x).toBeDefined();
     expect(graph.y).toBeDefined();
     expect(graph.x?.name).toBe("data_alta");
-    expect(graph.y?.name).toBe("data_alta");
+    expect(y.name).toBe("data_alta");
     expect(graph.x?.axis).toBe("x");
-    expect(graph.y?.axis).toBe("y");
+    expect(y.axis).toBe("y");
     expect(graph.x?.operator).toBeNull();
-    expect(graph.y?.operator).toBe("+");
+    expect(y.operator).toBe("+");
   });
 });