@gisce/ooui 0.5.1 → 0.6.2

package/dist/Graph/GraphAxis.d.ts

@@ -1,10 +1,10 @@
 export declare type Axis = "x" | "y";
 export declare type Operator = "count" | "+" | "-" | "*" | "min" | "max" | "avg";
 export declare class GraphAxis {
-    _name: string | undefined;
-    get name(): string | undefined;
-    _axis: Axis | undefined;
-    get axis(): Axis | undefined;
+    _name: string;
+    get name(): string;
+    _axis: Axis;
+    get axis(): Axis;
     _operator: Operator | undefined;
     get operator(): Operator | undefined;
     _label: string | undefined;
@@ -13,6 +13,6 @@ export declare class GraphAxis {
         name: string;
         axis: Axis;
         operator?: Operator;
-        label: string | undefined;
+        label?: string;
     });
 }

package/dist/Graph/GraphChart.d.ts

@@ -1,9 +1,9 @@
 import { GraphAxis } from ".";
 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;
+    _x: GraphAxis;
+    get x(): GraphAxis;
+    _y: GraphAxis[];
+    get y(): GraphAxis[];
     constructor(type: GraphType, element: HTMLElement);
 }

package/dist/Graph/GraphIndicatorField.d.ts

@@ -2,9 +2,9 @@ import { Operator } from ".";
 import { GraphType } from "./Graph";
 import { GraphIndicator } from "./GraphIndicator";
 export declare class GraphIndicatorField extends GraphIndicator {
-    _field: string | null;
-    get field(): string | null;
-    _operator: Operator | null;
-    get operator(): Operator | null;
+    _field: string | undefined;
+    get field(): string | undefined;
+    _operator: Operator | undefined;
+    get operator(): Operator | undefined;
     constructor(type: GraphType, element: HTMLElement);
 }

package/dist/Graph/GraphIndicatorField.js

@@ -16,13 +16,11 @@ var GraphIndicatorField = /** @class */ (function (_super) {
     __extends(GraphIndicatorField, _super);
     function GraphIndicatorField(type, element) {
         var _this = _super.call(this, type, element) || this;
-        _this._field = null;
-        _this._operator = null;
         Array.prototype.forEach.call(element.childNodes, function (child) {
             if (child.nodeType === child.ELEMENT_NODE && child.nodeName === "field") {
                 var name_1 = child.getAttribute("name");
                 var operator = child.getAttribute("operator");
-                _this._field = name_1;
+                _this._field = name_1 || undefined;
                 _this._operator = operator;
             }
         });

package/dist/Graph/GraphIndicatorField.js.map

@@ -1 +1 @@
-{"version":3,"file":"GraphIndicatorField.js","sourceRoot":"","sources":["../../src/Graph/GraphIndicatorField.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;IAAyC,uCAAc;IAWrD,6BAAY,IAAe,EAAE,OAAoB;QAAjD,YACE,kBAAM,IAAI,EAAE,OAAO,CAAC,SAUrB;QArBD,YAAM,GAAkB,IAAI,CAAC;QAK7B,eAAS,GAAoB,IAAI,CAAC;QAQhC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,UAAC,KAAc;YAC9D,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;gBACvE,IAAM,MAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gBACxC,IAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gBAChD,KAAI,CAAC,MAAM,GAAG,MAAI,CAAC;gBACnB,KAAI,CAAC,SAAS,GAAG,QAAoB,CAAC;aACvC;QACH,CAAC,CAAC,CAAC;;IACL,CAAC;IApBD,sBAAI,sCAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAGD,sBAAI,yCAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;;;OAAA;IAcH,0BAAC;AAAD,CAAC,AAvBD,CAAyC,cAAc,GAuBtD"}
+{"version":3,"file":"GraphIndicatorField.js","sourceRoot":"","sources":["../../src/Graph/GraphIndicatorField.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD;IAAyC,uCAAc;IAWrD,6BAAY,IAAe,EAAE,OAAoB;QAAjD,YACE,kBAAM,IAAI,EAAE,OAAO,CAAC,SAUrB;QARC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,UAAC,KAAc;YAC9D,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;gBACvE,IAAM,MAAI,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gBACxC,IAAM,QAAQ,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gBAChD,KAAI,CAAC,MAAM,GAAG,MAAI,IAAI,SAAS,CAAC;gBAChC,KAAI,CAAC,SAAS,GAAG,QAAoB,CAAC;aACvC;QACH,CAAC,CAAC,CAAC;;IACL,CAAC;IApBD,sBAAI,sCAAK;aAAT;YACE,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;;;OAAA;IAGD,sBAAI,yCAAQ;aAAZ;YACE,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;;;OAAA;IAcH,0BAAC;AAAD,CAAC,AAvBD,CAAyC,cAAc,GAuBtD"}

package/dist/Graph/graphHelper.d.ts

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

package/dist/Graph/graphHelper.js

@@ -1,6 +1,7 @@
 import { GraphAxis } from ".";
 export var parseXYAxis = function (nodes) {
-    var xyAxis = { x: undefined, y: [] };
+    var yAxisElements = [];
+    var xAxis;
     Array.prototype.forEach.call(nodes, function (child) {
         if (child.nodeType === child.ELEMENT_NODE && child.nodeName === "field") {
             var axis = child.getAttribute("axis");
@@ -16,17 +17,26 @@ export var parseXYAxis = function (nodes) {
             var graphAxis = new GraphAxis({
                 axis: axis,
                 name: name_1,
-                operator: operator,
+                operator: operator ? operator : undefined,
                 label: label || undefined,
             });
             if (axis === "x") {
-                xyAxis.x = graphAxis;
+                xAxis = graphAxis;
             }
             else if (axis === "y") {
-                xyAxis.y.push(graphAxis);
+                yAxisElements.push(graphAxis);
             }
         }
     });
-    return xyAxis;
+    if (!xAxis) {
+        throw new Error("No x axis found");
+    }
+    if (!yAxisElements.length) {
+        throw new Error("No y axis found. At least we need one y axis");
+    }
+    return {
+        x: xAxis,
+        y: yAxisElements,
+    };
 };
 //# sourceMappingURL=graphHelper.js.map

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;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,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;YACvE,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"}
+{"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,aAAa,GAAgB,EAAE,CAAC;IACtC,IAAI,KAAK,CAAC;IAEV,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,UAAC,KAAc;QACjD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE;YACvE,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,QAAQ,CAAC,CAAC,CAAE,QAAqB,CAAC,CAAC,CAAC,SAAS;gBACvD,KAAK,EAAE,KAAK,IAAI,SAAS;aAC1B,CAAC,CAAC;YAEH,IAAI,IAAI,KAAK,GAAG,EAAE;gBAChB,KAAK,GAAG,SAAS,CAAC;aACnB;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE;gBACvB,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC/B;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IAED,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IAED,OAAO;QACL,CAAC,EAAE,KAAK;QACR,CAAC,EAAE,aAAa;KACjB,CAAC;AACJ,CAAC,CAAC"}

package/package.json

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

package/src/Graph/GraphAxis.ts

@@ -2,13 +2,13 @@ export type Axis = "x" | "y";
 export type Operator = "count" | "+" | "-" | "*" | "min" | "max" | "avg";
 
 export class GraphAxis {
-  _name: string | undefined;
-  get name(): string | undefined {
+  _name: string;
+  get name(): string {
     return this._name;
   }
 
-  _axis: Axis | undefined;
-  get axis(): Axis | undefined {
+  _axis: Axis;
+  get axis(): Axis {
     return this._axis;
   }
 
@@ -31,7 +31,7 @@ export class GraphAxis {
     name: string;
     axis: Axis;
     operator?: Operator;
-    label: string | undefined;
+    label?: string;
   }) {
     this._name = name;
     this._axis = axis;

package/src/Graph/GraphChart.ts

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

package/src/Graph/GraphIndicatorField.ts

@@ -3,13 +3,13 @@ import { GraphType } from "./Graph";
 import { GraphIndicator } from "./GraphIndicator";
 
 export class GraphIndicatorField extends GraphIndicator {
-  _field: string | null = null;
-  get field(): string | null {
+  _field: string | undefined;
+  get field(): string | undefined {
     return this._field;
   }
 
-  _operator: Operator | null = null;
-  get operator(): Operator | null {
+  _operator: Operator | undefined;
+  get operator(): Operator | undefined {
     return this._operator;
   }
 
@@ -20,7 +20,7 @@ export class GraphIndicatorField extends GraphIndicator {
       if (child.nodeType === child.ELEMENT_NODE && child.nodeName === "field") {
         const name = child.getAttribute("name");
         const operator = child.getAttribute("operator");
-        this._field = name;
+        this._field = name || undefined;
         this._operator = operator as Operator;
       }
     });

package/src/Graph/graphHelper.ts

@@ -1,12 +1,13 @@
 import { Axis, GraphAxis, Operator } from ".";
 
 export type XYAxis = {
-  x: GraphAxis | undefined;
+  x: GraphAxis;
   y: GraphAxis[];
 };
 
 export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
-  const xyAxis: XYAxis = { x: undefined, y: [] };
+  const yAxisElements: GraphAxis[] = [];
+  let xAxis;
 
   Array.prototype.forEach.call(nodes, (child: Element) => {
     if (child.nodeType === child.ELEMENT_NODE && child.nodeName === "field") {
@@ -26,17 +27,28 @@ export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
       const graphAxis = new GraphAxis({
         axis: axis as Axis,
         name,
-        operator: operator as Operator,
+        operator: operator ? (operator as Operator) : undefined,
         label: label || undefined,
       });
 
       if (axis === "x") {
-        xyAxis.x = graphAxis;
+        xAxis = graphAxis;
       } else if (axis === "y") {
-        xyAxis.y.push(graphAxis);
+        yAxisElements.push(graphAxis);
       }
     }
   });
 
-  return xyAxis as XYAxis;
+  if (!xAxis) {
+    throw new Error("No x axis found");
+  }
+
+  if (!yAxisElements.length) {
+    throw new Error("No y axis found. At least we need one y axis");
+  }
+
+  return {
+    x: xAxis,
+    y: yAxisElements,
+  };
 };

package/src/spec/Graph.spec.ts

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