@ccpc/platform 0.1.10 → 0.1.12

package/index.js

@@ -1,6 +1,6 @@
 import { DefaultController as V, CCanvas as b } from "@ccpc/canvas";
 import { ClassManager as O, DebugUtil as E, TmpElementPainter as M, GPoint2d as R, GCurve2d as S, GPolycurve as B, GPolygon as F, GText2d as K, ElementId as X, GNODE_TYPE as D, GRep as U } from "@ccpc/core";
-import { Ln2 as P, Vec2 as m, CONST as w, alg as j, Arc2 as z, Plane as W, Vec3 as q } from "@ccpc/math";
+import { Ln2 as m, Vec2 as P, CONST as w, alg as j, Arc2 as z, Plane as W, Vec3 as q } from "@ccpc/math";
 import { SnapSetting as y, EN_SNAP_TYPE as a, EN_SNAP_HELP_OBJ as v, SnapEngine as Y, SnapCandidates as J, PtSnap as x, SnapContext as $ } from "@ccpc/snap";
 class k {
   constructor() {
@@ -78,13 +78,13 @@ class N extends V {
    * 获取画布
    */
   getCanvas() {
-    return p.getCanvas();
+    return d.getCanvas();
   }
   /**
    * 获取文档
    */
   getDoc() {
-    return p.doc;
+    return d.doc;
   }
   /**
    * 执行动作
@@ -161,6 +161,7 @@ class N extends V {
    * 清除所有绘制的临时元素
    */
   clearTmp() {
+    d.highLight.clear();
     for (const e of this._tmpElementPainters)
       e && e.clearTmp();
   }
@@ -174,7 +175,7 @@ class N extends V {
    * 结束cmd
    */
   _resolve(e) {
-    this._status.finish || (this._status.finish = !0, this._status.resolve(e), this.onDestroy());
+    this.clearTmp(), !this._status.finish && (this._status.finish = !0, this._status.resolve(e), this.onDestroy());
   }
   onKeyDown(e) {
     return e.domEvent.key === "Escape" ? (this.cancel(), !0) : !1;
@@ -209,17 +210,17 @@ class T {
 class Z extends N {
   onMouseMove(e) {
     const t = T.pickGNode(this.getCanvas(), e.pos);
-    return t ? (p.highLight.reset([t]), this._updateView(), !1) : (p.highLight.clear(), this._updateView(), !1);
+    return t ? (d.highLight.reset([t]), this._updateView(), !1) : (d.highLight.clear(), this._updateView(), !1);
   }
   onClick(e) {
     const t = T.pickGNode(this.getCanvas(), e.pos);
-    return p.highLight.clear(), !t && !e.fnKey.ctrlKey ? (p.selection.clear(), this._updateView(), !1) : (t && (e.fnKey.ctrlKey ? p.selection.add([t]) : p.selection.reset([t]), this._updateView()), !1);
+    return d.highLight.clear(), !t && !e.fnKey.ctrlKey ? (d.selection.clear(), this._updateView(), !1) : (t && (e.fnKey.ctrlKey ? d.selection.add([t]) : d.selection.reset([t]), this._updateView()), !1);
   }
   onRButtonDown(e) {
-    return p.highLight.clear(), p.selection.clear(), this._updateView(), !1;
+    return d.highLight.clear(), d.selection.clear(), this._updateView(), !1;
   }
   onKeyDown(e) {
-    return e.domEvent.key !== "Escape" ? !1 : (p.highLight.clear(), p.selection.clear(), this._updateView(), !0);
+    return e.domEvent.key !== "Escape" ? !1 : (d.highLight.clear(), d.selection.clear(), this._updateView(), !0);
   }
 }
 class A {
@@ -379,6 +380,9 @@ class G {
   constructor() {
     this._cmdMgr = Q, this.selection = f.instance(), this.highLight = u.instance();
   }
+  get cmdMgr() {
+    return this._cmdMgr;
+  }
   static instance() {
     return this._instance || (this._instance = new G()), this._instance;
   }
@@ -405,7 +409,7 @@ class G {
     return this._curCanvas = s, this._curDoc && this._curCanvas.resetModelView(this._curDoc.modelView), this._curCanvas.startListening(), s;
   }
 }
-const p = G.instance();
+const d = G.instance();
 var C = /* @__PURE__ */ ((n) => (n[n.OK = 0] = "OK", n[n.CANCEL = 1] = "CANCEL", n))(C || {});
 class L {
   constructor(e, t) {
@@ -511,16 +515,16 @@ class h {
     return t;
   }
 }
-var d = /* @__PURE__ */ ((n) => (n[n.POINT_ON_FACE = 1842204] = "POINT_ON_FACE", n[n.END_POINT = 4063173] = "END_POINT", n[n.POINT_ON_CURVE = 1842204] = "POINT_ON_CURVE", n[n.MIDDLE_POINT = 4063173] = "MIDDLE_POINT", n[n.PARALLEL_TO_AXIS = 4063173] = "PARALLEL_TO_AXIS", n[n.INTERSECT_POINT = 4063173] = "INTERSECT_POINT", n[n.VERTICAL_PARALLEL = 4063173] = "VERTICAL_PARALLEL", n))(d || {});
+var p = /* @__PURE__ */ ((n) => (n[n.POINT_ON_FACE = 1842204] = "POINT_ON_FACE", n[n.END_POINT = 4063173] = "END_POINT", n[n.POINT_ON_CURVE = 1842204] = "POINT_ON_CURVE", n[n.MIDDLE_POINT = 4063173] = "MIDDLE_POINT", n[n.PARALLEL_TO_AXIS = 4063173] = "PARALLEL_TO_AXIS", n[n.INTERSECT_POINT = 4063173] = "INTERSECT_POINT", n[n.VERTICAL_PARALLEL = 4063173] = "VERTICAL_PARALLEL", n))(p || {});
 const H = 200;
 function se(n, e) {
   if (!y.instance().canSnapHelperObject || !n?.pickedGNodes?.length)
     return;
   const t = (/* @__PURE__ */ new Date()).getTime();
   if (n && (n.snapType === a.MiddlePoint || n.snapType === a.EndPoint) && t - e > H && n.pickedPlane) {
-    const s = n.pickedPlane.getUVAt(n.point), i = new P(s, m.X(), [-w.MODEL_MAX_LENGTH, w.MODEL_MAX_LENGTH]);
+    const s = n.pickedPlane.getUVAt(n.point), i = new m(s, P.X(), [-w.MODEL_MAX_LENGTH, w.MODEL_MAX_LENGTH]);
     i.userData = { snapType: a.ReferCurve, lastPickedPt: s.clone() };
-    const r = new P(s, m.Y(), [-w.MODEL_MAX_LENGTH, w.MODEL_MAX_LENGTH]);
+    const r = new m(s, P.Y(), [-w.MODEL_MAX_LENGTH, w.MODEL_MAX_LENGTH]);
     r.userData = { snapType: a.ReferCurve, lastPickedPt: s.clone() }, h.instance().addSnapHelperCurves(_.BRIEF, [i, r]);
   }
 }
@@ -532,18 +536,18 @@ function ne(n, e, t) {
     return;
   const i = n.pickedGNodes[0];
   let r;
-  if (i.getType() === D.GCurve2d && i.geo instanceof P)
+  if (i.getType() === D.GCurve2d && i.geo instanceof m)
     r = i.geo;
   else if (i.getType() === D.GPolycurve) {
     const g = i.geo.getAllCurves();
-    g.length === 1 && g[0] instanceof P && (r = g[0]);
+    g.length === 1 && g[0] instanceof m && (r = g[0]);
   }
   if (!r)
     return;
   const c = r.getDirection().clone();
   if (c.userData = { refCurve: r }, h.instance().addSnapHelperDirs(_.BRIEF, c), !t)
     return;
-  const l = new m();
+  const l = new P();
   if (j.D.ptToCurve2d(t, r, l), l.equals(t))
     return;
   const o = l.subtracted(t).normalize();
@@ -583,11 +587,11 @@ function I(n, e) {
     return;
   const t = W.XOY();
   for (const s of n.getSnappedObjects())
-    if (s instanceof P && s.userData?.snapType === a.ReferCurve && s.userData?.lastPickedPt) {
-      const i = s.userData.lastPickedPt, r = new P(i, n.snappedPt);
-      let c = d.PARALLEL_TO_AXIS;
+    if (s instanceof m && s.userData?.snapType === a.ReferCurve && s.userData?.lastPickedPt) {
+      const i = s.userData.lastPickedPt, r = new m(i, n.snappedPt);
+      let c = p.PARALLEL_TO_AXIS;
       const l = r.getDirection();
-      l.isParallel(m.X()) ? c = 16711680 : l.isParallel(m.Y()) && (c = 65280);
+      l.isParallel(P.X()) ? c = 16711680 : l.isParallel(P.Y()) && (c = 65280);
       const o = new S(t, r);
       o.setStyle({
         line: {
@@ -598,7 +602,7 @@ function I(n, e) {
       const g = new R(t, i.clone());
       g.setStyle({
         point: {
-          color: d.PARALLEL_TO_AXIS,
+          color: p.PARALLEL_TO_AXIS,
           size: 6
         }
       }), e.addNode(g);
@@ -606,7 +610,7 @@ function I(n, e) {
       const i = s.userData.refCurve, r = new S(t, i);
       r.setStyle({
         line: {
-          color: d.VERTICAL_PARALLEL
+          color: p.VERTICAL_PARALLEL
         }
       }), e.addNode(r);
     }
@@ -639,38 +643,38 @@ class ce {
     if (!(t instanceof x))
       return;
     const s = new U();
-    let i = d.POINT_ON_FACE;
+    let i = p.POINT_ON_FACE;
     switch (t.getSnapType()) {
       case a.Pole:
       case a.EndPoint:
-        i = d.END_POINT;
+        i = p.END_POINT;
         break;
       case a.MiddlePoint:
       case a.Center:
-        i = d.MIDDLE_POINT;
+        i = p.MIDDLE_POINT;
         break;
       case a.ExtensionPoint:
       case a.ParallelToX:
       case a.ParallelToY:
-        i = d.PARALLEL_TO_AXIS;
+        i = p.PARALLEL_TO_AXIS;
         break;
       case a.PointOnCurve:
-        i = d.POINT_ON_CURVE;
+        i = p.POINT_ON_CURVE;
         break;
       case a.ClosedLineParallelToX:
       case a.ClosedLineParallelToY:
-        i = d.PARALLEL_TO_AXIS;
+        i = p.PARALLEL_TO_AXIS;
         break;
       case a.XPt:
-        i = d.INTERSECT_POINT;
+        i = p.INTERSECT_POINT;
         break;
       case a.ReferCurve:
-        I(t, s), i = d.POINT_ON_CURVE;
+        I(t, s), i = p.POINT_ON_CURVE;
         break;
       case a.PerpendicularPoint:
       case a.ParallelToCurve:
       case a.VerticalToCurve:
-        I(t, s), i = d.VERTICAL_PARALLEL;
+        I(t, s), i = p.VERTICAL_PARALLEL;
         break;
     }
     if (t.anotherSnapType)
@@ -688,7 +692,7 @@ class ce {
 }
 class ue extends te {
   constructor(e = new ae()) {
-    super(), this._currentMousePos = m.O(), this._hoverSnappedPtTime = Date.now(), this._hoverPickedGNodeTime = Date.now(), this._context = e, e.snapContext && e.snapContext.addSnapHelpers(
+    super(), this._currentMousePos = P.O(), this._hoverSnappedPtTime = Date.now(), this._hoverPickedGNodeTime = Date.now(), this._context = e, e.snapContext && e.snapContext.addSnapHelpers(
       v.POINT,
       h.instance().getAllSnapHelperPoints()
     );
@@ -784,7 +788,7 @@ export {
   ce as RunSnapUtil,
   f as Selection,
   h as SnapHelpMgr,
-  p as app,
+  d as app,
   Q as cmdMgr,
   se as createReferenceCurves,
   ne as createReferenceDirs,

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@ccpc/platform",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Platform command interaction layer for editor",
   "license": "MIT",
   "type": "module",
   "main": "./index.js",
   "types": "./types/index.d.ts",
   "peerDependencies": {
-    "@ccpc/canvas": "^0.1.10",
-    "@ccpc/core": "^0.1.13",
-    "@ccpc/math": "^0.1.16",
-    "@ccpc/snap": "^0.1.10"
+    "@ccpc/canvas": "^0.1.12",
+    "@ccpc/core": "^0.1.15",
+    "@ccpc/math": "^0.1.18",
+    "@ccpc/snap": "^0.1.12"
   }
 }

package/types/app/app.d.ts

@@ -10,6 +10,7 @@ export declare class App {
     selection: Selection;
     highLight: HighLight;
     constructor();
+    get cmdMgr(): import("..").CmdMgr;
     static instance(): App;
     get doc(): IDocument;
     start(doc: IDocument): void;

package/types/app/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAiB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAa,SAAS,EAAE,MAAM,YAAY,CAAC;AAGlD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,qBAAa,GAAG;IACZ,OAAO,CAAC,MAAM,CAAC,SAAS,CAAK;IAE7B,OAAO,CAAC,OAAO,CAAC,CAAW;IAE3B,OAAO,CAAC,UAAU,CAAC,CAAS;IAE5B,OAAO,CAAC,OAAO,CAAS;IAEjB,SAAS,EAAE,SAAS,CAAA;IAEpB,SAAS,EAAE,SAAS,CAAA;;WAOb,QAAQ;IAOtB,IAAW,GAAG,cAGb;IAEM,KAAK,CAAC,GAAG,EAAE,SAAS;IAOpB,IAAI;IASX;;OAEG;IACI,SAAS;IAIhB;;OAEG;IACI,YAAY,CAAC,SAAS,EAAE,WAAW;CAQ7C;AAED,eAAO,MAAM,GAAG,KAAiB,CAAA"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAiB,MAAM,cAAc,CAAC;AACtD,OAAO,EAAa,SAAS,EAAE,MAAM,YAAY,CAAC;AAGlD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,qBAAa,GAAG;IACZ,OAAO,CAAC,MAAM,CAAC,SAAS,CAAK;IAE7B,OAAO,CAAC,OAAO,CAAC,CAAW;IAE3B,OAAO,CAAC,UAAU,CAAC,CAAS;IAE5B,OAAO,CAAC,OAAO,CAAS;IAEjB,SAAS,EAAE,SAAS,CAAA;IAEpB,SAAS,EAAE,SAAS,CAAA;;IAO3B,IAAW,MAAM,wBAEhB;WAEa,QAAQ;IAOtB,IAAW,GAAG,cAGb;IAEM,KAAK,CAAC,GAAG,EAAE,SAAS;IAOpB,IAAI;IASX;;OAEG;IACI,SAAS;IAIhB;;OAEG;IACI,YAAY,CAAC,SAAS,EAAE,WAAW;CAQ7C;AAED,eAAO,MAAM,GAAG,KAAiB,CAAA"}

package/types/cmd/cmd_action_controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd_action_controller.d.ts","sourceRoot":"","sources":["../../../src/cmd/cmd_action_controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC7E,OAAO,EAAa,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,OAAO,IAAI;IAClC,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAChC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,qBAAa,mBAAmB,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,iBAAiB;IAEnE;;OAEG;IACH,OAAO,CAAC,OAAO,CAGd;IAED;;OAEG;IACI,MAAM,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAE5C;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAA+B;IAE1D;;OAEG;IACI,UAAU;IAQjB;;OAEG;IACI,SAAS;IAIhB;;OAEG;IACI,MAAM,IAAI,SAAS;IAI1B;;OAEG;IACU,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAQtE;;OAEG;IACU,OAAO,CAAC,GAAG,OAAO,EAAE,OAAO,EAAE;IAE1C;;OAEG;IACI,MAAM;IAIb;;OAEG;IACI,SAAS;IAEhB;;OAEG;IACI,qBAAqB;IAI5B;;OAEG;IACI,2BAA2B;IAIlC;;OAEG;IACI,2BAA2B,CAAC,KAAK,EAAE,MAAM;IAQhD;;OAEG;IACI,yBAAyB;IAMhC;;OAEG;IACI,4BAA4B;IAOnC;;OAEG;IACI,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,GAAE,MAAU;IAQhD;;OAEG;IACI,QAAQ;IAQf;;OAEG;IACH,SAAS,CAAC,WAAW;IAIrB;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IAOpB,SAAS,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO;IAQvC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO;CAKlD"}
+{"version":3,"file":"cmd_action_controller.d.ts","sourceRoot":"","sources":["../../../src/cmd/cmd_action_controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC7E,OAAO,EAAa,IAAI,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,OAAO,IAAI;IAClC,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAChC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,qBAAa,mBAAmB,CAAC,CAAC,GAAG,OAAO,CAAE,SAAQ,iBAAiB;IAEnE;;OAEG;IACH,OAAO,CAAC,OAAO,CAGd;IAED;;OAEG;IACI,MAAM,CAAC,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAA;IAE5C;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAA+B;IAE1D;;OAEG;IACI,UAAU;IAQjB;;OAEG;IACI,SAAS;IAIhB;;OAEG;IACI,MAAM,IAAI,SAAS;IAI1B;;OAEG;IACU,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAQtE;;OAEG;IACU,OAAO,CAAC,GAAG,OAAO,EAAE,OAAO,EAAE;IAE1C;;OAEG;IACI,MAAM;IAIb;;OAEG;IACI,SAAS;IAEhB;;OAEG;IACI,qBAAqB;IAI5B;;OAEG;IACI,2BAA2B;IAIlC;;OAEG;IACI,2BAA2B,CAAC,KAAK,EAAE,MAAM;IAQhD;;OAEG;IACI,yBAAyB;IAMhC;;OAEG;IACI,4BAA4B;IAOnC;;OAEG;IACI,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,GAAE,MAAU;IAQhD;;OAEG;IACI,QAAQ;IASf;;OAEG;IACH,SAAS,CAAC,WAAW;IAIrB;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;IASpB,SAAS,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO;IAQvC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO;CAKlD"}