lemon-core 3.0.0 → 3.1.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/README.md +13 -21
- package/dist/common/test-helper.js +19 -11
- package/dist/common/test-helper.js.map +1 -1
- package/dist/controllers/dummy-controller.d.ts +1 -1
- package/dist/controllers/dummy-controller.js +2 -2
- package/dist/controllers/dummy-controller.js.map +1 -1
- package/dist/controllers/general-api-controller.d.ts +1 -1
- package/dist/controllers/general-api-controller.js +5 -5
- package/dist/controllers/general-api-controller.js.map +1 -1
- package/dist/controllers/general-controller.js +2 -1
- package/dist/controllers/general-controller.js.map +1 -1
- package/dist/controllers/index.js +6 -2
- package/dist/controllers/index.js.map +1 -1
- package/dist/cores/api/api-service.d.ts +239 -0
- package/dist/cores/api/api-service.js +674 -0
- package/dist/cores/api/api-service.js.map +1 -0
- package/dist/cores/api/index.d.ts +10 -0
- package/dist/cores/api/index.js +27 -0
- package/dist/cores/api/index.js.map +1 -0
- package/dist/cores/api-service.js +19 -18
- package/dist/cores/api-service.js.map +1 -1
- package/dist/cores/aws/aws-kms-service.d.ts +53 -2
- package/dist/cores/aws/aws-kms-service.js +112 -29
- package/dist/cores/aws/aws-kms-service.js.map +1 -1
- package/dist/cores/aws/aws-s3-service.js +19 -18
- package/dist/cores/aws/aws-s3-service.js.map +1 -1
- package/dist/cores/aws/aws-sns-service.js +10 -10
- package/dist/cores/aws/aws-sns-service.js.map +1 -1
- package/dist/cores/aws/aws-sqs-service.js +12 -12
- package/dist/cores/aws/aws-sqs-service.js.map +1 -1
- package/dist/cores/aws/index.js +1 -1
- package/dist/cores/cache/cache-service.d.ts +440 -0
- package/dist/cores/cache/cache-service.js +967 -0
- package/dist/cores/cache/cache-service.js.map +1 -0
- package/dist/cores/cache/index.d.ts +10 -0
- package/dist/cores/cache/index.js +27 -0
- package/dist/cores/cache/index.js.map +1 -0
- package/dist/cores/cache-service.d.ts +54 -18
- package/dist/cores/cache-service.js +56 -45
- package/dist/cores/cache-service.js.map +1 -1
- package/dist/cores/config/config-service.js +11 -10
- package/dist/cores/config/config-service.js.map +1 -1
- package/dist/cores/core-services.js +6 -2
- package/dist/cores/core-services.js.map +1 -1
- package/dist/cores/core-types.d.ts +42 -12
- package/dist/cores/dynamo/dynamo-query-service.d.ts +52 -0
- package/dist/cores/dynamo/dynamo-query-service.js +127 -0
- package/dist/cores/dynamo/dynamo-query-service.js.map +1 -0
- package/dist/cores/dynamo/dynamo-scan-service.d.ts +70 -0
- package/dist/cores/dynamo/dynamo-scan-service.js +164 -0
- package/dist/cores/dynamo/dynamo-scan-service.js.map +1 -0
- package/dist/cores/dynamo/dynamo-service.d.ts +192 -0
- package/dist/cores/dynamo/dynamo-service.js +525 -0
- package/dist/cores/dynamo/dynamo-service.js.map +1 -0
- package/dist/cores/dynamo/index.d.ts +12 -0
- package/dist/cores/dynamo/index.js +29 -0
- package/dist/cores/dynamo/index.js.map +1 -0
- package/dist/cores/dynamo-query-service.js +7 -7
- package/dist/cores/dynamo-query-service.js.map +1 -1
- package/dist/cores/dynamo-scan-service.js +8 -8
- package/dist/cores/dynamo-scan-service.js.map +1 -1
- package/dist/cores/dynamo-service.js +19 -19
- package/dist/cores/dynamo-service.js.map +1 -1
- package/dist/cores/elastic/elastic6-query-service.d.ts +104 -0
- package/dist/cores/elastic/elastic6-query-service.js +510 -0
- package/dist/cores/elastic/elastic6-query-service.js.map +1 -0
- package/dist/cores/elastic/elastic6-service.d.ts +273 -0
- package/dist/cores/elastic/elastic6-service.js +903 -0
- package/dist/cores/elastic/elastic6-service.js.map +1 -0
- package/dist/cores/elastic/hangul-service.d.ts +102 -0
- package/dist/cores/elastic/hangul-service.js +205 -0
- package/dist/cores/elastic/hangul-service.js.map +1 -0
- package/dist/cores/elastic/index.d.ts +12 -0
- package/dist/cores/elastic/index.js +29 -0
- package/dist/cores/elastic/index.js.map +1 -0
- package/dist/cores/elastic6-query-service.js +7 -7
- package/dist/cores/elastic6-query-service.js.map +1 -1
- package/dist/cores/elastic6-service.js +57 -65
- package/dist/cores/elastic6-service.js.map +1 -1
- package/dist/cores/hangul-service.d.ts +17 -3
- package/dist/cores/hangul-service.js +17 -8
- package/dist/cores/hangul-service.js.map +1 -1
- package/dist/cores/http-storage-service.js +1 -1
- package/dist/cores/http-storage-service.js.map +1 -1
- package/dist/cores/index.d.ts +9 -15
- package/dist/cores/index.js +14 -15
- package/dist/cores/index.js.map +1 -1
- package/dist/cores/lambda/index.js +8 -4
- package/dist/cores/lambda/index.js.map +1 -1
- package/dist/cores/lambda/lambda-cognito-handler.js +2 -2
- package/dist/cores/lambda/lambda-cognito-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-cron-handler.js +2 -2
- package/dist/cores/lambda/lambda-cron-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-dynamo-stream-handler.d.ts +2 -2
- package/dist/cores/lambda/lambda-dynamo-stream-handler.js +20 -20
- package/dist/cores/lambda/lambda-dynamo-stream-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-handler.js +12 -11
- package/dist/cores/lambda/lambda-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-notification-handler.js +10 -10
- package/dist/cores/lambda/lambda-notification-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-sns-handler.js +13 -13
- package/dist/cores/lambda/lambda-sns-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-sqs-handler.js +13 -13
- package/dist/cores/lambda/lambda-sqs-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-web-handler.d.ts +158 -8
- package/dist/cores/lambda/lambda-web-handler.js +330 -119
- package/dist/cores/lambda/lambda-web-handler.js.map +1 -1
- package/dist/cores/lambda/lambda-wss-handler.js +16 -12
- package/dist/cores/lambda/lambda-wss-handler.js.map +1 -1
- package/dist/cores/model-manager.js +11 -11
- package/dist/cores/model-manager.js.map +1 -1
- package/dist/cores/protocol/protocol-service.d.ts +4 -0
- package/dist/cores/protocol/protocol-service.js +46 -40
- package/dist/cores/protocol/protocol-service.js.map +1 -1
- package/dist/cores/proxy-storage-service.js +7 -10
- package/dist/cores/proxy-storage-service.js.map +1 -1
- package/dist/cores/redis-storage-service.js +13 -13
- package/dist/cores/redis-storage-service.js.map +1 -1
- package/dist/cores/storage/http-storage-service.d.ts +22 -0
- package/dist/cores/storage/http-storage-service.js +129 -0
- package/dist/cores/storage/http-storage-service.js.map +1 -0
- package/dist/cores/storage/index.d.ts +14 -0
- package/dist/cores/storage/index.js +31 -0
- package/dist/cores/storage/index.js.map +1 -0
- package/dist/cores/storage/model-manager.d.ts +93 -0
- package/dist/cores/storage/model-manager.js +192 -0
- package/dist/cores/storage/model-manager.js.map +1 -0
- package/dist/cores/storage/proxy-storage-service.d.ts +573 -0
- package/dist/cores/storage/proxy-storage-service.js +913 -0
- package/dist/cores/storage/proxy-storage-service.js.map +1 -0
- package/dist/cores/storage/redis-storage-service.d.ts +183 -0
- package/dist/cores/storage/redis-storage-service.js +391 -0
- package/dist/cores/storage/redis-storage-service.js.map +1 -0
- package/dist/cores/storage/storage-service.d.ts +169 -0
- package/dist/cores/storage/storage-service.js +374 -0
- package/dist/cores/storage/storage-service.js.map +1 -0
- package/dist/cores/storage-service.d.ts +1 -1
- package/dist/cores/storage-service.js +10 -8
- package/dist/cores/storage-service.js.map +1 -1
- package/dist/engine/builder.js +27 -20
- package/dist/engine/builder.js.map +1 -1
- package/dist/engine/engine.js +53 -44
- package/dist/engine/engine.js.map +1 -1
- package/dist/engine/index.js +8 -4
- package/dist/engine/index.js.map +1 -1
- package/dist/engine/utilities.d.ts +4 -3
- package/dist/engine/utilities.js +32 -37
- package/dist/engine/utilities.js.map +1 -1
- package/dist/environ.d.ts +2 -2
- package/dist/environ.js +20 -10
- package/dist/environ.js.map +1 -1
- package/dist/exec-cli.js +26 -26
- package/dist/exec-cli.js.map +1 -1
- package/dist/extended/abstract-service.d.ts +533 -0
- package/dist/extended/abstract-service.js +915 -0
- package/dist/extended/abstract-service.js.map +1 -0
- package/dist/extended/index.d.ts +10 -0
- package/dist/extended/index.js +27 -0
- package/dist/extended/index.js.map +1 -0
- package/dist/helpers/helpers.d.ts +273 -0
- package/dist/helpers/helpers.js +613 -0
- package/dist/helpers/helpers.js.map +1 -0
- package/dist/helpers/index.d.ts +10 -0
- package/dist/helpers/index.js +27 -0
- package/dist/helpers/index.js.map +1 -0
- package/dist/index.d.ts +7 -5
- package/dist/index.js +11 -4
- package/dist/index.js.map +1 -1
- package/dist/lib/dynamo/expressions.js +35 -27
- package/dist/lib/dynamo/expressions.js.map +1 -1
- package/dist/lib/dynamo/query.js +24 -20
- package/dist/lib/dynamo/query.js.map +1 -1
- package/dist/lib/dynamo/scan.js +17 -13
- package/dist/lib/dynamo/scan.js.map +1 -1
- package/dist/lib/dynamo/serializer.js +11 -7
- package/dist/lib/dynamo/serializer.js.map +1 -1
- package/dist/lib/dynamo/utils.js +19 -14
- package/dist/lib/dynamo/utils.js.map +1 -1
- package/dist/lib/dynamodb-value.js +3 -3
- package/dist/lib/dynamodb-value.js.map +1 -1
- package/dist/lib/index.js +6 -2
- package/dist/lib/index.js.map +1 -1
- package/dist/tools/express.js +21 -15
- package/dist/tools/express.js.map +1 -1
- package/dist/tools/index.js +6 -2
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/shared.js +12 -6
- package/dist/tools/shared.js.map +1 -1
- package/package.json +16 -15
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
/**
|
|
18
|
+
* `helpers.ts`
|
|
19
|
+
* - several function helpers.
|
|
20
|
+
*
|
|
21
|
+
* @author Steve Jung <steve@lemoncloud.io>
|
|
22
|
+
* @date 2022-03-17 initial commit
|
|
23
|
+
*
|
|
24
|
+
* @copyright (C) lemoncloud.io 2022 - All Rights Reserved.
|
|
25
|
+
*/
|
|
26
|
+
__exportStar(require("./helpers"), exports);
|
|
27
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;GAQG;AACH,4CAA0B"}
|
package/dist/index.d.ts
CHANGED
|
@@ -21,13 +21,15 @@ import * as lib from './lib/';
|
|
|
21
21
|
import * as tools from './tools/';
|
|
22
22
|
import * as controllers from './controllers/';
|
|
23
23
|
export { lib, tools };
|
|
24
|
+
export * from './helpers/';
|
|
25
|
+
export * from './extended/';
|
|
24
26
|
declare const _default: {
|
|
25
|
-
engine: import("./engine").LemonEngine;
|
|
27
|
+
engine: import("./engine/types").LemonEngine;
|
|
26
28
|
cores: {
|
|
27
|
-
aws: import("./cores").AWSModule;
|
|
28
|
-
config: import("./cores").ConfigModule;
|
|
29
|
-
lambda: import("./cores").LambdaModule;
|
|
30
|
-
protocol: import("./cores").ProtocolModule;
|
|
29
|
+
aws: import("./cores/aws").AWSModule;
|
|
30
|
+
config: import("./cores/config").ConfigModule;
|
|
31
|
+
lambda: import("./cores/lambda").LambdaModule;
|
|
32
|
+
protocol: import("./cores/protocol").ProtocolModule;
|
|
31
33
|
};
|
|
32
34
|
tools: typeof tools;
|
|
33
35
|
controllers: typeof controllers;
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -12,12 +16,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
12
16
|
o["default"] = v;
|
|
13
17
|
});
|
|
14
18
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
15
|
-
for (var p in m) if (p !== "default" && !
|
|
19
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
16
20
|
};
|
|
17
21
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
18
22
|
if (mod && mod.__esModule) return mod;
|
|
19
23
|
var result = {};
|
|
20
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
24
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
21
25
|
__setModuleDefault(result, mod);
|
|
22
26
|
return result;
|
|
23
27
|
};
|
|
@@ -46,14 +50,17 @@ __exportStar(require("./engine/"), exports);
|
|
|
46
50
|
__exportStar(require("./cores/"), exports);
|
|
47
51
|
__exportStar(require("./tools/"), exports);
|
|
48
52
|
__exportStar(require("./controllers/"), exports);
|
|
49
|
-
//!
|
|
53
|
+
//! init an instance of core modules.
|
|
50
54
|
const engine_1 = __importDefault(require("./engine/"));
|
|
51
55
|
const cores_1 = __importDefault(require("./cores/"));
|
|
56
|
+
//! export as group.
|
|
52
57
|
const lib = __importStar(require("./lib/"));
|
|
53
58
|
exports.lib = lib;
|
|
54
59
|
const tools = __importStar(require("./tools/"));
|
|
55
60
|
exports.tools = tools;
|
|
56
61
|
const controllers = __importStar(require("./controllers/"));
|
|
62
|
+
__exportStar(require("./helpers/"), exports);
|
|
63
|
+
__exportStar(require("./extended/"), exports);
|
|
57
64
|
//! export as default.
|
|
58
65
|
exports.default = { engine: engine_1.default, cores: cores_1.default, tools, controllers };
|
|
59
66
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;GAYG;AACH,8EAA8E;AAC9E,iDAA+B;AAC/B,uDAAqC;AACrC,4CAA0B;AAC1B,2CAAyB;AACzB,2CAAyB;AACzB,iDAA+B;AAE/B,qCAAqC;AACrC,uDAA+B;AAC/B,qDAA6B;AAE7B,oBAAoB;AACpB,4CAA8B;AAKrB,kBAAG;AAJZ,gDAAkC;AAIpB,sBAAK;AAHnB,4DAA8C;AAI9C,6CAA2B;AAC3B,8CAA4B;AAE5B,sBAAsB;AACtB,kBAAe,EAAE,MAAM,EAAN,gBAAM,EAAE,KAAK,EAAL,eAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC"}
|
|
@@ -13,7 +13,11 @@
|
|
|
13
13
|
*/
|
|
14
14
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
15
15
|
if (k2 === undefined) k2 = k;
|
|
16
|
-
Object.
|
|
16
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
17
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
18
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
19
|
+
}
|
|
20
|
+
Object.defineProperty(o, k2, desc);
|
|
17
21
|
}) : (function(o, m, k, k2) {
|
|
18
22
|
if (k2 === undefined) k2 = k;
|
|
19
23
|
o[k2] = m[k];
|
|
@@ -26,7 +30,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
26
30
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
27
31
|
if (mod && mod.__esModule) return mod;
|
|
28
32
|
var result = {};
|
|
29
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
30
34
|
__setModuleDefault(result, mod);
|
|
31
35
|
return result;
|
|
32
36
|
};
|
|
@@ -47,7 +51,7 @@ internals.regexMap = lodash_1.default.reduce(internals.actionWords, function (re
|
|
|
47
51
|
// explanation http://stackoverflow.com/questions/3428618/regex-to-find-commas-that-arent-inside-and
|
|
48
52
|
internals.splitOperandsRegex = new RegExp(/\s*(?![^(]*\)),\s*/);
|
|
49
53
|
internals.match = function (actionWord, str) {
|
|
50
|
-
|
|
54
|
+
const match = internals.regexMap[actionWord].exec(str);
|
|
51
55
|
if (match && match.length >= 2) {
|
|
52
56
|
return match[1].split(internals.splitOperandsRegex);
|
|
53
57
|
}
|
|
@@ -55,16 +59,17 @@ internals.match = function (actionWord, str) {
|
|
|
55
59
|
return null;
|
|
56
60
|
}
|
|
57
61
|
};
|
|
58
|
-
|
|
62
|
+
const parse = function (str) {
|
|
59
63
|
return lodash_1.default.reduce(internals.actionWords, function (result, actionWord) {
|
|
60
64
|
result[actionWord] = internals.match(actionWord, str);
|
|
61
65
|
return result;
|
|
62
66
|
}, {});
|
|
63
67
|
};
|
|
64
|
-
exports.
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
+
exports.parse = parse;
|
|
69
|
+
const serializeUpdateExpression = function (schema, item) {
|
|
70
|
+
const datatypes = schema._modelDatatypes;
|
|
71
|
+
const data = utils.omitPrimaryKeys(schema, item);
|
|
72
|
+
const memo = {
|
|
68
73
|
expressions: {},
|
|
69
74
|
attributeNames: {},
|
|
70
75
|
values: {},
|
|
@@ -74,8 +79,8 @@ exports.serializeUpdateExpression = function (schema, item) {
|
|
|
74
79
|
return result;
|
|
75
80
|
}, {});
|
|
76
81
|
const result = lodash_1.default.reduce(data, function (result, value, key) {
|
|
77
|
-
|
|
78
|
-
|
|
82
|
+
const valueKey = ':' + key;
|
|
83
|
+
const nameKey = '#' + key;
|
|
79
84
|
if (lodash_1.default.isNull(value) || (lodash_1.default.isString(value) && lodash_1.default.isEmpty(value))) {
|
|
80
85
|
result.expressions.REMOVE.push(nameKey);
|
|
81
86
|
result.attributeNames[nameKey] = key;
|
|
@@ -99,7 +104,8 @@ exports.serializeUpdateExpression = function (schema, item) {
|
|
|
99
104
|
}, memo);
|
|
100
105
|
return result;
|
|
101
106
|
};
|
|
102
|
-
exports.
|
|
107
|
+
exports.serializeUpdateExpression = serializeUpdateExpression;
|
|
108
|
+
const stringify = function (expressions) {
|
|
103
109
|
return lodash_1.default.reduce(expressions, function (result, value, key) {
|
|
104
110
|
if (!lodash_1.default.isEmpty(value)) {
|
|
105
111
|
if (lodash_1.default.isArray(value)) {
|
|
@@ -112,6 +118,7 @@ exports.stringify = function (expressions) {
|
|
|
112
118
|
return result;
|
|
113
119
|
}, []).join(' ');
|
|
114
120
|
};
|
|
121
|
+
exports.stringify = stringify;
|
|
115
122
|
internals.formatAttributeValue = function (val) {
|
|
116
123
|
if (lodash_1.default.isDate(val)) {
|
|
117
124
|
return val.toISOString();
|
|
@@ -130,21 +137,21 @@ internals.isFunctionOperator = function (operator) {
|
|
|
130
137
|
], operator);
|
|
131
138
|
};
|
|
132
139
|
internals.uniqAttributeValueName = function (key, existingValueNames) {
|
|
133
|
-
|
|
134
|
-
|
|
140
|
+
let potentialName = ':' + key;
|
|
141
|
+
let idx = 1;
|
|
135
142
|
while (lodash_1.default.includes(existingValueNames, potentialName)) {
|
|
136
143
|
idx++;
|
|
137
144
|
potentialName = ':' + key + '_' + idx;
|
|
138
145
|
}
|
|
139
146
|
return potentialName;
|
|
140
147
|
};
|
|
141
|
-
|
|
148
|
+
const buildFilterExpression = function (key, operator, existingValueNames, val1, val2) {
|
|
142
149
|
// IN filter expression is unlike all the others where val1 is an array of values
|
|
143
150
|
if (operator === 'IN') {
|
|
144
151
|
return internals.buildInFilterExpression(key, existingValueNames, val1);
|
|
145
152
|
}
|
|
146
|
-
|
|
147
|
-
|
|
153
|
+
let v1 = internals.formatAttributeValue(val1);
|
|
154
|
+
const v2 = internals.formatAttributeValue(val2);
|
|
148
155
|
if (operator === 'attribute_exists' && v1 === false) {
|
|
149
156
|
operator = 'attribute_not_exists';
|
|
150
157
|
v1 = null;
|
|
@@ -152,10 +159,10 @@ exports.buildFilterExpression = function (key, operator, existingValueNames, val
|
|
|
152
159
|
else if (operator === 'attribute_exists' && v1 === true) {
|
|
153
160
|
v1 = null;
|
|
154
161
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
162
|
+
const path = '#' + key;
|
|
163
|
+
const v1ValueName = internals.uniqAttributeValueName(key, existingValueNames);
|
|
164
|
+
const v2ValueName = internals.uniqAttributeValueName(key, [v1ValueName].concat(existingValueNames));
|
|
165
|
+
let statement = '';
|
|
159
166
|
if (internals.isFunctionOperator(operator)) {
|
|
160
167
|
if (!lodash_1.default.isNull(v1) && !lodash_1.default.isUndefined(v1)) {
|
|
161
168
|
statement = operator + '(' + path + ', ' + v1ValueName + ')';
|
|
@@ -170,14 +177,14 @@ exports.buildFilterExpression = function (key, operator, existingValueNames, val
|
|
|
170
177
|
else {
|
|
171
178
|
statement = [path, operator, v1ValueName].join(' ');
|
|
172
179
|
}
|
|
173
|
-
|
|
180
|
+
const attributeValues = {};
|
|
174
181
|
if (!lodash_1.default.isNull(v1) && !lodash_1.default.isUndefined(v1)) {
|
|
175
182
|
attributeValues[v1ValueName] = v1;
|
|
176
183
|
}
|
|
177
184
|
if (!lodash_1.default.isNull(v2) && !lodash_1.default.isUndefined(v2)) {
|
|
178
185
|
attributeValues[v2ValueName] = v2;
|
|
179
186
|
}
|
|
180
|
-
|
|
187
|
+
const attributeNames = {};
|
|
181
188
|
attributeNames[path] = key;
|
|
182
189
|
return {
|
|
183
190
|
attributeNames: attributeNames,
|
|
@@ -185,13 +192,14 @@ exports.buildFilterExpression = function (key, operator, existingValueNames, val
|
|
|
185
192
|
attributeValues: attributeValues,
|
|
186
193
|
};
|
|
187
194
|
};
|
|
195
|
+
exports.buildFilterExpression = buildFilterExpression;
|
|
188
196
|
internals.buildInFilterExpression = function (key, existingValueNames, values) {
|
|
189
|
-
|
|
190
|
-
|
|
197
|
+
const path = '#' + key;
|
|
198
|
+
const attributeNames = {};
|
|
191
199
|
attributeNames[path] = key;
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
200
|
+
const attributeValues = lodash_1.default.reduce(values, function (result, val) {
|
|
201
|
+
const existing = lodash_1.default.keys(result).concat(existingValueNames);
|
|
202
|
+
const p = internals.uniqAttributeValueName(key, existing);
|
|
195
203
|
result[p] = internals.formatAttributeValue(val);
|
|
196
204
|
return result;
|
|
197
205
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../src/lib/dynamo/expressions.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,qCAAqC;AACrC;;;;;;;;;GASG
|
|
1
|
+
{"version":3,"file":"expressions.js","sourceRoot":"","sources":["../../../src/lib/dynamo/expressions.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/dynamo/query.js
CHANGED
|
@@ -13,7 +13,11 @@
|
|
|
13
13
|
*/
|
|
14
14
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
15
15
|
if (k2 === undefined) k2 = k;
|
|
16
|
-
Object.
|
|
16
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
17
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
18
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
19
|
+
}
|
|
20
|
+
Object.defineProperty(o, k2, desc);
|
|
17
21
|
}) : (function(o, m, k, k2) {
|
|
18
22
|
if (k2 === undefined) k2 = k;
|
|
19
23
|
o[k2] = m[k];
|
|
@@ -26,7 +30,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
26
30
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
27
31
|
if (mod && mod.__esModule) return mod;
|
|
28
32
|
var result = {};
|
|
29
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
30
34
|
__setModuleDefault(result, mod);
|
|
31
35
|
return result;
|
|
32
36
|
};
|
|
@@ -39,12 +43,12 @@ const expressions = __importStar(require("./expressions"));
|
|
|
39
43
|
const utils = __importStar(require("./utils"));
|
|
40
44
|
const internals = {};
|
|
41
45
|
internals.keyCondition = function (keyName, schema, query) {
|
|
42
|
-
|
|
46
|
+
const f = function (operator) {
|
|
43
47
|
return function ( /*values*/) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
+
const copy = [].slice.call(arguments);
|
|
49
|
+
const existingValueKeys = lodash_1.default.keys(query.request.ExpressionAttributeValues);
|
|
50
|
+
const args = [keyName, operator, existingValueKeys].concat(copy);
|
|
51
|
+
const cond = expressions.buildFilterExpression.apply(null, args);
|
|
48
52
|
return query.addKeyCondition(cond);
|
|
49
53
|
};
|
|
50
54
|
};
|
|
@@ -60,12 +64,12 @@ internals.keyCondition = function (keyName, schema, query) {
|
|
|
60
64
|
};
|
|
61
65
|
};
|
|
62
66
|
internals.queryFilter = function (keyName, schema, query) {
|
|
63
|
-
|
|
67
|
+
const f = function (operator) {
|
|
64
68
|
return function ( /*values*/) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
+
const copy = [].slice.call(arguments);
|
|
70
|
+
const existingValueKeys = lodash_1.default.keys(query.request.ExpressionAttributeValues);
|
|
71
|
+
const args = [keyName, operator, existingValueKeys].concat(copy);
|
|
72
|
+
const cond = expressions.buildFilterExpression.apply(null, args);
|
|
69
73
|
return query.addFilterCondition(cond);
|
|
70
74
|
};
|
|
71
75
|
};
|
|
@@ -157,8 +161,8 @@ class Query {
|
|
|
157
161
|
if (!lodash_1.default.isArray(attrs)) {
|
|
158
162
|
attrs = [attrs];
|
|
159
163
|
}
|
|
160
|
-
|
|
161
|
-
|
|
164
|
+
const expressionAttributeNames = lodash_1.default.reduce(attrs, function (result, attr) {
|
|
165
|
+
const path = '#' + attr;
|
|
162
166
|
result[path] = attr;
|
|
163
167
|
return result;
|
|
164
168
|
}, {});
|
|
@@ -196,19 +200,19 @@ class Query {
|
|
|
196
200
|
return internals.queryFilter(keyName, this.table.schema, this);
|
|
197
201
|
};
|
|
198
202
|
this.exec = function (callback) {
|
|
199
|
-
|
|
203
|
+
const self = this;
|
|
200
204
|
this.addKeyCondition(this.buildKey());
|
|
201
|
-
|
|
205
|
+
const runQuery = function (params, callback) {
|
|
202
206
|
self.table.runQuery(params, callback);
|
|
203
207
|
};
|
|
204
208
|
return utils.paginatedRequest(self, runQuery, callback);
|
|
205
209
|
};
|
|
206
210
|
this.buildKey = function () {
|
|
207
|
-
|
|
211
|
+
let key = this.table.schema.hashKey;
|
|
208
212
|
if (internals.isUsingGlobalIndex(this)) {
|
|
209
213
|
key = this.table.schema.globalIndexes[this.request.IndexName].hashKey;
|
|
210
214
|
}
|
|
211
|
-
|
|
215
|
+
const existingValueKeys = lodash_1.default.keys(this.request.ExpressionAttributeValues);
|
|
212
216
|
return expressions.buildFilterExpression(key, '=', existingValueKeys, this.hashKey);
|
|
213
217
|
};
|
|
214
218
|
this.buildRequest = function () {
|
|
@@ -222,8 +226,8 @@ class Query {
|
|
|
222
226
|
}
|
|
223
227
|
}
|
|
224
228
|
internals.addExpressionAttributes = function (request, condition) {
|
|
225
|
-
|
|
226
|
-
|
|
229
|
+
const expressionAttributeNames = lodash_1.default.merge({}, condition.attributeNames, request.ExpressionAttributeNames);
|
|
230
|
+
const expressionAttributeValues = lodash_1.default.merge({}, condition.attributeValues, request.ExpressionAttributeValues);
|
|
227
231
|
if (!lodash_1.default.isEmpty(expressionAttributeNames)) {
|
|
228
232
|
request.ExpressionAttributeNames = expressionAttributeNames;
|
|
229
233
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/lib/dynamo/query.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,qCAAqC;AACrC;;;;;;;;;GASG
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/lib/dynamo/query.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/dynamo/scan.js
CHANGED
|
@@ -13,7 +13,11 @@
|
|
|
13
13
|
*/
|
|
14
14
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
15
15
|
if (k2 === undefined) k2 = k;
|
|
16
|
-
Object.
|
|
16
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
17
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
18
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
19
|
+
}
|
|
20
|
+
Object.defineProperty(o, k2, desc);
|
|
17
21
|
}) : (function(o, m, k, k2) {
|
|
18
22
|
if (k2 === undefined) k2 = k;
|
|
19
23
|
o[k2] = m[k];
|
|
@@ -26,7 +30,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
26
30
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
27
31
|
if (mod && mod.__esModule) return mod;
|
|
28
32
|
var result = {};
|
|
29
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
30
34
|
__setModuleDefault(result, mod);
|
|
31
35
|
return result;
|
|
32
36
|
};
|
|
@@ -39,12 +43,12 @@ const expressions = __importStar(require("./expressions"));
|
|
|
39
43
|
const utils = __importStar(require("./utils"));
|
|
40
44
|
const internals = {};
|
|
41
45
|
internals.keyCondition = function (keyName, schema, scan) {
|
|
42
|
-
|
|
46
|
+
const f = function (operator) {
|
|
43
47
|
return function ( /*values*/) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
+
const copy = [].slice.call(arguments);
|
|
49
|
+
const existingValueKeys = lodash_1.default.keys(scan.request.ExpressionAttributeValues);
|
|
50
|
+
const args = [keyName, operator, existingValueKeys].concat(copy);
|
|
51
|
+
const cond = expressions.buildFilterExpression.apply(null, args);
|
|
48
52
|
return scan.addFilterCondition(cond);
|
|
49
53
|
};
|
|
50
54
|
};
|
|
@@ -75,8 +79,8 @@ class Scan {
|
|
|
75
79
|
return this;
|
|
76
80
|
};
|
|
77
81
|
this.addFilterCondition = function (condition) {
|
|
78
|
-
|
|
79
|
-
|
|
82
|
+
const expressionAttributeNames = lodash_1.default.merge({}, condition.attributeNames, this.request.ExpressionAttributeNames);
|
|
83
|
+
const expressionAttributeValues = lodash_1.default.merge({}, condition.attributeValues, this.request.ExpressionAttributeValues);
|
|
80
84
|
if (!lodash_1.default.isEmpty(expressionAttributeNames)) {
|
|
81
85
|
this.request.ExpressionAttributeNames = expressionAttributeNames;
|
|
82
86
|
}
|
|
@@ -99,8 +103,8 @@ class Scan {
|
|
|
99
103
|
if (!lodash_1.default.isArray(attrs)) {
|
|
100
104
|
attrs = [attrs];
|
|
101
105
|
}
|
|
102
|
-
|
|
103
|
-
|
|
106
|
+
const expressionAttributeNames = lodash_1.default.reduce(attrs, function (result, attr) {
|
|
107
|
+
const path = '#' + attr;
|
|
104
108
|
result[path] = attr;
|
|
105
109
|
return result;
|
|
106
110
|
}, {});
|
|
@@ -144,8 +148,8 @@ class Scan {
|
|
|
144
148
|
return this;
|
|
145
149
|
};
|
|
146
150
|
this.exec = function (callback) {
|
|
147
|
-
|
|
148
|
-
|
|
151
|
+
const self = this;
|
|
152
|
+
const runScan = function (params, callback) {
|
|
149
153
|
self.table.runScan(params, callback);
|
|
150
154
|
};
|
|
151
155
|
return utils.paginatedRequest(self, runScan, callback);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../src/lib/dynamo/scan.ts"],"names":[],"mappings":";AAAA,+DAA+D;AAC/D,qCAAqC;AACrC;;;;;;;;;GASG
|
|
1
|
+
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../src/lib/dynamo/scan.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,11 @@
|
|
|
13
13
|
*/
|
|
14
14
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
15
15
|
if (k2 === undefined) k2 = k;
|
|
16
|
-
Object.
|
|
16
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
17
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
18
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
19
|
+
}
|
|
20
|
+
Object.defineProperty(o, k2, desc);
|
|
17
21
|
}) : (function(o, m, k, k2) {
|
|
18
22
|
if (k2 === undefined) k2 = k;
|
|
19
23
|
o[k2] = m[k];
|
|
@@ -26,7 +30,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
26
30
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
27
31
|
if (mod && mod.__esModule) return mod;
|
|
28
32
|
var result = {};
|
|
29
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
30
34
|
__setModuleDefault(result, mod);
|
|
31
35
|
return result;
|
|
32
36
|
};
|
|
@@ -79,11 +83,11 @@ const internals = {
|
|
|
79
83
|
return internals.createSet(value, 'N');
|
|
80
84
|
},
|
|
81
85
|
binarySet: function (value) {
|
|
82
|
-
|
|
86
|
+
let bins = value;
|
|
83
87
|
if (!lodash_1.default.isArray(value)) {
|
|
84
88
|
bins = [value];
|
|
85
89
|
}
|
|
86
|
-
|
|
90
|
+
const vals = lodash_1.default.map(bins, serialize.binary);
|
|
87
91
|
return internals.createSet(vals, 'B');
|
|
88
92
|
},
|
|
89
93
|
},
|
|
@@ -156,7 +160,7 @@ serializer.buildKey = (hashKey, rangeKey, schema) => {
|
|
|
156
160
|
};
|
|
157
161
|
serializer.serializeItem = (schema, item, options) => {
|
|
158
162
|
options = options || {};
|
|
159
|
-
|
|
163
|
+
const serialize = function (item, datatypes) {
|
|
160
164
|
datatypes = datatypes || {};
|
|
161
165
|
if (!item) {
|
|
162
166
|
return null;
|
|
@@ -176,7 +180,7 @@ serializer.serializeItem = (schema, item, options) => {
|
|
|
176
180
|
});
|
|
177
181
|
return result;
|
|
178
182
|
}
|
|
179
|
-
|
|
183
|
+
const attr = internals.serializeAttribute(val, datatypes[key], options);
|
|
180
184
|
if (!lodash_1.default.isNull(attr) || options.returnNulls) {
|
|
181
185
|
if (options.expected) {
|
|
182
186
|
result[key] = { Value: attr };
|
|
@@ -219,7 +223,7 @@ serializer.deserializeItem = function (item) {
|
|
|
219
223
|
map = lodash_1.default.map;
|
|
220
224
|
}
|
|
221
225
|
return map(data, function (value) {
|
|
222
|
-
|
|
226
|
+
let result;
|
|
223
227
|
if (lodash_1.default.isPlainObject(value)) {
|
|
224
228
|
result = formatter(value);
|
|
225
229
|
}
|