spice-js 2.7.34 → 2.7.35

package/build/docs/generator.js

@@ -222,11 +222,16 @@ function _getModels() {
     var models = {};
     require("fs").readdirSync(paths).forEach(function (file) {
       var model = require(_path2.default.join(paths, file));
-      // Handle ESM default exports
-      if (model.default) {
-        model = model.default;
+      // `props` is a named export; the default export is the SpiceModel class,
+      // which does not carry it. Unwrapping to the default export first drops
+      // the schema off every model and leaves Swagger with empty definitions,
+      // so read the named export and only fall back to the default export for
+      // models that attach props there instead.
+      var props = model.props;
+      if (props == undefined && model.default != undefined) {
+        props = model.default.props;
       }
-      models[file.split(".")[0]] = model.props;
+      models[file.split(".")[0]] = props;
     });
     return models;
   });

package/build/utility/RestHelper.js

@@ -36,7 +36,9 @@ class RestHelper {
         ctx.status = 200;
         ctx.body = response;
       } catch (e) {
-        console.log("Error at response: ", e, e.stack);
+        console.error("Error at response: ", e, e == null ? void 0 : e.stack);
+        ctx.status = 500;
+        ctx.body = RestHelper.prepare_response(RestHelper.FAILURE, (e == null ? void 0 : e.message) || e);
       }
     })();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.7.34",
+  "version": "2.7.35",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/docs/generator.js

@@ -244,11 +244,16 @@ async function getModels() {
     .readdirSync(paths)
     .forEach(function (file) {
       let model = require(path.join(paths, file));
-      // Handle ESM default exports
-      if (model.default) {
-        model = model.default;
+      // `props` is a named export; the default export is the SpiceModel class,
+      // which does not carry it. Unwrapping to the default export first drops
+      // the schema off every model and leaves Swagger with empty definitions,
+      // so read the named export and only fall back to the default export for
+      // models that attach props there instead.
+      let props = model.props;
+      if (props == undefined && model.default != undefined) {
+        props = model.default.props;
       }
-      models[file.split(".")[0]] = model.props;
+      models[file.split(".")[0]] = props;
     });
   return models;
 }

package/src/utility/RestHelper.js

@@ -30,7 +30,12 @@ export default class RestHelper {
       ctx.status = 200;
       ctx.body = response;
     } catch (e) {
-      console.log("Error at response: ", e, e.stack);
+      console.error("Error at response: ", e, e?.stack);
+      ctx.status = 500;
+      ctx.body = RestHelper.prepare_response(
+        RestHelper.FAILURE,
+        e?.message || e,
+      );
     }
   }