inanis 0.0.7-beta.3 → 0.0.7-beta.4

package/dist/api/method.js

@@ -1,40 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Method = void 0;
-const Yup = __importStar(require("yup"));
+const zod_1 = require("zod");
 const power_helper_1 = require("power-helper");
 const json_schema_js_1 = require("../utils/json-schema.js");
 const context_js_1 = require("./context.js");
@@ -339,18 +306,19 @@ class Method {
                     });
                 }
                 if (this.verify.query) {
-                    const attrs = this.verify.query(Yup);
+                    const attrs = this.verify.query(zod_1.z);
                     for (let key in attrs) {
                         const doc = docs.query?.[key] || {};
-                        const { spec, type } = attrs[key];
+                        const schema = attrs[key];
+                        const isOptional = schema.isOptional();
                         output.parameters.push({
                             in: 'query',
                             name: key,
                             description: doc.desc,
                             example: doc.example,
-                            required: !spec.nullable,
+                            required: !isOptional,
                             schema: {
-                                type: type
+                                type: 'string'
                             }
                         });
                     }
@@ -374,7 +342,7 @@ class Method {
                     }
                     else {
                         const doc = docs.body;
-                        const schema = bodySchemaBindDoc((0, json_schema_js_1.yupToJsonSchema)(this.verify.body), doc);
+                        const schema = bodySchemaBindDoc((0, json_schema_js_1.zodToJsonSchema)(this.verify.body), doc);
                         output.requestBody = {
                             content: {
                                 [this.contentType]: {
@@ -424,11 +392,12 @@ class Method {
                 }
                 if (this.verify.response) {
                     const doc = docs.response;
-                    const schema = bodySchemaBindDoc((0, json_schema_js_1.yupToJsonSchema)(yup => {
+                    const jsonSchema = (0, json_schema_js_1.zodToJsonSchema)(z => {
                         return {
-                            data: yup.object(this.verify.response(yup)).required()
+                            data: z.object(this.verify.response(z)).required()
                         };
-                    }), doc);
+                    });
+                    const schema = bodySchemaBindDoc(jsonSchema, doc);
                     output.responses[200] = {
                         description: 'Success',
                         content: {

package/dist/document-db/index.d.ts

@@ -1,4 +1,4 @@
-import * as Yup from 'yup';
+import { z } from 'zod';
 import { Hook } from 'power-helper';
 import { TableManager, TableParams, Index } from './table.js';
 import type { MongoClient, Db } from 'mongodb';
@@ -30,9 +30,9 @@ export declare class DocumentDbManager<M extends Modes> extends Hook<Channels> {
     mongoClientDB?: Db;
     dynamoDbOptions: DynamoDbConfig | null;
     constructor(params: Params<M>);
-    static defineSchema<T extends Yup.AnyObjectSchema>(schema: (_yup: typeof Yup) => T): () => T;
+    static defineSchema<T extends z.ZodObject<any>>(schema: (_z: typeof z) => T): () => T;
     _install(): Promise<void>;
-    defineTable<T extends Yup.AnyObjectSchema, P extends T['__outputType'], EP extends P & {
+    defineTable<T extends z.ZodObject<any>, P extends z.infer<T>, EP extends P & {
         createdAt: number;
         updatedAt: number;
         expiredAt: number;

package/dist/document-db/index.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentDbManager = void 0;
-const Yup = __importStar(require("yup"));
+const zod_1 = require("zod");
 const change_case_1 = require("change-case");
 const power_helper_1 = require("power-helper");
 const output_js_1 = require("../utils/output.js");
@@ -53,7 +53,7 @@ class DocumentDbManager extends power_helper_1.Hook {
         this.params = params;
     }
     static defineSchema(schema) {
-        return () => schema(Yup);
+        return () => schema(zod_1.z);
     }
     async _install() {
         const { mode, config } = await this.params.install();
@@ -126,10 +126,11 @@ class DocumentDbManager extends power_helper_1.Hook {
                         continue;
                     }
                     const keys = [table.params.primaryKey];
-                    const schema = table.yupSchema;
+                    const schema = table.zodSchema;
                     const getKeyType = (key) => {
-                        if (schema.fields[key]) {
-                            return schema.fields[key].type === 'string' ? 'S' : 'N';
+                        const field = schema.shape[key];
+                        if (field) {
+                            return field._def.typeName === 'ZodString' ? 'S' : 'N';
                         }
                         else {
                             throw exception.create(`key ${key} not found in schema.`);

package/dist/document-db/table.d.ts

@@ -1,4 +1,4 @@
-import * as Yup from 'yup';
+import { z } from 'zod';
 import { DynamoDbTable } from './table-dynamo.js';
 import { MongoCollection } from './table-mongo.js';
 import { TPick } from 'power-helper';
@@ -23,9 +23,9 @@ export type TableParams<T = any, ID = any, PK = any, SK = any> = {
     tableName: string;
     primaryKey: PK;
     secondaryKey: SK;
-    schema: (_yup: typeof Yup) => T;
+    schema: (_z: typeof z) => T;
 };
-export declare class TableManager<T extends Yup.AnyObjectSchema, OP extends T['__outputType'], OEP extends P & {
+export declare class TableManager<T extends z.ZodObject<any>, OP extends z.infer<T>, OEP extends OP & {
     createdAt: number;
     updatedAt: number;
     expiredAt: number;
@@ -38,7 +38,7 @@ export declare class TableManager<T extends Yup.AnyObjectSchema, OP extends T['_
     constructor(manager: DocumentDbManager<'dynamo' | 'mongo'>, params: TableParams<T, ID, PK, SK>);
     get _type(): EP;
     get _putType(): P;
-    get yupSchema(): T;
+    get zodSchema(): T;
     _connect(): void;
     get(primary: Key, secondary: Key): Promise<EP>;
     scan(options: Omit<ListOptions, 'forward'>): Promise<{

package/dist/document-db/table.js

@@ -1,40 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableManager = void 0;
-const Yup = __importStar(require("yup"));
+const zod_1 = require("zod");
 const exception_js_1 = require("../exception.js");
 const table_dynamo_js_1 = require("./table-dynamo.js");
 const table_mongo_js_1 = require("./table-mongo.js");
@@ -47,7 +14,7 @@ class TableManager {
     mongoDbCollection;
     constructor(manager, params) {
         this.params = params;
-        this.schema = params.schema(Yup);
+        this.schema = params.schema(zod_1.z);
         this.manager = manager;
     }
     get _type() {
@@ -56,8 +23,8 @@ class TableManager {
     get _putType() {
         return null;
     }
-    get yupSchema() {
-        return this.params.schema(Yup);
+    get zodSchema() {
+        return this.params.schema(zod_1.z);
     }
     _connect() {
         if (this.manager.mode === 'mongo') {
@@ -127,7 +94,8 @@ class TableManager {
     }
     async update(primary, secondary, data) {
         for (let key in data) {
-            this.schema.validateSyncAt(key, data);
+            const partialSchema = this.schema.pick({ [key]: true });
+            partialSchema.parse({ [key]: data[key] });
         }
         if (this.manager.mode === 'mongo') {
             await this.mongoDbCollection.update(primary, secondary, data);
@@ -137,8 +105,7 @@ class TableManager {
         }
     }
     async replace(primary, secondary, data) {
-        let cast = this.schema.cast(data);
-        this.schema.validateSync(cast);
+        let cast = this.schema.parse(data);
         if (this.manager.mode === 'mongo') {
             let result = await this.mongoDbCollection.replace(primary, secondary, cast);
             return result;
@@ -149,8 +116,7 @@ class TableManager {
         }
     }
     async put(data) {
-        let cast = this.schema.cast(data);
-        this.schema.validateSync(cast);
+        let cast = this.schema.parse(data);
         if (this.manager.mode === 'mongo') {
             let result = await this.mongoDbCollection.put(cast);
             return result;
@@ -161,8 +127,7 @@ class TableManager {
         }
     }
     async putForce(data) {
-        let cast = this.schema.cast(data);
-        this.schema.validateSync(cast);
+        let cast = this.schema.parse(data);
         if (this.manager.mode === 'mongo') {
             await this.mongoDbCollection.putForce(cast);
         }

package/dist/utils/json-schema.d.ts

@@ -1,4 +1,4 @@
-import { convertSchema } from '@sodaru/yup-to-json-schema';
+import { z } from 'zod';
 import { ValidateCallback } from './validate.js';
-export type JsonSchema = ReturnType<typeof convertSchema>;
-export declare const yupToJsonSchema: (cb: ValidateCallback<any>) => import("json-schema").JSONSchema7;
+export declare const zodToJsonSchema: (cb: ValidateCallback<any>) => z.core.JSONSchema.JSONSchema;
+export type JsonSchema = ReturnType<typeof zodToJsonSchema>;

package/dist/utils/json-schema.js

@@ -1,42 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.yupToJsonSchema = void 0;
-const Yup = __importStar(require("yup"));
-const yup_to_json_schema_1 = require("@sodaru/yup-to-json-schema");
-const yupToJsonSchema = (cb) => {
-    return (0, yup_to_json_schema_1.convertSchema)(Yup.object(cb(Yup)));
+exports.zodToJsonSchema = void 0;
+const zod_1 = require("zod");
+const zodToJsonSchema = (cb) => {
+    return (0, zod_1.toJSONSchema)(zod_1.z.object(cb(zod_1.z)));
 };
-exports.yupToJsonSchema = yupToJsonSchema;
+exports.zodToJsonSchema = zodToJsonSchema;

package/dist/utils/validate.d.ts

@@ -1,11 +1,11 @@
-import * as Yup from 'yup';
+import { z } from 'zod';
 import { DeepRequired } from '../types.js';
-import type { Schema, InferType } from 'yup';
-export type ValidateCallback<T extends Record<string, Schema>> = (_yup: typeof Yup) => {
+import type { ZodAny } from 'zod';
+export type ValidateCallback<T extends Record<string, ZodAny>> = (_z: typeof z) => {
     [K in keyof T]: T[K];
 };
 export type ValidateCallbackOutputs<T extends ValidateCallback<any>, R = ReturnType<T>> = {
-    [K in keyof R]: R[K] extends Schema ? DeepRequired<InferType<R[K]>> : unknown;
+    [K in keyof R]: R[K] extends ZodAny ? DeepRequired<z.infer<R[K]>> : unknown;
 };
 export declare function definedValidateSchema<T extends ValidateCallback<any>>(cb: T): T;
-export declare function validate<T extends ValidateCallback<any>, R = ReturnType<T>>(target: any, schemaCallback: T): { [K in keyof R]: R[K] extends Schema ? DeepRequired<InferType<R[K]>> : unknown; };
+export declare function validate<T extends ValidateCallback<any>, R = ReturnType<T>>(target: any, schemaCallback: T): { [K in keyof R]: R[K] extends ZodAny ? DeepRequired<z.infer<R[K]>> : unknown; };

package/dist/utils/validate.js

@@ -1,44 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.definedValidateSchema = definedValidateSchema;
 exports.validate = validate;
-const Yup = __importStar(require("yup"));
+const zod_1 = require("zod");
 function definedValidateSchema(cb) {
     return cb;
 }
 function validate(target, schemaCallback) {
-    return Yup.object(schemaCallback(Yup)).required().validateSync(target || {});
+    return zod_1.z.object(schemaCallback(zod_1.z)).required().parse(target || {});
 }

package/dist/websocket/index.d.ts

@@ -31,7 +31,7 @@ export declare class WebsocketManager<M extends Modes> {
     mode: Modes;
     params: Params<M>;
     inanis: Inanis | null;
-    emiters: Emitter<any, any>[];
+    emitters: Emitter<any, any>[];
     nodeWebsocket: WebSocketServer | null;
     nodeWebsocketClientPool: Map<string, WebSocketServerRequest>;
     constructor(params: Params<M>);

package/dist/websocket/index.js

@@ -43,7 +43,7 @@ class WebsocketManager {
     mode;
     params;
     inanis = null;
-    emiters = [];
+    emitters = [];
     nodeWebsocket = null;
     nodeWebsocketClientPool = new Map();
     constructor(params) {
@@ -116,9 +116,9 @@ class WebsocketManager {
         }
     }
     createEmitter(name, params) {
-        const emiter = new emitter_js_1.Emitter(this, name, params);
-        this.emiters.push(emiter);
-        return emiter;
+        const emitter = new emitter_js_1.Emitter(this, name, params);
+        this.emitters.push(emitter);
+        return emitter;
     }
     // =================
     //
@@ -132,11 +132,11 @@ class WebsocketManager {
                     required: [],
                     properties: {}
                 };
-                for (let emiter of this.emiters) {
+                for (let emitter of this.emitters) {
                     if (Array.isArray(tsData.required)) {
-                        tsData.required.push(emiter.name);
+                        tsData.required.push(emitter.name);
                     }
-                    tsData.properties[emiter.name] = (0, json_schema_js_1.yupToJsonSchema)(emiter.params.sendSchema);
+                    tsData.properties[emitter.name] = (0, json_schema_js_1.zodToJsonSchema)(emitter.params.sendSchema);
                 }
                 try {
                     const { js: jsBeautify } = await Promise.resolve().then(() => __importStar(require('js-beautify')));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "inanis",
-    "version": "0.0.7-beta.3",
+    "version": "0.0.7-beta.4",
     "description": "Micro Service Best Tools.",
     "main": "./dist/index.js",
     "scripts": {
@@ -53,7 +53,6 @@
         "@aws-sdk/credential-provider-node": "^3.848.0",
         "@aws-sdk/lib-dynamodb": "^3.850.0",
         "@aws-sdk/s3-request-presigner": "^3.850.0",
-        "@sodaru/yup-to-json-schema": "^2.0.1",
         "amqplib": "^0.10.8",
         "axios": "^1.11.0",
         "change-case": "^5.4.4",
@@ -74,7 +73,7 @@
         "redis": "^5.6.1",
         "websocket": "^1.0.35",
         "yaml": "^2.8.0",
-        "yup": "^1.6.1"
+        "zod": "^4.1.12"
     },
     "packageManager": "yarn@4.1.1"
 }