@domain.js/main 0.3.20 → 0.3.23

package/.vscode/settings.json

@@ -1,7 +1,11 @@
 {
   "typescript.tsdk": "node_modules/typescript/lib",
   "[markdown]": {
-    "editor.quickSuggestions": true
+    "editor.quickSuggestions": {
+      "comments": "on",
+      "strings": "on",
+      "other": "on"
+    }
   },
   "editor.quickSuggestions": {
     "other": true,

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

@@ -1,4 +1,4 @@
-import * as _ from "lodash";
+import _ from "lodash";
 import { v4 } from "uuid";
 interface Cnf {
     logger: {

package/dist/deps/logger/index.js

@@ -1,34 +1,19 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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 });
 exports.Deps = exports.Main = void 0;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const util_1 = require("util");
 const date = (offset = 0) => new Date(Date.now() + (offset | 0)).toISOString();
 function Main(cnf, deps) {
     const { logger: { errorLogPath, infoLogPath, ignoreErrors, clientId }, } = cnf;
     const { _, uuid: { v4: uuid }, } = deps;
     const makeDir = _.memoize((dir) => {
-        if (!fs.existsSync(dir))
-            fs.mkdirSync(dir);
+        if (!fs_1.default.existsSync(dir))
+            fs_1.default.mkdirSync(dir);
     });
     const ignores = new Set(ignoreErrors);
     const error = (e, extra) => {
@@ -42,18 +27,30 @@ function Main(cnf, deps) {
         // 忽略某些错误
         if (ignores.has(code))
             return;
-        const dir = path.resolve(errorLogPath, today);
+        const dir = path_1.default.resolve(errorLogPath, today);
         makeDir(dir);
-        const file = path.resolve(dir, `${code}.err`);
+        const file = path_1.default.resolve(dir, `${code}.err`);
         const content = [time, clientId, e.message];
-        if (e.data)
-            content.push(JSON.stringify(e.data));
-        if (extra != null)
-            content.push(JSON.stringify(extra));
+        if (e.data) {
+            try {
+                content.push(JSON.stringify(e.data));
+            }
+            catch (err) {
+                content.push((0, util_1.format)(e.data));
+            }
+        }
+        if (extra !== null || extra !== undefined) {
+            try {
+                content.push(JSON.stringify(extra));
+            }
+            catch (e) {
+                content.push((0, util_1.format)(extra));
+            }
+        }
         if (e.stack)
             content.push(JSON.stringify(e.stack));
         try {
-            fs.appendFileSync(file, `${content.join("\t")}\n`);
+            fs_1.default.appendFileSync(file, `${content.join("\t")}\n`);
         }
         catch (err) {
             console.error("Logger.error appendFileSync faid: %o", err);
@@ -62,14 +59,21 @@ function Main(cnf, deps) {
     const info = (message, extra) => {
         const time = date();
         const today = time.split("T")[0];
-        const dir = path.resolve(infoLogPath, today);
+        const dir = path_1.default.resolve(infoLogPath, today);
         makeDir(dir);
-        const file = path.resolve(dir, "info.log");
+        const file = path_1.default.resolve(dir, "info.log");
         const content = [time, clientId, message];
-        if (extra != null)
-            content.push(JSON.stringify(extra));
+        // eslint-disable-next-line no-eq-null
+        if (extra !== null || extra !== undefined) {
+            try {
+                content.push(JSON.stringify(extra));
+            }
+            catch (e) {
+                content.push((0, util_1.format)(extra));
+            }
+        }
         try {
-            fs.appendFileSync(file, `${content.join("\t")}\n`);
+            fs_1.default.appendFileSync(file, `${content.join("\t")}\n`);
         }
         catch (e) {
             console.error("Logger.info appendFileSync faid: %o", e);

package/dist/deps/rest/stats.d.ts

@@ -6,7 +6,7 @@ interface Deps {
     _: typeof _;
     Sequelize: Pick<typeof Sequelize, "literal" | "and" | "fn">;
 }
-export declare function Stats(cnf: {}, deps: Deps, utils: ReturnType<typeof Utils>): <T extends ModelBase<any, any>>(Model: ModelStatic<T>, params: Record<string, any>, where?: any, conf?: {
+export declare function Stats(_cnf: any, deps: Deps, utils: ReturnType<typeof Utils>): <T extends ModelBase<any, any>>(Model: ModelStatic<T>, params: Record<string, any>, where?: any, conf?: {
     dimensions?: Record<string, string> | undefined;
     metrics: Record<string, string>;
     pagination?: {

package/dist/deps/rest/stats.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Stats = void 0;
-function Stats(cnf, deps, utils) {
+function Stats(_cnf, deps, utils) {
     const defaultPagination = {
         maxResults: 10,
         maxStartIndex: 10000,

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

@@ -24,6 +24,16 @@ export interface ModelSort<Fields extends string> {
     allow: Fields[];
     defaultDirection?: "DESC" | "ASC";
 }
+/** Model 上的 stats 设定类型 */
+export interface ModelStats<Fields extends string> {
+    dimensions?: Record<string, Fields>;
+    metrics: Record<string, string>;
+    pagination?: {
+        maxResults: number;
+        maxStartIndex: number;
+        maxResultsLimit: number;
+    };
+}
 /**
  * Model 基类
  */

package/dist/http/utils.js

@@ -122,6 +122,8 @@ function Utils(cnf) {
                 if (params[k] && lodash_1.default.isString(params[k]))
                     params[k] = params[k].split(",");
             }
+            if (params.__files)
+                throw Error("Params.__files disallow assignment");
             if (lodash_1.default.size(req.files))
                 params.__files = req.files;
             return params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.3.20",
+  "version": "0.3.23",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {