spice-js 2.6.69 → 2.6.70
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/docs/generator.js +12 -2
- package/package.json +1 -1
- package/src/docs/generator.js +15 -9
package/build/docs/generator.js
CHANGED
|
@@ -53,7 +53,12 @@ function getRoutes(models) {
|
|
|
53
53
|
|
|
54
54
|
require("fs").readdirSync(paths).forEach(function (file) {
|
|
55
55
|
if (file != "spice.js") {
|
|
56
|
-
var router = require(_path2.default.join(paths, file));
|
|
56
|
+
var router = require(_path2.default.join(paths, file)); // Handle ESM default exports
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
if (router.default) {
|
|
60
|
+
router = router.default;
|
|
61
|
+
}
|
|
57
62
|
|
|
58
63
|
var router_string = _fs.default.readFileSync(_path2.default.join(paths, file)).toString();
|
|
59
64
|
|
|
@@ -274,7 +279,12 @@ function _getModels() {
|
|
|
274
279
|
var models = {};
|
|
275
280
|
|
|
276
281
|
require("fs").readdirSync(paths).forEach(function (file) {
|
|
277
|
-
var model = require(_path2.default.join(paths, file));
|
|
282
|
+
var model = require(_path2.default.join(paths, file)); // Handle ESM default exports
|
|
283
|
+
|
|
284
|
+
|
|
285
|
+
if (model.default) {
|
|
286
|
+
model = model.default;
|
|
287
|
+
}
|
|
278
288
|
|
|
279
289
|
models[file.split(".")[0]] = model.props;
|
|
280
290
|
});
|
package/package.json
CHANGED
package/src/docs/generator.js
CHANGED
|
@@ -33,6 +33,10 @@ function getRoutes(models) {
|
|
|
33
33
|
.forEach(function (file) {
|
|
34
34
|
if (file != "spice.js") {
|
|
35
35
|
let router = require(path.join(paths, file));
|
|
36
|
+
// Handle ESM default exports
|
|
37
|
+
if (router.default) {
|
|
38
|
+
router = router.default;
|
|
39
|
+
}
|
|
36
40
|
let router_string = fs.readFileSync(path.join(paths, file)).toString();
|
|
37
41
|
let parsed_comments = comments.parse(router_string);
|
|
38
42
|
|
|
@@ -58,9 +62,9 @@ function getRoutes(models) {
|
|
|
58
62
|
tags.push({
|
|
59
63
|
name: file.split(".")[0],
|
|
60
64
|
description:
|
|
61
|
-
parsed_comments[0] != undefined
|
|
62
|
-
|
|
63
|
-
|
|
65
|
+
parsed_comments[0] != undefined ?
|
|
66
|
+
parsed_comments[0].description
|
|
67
|
+
: "",
|
|
64
68
|
});
|
|
65
69
|
let defaultModel = findDefaultModel(parsed_comments[0]);
|
|
66
70
|
_.each(router.stack, (layer) => {
|
|
@@ -181,9 +185,8 @@ function preparParameters(comment, defaultModel, models) {
|
|
|
181
185
|
return _.map(models[model], (value, key) => {
|
|
182
186
|
return {
|
|
183
187
|
name: key,
|
|
184
|
-
type:
|
|
185
|
-
? "string"
|
|
186
|
-
: value.type,
|
|
188
|
+
type:
|
|
189
|
+
_.includes(["object", "array"], value.type) ? "string" : value.type,
|
|
187
190
|
description: value.description ? value.description : "",
|
|
188
191
|
required: value.required ? value.required : false,
|
|
189
192
|
paramType: "form",
|
|
@@ -241,6 +244,10 @@ async function getModels() {
|
|
|
241
244
|
.readdirSync(paths)
|
|
242
245
|
.forEach(function (file) {
|
|
243
246
|
let model = require(path.join(paths, file));
|
|
247
|
+
// Handle ESM default exports
|
|
248
|
+
if (model.default) {
|
|
249
|
+
model = model.default;
|
|
250
|
+
}
|
|
244
251
|
models[file.split(".")[0]] = model.props;
|
|
245
252
|
});
|
|
246
253
|
return models;
|
|
@@ -272,9 +279,8 @@ function getProperties(obj) {
|
|
|
272
279
|
|
|
273
280
|
if (map != undefined && map.type == "model") {
|
|
274
281
|
if (map.reference != undefined) {
|
|
275
|
-
let references =
|
|
276
|
-
? map.reference
|
|
277
|
-
: [map.reference];
|
|
282
|
+
let references =
|
|
283
|
+
_.isArray(map.reference) ? map.reference : [map.reference];
|
|
278
284
|
let reference = `#/definitions/${
|
|
279
285
|
_.isString(map.reference) ? map.reference : references[0].name
|
|
280
286
|
}`;
|