@juadz/knex 0.1.3 → 0.3.1
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/build/src/basic.d.ts +2 -2
- package/build/src/basic.js +63 -64
- package/build/src/basic.js.map +1 -1
- package/build/src/list.d.ts +2 -2
- package/build/src/list.js +2 -2
- package/build/src/list.js.map +1 -1
- package/package.json +2 -2
package/build/src/basic.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IDatabaseModel } from '@juadz/core';
|
|
2
2
|
import { Knex } from 'knex';
|
|
3
3
|
import { KnexQueryListOptions } from './list';
|
|
4
4
|
import { IConnectionProvider } from './types';
|
|
5
|
-
export declare function SimpleKnexConnection(connectionProvider: IConnectionProvider | Knex, options: KnexQueryListOptions):
|
|
5
|
+
export declare function SimpleKnexConnection(connectionProvider: IConnectionProvider | Knex, options: KnexQueryListOptions, tableName: string): IDatabaseModel;
|
package/build/src/basic.js
CHANGED
|
@@ -2,73 +2,72 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SimpleKnexConnection = void 0;
|
|
4
4
|
const list_1 = require("./list");
|
|
5
|
-
function SimpleKnexConnection(connectionProvider, options) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
...params_,
|
|
29
|
-
};
|
|
30
|
-
const result = await getKnex(action)
|
|
31
|
-
.returning('id')
|
|
32
|
-
.insert({
|
|
33
|
-
...params,
|
|
34
|
-
});
|
|
35
|
-
const insertedId = result[0];
|
|
36
|
-
const insertedData = await get(insertedId);
|
|
37
|
-
return insertedData;
|
|
38
|
-
};
|
|
39
|
-
const replace = async (id, params_) => {
|
|
40
|
-
const params = {
|
|
41
|
-
id,
|
|
42
|
-
...params_,
|
|
43
|
-
};
|
|
44
|
-
const fields = [];
|
|
45
|
-
const values = [];
|
|
46
|
-
Object.keys(params).forEach(f => {
|
|
47
|
-
fields.push(`\`${f}\`=?`);
|
|
48
|
-
values.push(params[f]);
|
|
49
|
-
});
|
|
50
|
-
// console.log(
|
|
51
|
-
// `REPLACE INTO ${resourceName}(${fields.join(', ')})`,
|
|
52
|
-
// values.join(' | ')
|
|
53
|
-
// );
|
|
54
|
-
await getKnex(action).raw(`REPLACE INTO ${resourceName}(${fields.join(', ')})`, values);
|
|
55
|
-
const insertedData = await get(id);
|
|
56
|
-
return insertedData;
|
|
57
|
-
};
|
|
58
|
-
const delete_ = async (id) => {
|
|
59
|
-
const result = await getKnex(action).where('id', id).delete();
|
|
60
|
-
return result;
|
|
5
|
+
function SimpleKnexConnection(connectionProvider, options, tableName) {
|
|
6
|
+
const getKnex = (action) => {
|
|
7
|
+
if (typeof connectionProvider === 'function') {
|
|
8
|
+
return connectionProvider(tableName, action);
|
|
9
|
+
}
|
|
10
|
+
return connectionProvider;
|
|
11
|
+
};
|
|
12
|
+
const get = async (id) => {
|
|
13
|
+
const c = await getKnex('get')
|
|
14
|
+
.select('*')
|
|
15
|
+
.where('id', id)
|
|
16
|
+
.then(t => {
|
|
17
|
+
return t[0];
|
|
18
|
+
});
|
|
19
|
+
return c;
|
|
20
|
+
};
|
|
21
|
+
const update = async (id, patch) => {
|
|
22
|
+
await getKnex('update').where('id', id).update(patch);
|
|
23
|
+
return await get(id);
|
|
24
|
+
};
|
|
25
|
+
const create = async (params_) => {
|
|
26
|
+
const params = {
|
|
27
|
+
...params_,
|
|
61
28
|
};
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
29
|
+
const result = await getKnex('create')
|
|
30
|
+
.returning('id')
|
|
31
|
+
.insert({
|
|
32
|
+
...params,
|
|
33
|
+
});
|
|
34
|
+
const insertedId = result[0];
|
|
35
|
+
const insertedData = await get(insertedId);
|
|
36
|
+
return insertedData;
|
|
37
|
+
};
|
|
38
|
+
const replace = async (id, params_) => {
|
|
39
|
+
const params = {
|
|
40
|
+
id,
|
|
41
|
+
...params_,
|
|
70
42
|
};
|
|
43
|
+
const fields = [];
|
|
44
|
+
const values = [];
|
|
45
|
+
Object.keys(params).forEach(f => {
|
|
46
|
+
fields.push(`\`${f}\`=?`);
|
|
47
|
+
values.push(params[f]);
|
|
48
|
+
});
|
|
49
|
+
// console.log(
|
|
50
|
+
// `REPLACE INTO ${resourceName}(${fields.join(', ')})`,
|
|
51
|
+
// values.join(' | ')
|
|
52
|
+
// );
|
|
53
|
+
await getKnex('replace').raw(`REPLACE INTO ${tableName}(${fields.join(', ')})`, values);
|
|
54
|
+
const insertedData = await get(id);
|
|
55
|
+
return insertedData;
|
|
56
|
+
};
|
|
57
|
+
const delete_ = async (id) => {
|
|
58
|
+
const result = await getKnex('delete').where('id', id).delete();
|
|
59
|
+
return result;
|
|
60
|
+
};
|
|
61
|
+
const list = (0, list_1.KnexQueryList)(options, getKnex);
|
|
62
|
+
return {
|
|
63
|
+
get,
|
|
64
|
+
replace,
|
|
65
|
+
update,
|
|
66
|
+
create,
|
|
67
|
+
delete: delete_,
|
|
68
|
+
list,
|
|
71
69
|
};
|
|
72
70
|
}
|
|
73
71
|
exports.SimpleKnexConnection = SimpleKnexConnection;
|
|
72
|
+
;
|
|
74
73
|
//# sourceMappingURL=basic.js.map
|
package/build/src/basic.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../src/basic.ts"],"names":[],"mappings":";;;AAEA,iCAA2D;AAG3D,SAAgB,oBAAoB,CAClC,kBAA8C,EAC9C,OAA6B
|
|
1
|
+
{"version":3,"file":"basic.js","sourceRoot":"","sources":["../../src/basic.ts"],"names":[],"mappings":"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"}
|
package/build/src/list.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { IQueryListFunction } from '@juadz/core';
|
|
2
2
|
import { Knex } from 'knex';
|
|
3
3
|
export interface KnexQueryListOptions {
|
|
4
|
-
searchFields
|
|
4
|
+
searchFields?: Array<string>;
|
|
5
5
|
debug?: boolean;
|
|
6
6
|
}
|
|
7
7
|
export interface KnexQueryBuilder {
|
|
8
8
|
clone: () => Knex;
|
|
9
9
|
}
|
|
10
|
-
export declare function KnexQueryList(options: KnexQueryListOptions,
|
|
10
|
+
export declare function KnexQueryList(options: KnexQueryListOptions, getKnex: Function): IQueryListFunction;
|
package/build/src/list.js
CHANGED
|
@@ -5,9 +5,9 @@ const knexCloneIQuery = (query) => {
|
|
|
5
5
|
const q = query;
|
|
6
6
|
return q.clone();
|
|
7
7
|
};
|
|
8
|
-
function KnexQueryList(options,
|
|
8
|
+
function KnexQueryList(options, getKnex) {
|
|
9
9
|
const func = async (params) => {
|
|
10
|
-
const query =
|
|
10
|
+
const query = getKnex('list');
|
|
11
11
|
query.where((query) => {
|
|
12
12
|
params.filter.forEach((f) => {
|
|
13
13
|
const { field, op, value } = f;
|
package/build/src/list.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/list.ts"],"names":[],"mappings":";;;AAiBA,MAAM,eAAe,GAAG,CAAC,KAAW,EAAQ,EAAE;IAC5C,MAAM,CAAC,GAAY,KAAK,CAAC;IACzB,OAAQ,CAAsB,CAAC,KAAK,EAAE,CAAC;AACzC,CAAC,CAAC;AAEF,SAAgB,aAAa,CAC3B,OAA6B,EAC7B,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/list.ts"],"names":[],"mappings":";;;AAiBA,MAAM,eAAe,GAAG,CAAC,KAAW,EAAQ,EAAE;IAC5C,MAAM,CAAC,GAAY,KAAK,CAAC;IACzB,OAAQ,CAAsB,CAAC,KAAK,EAAE,CAAC;AACzC,CAAC,CAAC;AAEF,SAAgB,aAAa,CAC3B,OAA6B,EAC7B,OAAiB;IAEjB,MAAM,IAAI,GAAuB,KAAK,EAAE,MAAmB,EAAE,EAAE;QAC7D,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAE9B,KAAK,CAAC,KAAK,CAAC,CAAC,KAAW,EAAE,EAAE;YAC1B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAe,EAAE,EAAE;gBACxC,MAAM,EAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,CAAC,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,QAAQ,CAAC,IAAI,EAAE,KAAK,GAAG,EAAE;oBACvD,KAAK,CAAC,QAAQ,CAAC,CAAC,KAAW,EAAE,EAAE;wBAC7B,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;4BACvC,KAAK,CAAC,OAAO,CACX,CAAC,EACD,MAAM,EACN,IAAI,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,GAAG,CAC3C,CAAC;wBACJ,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;oBACH,OAAO;iBACR;gBAED,IAAI,MAAM,GAA2B,EAAE,CAAC;gBACxC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACxB,MAAM,GAAG,KAA+B,CAAC;iBAC1C;gBAED,QAAQ,EAAE,EAAE;oBACV,KAAK,GAAG;wBACN,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;wBAC1B,OAAO;oBACT,KAAK,IAAI;wBACP,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;wBAC7B,OAAO;oBACT,KAAK,GAAG,CAAC;oBACT,KAAK,IAAI,CAAC;oBACV,KAAK,GAAG,CAAC;oBACT,KAAK,IAAI;wBACP,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;wBAC9B,OAAO;oBACT,KAAK,IAAI;wBACP,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;wBAC7B,OAAO;oBACT,KAAK,KAAK;wBACR,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;wBAChC,OAAO;oBACT,KAAK,UAAU;wBACb,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;wBACtC,OAAO;oBACT,KAAK,WAAW;wBACd,KAAK,CAAC,QAAQ,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC;wBAC1D,OAAO;oBACT,KAAK,SAAS;wBACZ,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClD,OAAO;oBACT,KAAK,UAAU;wBACb,KAAK,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBACrD,OAAO;oBACT,KAAK,MAAM;wBACT,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;wBACvB,OAAO;oBACT,KAAK,OAAO;wBACV,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;wBAC1B,OAAO;iBACV;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC;aACtC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;aAC3B,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;aACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAC,CAAC,CAAC,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAoB,MAAM,eAAe,CAAC,KAAK,CAAC;aAC3D,KAAK,CAAC,QAAQ,CAAC;aACf,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,MAAM,KAAK,GAAG,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9D,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,KAAK,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC;iBACjC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;iBAC3B,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;iBACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAC,CAAC,CAAC,CAAC;iBACtE,QAAQ,EAAE,CAAC;SACf;QAED,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAC,KAAK,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1B,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC;AAjGD,sCAiGC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@juadz/knex",
|
|
3
|
-
"version": "0.1
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"description": "Use Knex as datalayer's for Juadz.",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -45,6 +45,6 @@
|
|
|
45
45
|
"typescript": "^4.7.4"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@juadz/core": "^0.
|
|
48
|
+
"@juadz/core": "^0.3.0"
|
|
49
49
|
}
|
|
50
50
|
}
|