@atlisp/mcp 1.6.6 → 1.6.8

package/dist/atlisp-mcp.js

@@ -23,7 +23,7 @@ var FILE_EXTENSIONS = {
   "BricsCAD": [".des"]
 };
 var SERVER_NAME = "atlisp-mcp-server";
-var SERVER_VERSION = "1.6.4";
+var SERVER_VERSION = "1.6.7";
 var MOCK_PACKAGES = [
   { name: "base", description: "\u57FA\u7840\u51FD\u6570\u5E93", version: "1.0.0" },
   { name: "at-pm", description: "\u5DE5\u7A0B\u9879\u76EE\u7BA1\u7406", version: "2.1.0" },
@@ -610,6 +610,58 @@ var __dirname2 = path4.dirname(fileURLToPath2(import.meta.url));
 var STANDARDS_DIR = path4.join(__dirname2, "..", "standards");
 var CACHE_TTL = config_default.resourceCacheTtl;
 var resourceCache = /* @__PURE__ */ new Map();
+var ENTITY_PROPERTIES_LISP = `
+(defun entity:to-list (val)
+  (cond
+    ((= (type val) 'VARIANT) (entity:to-list (vlax-variant-value val)))
+    ((= (type val) 'SAFEARRAY) (vlax-safearray->list val))
+    (T val)))
+
+(defun entity:try-get (obj names / result val)
+  (foreach name names
+    (if (not (vl-catch-all-error-p
+               (setq val (vl-catch-all-apply
+                           (function vlax-get-property)
+                           (list obj name)))))
+      (setq result (cons (cons name (entity:to-list val)) result))))
+  (reverse result))
+
+(setq *common-props* '(ObjectName Handle Layer Color Linetype LinetypeScale Lineweight Visibility Material))
+
+(setq *entity-props*
+  '((AcDbLine StartPoint EndPoint Angle Delta Length Thickness Normal)
+    (AcDbCircle Center Radius Diameter Circumference Area Thickness Normal)
+    (AcDbArc Center Radius StartAngle EndAngle TotalAngle ArcLength Area Normal)
+    (AcDbPoint Position Thickness Normal)
+    (AcDbText TextString Position Height Width ObliqueAngle Rotation StyleName HorizontalAlignment VerticalAlignment Normal Backward UpsideDown)
+    (AcDbMText TextString Location Height Width Rotation StyleName AttachmentPoint DrawingDirection LinespacingFactor LinespacingDistance LinespacingStyle FlowDirection)
+    (AcDbBlockReference Name InsertionPoint Rotation XScale YScale ZScale Normal)
+    (AcDbPolyline Coordinates Closed ConstantWidth Elevation Normal Thickness LinetypeGeneration Area Length)
+    (AcDb2dPolyline Coordinates Closed Elevation Normal Thickness LinetypeGeneration Area Length Type Width)
+    (AcDb3dPolyline Coordinates Closed Type Normal Length Area)
+    (AcDbAlignedDimension DimLinePoint1 DimLinePoint2 ExtLinePoint1 ExtLinePoint2 TextPosition TextRotation Measurement)
+    (AcDbRotatedDimension DimLinePoint1 DimLinePoint2 ExtLinePoint1 ExtLinePoint2 TextPosition TextRotation Measurement Rotation)
+    (AcDbRadialDimension Center Diameter LeaderLength TextPosition)
+    (AcDbDiametricDimension Center Diameter LeaderLength TextPosition)
+    (AcDbAngularDimension AngleVertex AngleEndPoint ArcPoint TextPosition Measurement)
+    (AcDbHatch PatternName PatternType Area Elevation Normal NumberOfLoops AssociativeHatch HatchObjectType PatternAngle PatternScale PatternSpace ISOPenWidth)
+    (AcDbSpline Degree NumberOfControlPoints NumberOfFitPoints ControlPoints FitPoints Knots Weights Area Length Closed Periodic StartTanVector EndTanVector Elevation Normal)
+    (AcDbEllipse Center MajorRadius MinorRadius RadiusRatio StartAngle EndAngle Area Circumference Normal)
+    (AcDbRegion Area Perimeter Centroid MomentsOfInertia PrincipalMoments PrincipalDirections Normal)
+    (AcDb3dSolid Volume Area Centroid MomentsOfInertia PrincipalMoments PrincipalDirections)
+    (AcDbRasterImage ImageFile ImageWidth ImageHeight Origin Rotation Width Height ShowImage ClippingEnabled)
+    (AcDbLeader Coordinates ArrowheadType ArrowheadSize Color ScaleFactor StyleName TextString TextPosition Type Normal)
+    (AcDbViewport Center Width Height ScaleFactor CustomScale StandardScale GridOn SnapOn On DisplayLocked)
+    (AcDbTable TableStyleName Position Rows Columns Direction FlowDirection)))
+
+(defun entity:properties (ent / obj object-name result)
+  (setq obj (if (= (type ent) 'VLA-OBJECT) ent (vlax-ename->vla-object ent)))
+  (setq result (entity:try-get obj *common-props*))
+  (setq object-name (cdr (assoc 'ObjectName result)))
+  (if object-name
+    (setq result (append result (entity:try-get obj (cdr (assoc (read object-name) *entity-props*))))))
+  result)
+`;
 function getCached(key) {
   const entry = resourceCache.get(key);
   if (entry && Date.now() - entry.timestamp < CACHE_TTL) {
@@ -812,34 +864,18 @@ function lispPairsToObject(pairs) {
   }
   return obj;
 }
-function parseEntity(arr) {
-  if (!Array.isArray(arr) || arr.length < 5)
+function propertyPairsToObject(pairs) {
+  if (!Array.isArray(pairs))
     return null;
-  const [type, handle, layer, color, linetype, ...rest] = arr;
-  const entity = {
-    type: String(type).toUpperCase().replace(/^"|"$/g, ""),
-    handle: String(handle),
-    layer: String(layer),
-    color,
-    linetype: String(linetype)
-  };
-  const entType = typeof entity.type === "string" ? entity.type.toUpperCase() : entity.type;
-  if (/^(TEXT|MTEXT|ATTRIB|TCH_TEXT)$/.test(entType) && rest[0] != null) {
-    entity.text = String(rest[0]);
-  }
-  if (/^(LINE|LWPOLYLINE|POLYLINE|ARC|CIRCLE|SPLINE|ELLIPSE|XLINE|RAY)$/.test(entType) && Array.isArray(rest[0])) {
-    entity.points = rest[0].map((pt) => {
-      if (Array.isArray(pt) && pt.length >= 2)
-        return { x: Number(pt[0]), y: Number(pt[1]), z: Number(pt[2] || 0) };
-      return null;
-    }).filter(Boolean);
-  }
-  if (entType === "INSERT" && rest[0] != null) {
-    entity.blockName = String(rest[0]);
+  const obj = {};
+  for (const pair of pairs) {
+    if (Array.isArray(pair) && pair.length >= 2) {
+      obj[String(pair[0])] = pair[1] !== null && pair[1] !== void 0 ? pair[1] : null;
+    }
   }
-  return entity;
+  return obj;
 }
-function buildEntityCode({ type, layer, bbox }) {
+function buildEntityPropertiesCode({ type, layer, bbox }) {
   const items = [];
   if (type)
     items.push(`(cons 0 "${type.replace(/"/g, '\\"')}")`);
@@ -861,27 +897,12 @@ function buildEntityCode({ type, layer, bbox }) {
   const ssgetExpr = items.length ? `(ssget "_X" ${filterExpr})` : '(ssget "_X")';
   return `(progn
 (vl-load-com)
-(defun @e:safe-fn (f ent / r)
-  (setq r (vl-catch-all-apply f (list ent)))
-  (if (vl-catch-all-error-p r) nil r))
-(defun @e:dp (ent / ed typ gcl is)
-  (setq ed (entget ent) typ (cdr (assoc 0 ed)) gcl (assoc 62 ed) is (assoc 6 ed))
-  (append
-    (list typ (cdr (assoc 5 ed)) (cdr (assoc 8 ed))
-      (if gcl (cdr gcl) 256)
-      (if is (cdr is) "ByLayer"))
-    (cond
-      ((wcmatch typ "TEXT,MTEXT,ATTRIB,TCH_TEXT")
-       (list (@e:safe-fn '(lambda (e) (text:remove-fmt (text:get-mtext e))) ent)))
-      ((wcmatch typ "LINE,LWPOLYLINE,POLYLINE,ARC,CIRCLE,SPLINE,ELLIPSE,XLINE,RAY")
-       (list (@e:safe-fn 'curve:get-points ent)))
-      ((= typ "INSERT")
-       (list (@e:safe-fn 'block:get-effectivename ent)))
-      (t nil))))
+${ENTITY_PROPERTIES_LISP}
 (setq @e:total (if (setq @e:ss ${ssgetExpr}) (sslength @e:ss) 0)
       @e:ents nil @e:i 0)
-(while (and @e:ss (< @e:i @e:total)(< (length @e:ents) 3000))
-  (setq @e:ents (cons (@e:dp (ssname @e:ss @e:i)) @e:ents) @e:i (1+ @e:i)))
+(while (and @e:ss (< @e:i @e:total) (< (length @e:ents) 3000))
+  (setq @e:ents (cons (entity:properties (ssname @e:ss @e:i)) @e:ents)
+        @e:i (1+ @e:i)))
 (vl-prin1-to-string (list @e:total (reverse @e:ents))))`;
 }
 function buildTextCode({ layer, bbox, offset, limit }) {
@@ -902,15 +923,19 @@ function buildTextCode({ layer, bbox, offset, limit }) {
   }
   const filterExpr = `(list ${items.join(" ")})`;
   return `(progn
-(defun @t:props (ent / ed typ result item ins)
-  (setq ed (entget ent) typ (cdr (assoc 0 ed)))
-  (setq result (list (vl-prin1-to-string typ) (vl-prin1-to-string (cdr (assoc 5 ed))) (vl-prin1-to-string (cdr (assoc 8 ed)))
-    (if (setq item (assoc 62 ed)) (cdr item) "ByLayer")
-    (vl-prin1-to-string (if (setq item (assoc 6 ed)) (cdr item) "ByLayer"))))
-  (setq ins (cdr (assoc 10 ed)))
-  (append result (list (vl-prin1-to-string (cdr (assoc 1 ed))) (car ins) (cadr ins) (caddr ins)
-    (cdr (assoc 40 ed)) (cdr (assoc 50 ed))
-    (vl-prin1-to-string (if (setq item (assoc 7 ed)) (cdr item) "Standard")))))
+(defun @t:props (ent / ed ins)
+  (setq ed (entget ent) ins (cdr (assoc 10 ed)))
+  (list
+    (list "type" (vl-prin1-to-string (cdr (assoc 0 ed))))
+    (list "handle" (vl-prin1-to-string (cdr (assoc 5 ed))))
+    (list "layer" (vl-prin1-to-string (cdr (assoc 8 ed))))
+    (list "color" (if (assoc 62 ed) (cdr (assoc 62 ed)) 256))
+    (list "linetype" (vl-prin1-to-string (if (assoc 6 ed) (cdr (assoc 6 ed)) "ByLayer")))
+    (list "text" (vl-prin1-to-string (cdr (assoc 1 ed))))
+    (list "insert" (list (car ins) (cadr ins) (caddr ins)))
+    (list "height" (cdr (assoc 40 ed)))
+    (list "rotation" (cdr (assoc 50 ed)))
+    (list "style" (vl-prin1-to-string (if (assoc 7 ed) (cdr (assoc 7 ed)) "Standard")))))
 (defun @t:run nil
   (setq ss (ssget "_X" ${filterExpr}))
   (if (null ss)
@@ -926,8 +951,8 @@ function buildTextCode({ layer, bbox, offset, limit }) {
 var RESOURCES = [
   { uri: "atlisp://cad/info", name: "CAD Info", description: "CAD \u8FDE\u63A5\u4FE1\u606F", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/layers", name: "Layers", description: "\u56FE\u5C42\u5217\u8868", mimeType: "application/json", subscribable: true },
-  { uri: "atlisp://dwg/entities", name: "Entities", description: "\u56FE\u5143\u5217\u8868\uFF0C\u8FD4\u56DE\u603B\u6570\u548C\u524D3000\u4E2A\u56FE\u5143\uFF0C\u6587\u672C\u9644\u52A0 text \u5B57\u6BB5\uFF0C\u66F2\u7EBF\u9644\u52A0 points \u6570\u7EC4\uFF0CINSERT \u9644\u52A0 blockName\uFF0C\u652F\u6301 ?type=LINE&layer=0&bbox=0,0,100,100 \u8FC7\u6EE4", mimeType: "application/json", subscribable: true },
-  { uri: "atlisp://dwg/texts", name: "Texts", description: "\u6587\u672C\u5B9E\u4F53\u5185\u5BB9\u5217\u8868 (TEXT/MTEXT/ATTRIB/TCH_TEXT)\uFF0C\u652F\u6301 ?layer=0&bbox=0,0,100,100&limit=5000&offset=0", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://dwg/entities", name: "Entities", description: "\u56FE\u5143\u5217\u8868\u3002\u65E0\u53C2\u6570\u65F6\u8FD4\u56DE\u603B\u6570\u548C\u6309\u7C7B\u578B\u7EDF\u8BA1\uFF1B\u6709\u53C2\u6570\u65F6\u8FD4\u56DE filtered \u56FE\u6587\u7684 entity:properties \u5168\u5C5E\u6027 JSON\uFF08ObjectName, Handle, Layer, Color, Center, Radius \u7B49\uFF09\uFF0C\u652F\u6301 ?type=LINE&layer=0&bbox=0,0,100,100", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://dwg/texts", name: "Texts", description: "\u6587\u672C\u5B9E\u4F53 key:value \u5217\u8868 (TEXT/MTEXT/ATTRIB/TCH_TEXT)\uFF0C\u652F\u6301 ?layer=0&bbox=0,0,100,100&limit=5000&offset=0", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/name", name: "DWG Name", description: "\u5F53\u524D DWG \u6587\u4EF6\u540D", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/path", name: "DWG Path", description: "\u6587\u4EF6\u5B8C\u6574\u8DEF\u5F84", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://cad/dwgs", name: "DWG List", description: "\u6240\u6709\u6253\u5F00\u7684 DWG \u6587\u4EF6\u5217\u8868", mimeType: "application/json", subscribable: true },
@@ -1130,7 +1155,7 @@ async function getEntities(params = {}) {
     return await getEntitiesSummary(cacheKey);
   }
   try {
-    const code = buildEntityCode({
+    const code = buildEntityPropertiesCode({
       type: params.type || null,
       layer: params.layer || null,
       bbox: params.bbox || null
@@ -1147,7 +1172,7 @@ async function getEntities(params = {}) {
     if (parsed && Array.isArray(parsed) && parsed.length >= 2) {
       total = typeof parsed[0] === "number" ? parsed[0] : 0;
       const rawEntities = Array.isArray(parsed[1]) ? parsed[1] : [];
-      entities = rawEntities.map(parseEntity).filter(Boolean);
+      entities = rawEntities.map(propertyPairsToObject).filter(Boolean);
     }
     const result = { total, entities };
     log(`getEntities: total=${total}, returned=${entities.length}`);
@@ -1249,7 +1274,7 @@ async function getTexts(params = {}) {
     const textsIdx = parsed.indexOf("texts");
     const rawTexts = textsIdx !== -1 && Array.isArray(parsed[textsIdx + 1]) ? parsed[textsIdx + 1] : [];
     const data = lispPairsToObject(parsed);
-    data.texts = rawTexts.length > 0 ? rawTexts.map(parseEntity).filter(Boolean) : [];
+    data.texts = rawTexts.length > 0 ? rawTexts.map(propertyPairsToObject).filter(Boolean) : [];
     data.offset = offset;
     data.limit = limit;
     setCache(cacheKey, data);
@@ -2982,9 +3007,15 @@ var RESOURCE_TEMPLATES = [
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/entities?type={type}",
-    name: "Entities by Type",
-    description: "\u6309\u7C7B\u578B\u67E5\u8BE2\u5B9E\u4F53\u5217\u8868",
+    uriTemplate: "atlisp://dwg/entities",
+    name: "Entities Summary",
+    description: "\u8FD4\u56DE\u56FE\u5143\u603B\u6570\u548C\u6309\u7C7B\u578B\u7EDF\u8BA1\u5217\u8868",
+    mimeType: "application/json"
+  },
+  {
+    uriTemplate: "atlisp://dwg/entities?type={type}&layer={layer}&bbox={bbox}",
+    name: "Filtered Entities",
+    description: "\u6309 type/layer/bbox \u8FC7\u6EE4\u56FE\u5143\uFF0C\u8FD4\u56DE entity:properties \u5168\u5C5E\u6027 JSON\uFF08ObjectName, Handle, Layer, Color, Center, Radius \u7B49\uFF09",
     mimeType: "application/json"
   },
   {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlisp/mcp",
-    "version": "1.6.6",
+    "version": "1.6.8",
     "description": "MCP Server for @lisp on CAD,support AutoCAD/GstarCAD/ZWCAD/BricsCAD or CAD platform compatible with AutoLISP",
     "type": "module",
     "bin": {