@open-norantec/herbal 1.0.2 → 2.0.0-alpha.0

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

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import { Constructor } from 'type-fest';
-import { OpenAPIObject } from 'zod-openapi/dist/openapi3-ts/dist/model/openapi31';
+import { OpenAPIObject } from 'openapi3-ts/oas31';
 export interface CreateClientOptions {
     Module: Constructor<any>;
 }

package/dist/core.d.ts

@@ -1,44 +1,44 @@
 import 'reflect-metadata';
 import { HeaderUtil } from '@open-norantec/utilities/dist/header-util.class';
-import { z } from 'zod';
 import { Request, RequestContext } from './types/request.type';
+import { z } from '@open-norantec/utilities';
 import 'reflect-metadata';
 import { Request as ExpressRequest } from 'express';
 import { Constructor } from 'type-fest';
 import { AuthAdapter } from './abstracts/auth-adapter.abstract.class';
-import { PathsObject } from 'zod-openapi/dist/openapi3-ts/dist/model/openapi31';
+import { PathsObject } from 'openapi3-ts/oas31';
 export * from '@nestjs/core';
-export type MethodHandler<IS extends z.Schema<any>, OS extends z.Schema<any>> = (request: Request, input: unknown, headers: ReturnType<typeof HeaderUtil.parse>) => Promise<{
+export type MethodHandler<IS extends z.ZodType<any>, OS extends z.ZodType<any>> = (request: Request, input: unknown, headers: ReturnType<typeof HeaderUtil.parse>) => Promise<{
     request: z.infer<IS>;
     response: z.infer<OS>;
 }>;
 type ClientGroups = Array<string> | null | undefined;
 type ClienttGroupsFactory = (defaultGroupName: string) => ClientGroups;
-export interface MethodRegisterOptions<IS extends z.Schema<any>, OS extends z.Schema<any>> {
+export interface MethodRegisterOptions<IS extends z.ZodType<any>, OS extends z.ZodType<any>> {
     inputSchema: IS;
     outputSchema: OS;
     authAdapters?: Constructor<AuthAdapter>[];
     clientGroups?: ClientGroups | ClienttGroupsFactory;
     disableTransaction?: boolean;
 }
-export type MethodRegisterFn<C> = <IS extends z.Schema<any>, OS extends z.Schema<any>>(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>) => void;
-export interface MethodContext<IS extends z.Schema<any>> extends RequestContext {
+export type MethodRegisterFn<C> = <IS extends z.ZodType<any>, OS extends z.ZodType<any>>(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>) => void;
+export interface MethodContext<IS extends z.ZodType<any>> extends RequestContext {
     headers: ReturnType<typeof HeaderUtil.parse>;
     input: z.infer<IS>;
     url: string;
 }
-export type MethodCallContext<IS extends z.Schema<any>> = Omit<MethodContext<IS>, 'input'>;
-export type MethodCallback<IS extends z.Schema<any>, OS extends z.Schema<any>, C> = (this: C, context: MethodContext<IS>) => Promise<z.infer<OS>>;
-declare class MethodConfig<IS extends z.Schema<any>, OS extends z.Schema<any>, C> {
+export type MethodCallContext<IS extends z.ZodType<any>> = Omit<MethodContext<IS>, 'input'>;
+export type MethodCallback<IS extends z.ZodType<any>, OS extends z.ZodType<any>, C> = (this: C, context: MethodContext<IS>) => Promise<z.infer<OS>>;
+declare class MethodConfig<IS extends z.ZodType<any>, OS extends z.ZodType<any>, C> {
     readonly name: string;
     readonly options: MethodRegisterOptions<IS, OS>;
     protected readonly callback: MethodCallback<IS, OS, C>;
     constructor(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>);
-    call(controller: C, callContext: MethodCallContext<IS>): Promise<z.TypeOf<OS>>;
+    call(controller: C, callContext: MethodCallContext<IS>): Promise<z.core.output<OS>>;
 }
 declare class MethodPool {
     protected readonly methods: Map<string, MethodConfig<any, any, any>>;
-    registerMethod<IS extends z.Schema<any>, OS extends z.Schema<any>, C>(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>): void;
+    registerMethod<IS extends z.ZodType<any>, OS extends z.ZodType<any>, C>(name: string, options: MethodRegisterOptions<IS, OS>, callback: MethodCallback<IS, OS, C>): void;
     transactionDisabled(name: string): boolean | undefined;
     getCallFn(name: string): ((controller: any, callContext: MethodCallContext<any>) => Promise<any>) | null;
     getAuthAdapters(name: string): Constructor<AuthAdapter>[] | null | undefined;

package/dist/core.js

@@ -90,7 +90,6 @@ exports.ControllerUtil = exports.getMethodPool = exports.getControllerName = exp
 require("reflect-metadata");
 var common_1 = require("@nestjs/common");
 var header_util_class_1 = require("@open-norantec/utilities/dist/header-util.class");
-var zod_1 = require("zod");
 var string_util_class_1 = require("@open-norantec/utilities/dist/string-util.class");
 var utilities_1 = require("@open-norantec/utilities");
 require("reflect-metadata");
@@ -106,7 +105,6 @@ var operators_1 = require("rxjs/operators");
 var logger_service_1 = require("./modules/logger/logger.service");
 var sequelize_typescript_1 = require("sequelize-typescript");
 var decorators_1 = require("./decorators");
-var zod_openapi_1 = require("zod-openapi");
 __exportStar(require("@nestjs/core"), exports);
 var HANDLE_REQUEST_INSTANCE_SYMBOL = '$handleRequestInstance';
 var METHOD_POOL = Symbol();
@@ -130,7 +128,7 @@ var MethodConfig = (function () {
                         _g.trys.push([1, 3, , 4]);
                         parsedBody_1 = _.attempt(function () { return JSON.parse((callContext === null || callContext === void 0 ? void 0 : callContext.rawBody) || ''); });
                         input = _.attempt(function () { return (parsedBody_1 instanceof Error ? undefined : inputSchema.parse(parsedBody_1)); });
-                        if (input instanceof zod_1.ZodError) {
+                        if (input instanceof utilities_1.ZodError) {
                             throw new common_2.BadRequestException({
                                 from: 'request',
                                 invalidParams: (_c = (_b = (_a = input === null || input === void 0 ? void 0 : input.issues) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) { var _a, _b; return (_b = (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '.'); })) !== null && _c !== void 0 ? _c : [],
@@ -142,7 +140,7 @@ var MethodConfig = (function () {
                     case 2:
                         rawResponse_1 = _g.sent();
                         response = _.attempt(function () { return outputSchema.parse(rawResponse_1); });
-                        if (response instanceof zod_1.ZodError) {
+                        if (response instanceof utilities_1.ZodError) {
                             throw new common_2.BadRequestException({
                                 from: 'response',
                                 invalidParams: (_f = (_e = (_d = response === null || response === void 0 ? void 0 : response.issues) === null || _d === void 0 ? void 0 : _d.map) === null || _e === void 0 ? void 0 : _e.call(_d, function (item) { var _a, _b; return (_b = (_a = item === null || item === void 0 ? void 0 : item.path) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '.'); })) !== null && _f !== void 0 ? _f : [],
@@ -213,7 +211,7 @@ var MethodPool = (function () {
                         required: true,
                         content: {
                             'application/json': {
-                                schema: (0, zod_openapi_1.createSchema)(config.options.inputSchema).schema,
+                                schema: config.options.inputSchema,
                             },
                         },
                     },
@@ -221,10 +219,12 @@ var MethodPool = (function () {
                         '200': {
                             description: 'Response for method ' + name,
                             content: {
-                                'application/json': (0, zod_openapi_1.createSchema)(zod_1.z.object({
-                                    data: config.options.outputSchema,
-                                    token: zod_1.z.string().nullable(),
-                                })),
+                                'application/json': utilities_1.z
+                                    .object({
+                                    data: config.options.outputSchema.toJSONSchema(),
+                                    token: utilities_1.z.string().nullable(),
+                                })
+                                    .toJSONSchema(),
                             },
                         },
                     },

package/package.json

@@ -1,12 +1,13 @@
 {
     "name": "@open-norantec/herbal",
-    "version": "1.0.2",
+    "version": "2.0.0-alpha.0",
     "description": "Herbal is a builder and toolchain for Nest.js applications",
     "main": "dist/index.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "build": "rimraf dist && tsc -b",
-        "postinstall": "node ./bin/herbal-patch.js"
+        "postinstall": "node ./bin/herbal-patch.js",
+        "upgrade": "npm i @open-norantec/forge@latest -S && npm i @open-norantec/utilities@latest -D"
     },
     "repository": {
         "type": "git",
@@ -31,15 +32,16 @@
     },
     "homepage": "https://github.com/norantec/herbal#readme",
     "peerDependencies": {
+        "@open-norantec/utilities": ">= 2.0.0",
         "express": ">=4.0.0 <5.0.0",
         "typescript": ">=5.1.0 <5.2.0"
     },
     "dependencies": {
         "@nestjs/common": "^10.0.0",
         "@nestjs/core": "^10.4.19",
+        "@nestjs/platform-express": "^10.4.22",
         "@nestjs/sequelize": "^10.0.1",
-        "@open-norantec/forge": "^2.0.0",
-        "@open-norantec/utilities": "^1.0.0",
+        "@open-norantec/forge": "^3.0.0-alpha.2",
         "commander": "^12.1.0",
         "fs-extra": "^11.3.4",
         "json-schema-to-typescript": "^15.0.4",
@@ -53,11 +55,10 @@
         "sequelize-typescript": "^2.1.5",
         "type-fest": "^4.41.0",
         "typescript": ">=5.1.0 <5.2.0",
-        "uuid": "^11.1.0",
-        "zod": "^3.25.67",
-        "zod-openapi": "4.2.4"
+        "uuid": "^11.1.0"
     },
     "devDependencies": {
+        "@open-norantec/utilities": "^2.0.2",
         "@types/express": "^5.0.3",
         "@types/fs-extra": "^11.0.4",
         "@types/lodash": "^4.17.16",
@@ -65,6 +66,7 @@
         "cross-env": "^7.0.3",
         "eslint": "^8.0.0",
         "express": "^4.21.2",
+        "openapi3-ts": "^4.5.0",
         "rimraf": "^6.0.1",
         "ts-node": "^10.0.0"
     }