@domain.js/main 1.0.0-alpha.4 → 1.0.0-arpha.7

package/.husky/pre-commit

@@ -1,8 +1,2 @@
-#!/bin/sh
-if [ ! -f "$(dirname "$0")/_/husky.sh" ]; then
-  npx husky install
-fi
-. "$(dirname "$0")/_/husky.sh"
-
 ts-node src/cli/index.ts loadDeps ./src/deps ts && npm run lint-staged && npm run build 
 # npm tst

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

@@ -1,4 +1,4 @@
-import * as cronParser from "cron-parser";
+import { CronExpressionParser } from "cron-parser";
 import human = require("human-interval");
 interface Cnf {
     cron?: {
@@ -14,7 +14,7 @@ interface callbackArg {
     cronJob: [Error | null, any, number];
 }
 interface Deps {
-    cronParser: typeof cronParser;
+    cronParser: typeof CronExpressionParser;
     humanInterval: typeof human;
     myCia: {
         regist: (name: string, validator: any, waiters: waiter[]) => void;

package/dist/deps/cron/index.js

@@ -21,7 +21,7 @@ exports.timeout = timeout;
 function Main(cnf, deps) {
     const { cron = {} } = cnf;
     const ciaTaskType = "cronJob";
-    const { myCia, humanInterval: human, cronParser: parser } = deps;
+    const { myCia, humanInterval: human, cronParser: CronParser } = deps;
     const { tz = "Asia/Shanghai" } = cron;
     // 注册信息
     const registed = {};
@@ -29,7 +29,7 @@ function Main(cnf, deps) {
     let startedAt;
     // 计算具体下次执行还有多少毫秒
     const calcNextMS = (intervalStr) => {
-        const interval = human(intervalStr) || parser.parseExpression(intervalStr, { tz });
+        const interval = human(intervalStr) || CronParser.parse(intervalStr, { tz });
         if (typeof interval === "number")
             return interval;
         //  *    *    *    *    *    *

package/dist/http/index.d.ts

@@ -7,7 +7,7 @@ export declare function Main(cnf: Cnf, deps: {
     httpCodes: HttpCodes;
     makeProfileHook?: (obj: Profile, req: FastifyRequest) => any;
     socketLogger?: (...args: any[]) => void;
-}): () => import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>> & {
+}): () => import("fastify").FastifyInstance<import("node:http").Server<typeof import("node:http").IncomingMessage, typeof import("node:http").ServerResponse>, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<import("fastify").FastifyInstance<import("node:http").Server<typeof import("node:http").IncomingMessage, typeof import("node:http").ServerResponse>, import("node:http").IncomingMessage, import("node:http").ServerResponse<import("node:http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>> & {
     __linterBrands: "SafePromiseLike";
 };
 declare module "fastify" {

package/dist/http/utils.d.ts

@@ -23,7 +23,9 @@ export declare function Utils(cnf: Cnf): {
         Querystring: Record<string, any>;
         Params: Record<string, any>;
         Body: Record<string, any>;
-    }>): Promise<{}>;
+    }>): Promise<{
+        [x: string]: any;
+    }>;
     /**
      *
      * 输出csv相关

package/dist/http/utils.js

@@ -150,26 +150,42 @@ function Utils(cnf) {
             else if (req.body) {
                 params.__raw = req.body;
             }
-            // 逗号分隔的属性，自动转换为 array
-            for (const k of str2arr) {
-                if (params[k] && lodash_1.default.isString(params[k]))
-                    params[k] = params[k].split(",");
-            }
-            // 检查请求是否包含文件上传
+            // 处理 multipart：同时解析字段与文件
             let files = {};
             try {
-                // 只有在 multipart 请求时才处理文件
                 if ((_a = req.headers["content-type"]) === null || _a === void 0 ? void 0 : _a.includes("multipart/form-data")) {
-                    const uploadedFile = await req.file();
-                    if (uploadedFile) {
-                        files = await RestifyFileConvertUploadFiles(uploadedFile);
+                    const fields = {};
+                    const parts = req.parts();
+                    for await (const part of parts) {
+                        if (part.type === "file") {
+                            const saved = await RestifyFileConvertUploadFiles(part);
+                            Object.assign(files, saved);
+                        }
+                        else if (part.type === "field") {
+                            const key = part.fieldname;
+                            const value = part.value;
+                            if (fields[key] !== undefined) {
+                                fields[key] = Array.isArray(fields[key])
+                                    ? [...fields[key], value]
+                                    : [fields[key], value];
+                            }
+                            else {
+                                fields[key] = value;
+                            }
+                        }
                     }
+                    // 将表单字段合并进 params
+                    params = { ...fields, ...params };
                 }
             }
             catch (error) {
-                // 如果文件处理出错，记录错误但不中断请求处理
                 console.warn("File upload processing error:", error);
             }
+            // 逗号分隔的属性，自动转换为 array（在合并字段之后处理）
+            for (const k of str2arr) {
+                if (params[k] && lodash_1.default.isString(params[k]))
+                    params[k] = params[k].split(",");
+            }
             // 将上传文件附加到 params 中
             return { ...params, ...files };
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-arpha.7",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {
@@ -10,7 +10,6 @@
     "build": "rm -rf ./dist/* && tsc",
     "test": "export NODE_ENV=test && jest ./src --coverage",
     "test:watch": "export NODE_ENV=test && jest ./src --watch",
-    "prepare": "husky install",
     "lint-staged": "lint-staged",
     "lint-staged:js": "eslint --no-warn-ignored src/**/*.ts",
     "loadDeps": "ts-node src/cli/index.ts loadDeps ./src/deps ts"
@@ -18,29 +17,33 @@
   "author": "Redstone Zhao",
   "license": "MIT",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.28.0",
+    "@babel/eslint-parser": "^7.28.6",
+    "@eslint/js": "^10.0.1",
+    "@types/async": "^3.2.25",
     "@types/jest": "^30.0.0",
-    "@types/node": "24.1.0",
-    "@typescript-eslint/eslint-plugin": "^8.38.0",
-    "@typescript-eslint/parser": "^8.38.0",
-    "codecov": "^3.8.3",
-    "eslint": "^9.32.0",
+    "@types/lodash": "^4.17.24",
+    "@types/node": "25.3.0",
+    "@types/validator": "^13.15.10",
+    "@types/ws": "^8.18.1",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
+    "eslint": "^10.0.1",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-alloy": "^5.1.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-prettier": "^5.5.3",
+    "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-unused-imports": "^4.1.4",
+    "eslint-plugin-unused-imports": "^4.4.1",
     "husky": "^9.1.7",
-    "jest": "^30.0.5",
-    "lint-staged": "^16.1.2",
-    "prettier": "^3.6.2",
-    "ts-jest": "^29.4.0",
+    "jest": "^30.2.0",
+    "lint-staged": "^16.2.7",
+    "prettier": "^3.8.1",
+    "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.3"
   },
   "prettier": {
     "printWidth": 100,
@@ -53,26 +56,23 @@
     ]
   },
   "dependencies": {
-    "@fastify/multipart": "^9.0.3",
-    "@types/async": "^3.2.25",
-    "@types/lodash": "^4.17.20",
-    "@types/validator": "^13.7.0",
-    "ajv": "^8.17.1",
+    "@fastify/multipart": "^9.4.0",
+    "ajv": "^8.18.0",
     "ajv-formats": "^3.0.1",
     "ajv-keywords": "^5.1.0",
     "async": "^3.2.6",
-    "cron-parser": "^4.1.0",
-    "csv-stringify": "^6.0.2",
-    "dayjs": "^1.11.13",
-    "fastify": "^5.4.0",
+    "cron-parser": "^5.5.0",
+    "csv-stringify": "^6.6.0",
+    "dayjs": "^1.11.19",
+    "fastify": "^5.7.4",
     "fastify-socket.io": "^5.1.0",
     "human-interval": "^2.0.1",
-    "ioredis": "^5.7.0",
-    "lodash": "^4.17.21",
-    "lru-cache": "^11.1.0",
-    "mysql2": "^3.14.3",
+    "ioredis": "^5.9.3",
+    "lodash": "^4.17.23",
+    "lru-cache": "^11.2.6",
+    "mysql2": "^3.17.4",
     "sequelize": "^6.37.7",
-    "socket.io": "^4.8.1",
+    "socket.io": "^4.8.3",
     "xlsx": "^0.18.5"
   }
 }