namirasoft-node 1.4.61 → 1.4.63
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/BaseFilterItemBuilder.d.ts +2 -0
- package/dist/BaseFilterItemBuilder.js +13 -1
- package/dist/BaseFilterItemBuilder.js.map +1 -1
- package/dist/BaseFilterItemBuilderDatabase.d.ts +1 -0
- package/dist/BaseFilterItemBuilderDatabase.js +6 -1
- package/dist/BaseFilterItemBuilderDatabase.js.map +1 -1
- package/dist/BaseFilterItemBuilderObject.d.ts +2 -0
- package/dist/BaseFilterItemBuilderObject.js +10 -0
- package/dist/BaseFilterItemBuilderObject.js.map +1 -1
- package/package.json +1 -1
- package/src/BaseFilterItemBuilder.ts +18 -1
- package/src/BaseFilterItemBuilderDatabase.ts +7 -1
- package/src/BaseFilterItemBuilderObject.ts +10 -0
|
@@ -22,6 +22,8 @@ export declare abstract class BaseFilterItemBuilder<Table extends {
|
|
|
22
22
|
}, filters?: FilterItem[] | undefined): Promise<WhereOptions[]>;
|
|
23
23
|
abstract checkColumn(table_name: string, column_name: string): void;
|
|
24
24
|
abstract getRealColumnName(table_name: string, column_name: string): string;
|
|
25
|
+
abstract getAdvancedSearchColumns(table_name: string): string[];
|
|
26
|
+
abstract getAdvancedSearchConditions(columns: string[], search: string): Promise<WhereOptions[]>;
|
|
25
27
|
abstract getIn(column_name: string, not: boolean, values: string[]): BaseFilterItemBuilder_Condition<WhereOptions>;
|
|
26
28
|
abstract getLike(column_name: string, not: boolean, value: string): BaseFilterItemBuilder_Condition<WhereOptions>;
|
|
27
29
|
abstract getRegex(column_name: string, not: boolean, value: string): BaseFilterItemBuilder_Condition<WhereOptions>;
|
|
@@ -61,7 +61,19 @@ class BaseFilterItemBuilder {
|
|
|
61
61
|
conditions_in_select_main[filter.table.name].push(condition);
|
|
62
62
|
}
|
|
63
63
|
});
|
|
64
|
-
if (
|
|
64
|
+
if (column_name === "*") {
|
|
65
|
+
if (filter.operator !== namirasoft_core_1.FilterItemOperator.all.equals)
|
|
66
|
+
namirasoft_core_1.ErrorOperation.throwHTTP(400, `Invalid operator for all columns (*).`);
|
|
67
|
+
else {
|
|
68
|
+
let columns = this.getAdvancedSearchColumns(filter.table.name);
|
|
69
|
+
for (let i = 0; i < values.length; i++) {
|
|
70
|
+
const value = values[i];
|
|
71
|
+
let conditions = yield this.getAdvancedSearchConditions(columns, value);
|
|
72
|
+
ans.push(...conditions);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else if (filter.operator == namirasoft_core_1.FilterItemOperator.all.equals)
|
|
65
77
|
yield addCondition(this.getIn(column_name, filter.not, values));
|
|
66
78
|
else if (filter.operator == namirasoft_core_1.FilterItemOperator.all.contains)
|
|
67
79
|
for (const value of values)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseFilterItemBuilder.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BaseFilterItemBuilder.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,4 +6,5 @@ export declare abstract class BaseFilterItemBuilderDatabase<WhereOptions> extend
|
|
|
6
6
|
constructor(database: BaseDatabase);
|
|
7
7
|
checkColumn(table_name: string, column_name: string): void;
|
|
8
8
|
getRealColumnName(table_name: string, column_name: string): string;
|
|
9
|
+
getAdvancedSearchColumns(table_name: string): string[];
|
|
9
10
|
}
|
|
@@ -9,12 +9,17 @@ class BaseFilterItemBuilderDatabase extends BaseFilterItemBuilder_1.BaseFilterIt
|
|
|
9
9
|
}
|
|
10
10
|
checkColumn(table_name, column_name) {
|
|
11
11
|
let t = this.database.getTable(table_name);
|
|
12
|
-
|
|
12
|
+
if (column_name != "*")
|
|
13
|
+
t.checkColumn(column_name, false, null);
|
|
13
14
|
}
|
|
14
15
|
getRealColumnName(table_name, column_name) {
|
|
15
16
|
let t = this.database.getTable(table_name);
|
|
16
17
|
return t.getRealColumnName(column_name);
|
|
17
18
|
}
|
|
19
|
+
getAdvancedSearchColumns(table_name) {
|
|
20
|
+
let t = this.database.getTable(table_name);
|
|
21
|
+
return t.getColumns(false, null, { searchable: true });
|
|
22
|
+
}
|
|
18
23
|
}
|
|
19
24
|
exports.BaseFilterItemBuilderDatabase = BaseFilterItemBuilderDatabase;
|
|
20
25
|
//# sourceMappingURL=BaseFilterItemBuilderDatabase.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseFilterItemBuilderDatabase.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderDatabase.ts"],"names":[],"mappings":";;;AAEA,mEAAgE;AAEhE,MAAsB,6BAA4C,SAAQ,6CAAiE;IAEvI,YAAmB,QAAsB;QAErC,KAAK,EAAE,CAAC;QAFO,aAAQ,GAAR,QAAQ,CAAc;IAGzC,CAAC;IACM,WAAW,CAAC,UAAkB,EAAE,WAAmB;QAEtD,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAA+B,UAAU,CAAC,CAAC;QACzE,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseFilterItemBuilderDatabase.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderDatabase.ts"],"names":[],"mappings":";;;AAEA,mEAAgE;AAEhE,MAAsB,6BAA4C,SAAQ,6CAAiE;IAEvI,YAAmB,QAAsB;QAErC,KAAK,EAAE,CAAC;QAFO,aAAQ,GAAR,QAAQ,CAAc;IAGzC,CAAC;IACM,WAAW,CAAC,UAAkB,EAAE,WAAmB;QAEtD,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAA+B,UAAU,CAAC,CAAC;QACzE,IAAI,WAAW,IAAI,GAAG;YAClB,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IACM,iBAAiB,CAAC,UAAkB,EAAE,WAAmB;QAE5D,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAA+B,UAAU,CAAC,CAAC;QACzE,OAAO,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;IACe,wBAAwB,CAAC,UAAkB;QAEvD,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAiC,CAAC;QAC3E,OAAO,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;CACJ;AAtBD,sEAsBC"}
|
|
@@ -6,6 +6,8 @@ export declare class BaseFilterItemBuilderObject extends BaseFilterItemBuilder<{
|
|
|
6
6
|
constructor(object: any);
|
|
7
7
|
checkColumn(): void;
|
|
8
8
|
getRealColumnName(_: string, column_name: string): string;
|
|
9
|
+
getAdvancedSearchColumns(): string[];
|
|
10
|
+
getAdvancedSearchConditions(columns: string[], search: string): Promise<boolean[]>;
|
|
9
11
|
getIn(column_name: string, not: boolean, values: string[]): {
|
|
10
12
|
condition: boolean;
|
|
11
13
|
};
|
|
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.BaseFilterItemBuilderObject = void 0;
|
|
13
|
+
const namirasoft_core_1 = require("namirasoft-core");
|
|
13
14
|
const BaseFilterItemBuilder_1 = require("./BaseFilterItemBuilder");
|
|
14
15
|
class BaseFilterItemBuilderObject extends BaseFilterItemBuilder_1.BaseFilterItemBuilder {
|
|
15
16
|
constructor(object) {
|
|
@@ -21,6 +22,15 @@ class BaseFilterItemBuilderObject extends BaseFilterItemBuilder_1.BaseFilterItem
|
|
|
21
22
|
getRealColumnName(_, column_name) {
|
|
22
23
|
return column_name;
|
|
23
24
|
}
|
|
25
|
+
getAdvancedSearchColumns() {
|
|
26
|
+
return Object.keys(this.object);
|
|
27
|
+
}
|
|
28
|
+
getAdvancedSearchConditions(columns, search) {
|
|
29
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
let text = columns.map(c => this.object[c]).filter(v => v).join(" ");
|
|
31
|
+
return [namirasoft_core_1.SearchOperation.match(text, search)];
|
|
32
|
+
});
|
|
33
|
+
}
|
|
24
34
|
getIn(column_name, not, values) {
|
|
25
35
|
var _a;
|
|
26
36
|
let condition = values.includes((_a = this.object[column_name]) !== null && _a !== void 0 ? _a : null) !== not;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseFilterItemBuilderObject.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderObject.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BaseFilterItemBuilderObject.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderObject.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkD;AAClD,mEAAgE;AAEhE,MAAa,2BAA4B,SAAQ,6CAAyD;IAEtG,YAAmB,MAAW;QAE1B,KAAK,EAAE,CAAC;QAFO,WAAM,GAAN,MAAM,CAAK;IAG9B,CAAC;IACM,WAAW;IAElB,CAAC;IACM,iBAAiB,CAAC,CAAS,EAAE,WAAmB;QAEnD,OAAO,WAAW,CAAC;IACvB,CAAC;IACQ,wBAAwB;QAE7B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IACc,2BAA2B,CAAC,OAAiB,EAAE,MAAc;;YAExE,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrE,OAAO,CAAC,iCAAe,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;IACQ,KAAK,CAAC,WAAmB,EAAE,GAAY,EAAE,MAAgB;;QAE9D,IAAI,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,IAAI,CAAC,KAAK,GAAG,CAAC;QAC1E,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,OAAO,CAAC,WAAmB,EAAE,GAAY,EAAE,KAAa;;QAE7D,IAAI,SAAS,GAAG,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,KAAK,GAAG,CAAC;QACxF,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,QAAQ,CAAC,WAAmB,EAAE,GAAY,EAAE,KAAa;;QAE9D,IAAI,SAAS,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,KAAK,GAAG,CAAC;QAC/E,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,QAAQ,CAAC,WAAmB,EAAE,GAAY;;QAE/C,IAAI,SAAS,GAAG,CAAC,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC;QACjE,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,SAAS,CAAC,WAAmB,EAAE,GAAY;QAEhD,IAAI,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;QAC7D,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,WAAW,CAAC,WAAmB,EAAE,GAAY,EAAE,MAAgB;QAEpE,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IACpF,CAAC;IACQ,aAAa,CAAC,WAAmB,EAAE,GAAY,EAAE,KAAa;;QAEnE,IAAI,SAAS,GAAG,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,KAAK,GAAG,CAAC;QACtF,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,WAAW,CAAC,WAAmB,EAAE,GAAY,EAAE,KAAa;;QAEjE,IAAI,SAAS,GAAG,IAAI,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,KAAK,GAAG,CAAC;QACtF,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,KAAK,CAAC,WAAmB,EAAE,KAAU;;QAE1C,IAAI,SAAS,GAAG,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACjF,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,MAAM,CAAC,WAAmB,EAAE,KAAU;;QAE3C,IAAI,SAAS,GAAG,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAClF,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,KAAK,CAAC,WAAmB,EAAE,KAAU;;QAE1C,IAAI,SAAS,GAAG,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QACjF,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACQ,MAAM,CAAC,WAAmB,EAAE,KAAU;;QAE3C,IAAI,SAAS,GAAG,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mCAAI,EAAE,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAClF,OAAO,EAAE,SAAS,EAAE,CAAC;IACzB,CAAC;IACc,WAAW;;YAEtB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC;KAAA;CACJ;AArFD,kEAqFC"}
|
package/package.json
CHANGED
|
@@ -77,7 +77,22 @@ export abstract class BaseFilterItemBuilder<Table extends { getName: () => strin
|
|
|
77
77
|
conditions_in_select_main[filter.table.name].push(condition);
|
|
78
78
|
}
|
|
79
79
|
};
|
|
80
|
-
if (
|
|
80
|
+
if (column_name === "*")
|
|
81
|
+
{
|
|
82
|
+
if (filter.operator !== FilterItemOperator.all.equals)
|
|
83
|
+
ErrorOperation.throwHTTP(400, `Invalid operator for all columns (*).`);
|
|
84
|
+
else
|
|
85
|
+
{
|
|
86
|
+
let columns = this.getAdvancedSearchColumns(filter.table.name);
|
|
87
|
+
for (let i = 0; i < values.length; i++)
|
|
88
|
+
{
|
|
89
|
+
const value = values[i];
|
|
90
|
+
let conditions = await this.getAdvancedSearchConditions(columns, value);
|
|
91
|
+
ans.push(...conditions);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
else if (filter.operator == FilterItemOperator.all.equals)
|
|
81
96
|
await addCondition(this.getIn(column_name, filter.not, values));
|
|
82
97
|
else if (filter.operator == FilterItemOperator.all.contains)
|
|
83
98
|
for (const value of values)
|
|
@@ -137,6 +152,8 @@ export abstract class BaseFilterItemBuilder<Table extends { getName: () => strin
|
|
|
137
152
|
}
|
|
138
153
|
public abstract checkColumn(table_name: string, column_name: string): void;
|
|
139
154
|
public abstract getRealColumnName(table_name: string, column_name: string): string;
|
|
155
|
+
public abstract getAdvancedSearchColumns(table_name: string): string[];
|
|
156
|
+
public abstract getAdvancedSearchConditions(columns: string[], search: string): Promise<WhereOptions[]>;
|
|
140
157
|
public abstract getIn(column_name: string, not: boolean, values: string[]): BaseFilterItemBuilder_Condition<WhereOptions>;
|
|
141
158
|
public abstract getLike(column_name: string, not: boolean, value: string): BaseFilterItemBuilder_Condition<WhereOptions>;
|
|
142
159
|
public abstract getRegex(column_name: string, not: boolean, value: string): BaseFilterItemBuilder_Condition<WhereOptions>;
|
|
@@ -11,11 +11,17 @@ export abstract class BaseFilterItemBuilderDatabase<WhereOptions> extends BaseFi
|
|
|
11
11
|
public checkColumn(table_name: string, column_name: string): void
|
|
12
12
|
{
|
|
13
13
|
let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
|
|
14
|
-
|
|
14
|
+
if (column_name != "*")
|
|
15
|
+
t.checkColumn(column_name, false, null);
|
|
15
16
|
}
|
|
16
17
|
public getRealColumnName(table_name: string, column_name: string): string
|
|
17
18
|
{
|
|
18
19
|
let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
|
|
19
20
|
return t.getRealColumnName(column_name);
|
|
20
21
|
}
|
|
22
|
+
public override getAdvancedSearchColumns(table_name: string): string[]
|
|
23
|
+
{
|
|
24
|
+
let t = this.database.getTable(table_name) as BaseTable<BaseDatabase, any>;
|
|
25
|
+
return t.getColumns(false, null, { searchable: true });
|
|
26
|
+
}
|
|
21
27
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SearchOperation } from "namirasoft-core";
|
|
1
2
|
import { BaseFilterItemBuilder } from "./BaseFilterItemBuilder";
|
|
2
3
|
|
|
3
4
|
export class BaseFilterItemBuilderObject extends BaseFilterItemBuilder<{ getName: () => string }, boolean>
|
|
@@ -13,6 +14,15 @@ export class BaseFilterItemBuilderObject extends BaseFilterItemBuilder<{ getName
|
|
|
13
14
|
{
|
|
14
15
|
return column_name;
|
|
15
16
|
}
|
|
17
|
+
override getAdvancedSearchColumns(): string[]
|
|
18
|
+
{
|
|
19
|
+
return Object.keys(this.object);
|
|
20
|
+
}
|
|
21
|
+
override async getAdvancedSearchConditions(columns: string[], search: string): Promise<boolean[]>
|
|
22
|
+
{
|
|
23
|
+
let text = columns.map(c => this.object[c]).filter(v => v).join(" ");
|
|
24
|
+
return [SearchOperation.match(text, search)];
|
|
25
|
+
}
|
|
16
26
|
override getIn(column_name: string, not: boolean, values: string[])
|
|
17
27
|
{
|
|
18
28
|
let condition = values.includes(this.object[column_name] ?? null) !== not;
|