namirasoft-node 1.4.43 → 1.4.45
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/BaseDatabase.d.ts +1 -2
- package/dist/BaseDatabase.js +5 -6
- package/dist/BaseDatabase.js.map +1 -1
- package/package.json +43 -43
- package/src/BaseDatabase.ts +6 -7
package/dist/BaseDatabase.d.ts
CHANGED
|
@@ -107,8 +107,7 @@ export declare abstract class BaseDatabase {
|
|
|
107
107
|
protected _getFiltersConditions<WhereOptions>(tables: {
|
|
108
108
|
[table: string]: BaseDatabase_FilterTable;
|
|
109
109
|
}, idatabase: IFilterableDatabase<WhereOptions>, filters?: FilterItem[] | undefined): {
|
|
110
|
-
|
|
111
|
-
joins: string[];
|
|
110
|
+
[table: string]: WhereOptions[];
|
|
112
111
|
};
|
|
113
112
|
abstract getSortOptions(sorts?: SortItem[] | undefined): any;
|
|
114
113
|
}
|
package/dist/BaseDatabase.js
CHANGED
|
@@ -46,7 +46,8 @@ class BaseDatabase {
|
|
|
46
46
|
}
|
|
47
47
|
_getFiltersConditions(tables, idatabase, filters) {
|
|
48
48
|
var _a, _b;
|
|
49
|
-
let ans = {
|
|
49
|
+
let ans = {};
|
|
50
|
+
Object.keys(tables).forEach(table => ans[table] = []);
|
|
50
51
|
if (filters) {
|
|
51
52
|
let processed = {};
|
|
52
53
|
for (let i = 0; i < filters.length; i++)
|
|
@@ -55,7 +56,7 @@ class BaseDatabase {
|
|
|
55
56
|
let table = tables[filter.table.name];
|
|
56
57
|
let t = this.getTable(filter.table.name);
|
|
57
58
|
let column_name = (_b = (_a = table === null || table === void 0 ? void 0 : table.overrideColumnName) === null || _a === void 0 ? void 0 : _a.call(table, filter.column.name)) !== null && _b !== void 0 ? _b : filter.column.name;
|
|
58
|
-
t.checkColumn(
|
|
59
|
+
t.checkColumn(filter.column.name, false, null);
|
|
59
60
|
let values = filter.values;
|
|
60
61
|
if (filter.operator.count > 0)
|
|
61
62
|
for (let j = i + 1; j < filters.length; j++) {
|
|
@@ -78,12 +79,10 @@ class BaseDatabase {
|
|
|
78
79
|
if (res.partial) {
|
|
79
80
|
let wh = {};
|
|
80
81
|
wh[column_name] = res.condition;
|
|
81
|
-
ans.
|
|
82
|
+
ans[filter.table.name].push(wh);
|
|
82
83
|
}
|
|
83
84
|
else
|
|
84
|
-
ans.
|
|
85
|
-
if (!ans.joins.includes(filter.table.name))
|
|
86
|
-
ans.joins.push(filter.table.name);
|
|
85
|
+
ans[filter.table.name].push(res.condition);
|
|
87
86
|
};
|
|
88
87
|
if (filter.operator == namirasoft_core_1.FilterItemOperator.all.equals) {
|
|
89
88
|
if (filter.not)
|
package/dist/BaseDatabase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDatabase.js","sourceRoot":"","sources":["../src/BaseDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qDAA2F;AA2C3F,MAAsB,YAAY;IAAlC;QAEY,WAAM,GAA4B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseDatabase.js","sourceRoot":"","sources":["../src/BaseDatabase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,44 +1,44 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "namirasoft-node",
|
|
3
|
-
"title": "Namirasoft Node NPM Package",
|
|
4
|
-
"description": "Namira Software Corporation Node NPM Package",
|
|
5
|
-
"icon": "logo.png",
|
|
6
|
-
"logo": "https://static.namirasoft.com/image/namirasoft/site/logo/base.png",
|
|
7
|
-
"language": "ts",
|
|
8
|
-
"framework": "npm",
|
|
9
|
-
"application": "package",
|
|
10
|
-
"private": false,
|
|
11
|
-
"version": "1.4.
|
|
12
|
-
"author": "Amir Abolhasani",
|
|
13
|
-
"license": "MIT",
|
|
14
|
-
"main": "./dist/index.js",
|
|
15
|
-
"types": "./dist/index.d.ts",
|
|
16
|
-
"scripts": {
|
|
17
|
-
"build": ""
|
|
18
|
-
},
|
|
19
|
-
"dependencies": {
|
|
20
|
-
"@supercharge/request-ip": "^1.2.0",
|
|
21
|
-
"@types/cors": "^2.8.17",
|
|
22
|
-
"@types/express": "^5.0.0",
|
|
23
|
-
"@types/node": "^22.10.6",
|
|
24
|
-
"@types/node-cron": "^3.0.11",
|
|
25
|
-
"@types/nodemailer": "^6.4.17",
|
|
26
|
-
"@types/nodemailer-smtp-transport": "^2.7.8",
|
|
27
|
-
"@types/serve-index": "^1.9.4",
|
|
28
|
-
"@types/swagger-jsdoc": "^6.0.4",
|
|
29
|
-
"@types/swagger-ui-express": "^4.1.7",
|
|
30
|
-
"cors": "^2.8.5",
|
|
31
|
-
"express": "^4.21.2",
|
|
32
|
-
"joi": "^17.13.3",
|
|
33
|
-
"namirasoft-core": "^1.4.42",
|
|
34
|
-
"namirasoft-log": "^1.4.15",
|
|
35
|
-
"namirasoft-schema": "^1.4.22",
|
|
36
|
-
"node-cron": "^3.0.3",
|
|
37
|
-
"nodemailer": "^6.9.16",
|
|
38
|
-
"nodemailer-smtp-transport": "^2.7.4",
|
|
39
|
-
"request-ip": "^3.3.0",
|
|
40
|
-
"serve-index": "^1.9.1",
|
|
41
|
-
"swagger-jsdoc": "^6.2.8",
|
|
42
|
-
"swagger-ui-express": "^5.0.1"
|
|
43
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "namirasoft-node",
|
|
3
|
+
"title": "Namirasoft Node NPM Package",
|
|
4
|
+
"description": "Namira Software Corporation Node NPM Package",
|
|
5
|
+
"icon": "logo.png",
|
|
6
|
+
"logo": "https://static.namirasoft.com/image/namirasoft/site/logo/base.png",
|
|
7
|
+
"language": "ts",
|
|
8
|
+
"framework": "npm",
|
|
9
|
+
"application": "package",
|
|
10
|
+
"private": false,
|
|
11
|
+
"version": "1.4.45",
|
|
12
|
+
"author": "Amir Abolhasani",
|
|
13
|
+
"license": "MIT",
|
|
14
|
+
"main": "./dist/index.js",
|
|
15
|
+
"types": "./dist/index.d.ts",
|
|
16
|
+
"scripts": {
|
|
17
|
+
"build": ""
|
|
18
|
+
},
|
|
19
|
+
"dependencies": {
|
|
20
|
+
"@supercharge/request-ip": "^1.2.0",
|
|
21
|
+
"@types/cors": "^2.8.17",
|
|
22
|
+
"@types/express": "^5.0.0",
|
|
23
|
+
"@types/node": "^22.10.6",
|
|
24
|
+
"@types/node-cron": "^3.0.11",
|
|
25
|
+
"@types/nodemailer": "^6.4.17",
|
|
26
|
+
"@types/nodemailer-smtp-transport": "^2.7.8",
|
|
27
|
+
"@types/serve-index": "^1.9.4",
|
|
28
|
+
"@types/swagger-jsdoc": "^6.0.4",
|
|
29
|
+
"@types/swagger-ui-express": "^4.1.7",
|
|
30
|
+
"cors": "^2.8.5",
|
|
31
|
+
"express": "^4.21.2",
|
|
32
|
+
"joi": "^17.13.3",
|
|
33
|
+
"namirasoft-core": "^1.4.42",
|
|
34
|
+
"namirasoft-log": "^1.4.15",
|
|
35
|
+
"namirasoft-schema": "^1.4.22",
|
|
36
|
+
"node-cron": "^3.0.3",
|
|
37
|
+
"nodemailer": "^6.9.16",
|
|
38
|
+
"nodemailer-smtp-transport": "^2.7.4",
|
|
39
|
+
"request-ip": "^3.3.0",
|
|
40
|
+
"serve-index": "^1.9.1",
|
|
41
|
+
"swagger-jsdoc": "^6.2.8",
|
|
42
|
+
"swagger-ui-express": "^5.0.1"
|
|
43
|
+
}
|
|
44
44
|
}
|
package/src/BaseDatabase.ts
CHANGED
|
@@ -83,9 +83,10 @@ export abstract class BaseDatabase
|
|
|
83
83
|
let limit = page_size;
|
|
84
84
|
return { offset, limit };
|
|
85
85
|
}
|
|
86
|
-
protected _getFiltersConditions<WhereOptions>(tables: { [table: string]: BaseDatabase_FilterTable }, idatabase: IFilterableDatabase<WhereOptions>, filters?: FilterItem[] | undefined): {
|
|
86
|
+
protected _getFiltersConditions<WhereOptions>(tables: { [table: string]: BaseDatabase_FilterTable }, idatabase: IFilterableDatabase<WhereOptions>, filters?: FilterItem[] | undefined): { [table: string]: WhereOptions[] }
|
|
87
87
|
{
|
|
88
|
-
let ans: {
|
|
88
|
+
let ans: { [table: string]: WhereOptions[] } = {};
|
|
89
|
+
Object.keys(tables).forEach(table => ans[table] = []);
|
|
89
90
|
if (filters)
|
|
90
91
|
{
|
|
91
92
|
let processed: { [index: number]: boolean } = {};
|
|
@@ -96,7 +97,7 @@ export abstract class BaseDatabase
|
|
|
96
97
|
let table = tables[filter.table.name];
|
|
97
98
|
let t = this.getTable<BaseTable<BaseDatabase, any>>(filter.table.name);
|
|
98
99
|
let column_name = table?.overrideColumnName?.(filter.column.name) ?? filter.column.name;
|
|
99
|
-
t.checkColumn(
|
|
100
|
+
t.checkColumn(filter.column.name, false, null);
|
|
100
101
|
let values = filter.values;
|
|
101
102
|
if (filter.operator.count > 0)
|
|
102
103
|
for (let j = i + 1; j < filters.length; j++)
|
|
@@ -125,12 +126,10 @@ export abstract class BaseDatabase
|
|
|
125
126
|
{
|
|
126
127
|
let wh: any = {};
|
|
127
128
|
wh[column_name] = res.condition;
|
|
128
|
-
ans.
|
|
129
|
+
ans[filter.table.name].push(wh);
|
|
129
130
|
}
|
|
130
131
|
else
|
|
131
|
-
ans.
|
|
132
|
-
if (!ans.joins.includes(filter.table.name))
|
|
133
|
-
ans.joins.push(filter.table.name);
|
|
132
|
+
ans[filter.table.name].push(res.condition);
|
|
134
133
|
};
|
|
135
134
|
if (filter.operator == FilterItemOperator.all.equals)
|
|
136
135
|
{
|