namirasoft-node 1.4.82 → 1.4.84
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 +1 -0
- package/dist/BaseFilterItemBuilder.js +9 -0
- package/dist/BaseFilterItemBuilder.js.map +1 -1
- package/dist/BaseFilterItemBuilderDatabase.d.ts +1 -0
- package/dist/BaseFilterItemBuilderDatabase.js +17 -0
- package/dist/BaseFilterItemBuilderDatabase.js.map +1 -1
- package/dist/BaseFilterItemBuilderObject.d.ts +1 -0
- package/dist/BaseFilterItemBuilderObject.js +2 -0
- package/dist/BaseFilterItemBuilderObject.js.map +1 -1
- package/dist/BaseTable.d.ts +4 -2
- package/dist/BaseTable.js.map +1 -1
- package/dist/BaseTableColumnOptions.d.ts +8 -0
- package/dist/BaseTableColumnOptions.js +4 -0
- package/dist/BaseTableColumnOptions.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
- package/src/BaseFilterItemBuilder.ts +12 -0
- package/src/BaseFilterItemBuilderDatabase.ts +21 -2
- package/src/BaseFilterItemBuilderObject.ts +4 -1
- package/src/BaseTable.ts +6 -4
- package/src/BaseTableColumnOptions.ts +9 -0
- package/src/index.ts +1 -0
|
@@ -21,6 +21,7 @@ export declare abstract class BaseFilterItemBuilder<Table extends {
|
|
|
21
21
|
[table: string]: BaseFilterItemBuilder_JoinTable<WhereOptions>;
|
|
22
22
|
}, filters?: FilterItem[] | undefined): Promise<WhereOptions[]>;
|
|
23
23
|
abstract checkColumn(table_name: string, column_name: string): void;
|
|
24
|
+
abstract checkValue(table_name: string, column_name: string, value: string): void;
|
|
24
25
|
abstract getRealColumnName(table_name: string, column_name: string): string;
|
|
25
26
|
abstract getAdvancedSearchColumns(table_name: string): string[];
|
|
26
27
|
abstract getAdvancedSearchConditions(columns: string[], search: string): Promise<WhereOptions[]>;
|
|
@@ -35,6 +35,15 @@ class BaseFilterItemBuilder {
|
|
|
35
35
|
let is_table_main = table_main.getName() === filter.table.name;
|
|
36
36
|
let column_name = (_a = this.getRealColumnName(filter.table.name, filter.column.name)) !== null && _a !== void 0 ? _a : filter.column.name;
|
|
37
37
|
let values = filter.values;
|
|
38
|
+
if ([
|
|
39
|
+
namirasoft_core_1.FilterItemOperator.all.equals.sign,
|
|
40
|
+
namirasoft_core_1.FilterItemOperator.all.lessthan.sign,
|
|
41
|
+
namirasoft_core_1.FilterItemOperator.all.lessthanequal.sign,
|
|
42
|
+
namirasoft_core_1.FilterItemOperator.all.morethan.sign,
|
|
43
|
+
namirasoft_core_1.FilterItemOperator.all.morethanequal.sign
|
|
44
|
+
].includes(filter.operator.sign))
|
|
45
|
+
for (let v = 0; v < values.length; v++)
|
|
46
|
+
this.checkValue(filter.table.name, filter.column.name, values[i]);
|
|
38
47
|
if (filter.operator.count > 0)
|
|
39
48
|
for (let j = i + 1; j < filters.length; j++) {
|
|
40
49
|
const f = filters[j];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseFilterItemBuilder.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAiF;AAkBjF,MAAsB,qBAAqB;IAE1B,KAAK,CAAC,UAAiB,EAAE,WAA+E,EAAE,OAAkC;;;YAErJ,IAAI,GAAG,GAAmB,EAAE,CAAC;YAC7B,IAAI,OAAO,EACX,CAAC;gBACG,IAAI,yBAAyB,GAAwC,EAAE,CAAC;gBACxE,SAAS,6BAA6B,CAAC,IAAY;oBAE/C,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;wBAChC,yBAAyB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;oBACzC,OAAO,yBAAyB,CAAC,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBACD,IAAI,SAAS,GAAiC,EAAE,CAAC;gBAEjD,IAAI,uBAAuB,GAAG,CAAO,KAAa,EAAE,GAAY,EAAE,UAA0B,EAAyB,EAAE;oBAEnH,IAAI,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;oBAC9B,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;gBAC1D,CAAC,CAAA,CAAA;gBAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE;oBACnC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EACjB,CAAC;wBACG,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;wBAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBACxD,IAAI,aAAa,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;wBAC/D,IAAI,WAAW,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;wBAEtG,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseFilterItemBuilder.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export declare abstract class BaseFilterItemBuilderDatabase<WhereOptions> extend
|
|
|
5
5
|
database: BaseDatabase;
|
|
6
6
|
constructor(database: BaseDatabase);
|
|
7
7
|
checkColumn(table_name: string, column_name: string): void;
|
|
8
|
+
checkValue(table_name: string, column_name: string, value: string): void;
|
|
8
9
|
getRealColumnName(table_name: string, column_name: string): string;
|
|
9
10
|
getAdvancedSearchColumns(table_name: string): string[];
|
|
10
11
|
}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BaseFilterItemBuilderDatabase = void 0;
|
|
4
4
|
const BaseFilterItemBuilder_1 = require("./BaseFilterItemBuilder");
|
|
5
|
+
const namirasoft_core_1 = require("namirasoft-core");
|
|
6
|
+
const namirasoft_schema_1 = require("namirasoft-schema");
|
|
5
7
|
class BaseFilterItemBuilderDatabase extends BaseFilterItemBuilder_1.BaseFilterItemBuilder {
|
|
6
8
|
constructor(database) {
|
|
7
9
|
super();
|
|
@@ -12,6 +14,21 @@ class BaseFilterItemBuilderDatabase extends BaseFilterItemBuilder_1.BaseFilterIt
|
|
|
12
14
|
if (column_name != "*")
|
|
13
15
|
t.checkColumn(column_name, false, null);
|
|
14
16
|
}
|
|
17
|
+
checkValue(table_name, column_name, value) {
|
|
18
|
+
let t = this.database.getTable(table_name);
|
|
19
|
+
if (column_name != "*") {
|
|
20
|
+
let c = t.getColumn(column_name);
|
|
21
|
+
if (c.type === namirasoft_schema_1.VariableType.Date)
|
|
22
|
+
if (namirasoft_core_1.TimeOperation.isValidDate(value))
|
|
23
|
+
throw namirasoft_core_1.ErrorOperation.getHTTP(400, `Invalid value for Date: ${value}. Valid Format is ${namirasoft_core_1.TimeOperation.FORMAT_DATE}`);
|
|
24
|
+
if (c.type === namirasoft_schema_1.VariableType.DateTime)
|
|
25
|
+
if (namirasoft_core_1.TimeOperation.isValidDate(value))
|
|
26
|
+
throw namirasoft_core_1.ErrorOperation.getHTTP(400, `Invalid value for DateTime: ${value}. Valid Format is ${namirasoft_core_1.TimeOperation.FORMAT_DATETIME}`);
|
|
27
|
+
if (c.type === namirasoft_schema_1.VariableType.Time)
|
|
28
|
+
if (namirasoft_core_1.TimeOperation.isValidDate(value))
|
|
29
|
+
throw namirasoft_core_1.ErrorOperation.getHTTP(400, `Invalid value for Time: ${value}. Valid Format is ${namirasoft_core_1.TimeOperation.FORMAT_TIME}`);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
15
32
|
getRealColumnName(table_name, column_name) {
|
|
16
33
|
let t = this.database.getTable(table_name);
|
|
17
34
|
return t.getRealColumnName(column_name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseFilterItemBuilderDatabase.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderDatabase.ts"],"names":[],"mappings":";;;AAEA,mEAAgE;
|
|
1
|
+
{"version":3,"file":"BaseFilterItemBuilderDatabase.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderDatabase.ts"],"names":[],"mappings":";;;AAEA,mEAAgE;AAChE,qDAAgE;AAChE,yDAAiD;AAEjD,MAAsB,6BAA4C,SAAQ,6CAAiE;IAEvI,YAAmB,QAAsB;QAErC,KAAK,EAAE,CAAC;QAFO,aAAQ,GAAR,QAAQ,CAAc;IAGzC,CAAC;IACe,WAAW,CAAC,UAAkB,EAAE,WAAmB;QAE/D,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,UAAU,CAAC,UAAkB,EAAE,WAAmB,EAAE,KAAa;QAEpE,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAA+B,UAAU,CAAC,CAAC;QACzE,IAAI,WAAW,IAAI,GAAG,EACtB,CAAC;YACG,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACjC,IAAI,CAAC,CAAC,IAAI,KAAK,gCAAY,CAAC,IAAI;gBAC5B,IAAI,+BAAa,CAAC,WAAW,CAAC,KAAK,CAAC;oBAChC,MAAM,gCAAc,CAAC,OAAO,CAAC,GAAG,EAAE,2BAA2B,KAAK,qBAAqB,+BAAa,CAAC,WAAW,EAAE,CAAC,CAAC;YAC5H,IAAI,CAAC,CAAC,IAAI,KAAK,gCAAY,CAAC,QAAQ;gBAChC,IAAI,+BAAa,CAAC,WAAW,CAAC,KAAK,CAAC;oBAChC,MAAM,gCAAc,CAAC,OAAO,CAAC,GAAG,EAAE,+BAA+B,KAAK,qBAAqB,+BAAa,CAAC,eAAe,EAAE,CAAC,CAAC;YACpI,IAAI,CAAC,CAAC,IAAI,KAAK,gCAAY,CAAC,IAAI;gBAC5B,IAAI,+BAAa,CAAC,WAAW,CAAC,KAAK,CAAC;oBAChC,MAAM,gCAAc,CAAC,OAAO,CAAC,GAAG,EAAE,2BAA2B,KAAK,qBAAqB,+BAAa,CAAC,WAAW,EAAE,CAAC,CAAC;QAChI,CAAC;IACL,CAAC;IACe,iBAAiB,CAAC,UAAkB,EAAE,WAAmB;QAErE,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;AAvCD,sEAuCC"}
|
|
@@ -5,6 +5,7 @@ export declare class BaseFilterItemBuilderObject extends BaseFilterItemBuilder<{
|
|
|
5
5
|
object: any;
|
|
6
6
|
constructor(object: any);
|
|
7
7
|
checkColumn(): void;
|
|
8
|
+
checkValue(): void;
|
|
8
9
|
getRealColumnName(_: string, column_name: string): string;
|
|
9
10
|
getAdvancedSearchColumns(): string[];
|
|
10
11
|
getAdvancedSearchConditions(columns: string[], search: string): Promise<boolean[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseFilterItemBuilderObject.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderObject.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkD;AAClD,mEAAiG;AAEjG,MAAa,2BAA4B,SAAQ,6CAAyD;IAEtG,YAAmB,MAAW;QAE1B,KAAK,EAAE,CAAC;QAFO,WAAM,GAAN,MAAM,CAAK;IAG9B,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseFilterItemBuilderObject.js","sourceRoot":"","sources":["../src/BaseFilterItemBuilderObject.ts"],"names":[],"mappings":"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"}
|
package/dist/BaseTable.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { ArraySchema, BaseTypeSchema, ObjectSchema } from "namirasoft-schema";
|
|
2
2
|
import { BaseDatabase } from "./BaseDatabase";
|
|
3
|
-
import { BaseUUID } from "namirasoft-core";
|
|
4
|
-
|
|
3
|
+
import { BaseUUID, BaseMetaColumn } from "namirasoft-core";
|
|
4
|
+
import { BaseTableColumnOptions } from "./BaseTableColumnOptions";
|
|
5
|
+
export declare abstract class BaseTable<D extends BaseDatabase, ModelColumnOption extends BaseTableColumnOptions> {
|
|
5
6
|
database: D;
|
|
6
7
|
uuid: BaseUUID;
|
|
7
8
|
constructor(database: D);
|
|
@@ -10,6 +11,7 @@ export declare abstract class BaseTable<D extends BaseDatabase, ModelColumnOptio
|
|
|
10
11
|
getSecureColumns(): string[];
|
|
11
12
|
getReadOnlyColumns(): string[];
|
|
12
13
|
abstract forEachColumn(handler: (name: string, column: ModelColumnOption) => void): void;
|
|
14
|
+
abstract getColumn(name: string): BaseMetaColumn;
|
|
13
15
|
getColumns(secure?: boolean | null, read_only?: boolean | null, filter?: any): string[];
|
|
14
16
|
checkColumn(column: string, secure: boolean | null, read_only: boolean | null): void;
|
|
15
17
|
getRealColumnName(column: string): string;
|
package/dist/BaseTable.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseTable.js","sourceRoot":"","sources":["../src/BaseTable.ts"],"names":[],"mappings":";;;AAAA,yDAAkG;AAElG,
|
|
1
|
+
{"version":3,"file":"BaseTable.js","sourceRoot":"","sources":["../src/BaseTable.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BaseTableColumnOptions.js","sourceRoot":"","sources":["../src/BaseTableColumnOptions.ts"],"names":[],"mappings":";;AAQC,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ export * from "./BaseFilterItemBuilder";
|
|
|
9
9
|
export * from "./BaseFilterItemBuilderDatabase";
|
|
10
10
|
export * from "./BaseFilterItemBuilderObject";
|
|
11
11
|
export * from "./BaseTable";
|
|
12
|
+
export * from "./BaseTableColumnOptions";
|
|
12
13
|
export * from "./CommandOperation";
|
|
13
14
|
export * from "./GmailService";
|
|
14
15
|
export * from "./IPOperation";
|
package/dist/index.js
CHANGED
|
@@ -25,6 +25,7 @@ __exportStar(require("./BaseFilterItemBuilder"), exports);
|
|
|
25
25
|
__exportStar(require("./BaseFilterItemBuilderDatabase"), exports);
|
|
26
26
|
__exportStar(require("./BaseFilterItemBuilderObject"), exports);
|
|
27
27
|
__exportStar(require("./BaseTable"), exports);
|
|
28
|
+
__exportStar(require("./BaseTableColumnOptions"), exports);
|
|
28
29
|
__exportStar(require("./CommandOperation"), exports);
|
|
29
30
|
__exportStar(require("./GmailService"), exports);
|
|
30
31
|
__exportStar(require("./IPOperation"), 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,oDAAkC;AAClC,wDAAsC;AACtC,mDAAiC;AACjC,6CAA2B;AAC3B,iDAA+B;AAC/B,qDAAmC;AACnC,0DAAwC;AACxC,kEAAgD;AAChD,gEAA8C;AAC9C,8CAA4B;AAC5B,qDAAmC;AACnC,iDAA+B;AAC/B,gDAA8B;AAC9B,yCAAuB;AACvB,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C;AAC1C,gDAA8B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,oDAAkC;AAClC,wDAAsC;AACtC,mDAAiC;AACjC,6CAA2B;AAC3B,iDAA+B;AAC/B,qDAAmC;AACnC,0DAAwC;AACxC,kEAAgD;AAChD,gEAA8C;AAC9C,8CAA4B;AAC5B,2DAAyC;AACzC,qDAAmC;AACnC,iDAA+B;AAC/B,gDAA8B;AAC9B,yCAAuB;AACvB,iDAA+B;AAC/B,yDAAuC;AACvC,4DAA0C;AAC1C,gDAA8B"}
|
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.84",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/index.js",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@supercharge/request-ip": "^1.2.0",
|
|
21
21
|
"@types/cors": "^2.8.17",
|
|
22
22
|
"@types/express": "^5.0.0",
|
|
23
|
-
"@types/node": "^22.13.
|
|
23
|
+
"@types/node": "^22.13.10",
|
|
24
24
|
"@types/node-cron": "^3.0.11",
|
|
25
25
|
"@types/nodemailer": "^6.4.17",
|
|
26
26
|
"@types/nodemailer-smtp-transport": "^2.7.8",
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
"cors": "^2.8.5",
|
|
31
31
|
"express": "^4.21.2",
|
|
32
32
|
"joi": "^17.13.3",
|
|
33
|
-
"namirasoft-core": "^1.4.
|
|
34
|
-
"namirasoft-log": "^1.4.
|
|
33
|
+
"namirasoft-core": "^1.4.60",
|
|
34
|
+
"namirasoft-log": "^1.4.22",
|
|
35
35
|
"namirasoft-schema": "^1.4.25",
|
|
36
36
|
"node-cron": "^3.0.3",
|
|
37
37
|
"nodemailer": "^6.10.0",
|
|
@@ -47,6 +47,17 @@ export abstract class BaseFilterItemBuilder<Table extends { getName: () => strin
|
|
|
47
47
|
let column_name = this.getRealColumnName(filter.table.name, filter.column.name) ?? filter.column.name;
|
|
48
48
|
|
|
49
49
|
let values = filter.values;
|
|
50
|
+
|
|
51
|
+
if ([
|
|
52
|
+
FilterItemOperator.all.equals.sign,
|
|
53
|
+
FilterItemOperator.all.lessthan.sign,
|
|
54
|
+
FilterItemOperator.all.lessthanequal.sign,
|
|
55
|
+
FilterItemOperator.all.morethan.sign,
|
|
56
|
+
FilterItemOperator.all.morethanequal.sign
|
|
57
|
+
].includes(filter.operator.sign))
|
|
58
|
+
for (let v = 0; v < values.length; v++)
|
|
59
|
+
this.checkValue(filter.table.name, filter.column.name, values[i]);
|
|
60
|
+
|
|
50
61
|
if (filter.operator.count > 0)
|
|
51
62
|
for (let j = i + 1; j < filters.length; j++)
|
|
52
63
|
{
|
|
@@ -156,6 +167,7 @@ export abstract class BaseFilterItemBuilder<Table extends { getName: () => strin
|
|
|
156
167
|
return ans;
|
|
157
168
|
}
|
|
158
169
|
public abstract checkColumn(table_name: string, column_name: string): void;
|
|
170
|
+
public abstract checkValue(table_name: string, column_name: string, value: string): void;
|
|
159
171
|
public abstract getRealColumnName(table_name: string, column_name: string): string;
|
|
160
172
|
public abstract getAdvancedSearchColumns(table_name: string): string[];
|
|
161
173
|
public abstract getAdvancedSearchConditions(columns: string[], search: string): Promise<WhereOptions[]>;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { BaseTable } from "./BaseTable";
|
|
2
2
|
import { BaseDatabase } from "./BaseDatabase";
|
|
3
3
|
import { BaseFilterItemBuilder } from "./BaseFilterItemBuilder";
|
|
4
|
+
import { ErrorOperation, TimeOperation } from "namirasoft-core";
|
|
5
|
+
import { VariableType } from "namirasoft-schema";
|
|
4
6
|
|
|
5
7
|
export abstract class BaseFilterItemBuilderDatabase<WhereOptions> extends BaseFilterItemBuilder<BaseTable<BaseDatabase, any>, WhereOptions>
|
|
6
8
|
{
|
|
@@ -8,13 +10,30 @@ export abstract class BaseFilterItemBuilderDatabase<WhereOptions> extends BaseFi
|
|
|
8
10
|
{
|
|
9
11
|
super();
|
|
10
12
|
}
|
|
11
|
-
public checkColumn(table_name: string, column_name: string): void
|
|
13
|
+
public override checkColumn(table_name: string, column_name: string): void
|
|
12
14
|
{
|
|
13
15
|
let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
|
|
14
16
|
if (column_name != "*")
|
|
15
17
|
t.checkColumn(column_name, false, null);
|
|
16
18
|
}
|
|
17
|
-
public
|
|
19
|
+
public checkValue(table_name: string, column_name: string, value: string)
|
|
20
|
+
{
|
|
21
|
+
let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
|
|
22
|
+
if (column_name != "*")
|
|
23
|
+
{
|
|
24
|
+
let c = t.getColumn(column_name);
|
|
25
|
+
if (c.type === VariableType.Date)
|
|
26
|
+
if (TimeOperation.isValidDate(value))
|
|
27
|
+
throw ErrorOperation.getHTTP(400, `Invalid value for Date: ${value}. Valid Format is ${TimeOperation.FORMAT_DATE}`);
|
|
28
|
+
if (c.type === VariableType.DateTime)
|
|
29
|
+
if (TimeOperation.isValidDate(value))
|
|
30
|
+
throw ErrorOperation.getHTTP(400, `Invalid value for DateTime: ${value}. Valid Format is ${TimeOperation.FORMAT_DATETIME}`);
|
|
31
|
+
if (c.type === VariableType.Time)
|
|
32
|
+
if (TimeOperation.isValidDate(value))
|
|
33
|
+
throw ErrorOperation.getHTTP(400, `Invalid value for Time: ${value}. Valid Format is ${TimeOperation.FORMAT_TIME}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
public override getRealColumnName(table_name: string, column_name: string): string
|
|
18
37
|
{
|
|
19
38
|
let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
|
|
20
39
|
return t.getRealColumnName(column_name);
|
|
@@ -7,7 +7,10 @@ export class BaseFilterItemBuilderObject extends BaseFilterItemBuilder<{ getName
|
|
|
7
7
|
{
|
|
8
8
|
super();
|
|
9
9
|
}
|
|
10
|
-
public checkColumn(): void
|
|
10
|
+
public override checkColumn(): void
|
|
11
|
+
{
|
|
12
|
+
}
|
|
13
|
+
public override checkValue(): void
|
|
11
14
|
{
|
|
12
15
|
}
|
|
13
16
|
public getRealColumnName(_: string, column_name: string): string
|
package/src/BaseTable.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { ArraySchema, BaseTypeSchema, BaseVariableSchema, ObjectSchema } from "namirasoft-schema";
|
|
2
2
|
import { BaseDatabase } from "./BaseDatabase";
|
|
3
|
-
import { ErrorOperation, BaseUUID, NamingConvention } from "namirasoft-core";
|
|
3
|
+
import { ErrorOperation, BaseUUID, NamingConvention, BaseMetaColumn } from "namirasoft-core";
|
|
4
|
+
import { BaseTableColumnOptions } from "./BaseTableColumnOptions";
|
|
4
5
|
|
|
5
|
-
export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption>
|
|
6
|
+
export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption extends BaseTableColumnOptions>
|
|
6
7
|
{
|
|
7
8
|
database: D;
|
|
8
9
|
uuid: BaseUUID;
|
|
@@ -16,7 +17,7 @@ export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption>
|
|
|
16
17
|
public getSecureColumns(): string[]
|
|
17
18
|
{
|
|
18
19
|
let columns: string[] = [];
|
|
19
|
-
this.forEachColumn((name, column:
|
|
20
|
+
this.forEachColumn((name, column: ModelColumnOption) =>
|
|
20
21
|
{
|
|
21
22
|
if (column.secure)
|
|
22
23
|
columns.push(name);
|
|
@@ -26,7 +27,7 @@ export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption>
|
|
|
26
27
|
public getReadOnlyColumns(): string[]
|
|
27
28
|
{
|
|
28
29
|
let columns: string[] = [];
|
|
29
|
-
this.forEachColumn((name, column:
|
|
30
|
+
this.forEachColumn((name, column: ModelColumnOption) =>
|
|
30
31
|
{
|
|
31
32
|
if (column.read_only)
|
|
32
33
|
columns.push(name);
|
|
@@ -34,6 +35,7 @@ export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption>
|
|
|
34
35
|
return columns;
|
|
35
36
|
}
|
|
36
37
|
public abstract forEachColumn(handler: (name: string, column: ModelColumnOption) => void): void;
|
|
38
|
+
public abstract getColumn(name: string): BaseMetaColumn;
|
|
37
39
|
public getColumns(secure: boolean | null = false, read_only: boolean | null = null, filter?: any): string[]
|
|
38
40
|
{
|
|
39
41
|
let columns_secure: string[] = this.getSecureColumns();
|
package/src/index.ts
CHANGED
|
@@ -9,6 +9,7 @@ export * from "./BaseFilterItemBuilder";
|
|
|
9
9
|
export * from "./BaseFilterItemBuilderDatabase";
|
|
10
10
|
export * from "./BaseFilterItemBuilderObject";
|
|
11
11
|
export * from "./BaseTable";
|
|
12
|
+
export * from "./BaseTableColumnOptions";
|
|
12
13
|
export * from "./CommandOperation";
|
|
13
14
|
export * from "./GmailService";
|
|
14
15
|
export * from "./IPOperation";
|