@atlisp/mcp 1.8.2 → 1.8.3

package/dist/atlisp-mcp.js

@@ -1554,51 +1554,30 @@ function buildBlockRefsCode(filterBlockName) {
   return `(progn
 (vl-load-com)
 
-(defun @br:try (obj prop / r)
-  (if (vl-catch-all-error-p
-        (setq r (vl-catch-all-apply
-                  (function (lambda () (vlax-get obj prop))))))
-    nil
-    r))
-
-(defun @br:get-attrs (ent / att atts)
-  (if (setq att (entnext ent))
-    (progn
-      (setq atts nil)
-      (while (= (cdr (assoc 0 (entget att))) "ATTRIB")
-        (setq atts (cons (cons (cdr (assoc 2 (entget att))) (cdr (assoc 1 (entget att)))) atts))
-        att (entnext att))
-      (reverse atts))
-    nil))
-
-(defun @br:get-dynprops (obj / r)
-  (setq r (vl-catch-all-apply
-            (function (lambda ()
-              (mapcar '(lambda (x)
-                (cons (vla-get-propertyname x)
-                  (list (cons "value" (vlax-get x 'value))
-                        (cons "readOnly" (vlax-get x 'readonly))
-                        (cons "show" (vlax-get x 'show)))))
-                (vlax-safearray->list (vlax-invoke obj 'getdynamicblockproperties)))))))
+(defun @br:try-fn (fn arg / r)
+  (setq r (vl-catch-all-apply (function (lambda () (apply fn (list arg))))))
   (if (vl-catch-all-error-p r) nil r))
 
-(defun @br:props (ent / obj ed r)
+(defun @br:props (ent / ed r p2 p10 p50 p41 p42 p43)
+  (setq ed (entget ent)
+        p10 (cdr (assoc 10 ed))
+        p50 (cdr (assoc 50 ed))
+        p41 (cdr (assoc 41 ed))
+        p42 (cdr (assoc 42 ed))
+        p43 (cdr (assoc 43 ed)))
   (setq r (vl-catch-all-apply
             (function (lambda ()
-              (setq obj (vlax-ename->vla-object ent)
-                    ed (entget ent))
               (list
                 (cons "handle" (cdr (assoc 5 ed)))
                 (cons "layer" (cdr (assoc 8 ed)))
-                (cons "blockName" (vla-get-name obj))
-                (cons "effectiveBlockName" (@br:try obj 'effectivename))
-                (cons "insertionPoint" (vlax-safearray->list (vla-get-insertionpoint obj)))
-                (cons "rotation" (vla-get-rotation obj))
-                (cons "scale" (list (vla-get-xscale obj) (vla-get-yscale obj) (vla-get-zscale obj)))
-                (cons "isDynamic" (@br:try obj 'isdynamicblock))
-                (cons "attributes" (@br:get-attrs ent))
-                (cons "dynamicProperties" (@br:get-dynprops obj)))))))
-  (if (vl-catch-all-error-p r) nil r))
+                (cons "blockName" (cdr (assoc 2 ed)))
+                (cons "effectiveBlockName" (cdr (assoc 2 ed)))
+                (cons "insertionPoint" (list (car p10) (cadr p10) (caddr p10)))
+                (cons "rotation" p50)
+                (cons "scale" (list p41 p42 p43))
+                (cons "attributes" (@br:try-fn 'block:get-attributes ent))
+                (cons "dynamicProperties" (@br:try-fn 'block:get-properties ent)))))))
+  (if (vl-catch-all-error-p r) (list (cons "handle" (cdr (assoc 5 ed)))) r))
 
 (setq ss (ssget "_X" ${filterCode}))
 (if (null ss)
@@ -1648,6 +1627,18 @@ async function getBlockRefs(params = {}) {
                 val = val.map((v) => typeof v === "number" ? v : 1);
               } else if (key === "isDynamic") {
                 val = val === true || val === "true" || val === 1;
+              } else if (key === "attributes" && Array.isArray(val)) {
+                const o = {};
+                val.forEach((p) => {
+                  if (Array.isArray(p) && p.length >= 2) o[String(p[0])] = p[1];
+                });
+                val = o;
+              } else if (key === "dynamicProperties" && Array.isArray(val)) {
+                const o = {};
+                val.forEach((p) => {
+                  if (Array.isArray(p) && p.length >= 2) o[String(p[0])] = p[1];
+                });
+                val = o;
               }
               obj[key] = val;
             }

package/package.json

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