@retikz/core 0.0.1-rc.1 → 0.0.1-rc.2

package/dist/es/components/Scope.js

@@ -1,10 +1,11 @@
 import { jsx } from "react/jsx-runtime";
 import { forwardRef } from "react";
-import { ScopeContext } from "../hooks/context/useScope.js";
+import useScope, { ScopeContext } from "../hooks/context/useScope.js";
 import Group from "../container/Group.js";
 const Scope = forwardRef((props, ref) => {
   const { children, ...resProps } = props;
-  return /* @__PURE__ */ jsx(ScopeContext.Provider, { value: resProps, children: /* @__PURE__ */ jsx(Group, { ref, children }) });
+  const baseScopeValue = useScope();
+  return /* @__PURE__ */ jsx(ScopeContext.Provider, { value: { ...baseScopeValue, ...resProps }, children: /* @__PURE__ */ jsx(Group, { ref, children }) });
 });
 export {
   Scope as default

package/dist/es/components/draw/arrow/circle.d.ts

@@ -0,0 +1,7 @@
+import { ArrowAttributes } from './types';
+declare const getCirclePath: (attributes: ArrowAttributes) => {
+    d: string;
+    offsetDistance: number;
+    insertDistance: number;
+};
+export default getCirclePath;

package/dist/es/components/draw/arrow/circle.js

@@ -0,0 +1,20 @@
+const getCirclePath = (attributes) => {
+  const {
+    width = 5,
+    left = false,
+    right = false,
+    scale = 1
+  } = attributes;
+  const radius = width / 2 * scale;
+  const diameter = width * scale;
+  const startPoint = [0, 0];
+  const path = `M ${startPoint.join(",")} ` + (left ? `A ${radius},${radius} 0 1,0 ${-diameter},0 Z` : right ? `A ${radius},${radius} 0 1,1 ${-diameter},0 Z` : `A ${radius},${radius} 0 1,0 ${-diameter},0A ${radius},${radius} 0 1,0 ${startPoint.join(",")} Z`);
+  return {
+    d: path,
+    offsetDistance: radius,
+    insertDistance: radius
+  };
+};
+export {
+  getCirclePath as default
+};

package/dist/es/components/draw/arrow/index.d.ts

@@ -1,6 +1,6 @@
 import { ArrowAttributes, ArrowPathConfig } from './types';
 export type { ArrowAttributes as ArrowPositionAttributes, ArrowPathConfig };
-export type ArrowType = 'Stealth';
+export type ArrowType = 'Stealth' | 'Circle';
 declare const getArrowPath: (type: ArrowType, attributes: ArrowAttributes) => {
     d: string;
     offsetDistance: number;

package/dist/es/components/draw/arrow/index.js

@@ -1,8 +1,11 @@
+import getCirclePath from "./circle.js";
 import getStealthPath from "./stealth.js";
 const getArrowPath = (type, attributes) => {
   switch (type) {
     case "Stealth":
       return getStealthPath(attributes);
+    case "Circle":
+      return getCirclePath(attributes);
   }
 };
 export {

package/dist/es/components/draw/common.js

@@ -2,7 +2,7 @@ const offsetReg = /\+[[(]?[+-]?\d+(?:\.\d+)?,\s*[+-]?\d+(?:\.\d+)?[)\]]?/;
 const moveReg = /\+\+[[(]?[+-]?\d+(?:\.\d+)?,\s*[+-]?\d+(?:\.\d+)?[)\]]?/;
 const getDrawPointType = (point) => {
   if (typeof point !== "string") return "coordinate";
-  if (["-|", "|-"].includes(point)) return "vertical";
+  if (["-|", "|-", "-|-", "|-|"].includes(point)) return "vertical";
   if (point.match(moveReg)) return "move";
   if (point.match(offsetReg)) return "offset";
   return "node";

package/dist/es/components/draw/segment/useConvertWay.d.ts

@@ -5,7 +5,7 @@ import { DrawWaySegmentType } from '../types';
 /** 将坐标格式转换为笛卡尔坐标数组形式 */
 export declare const formatPointPosition: (point: PointPosition) => Position;
 /** 获取两点间的垂直点 */
-export declare const getVerticalPoint: (point1: PointPosition, point2: PointPosition, type: "-|" | "|-") => Position;
+export declare const getVerticalPoint: (point1: PointPosition, point2: PointPosition, type: "-|" | "|-" | "-|-" | "|-|") => Position | Position[];
 /**
  * 将特殊路径点转换为坐标，Node 节点转换为对应的 Model
  * 目前支持的节点类型：node，各种坐标，垂点，位移点

package/dist/es/components/draw/segment/useConvertWay.js

@@ -15,7 +15,13 @@ const formatPointPosition = (point) => {
 const getVerticalPoint = (point1, point2, type) => {
   const p1 = formatPointPosition(point1);
   const p2 = formatPointPosition(point2);
-  return type === "-|" ? [p2[0], p1[1]] : [p1[0], p2[1]];
+  if (["-|", "|-"].includes(type)) return type === "-|" ? [p2[0], p1[1]] : [p1[0], p2[1]];
+  if (type === "-|-") {
+    const centerX = (p1[0] + p2[0]) / 2;
+    return [[centerX, p1[1]], [centerX, p2[1]]];
+  }
+  const centerY = (p1[1] + p2[1]) / 2;
+  return [[p1[0], centerY], [p2[0], centerY]];
 };
 const convertOffsetAndMovePoint = (point) => {
   const filterPoint = point.replace(/[+()[\]\s]/g, "");
@@ -37,13 +43,13 @@ const useConvertWay = (way) => {
   const subscribeCbs = [];
   let allNodeInit = true;
   const result = useMemo(
-    () => way.map((item, index) => {
+    () => way.reduce((acc, item, index) => {
       const type = getDrawPointType(item);
       switch (type) {
         case "coordinate": {
           const corPosition = formatPointPosition(item);
           cursor = corPosition;
-          return corPosition;
+          return acc.concat(corPosition);
         }
         case "node": {
           if (![0, way.length - 1].includes(index)) {
@@ -59,7 +65,7 @@ const useConvertWay = (way) => {
           });
           if (cb) subscribeCbs.push(cb);
           cursor = nodeModel.center;
-          return nodeModel;
+          return acc.concat(nodeModel);
         }
         case "vertical": {
           if ([0, way.length - 1].includes(index)) {
@@ -73,18 +79,23 @@ const useConvertWay = (way) => {
           }
           const afterPosition = afterPointType === "node" ? tryGetModel(afterPoint).center : formatPointPosition(afterPoint);
           const verPosition = getVerticalPoint(beforePosition, afterPosition, item);
+          if (Array.isArray(verPosition[0])) {
+            const realVerPosition = verPosition;
+            cursor = realVerPosition[realVerPosition.length - 1];
+            return acc.concat(realVerPosition);
+          }
           cursor = verPosition;
-          return cursor;
+          return acc.concat(verPosition);
         }
         default: {
           if (index === 0) throw new Error("offset/move point can not be the first point on path.");
           const convertedPos = convertOffsetAndMovePoint(item);
           const curPos = DescartesPoint.plus(convertedPos, cursor);
           if (type === "move") cursor = curPos;
-          return curPos;
+          return acc.concat(curPos);
         }
       }
-    }),
+    }, []),
     [way, nodeUpdateCount.current]
   );
   useLayoutEffect(() => () => {

package/dist/es/components/draw/types.d.ts

@@ -7,7 +7,7 @@ export type ArrowConfig = {
     fill?: string;
 } & ArrowPositionAttributes & StrokeProps;
 /** 垂直路径点，临近的节点不能都是特殊路径点 */
-export type VerticalDrawPosition = '-|' | '|-';
+export type VerticalDrawPosition = '-|' | '|-' | '-|-' | '|-|';
 /** 偏移与移动点 */
 export type OffSetOrMovePosition = string;
 /** 路径点类型：节点，坐标，垂点，偏移点，移动点 */

package/dist/es/model/equation/line.js

@@ -8,6 +8,7 @@ const _Line = class _Line {
     __publicField(this, "b", 0);
     __publicField(this, "c", 0);
     if (a === 0 && b === 0) {
+      console.error("invalid line equation");
       return;
     }
     this.a = a;

package/dist/lib/components/Scope.cjs

@@ -6,6 +6,7 @@ const useScope = require("../hooks/context/useScope.cjs");
 const Group = require("../container/Group.cjs");
 const Scope = react.forwardRef((props, ref) => {
   const { children, ...resProps } = props;
-  return /* @__PURE__ */ jsxRuntime.jsx(useScope.ScopeContext.Provider, { value: resProps, children: /* @__PURE__ */ jsxRuntime.jsx(Group.default, { ref, children }) });
+  const baseScopeValue = useScope.default();
+  return /* @__PURE__ */ jsxRuntime.jsx(useScope.ScopeContext.Provider, { value: { ...baseScopeValue, ...resProps }, children: /* @__PURE__ */ jsxRuntime.jsx(Group.default, { ref, children }) });
 });
 exports.default = Scope;

package/dist/lib/components/draw/arrow/circle.cjs

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const getCirclePath = (attributes) => {
+  const {
+    width = 5,
+    left = false,
+    right = false,
+    scale = 1
+  } = attributes;
+  const radius = width / 2 * scale;
+  const diameter = width * scale;
+  const startPoint = [0, 0];
+  const path = `M ${startPoint.join(",")} ` + (left ? `A ${radius},${radius} 0 1,0 ${-diameter},0 Z` : right ? `A ${radius},${radius} 0 1,1 ${-diameter},0 Z` : `A ${radius},${radius} 0 1,0 ${-diameter},0A ${radius},${radius} 0 1,0 ${startPoint.join(",")} Z`);
+  return {
+    d: path,
+    offsetDistance: radius,
+    insertDistance: radius
+  };
+};
+exports.default = getCirclePath;

package/dist/lib/components/draw/arrow/circle.d.ts

@@ -0,0 +1,7 @@
+import { ArrowAttributes } from './types';
+declare const getCirclePath: (attributes: ArrowAttributes) => {
+    d: string;
+    offsetDistance: number;
+    insertDistance: number;
+};
+export default getCirclePath;

package/dist/lib/components/draw/arrow/index.cjs

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const circle = require("./circle.cjs");
 const stealth = require("./stealth.cjs");
 const getArrowPath = (type, attributes) => {
   switch (type) {
     case "Stealth":
       return stealth.default(attributes);
+    case "Circle":
+      return circle.default(attributes);
   }
 };
 exports.default = getArrowPath;

package/dist/lib/components/draw/arrow/index.d.ts

@@ -1,6 +1,6 @@
 import { ArrowAttributes, ArrowPathConfig } from './types';
 export type { ArrowAttributes as ArrowPositionAttributes, ArrowPathConfig };
-export type ArrowType = 'Stealth';
+export type ArrowType = 'Stealth' | 'Circle';
 declare const getArrowPath: (type: ArrowType, attributes: ArrowAttributes) => {
     d: string;
     offsetDistance: number;

package/dist/lib/components/draw/common.cjs

@@ -4,7 +4,7 @@ const offsetReg = /\+[[(]?[+-]?\d+(?:\.\d+)?,\s*[+-]?\d+(?:\.\d+)?[)\]]?/;
 const moveReg = /\+\+[[(]?[+-]?\d+(?:\.\d+)?,\s*[+-]?\d+(?:\.\d+)?[)\]]?/;
 const getDrawPointType = (point) => {
   if (typeof point !== "string") return "coordinate";
-  if (["-|", "|-"].includes(point)) return "vertical";
+  if (["-|", "|-", "-|-", "|-|"].includes(point)) return "vertical";
   if (point.match(moveReg)) return "move";
   if (point.match(offsetReg)) return "offset";
   return "node";

package/dist/lib/components/draw/segment/useConvertWay.cjs

@@ -17,7 +17,13 @@ const formatPointPosition = (point) => {
 const getVerticalPoint = (point1, point2, type) => {
   const p1 = formatPointPosition(point1);
   const p2 = formatPointPosition(point2);
-  return type === "-|" ? [p2[0], p1[1]] : [p1[0], p2[1]];
+  if (["-|", "|-"].includes(type)) return type === "-|" ? [p2[0], p1[1]] : [p1[0], p2[1]];
+  if (type === "-|-") {
+    const centerX = (p1[0] + p2[0]) / 2;
+    return [[centerX, p1[1]], [centerX, p2[1]]];
+  }
+  const centerY = (p1[1] + p2[1]) / 2;
+  return [[p1[0], centerY], [p2[0], centerY]];
 };
 const convertOffsetAndMovePoint = (point) => {
   const filterPoint = point.replace(/[+()[\]\s]/g, "");
@@ -39,13 +45,13 @@ const useConvertWay = (way) => {
   const subscribeCbs = [];
   let allNodeInit = true;
   const result = react.useMemo(
-    () => way.map((item, index) => {
+    () => way.reduce((acc, item, index) => {
       const type = common.getDrawPointType(item);
       switch (type) {
         case "coordinate": {
           const corPosition = formatPointPosition(item);
           cursor = corPosition;
-          return corPosition;
+          return acc.concat(corPosition);
         }
         case "node": {
           if (![0, way.length - 1].includes(index)) {
@@ -61,7 +67,7 @@ const useConvertWay = (way) => {
           });
           if (cb) subscribeCbs.push(cb);
           cursor = nodeModel.center;
-          return nodeModel;
+          return acc.concat(nodeModel);
         }
         case "vertical": {
           if ([0, way.length - 1].includes(index)) {
@@ -75,18 +81,23 @@ const useConvertWay = (way) => {
           }
           const afterPosition = afterPointType === "node" ? tryGetModel(afterPoint).center : formatPointPosition(afterPoint);
           const verPosition = getVerticalPoint(beforePosition, afterPosition, item);
+          if (Array.isArray(verPosition[0])) {
+            const realVerPosition = verPosition;
+            cursor = realVerPosition[realVerPosition.length - 1];
+            return acc.concat(realVerPosition);
+          }
           cursor = verPosition;
-          return cursor;
+          return acc.concat(verPosition);
         }
         default: {
           if (index === 0) throw new Error("offset/move point can not be the first point on path.");
           const convertedPos = convertOffsetAndMovePoint(item);
           const curPos = DescartesPoint.default.plus(convertedPos, cursor);
           if (type === "move") cursor = curPos;
-          return curPos;
+          return acc.concat(curPos);
         }
       }
-    }),
+    }, []),
     [way, nodeUpdateCount.current]
   );
   react.useLayoutEffect(() => () => {

package/dist/lib/components/draw/segment/useConvertWay.d.ts

@@ -5,7 +5,7 @@ import { DrawWaySegmentType } from '../types';
 /** 将坐标格式转换为笛卡尔坐标数组形式 */
 export declare const formatPointPosition: (point: PointPosition) => Position;
 /** 获取两点间的垂直点 */
-export declare const getVerticalPoint: (point1: PointPosition, point2: PointPosition, type: "-|" | "|-") => Position;
+export declare const getVerticalPoint: (point1: PointPosition, point2: PointPosition, type: "-|" | "|-" | "-|-" | "|-|") => Position | Position[];
 /**
  * 将特殊路径点转换为坐标，Node 节点转换为对应的 Model
  * 目前支持的节点类型：node，各种坐标，垂点，位移点

package/dist/lib/components/draw/types.d.ts

@@ -7,7 +7,7 @@ export type ArrowConfig = {
     fill?: string;
 } & ArrowPositionAttributes & StrokeProps;
 /** 垂直路径点，临近的节点不能都是特殊路径点 */
-export type VerticalDrawPosition = '-|' | '|-';
+export type VerticalDrawPosition = '-|' | '|-' | '-|-' | '|-|';
 /** 偏移与移动点 */
 export type OffSetOrMovePosition = string;
 /** 路径点类型：节点，坐标，垂点，偏移点，移动点 */

package/dist/lib/model/equation/line.cjs

@@ -10,6 +10,7 @@ const _Line = class _Line {
     __publicField(this, "b", 0);
     __publicField(this, "c", 0);
     if (a === 0 && b === 0) {
+      console.error("invalid line equation");
       return;
     }
     this.a = a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retikz/core",
-  "version": "0.0.1-rc.1",
+  "version": "0.0.1-rc.2",
   "description": "atomic drawing library implemented using react and d3, inspired by tikz",
   "type": "module",
   "homepage": "https://pionpill.github.io/retikz.doc/",
@@ -22,12 +22,6 @@
     "README.md",
     "dist/**/*"
   ],
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "lint": "eslint .",
-    "preview": "vite preview"
-  },
   "peerDependencies": {
     "react": ">=18",
     "react-dom": ">=18"
@@ -54,5 +48,11 @@
     "typescript-eslint": "^8.15.0",
     "vite": "^6.0.1",
     "vite-plugin-dts": "^4.5.0"
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "lint": "eslint .",
+    "preview": "vite preview"
   }
-}
+}