@softeria/ms-365-mcp-server 0.145.1 → 0.145.2

package/dist/normalize-tool-schema.js

@@ -1,5 +1,6 @@
 import { ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import logger from "./logger.js";
+const MAX_INLINE_GROWTH = 2;
 function unescapePointer(token) {
   return token.replace(/~1/g, "/").replace(/~0/g, "~");
 }
@@ -51,6 +52,78 @@ function repointRefs(node, nameFor) {
     }
   }
 }
+function hasDef(defs, name) {
+  return Object.prototype.hasOwnProperty.call(defs, name);
+}
+function defRefName(value) {
+  const prefix = "#/$defs/";
+  return typeof value === "string" && value.startsWith(prefix) ? value.slice(prefix.length) : null;
+}
+function collectDefRefNames(node, out) {
+  if (!node || typeof node !== "object") return;
+  if (Array.isArray(node)) {
+    for (const item of node) collectDefRefNames(item, out);
+    return;
+  }
+  for (const [key, value] of Object.entries(node)) {
+    const name = key === "$ref" ? defRefName(value) : null;
+    if (name === null) collectDefRefNames(value, out);
+    else out.add(name);
+  }
+}
+function collectSiblingRefNames(node, out) {
+  if (!node || typeof node !== "object") return;
+  if (Array.isArray(node)) {
+    for (const item of node) collectSiblingRefNames(item, out);
+    return;
+  }
+  const record = node;
+  const name = defRefName(record.$ref);
+  if (name !== null && Object.keys(record).length > 1) out.add(name);
+  for (const value of Object.values(record)) collectSiblingRefNames(value, out);
+}
+function findCyclicDefs(defs) {
+  const edges = /* @__PURE__ */ new Map();
+  for (const [name, value] of Object.entries(defs)) {
+    const out = /* @__PURE__ */ new Set();
+    collectDefRefNames(value, out);
+    edges.set(name, out);
+  }
+  const cyclic = /* @__PURE__ */ new Set();
+  for (const start of edges.keys()) {
+    const seen = /* @__PURE__ */ new Set();
+    const stack = [...edges.get(start) ?? []];
+    while (stack.length > 0) {
+      const next = stack.pop();
+      if (next === start) {
+        cyclic.add(start);
+        break;
+      }
+      if (seen.has(next)) continue;
+      seen.add(next);
+      for (const onward of edges.get(next) ?? []) stack.push(onward);
+    }
+  }
+  return cyclic;
+}
+function inlineDefRefs(node, defs, pinned, expand) {
+  if (!node || typeof node !== "object") return node;
+  if (Array.isArray(node)) return node.map((item) => inlineDefRefs(item, defs, pinned, expand));
+  const record = node;
+  const name = defRefName(record.$ref);
+  if (name !== null && hasDef(defs, name) && !pinned.has(name)) {
+    const siblings = {};
+    for (const [key, value] of Object.entries(record)) {
+      if (key !== "$ref") siblings[key] = inlineDefRefs(value, defs, pinned, expand);
+    }
+    return { ...structuredClone(expand(name)), ...siblings };
+  }
+  const out = {};
+  for (const [key, value] of Object.entries(record)) {
+    out[key] = inlineDefRefs(value, defs, pinned, expand);
+  }
+  return out;
+}
 function normalizeToolSchemaRefs(schema) {
   const targets = /* @__PURE__ */ new Set();
   collectBadRefTargets(schema, targets);
@@ -85,8 +158,37 @@ function normalizeToolSchemaRefs(schema) {
   repointRefs(clone, nameFor);
   for (const name of Object.keys(defs)) repointRefs(defs[name], nameFor);
   const existingDefs = clone.$defs ?? {};
+  delete clone.$defs;
+  const pinned = findCyclicDefs(defs);
+  collectSiblingRefNames(clone, pinned);
+  for (const value of Object.values(defs)) collectSiblingRefNames(value, pinned);
+  for (const value of Object.values(existingDefs)) collectSiblingRefNames(value, pinned);
+  for (const name of [...pinned]) {
+    if (!hasDef(defs, name)) pinned.delete(name);
+  }
+  if (pinned.size > 0) {
+    clone.$defs = { ...existingDefs, ...defs };
+    return clone;
+  }
+  const memo = /* @__PURE__ */ new Map();
+  const expand = (name) => {
+    if (memo.has(name)) return memo.get(name);
+    const value = inlineDefRefs(defs[name], defs, pinned, expand);
+    memo.set(name, value);
+    return value;
+  };
+  const inlined = inlineDefRefs(clone, defs, pinned, expand);
+  if (Object.keys(existingDefs).length > 0) {
+    inlined.$defs = Object.fromEntries(
+      Object.entries(existingDefs).map(([name, value]) => [
+        name,
+        inlineDefRefs(value, defs, pinned, expand)
+      ])
+    );
+  }
   clone.$defs = { ...existingDefs, ...defs };
-  return clone;
+  const grewTooMuch = JSON.stringify(inlined).length > JSON.stringify(clone).length * MAX_INLINE_GROWTH;
+  return grewTooMuch ? clone : inlined;
 }
 function installToolSchemaRefNormalization(server) {
   const lowLevel = server.server;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@softeria/ms-365-mcp-server",
   "mcpName": "io.github.Softeria/ms-365-mcp-server",
-  "version": "0.145.1",
+  "version": "0.145.2",
   "description": " A Model Context Protocol (MCP) server for interacting with Microsoft 365 and Office services through the Graph API",
   "type": "module",
   "main": "dist/index.js",