@atlisp/mcp 1.4.3 → 1.5.0

package/dist/atlisp-mcp.js

@@ -119,7 +119,7 @@ var FILE_EXTENSIONS = {
   "BricsCAD": [".des"]
 };
 var SERVER_NAME = "atlisp-mcp-server";
-var SERVER_VERSION = "1.4.1";
+var SERVER_VERSION = "1.5.0";
 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" },
@@ -1036,33 +1036,33 @@ function lispPairsToObject(pairs) {
   }
   return obj;
 }
-var ENTITY_SCHEMAS = {
-  LINE: { fields: ["x1", "y1", "z1", "x2", "y2", "z2", "length"], strings: [] },
-  CIRCLE: { fields: ["cx", "cy", "cz", "radius"], strings: [] },
-  ARC: { fields: ["cx", "cy", "cz", "radius", "startAngle", "endAngle"], strings: [] },
-  LWPOLYLINE: { fields: ["vertices", "closed"], strings: [] },
-  TEXT: { fields: ["x", "y", "z", "text", "height", "rotation"], strings: ["text"] },
-  MTEXT: { fields: ["x", "y", "z", "text", "height", "rotation"], strings: ["text"] },
-  ATTRIB: { fields: ["x", "y", "z", "text", "height", "rotation"], strings: ["text"] },
-  TCH_TEXT: { fields: ["x", "y", "z", "text", "height", "rotation"], strings: ["text"] },
-  INSERT: { fields: ["x", "y", "z", "blockName", "rotation", "scaleX", "scaleY"], strings: ["blockName"] },
-  POINT: { fields: ["x", "y", "z"], strings: [] }
-};
 function parseEntity(arr) {
   if (!Array.isArray(arr) || arr.length < 5) return null;
   const [type, handle, layer, color, linetype, ...rest] = arr;
-  const schema = ENTITY_SCHEMAS[String(type)] || { fields: [], strings: [] };
-  const props = {};
-  schema.fields.forEach((name, i) => {
-    if (i < rest.length) {
-      let val = rest[i];
-      if (schema.strings.includes(name) && val !== null && val !== void 0) val = String(val);
-      props[name] = val;
-    }
-  });
-  return { type: String(type), handle: String(handle), layer: String(layer), color, linetype: String(linetype), ...props };
+  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 buildEntityCode({ type, layer, bbox, offset, limit }) {
+function buildEntityCode({ type, layer, bbox }) {
   const items = [];
   if (type) items.push(`(cons 0 "${type.replace(/"/g, '\\"')}")`);
   if (layer) items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
@@ -1081,51 +1081,29 @@ function buildEntityCode({ type, layer, bbox, offset, limit }) {
   const filterExpr = items.length ? `(list ${items.join(" ")})` : "nil";
   const ssgetExpr = items.length ? `(ssget "_X" ${filterExpr})` : '(ssget "_X")';
   return `(progn
-(defun @e:props (ent / ed typ result item s e c verts closed ins)
-  (setq ed (entget ent) typ (cdr (assoc 0 ed)))
-  (setq result (list (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"))))
-  (cond
-    ((= typ "LINE")
-      (setq s (cdr (assoc 10 ed)) e (cdr (assoc 11 ed)))
-      (append result (list (car s) (cadr s) (caddr s) (car e) (cadr e) (caddr e) (distance s e))))
-    ((= typ "CIRCLE")
-      (setq c (cdr (assoc 10 ed)))
-      (append result (list (car c) (cadr c) (caddr c) (cdr (assoc 40 ed)))))
-    ((= typ "ARC")
-      (setq c (cdr (assoc 10 ed)))
-      (append result (list (car c) (cadr c) (caddr c) (cdr (assoc 40 ed)) (cdr (assoc 50 ed)) (cdr (assoc 51 ed)))))
-    ((= typ "LWPOLYLINE")
-      (setq verts nil closed nil)
-      (foreach g ed
-        (if (= (car g) 10) (setq verts (append verts (list (list (cadr g) (caddr g))))))
-        (if (= (car g) 70) (setq closed (= (logand (cdr g) 1) 1))))
-      (append result (list verts (if closed "T" nil))))
-    ((= typ "TEXT")
-      (setq ins (cdr (assoc 10 ed)))
-      (append result (list (car ins) (cadr ins) (caddr ins) (vl-prin1-to-string (cdr (assoc 1 ed))) (cdr (assoc 40 ed)) (cdr (assoc 50 ed))))))
-    ((= typ "MTEXT")
-      (setq ins (cdr (assoc 10 ed)))
-      (append result (list (car ins) (cadr ins) (caddr ins) (vl-prin1-to-string (cdr (assoc 1 ed))) (cdr (assoc 40 ed)) (cdr (assoc 50 ed))))))
-    ((= typ "INSERT")
-      (setq ins (cdr (assoc 10 ed)))
-      (append result (list (car ins) (cadr ins) (caddr ins) (vl-prin1-to-string (cdr (assoc 2 ed))) (cdr (assoc 50 ed)) (cdr (assoc 41 ed)) (cdr (assoc 42 ed))))))
-    ((= typ "POINT")
-      (setq p (cdr (assoc 10 ed)))
-      (append result (list (car p) (cadr p) (caddr p))))
-    (t result)))
-(defun @e:run nil
-  (setq ss ${ssgetExpr})
-  (if (null ss)
-    (list "total" 0 "offset" ${offset} "limit" ${limit})
-    (progn
-      (setq total (sslength ss) entities nil i ${offset})
-      (while (and (< i total) (< (length entities) ${limit}))
-        (setq entities (append entities (list (@e:props (ssname ss i)))) i (1+ i)))
-      (list "total" total "offset" ${offset} "limit" ${limit} "entities" entities))))
-(@e:run))
-`;
+(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))))
+(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)))
+(vl-prin1-to-string (list @e:total (reverse @e:ents))))`;
 }
 function buildTextCode({ layer, bbox, offset, limit }) {
   const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
@@ -1168,8 +1146,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: "\u5B9E\u4F53\u5C5E\u6027\u5217\u8868\uFF0C\u652F\u6301 ?type=LINE&layer=0&bbox=0,0,100,100&limit=100&offset=0", 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=500&offset=0", 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/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 },
@@ -1262,7 +1240,7 @@ async function getLayers(filterName = null) {
   if (!cad.connected) await cad.connect();
   if (!cad.connected) return [];
   try {
-    const code = filterName ? `(tblnext "LAYER" T)` : `(progn (setq res nil)(while (setq e (tblnext "LAYER" (null res)))(setq res (cons (list (cdr (assoc 2 e)) (cdr (assoc 62 e)) (cdr (assoc 70 e))) res))) (reverse res))`;
+    const code = filterName ? `(vl-prin1-to-string (cdr (assoc 2 (tblnext "LAYER" T))))` : `(progn (setq res nil)(while (setq e (tblnext "LAYER" (null res)))(setq res (cons (list (vl-prin1-to-string (cdr (assoc 2 e))) (cdr (assoc 62 e)) (cdr (assoc 70 e))) res))) (reverse res))`;
     const result = await cad.sendCommandWithResult(code);
     if (!result || result === "" || result === "nil") {
       setCache(cacheKey, []);
@@ -1314,39 +1292,33 @@ async function getEntities(params = {}) {
     setCache(cacheKey, result);
     return result;
   }
-  const offset = Math.max(0, parseInt(params.offset) || 0);
-  const limit = Math.min(Math.max(1, parseInt(params.limit) || 100), 1e3);
   try {
     const code = buildEntityCode({
       type: params.type || null,
       layer: params.layer || null,
-      bbox: params.bbox || null,
-      offset,
-      limit
+      bbox: params.bbox || null
     });
     const resultStr = await cad.sendCommandWithResult(code);
-    if (!resultStr || resultStr === "" || resultStr === "nil" || resultStr === "0") {
-      const result = { total: 0, offset, limit, entities: [] };
-      setCache(cacheKey, result);
-      return result;
+    if (!resultStr || resultStr === "" || resultStr === "nil") {
+      const result2 = { total: 0, entities: [] };
+      setCache(cacheKey, result2);
+      return result2;
     }
+    let total = 0;
+    let entities = [];
     const parsed = parseLispRecursive(resultStr);
-    if (!parsed || !Array.isArray(parsed)) {
-      const result = { total: 0, offset, limit, entities: [] };
-      setCache(cacheKey, result);
-      return result;
+    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);
     }
-    const entitiesIdx = parsed.indexOf("entities");
-    const rawEntities = entitiesIdx !== -1 && Array.isArray(parsed[entitiesIdx + 1]) ? parsed[entitiesIdx + 1] : [];
-    const data = lispPairsToObject(parsed);
-    data.entities = rawEntities.length > 0 ? rawEntities.map(parseEntity).filter(Boolean) : [];
-    data.offset = offset;
-    data.limit = limit;
-    setCache(cacheKey, data);
-    return data;
+    const result = { total, entities };
+    log(`getEntities: total=${total}, returned=${entities.length}`);
+    setCache(cacheKey, result);
+    return result;
   } catch (e) {
     log(`getEntities error: ${e.message}`);
-    const result = { total: 0, offset, limit, entities: [] };
+    const result = { total: 0, entities: [] };
     setCache(cacheKey, result);
     return result;
   }
@@ -1362,7 +1334,7 @@ async function getTexts(params = {}) {
     return result;
   }
   const offset = Math.max(0, parseInt(params.offset) || 0);
-  const limit = Math.min(Math.max(1, parseInt(params.limit) || 500), 5e3);
+  const limit = Math.min(Math.max(1, parseInt(params.limit) || 5e3), 5e3);
   try {
     const code = buildTextCode({
       layer: params.layer || null,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlisp/mcp",
-    "version": "1.4.3",
+    "version": "1.5.0",
     "description": "MCP Server for @lisp on CAD",
     "type": "module",
     "bin": {