@hzab/data-model 2.0.3-alpha.0 → 2.1.0-alpha.0

package/package.json

@@ -1,63 +1,76 @@
 {
   "name": "@hzab/data-model",
-  "version": "2.0.3-alpha.0",
-  "description": "data model",
-  "main": "src",
-  "scripts": {
-    "dev": "npm run prepare && webpack serve -c ./config/webpack.config.js --env local",
-    "build": "webpack -c ./config/webpack.config.js --env production",
-    "version:alpha": "npm version prerelease --preid=alpha",
-    "publish:alpha": "npm publish --tag alpha",
-    "version:beta": "npm version prerelease --preid=beta",
-    "publish:beta": "npm publish --tag beta",
-    "version:patch": "npm version patch",
-    "version:minior": "npm version minor",
-    "version:major": "npm version major",
-    "publish:stable": "npm publish --access public",
-    "prepare": "husky install",
-    "docs": "typedoc"
+  "version": "2.1.0-alpha.0",
+  "private": false,
+  "description": "数据模型 2.1：再导出 core + useDataModel；后继 API 与旧写法双轨",
+  "type": "module",
+  "license": "MIT",
+  "author": "CaiYansong",
+  "publishConfig": {
+    "access": "public"
   },
   "files": [
+    "dist",
     "src",
+    "README.md",
+    "LICENSE",
     "CHANGELOG.md"
   ],
-  "keywords": [],
-  "author": "CaiYansong",
-  "license": "ISC",
-  "devDependencies": {
-    "@hzab/permissions": "^0.1.1",
-    "@hzab/webpack-config": "^0.7.1",
-    "@types/react": "^17.0.62",
-    "@types/react-dom": "^17.0.20",
-    "antd": "4.24.16",
-    "axios": "1.13.6",
-    "eslint": "^8.30.0",
-    "js-cookie": "^3.0.5",
-    "less": "^4.1.3",
-    "mobx": "^6.7.0",
-    "mobx-react": "^7.6.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router-dom": "^6.14.1",
-    "typedoc": "^0.24.8",
-    "typescript": "^4.9.4"
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./package.json": "./package.json"
+  },
+  "sideEffects": [
+    "./dist/index.js",
+    "./dist/index.cjs"
+  ],
+  "dependencies": {
+    "axios": "^1.18.1",
+    "nanoid": "^3.3.15"
+  },
+  "engines": {
+    "node": ">=24"
   },
   "peerDependencies": {
-    "axios": ">=1.6.2",
-    "js-cookie": ">=3.0.5"
+    "js-cookie": "^3.0.5",
+    "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
   },
-  "dependencies": {
-    "dayjs": "^1.11.7",
-    "axios": ">=1.6.2",
-    "js-cookie": ">=3.0.5",
-    "nanoid": "^3.3.7"
+  "peerDependenciesMeta": {
+    "js-cookie": {
+      "optional": true
+    }
   },
-  "directories": {
-    "lib": "lib"
+  "devDependencies": {
+    "@testing-library/react": "^16.3.3",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^24.0.0",
+    "@types/react": "^19.0.0",
+    "happy-dom": "^20.11.12",
+    "lodash-es": "^4.18.1",
+    "prettier": "^3.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.2.8",
+    "tsup": "^8.5.1",
+    "typescript": "^5.9.3",
+    "vite": "^8.0.0",
+    "vitest": "^4.1.10",
+    "@hzab/data-model-core": "^2.1.0-alpha.0",
+    "@hzab/eslint-config": "^0.0.0",
+    "@hzab/vite-config": "^0.0.2-alpha.0",
+    "@hzab/typescript-config": "^0.0.0"
   },
-  "lint-staged": {
-    "**.{js,jsx,ts,tsx,css,scss,less,json,html}": [
-      "prettier --write"
-    ]
+  "scripts": {
+    "build": "tsup",
+    "typecheck": "tsc --noEmit -p tsconfig.json --rootDir .",
+    "test": "vitest run",
+    "lint": "eslint src --max-warnings=0",
+    "format:check": "prettier --check src"
   }
-}
+}

package/src/hooks.ts

@@ -1,38 +1,42 @@
-import { useMemo, useRef } from "react";
-import { merge } from "lodash";
-import DataModel, { DataModelOptions } from "./data-model";
-
-/**
- * useDataModel 选项接口
- */
-export interface UseDataModelOptions<T = any> {
-  /** 动态数据监听的目标 */
-  effectTargets?: any[];
-  /** 动态的 params 数据，包含了 query */
-  effectParams?: Partial<DataModelOptions<T>>;
-  /** 动态的 query 数据 */
-  effectQuery?: DataModelOptions<T>["query"];
-}
-
-/**
- * 解决 hooks 重复实例化导致 query 丢失的问题
- * @param {Object} initParams 初始参数
- * @param {Object} opt
- * @param {Object} opt.effectTargets 动态数据监听的目标
- * @param {Object} opt.effectParams 动态的 params 数据，包含了 query
- * @param {Object} opt.effectQuery 动态的 query 数据
- * @returns DataModel 实例
- */
-export const useDataModel = function <T = any>(initParams: DataModelOptions<T> = {}, opt: UseDataModelOptions<T> = {}) {
-  const model = useRef<DataModel<T>>(new DataModel(initParams));
-  return useMemo(() => {
-    const { effectParams, effectQuery } = opt || {};
-    if (effectParams) {
-      merge(model.current, effectParams);
-    }
-    if (effectQuery) {
-      merge(model.current.query, effectQuery);
-    }
-    return model.current;
-  }, opt.effectTargets || []);
-};
+import { useMemo, useRef } from "react";
+import { merge } from "lodash-es";
+import DataModel from "@hzab/data-model-core";
+import type { DataModelOptions } from "@hzab/data-model-core";
+
+/**
+ * useDataModel 选项接口
+ */
+export interface UseDataModelOptions<T = any> {
+  /** 动态数据监听的目标 */
+  effectTargets?: any[];
+  /** 动态的 params 数据，包含了 query */
+  effectParams?: Partial<DataModelOptions<T>>;
+  /** 动态的 query 数据 */
+  effectQuery?: DataModelOptions<T>["query"];
+}
+
+/**
+ * 解决 hooks 重复实例化导致 query 丢失的问题
+ * @param {Object} initParams 初始参数
+ * @param {Object} opt
+ * @param {Object} opt.effectTargets 动态数据监听的目标
+ * @param {Object} opt.effectParams 动态的 params 数据，包含了 query
+ * @param {Object} opt.effectQuery 动态的 query 数据
+ * @returns DataModel 实例
+ */
+export const useDataModel = function <T = any>(
+  initParams: DataModelOptions<T> = {},
+  opt: UseDataModelOptions<T> = {},
+) {
+  const model = useRef<DataModel<T>>(new DataModel<T>(initParams));
+  return useMemo(() => {
+    const { effectParams, effectQuery } = opt || {};
+    if (effectParams) {
+      merge(model.current, effectParams);
+    }
+    if (effectQuery) {
+      merge(model.current.query, effectQuery);
+    }
+    return model.current;
+  }, opt.effectTargets || []);
+};

package/src/index.ts

@@ -1,11 +1,14 @@
-import axios from "./axios";
-import DataModel from "./data-model";
-
-export * from "./axios";
-export * from "./data-model";
-export * from "./hooks";
-export * from "./type";
-
-export { axios, DataModel };
-
-export default DataModel;
+/**
+ * 数据模型 2.1：再导出 `@hzab/data-model-core`（打进 dist，不单独发布），
+ * 并提供 `useDataModel`。后继 API 与旧写法双轨。
+ *
+ * 老页面 `import { useDataModel, DataModel, axios } from "@hzab/data-model"` 仍可用。
+ * 不要安装 `@hzab/data-model-core`（private，已被打进本包 dist）。
+ *
+ * @packageDocumentation
+ */
+
+export * from "@hzab/data-model-core";
+export { useDataModel } from "./hooks";
+export type { UseDataModelOptions } from "./hooks";
+export { default } from "@hzab/data-model-core";