@atlisp/mcp 1.6.7 → 1.6.8

package/dist/atlisp-mcp.js

@@ -864,33 +864,6 @@ function lispPairsToObject(pairs) {
   }
   return obj;
 }
-function parseEntity(arr) {
-  if (!Array.isArray(arr) || arr.length < 5)
-    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]);
-  }
-  return entity;
-}
 function propertyPairsToObject(pairs) {
   if (!Array.isArray(pairs))
     return null;
@@ -950,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)
@@ -975,7 +952,7 @@ 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\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\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/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 },
@@ -1297,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);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlisp/mcp",
-    "version": "1.6.7",
+    "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": {