namirasoft-core 1.4.38 → 1.4.40
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/FilterItem.js +3 -2
- package/dist/FilterItem.js.map +1 -1
- package/dist/FilterItemColumnType.d.ts +1 -1
- package/dist/FilterItemColumnType.js +1 -1
- package/dist/FilterItemColumnType.js.map +1 -1
- package/dist/FilterItemOperator.d.ts +1 -0
- package/dist/FilterItemOperator.js +3 -2
- package/dist/FilterItemOperator.js.map +1 -1
- package/package.json +2 -2
- package/src/FilterItem.ts +3 -2
- package/src/FilterItemColumnType.ts +1 -1
- package/src/FilterItemOperator.ts +3 -2
package/dist/FilterItem.js
CHANGED
|
@@ -70,7 +70,7 @@ class FilterItem {
|
|
|
70
70
|
this.operator = operator;
|
|
71
71
|
this.values = values;
|
|
72
72
|
if (this.values.length != operator.count)
|
|
73
|
-
throw new Error(`Invalid count of values: ${this.values.length}
|
|
73
|
+
throw new Error(`Invalid count of values: ${this.values.length} is provided but ${operator.count} is required.`);
|
|
74
74
|
}
|
|
75
75
|
getCommand() {
|
|
76
76
|
return [this.table.name, this.column.name, this.not ? "1" : "0", this.operator.name, ...this.values.map(x => (x !== null && x !== void 0 ? x : "").toString().replace(/;/gm, "\\;"))].join(";");
|
|
@@ -95,7 +95,8 @@ class FilterItem {
|
|
|
95
95
|
}
|
|
96
96
|
if (this.not)
|
|
97
97
|
ans.push("Not");
|
|
98
|
-
|
|
98
|
+
if (!this.isAllColumns() || this.operator != FilterItemOperator_1.FilterItemOperator.all.equals || this.not)
|
|
99
|
+
ans.push(this.operator.name);
|
|
99
100
|
ans.push(this.values.join(", "));
|
|
100
101
|
return ans.filter(x => x).join(" ");
|
|
101
102
|
}
|
package/dist/FilterItem.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterItem.js","sourceRoot":"","sources":["../src/FilterItem.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FilterItem.js","sourceRoot":"","sources":["../src/FilterItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FilterItemColumnType = void 0;
|
|
4
4
|
var FilterItemColumnType;
|
|
5
5
|
(function (FilterItemColumnType) {
|
|
6
|
-
FilterItemColumnType["
|
|
6
|
+
FilterItemColumnType["Unknown"] = "Any";
|
|
7
7
|
FilterItemColumnType["Boolean"] = "Boolean";
|
|
8
8
|
FilterItemColumnType["Number"] = "Number";
|
|
9
9
|
FilterItemColumnType["String"] = "String";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterItemColumnType.js","sourceRoot":"","sources":["../src/FilterItemColumnType.ts"],"names":[],"mappings":";;;AAAA,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAE5B,
|
|
1
|
+
{"version":3,"file":"FilterItemColumnType.js","sourceRoot":"","sources":["../src/FilterItemColumnType.ts"],"names":[],"mappings":";;;AAAA,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAE5B,uCAAe,CAAA;IACf,2CAAmB,CAAA;IACnB,yCAAiB,CAAA;IACjB,yCAAiB,CAAA;AACrB,CAAC,EANW,oBAAoB,oCAApB,oBAAoB,QAM/B;AAAA,CAAC"}
|
|
@@ -31,11 +31,12 @@ class FilterItemOperator {
|
|
|
31
31
|
}
|
|
32
32
|
exports.FilterItemOperator = FilterItemOperator;
|
|
33
33
|
FilterItemOperator.all = {
|
|
34
|
-
equals: new FilterItemOperator("Equals", "=", 1, (
|
|
34
|
+
equals: new FilterItemOperator("Equals", "=", 1, (type) => { return type != FilterItemColumnType_1.FilterItemColumnType.Unknown; }),
|
|
35
35
|
contains: new FilterItemOperator("Contains", ":", 1, (type) => { return type == FilterItemColumnType_1.FilterItemColumnType.Number || type == FilterItemColumnType_1.FilterItemColumnType.String; }),
|
|
36
36
|
regex: new FilterItemOperator("Regex", "*", 1, (type) => { return type == FilterItemColumnType_1.FilterItemColumnType.Number || type == FilterItemColumnType_1.FilterItemColumnType.String; }),
|
|
37
|
-
empty: new FilterItemOperator("Empty", "?", 0, (type) => { return type != FilterItemColumnType_1.FilterItemColumnType.
|
|
37
|
+
empty: new FilterItemOperator("Empty", "?", 0, (type) => { return type != FilterItemColumnType_1.FilterItemColumnType.Unknown; }),
|
|
38
38
|
exists: new FilterItemOperator("Exists", "??", 0, (_, required) => { return !required; }),
|
|
39
|
+
includes: new FilterItemOperator("Includes", "??", 1, (_, required) => { return !required; }),
|
|
39
40
|
startswith: new FilterItemOperator("Starts With", "(", 1, (type) => { return type == FilterItemColumnType_1.FilterItemColumnType.String; }),
|
|
40
41
|
endswith: new FilterItemOperator("Ends With", ")", 1, (type) => { return type == FilterItemColumnType_1.FilterItemColumnType.String; }),
|
|
41
42
|
lessthan: new FilterItemOperator("Less Than", "<", 1, (type) => { return type == FilterItemColumnType_1.FilterItemColumnType.Number; }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterItemOperator.js","sourceRoot":"","sources":["../src/FilterItemOperator.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,iEAA8D;AAE9D,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"FilterItemOperator.js","sourceRoot":"","sources":["../src/FilterItemOperator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.4.
|
|
11
|
+
"version": "1.4.40",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/index.js",
|
|
@@ -22,6 +22,6 @@
|
|
|
22
22
|
"buffer": "^6.0.3",
|
|
23
23
|
"moment": "^2.30.1",
|
|
24
24
|
"phone": "^3.1.57",
|
|
25
|
-
"uuid": "^11.0.
|
|
25
|
+
"uuid": "^11.0.5"
|
|
26
26
|
}
|
|
27
27
|
}
|
package/src/FilterItem.ts
CHANGED
|
@@ -93,7 +93,7 @@ export class FilterItem
|
|
|
93
93
|
this.operator = operator;
|
|
94
94
|
this.values = values;
|
|
95
95
|
if (this.values.length != operator.count)
|
|
96
|
-
throw new Error(`Invalid count of values: ${this.values.length}
|
|
96
|
+
throw new Error(`Invalid count of values: ${this.values.length} is provided but ${operator.count} is required.`);
|
|
97
97
|
}
|
|
98
98
|
getCommand()
|
|
99
99
|
{
|
|
@@ -122,7 +122,8 @@ export class FilterItem
|
|
|
122
122
|
}
|
|
123
123
|
if (this.not)
|
|
124
124
|
ans.push("Not");
|
|
125
|
-
|
|
125
|
+
if (!this.isAllColumns() || this.operator != FilterItemOperator.all.equals || this.not)
|
|
126
|
+
ans.push(this.operator.name);
|
|
126
127
|
ans.push(this.values.join(", "));
|
|
127
128
|
return ans.filter(x => x).join(" ");
|
|
128
129
|
}
|
|
@@ -4,11 +4,12 @@ import { FilterItemColumnType } from "./FilterItemColumnType";
|
|
|
4
4
|
export class FilterItemOperator
|
|
5
5
|
{
|
|
6
6
|
static all = {
|
|
7
|
-
equals: new FilterItemOperator("Equals", "=", 1, (
|
|
7
|
+
equals: new FilterItemOperator("Equals", "=", 1, (type: FilterItemColumnType) => { return type != FilterItemColumnType.Unknown; }),
|
|
8
8
|
contains: new FilterItemOperator("Contains", ":", 1, (type: FilterItemColumnType) => { return type == FilterItemColumnType.Number || type == FilterItemColumnType.String; }),
|
|
9
9
|
regex: new FilterItemOperator("Regex", "*", 1, (type: FilterItemColumnType) => { return type == FilterItemColumnType.Number || type == FilterItemColumnType.String; }),
|
|
10
|
-
empty: new FilterItemOperator("Empty", "?", 0, (type: FilterItemColumnType) => { return type != FilterItemColumnType.
|
|
10
|
+
empty: new FilterItemOperator("Empty", "?", 0, (type: FilterItemColumnType) => { return type != FilterItemColumnType.Unknown; }),
|
|
11
11
|
exists: new FilterItemOperator("Exists", "??", 0, (_: FilterItemColumnType, required: boolean) => { return !required; }),
|
|
12
|
+
includes: new FilterItemOperator("Includes", "??", 1, (_: FilterItemColumnType, required: boolean) => { return !required; }),
|
|
12
13
|
startswith: new FilterItemOperator("Starts With", "(", 1, (type: FilterItemColumnType) => { return type == FilterItemColumnType.String; }),
|
|
13
14
|
endswith: new FilterItemOperator("Ends With", ")", 1, (type: FilterItemColumnType) => { return type == FilterItemColumnType.String; }),
|
|
14
15
|
lessthan: new FilterItemOperator("Less Than", "<", 1, (type: FilterItemColumnType) => { return type == FilterItemColumnType.Number; }),
|