@atlisp/mcp 1.6.10 → 1.6.12

package/dist/atlisp-mcp.js

@@ -1041,9 +1041,7 @@ async function getCadInfo() {
     await cad.connect();
   }
   if (!cad.connected) {
-    const result2 = { connected: false, platform: null, version: null, busy: false };
-    setCache("cad:info", result2);
-    return result2;
+    return { connected: false, platform: null, version: null, busy: false };
   }
   let busy = false;
   try {
@@ -1068,9 +1066,7 @@ async function getEntities(params = {}) {
   if (!cad.connected)
     await cad.connect();
   if (!cad.connected) {
-    const result = { total: 0, entities: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { total: 0, entities: [] };
   }
   const hasFilter = params.type || params.layer || params.bbox;
   if (!hasFilter) {
@@ -1084,9 +1080,7 @@ async function getEntities(params = {}) {
     });
     const resultStr = await cad.sendCommandWithResult(code);
     if (!resultStr || resultStr === "" || resultStr === "nil") {
-      const result2 = { total: 0, entities: [] };
-      setCache(cacheKey, result2);
-      return result2;
+      return { total: 0, entities: [] };
     }
     let total = 0;
     let entities = [];
@@ -1102,9 +1096,7 @@ async function getEntities(params = {}) {
     return result;
   } catch (e) {
     log(`getEntities error: ${e.message}`);
-    const result = { total: 0, entities: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { total: 0, entities: [] };
   }
 }
 async function getEntitiesSummary(cacheKey) {
@@ -1130,15 +1122,11 @@ async function getEntitiesSummary(cacheKey) {
   try {
     const resultStr = await cad.sendCommandWithResult(summaryCode);
     if (!resultStr || resultStr === "" || resultStr === "nil") {
-      const result2 = { total: 0, summary: [] };
-      setCache(cacheKey, result2);
-      return result2;
+      return { total: 0, summary: [] };
     }
     const parsed = parseLispRecursive(resultStr);
     if (!parsed || !Array.isArray(parsed)) {
-      const result2 = { total: 0, summary: [] };
-      setCache(cacheKey, result2);
-      return result2;
+      return { total: 0, summary: [] };
     }
     let total = 0;
     const summary = [];
@@ -1160,9 +1148,7 @@ async function getEntitiesSummary(cacheKey) {
     return result;
   } catch (e) {
     log(`getEntitiesSummary error: ${e.message}`);
-    const result = { total: 0, summary: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { total: 0, summary: [] };
   }
 }
 function buildTextContentCode({ layer, bbox, offset, limit }) {
@@ -1202,9 +1188,7 @@ async function getTextContent(params = {}) {
   if (!cad.connected)
     await cad.connect();
   if (!cad.connected) {
-    const result = { total: 0, offset: 0, limit: 5e3, texts: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { total: 0, offset: 0, limit: 5e3, texts: [] };
   }
   const offset = Math.max(0, parseInt(params.offset) || 0);
   const limit = Math.min(Math.max(1, parseInt(params.limit) || 5e3), 5e3);
@@ -1212,15 +1196,11 @@ async function getTextContent(params = {}) {
     const code = buildTextContentCode({ layer: params.layer, bbox: params.bbox, offset, limit });
     const resultStr = await cad.sendCommandWithResult(code);
     if (!resultStr || resultStr === "" || resultStr === "nil" || resultStr === "0") {
-      const result = { total: 0, offset, limit, texts: [] };
-      setCache(cacheKey, result);
-      return result;
+      return { total: 0, offset, limit, texts: [] };
     }
     const parsed = parseLispRecursive(resultStr);
     if (!parsed || !Array.isArray(parsed)) {
-      const result = { total: 0, offset, limit, texts: [] };
-      setCache(cacheKey, result);
-      return result;
+      return { total: 0, offset, limit, texts: [] };
     }
     const data = lispPairsToObject(parsed);
     const rawTexts = Array.isArray(data.texts) ? data.texts : [];
@@ -1243,9 +1223,7 @@ async function getTextContent(params = {}) {
     return data;
   } catch (e) {
     log(`getTextContent error: ${e.message}`);
-    const result = { total: 0, offset, limit, texts: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { total: 0, offset, limit, texts: [] };
   }
 }
 async function getDwgName() {
@@ -1376,23 +1354,17 @@ async function getBlockRefs(params = {}) {
   if (!cad.connected)
     await cad.connect();
   if (!cad.connected) {
-    const result = { total: 0, blockRefs: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { total: 0, blockRefs: [] };
   }
   try {
     const code = buildBlockRefsCode(params.blockName);
     const resultStr = await cad.sendCommandWithResult(code);
     if (!resultStr || resultStr === "" || resultStr === "nil") {
-      const result2 = { total: 0, blockRefs: [] };
-      setCache(cacheKey, result2);
-      return result2;
+      return { total: 0, blockRefs: [] };
     }
     const parsed = parseLispRecursive(resultStr);
     if (!parsed || !Array.isArray(parsed)) {
-      const result2 = { total: 0, blockRefs: [] };
-      setCache(cacheKey, result2);
-      return result2;
+      return { total: 0, blockRefs: [] };
     }
     const result = lispPairsToObject(parsed);
     const blockRefs = Array.isArray(result.blockRefs) ? result.blockRefs : [];
@@ -1423,22 +1395,22 @@ async function getBlockRefs(params = {}) {
     return finalResult;
   } catch (e) {
     log(`getBlockRefs error: ${e.message}`);
-    const result = { total: 0, blockRefs: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { total: 0, blockRefs: [] };
   }
 }
 var TBL_QUERIES = {
   layer: { name: "layer", lisp: `(progn
 (setq @d nil)
-(vlax-for e (vla-get-layers (vla-get-activedocument (vlax-get-acad-object)))
+(setq @e (tblnext "layer" t))
+(while @e
   (setq @d (cons (list
-    (cons 2 (vla-get-name e))
-    (cons 62 (vla-get-color e))
-    (cons 6 (vla-get-linetype e))
-    (cons 70 (logior (if (vla-get-freeze e) 1 0) (if (vla-get-lock e) 4 0)))
-    (cons 60 (if (vla-get-layeron e) 0 1))
-  ) @d)))
+    (cons 2 (cdr (assoc 2 @e)))
+    (cons 62 (cdr (assoc 62 @e)))
+    (cons 6 (cdr (assoc 6 @e)))
+    (cons 70 (cdr (assoc 70 @e)))
+    (cons 60 (if (< (cdr (assoc 62 @e)) 0) 1 0))
+  ) @d))
+  (setq @e (tblnext "layer" nil)))
 (list (cons 'table 'layer) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
   block: { name: "block", lisp: `(progn
 (setq @d nil)
@@ -1449,7 +1421,15 @@ var TBL_QUERIES = {
   style: { name: "style", lisp: `(progn
 (setq @d nil)
 (vlax-for e (vla-get-textstyles (vla-get-activedocument (vlax-get-acad-object)))
-  (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
+  (setq @d (cons (list
+    (cons 2 (vla-get-name e))
+    (cons 1 (vla-get-fontfile e))
+    (cons 3 (vla-get-bigfontfile e))
+    (cons 40 (vla-get-height e))
+    (cons 41 (vla-get-width e))
+    (cons 42 (/ (* 180.0 (vla-get-obliqueangle e)) pi))
+    (cons 70 (vla-get-textgenerationflag e))
+  ) @d)))
 (list (cons 'table 'style) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
   dimstyle: { name: "dimstyle", lisp: `(progn
 (setq @d nil)
@@ -1462,8 +1442,15 @@ var TBL_QUERIES = {
   (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
 (list (cons 'table 'linetype) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` }
 };
+var TBL_KEY_ALIAS = {
+  textstyle: "style",
+  textstyles: "style",
+  ltype: "linetype",
+  linetype: "ltype"
+};
 function buildTablesCode(tblName) {
-  const key = tblName.toLowerCase();
+  const raw = tblName.toLowerCase();
+  const key = TBL_KEY_ALIAS[raw] || raw;
   const query = TBL_QUERIES[key];
   if (query) {
     return `(progn (vl-load-com) ${query.lisp})`;
@@ -1500,7 +1487,9 @@ function parseTableRecord(rec) {
       else if (key === "42")
         obj.oblique = typeof val === "number" ? val : 0;
       else if (key === "3")
-        obj.description = String(val);
+        obj.bigfont = String(val);
+      else if (key === "50")
+        obj.flags = typeof val === "number" ? val : 0;
     }
   }
   return obj.name ? obj : null;
@@ -1519,15 +1508,11 @@ async function getTables(params = {}) {
     const code = buildTablesCode(tblName);
     const resultStr = await cad.sendCommandWithResult(code);
     if (!resultStr || resultStr === "" || resultStr === "nil") {
-      const result2 = { table: tblName, data: [] };
-      setCache(cacheKey, result2);
-      return result2;
+      return { table: tblName, data: [] };
     }
     const parsed = parseLispRecursive(resultStr);
     if (!parsed || !Array.isArray(parsed)) {
-      const result2 = { table: tblName, total: 0, data: [] };
-      setCache(cacheKey, result2);
-      return result2;
+      return { table: tblName, total: 0, data: [] };
     }
     let result;
     if (parsed.length >= 3 && parsed[0] && String(parsed[0][0]).toUpperCase() === "TABLE") {
@@ -1599,9 +1584,7 @@ async function getTables(params = {}) {
     return result;
   } catch (e) {
     log(`getTables error: ${e.message}`);
-    const result = { table: tblName, data: [] };
-    setCache(cacheKey, result);
-    return result;
+    return { table: tblName, data: [] };
   }
 }
 async function getPackages(filterName = null) {
@@ -1617,7 +1600,6 @@ async function getPackages(filterName = null) {
     const code = `(mapcar 'cdr @::*local-pkgs*)`;
     const result = await cad.sendCommandWithResult(code);
     if (!result || result === "" || result === "nil") {
-      setCache(cacheKey, []);
       return [];
     }
     let raw = [];
@@ -1688,7 +1670,6 @@ async function getPackages(filterName = null) {
     setCache(cacheKey, packages);
     return packages;
   } catch (e) {
-    setCache(cacheKey, []);
     return [];
   }
 }
@@ -1718,7 +1699,6 @@ async function getDwgList() {
         )`;
     const result = await cad.sendCommandWithResult(code);
     if (!result || result === "" || result === "nil") {
-      setCache(cacheKey, []);
       return [];
     }
     let parsed = [];
@@ -1741,7 +1721,6 @@ async function getDwgList() {
     setCache(cacheKey, dwgList);
     return dwgList;
   } catch (e) {
-    setCache(cacheKey, []);
     return [];
   }
 }

package/package.json

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