spice-js 2.5.6 → 2.5.7
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/bootstrap/database.js +1 -1
- package/build/bootstrap/map.js +2 -4
- package/build/bootstrap/tasks.js +8 -7
- package/build/docs/generator.js +9 -15
- package/build/events/Event.js +3 -5
- package/build/events/providers/EventDebugger.js +4 -6
- package/build/events/providers/SocketEventDriver.js +1 -3
- package/build/events/providers/SpiceEventDriver.js +3 -5
- package/build/index.js +36 -106
- package/build/loaders/index.js +14 -5
- package/build/mail/Mail.js +8 -11
- package/build/mail/providers/Debug.js +12 -9
- package/build/mail/providers/File.js +14 -11
- package/build/models/SpiceModel.js +24 -25
- package/build/storage/Storage.js +6 -5
- package/build/storage/providers/Debug.js +12 -9
- package/build/storage/providers/Local.js +8 -7
- package/build/utility/Crypt.js +1 -3
- package/build/utility/DataType.js +1 -3
- package/build/utility/MapType.js +1 -3
- package/build/utility/RestHelper.js +11 -10
- package/build/utility/Serializer.js +1 -3
- package/build/utility/index.js +1 -3
- package/build/val/Utility.js +3 -3
- package/package.json +2 -1
- package/src/bootstrap/map.js +1 -3
- package/src/loaders/index.js +12 -2
|
@@ -19,7 +19,7 @@ function _connect() {
|
|
|
19
19
|
var value = spice.config.database.connections[key];
|
|
20
20
|
|
|
21
21
|
if (value.enabled) {
|
|
22
|
-
var Database = require("spice-"
|
|
22
|
+
var Database = require("spice-" + value.type);
|
|
23
23
|
|
|
24
24
|
var connection = new Database();
|
|
25
25
|
var result = yield connection.connect(key, value);
|
package/build/bootstrap/map.js
CHANGED
|
@@ -13,8 +13,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
|
|
|
13
13
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
14
14
|
|
|
15
15
|
try {
|
|
16
|
-
var resources = ["models", "controllers"];
|
|
17
|
-
console.log(":::::::::::::STARTING MAP:::::::::::::");
|
|
16
|
+
var resources = ["models", "controllers", "schemas"];
|
|
18
17
|
resources.every(resource => {
|
|
19
18
|
var paths = _path.default.join(spice.root_path, resource);
|
|
20
19
|
|
|
@@ -24,8 +23,7 @@ try {
|
|
|
24
23
|
/*#__PURE__*/
|
|
25
24
|
function () {
|
|
26
25
|
var _ref = _asyncToGenerator(function* (file) {
|
|
27
|
-
|
|
28
|
-
spice[resource][file.split(".")[0]] = (yield Promise.resolve("".concat(_path.default.join(paths, file))).then(s => _interopRequireWildcard(require(s)))).default;
|
|
26
|
+
spice[resource][file.split(".")[0]] = (yield Promise.resolve("" + _path.default.join(paths, file)).then(s => _interopRequireWildcard(require(s)))).default;
|
|
29
27
|
});
|
|
30
28
|
|
|
31
29
|
return function (_x) {
|
package/build/bootstrap/tasks.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = addTask;
|
|
7
5
|
|
|
8
6
|
var _path = _interopRequireDefault(require("path"));
|
|
@@ -74,13 +72,16 @@ _asyncToGenerator(function* () {
|
|
|
74
72
|
}
|
|
75
73
|
});
|
|
76
74
|
|
|
77
|
-
function addTask(_x4) {
|
|
75
|
+
function addTask(_x4, _x5) {
|
|
78
76
|
return _addTask.apply(this, arguments);
|
|
79
77
|
}
|
|
80
78
|
|
|
81
79
|
function _addTask() {
|
|
82
|
-
_addTask = _asyncToGenerator(function* (task) {
|
|
83
|
-
|
|
80
|
+
_addTask = _asyncToGenerator(function* (task, params) {
|
|
81
|
+
if (params === void 0) {
|
|
82
|
+
params = null;
|
|
83
|
+
}
|
|
84
|
+
|
|
84
85
|
agenda.define(task.name, task.handle);
|
|
85
86
|
var parameters = params != null ? params : task.params;
|
|
86
87
|
var returned_function = yield getExecuteFunction(task, parameters);
|
|
@@ -97,7 +98,7 @@ function _addTask() {
|
|
|
97
98
|
return _addTask.apply(this, arguments);
|
|
98
99
|
}
|
|
99
100
|
|
|
100
|
-
function getExecuteFunction(
|
|
101
|
+
function getExecuteFunction(_x6, _x7) {
|
|
101
102
|
return _getExecuteFunction.apply(this, arguments);
|
|
102
103
|
}
|
|
103
104
|
|
package/build/docs/generator.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = generateSpec;
|
|
7
5
|
|
|
8
6
|
var _path2 = _interopRequireDefault(require("path"));
|
|
@@ -23,11 +21,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
|
|
|
23
21
|
|
|
24
22
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
25
23
|
|
|
26
|
-
function
|
|
27
|
-
|
|
28
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
29
|
-
|
|
30
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
24
|
+
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
31
25
|
|
|
32
26
|
//let paths = path.join(spice.root_path, "routes");
|
|
33
27
|
var tags = [];
|
|
@@ -45,7 +39,7 @@ function getPackageInfo() {
|
|
|
45
39
|
function createPath(path) {
|
|
46
40
|
return _lodash.default.join(_lodash.default.map(_lodash.default.split(path, "/"), seg => {
|
|
47
41
|
if (_lodash.default.startsWith(seg, ":")) {
|
|
48
|
-
return "{"
|
|
42
|
+
return "{" + _lodash.default.trim(seg, ":") + "}";
|
|
49
43
|
}
|
|
50
44
|
|
|
51
45
|
return seg;
|
|
@@ -142,20 +136,20 @@ function getRoutes(models) {
|
|
|
142
136
|
if (doc_return.length > 0) {
|
|
143
137
|
if (doc_return[0].type == undefined) {
|
|
144
138
|
_path.responses["200"]["schema"] = {
|
|
145
|
-
$ref: "#/definitions/"
|
|
139
|
+
$ref: "#/definitions/" + doc_return[0].description
|
|
146
140
|
};
|
|
147
141
|
} else if (doc_return[0].type.name == "array") {
|
|
148
142
|
_path.responses["200"]["schema"] = {
|
|
149
143
|
type: doc_return[0].type.name,
|
|
150
144
|
items: {
|
|
151
|
-
$ref: "#/definitions/"
|
|
145
|
+
$ref: "#/definitions/" + doc_return[0].description
|
|
152
146
|
}
|
|
153
147
|
};
|
|
154
148
|
} else if (doc_return[0].type.name == "object") {
|
|
155
149
|
_path.responses["200"]["schema"] = {
|
|
156
150
|
type: doc_return[0].type.name,
|
|
157
151
|
additionalProperties: {
|
|
158
|
-
$ref: "#/definitions/"
|
|
152
|
+
$ref: "#/definitions/" + doc_return[0].description
|
|
159
153
|
}
|
|
160
154
|
};
|
|
161
155
|
}
|
|
@@ -189,7 +183,7 @@ function preparParameters(comment, defaultModel, models) {
|
|
|
189
183
|
|
|
190
184
|
if (tag.description != undefined && IsJsonString(tag.description)) {
|
|
191
185
|
var parsed_JSON = JSON.parse(tag.description);
|
|
192
|
-
param =
|
|
186
|
+
param = _extends({}, param, parsed_JSON);
|
|
193
187
|
}
|
|
194
188
|
|
|
195
189
|
if (tag.name == "" && tag.type != undefined) {
|
|
@@ -325,7 +319,7 @@ function getProperties(obj) {
|
|
|
325
319
|
if (map != undefined && map.type == "model") {
|
|
326
320
|
if (map.reference != undefined) {
|
|
327
321
|
var references = _lodash.default.isArray(map.reference) ? map.reference : [map.reference];
|
|
328
|
-
var reference = "#/definitions/"
|
|
322
|
+
var reference = "#/definitions/" + (_lodash.default.isString(map.reference) ? map.reference : references[0].name);
|
|
329
323
|
|
|
330
324
|
if (to_return.type == "array") {
|
|
331
325
|
to_return.items.$ref = reference;
|
|
@@ -433,7 +427,7 @@ function _generateSpec() {
|
|
|
433
427
|
security: [{
|
|
434
428
|
Bearer: []
|
|
435
429
|
}],
|
|
436
|
-
host:
|
|
430
|
+
host: spice.config.spice.host + ":" + spice.config.spice.port,
|
|
437
431
|
port: 80,
|
|
438
432
|
basePath: "/",
|
|
439
433
|
tags: generateTags(),
|
package/build/events/Event.js
CHANGED
|
@@ -3,9 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
"use strict";
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
value: true
|
|
8
|
-
});
|
|
6
|
+
exports.__esModule = true;
|
|
9
7
|
exports.default = void 0;
|
|
10
8
|
|
|
11
9
|
var Date = require("sonover-date");
|
|
@@ -18,10 +16,10 @@ class Event {
|
|
|
18
16
|
this.topic = args.topic;
|
|
19
17
|
}
|
|
20
18
|
|
|
21
|
-
dispatch() {
|
|
19
|
+
dispatch(_temp) {
|
|
22
20
|
var {
|
|
23
21
|
driver
|
|
24
|
-
} =
|
|
22
|
+
} = _temp === void 0 ? {} : _temp;
|
|
25
23
|
|
|
26
24
|
if (driver) {
|
|
27
25
|
this.driver = driver;
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
class EventDebugger {
|
|
9
|
-
dispatch() {
|
|
7
|
+
dispatch(_temp) {
|
|
10
8
|
var {
|
|
11
9
|
topic,
|
|
12
10
|
data
|
|
13
|
-
} =
|
|
14
|
-
console.log(data, "dispatched on ", "\""
|
|
11
|
+
} = _temp === void 0 ? {} : _temp;
|
|
12
|
+
console.log(data, "dispatched on ", "\"" + topic + "\"");
|
|
15
13
|
}
|
|
16
14
|
|
|
17
15
|
on(topic, callback) {}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
class SpiceEventDriver {
|
|
9
|
-
dispatch() {
|
|
7
|
+
dispatch(_temp) {
|
|
10
8
|
var {
|
|
11
9
|
topic,
|
|
12
10
|
data
|
|
13
|
-
} =
|
|
11
|
+
} = _temp === void 0 ? {} : _temp;
|
|
14
12
|
spice.EventEmitter.emit(topic, data);
|
|
15
13
|
}
|
|
16
14
|
|
package/build/index.js
CHANGED
|
@@ -1,150 +1,80 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
});
|
|
6
|
-
Object.defineProperty(exports, "Event", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: function get() {
|
|
9
|
-
return _Event.default;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
|
-
Object.defineProperty(exports, "EventDebugger", {
|
|
13
|
-
enumerable: true,
|
|
14
|
-
get: function get() {
|
|
15
|
-
return _EventDebugger.default;
|
|
16
|
-
}
|
|
17
|
-
});
|
|
18
|
-
Object.defineProperty(exports, "SpiceEventDriver", {
|
|
19
|
-
enumerable: true,
|
|
20
|
-
get: function get() {
|
|
21
|
-
return _SpiceEventDriver.default;
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
Object.defineProperty(exports, "SocketEventDriver", {
|
|
25
|
-
enumerable: true,
|
|
26
|
-
get: function get() {
|
|
27
|
-
return _SocketEventDriver.default;
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
Object.defineProperty(exports, "SpiceModel", {
|
|
31
|
-
enumerable: true,
|
|
32
|
-
get: function get() {
|
|
33
|
-
return _SpiceModel.default;
|
|
34
|
-
}
|
|
35
|
-
});
|
|
36
|
-
Object.defineProperty(exports, "Crypt", {
|
|
37
|
-
enumerable: true,
|
|
38
|
-
get: function get() {
|
|
39
|
-
return _Crypt.default;
|
|
40
|
-
}
|
|
41
|
-
});
|
|
42
|
-
Object.defineProperty(exports, "Serializer", {
|
|
43
|
-
enumerable: true,
|
|
44
|
-
get: function get() {
|
|
45
|
-
return _Serializer.default;
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
Object.defineProperty(exports, "RestHelper", {
|
|
49
|
-
enumerable: true,
|
|
50
|
-
get: function get() {
|
|
51
|
-
return _RestHelper.default;
|
|
52
|
-
}
|
|
53
|
-
});
|
|
54
|
-
Object.defineProperty(exports, "Mail", {
|
|
55
|
-
enumerable: true,
|
|
56
|
-
get: function get() {
|
|
57
|
-
return _Mail.default;
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
|
-
Object.defineProperty(exports, "DataType", {
|
|
61
|
-
enumerable: true,
|
|
62
|
-
get: function get() {
|
|
63
|
-
return _DataType.default;
|
|
64
|
-
}
|
|
65
|
-
});
|
|
66
|
-
Object.defineProperty(exports, "MailDebug", {
|
|
67
|
-
enumerable: true,
|
|
68
|
-
get: function get() {
|
|
69
|
-
return _Debug.default;
|
|
70
|
-
}
|
|
71
|
-
});
|
|
72
|
-
Object.defineProperty(exports, "DebugStorage", {
|
|
73
|
-
enumerable: true,
|
|
74
|
-
get: function get() {
|
|
75
|
-
return _Debug2.default;
|
|
76
|
-
}
|
|
77
|
-
});
|
|
78
|
-
Object.defineProperty(exports, "LocalStorage", {
|
|
79
|
-
enumerable: true,
|
|
80
|
-
get: function get() {
|
|
81
|
-
return _Local.default;
|
|
82
|
-
}
|
|
83
|
-
});
|
|
84
|
-
Object.defineProperty(exports, "Storage", {
|
|
85
|
-
enumerable: true,
|
|
86
|
-
get: function get() {
|
|
87
|
-
return _Storage.default;
|
|
88
|
-
}
|
|
89
|
-
});
|
|
90
|
-
Object.defineProperty(exports, "MailFile", {
|
|
91
|
-
enumerable: true,
|
|
92
|
-
get: function get() {
|
|
93
|
-
return _File.default;
|
|
94
|
-
}
|
|
95
|
-
});
|
|
96
|
-
Object.defineProperty(exports, "MapType", {
|
|
97
|
-
enumerable: true,
|
|
98
|
-
get: function get() {
|
|
99
|
-
return _MapType.default;
|
|
100
|
-
}
|
|
101
|
-
});
|
|
102
|
-
Object.defineProperty(exports, "addTask", {
|
|
103
|
-
enumerable: true,
|
|
104
|
-
get: function get() {
|
|
105
|
-
return _tasks.default;
|
|
106
|
-
}
|
|
107
|
-
});
|
|
108
|
-
exports.default = exports.status = void 0;
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
exports.default = exports.status = exports.addTask = exports.MapType = exports.MailFile = exports.Storage = exports.LocalStorage = exports.DebugStorage = exports.MailDebug = exports.DataType = exports.Mail = exports.RestHelper = exports.Serializer = exports.Crypt = exports.SpiceModel = exports.SocketEventDriver = exports.SpiceEventDriver = exports.EventDebugger = exports.Event = void 0;
|
|
109
5
|
|
|
110
6
|
var _koaSocket = _interopRequireDefault(require("koa-socket-2"));
|
|
111
7
|
|
|
112
8
|
var _Event = _interopRequireDefault(require("./events/Event"));
|
|
113
9
|
|
|
10
|
+
exports.Event = _Event.default;
|
|
11
|
+
|
|
114
12
|
var _EventDebugger = _interopRequireDefault(require("./events/providers/EventDebugger"));
|
|
115
13
|
|
|
14
|
+
exports.EventDebugger = _EventDebugger.default;
|
|
15
|
+
|
|
116
16
|
var _SpiceEventDriver = _interopRequireDefault(require("./events/providers/SpiceEventDriver"));
|
|
117
17
|
|
|
18
|
+
exports.SpiceEventDriver = _SpiceEventDriver.default;
|
|
19
|
+
|
|
118
20
|
var _SocketEventDriver = _interopRequireDefault(require("./events/providers/SocketEventDriver"));
|
|
119
21
|
|
|
22
|
+
exports.SocketEventDriver = _SocketEventDriver.default;
|
|
23
|
+
|
|
120
24
|
var _SpiceModel = _interopRequireDefault(require("./models/SpiceModel"));
|
|
121
25
|
|
|
26
|
+
exports.SpiceModel = _SpiceModel.default;
|
|
27
|
+
|
|
122
28
|
var _Crypt = _interopRequireDefault(require("./utility/Crypt"));
|
|
123
29
|
|
|
30
|
+
exports.Crypt = _Crypt.default;
|
|
31
|
+
|
|
124
32
|
var _Serializer = _interopRequireDefault(require("./utility/Serializer"));
|
|
125
33
|
|
|
34
|
+
exports.Serializer = _Serializer.default;
|
|
35
|
+
|
|
126
36
|
var _RestHelper = _interopRequireDefault(require("./utility/RestHelper"));
|
|
127
37
|
|
|
38
|
+
exports.RestHelper = _RestHelper.default;
|
|
39
|
+
|
|
128
40
|
var _Status = _interopRequireDefault(require("./utility/Status"));
|
|
129
41
|
|
|
130
42
|
var _Mail = _interopRequireDefault(require("./mail/Mail"));
|
|
131
43
|
|
|
44
|
+
exports.Mail = _Mail.default;
|
|
45
|
+
|
|
132
46
|
var _DataType = _interopRequireDefault(require("./utility/DataType"));
|
|
133
47
|
|
|
48
|
+
exports.DataType = _DataType.default;
|
|
49
|
+
|
|
134
50
|
var _Debug = _interopRequireDefault(require("./mail/providers/Debug"));
|
|
135
51
|
|
|
52
|
+
exports.MailDebug = _Debug.default;
|
|
53
|
+
|
|
136
54
|
var _Debug2 = _interopRequireDefault(require("./storage/providers/Debug"));
|
|
137
55
|
|
|
56
|
+
exports.DebugStorage = _Debug2.default;
|
|
57
|
+
|
|
138
58
|
var _Local = _interopRequireDefault(require("./storage/providers/Local"));
|
|
139
59
|
|
|
60
|
+
exports.LocalStorage = _Local.default;
|
|
61
|
+
|
|
140
62
|
var _Storage = _interopRequireDefault(require("./storage/Storage"));
|
|
141
63
|
|
|
64
|
+
exports.Storage = _Storage.default;
|
|
65
|
+
|
|
142
66
|
var _File = _interopRequireDefault(require("./mail/providers/File"));
|
|
143
67
|
|
|
68
|
+
exports.MailFile = _File.default;
|
|
69
|
+
|
|
144
70
|
var _MapType = _interopRequireDefault(require("./utility/MapType"));
|
|
145
71
|
|
|
72
|
+
exports.MapType = _MapType.default;
|
|
73
|
+
|
|
146
74
|
var _tasks = _interopRequireDefault(require("./bootstrap/tasks"));
|
|
147
75
|
|
|
76
|
+
exports.addTask = _tasks.default;
|
|
77
|
+
|
|
148
78
|
var _generator = _interopRequireDefault(require("./docs/generator"));
|
|
149
79
|
|
|
150
80
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
package/build/loaders/index.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.load = load;
|
|
7
5
|
|
|
8
6
|
var _path = _interopRequireDefault(require("path"));
|
|
@@ -17,7 +15,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
|
|
|
17
15
|
|
|
18
16
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
19
17
|
|
|
20
|
-
var ordered_modules = ["map", "logger", "error", "database"
|
|
18
|
+
var ordered_modules = ["map", "logger", "error", "database"];
|
|
19
|
+
var last_modules = ["views", "routes"];
|
|
21
20
|
|
|
22
21
|
function load() {
|
|
23
22
|
return _load.apply(this, arguments);
|
|
@@ -53,7 +52,7 @@ function _load() {
|
|
|
53
52
|
for (var _file of _fs.default.readdirSync(loadder_path)) {
|
|
54
53
|
console.log("Loading:", _file);
|
|
55
54
|
|
|
56
|
-
if (_file != "index.js" && !_lodash.default.includes(ordered_modules, _file.split(".")[0])) {
|
|
55
|
+
if (_file != "index.js" && !_lodash.default.includes(ordered_modules, _file.split(".")[0]) && !_lodash.default.includes(last_modules, _file.split(".")[0])) {
|
|
57
56
|
var _mod = require(_path.default.join(loadder_path, _file.split(".")[0]));
|
|
58
57
|
|
|
59
58
|
if (_lodash.default.isFunction(_mod)) {
|
|
@@ -62,6 +61,16 @@ function _load() {
|
|
|
62
61
|
}
|
|
63
62
|
}
|
|
64
63
|
}
|
|
64
|
+
|
|
65
|
+
for (var _file2 of last_modules) {
|
|
66
|
+
var _mod2 = require(_path.default.join(bootstrap_path, _file2));
|
|
67
|
+
|
|
68
|
+
if (_lodash.default.isFunction(_mod2)) {
|
|
69
|
+
yield _mod2();
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
console.log("loaded", _file2);
|
|
73
|
+
}
|
|
65
74
|
} catch (e) {
|
|
66
75
|
console.log(e.stack);
|
|
67
76
|
}
|
package/build/mail/Mail.js
CHANGED
|
@@ -1,19 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
9
7
|
|
|
10
8
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
9
|
|
|
12
|
-
function
|
|
13
|
-
|
|
14
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
15
|
-
|
|
16
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
10
|
+
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
17
11
|
|
|
18
12
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
19
13
|
|
|
@@ -26,8 +20,11 @@ var path = require("path");
|
|
|
26
20
|
var juice = require("juice");
|
|
27
21
|
|
|
28
22
|
class Mail {
|
|
29
|
-
constructor() {
|
|
30
|
-
|
|
23
|
+
constructor(args) {
|
|
24
|
+
if (args === void 0) {
|
|
25
|
+
args = {};
|
|
26
|
+
}
|
|
27
|
+
|
|
31
28
|
this.nunjucksOptions = {
|
|
32
29
|
map: {
|
|
33
30
|
html: "nunjucks"
|
|
@@ -91,7 +88,7 @@ class Mail {
|
|
|
91
88
|
var sendable_text = "";
|
|
92
89
|
|
|
93
90
|
if (_this2.template) {
|
|
94
|
-
sendable_text = yield _this2.prepare(
|
|
91
|
+
sendable_text = yield _this2.prepare(_extends({}, data, _this2));
|
|
95
92
|
}
|
|
96
93
|
|
|
97
94
|
if (content) {
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
@@ -10,19 +8,24 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
|
|
|
10
8
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
11
9
|
|
|
12
10
|
class Mail {
|
|
13
|
-
constructor() {
|
|
14
|
-
|
|
11
|
+
constructor(args) {
|
|
12
|
+
if (args === void 0) {
|
|
13
|
+
args = {};
|
|
14
|
+
}
|
|
15
|
+
|
|
15
16
|
this.sender = args.sender;
|
|
16
17
|
this.subject = args.subject;
|
|
17
18
|
this.htmlText = args.htmlText;
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
send(htmlText) {
|
|
21
|
-
var
|
|
22
|
-
_this = this;
|
|
21
|
+
send(htmlText, options) {
|
|
22
|
+
var _this = this;
|
|
23
23
|
|
|
24
24
|
return _asyncToGenerator(function* () {
|
|
25
|
-
|
|
25
|
+
if (options === void 0) {
|
|
26
|
+
options = {};
|
|
27
|
+
}
|
|
28
|
+
|
|
26
29
|
var email = {
|
|
27
30
|
to: options.to,
|
|
28
31
|
from: options.sender || _this.sender,
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
@@ -16,8 +14,11 @@ var path = require('path');
|
|
|
16
14
|
var open = require("open");
|
|
17
15
|
|
|
18
16
|
class File {
|
|
19
|
-
constructor() {
|
|
20
|
-
|
|
17
|
+
constructor(args) {
|
|
18
|
+
if (args === void 0) {
|
|
19
|
+
args = {};
|
|
20
|
+
}
|
|
21
|
+
|
|
21
22
|
this.sender = args.sender;
|
|
22
23
|
this.subject = args.subject;
|
|
23
24
|
this.htmlText = args.htmlText;
|
|
@@ -28,12 +29,14 @@ class File {
|
|
|
28
29
|
}
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
send(htmlText) {
|
|
32
|
-
var
|
|
33
|
-
_this = this;
|
|
32
|
+
send(htmlText, options) {
|
|
33
|
+
var _this = this;
|
|
34
34
|
|
|
35
35
|
return _asyncToGenerator(function* () {
|
|
36
|
-
|
|
36
|
+
if (options === void 0) {
|
|
37
|
+
options = {};
|
|
38
|
+
}
|
|
39
|
+
|
|
37
40
|
var email = {
|
|
38
41
|
to: options.to,
|
|
39
42
|
from: options.sender || _this.sender,
|
|
@@ -41,8 +44,8 @@ class File {
|
|
|
41
44
|
htmlText: htmlText || _this.htmlText
|
|
42
45
|
};
|
|
43
46
|
var time = new Date().getTime();
|
|
44
|
-
fs.ensureDirSync(
|
|
45
|
-
var full_path =
|
|
47
|
+
fs.ensureDirSync(_this.dest + "/" + email.subject + "/" + time);
|
|
48
|
+
var full_path = _this.dest + "/" + email.subject + "/" + time + "/to:" + email.to + " from:" + email.from + ".html";
|
|
46
49
|
fs.writeFileSync(full_path, email.htmlText);
|
|
47
50
|
open(full_path);
|
|
48
51
|
})();
|
|
@@ -1,17 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
var _2 = require("..");
|
|
9
7
|
|
|
10
|
-
function
|
|
11
|
-
|
|
12
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
13
|
-
|
|
14
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
8
|
+
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
15
9
|
|
|
16
10
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
17
11
|
|
|
@@ -42,13 +36,15 @@ if (!Promise.allSettled) {
|
|
|
42
36
|
}
|
|
43
37
|
|
|
44
38
|
class SpiceModel {
|
|
45
|
-
constructor() {
|
|
46
|
-
|
|
39
|
+
constructor(args) {
|
|
40
|
+
if (args === void 0) {
|
|
41
|
+
args = {};
|
|
42
|
+
}
|
|
47
43
|
|
|
48
44
|
try {
|
|
49
45
|
var dbtype = spice.config.database.connections[args.connection].type || "couchbase";
|
|
50
46
|
|
|
51
|
-
var Database = require("spice-"
|
|
47
|
+
var Database = require("spice-" + dbtype);
|
|
52
48
|
|
|
53
49
|
this.type = "";
|
|
54
50
|
this[_hooks] = {
|
|
@@ -214,11 +210,11 @@ class SpiceModel {
|
|
|
214
210
|
}
|
|
215
211
|
|
|
216
212
|
if (i == "requires") {
|
|
217
|
-
returnVal.push("shouldExist:"
|
|
213
|
+
returnVal.push("shouldExist:" + props[i]);
|
|
218
214
|
}
|
|
219
215
|
|
|
220
216
|
if (i == "unique") {
|
|
221
|
-
returnVal.push("unique:"
|
|
217
|
+
returnVal.push("unique:" + this.constructor.name + "," + property_name);
|
|
222
218
|
}
|
|
223
219
|
|
|
224
220
|
if (i == "type") {
|
|
@@ -298,13 +294,16 @@ class SpiceModel {
|
|
|
298
294
|
return _.join(returnVal, "|");
|
|
299
295
|
}
|
|
300
296
|
|
|
301
|
-
getValidationRules() {
|
|
302
|
-
|
|
297
|
+
getValidationRules(method, _temp) {
|
|
298
|
+
if (method === void 0) {
|
|
299
|
+
method = "POST";
|
|
300
|
+
}
|
|
301
|
+
|
|
303
302
|
var {
|
|
304
303
|
complete = false,
|
|
305
304
|
pick = [],
|
|
306
305
|
omit = []
|
|
307
|
-
} =
|
|
306
|
+
} = _temp === void 0 ? {} : _temp;
|
|
308
307
|
var rules = {};
|
|
309
308
|
var filters = {};
|
|
310
309
|
var working_properties = this.props;
|
|
@@ -402,7 +401,7 @@ class SpiceModel {
|
|
|
402
401
|
var results = yield _this.database.get(args.id);
|
|
403
402
|
|
|
404
403
|
if (results.type != _this.type) {
|
|
405
|
-
throw new Error(
|
|
404
|
+
throw new Error(_this.type + " does not exist");
|
|
406
405
|
}
|
|
407
406
|
|
|
408
407
|
if (results.deleted == undefined || results.deleted == false) {
|
|
@@ -410,7 +409,7 @@ class SpiceModel {
|
|
|
410
409
|
results = yield _this.do_serialize(results, "read", {}, args);
|
|
411
410
|
return results;
|
|
412
411
|
} else {
|
|
413
|
-
throw new Error(
|
|
412
|
+
throw new Error(_this.type + " does not exist");
|
|
414
413
|
}
|
|
415
414
|
}
|
|
416
415
|
} catch (e) {
|
|
@@ -497,7 +496,7 @@ class SpiceModel {
|
|
|
497
496
|
var item_exist = yield _this5.exist(results);
|
|
498
497
|
|
|
499
498
|
if (!item_exist) {
|
|
500
|
-
throw new Error(
|
|
499
|
+
throw new Error(_this5.type + " does not exist.");
|
|
501
500
|
}
|
|
502
501
|
|
|
503
502
|
delete results["id"];
|
|
@@ -523,7 +522,7 @@ class SpiceModel {
|
|
|
523
522
|
yield _this5.database.update(args.id, form || _this5);
|
|
524
523
|
|
|
525
524
|
if (args.skip_hooks != true) {
|
|
526
|
-
yield _this5.run_hook(
|
|
525
|
+
yield _this5.run_hook(_extends({}, _this5, {
|
|
527
526
|
id: args.id
|
|
528
527
|
}), "update", "after");
|
|
529
528
|
}
|
|
@@ -533,7 +532,7 @@ class SpiceModel {
|
|
|
533
532
|
}
|
|
534
533
|
|
|
535
534
|
_this5.id = args.id;
|
|
536
|
-
return
|
|
535
|
+
return _extends({}, form, {
|
|
537
536
|
id: args.id
|
|
538
537
|
});
|
|
539
538
|
} catch (e) {
|
|
@@ -560,7 +559,7 @@ class SpiceModel {
|
|
|
560
559
|
|
|
561
560
|
var workingForm = form || _this6;
|
|
562
561
|
_this6.updated_at = new SDate().now();
|
|
563
|
-
var id =
|
|
562
|
+
var id = args.id_prefix + "-" + UUID.v4();
|
|
564
563
|
|
|
565
564
|
if (args && args.id) {
|
|
566
565
|
id = args.id;
|
|
@@ -569,11 +568,11 @@ class SpiceModel {
|
|
|
569
568
|
yield _this6.run_hook(workingForm, "create", "before");
|
|
570
569
|
workingForm = yield _this6.do_serialize(workingForm, "write", {}, args);
|
|
571
570
|
var results = yield _this6.database.insert(id, workingForm, args.expiry);
|
|
572
|
-
yield _this6.run_hook(
|
|
571
|
+
yield _this6.run_hook(_extends({}, results, {
|
|
573
572
|
id
|
|
574
573
|
}), "create", "after");
|
|
575
574
|
results = yield _this6.do_serialize(results, "read", {}, args);
|
|
576
|
-
return
|
|
575
|
+
return _extends({}, results, {
|
|
577
576
|
id
|
|
578
577
|
});
|
|
579
578
|
} catch (e) {
|
|
@@ -590,7 +589,7 @@ class SpiceModel {
|
|
|
590
589
|
var item_exist = yield _this7.exist(args.id);
|
|
591
590
|
|
|
592
591
|
if (!item_exist) {
|
|
593
|
-
throw new Error(
|
|
592
|
+
throw new Error(_this7.type + " does not exist.");
|
|
594
593
|
}
|
|
595
594
|
|
|
596
595
|
try {
|
package/build/storage/Storage.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
@@ -20,8 +18,11 @@ var path = require("path");
|
|
|
20
18
|
var juice = require('juice');
|
|
21
19
|
|
|
22
20
|
class Storage {
|
|
23
|
-
constructor() {
|
|
24
|
-
|
|
21
|
+
constructor(args) {
|
|
22
|
+
if (args === void 0) {
|
|
23
|
+
args = {};
|
|
24
|
+
}
|
|
25
|
+
|
|
25
26
|
this.driver_name = args.driver_name || spice.config.storage.default_driver;
|
|
26
27
|
this.driver_options = _lodash.default.merge(spice.config.storage.drivers[this.driver_name], args.options); //console.log(this.driver_name, spice.config.storage.providers)
|
|
27
28
|
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
@@ -10,17 +8,22 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
|
|
|
10
8
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
11
9
|
|
|
12
10
|
class Mail {
|
|
13
|
-
constructor() {
|
|
14
|
-
|
|
11
|
+
constructor(args) {
|
|
12
|
+
if (args === void 0) {
|
|
13
|
+
args = {};
|
|
14
|
+
}
|
|
15
|
+
|
|
15
16
|
this.options = args;
|
|
16
17
|
}
|
|
17
18
|
|
|
18
|
-
send(file) {
|
|
19
|
-
var
|
|
20
|
-
_this = this;
|
|
19
|
+
send(file, options) {
|
|
20
|
+
var _this = this;
|
|
21
21
|
|
|
22
22
|
return _asyncToGenerator(function* () {
|
|
23
|
-
|
|
23
|
+
if (options === void 0) {
|
|
24
|
+
options = {};
|
|
25
|
+
}
|
|
26
|
+
|
|
24
27
|
var email = {
|
|
25
28
|
to: options.to,
|
|
26
29
|
from: options.sender || _this.sender,
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
var _lodash = _interopRequireDefault(require("lodash"));
|
|
@@ -22,8 +20,11 @@ var open = require("open");
|
|
|
22
20
|
var uuid = require('uuid');
|
|
23
21
|
|
|
24
22
|
class Local {
|
|
25
|
-
constructor() {
|
|
26
|
-
|
|
23
|
+
constructor(args) {
|
|
24
|
+
if (args === void 0) {
|
|
25
|
+
args = {};
|
|
26
|
+
}
|
|
27
|
+
|
|
27
28
|
this.args = args;
|
|
28
29
|
}
|
|
29
30
|
|
|
@@ -84,12 +85,12 @@ class Local {
|
|
|
84
85
|
|
|
85
86
|
var file_name = _lodash.default.last(uuid.v4().split("-"));
|
|
86
87
|
|
|
87
|
-
var writeStream = fs.createWriteStream(
|
|
88
|
+
var writeStream = fs.createWriteStream(path + "/" + file_name + "." + extension);
|
|
88
89
|
item.readStream.pipe(writeStream);
|
|
89
90
|
item.readStream.on("end", function (err) {
|
|
90
91
|
fs.unlink(item.file.path, function (obj) {});
|
|
91
92
|
});
|
|
92
|
-
return
|
|
93
|
+
return path + "/" + file_name + "." + extension;
|
|
93
94
|
});
|
|
94
95
|
|
|
95
96
|
if (paths.length == 1) {
|
package/build/utility/Crypt.js
CHANGED
|
@@ -3,9 +3,7 @@
|
|
|
3
3
|
* Created by chadfraser on 12/12/15.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
value: true
|
|
8
|
-
});
|
|
6
|
+
exports.__esModule = true;
|
|
9
7
|
exports.default = void 0;
|
|
10
8
|
|
|
11
9
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
package/build/utility/MapType.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
3
|
+
exports.__esModule = true;
|
|
6
4
|
exports.default = void 0;
|
|
7
5
|
|
|
8
6
|
var _flat = _interopRequireDefault(require("flat"));
|
|
@@ -78,8 +76,8 @@ class RestHelper {
|
|
|
78
76
|
}
|
|
79
77
|
|
|
80
78
|
makeDirectory("./storage/exports");
|
|
81
|
-
makeDirectory("./storage/exports/"
|
|
82
|
-
var file = path.resolve("./storage/exports/"
|
|
79
|
+
makeDirectory("./storage/exports/" + download_type + "/");
|
|
80
|
+
var file = path.resolve("./storage/exports/" + download_type + "/" + RestHelper.makeid(9) + "." + download_type);
|
|
83
81
|
yield fs.writeFile(file, content, function (err) {
|
|
84
82
|
if (err) throw err;
|
|
85
83
|
});
|
|
@@ -107,11 +105,14 @@ class RestHelper {
|
|
|
107
105
|
return result;
|
|
108
106
|
}
|
|
109
107
|
|
|
110
|
-
static prepare_collection(status) {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
108
|
+
static prepare_collection(status, obj) {
|
|
109
|
+
if (obj === void 0) {
|
|
110
|
+
obj = {
|
|
111
|
+
data: [],
|
|
112
|
+
total: null
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
|
|
115
116
|
var data = {
|
|
116
117
|
status: status,
|
|
117
118
|
type: "collection",
|
package/build/utility/index.js
CHANGED
package/build/val/Utility.js
CHANGED
|
@@ -4,7 +4,7 @@ var Rules = spice.classes.validate.Rules;
|
|
|
4
4
|
|
|
5
5
|
Rules.prototype.shouldExist = function* (field, value, args, message) {
|
|
6
6
|
try {
|
|
7
|
-
var loaded = require(spice.root_path + "/models/"
|
|
7
|
+
var loaded = require(spice.root_path + ("/models/" + args));
|
|
8
8
|
|
|
9
9
|
var Class = loaded.default;
|
|
10
10
|
var obj = new Class();
|
|
@@ -22,12 +22,12 @@ Rules.prototype.shouldExist = function* (field, value, args, message) {
|
|
|
22
22
|
|
|
23
23
|
Rules.prototype.unique = function* (field, value, args, message) {
|
|
24
24
|
try {
|
|
25
|
-
var loaded = require(spice.root_path + "/models/"
|
|
25
|
+
var loaded = require(spice.root_path + ("/models/" + args[0]));
|
|
26
26
|
|
|
27
27
|
var Class = loaded.default;
|
|
28
28
|
var obj = new Class();
|
|
29
29
|
var found = yield obj.list({
|
|
30
|
-
query:
|
|
30
|
+
query: args[1] + " = \"" + value + "\""
|
|
31
31
|
});
|
|
32
32
|
|
|
33
33
|
if (found.data.length == 0) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "spice-js",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.7",
|
|
4
4
|
"description": "spice",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
"license": "ISC",
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"agenda": "^3.1.0",
|
|
18
|
+
"caniuse-lite": "^1.0.30001283",
|
|
18
19
|
"co": "^4.6.0",
|
|
19
20
|
"dotenv": "^8.2.0",
|
|
20
21
|
"flat": "^5.0.0",
|
package/src/bootstrap/map.js
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
|
|
3
3
|
try {
|
|
4
|
-
let resources = ["models", "controllers"];
|
|
5
|
-
console.log(":::::::::::::STARTING MAP:::::::::::::");
|
|
4
|
+
let resources = ["models", "controllers", "schemas"];
|
|
6
5
|
resources.every((resource) => {
|
|
7
6
|
let paths = path.join(spice.root_path, resource);
|
|
8
7
|
spice[resource] = {};
|
|
9
8
|
require("fs")
|
|
10
9
|
.readdirSync(paths)
|
|
11
10
|
.forEach(async function (file) {
|
|
12
|
-
console.log("Loading:", file);
|
|
13
11
|
spice[resource][file.split(".")[0]] = (
|
|
14
12
|
await import(path.join(paths, file))
|
|
15
13
|
).default;
|
package/src/loaders/index.js
CHANGED
|
@@ -2,7 +2,8 @@ import path from "path";
|
|
|
2
2
|
import fs from "fs";
|
|
3
3
|
import _ from "lodash";
|
|
4
4
|
|
|
5
|
-
let ordered_modules = ["map", "logger", "error", "database"
|
|
5
|
+
let ordered_modules = ["map", "logger", "error", "database"];
|
|
6
|
+
let last_modules = ["views", "routes"];
|
|
6
7
|
export async function load() {
|
|
7
8
|
try {
|
|
8
9
|
/* console.log('loading from array')*/
|
|
@@ -33,7 +34,8 @@ export async function load() {
|
|
|
33
34
|
console.log("Loading:", file);
|
|
34
35
|
if (
|
|
35
36
|
file != "index.js" &&
|
|
36
|
-
!_.includes(ordered_modules, file.split(".")[0])
|
|
37
|
+
!_.includes(ordered_modules, file.split(".")[0]) &&
|
|
38
|
+
!_.includes(last_modules, file.split(".")[0])
|
|
37
39
|
) {
|
|
38
40
|
let mod = require(path.join(loadder_path, file.split(".")[0]));
|
|
39
41
|
if (_.isFunction(mod)) {
|
|
@@ -42,6 +44,14 @@ export async function load() {
|
|
|
42
44
|
}
|
|
43
45
|
}
|
|
44
46
|
}
|
|
47
|
+
|
|
48
|
+
for (let file of last_modules) {
|
|
49
|
+
let mod = require(path.join(bootstrap_path, file));
|
|
50
|
+
if (_.isFunction(mod)) {
|
|
51
|
+
await mod();
|
|
52
|
+
}
|
|
53
|
+
console.log("loaded", file);
|
|
54
|
+
}
|
|
45
55
|
} catch (e) {
|
|
46
56
|
console.log(e.stack);
|
|
47
57
|
}
|