query-layers-expression 1.0.9 → 1.0.10

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.
Files changed (4) hide show
  1. package/build/index.d.ts +3 -1
  2. package/build/index.js +96 -33
  3. package/package.json +2 -2
  4. package/src/index.ts +98 -32
package/build/index.d.ts CHANGED
@@ -7,6 +7,7 @@ interface queryExpressionType {
7
7
  status?: number | null;
8
8
  statusField?: any;
9
9
  qExpression?: any;
10
+ q2Expression?: any;
10
11
  }
11
12
  declare class QueryExpressionLayers implements queryExpressionType {
12
13
  qValues?: [any?, any?, any?] | any;
@@ -17,7 +18,8 @@ declare class QueryExpressionLayers implements queryExpressionType {
17
18
  status?: number | null;
18
19
  statusField?: any;
19
20
  qExpression?: any;
20
- constructor(qValues: any, qFields: any, chartCategory: any, chartCategoryField: any, chartCategoryType: "number" | "string", status: number, statusField: any, qExpression: any);
21
+ q2Expression?: any;
22
+ constructor(qValues: any, qFields: any, chartCategory: any, chartCategoryField: any, chartCategoryType: "number" | "string", status: number, statusField: any, qExpression: any, q2Expression: any);
21
23
  queryExpression: () => string;
22
24
  }
23
25
  export default QueryExpressionLayers;
package/build/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  class QueryExpressionLayers {
4
- constructor(qValues, qFields, chartCategory, chartCategoryField, chartCategoryType, status, statusField, qExpression) {
4
+ constructor(qValues, qFields, chartCategory, chartCategoryField, chartCategoryType, status, statusField, qExpression, q2Expression) {
5
5
  //--- Method ---//
6
6
  //--- Query Expression
7
7
  this.queryExpression = () => {
@@ -52,60 +52,92 @@ class QueryExpressionLayers {
52
52
  if (this.chartCategoryField) {
53
53
  if (this.statusField) {
54
54
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
55
- expression = q_status_chartC_qE;
55
+ expression = !this.q2Expression
56
+ ? q_status_chartC_qE
57
+ : `${q_status_chartC_qE} AND ${this.q2Expression}`;
56
58
  }
57
59
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
58
- expression = query1_status_chartC_qE;
60
+ expression = !this.q2Expression
61
+ ? query1_status_chartC_qE
62
+ : `${query1_status_chartC_qE} AND ${this.q2Expression}`;
59
63
  }
60
64
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
61
- expression = query12_status_chartC_qE;
65
+ expression = !this.q2Expression
66
+ ? query12_status_chartC_qE
67
+ : `${query12_status_chartC_qE} AND ${this.q2Expression}`;
62
68
  }
63
69
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
64
- expression = query123_status_chartC_qE;
70
+ expression = !this.q2Expression
71
+ ? query123_status_chartC_qE
72
+ : `${query123_status_chartC_qE} AND ${this.q2Expression}`;
65
73
  }
66
74
  }
67
75
  else if (!this.statusField) {
68
76
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
69
- expression = q_chartC_qE;
77
+ expression = !this.q2Expression
78
+ ? q_chartC_qE
79
+ : `${q_chartC_qE} AND ${this.q2Expression}`;
70
80
  }
71
81
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
72
- expression = query1_chartC_qE;
82
+ expression = !this.q2Expression
83
+ ? query1_chartC_qE
84
+ : `${query1_chartC_qE} AND ${this.q2Expression}`;
73
85
  }
74
86
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
75
- expression = query12_chartC_qE;
87
+ expression = !this.q2Expression
88
+ ? query12_chartC_qE
89
+ : `${query12_chartC_qE} AND ${this.q2Expression}`;
76
90
  }
77
91
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
78
- expression = query123_chartC_qE;
92
+ expression = !this.q2Expression
93
+ ? query123_chartC_qE
94
+ : `${query123_chartC_qE} AND ${this.q2Expression}`;
79
95
  }
80
96
  }
81
97
  }
82
98
  else if (!this.chartCategoryField) {
83
99
  if (this.statusField) {
84
100
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
85
- expression = q_status_qE;
101
+ expression = !this.q2Expression
102
+ ? q_status_qE
103
+ : `${q_status_qE} AND ${this.q2Expression}`;
86
104
  }
87
105
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
88
- expression = query1_status_qE;
106
+ expression = !this.q2Expression
107
+ ? query1_status_qE
108
+ : `${query1_status_qE} AND ${this.q2Expression}`;
89
109
  }
90
110
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
91
- expression = query12_status_qE;
111
+ expression = !this.q2Expression
112
+ ? query12_status_qE
113
+ : `${query12_status_qE} AND ${this.q2Expression}`;
92
114
  }
93
115
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
94
- expression = query123_status_qE;
116
+ expression = !this.q2Expression
117
+ ? query123_status_qE
118
+ : `${query123_status_qE} AND ${this.q2Expression}`;
95
119
  }
96
120
  }
97
121
  else if (!this.statusField) {
98
122
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
99
- expression = this.qExpression;
123
+ expression = !this.q2Expression
124
+ ? this.qExpression
125
+ : `${this.qExpression} AND ${this.q2Expression}`;
100
126
  }
101
127
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
102
- expression = query1_qE;
128
+ expression = !this.q2Expression
129
+ ? query1_qE
130
+ : `${query1_qE} AND ${this.q2Expression}`;
103
131
  }
104
132
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
105
- expression = query12_qE;
133
+ expression = !this.q2Expression
134
+ ? query12_qE
135
+ : `${query12_qE} AND ${this.q2Expression}`;
106
136
  }
107
137
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
108
- expression = query123_qE;
138
+ expression = !this.q2Expression
139
+ ? query123_qE
140
+ : `${query123_qE} AND ${this.q2Expression}`;
109
141
  }
110
142
  }
111
143
  }
@@ -114,60 +146,90 @@ class QueryExpressionLayers {
114
146
  if (this.chartCategoryField) {
115
147
  if (this.statusField) {
116
148
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
117
- expression = q_status_chartC;
149
+ expression = !this.q2Expression
150
+ ? q_status_chartC
151
+ : `${q_status_chartC} AND ${this.q2Expression}`;
118
152
  }
119
153
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
120
- expression = query1_status_chartC;
154
+ expression = !this.q2Expression
155
+ ? query1_status_chartC
156
+ : `${query1_status_chartC} AND ${this.q2Expression}`;
121
157
  }
122
158
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
123
- expression = query12_status_chartC;
159
+ expression = !this.q2Expression
160
+ ? query12_status_chartC
161
+ : `${query12_status_chartC} AND ${this.q2Expression}`;
124
162
  }
125
163
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
126
- expression = query123_status_chartC;
164
+ expression = !this.q2Expression
165
+ ? query123_status_chartC
166
+ : `${query123_status_chartC} AND ${this.q2Expression}`;
127
167
  }
128
168
  }
129
169
  else if (!this.statusField) {
130
170
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
131
- expression = q_chartC;
171
+ expression = !this.q2Expression
172
+ ? q_chartC
173
+ : `${q_chartC} AND ${this.q2Expression}`;
132
174
  }
133
175
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
134
- expression = query1_chartC;
176
+ expression = !this.q2Expression
177
+ ? query1_chartC
178
+ : `${query1_chartC} AND ${this.q2Expression}`;
135
179
  }
136
180
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
137
- expression = query12_chartC;
181
+ expression = !this.q2Expression
182
+ ? query12_chartC
183
+ : `${query12_chartC} AND ${this.q2Expression}`;
138
184
  }
139
185
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
140
- expression = query123_chartC;
186
+ expression = !this.q2Expression
187
+ ? query123_chartC
188
+ : `${query123_chartC} AND ${this.q2Expression}`;
141
189
  }
142
190
  }
143
191
  }
144
192
  else if (!this.chartCategoryField) {
145
193
  if (this.statusField) {
146
194
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
147
- expression = q_status;
195
+ expression = !this.q2Expression
196
+ ? q_status
197
+ : `${q_status} AND ${this.q2Expression}`;
148
198
  }
149
199
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
150
- expression = query1_status;
200
+ expression = !this.q2Expression
201
+ ? query1_status
202
+ : `${query1_status} AND ${this.q2Expression}`;
151
203
  }
152
204
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
153
- expression = query12_status;
205
+ expression = !this.q2Expression
206
+ ? query12_status
207
+ : `${query12_status} AND ${this.q2Expression}`;
154
208
  }
155
209
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
156
- expression = query123_status;
210
+ expression = !this.q2Expression
211
+ ? query123_status
212
+ : `${query123_status} AND ${this.q2Expression}`;
157
213
  }
158
214
  }
159
215
  else if (!this.statusField) {
160
216
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
161
- expression = "1=1";
217
+ expression = !this.q2Expression ? "1=1" : this.q2Expression;
162
218
  }
163
219
  else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
164
- expression = query1;
220
+ expression = !this.q2Expression
221
+ ? query1
222
+ : `${query1} AND ${this.q2Expression}`;
165
223
  }
166
224
  else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
167
- expression = query12;
225
+ expression = !this.q2Expression
226
+ ? query12
227
+ : `${query12} AND ${this.q2Expression}`;
168
228
  }
169
229
  else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
170
- expression = query123;
230
+ expression = !this.q2Expression
231
+ ? query123
232
+ : `${query123} AND ${this.q2Expression}`;
171
233
  }
172
234
  }
173
235
  }
@@ -182,6 +244,7 @@ class QueryExpressionLayers {
182
244
  this.status = status;
183
245
  this.statusField = statusField;
184
246
  this.qExpression = qExpression;
247
+ this.q2Expression = q2Expression;
185
248
  }
186
249
  }
187
250
  exports.default = QueryExpressionLayers;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "query-layers-expression",
3
- "version": "1.0.9",
4
- "description": "",
3
+ "version": "1.0.10",
4
+ "description": "Added q2Expression for superurgent for N2 Land",
5
5
  "license": "ISC",
6
6
  "author": "Eiji Matsuzaki",
7
7
  "type": "commonjs",
package/src/index.ts CHANGED
@@ -7,6 +7,7 @@ interface queryExpressionType {
7
7
  status?: number | null;
8
8
  statusField?: any;
9
9
  qExpression?: any;
10
+ q2Expression?: any;
10
11
  }
11
12
 
12
13
  class QueryExpressionLayers implements queryExpressionType {
@@ -18,6 +19,7 @@ class QueryExpressionLayers implements queryExpressionType {
18
19
  status?: number | null;
19
20
  statusField?: any;
20
21
  qExpression?: any;
22
+ q2Expression?: any;
21
23
 
22
24
  constructor(
23
25
  qValues: any,
@@ -28,6 +30,7 @@ class QueryExpressionLayers implements queryExpressionType {
28
30
  status: number,
29
31
  statusField: any,
30
32
  qExpression: any,
33
+ q2Expression: any,
31
34
  ) {
32
35
  this.qValues = qValues;
33
36
  this.qFields = qFields;
@@ -37,6 +40,7 @@ class QueryExpressionLayers implements queryExpressionType {
37
40
  this.status = status;
38
41
  this.statusField = statusField;
39
42
  this.qExpression = qExpression;
43
+ this.q2Expression = q2Expression;
40
44
  }
41
45
 
42
46
  //--- Method ---//
@@ -95,45 +99,77 @@ class QueryExpressionLayers implements queryExpressionType {
95
99
  if (this.chartCategoryField) {
96
100
  if (this.statusField) {
97
101
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
98
- expression = q_status_chartC_qE;
102
+ expression = !this.q2Expression
103
+ ? q_status_chartC_qE
104
+ : `${q_status_chartC_qE} AND ${this.q2Expression}`;
99
105
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
100
- expression = query1_status_chartC_qE;
106
+ expression = !this.q2Expression
107
+ ? query1_status_chartC_qE
108
+ : `${query1_status_chartC_qE} AND ${this.q2Expression}`;
101
109
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
102
- expression = query12_status_chartC_qE;
110
+ expression = !this.q2Expression
111
+ ? query12_status_chartC_qE
112
+ : `${query12_status_chartC_qE} AND ${this.q2Expression}`;
103
113
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
104
- expression = query123_status_chartC_qE;
114
+ expression = !this.q2Expression
115
+ ? query123_status_chartC_qE
116
+ : `${query123_status_chartC_qE} AND ${this.q2Expression}`;
105
117
  }
106
118
  } else if (!this.statusField) {
107
119
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
108
- expression = q_chartC_qE;
120
+ expression = !this.q2Expression
121
+ ? q_chartC_qE
122
+ : `${q_chartC_qE} AND ${this.q2Expression}`;
109
123
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
110
- expression = query1_chartC_qE;
124
+ expression = !this.q2Expression
125
+ ? query1_chartC_qE
126
+ : `${query1_chartC_qE} AND ${this.q2Expression}`;
111
127
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
112
- expression = query12_chartC_qE;
128
+ expression = !this.q2Expression
129
+ ? query12_chartC_qE
130
+ : `${query12_chartC_qE} AND ${this.q2Expression}`;
113
131
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
114
- expression = query123_chartC_qE;
132
+ expression = !this.q2Expression
133
+ ? query123_chartC_qE
134
+ : `${query123_chartC_qE} AND ${this.q2Expression}`;
115
135
  }
116
136
  }
117
137
  } else if (!this.chartCategoryField) {
118
138
  if (this.statusField) {
119
139
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
120
- expression = q_status_qE;
140
+ expression = !this.q2Expression
141
+ ? q_status_qE
142
+ : `${q_status_qE} AND ${this.q2Expression}`;
121
143
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
122
- expression = query1_status_qE;
144
+ expression = !this.q2Expression
145
+ ? query1_status_qE
146
+ : `${query1_status_qE} AND ${this.q2Expression}`;
123
147
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
124
- expression = query12_status_qE;
148
+ expression = !this.q2Expression
149
+ ? query12_status_qE
150
+ : `${query12_status_qE} AND ${this.q2Expression}`;
125
151
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
126
- expression = query123_status_qE;
152
+ expression = !this.q2Expression
153
+ ? query123_status_qE
154
+ : `${query123_status_qE} AND ${this.q2Expression}`;
127
155
  }
128
156
  } else if (!this.statusField) {
129
157
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
130
- expression = this.qExpression;
158
+ expression = !this.q2Expression
159
+ ? this.qExpression
160
+ : `${this.qExpression} AND ${this.q2Expression}`;
131
161
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
132
- expression = query1_qE;
162
+ expression = !this.q2Expression
163
+ ? query1_qE
164
+ : `${query1_qE} AND ${this.q2Expression}`;
133
165
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
134
- expression = query12_qE;
166
+ expression = !this.q2Expression
167
+ ? query12_qE
168
+ : `${query12_qE} AND ${this.q2Expression}`;
135
169
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
136
- expression = query123_qE;
170
+ expression = !this.q2Expression
171
+ ? query123_qE
172
+ : `${query123_qE} AND ${this.q2Expression}`;
137
173
  }
138
174
  }
139
175
  }
@@ -141,45 +177,75 @@ class QueryExpressionLayers implements queryExpressionType {
141
177
  if (this.chartCategoryField) {
142
178
  if (this.statusField) {
143
179
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
144
- expression = q_status_chartC;
180
+ expression = !this.q2Expression
181
+ ? q_status_chartC
182
+ : `${q_status_chartC} AND ${this.q2Expression}`;
145
183
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
146
- expression = query1_status_chartC;
184
+ expression = !this.q2Expression
185
+ ? query1_status_chartC
186
+ : `${query1_status_chartC} AND ${this.q2Expression}`;
147
187
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
148
- expression = query12_status_chartC;
188
+ expression = !this.q2Expression
189
+ ? query12_status_chartC
190
+ : `${query12_status_chartC} AND ${this.q2Expression}`;
149
191
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
150
- expression = query123_status_chartC;
192
+ expression = !this.q2Expression
193
+ ? query123_status_chartC
194
+ : `${query123_status_chartC} AND ${this.q2Expression}`;
151
195
  }
152
196
  } else if (!this.statusField) {
153
197
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
154
- expression = q_chartC;
198
+ expression = !this.q2Expression
199
+ ? q_chartC
200
+ : `${q_chartC} AND ${this.q2Expression}`;
155
201
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
156
- expression = query1_chartC;
202
+ expression = !this.q2Expression
203
+ ? query1_chartC
204
+ : `${query1_chartC} AND ${this.q2Expression}`;
157
205
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
158
- expression = query12_chartC;
206
+ expression = !this.q2Expression
207
+ ? query12_chartC
208
+ : `${query12_chartC} AND ${this.q2Expression}`;
159
209
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
160
- expression = query123_chartC;
210
+ expression = !this.q2Expression
211
+ ? query123_chartC
212
+ : `${query123_chartC} AND ${this.q2Expression}`;
161
213
  }
162
214
  }
163
215
  } else if (!this.chartCategoryField) {
164
216
  if (this.statusField) {
165
217
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
166
- expression = q_status;
218
+ expression = !this.q2Expression
219
+ ? q_status
220
+ : `${q_status} AND ${this.q2Expression}`;
167
221
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
168
- expression = query1_status;
222
+ expression = !this.q2Expression
223
+ ? query1_status
224
+ : `${query1_status} AND ${this.q2Expression}`;
169
225
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
170
- expression = query12_status;
226
+ expression = !this.q2Expression
227
+ ? query12_status
228
+ : `${query12_status} AND ${this.q2Expression}`;
171
229
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
172
- expression = query123_status;
230
+ expression = !this.q2Expression
231
+ ? query123_status
232
+ : `${query123_status} AND ${this.q2Expression}`;
173
233
  }
174
234
  } else if (!this.statusField) {
175
235
  if (!this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
176
- expression = "1=1";
236
+ expression = !this.q2Expression ? "1=1" : this.q2Expression;
177
237
  } else if (this.qValues[0] && !this.qValues[1] && !this.qValues[2]) {
178
- expression = query1;
238
+ expression = !this.q2Expression
239
+ ? query1
240
+ : `${query1} AND ${this.q2Expression}`;
179
241
  } else if (this.qValues[0] && this.qValues[1] && !this.qValues[2]) {
180
- expression = query12;
242
+ expression = !this.q2Expression
243
+ ? query12
244
+ : `${query12} AND ${this.q2Expression}`;
181
245
  } else if (this.qValues[0] && this.qValues[1] && this.qValues[2]) {
182
- expression = query123;
246
+ expression = !this.q2Expression
247
+ ? query123
248
+ : `${query123} AND ${this.q2Expression}`;
183
249
  }
184
250
  }
185
251
  }