@domain.js/main 0.3.8 → 0.3.11

package/dist/cfg/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
 const ajv_1 = __importDefault(require("ajv"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
+const ajv_keywords_1 = __importDefault(require("ajv-keywords"));
 const lodash_1 = __importDefault(require("lodash"));
 function Main(object, schema) {
     if (typeof schema !== "object")
@@ -13,6 +14,7 @@ function Main(object, schema) {
     const FIELDS = new Set(Object.keys(schema.properties));
     const ajv = new ajv_1.default({ allowUnionTypes: true, coerceTypes: true, useDefaults: true });
     (0, ajv_formats_1.default)(ajv);
+    (0, ajv_keywords_1.default)(ajv);
     const validate = ajv.compile(schema);
     const obj = lodash_1.default.pick(object, [...FIELDS]);
     if (!validate(obj)) {

package/dist/cli/index.js

@@ -57,10 +57,10 @@ const makeDefineFile = async (modules, targetFile, isTS) => {
         const name = path.relative(dirname, x);
         const variable = filePath2Var(name);
         if (isTS) {
-            content.push(`import * as ${variable} from "./${name}"`);
+            content.push(`import * as ${variable} from "./${name}";`);
         }
         else {
-            content.push(`const ${variable} = require("./${name}")`);
+            content.push(`const ${variable} = require("./${name}");`);
         }
         _exports.push(`"${file2Module(name).replace(/[/]/, ".")}": ${variable},`);
     }
@@ -73,7 +73,7 @@ const makeDefineFile = async (modules, targetFile, isTS) => {
         content.push("module.exports = {");
     }
     for (const x of _exports)
-        content.push(x);
+        content.push(`  ${x}`);
     content.push("};");
     fs.writeFileSync(targetFile, content.join("\n"));
     await codeStyleFormat(targetFile);

package/dist/defaults.d.ts

@@ -1,5 +1,6 @@
 import * as ajv from "ajv";
 import * as ajvFormats from "ajv-formats";
+import ajvKeywords from "ajv-keywords";
 import * as async from "async";
 import * as axios from "axios";
 import * as cronParser from "cron-parser";
@@ -35,6 +36,7 @@ export interface Defaults {
      * @link https://www.npmjs.com/package/ajv-formats
      */
     ajvFormats: typeof ajvFormats;
+    ajvKeywords: typeof ajvKeywords;
     /**
      * Async is a utility module which provides straight-forward
      * powerful functions for working with asynchronous JavaScript.

package/dist/defaults.js

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaults = void 0;
 const ajv = __importStar(require("ajv"));
 const ajvFormats = __importStar(require("ajv-formats"));
+const ajv_keywords_1 = __importDefault(require("ajv-keywords"));
 const async = __importStar(require("async"));
 const axios = __importStar(require("axios"));
 const cronParser = __importStar(require("cron-parser"));
@@ -43,6 +44,7 @@ exports.defaults = {
     uuid,
     ajv,
     ajvFormats,
+    ajvKeywords: ajv_keywords_1.default,
     async,
     axios,
     cronParser,

package/dist/deps/request/index.d.ts

@@ -1,6 +1,6 @@
 import axios, { AxiosInstance } from "axios";
-import { Main as Logger } from "../logger";
 import * as utils from "../../utils";
+import { Main as Logger } from "../logger";
 interface Cnf {
     /** axios config */
     axios?: {

package/dist/deps/rest/index.js

@@ -80,7 +80,7 @@ function Main(cnf, deps, utils) {
         Object.assign(model, attr);
         return model.save();
     };
-    const TRASH_OPT = Object.freeze({ fields: ["isDeleted", "deletorId"] });
+    const TRASH_OPT = Object.freeze({ fields: ["isDeleted", "deletorId", "deletedAt"] });
     /**
      * Restful remove (D of CRUD) for delete a resource
      * @param model the resources will be removed
@@ -94,6 +94,7 @@ function Main(cnf, deps, utils) {
         // 这里不做字段是否存在的判断，无所谓
         model.deletorId = deletorId;
         model.isDeleted = "yes";
+        model.deletedAt = new Date();
         // 丢进垃圾桶
         return model.save(TRASH_OPT);
     };

package/dist/deps/schema/index.d.ts

@@ -1,5 +1,6 @@
 import * as ajv from "ajv";
 import addFormats from "ajv-formats";
+import ajvKeywords from "ajv-keywords";
 interface Cnf {
     schema?: ConstructorParameters<typeof ajv.default>[0];
 }
@@ -8,6 +9,7 @@ interface Deps {
         default: typeof ajv.default;
     };
     ajvFormats: typeof addFormats;
+    ajvKeywords: typeof ajvKeywords;
 }
 declare type Schema = ajv.Schema;
 /**

package/dist/deps/schema/index.js

@@ -27,9 +27,10 @@ const util = __importStar(require("util"));
  * @returns auto, validate, complie, ajv
  */
 function Main(cnf, deps) {
-    const { ajv: { default: Ajv }, ajvFormats, } = deps;
+    const { ajv: { default: Ajv }, ajvFormats, ajvKeywords, } = deps;
     const ajv = new Ajv(cnf.schema || {});
     ajvFormats(ajv);
+    ajvKeywords(ajv);
     /**
      * Ajv complie function
      * @param schema Definition of data format, Ajv specification
@@ -79,4 +80,4 @@ function Main(cnf, deps) {
     });
 }
 exports.Main = Main;
-exports.Deps = ["ajv", "ajvFormats"];
+exports.Deps = ["ajv", "ajvFormats", "ajvKeywords"];

package/dist/http/utils.js

@@ -103,7 +103,7 @@ function Utils(cnf) {
             obj.uuid = req.headers["x-auth-uuid"];
             if (customFn)
                 Object.assign(obj, customFn(obj, req));
-            return Object.freeze(obj);
+            return obj;
         },
         /**
          * 构造领域方法所需的 params 参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.3.8",
+  "version": "0.3.11",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {
@@ -18,11 +18,20 @@
   "author": "Redstone Zhao",
   "license": "MIT",
   "devDependencies": {
+    "@types/async": "^3.2.10",
+    "@types/crypto-js": "^4.0.2",
+    "@types/ioredis": "^4.28.1",
+    "@types/jest": "^27.0.3",
+    "@types/lodash": "^4.14.177",
+    "@types/lru-cache": "^5.1.1",
+    "@types/restify-errors": "^4.3.4",
+    "@types/restify": "^8.5.4",
+    "@types/uuid": "^8.3.3",
+    "@types/validator": "^13.7.0",
     "@typescript-eslint/eslint-plugin": "^5.11.0",
     "@typescript-eslint/parser": "^5.11.0",
     "babel-eslint": "^10.1.0",
     "codecov": "^3.8.3",
-    "eslint": "^8.8.0",
     "eslint-config-airbnb": "^18.2.0",
     "eslint-config-alloy": "^4.4.0",
     "eslint-config-prettier": "^8.3.0",
@@ -32,6 +41,7 @@
     "eslint-plugin-react": "^7.21.4",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint": "^8.8.0",
     "husky": "^7.0.0",
     "jest": "^27.3.1",
     "lint-staged": "^11.0.0",
@@ -52,18 +62,9 @@
     ]
   },
   "dependencies": {
-    "@types/async": "^3.2.10",
-    "@types/crypto-js": "^4.0.2",
-    "@types/ioredis": "^4.28.1",
-    "@types/jest": "^27.0.3",
-    "@types/lodash": "^4.14.177",
-    "@types/lru-cache": "^5.1.1",
-    "@types/restify": "^8.5.4",
-    "@types/restify-errors": "^4.3.4",
-    "@types/uuid": "^8.3.3",
-    "@types/validator": "^13.7.0",
     "ajv": "^8.8.1",
     "ajv-formats": "^2.1.1",
+    "ajv-keywords": "^5.1.0",
     "async": "^3.2.2",
     "axios": "^0.24.0",
     "cron-parser": "^4.1.0",