vona 5.0.7 → 5.0.9

package/LICENSE

@@ -2,20 +2,7 @@ MIT License
 
 Copyright (c) 2016-present Vona
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+> Vona 5.0 internal alpha version, still under continuous development, not yet open source, please do not spread it
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+> Vona 5.0 内测版，仍在持续开发中，尚未开源，请勿扩散

package/README.en-US.md

@@ -0,0 +1,63 @@
+English | [简体中文](./README.md)
+
+# What is Vona
+
+Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size
+
+* Issues: https://github.com/vonajs/vona/issues
+* Discussions: https://github.com/vonajs/vona/discussions
+* Twitter: https://x.com/zhennann2024
+* Bilibili: https://space.bilibili.com/454737998
+
+## Quick Start
+
+1. Clone
+
+``` bash
+git clone git@github.com:cabloy/vona-dev.git vona-dev
+```
+
+2. Install
+
+``` bash
+$ cp package.original.json package.json
+$ npm run init
+```
+
+3. .env
+
+Modify the `.env` file:
+
+``` bash
+# app
+APP_NAME = Vona
+
+# database
+
+DATABASE_DEFAULT_CLIENT = 'pg' # pg/mysql
+
+DATABASE_CLIENT_PG_HOST = 127.0.0.1
+DATABASE_CLIENT_PG_PORT = 5432
+DATABASE_CLIENT_PG_USER = postgres
+DATABASE_CLIENT_PG_PASSWORD = 
+DATABASE_CLIENT_PG_DATABASE = postgres
+
+DATABASE_CLIENT_MYSQL_HOST = 127.0.0.1
+DATABASE_CLIENT_MYSQL_PORT = 3306
+DATABASE_CLIENT_MYSQL_USER = root
+DATABASE_CLIENT_MYSQL_PASSWORD = 
+DATABASE_CLIENT_MYSQL_DATABASE = mysql
+
+# redis
+
+REDIS_DEFAULT_HOST = 127.0.0.1
+REDIS_DEFAULT_PORT = 6379
+REDIS_DEFAULT_PASSWORD = 
+REDIS_DEFAULT_DB = 0
+```
+
+4. Start
+
+``` bash
+npm run dev
+```

package/README.md

@@ -1 +1,63 @@
-# vona
+简体中文 | [English](./README.en-US.md)
+
+# Vona 是什么
+
+Vona 是一款直观、优雅、强大的Node.js框架，用于快速开发任何规模的企业级应用
+
+* Issues: https://github.com/vonajs/vona/issues
+* Discussions: https://github.com/vonajs/vona/discussions
+* Twitter: https://x.com/zhennann2024
+* Bilibili: https://space.bilibili.com/454737998
+
+## 快速开始
+
+1. Clone
+
+``` bash
+git clone git@github.com:cabloy/vona-dev.git vona-dev
+```
+
+2. Install
+
+``` bash
+$ cp package.original.json package.json
+$ npm run init
+```
+
+3. .env
+
+Modify the `.env` file:
+
+``` bash
+# app
+APP_NAME = Vona
+
+# database
+
+DATABASE_DEFAULT_CLIENT = 'pg' # pg/mysql
+
+DATABASE_CLIENT_PG_HOST = 127.0.0.1
+DATABASE_CLIENT_PG_PORT = 5432
+DATABASE_CLIENT_PG_USER = postgres
+DATABASE_CLIENT_PG_PASSWORD = 
+DATABASE_CLIENT_PG_DATABASE = postgres
+
+DATABASE_CLIENT_MYSQL_HOST = 127.0.0.1
+DATABASE_CLIENT_MYSQL_PORT = 3306
+DATABASE_CLIENT_MYSQL_USER = root
+DATABASE_CLIENT_MYSQL_PASSWORD = 
+DATABASE_CLIENT_MYSQL_DATABASE = mysql
+
+# redis
+
+REDIS_DEFAULT_HOST = 127.0.0.1
+REDIS_DEFAULT_PORT = 6379
+REDIS_DEFAULT_PASSWORD = 
+REDIS_DEFAULT_DB = 0
+```
+
+4. Start
+
+``` bash
+npm run dev
+```

package/package.json

@@ -1,86 +1,15 @@
 {
   "name": "vona",
-  "version": "5.0.7",
+  "type": "module",
+  "version": "5.0.9",
   "description": "vona",
   "publishConfig": {
     "access": "public"
   },
-  "exports": {
-    ".": {
-      "types": [
-        "./src/index.ts",
-        "./dist/index.d.ts"
-      ],
-      "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "default": "./src/index.ts"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "dist/**/*.js",
-    "dist/**/*.d.ts"
-  ],
-  "scripts": {
-    "lint": "eslint ."
-  },
+  "author": "zhennann",
   "keywords": [
-    "egg",
-    "egg-born",
+    "nodejs",
     "framework",
-    "cabloy"
-  ],
-  "author": "zhennann",
-  "dependencies": {
-    "@cabloy/cluster-reload": "^1.0.7",
-    "@cabloy/compose": "^1.0.9",
-    "@cabloy/deps": "^1.0.7",
-    "@cabloy/dotenv": "^1.0.9",
-    "@cabloy/egg-socket.io": "^6.0.0",
-    "@cabloy/ensure-array": "^1.0.8",
-    "@cabloy/extend": "^3.0.12",
-    "@cabloy/json5": "^1.0.7",
-    "@cabloy/koa-static-cache": "^5.1.8",
-    "@cabloy/localeutil": "^1.0.11",
-    "@cabloy/module-glob": "^5.1.8",
-    "@cabloy/module-info": "^1.1.8",
-    "@cabloy/module-info-pro": "^1.0.16",
-    "@cabloy/set": "^1.0.7",
-    "@cabloy/word-utils": "^1.0.2",
-    "@zhennann/egg-passport": "^2.1.5",
-    "async": "^3.2.0",
-    "bottleneck": "^2.19.5",
-    "bullmq": "^2.3.1",
-    "chalk": "^3.0.0",
-    "chokidar": "^3.5.2",
-    "debounce": "^1.2.0",
-    "debug": "^4.3.4",
-    "egg": "^3.17.5",
-    "egg-born-mock": "^6.0.7",
-    "egg-cluster": "^2.2.1",
-    "egg-path-matching": "^1.0.1",
-    "egg-redis": "^2.4.0",
-    "egg-security": "^3.0.0",
-    "fs-extra": "^10.1.0",
-    "inflation": "^2.0.0",
-    "ioredis": "^5.3.2",
-    "is-type-of": "^1.2.0",
-    "jsonwebtoken": "^9.0.2",
-    "koa-compose": "^4.1.0",
-    "koa-jwt2": "^1.0.3",
-    "mixin-classes": "^1.0.2",
-    "module-alias": "^2.2.2",
-    "moment": "^2.24.0",
-    "passport-oauth2": "^1.6.1",
-    "raw-body": "2.5.1",
-    "redlock": "^4.1.0",
-    "reflect-metadata": "^0.2.2",
-    "regenerator-runtime": "^0.14.1",
-    "semver": "^7.3.7",
-    "socket.io": "^2.3.0",
-    "supertest": "^4.0.2",
-    "uuid": "^9.0.1",
-    "vona-shared": "^1.0.7"
-  },
-  "gitHead": "2d40c063c115b230fdbc89f5a78b4412ebd0dfc9"
+    "vona"
+  ]
 }

package/README.zh-CN.md

@@ -1 +0,0 @@
-# vona

package/dist/app/extend/context.d.ts

@@ -1,4 +0,0 @@
-import { ContextBase } from '../../types/context/contextBase.js';
-declare const context: ContextBase;
-export default context;
-//# sourceMappingURL=context.d.ts.map

package/dist/app/extend/context.js

@@ -1,152 +0,0 @@
-"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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const raw_body_1 = __importDefault(require("raw-body"));
-const inflation_1 = __importDefault(require("inflation"));
-const ModuleInfo = __importStar(require("@cabloy/module-info"));
-const metaCtx_js_1 = require("../../lib/core/metaCtx.js");
-const cast_js_1 = require("../../types/utils/cast.js");
-const MODULE = Symbol.for('Context#__module');
-const META = Symbol.for('Context#__meta');
-const INNERACCESS = Symbol.for('Context#__inneraccess');
-const SUBDOMAIN = Symbol.for('Context#__subdomain');
-const CTXCALLER = Symbol.for('Context#__ctxcaller');
-const TAILCALLBACKS = Symbol.for('Context#__tailcallbacks');
-const DBLEVEL = Symbol.for('Context#__dblevel');
-const context = {
-    get module() {
-        const self = (0, cast_js_1.Cast)(this);
-        if (this[MODULE] === undefined) {
-            const url = self.req.url || '';
-            let info;
-            if (url.indexOf('/api/static/public/') === 0) {
-                info = null;
-            }
-            else {
-                info = ModuleInfo.parseInfo(ModuleInfo.parseName(url));
-            }
-            if (!info) {
-                info = ModuleInfo.parseInfo('a-base');
-            }
-            if (info) {
-                const module = self.app.meta.modules[info.relativeName];
-                // should not throw error, because the url maybe not valid
-                // if (!module) throw new Error(`module not found: ${info.relativeName}`);
-                this[MODULE] = module || null;
-            }
-            else {
-                this[MODULE] = null;
-            }
-        }
-        return this[MODULE];
-    },
-    get meta() {
-        const self = (0, cast_js_1.Cast)(this);
-        if (!this[META]) {
-            this[META] = self.bean._newBean(metaCtx_js_1.CtxMeta);
-        }
-        return this[META];
-    },
-    get innerAccess() {
-        return this[INNERACCESS];
-    },
-    set innerAccess(value) {
-        this[INNERACCESS] = value;
-    },
-    get dbLevel() {
-        return this[DBLEVEL] || 0;
-    },
-    set dbLevel(value) {
-        this[DBLEVEL] = value;
-    },
-    get subdomain() {
-        const self = (0, cast_js_1.Cast)(this);
-        return typeof this[SUBDOMAIN] === 'undefined' ? self.subdomains.join('.') : this[SUBDOMAIN];
-    },
-    set subdomain(value) {
-        this[SUBDOMAIN] = value;
-    },
-    get ctxCaller() {
-        return this[CTXCALLER];
-    },
-    set ctxCaller(value) {
-        // ctxCaller
-        this[CTXCALLER] = value;
-        // innerAccess
-        this.innerAccess = true;
-        // transaction
-        (0, cast_js_1.Cast)(this).dbMeta = value.dbMeta;
-        // dbLevel
-        this.dbLevel = value.dbLevel;
-    },
-    get cache() {
-        const self = (0, cast_js_1.Cast)(this);
-        return self.bean._getBean('cache');
-    },
-    tail(cb) {
-        if (!(0, cast_js_1.Cast)(this).dbMeta.master) {
-            this.ctxCaller.tail(cb);
-        }
-        else {
-            this.tailCallbacks.push(cb);
-        }
-    },
-    async tailDone() {
-        while (true) {
-            const cb = this.tailCallbacks.shift();
-            if (!cb)
-                break;
-            await cb();
-            // try {
-            //   await cb();
-            // } catch (err) {
-            //   this.app.logger.error(err);
-            // }
-        }
-    },
-    get tailCallbacks() {
-        if (!this[TAILCALLBACKS]) {
-            this[TAILCALLBACKS] = [];
-        }
-        return this[TAILCALLBACKS];
-    },
-    successMore(list, index, size) {
-        const self = (0, cast_js_1.Cast)(this);
-        self.success({
-            list,
-            index: index + list.length,
-            finished: size === -1 || size === 0 || list.length < size,
-        });
-    },
-    async getPayload(options) {
-        const self = (0, cast_js_1.Cast)(this);
-        return await (0, raw_body_1.default)((0, inflation_1.default)(self.req), options);
-    },
-};
-exports.default = context;
-//# sourceMappingURL=context.js.map

package/dist/index.d.ts

@@ -1,11 +0,0 @@
-import '@cabloy/set';
-import '@cabloy/json5';
-import 'regenerator-runtime';
-export * from './types/index.js';
-export * from './lib/bean/index.js';
-export * from './lib/core/index.js';
-export * from './lib/decorator/index.js';
-export * from './lib/module/index.js';
-export * from './lib/framework/framework.js';
-export * from './lib/utils/index.js';
-//# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,35 +0,0 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-require("@cabloy/set");
-require("@cabloy/json5");
-require("regenerator-runtime");
-const module_alias_1 = __importDefault(require("module-alias"));
-const cluster_reload_1 = __importDefault(require("@cabloy/cluster-reload"));
-const master_js_1 = __importDefault(require("egg-cluster/lib/master.js"));
-module_alias_1.default.addAlias('koa-static-cache', '@cabloy/koa-static-cache');
-master_js_1.default.prototype.onReload = cluster_reload_1.default;
-__exportStar(require("./types/index.js"), exports);
-__exportStar(require("./lib/bean/index.js"), exports);
-__exportStar(require("./lib/core/index.js"), exports);
-__exportStar(require("./lib/decorator/index.js"), exports);
-__exportStar(require("./lib/module/index.js"), exports);
-__exportStar(require("./lib/framework/framework.js"), exports);
-__exportStar(require("./lib/utils/index.js"), exports);
-//# sourceMappingURL=index.js.map

package/dist/lib/base/dbTransaction.d.ts

@@ -1,12 +0,0 @@
-import { CabloyContext } from '../../types/index.js';
-export default class DbTransaction {
-    _ctx: CabloyContext;
-    _transactionCounter: number;
-    _connection: any;
-    constructor(ctx: any);
-    get inTransaction(): boolean;
-    get connection(): any;
-    set connection(value: any);
-    begin(fn: any): Promise<any>;
-}
-//# sourceMappingURL=dbTransaction.d.ts.map

package/dist/lib/base/dbTransaction.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class DbTransaction {
-    constructor(ctx) {
-        this._ctx = ctx;
-        this._transactionCounter = 0;
-        this._connection = null;
-    }
-    get inTransaction() {
-        return this._transactionCounter > 0;
-    }
-    get connection() {
-        return this._connection;
-    }
-    set connection(value) {
-        this._connection = value;
-    }
-    async begin(fn) {
-        let res;
-        const db = this._ctx.meta.util.getDbOriginal();
-        try {
-            if (++this._transactionCounter === 1) {
-                this._connection = await db.beginTransaction();
-            }
-        }
-        catch (err) {
-            this._transactionCounter--;
-            throw err;
-        }
-        try {
-            res = await fn();
-        }
-        catch (err) {
-            if (--this._transactionCounter === 0) {
-                await this._connection.rollback();
-                this._connection = null;
-            }
-            throw err;
-        }
-        try {
-            if (--this._transactionCounter === 0) {
-                await this._connection.commit();
-                this._connection = null;
-            }
-        }
-        catch (err) {
-            await this._connection.rollback();
-            this._connection = null;
-            throw err;
-        }
-        return res;
-    }
-}
-exports.default = DbTransaction;
-//# sourceMappingURL=dbTransaction.js.map

package/dist/lib/base/error.d.ts

@@ -1,18 +0,0 @@
-import { BeanSimple } from '../bean/beanSimple.js';
-export declare class ErrorClass extends BeanSimple {
-    ebErrors: any;
-    constructor(ebErrors: any);
-    success(module: any, data: any, code: any, ...args: any[]): void;
-    fail(module: any, code: any, ...args: any[]): void;
-    throw(module: any, code: any, ...args: any[]): void;
-    parseFail(module: any, code: any, ...args: any[]): any;
-    parseSuccess(module: any, code: any, ...args: any[]): {
-        code: any;
-        message: null;
-    };
-    parseCode(module: any, codeDefault: any, code: any, ...args: any[]): {
-        code: any;
-        message: null;
-    };
-}
-//# sourceMappingURL=error.d.ts.map

package/dist/lib/base/error.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorClass = void 0;
-const beanSimple_js_1 = require("../bean/beanSimple.js");
-class ErrorClass extends beanSimple_js_1.BeanSimple {
-    constructor(ebErrors) {
-        super();
-        this.ebErrors = ebErrors;
-    }
-    // data,code/message,args
-    success(module, data, code, ...args) {
-        const body = this.parseSuccess(module, code, ...args);
-        this.ctx.response.status = 200;
-        this.ctx.response.type = 'application/json';
-        this.ctx.response.body = { code: 0, message: body.message, data };
-    }
-    // code/message,args
-    fail(module, code, ...args) {
-        const body = this.parseFail(module, code, ...args);
-        this.ctx.response.status = 200;
-        this.ctx.response.type = 'application/json';
-        this.ctx.response.body = { code: __combineErrorCode(module, body.code), message: body.message }; // body maybe Error
-    }
-    // code/message,args
-    throw(module, code, ...args) {
-        const body = this.parseFail(module, code, ...args);
-        const err = new Error();
-        err.code = __combineErrorCode(module, body.code);
-        err.message = body.message;
-        if (body.code < 500)
-            err.status = body.code;
-        throw err;
-    }
-    // code/message,args
-    parseFail(module, code, ...args) {
-        if (typeof code === 'object')
-            return code;
-        return this.parseCode(module, 1, code, ...args);
-    }
-    // code/message,args
-    parseSuccess(module, code, ...args) {
-        return this.parseCode(module, 0, code, ...args);
-    }
-    // parseCode
-    parseCode(module, codeDefault, code, ...args) {
-        const ebError = this.ebErrors[module];
-        let message = null;
-        if (code === undefined || code === null || code === '') {
-            code = codeDefault;
-        }
-        else if (typeof code === 'string') {
-            message = this.ctx.text(code, ...args);
-            code = codeDefault;
-        }
-        else {
-            message = this.ctx.text(ebError[code], ...args);
-        }
-        if (!message) {
-            message = this.ctx.text(ebError[codeDefault]);
-        }
-        return { code, message };
-    }
-}
-exports.ErrorClass = ErrorClass;
-function __combineErrorCode(module, code) {
-    if (code <= 1000)
-        return code;
-    return module ? `${module}:${code}` : code;
-}
-//# sourceMappingURL=error.js.map

package/dist/lib/base/model.d.ts

@@ -1,22 +0,0 @@
-import { BeanSimple } from '../bean/beanSimple.js';
-export declare class Model extends BeanSimple {
-    table: string;
-    options: any;
-    constructor({ table, options }: {
-        table: any;
-        options?: {} | undefined;
-    });
-    get disableDeleted(): any;
-    get disableInstance(): any;
-    columns(tableName?: string): Promise<any>;
-    columnsClear(tableName: any): any;
-    columnsClearAll(): boolean;
-    prepareData(item: any): Promise<{}>;
-    default(data: any): Promise<any>;
-    _coerceTypeOfDefault(column: any): any;
-    create(data: any, ...args: any[]): Promise<any>;
-    write(data: any, ...args: any[]): Promise<any>;
-    _rowCheck(row: any): void;
-    _insertRowsCheck(rows: any): void;
-}
-//# sourceMappingURL=model.d.ts.map