evaengine 0.11.2 → 1.0.0

package/package.json

@@ -1,25 +1,27 @@
 {
   "name": "evaengine",
-  "version": "0.11.2",
+  "version": "1.0.0",
   "description": "EvaEngine for Node.js, a micro service development engine",
   "license": "MIT",
+  "type": "module",
   "package-lock": false,
   "repository": {
     "type": "git",
     "url": "https://github.com/EvaEngine/EvaEngine.js.git"
   },
   "scripts": {
-    "prestart": "npm run build",
-    "prepublish": "rm -rf ./lib && npm run build",
+    "prestart": "node src/index.js",
+    "prepublish": "npm run test",
     "ava": "cross-env LOG_LEVEL=error NODE_ENV=test ava --verbose --serial",
     "test": "nyc -a --reporter=lcov --reporter=text --reporter=html npm run ava",
-    "lint": "eslint src/* --ext .js",
-    "build": "./node_modules/.bin/babel -D -s -d lib/ src/",
-    "travis-deploy-once": "travis-deploy-once",
-    "semantic-release": "semantic-release"
+    "lint": "eslint src test index.js",
+    "build": "node --check src/index.js",
+    "ci:check": "npm run lint && npm run build",
+    "semantic-release": "semantic-release",
+    "release": "semantic-release"
   },
   "engines": {
-    "node": ">=6.0.0"
+    "node": ">=24.0.0"
   },
   "keywords": [
     "es7",
@@ -28,10 +30,9 @@
     "micro service",
     "orm"
   ],
-  "main": "index.js",
+  "main": "src/index.js",
   "bin": {
-    "engine": "./bin/engine",
-    "engine-babel": "./bin/engine-babel"
+    "engine": "./bin/engine"
   },
   "pre-commit": [
     "lint"
@@ -50,11 +51,8 @@
     "failFast": false,
     "tap": false,
     "require": [
-      "babel-core/register",
-      "babel-polyfill",
-      "./test/bootstrap"
-    ],
-    "babel": "inherit"
+      "./test/bootstrap.js"
+    ]
   },
   "nyc": {
     "require": [],
@@ -66,58 +64,56 @@
     ]
   },
   "dependencies": {
-    "acorn": "^5.5.3",
-    "app-root-path": "^2.0.1",
-    "babel-polyfill": "^6.23.0",
-    "cloud-config-client": "^1.1.0",
-    "connect-redis": "^3.3.3",
+    "acorn": "^8.18.0",
+    "app-root-path": "^3.1.0",
+    "cloud-config-client": "^1.6.2",
+    "connect-redis": "^10.0.0",
     "constitute": "^1.6.2",
     "continuation-local-storage": "^3.2.1",
-    "doctrine": "^2.1.0",
-    "express": "^4.16.3",
-    "express-session": "^1.15.3",
-    "glob": "^7.1.2",
-    "ioredis": "^3.1.1",
-    "joi": "^12.0.0",
-    "js-yaml": "^3.11.0",
-    "jwt-simple": "^0.5.1",
+    "doctrine": "^3.0.0",
+    "express": "^5.2.1",
+    "express-session": "^1.19.0",
+    "glob": "^13.0.6",
+    "ioredis": "^5.11.1",
+    "joi": "^18.2.3",
+    "js-yaml": "^5.2.2",
+    "jwt-simple": "^0.5.6",
     "later": "^1.2.0",
-    "lodash": "^4.17.5",
-    "mkdirp": "^0.5.1",
-    "moment": "^2.22.0",
-    "moment-timezone": "^0.5.13",
-    "morgan": "^1.8.2",
-    "mysql": "^2.13.0",
-    "node-mocks-http": "~1.6.6",
-    "on-headers": "^1.0.1",
-    "pug": "^2.0.3",
-    "request": "^2.85.0",
-    "request-promise-native": "^1.0.4",
-    "sequelize": "^3.31.0",
-    "swagger-ui-dist": "^3.13.3",
-    "winston": "^2.4.1",
-    "yargs": "^11.0.0"
+    "lodash": "^4.18.1",
+    "mkdirp": "^3.0.1",
+    "moment": "^2.30.1",
+    "moment-timezone": "^0.6.3",
+    "morgan": "^1.11.0",
+    "mysql": "^2.18.1",
+    "mysql2": "^3.23.2",
+    "node-mocks-http": "~1.18.1",
+    "on-headers": "^1.1.0",
+    "pug": "^3.0.4",
+    "request": "^2.88.2",
+    "request-promise-native": "^1.0.9",
+    "sequelize": "^6.37.8",
+    "swagger-ui-dist": "^5.32.11",
+    "winston": "^3.19.0",
+    "yargs": "^18.1.0"
   },
   "devDependencies": {
-    "ava": "^0.25.0",
-    "babel-cli": "^6.24.1",
-    "babel-core": "^6.25.0",
-    "babel-eslint": "^8.2.2",
-    "babel-plugin-transform-builtin-extend": "^1.1.2",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "cross-env": "^5.1.4",
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-plugin-import": "^2.10.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.7.0",
-    "is-type-of": "^1.0.0",
-    "nock": "^9.2.3",
-    "nyc": "^11.6.0",
-    "pre-commit": "^1.2.2",
-    "semantic-release": "^15.1.5",
-    "travis-deploy-once": "^4.4.1"
+    "@eslint/js": "^9.39.5",
+    "@semantic-release/changelog": "^6.0.0",
+    "@semantic-release/commit-analyzer": "^13.0.0",
+    "@semantic-release/git": "^10.0.0",
+    "@semantic-release/github": "^11.0.0",
+    "@semantic-release/npm": "^12.0.0",
+    "@semantic-release/release-notes-generator": "^14.0.0",
+    "ava": "^8.0.1",
+    "conventional-changelog-conventionalcommits": "^8.0.0",
+    "cross-env": "^10.1.0",
+    "eslint": "^9.39.5",
+    "eslint-plugin-import": "^2.32.0",
+    "globals": "^17.8.0",
+    "is-type-of": "^2.2.0",
+    "nock": "^14.0.17",
+    "nyc": "^18.0.0",
+    "pre-commit": "^2.0.0",
+    "semantic-release": "^25.0.8"
   }
 }

package/src/index.js

@@ -0,0 +1,57 @@
+import constitute from 'constitute';
+import * as mysql from 'mysql';
+import sequelize from 'sequelize';
+import Joi from 'joi';
+import EvaEngine, * as engine from './engine.js';
+import * as swagger from './swagger/index.js';
+import * as exceptions from './exceptions/index.js';
+import * as services from './services/index.js';
+import * as middlewares from './middlewares/index.js';
+import * as ServiceProviders from './services/providers.js';
+import * as MiddlewareProviders from './middlewares/providers.js';
+import * as utils from './utils/index.js';
+import Command, * as commands from './commands/index.js';
+import Entities from './entities/index.js';
+
+const providers = {
+  services: ServiceProviders,
+  middlewares: MiddlewareProviders
+};
+
+const { wrapper } = utils;
+
+const {
+  DI,
+  express
+} = engine;
+
+/**
+ * @typedef {Object} engineCore
+ */
+const core = {
+  EvaEngine,
+  Command,
+  DI,
+  Entities,
+  engine,
+  express,
+  commands,
+  dependencies: {
+    Joi,
+    constitute,
+    sequelize,
+    mysql
+  },
+  exceptions,
+  middlewares,
+  sequelize,
+  Joi,
+  swagger,
+  services,
+  providers,
+  wrapper,
+  utils
+};
+
+export default core;
+export { core };

package/bin/engine-babel

@@ -1,38 +0,0 @@
-#!/usr/bin/env babel-node
-const { EvaEngine, DI, exceptions, commands } = require('../');
-const co = (fn) => { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { return step("next", value); }, function (err) { return step("throw", err); }); } } return step("next"); }); }; }
-
-const engine = new EvaEngine({
-  projectRoot: process.cwd()
-}, 'cli');
-engine.registerCommands([
-  commands
-]);
-
-const logger = DI.get('logger');
-co(function* () {
-  if (process.env.SPRING_CONFIG_ENDPOINT) {
-    const springOptions = {
-      endpoint: process.env.SPRING_CONFIG_ENDPOINT,
-      name: process.env.SPRING_CONFIG_NAME || 'unknown-spring-config-name',
-      profiles: process.env.SPRING_CONFIG_PROFILES || process.env.NODE_ENV,
-      label: process.env.SPRING_CONFIG_LABEL || 'master'
-    };
-    logger.info(`Loading configs from Spring Cloud Config, options:${JSON.stringify(springOptions)}`);
-    yield DI.get('config').resolveSpringConfig(springOptions);
-  }
-  try {
-    yield engine.runCLI();
-  } catch (e) {
-    if (e instanceof exceptions.StandardException) {
-      logger.warn(e.getDetails());
-      return logger.warn(e.message);
-    }
-    logger.error(e);
-  }
-  const redis = DI.get('redis');
-  if (redis.isConnected()) {
-    redis.cleanup();
-  }
-  return true;
-})();

package/lib/commands/index.js

@@ -1,25 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.TrampConfig = exports.MakeGraphql = exports.MakeDbView = exports.MakeEntity = undefined;
-
-var _interface = require('./interface');
-
-var _interface2 = _interopRequireDefault(_interface);
-
-var _make_entity = require('./make_entity');
-
-var _tramp = require('./tramp');
-
-var _tramp2 = _interopRequireDefault(_tramp);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-exports.default = _interface2.default;
-exports.MakeEntity = _make_entity.MakeEntity;
-exports.MakeDbView = _make_entity.MakeDbView;
-exports.MakeGraphql = _make_entity.MakeGraphql;
-exports.TrampConfig = _tramp2.default;
-//# sourceMappingURL=index.js.map

package/lib/commands/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/commands/index.js"],"names":["Command","MakeEntity","MakeDbView","MakeGraphql","TrampConfig"],"mappings":";;;;;;;AAAA;;;;AACA;;AACA;;;;;;kBAEeA,mB;QAGbC,U,GAAAA,uB;QACAC,U,GAAAA,uB;QACAC,W,GAAAA,wB;QACAC,W,GAAAA,e","file":"index.js","sourcesContent":["import Command from './interface';\nimport { MakeEntity, MakeDbView, MakeGraphql } from './make_entity';\nimport TrampConfig from './tramp';\n\nexport default Command;\n\nexport {\n  MakeEntity,\n  MakeDbView,\n  MakeGraphql,\n  TrampConfig\n};\n"]}

package/lib/commands/interface.js

@@ -1,51 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-let Command = class Command {
-  constructor(argv) {
-    this.argv = argv;
-    this.options = null;
-  }
-
-  getArgv() {
-    return this.argv;
-  }
-
-  setArgv(argv) {
-    this.argv = argv;
-    return this;
-  }
-
-  setOptions(options) {
-    this.options = options;
-    return this;
-  }
-
-  getOptions() {
-    const options = {};
-    Object.keys(this.argv).forEach(key => {
-      if (key !== '$0' && ['string', 'number'].includes(typeof this.argv[key])) {
-        options[key] = this.argv[key];
-      }
-    });
-    return options;
-  }
-
-  static getName() {
-    return '';
-  }
-
-  static getDescription() {
-    return '';
-  }
-
-  static getSpec() {
-    return {};
-  }
-
-  run() {}
-};
-exports.default = Command;
-//# sourceMappingURL=interface.js.map

package/lib/commands/interface.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/commands/interface.js"],"names":["Command","constructor","argv","options","getArgv","setArgv","setOptions","getOptions","Object","keys","forEach","key","includes","getName","getDescription","getSpec","run"],"mappings":";;;;;IAAqBA,O,GAAN,MAAMA,OAAN,CAAc;AAC3BC,cAAYC,IAAZ,EAAkB;AAChB,SAAKA,IAAL,GAAYA,IAAZ;AACA,SAAKC,OAAL,GAAe,IAAf;AACD;;AAEDC,YAAU;AACR,WAAO,KAAKF,IAAZ;AACD;;AAEDG,UAAQH,IAAR,EAAc;AACZ,SAAKA,IAAL,GAAYA,IAAZ;AACA,WAAO,IAAP;AACD;;AAEDI,aAAWH,OAAX,EAAoB;AAClB,SAAKA,OAAL,GAAeA,OAAf;AACA,WAAO,IAAP;AACD;;AAEDI,eAAa;AACX,UAAMJ,UAAU,EAAhB;AACAK,WAAOC,IAAP,CAAY,KAAKP,IAAjB,EAAuBQ,OAAvB,CAAgCC,GAAD,IAAS;AACtC,UAAIA,QAAQ,IAAR,IAAgB,CAAC,QAAD,EAAW,QAAX,EAAqBC,QAArB,CAA8B,OAAO,KAAKV,IAAL,CAAUS,GAAV,CAArC,CAApB,EAA0E;AACxER,gBAAQQ,GAAR,IAAe,KAAKT,IAAL,CAAUS,GAAV,CAAf;AACD;AACF,KAJD;AAKA,WAAOR,OAAP;AACD;;AAED,SAAOU,OAAP,GAAiB;AACf,WAAO,EAAP;AACD;;AAED,SAAOC,cAAP,GAAwB;AACtB,WAAO,EAAP;AACD;;AAED,SAAOC,OAAP,GAAiB;AACf,WAAO,EAAP;AACD;;AAEDC,QAAM,CACL;AA3C0B,C;kBAARhB,O","file":"interface.js","sourcesContent":["export default class Command {\n  constructor(argv) {\n    this.argv = argv;\n    this.options = null;\n  }\n\n  getArgv() {\n    return this.argv;\n  }\n\n  setArgv(argv) {\n    this.argv = argv;\n    return this;\n  }\n\n  setOptions(options) {\n    this.options = options;\n    return this;\n  }\n\n  getOptions() {\n    const options = {};\n    Object.keys(this.argv).forEach((key) => {\n      if (key !== '$0' && ['string', 'number'].includes(typeof this.argv[key])) {\n        options[key] = this.argv[key];\n      }\n    });\n    return options;\n  }\n\n  static getName() {\n    return '';\n  }\n\n  static getDescription() {\n    return '';\n  }\n\n  static getSpec() {\n    return {};\n  }\n\n  run() {\n  }\n}\n"]}