namirasoft-core 1.3.53 → 1.3.55
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/BaseMetaColumn.d.ts +7 -0
- package/dist/BaseMetaColumn.js +13 -0
- package/dist/BaseMetaColumn.js.map +1 -0
- package/dist/BaseMetaTable.d.ts +7 -0
- package/dist/BaseMetaTable.js +23 -0
- package/dist/BaseMetaTable.js.map +1 -0
- package/dist/FilterItem.d.ts +5 -15
- package/dist/FilterItem.js +6 -5
- package/dist/FilterItem.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/BaseMetaColumn.ts +14 -0
- package/src/BaseMetaTable.ts +25 -0
- package/src/FilterItem.ts +9 -14
- package/src/index.ts +2 -0
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BaseMetaColumn = void 0;
|
|
4
|
+
class BaseMetaColumn {
|
|
5
|
+
constructor(name, text, type, required) {
|
|
6
|
+
this.name = name;
|
|
7
|
+
this.text = text;
|
|
8
|
+
this.type = type;
|
|
9
|
+
this.required = required;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.BaseMetaColumn = BaseMetaColumn;
|
|
13
|
+
//# sourceMappingURL=BaseMetaColumn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BaseMetaColumn.js","sourceRoot":"","sources":["../src/BaseMetaColumn.ts"],"names":[],"mappings":";;;AAAA,MAAa,cAAc;IAMvB,YAAY,IAAY,EAAE,IAAY,EAAE,IAAY,EAAE,QAAiB;QAEnE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;CACJ;AAbD,wCAaC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BaseMetaTable = void 0;
|
|
4
|
+
const BaseMetaColumn_1 = require("./BaseMetaColumn");
|
|
5
|
+
class BaseMetaTable {
|
|
6
|
+
constructor(name, text) {
|
|
7
|
+
this.name = name;
|
|
8
|
+
this.text = text;
|
|
9
|
+
}
|
|
10
|
+
getColumns() {
|
|
11
|
+
let ans = [];
|
|
12
|
+
let columns = this.columns;
|
|
13
|
+
if (columns)
|
|
14
|
+
for (let key of Object.keys(columns)) {
|
|
15
|
+
let object = columns[key];
|
|
16
|
+
if (object instanceof BaseMetaColumn_1.BaseMetaColumn)
|
|
17
|
+
ans.push(object);
|
|
18
|
+
}
|
|
19
|
+
return ans;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.BaseMetaTable = BaseMetaTable;
|
|
23
|
+
//# sourceMappingURL=BaseMetaTable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BaseMetaTable.js","sourceRoot":"","sources":["../src/BaseMetaTable.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAElD,MAAa,aAAa;IAItB,YAAY,IAAY,EAAE,IAAY;QAElC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IACM,UAAU;QAEb,IAAI,GAAG,GAAqB,EAAE,CAAC;QAC/B,IAAI,OAAO,GAAI,IAAY,CAAC,OAAO,CAAC;QACpC,IAAI,OAAO;YACP,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EACpC;gBACI,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC1B,IAAI,MAAM,YAAY,+BAAc;oBAChC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACxB;QACL,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAtBD,sCAsBC"}
|
package/dist/FilterItem.d.ts
CHANGED
|
@@ -1,25 +1,15 @@
|
|
|
1
|
+
import { BaseMetaColumn } from "./BaseMetaColumn";
|
|
2
|
+
import { BaseMetaTable } from "./BaseMetaTable";
|
|
1
3
|
import { FilterItemOperator } from "./FilterItemOperator";
|
|
2
4
|
export declare class FilterItem {
|
|
3
|
-
table:
|
|
4
|
-
|
|
5
|
-
text: string;
|
|
6
|
-
};
|
|
7
|
-
column: {
|
|
8
|
-
name: string;
|
|
9
|
-
text: string;
|
|
10
|
-
};
|
|
5
|
+
table: BaseMetaTable;
|
|
6
|
+
column: BaseMetaColumn;
|
|
11
7
|
not: boolean;
|
|
12
8
|
operator: FilterItemOperator;
|
|
13
9
|
values: string[];
|
|
14
10
|
static stringify(filters: FilterItem[] | null): string;
|
|
15
11
|
static parse(item: string | null): FilterItem[];
|
|
16
|
-
constructor(table:
|
|
17
|
-
name: string;
|
|
18
|
-
text: string;
|
|
19
|
-
}, column: {
|
|
20
|
-
name: string;
|
|
21
|
-
text: string;
|
|
22
|
-
}, not: boolean, operator: FilterItemOperator, ...values: string[]);
|
|
12
|
+
constructor(table: BaseMetaTable, column: BaseMetaColumn, not: boolean, operator: FilterItemOperator, ...values: string[]);
|
|
23
13
|
getCommand(): string;
|
|
24
14
|
isAllColumns(): boolean;
|
|
25
15
|
toString(): string;
|
package/dist/FilterItem.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FilterItem = void 0;
|
|
4
|
+
const BaseMetaColumn_1 = require("./BaseMetaColumn");
|
|
5
|
+
const BaseMetaTable_1 = require("./BaseMetaTable");
|
|
4
6
|
const FilterItemOperator_1 = require("./FilterItemOperator");
|
|
5
7
|
class FilterItem {
|
|
6
8
|
static stringify(filters) {
|
|
@@ -13,7 +15,7 @@ class FilterItem {
|
|
|
13
15
|
if (item) {
|
|
14
16
|
let items = item.split(/(?<!\\);/);
|
|
15
17
|
for (let i = 0; i < items.length;) {
|
|
16
|
-
if (i +
|
|
18
|
+
if (i + 4 >= items.length)
|
|
17
19
|
throw new Error("Invalid value for FilterItem: " + item);
|
|
18
20
|
let tableIndex = i;
|
|
19
21
|
let columnIndex = i + 1;
|
|
@@ -31,8 +33,8 @@ class FilterItem {
|
|
|
31
33
|
let value = items[valueIndex + j].replace(/\\;/gm, ";");
|
|
32
34
|
values.push(value);
|
|
33
35
|
}
|
|
34
|
-
ans.push(new FilterItem(
|
|
35
|
-
i +=
|
|
36
|
+
ans.push(new FilterItem(new BaseMetaTable_1.BaseMetaTable(table, table), new BaseMetaColumn_1.BaseMetaColumn(column, column, "", false), not, operator, ...values));
|
|
37
|
+
i += 4 + operator.count;
|
|
36
38
|
}
|
|
37
39
|
}
|
|
38
40
|
return ans;
|
|
@@ -69,8 +71,7 @@ class FilterItem {
|
|
|
69
71
|
}
|
|
70
72
|
if (this.not)
|
|
71
73
|
ans.push("Not");
|
|
72
|
-
|
|
73
|
-
ans.push(this.operator.name);
|
|
74
|
+
ans.push(this.operator.name);
|
|
74
75
|
ans.push(this.values.join(", "));
|
|
75
76
|
return ans.filter(x => x).join(" ");
|
|
76
77
|
}
|
package/dist/FilterItem.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterItem.js","sourceRoot":"","sources":["../src/FilterItem.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"FilterItem.js","sourceRoot":"","sources":["../src/FilterItem.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -15,6 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./BaseDatabaseRow"), exports);
|
|
18
|
+
__exportStar(require("./BaseMetaColumn"), exports);
|
|
19
|
+
__exportStar(require("./BaseMetaTable"), exports);
|
|
18
20
|
__exportStar(require("./BaseServer"), exports);
|
|
19
21
|
__exportStar(require("./ConsoleOperation"), exports);
|
|
20
22
|
__exportStar(require("./Countries"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,+CAA6B;AAC7B,qDAAmC;AACnC,8CAA4B;AAC5B,mDAAiC;AACjC,4CAA0B;AAC1B,qDAAmC;AACnC,sDAAoC;AACpC,wDAAsC;AACtC,mDAAiC;AACjC,kDAAgC;AAChC,+CAA6B;AAC7B,yDAAuC;AACvC,uDAAqC;AACrC,iDAA+B;AAC/B,kDAAgC;AAChC,8CAA4B;AAC5B,+CAA6B;AAC7B,6CAA2B;AAC3B,mDAAiC;AACjC,kDAAgC;AAChC,mDAAiC;AACjC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AACjC,oDAAkC;AAClC,mDAAiC;AACjC,kDAAgC;AAChC,oDAAkC;AAClC,kDAAgC;AAChC,iDAA+B;AAC/B,qDAAmC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,kDAAgC;AAChC,+CAA6B;AAC7B,qDAAmC;AACnC,8CAA4B;AAC5B,mDAAiC;AACjC,4CAA0B;AAC1B,qDAAmC;AACnC,sDAAoC;AACpC,wDAAsC;AACtC,mDAAiC;AACjC,kDAAgC;AAChC,+CAA6B;AAC7B,yDAAuC;AACvC,uDAAqC;AACrC,iDAA+B;AAC/B,kDAAgC;AAChC,8CAA4B;AAC5B,+CAA6B;AAC7B,6CAA2B;AAC3B,mDAAiC;AACjC,kDAAgC;AAChC,mDAAiC;AACjC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AACjC,oDAAkC;AAClC,mDAAiC;AACjC,kDAAgC;AAChC,oDAAkC;AAClC,kDAAgC;AAChC,iDAA+B;AAC/B,qDAAmC"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export class BaseMetaColumn
|
|
2
|
+
{
|
|
3
|
+
name: string;
|
|
4
|
+
text: string;
|
|
5
|
+
type: string;
|
|
6
|
+
required: boolean;
|
|
7
|
+
constructor(name: string, text: string, type: string, required: boolean)
|
|
8
|
+
{
|
|
9
|
+
this.name = name;
|
|
10
|
+
this.text = text;
|
|
11
|
+
this.type = type;
|
|
12
|
+
this.required = required;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { BaseMetaColumn } from "./BaseMetaColumn";
|
|
2
|
+
|
|
3
|
+
export class BaseMetaTable
|
|
4
|
+
{
|
|
5
|
+
name: string;
|
|
6
|
+
text: string;
|
|
7
|
+
constructor(name: string, text: string)
|
|
8
|
+
{
|
|
9
|
+
this.name = name;
|
|
10
|
+
this.text = text;
|
|
11
|
+
}
|
|
12
|
+
public getColumns(): BaseMetaColumn[]
|
|
13
|
+
{
|
|
14
|
+
let ans: BaseMetaColumn[] = [];
|
|
15
|
+
let columns = (this as any).columns;
|
|
16
|
+
if (columns)
|
|
17
|
+
for (let key of Object.keys(columns))
|
|
18
|
+
{
|
|
19
|
+
let object = columns[key];
|
|
20
|
+
if (object instanceof BaseMetaColumn)
|
|
21
|
+
ans.push(object);
|
|
22
|
+
}
|
|
23
|
+
return ans;
|
|
24
|
+
}
|
|
25
|
+
}
|
package/src/FilterItem.ts
CHANGED
|
@@ -1,15 +1,11 @@
|
|
|
1
|
+
import { BaseMetaColumn } from "./BaseMetaColumn";
|
|
2
|
+
import { BaseMetaTable } from "./BaseMetaTable";
|
|
1
3
|
import { FilterItemOperator } from "./FilterItemOperator";
|
|
2
4
|
|
|
3
5
|
export class FilterItem
|
|
4
6
|
{
|
|
5
|
-
public table:
|
|
6
|
-
|
|
7
|
-
text: string;
|
|
8
|
-
};
|
|
9
|
-
public column: {
|
|
10
|
-
name: string;
|
|
11
|
-
text: string;
|
|
12
|
-
};
|
|
7
|
+
public table: BaseMetaTable;
|
|
8
|
+
public column: BaseMetaColumn;
|
|
13
9
|
public not: boolean;
|
|
14
10
|
public operator: FilterItemOperator;
|
|
15
11
|
public values: string[];
|
|
@@ -27,7 +23,7 @@ export class FilterItem
|
|
|
27
23
|
let items = item.split(/(?<!\\);/);
|
|
28
24
|
for (let i = 0; i < items.length;)
|
|
29
25
|
{
|
|
30
|
-
if (i +
|
|
26
|
+
if (i + 4 >= items.length)
|
|
31
27
|
throw new Error("Invalid value for FilterItem: " + item);
|
|
32
28
|
let tableIndex = i;
|
|
33
29
|
let columnIndex = i + 1;
|
|
@@ -46,13 +42,13 @@ export class FilterItem
|
|
|
46
42
|
let value = items[valueIndex + j].replace(/\\;/gm, ";");
|
|
47
43
|
values.push(value);
|
|
48
44
|
}
|
|
49
|
-
ans.push(new FilterItem(
|
|
50
|
-
i +=
|
|
45
|
+
ans.push(new FilterItem(new BaseMetaTable(table, table), new BaseMetaColumn(column, column, "", false), not, operator, ...values));
|
|
46
|
+
i += 4 + operator.count;
|
|
51
47
|
}
|
|
52
48
|
}
|
|
53
49
|
return ans;
|
|
54
50
|
}
|
|
55
|
-
constructor(table:
|
|
51
|
+
constructor(table: BaseMetaTable, column: BaseMetaColumn, not: boolean, operator: FilterItemOperator, ...values: string[])
|
|
56
52
|
{
|
|
57
53
|
this.table = table;
|
|
58
54
|
this.column = column;
|
|
@@ -89,8 +85,7 @@ export class FilterItem
|
|
|
89
85
|
}
|
|
90
86
|
if (this.not)
|
|
91
87
|
ans.push("Not");
|
|
92
|
-
|
|
93
|
-
ans.push(this.operator.name);
|
|
88
|
+
ans.push(this.operator.name);
|
|
94
89
|
ans.push(this.values.join(", "));
|
|
95
90
|
return ans.filter(x => x).join(" ");
|
|
96
91
|
}
|