@open-norantec/herbal 2.0.0-alpha.1 → 2.0.0-alpha.3

package/dist/clients/typescript-client.class.js

@@ -210,6 +210,8 @@ var TypeScriptClient = (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (!schema)
+                            return [2, 'unknown'];
                         interfaceName = "Interface".concat(Math.random().toString(36).slice(2));
                         return [4, (0, json_schema_to_typescript_1.compile)(schema, interfaceName, {
                                 format: true,
@@ -221,6 +223,7 @@ var TypeScriptClient = (function (_super) {
                                     semi: true,
                                     trailingComma: 'none',
                                 },
+                                cwd: process.cwd(),
                             }).then(function (code) {
                                 return code
                                     .trim()

package/dist/core.js

@@ -219,12 +219,14 @@ var MethodPool = (function () {
                         '200': {
                             description: 'Response for method ' + name,
                             content: {
-                                'application/json': utilities_1.z
-                                    .object({
-                                    data: config.options.outputSchema,
-                                    token: utilities_1.z.string().nullable(),
-                                })
-                                    .toJSONSchema(),
+                                'application/json': {
+                                    schema: utilities_1.z
+                                        .object({
+                                        data: config.options.outputSchema,
+                                        token: utilities_1.z.string().nullable(),
+                                    })
+                                        .toJSONSchema(),
+                                },
                             },
                         },
                     },
@@ -310,7 +312,7 @@ function HerbalGuard(options) {
             var _a, e_1, _b, _c;
             var _d, _e, _f, _g, _h, _j, _k, _l, _m;
             return __awaiter(this, void 0, void 0, function () {
-                var sequelizeInstance, transaction, request, response, traceId, chunks, _o, request_1, request_1_1, chunk, e_1_1, _p, parsedBody, rawHandlerName, handlerPropertype, handlerName, methodPool, authAdapters, error_2, _i, authAdapters_1, AuthAdapterClass, adapter, authenticateResult, error_3, _q;
+                var sequelizeInstance, transaction, request, response, traceId, chunks, _o, request_1, request_1_1, chunk, e_1_1, _p, parsedBody, rawHandlerName, handlerPropertype, handlerName, methodPool, authAdapters, shouldHaveTransaction, error_2, _i, authAdapters_1, AuthAdapterClass, adapter, authenticateResult, error_3, _q;
                 var _this = this;
                 return __generator(this, function (_r) {
                     switch (_r.label) {
@@ -384,9 +386,8 @@ function HerbalGuard(options) {
                             authAdapters = (_h = methodPool === null || methodPool === void 0 ? void 0 : methodPool.getAuthAdapters) === null || _h === void 0 ? void 0 : _h.call(methodPool, handlerName);
                             if (authAdapters === null)
                                 authAdapters = auth_adapter_decorator_1.AuthAdapters.getAdapters(handlerPropertype, handlerName);
-                            if (!(!(sequelizeInstance instanceof Error) &&
-                                !decorators_1.NoTransaction.isDisabled(handlerPropertype, rawHandlerName) &&
-                                !((_j = methodPool === null || methodPool === void 0 ? void 0 : methodPool.transactionDisabled) === null || _j === void 0 ? void 0 : _j.call(methodPool, handlerName)))) return [3, 20];
+                            shouldHaveTransaction = !decorators_1.NoTransaction.isDisabled(handlerPropertype, rawHandlerName) && !((_j = methodPool === null || methodPool === void 0 ? void 0 : methodPool.transactionDisabled) === null || _j === void 0 ? void 0 : _j.call(methodPool, handlerName));
+                            if (!(!(sequelizeInstance instanceof Error) && shouldHaveTransaction)) return [3, 20];
                             _r.label = 16;
                         case 16:
                             _r.trys.push([16, 18, , 19]);
@@ -404,7 +405,7 @@ function HerbalGuard(options) {
                             return [3, 19];
                         case 19: return [3, 21];
                         case 20:
-                            if (decorators_1.NoTransaction.isDisabled(handlerPropertype, handlerName)) {
+                            if (!shouldHaveTransaction) {
                                 this.getLogger().log("[trace:".concat(request === null || request === void 0 ? void 0 : request.traceId, ":transaction] Transaction is disabled for this route: ").concat(handlerName));
                             }
                             _r.label = 21;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@open-norantec/herbal",
-    "version": "2.0.0-alpha.1",
+    "version": "2.0.0-alpha.3",
     "description": "Herbal is a builder and toolchain for Nest.js applications",
     "main": "dist/index.js",
     "scripts": {