@open-norantec/herbal 1.0.2-alpha.19 → 1.0.2-alpha.20

package/dist/abstracts/client.abstract.class.d.ts

@@ -1,14 +1,13 @@
 import 'reflect-metadata';
 import { Constructor } from 'type-fest';
-import { GroupsFactory } from '../decorators/client-groups.decorator';
 import { OpenAPIObject } from 'zod-openapi/dist/openapi3-ts/dist/model/openapi31';
 export interface CreateClientOptions {
     Module: Constructor<any>;
-    allowedClientGroupsFactory?: GroupsFactory;
 }
 export declare abstract class Client {
     readonly options: CreateClientOptions;
     protected document: OpenAPIObject;
     constructor(options: CreateClientOptions);
-    abstract generateClientSourceFile(currentGroup?: string): string;
+    abstract generateClientSourceFile(): string;
+    createSchema(group?: string): void;
 }

package/dist/abstracts/client.abstract.class.js

@@ -8,7 +8,6 @@ var controller_util_class_1 = require("../utilities/controller-util.class");
 var method_decorator_1 = require("../decorators/method.decorator");
 var Client = (function () {
     function Client(options) {
-        var _this = this;
         this.options = options;
         this.document = {
             openapi: '3.1.0',
@@ -18,19 +17,24 @@ var Client = (function () {
             },
             paths: {},
         };
-        nest_util_class_1.NestUtil.getControllerClasses(options.Module).forEach(function (Class) {
+    }
+    Client.prototype.createSchema = function (group) {
+        var _this = this;
+        if (string_util_class_1.StringUtil.isFalsyString(group) && typeof group !== 'undefined')
+            return;
+        nest_util_class_1.NestUtil.getControllerClasses(this.options.Module).forEach(function (Class) {
             if (string_util_class_1.StringUtil.isFalsyString(Class === null || Class === void 0 ? void 0 : Class.name) || !(0, controller_util_class_1.isHerbalController)(Class))
                 return;
             var controllerName = (0, controller_util_class_1.getControllerName)(Class);
             var pool = method_decorator_1.Method.getPool(Class.prototype);
             if (string_util_class_1.StringUtil.isFalsyString(controllerName) || pool === null)
                 return;
-            Object.entries(pool.getOpenAPIPathsObject()).forEach(function (_a) {
+            Object.entries(pool.getOpenAPIPathsObject(group)).forEach(function (_a) {
                 var pathname = _a[0], schemas = _a[1];
                 _this.document.paths[["/".concat(controllerName), pathname].join('')] = schemas;
             });
         });
-    }
+    };
     return Client;
 }());
 exports.Client = Client;

package/dist/cli/herbal.js

@@ -146,7 +146,7 @@ command
 }))
     .addCommand((0, forge_1.createCommand)('generate-client', function (_a) {
     var addOption = _a.addOption;
-    addOption('--group', 'Client group name to generate');
+    addOption('--group <name>', 'Client group name to generate');
     return {
         onLog: log,
         hiddenOptions: [
@@ -172,11 +172,12 @@ command
                 return [
                     "const entry = require('".concat(buildEntryFilePath, "')"),
                     "const { isClient } = require(\'@open-norantec/herbal\')",
-                    'module.exports = () => {',
+                    'module.exports = (context) => {',
                     '  let client = entry;',
                     '  if (!isClient(client)) { client = entry?.default; }',
                     "  if (!isClient(client)) return '';",
-                    "  try { return client.instance.generateClientSourceFile() ?? ''; } catch (error) { throw error; }",
+                    '  client.instance.createSchema(context?.group);',
+                    "  return client.instance.generateClientSourceFile() ?? '';",
                     '};',
                 ].join('\n');
             },

package/dist/clients/typescript-client.class.d.ts

@@ -16,7 +16,6 @@ declare namespace OpenApiToTypescript {
 }
 export declare function convertOpenApiToTypescript(schema: SchemaObject, name?: string, options?: OpenApiToTypescript.Options): OpenApiToTypescript.TypeResult;
 export declare class TypeScriptClient extends Client implements Client {
-    readonly options: CreateClientOptions;
     constructor(options: CreateClientOptions);
     generateClientSourceFile(): string;
 }

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

@@ -227,11 +227,10 @@ exports.convertOpenApiToTypescript = convertOpenApiToTypescript;
 var TypeScriptClient = (function (_super) {
     __extends(TypeScriptClient, _super);
     function TypeScriptClient(options) {
-        var _this = _super.call(this, options) || this;
-        _this.options = options;
-        return _this;
+        return _super.call(this, options) || this;
     }
     TypeScriptClient.prototype.generateClientSourceFile = function () {
+        var _this = this;
         var options = this.options;
         if (!(options === null || options === void 0 ? void 0 : options.Module))
             throw new Error("Parameter 'Module' must be specified");
@@ -246,13 +245,13 @@ var TypeScriptClient = (function (_super) {
         var RESULT_TYPE_ANNOTATION = "".concat(RESULT_TYPE_NAME, "<").concat(METHOD_TYPE_MAP_NAME, "[T]['response']>");
         var methodTypeMapCodeLines = nest_util_class_1.NestUtil.getControllerClasses(options.Module)
             .reduce(function (result, Class) {
+            var _a;
             if (string_util_class_1.StringUtil.isFalsyString(Class === null || Class === void 0 ? void 0 : Class.name) || !(0, controller_util_class_1.isHerbalController)(Class))
                 return result;
-            var controllerName = (0, controller_util_class_1.getControllerName)(Class);
             var pool = method_decorator_1.Method.getPool(Class.prototype);
-            if (string_util_class_1.StringUtil.isFalsyString(controllerName) || pool === null)
+            if (pool === null)
                 return result;
-            return result.concat(Object.entries(pool.getOpenAPIPathsObject())
+            return result.concat(Object.entries((_a = _this.document.paths) !== null && _a !== void 0 ? _a : {})
                 .map(function (_a) {
                 var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
                 var pathname = _a[0], schema = _a[1];
@@ -261,7 +260,7 @@ var TypeScriptClient = (function (_super) {
                 if (!requestSchema && !responseSchema)
                     return null;
                 return [
-                    "'/".concat(controllerName).concat(pathname, "': {"),
+                    "'".concat(pathname, "': {"),
                     " request: ".concat(((_l = convertOpenApiToTypescript(requestSchema)) === null || _l === void 0 ? void 0 : _l.code) || 'any', ";"),
                     " response: ".concat(((_m = convertOpenApiToTypescript(responseSchema)) === null || _m === void 0 ? void 0 : _m.code) || 'any', ";"),
                     ' };',
@@ -269,7 +268,7 @@ var TypeScriptClient = (function (_super) {
             })
                 .filter(function (value) { return value !== null; }));
         }, [])
-            .map(function (line) { return "    ".concat(line); });
+            .map(function (line) { return "  ".concat(line); });
         methodTypeMapCodeLines.unshift("export interface ".concat(METHOD_TYPE_MAP_NAME, " {"));
         methodTypeMapCodeLines.push('}');
         return [

package/dist/decorators/method.decorator.d.ts

@@ -1,17 +1,18 @@
 import 'reflect-metadata';
 import { z } from 'zod';
 import { AuthAdapter } from '../abstracts';
-import { GroupsFactory } from './client-groups.decorator';
 import { HeaderUtil } from '@open-norantec/utilities/dist/header-util.class';
 import { Constructor } from 'type-fest';
 import { Type } from '@nestjs/common';
 import { RequestContext } from '../types';
 import { PathsObject } from 'zod-openapi/dist/openapi3-ts/dist/model/openapi31';
+type ClientGroups = Array<string> | null | undefined;
+type ClienttGroupsFactory = (defaultGroupName: string) => ClientGroups;
 export interface MethodOptions<IS extends z.Schema<any>, OS extends z.Schema<any>> {
     inputSchema: IS;
     outputSchema: OS;
     authAdapters?: AuthAdapter[];
-    clientGroups?: GroupsFactory | string[];
+    clientGroups?: ClientGroups | ClienttGroupsFactory;
     disableTransaction?: boolean;
 }
 export type DependencyGetter = <T>(dependency: Constructor<T>) => T;
@@ -34,7 +35,7 @@ declare class MethodPool {
     protected readonly methods: Map<string, MethodConfig<any, any>>;
     registerMethod<IS extends z.Schema<any>, OS extends z.Schema<any>>(name: string, options: MethodOptions<IS, OS>, callback: MethodCallback<IS, OS>): void;
     getCallFn(name: string): any;
-    getOpenAPIPathsObject(): PathsObject;
+    getOpenAPIPathsObject(group?: string): PathsObject;
 }
 export declare function Method<IS extends z.Schema<any>, OS extends z.Schema<any>>(...parameters: Parameters<typeof MethodPool.prototype.registerMethod<IS, OS>>): ClassDecorator;
 export declare namespace Method {

package/dist/decorators/method.decorator.js

@@ -121,10 +121,18 @@ var MethodPool = (function () {
         var callFn = (_a = this.methods.get(name)) === null || _a === void 0 ? void 0 : _a.call;
         return typeof callFn === 'function' ? callFn.bind(this) : null;
     };
-    MethodPool.prototype.getOpenAPIPathsObject = function () {
+    MethodPool.prototype.getOpenAPIPathsObject = function (group) {
         var result = {};
         Array.from(this.methods.entries()).forEach(function (_a) {
+            var _b;
             var name = _a[0], config = _a[1];
+            var defaultGroupName = "".concat(Date.now(), "_").concat(Math.random().toString(16).slice(2));
+            var currentGroupName = utilities_1.StringUtil.isFalsyString(group) ? defaultGroupName : group;
+            var clientGroups = typeof config.options.clientGroups === 'function'
+                ? config.options.clientGroups(defaultGroupName)
+                : (_b = config === null || config === void 0 ? void 0 : config.options) === null || _b === void 0 ? void 0 : _b.clientGroups;
+            if (Array.isArray(clientGroups) && !clientGroups.includes(currentGroupName))
+                return;
             result["/".concat(name)] = {
                 post: {
                     requestBody: {

package/package.json

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