@gisce/ooui 0.4.0 → 0.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Graph/GraphChart.d.ts +2 -2
- package/dist/Graph/graphHelper.d.ts +2 -2
- package/dist/Graph/graphHelper.js +2 -2
- package/dist/Graph/graphHelper.js.map +1 -1
- package/dist/helpers/contextParser.js +2 -1
- package/dist/helpers/contextParser.js.map +1 -1
- package/package.json +1 -1
- package/src/Graph/GraphChart.ts +2 -2
- package/src/Graph/graphHelper.ts +4 -5
- package/src/helpers/contextParser.ts +2 -1
- package/src/spec/Graph.spec.ts +6 -4
- package/src/spec/contextParser.spec.ts +9 -0
|
@@ -3,7 +3,7 @@ import { Graph, GraphType } from "./Graph";
|
|
|
3
3
|
export declare class GraphChart extends Graph {
|
|
4
4
|
_x: GraphAxis | undefined;
|
|
5
5
|
get x(): GraphAxis | undefined;
|
|
6
|
-
_y: GraphAxis | undefined;
|
|
7
|
-
get y(): GraphAxis | undefined;
|
|
6
|
+
_y: GraphAxis[] | undefined;
|
|
7
|
+
get y(): GraphAxis[] | undefined;
|
|
8
8
|
constructor(type: GraphType, element: HTMLElement);
|
|
9
9
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { GraphAxis } from ".";
|
|
2
2
|
export var parseXYAxis = function (nodes) {
|
|
3
|
-
var xyAxis = {};
|
|
3
|
+
var xyAxis = { x: undefined, y: [] };
|
|
4
4
|
Array.prototype.forEach.call(nodes, function (child) {
|
|
5
5
|
if (child.nodeType === child.ELEMENT_NODE) {
|
|
6
6
|
if (child.nodeName === "field") {
|
|
@@ -25,7 +25,7 @@ export var parseXYAxis = function (nodes) {
|
|
|
25
25
|
xyAxis.x = graphAxis;
|
|
26
26
|
}
|
|
27
27
|
else if (axis === "y") {
|
|
28
|
-
xyAxis.y
|
|
28
|
+
xyAxis.y.push(graphAxis);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphHelper.js","sourceRoot":"","sources":["../../src/Graph/graphHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,SAAS,EAAY,MAAM,GAAG,CAAC;
|
|
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,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"}
|
|
@@ -9,7 +9,8 @@ export var parseContext = function (_a) {
|
|
|
9
9
|
return undefined;
|
|
10
10
|
}
|
|
11
11
|
// TODO: maybe this can be accomplished more performant and elegant with regex
|
|
12
|
-
var
|
|
12
|
+
var singleQuotesReplace = context.replace(/\"/g, "'");
|
|
13
|
+
var strNoWhitespaces = singleQuotesReplace.replace(/\s/g, "");
|
|
13
14
|
var replaceTrue = strNoWhitespaces.replace(/True/g, "true");
|
|
14
15
|
var replaceFalse = replaceTrue.replace(/False/g, "false");
|
|
15
16
|
var strNoClauLeft = replaceFalse.replace(/\{/g, "");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contextParser.js","sourceRoot":"","sources":["../../src/helpers/contextParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,CAAC,IAAM,YAAY,GAAG,UAAC,EAQ5B;QAPC,OAAO,aAAA,EACP,MAAM,YAAA,EACN,MAAM,YAAA;IAMN,mGAAmG;IACnG,IAAI;QACF,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,OAAO,SAAS,CAAC;SAClB;QAED,8EAA8E;QAC9E,IAAM,
|
|
1
|
+
{"version":3,"file":"contextParser.js","sourceRoot":"","sources":["../../src/helpers/contextParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,CAAC,IAAM,YAAY,GAAG,UAAC,EAQ5B;QAPC,OAAO,aAAA,EACP,MAAM,YAAA,EACN,MAAM,YAAA;IAMN,mGAAmG;IACnG,IAAI;QACF,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,OAAO,SAAS,CAAC;SAClB;QAED,8EAA8E;QAC9E,IAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACxD,IAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5D,IAAI,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACtD,IAAM,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAExD,IAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,UAAC,KAAK;YAC3C,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,IAAM,eAAa,GAAQ,EAAE,CAAC;QAE9B,cAAc,CAAC,OAAO,CAAC,UAAC,KAAK;YAC3B,IAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAE3B,IACE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM;gBACnB,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,EACpB;gBACA,IAAM,aAAa,GAAG,gBAAgB,CAAC;oBACrC,MAAM,QAAA;oBACN,MAAM,QAAA;oBACN,SAAS,EAAE,SAAS,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;iBACxD,CAAC,CAAC;gBACH,eAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,aAAa,IAAI,SAAS,CAAC;aACxE;iBAAM;gBACL,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;oBACvB,eAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;iBAClD;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;oBAC/B,eAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;iBACnD;qBAAM;oBACL,eAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAC1D,IAAI,EACJ,EAAE,CACH,CAAC;iBACH;aACF;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,eAAa,CAAC;KACtB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC"}
|
package/package.json
CHANGED
package/src/Graph/GraphChart.ts
CHANGED
|
@@ -8,8 +8,8 @@ export class GraphChart extends Graph {
|
|
|
8
8
|
return this._x;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
_y: GraphAxis | undefined;
|
|
12
|
-
get y(): GraphAxis | undefined {
|
|
11
|
+
_y: GraphAxis[] | undefined;
|
|
12
|
+
get y(): GraphAxis[] | undefined {
|
|
13
13
|
return this._y;
|
|
14
14
|
}
|
|
15
15
|
constructor(type: GraphType, element: HTMLElement) {
|
package/src/Graph/graphHelper.ts
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { Axis, GraphAxis, Operator } from ".";
|
|
2
|
-
import { Label } from "..";
|
|
3
2
|
|
|
4
3
|
export type XYAxis = {
|
|
5
|
-
x: GraphAxis;
|
|
6
|
-
y: GraphAxis;
|
|
4
|
+
x: GraphAxis | undefined;
|
|
5
|
+
y: GraphAxis[];
|
|
7
6
|
};
|
|
8
7
|
|
|
9
8
|
export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
|
|
10
|
-
const xyAxis:
|
|
9
|
+
const xyAxis: XYAxis = { x: undefined, y: [] };
|
|
11
10
|
|
|
12
11
|
Array.prototype.forEach.call(nodes, (child: Element) => {
|
|
13
12
|
if (child.nodeType === child.ELEMENT_NODE) {
|
|
@@ -36,7 +35,7 @@ export const parseXYAxis = (nodes: NodeListOf<ChildNode>): XYAxis => {
|
|
|
36
35
|
if (axis === "x") {
|
|
37
36
|
xyAxis.x = graphAxis;
|
|
38
37
|
} else if (axis === "y") {
|
|
39
|
-
xyAxis.y
|
|
38
|
+
xyAxis.y.push(graphAxis);
|
|
40
39
|
}
|
|
41
40
|
}
|
|
42
41
|
});
|
|
@@ -18,7 +18,8 @@ export const parseContext = ({
|
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
// TODO: maybe this can be accomplished more performant and elegant with regex
|
|
21
|
-
const
|
|
21
|
+
const singleQuotesReplace = context.replace(/\"/g, "'");
|
|
22
|
+
const strNoWhitespaces = singleQuotesReplace.replace(/\s/g, "");
|
|
22
23
|
var replaceTrue = strNoWhitespaces.replace(/True/g, "true");
|
|
23
24
|
var replaceFalse = replaceTrue.replace(/False/g, "false");
|
|
24
25
|
const strNoClauLeft = replaceFalse.replace(/\{/g, "");
|
package/src/spec/Graph.spec.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GraphIndicator, GraphChart, parseGraph } from "..";
|
|
1
|
+
import { GraphIndicator, GraphChart, parseGraph, GraphAxis } from "..";
|
|
2
2
|
|
|
3
3
|
describe("A Graph", () => {
|
|
4
4
|
it("should parse a basic XML title and type indicator", () => {
|
|
@@ -22,14 +22,16 @@ describe("A Graph", () => {
|
|
|
22
22
|
`;
|
|
23
23
|
|
|
24
24
|
const graph = parseGraph(xml) as GraphChart;
|
|
25
|
+
const y: GraphAxis = graph.y![0];
|
|
26
|
+
|
|
25
27
|
expect(graph.type).toBe("line");
|
|
26
28
|
expect(graph.x).toBeDefined();
|
|
27
29
|
expect(graph.y).toBeDefined();
|
|
28
30
|
expect(graph.x?.name).toBe("data_alta");
|
|
29
|
-
expect(
|
|
31
|
+
expect(y.name).toBe("data_alta");
|
|
30
32
|
expect(graph.x?.axis).toBe("x");
|
|
31
|
-
expect(
|
|
33
|
+
expect(y.axis).toBe("y");
|
|
32
34
|
expect(graph.x?.operator).toBeNull();
|
|
33
|
-
expect(
|
|
35
|
+
expect(y.operator).toBe("+");
|
|
34
36
|
});
|
|
35
37
|
});
|
|
@@ -71,5 +71,14 @@ describe("A Context Parser", () => {
|
|
|
71
71
|
expect(parsedContext!["active_id"]).toBeDefined();
|
|
72
72
|
expect(parsedContext!["active_id"]).toBe(3);
|
|
73
73
|
});
|
|
74
|
+
|
|
75
|
+
it("should properly parse with double quotes", () => {
|
|
76
|
+
const str = "{\"active_id\": 3}";
|
|
77
|
+
|
|
78
|
+
const parsedContext = parseContext({ context: str });
|
|
79
|
+
|
|
80
|
+
expect(parsedContext!["active_id"]).toBeDefined();
|
|
81
|
+
expect(parsedContext!["active_id"]).toBe(3);
|
|
82
|
+
});
|
|
74
83
|
});
|
|
75
84
|
});
|