cmx-sdk 0.2.6 → 0.2.8

package/dist/index.js

@@ -22,6 +22,46 @@ var CmxApiError = class extends Error {
 
 // src/core/sdk-fetcher.ts
 var DEFAULT_API_URL = "https://app.cmx-ai.org";
+function stringifyErrorValue(value) {
+  if (typeof value === "string") return value;
+  if (value === null || value === void 0) return "";
+  if (typeof value === "object") {
+    const objectValue = value;
+    if (typeof objectValue.message === "string" && objectValue.message.length > 0) {
+      return objectValue.message;
+    }
+    try {
+      return JSON.stringify(value);
+    } catch {
+      return String(value);
+    }
+  }
+  return String(value);
+}
+function parseSdkErrorBody(body, status) {
+  const fallbackMessage = `API error: ${status}`;
+  if (!body) {
+    return { message: fallbackMessage };
+  }
+  try {
+    const parsed = JSON.parse(body);
+    const main = stringifyErrorValue(parsed.error ?? parsed.message);
+    const details = stringifyErrorValue(parsed.details);
+    const code = typeof parsed.code === "string" ? parsed.code : void 0;
+    const message = [main, details].filter((part, index, parts) => part.length > 0 && parts.indexOf(part) === index).join(" | ");
+    return {
+      message: message || fallbackMessage,
+      code
+    };
+  } catch {
+    return { message: body };
+  }
+}
+async function toCmxApiError(response) {
+  const body = await response.text();
+  const { message, code } = parseSdkErrorBody(body, response.status);
+  return new CmxApiError(message, response.status, code);
+}
 function getSdkApiBaseUrl() {
   const apiUrl = process.env.CMX_API_URL || DEFAULT_API_URL;
   return `${apiUrl}/api/v1/sdk`;
@@ -50,8 +90,7 @@ async function sdkFetcher(path, options) {
   };
   const response = await fetch(url, fetchOptions);
   if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: "Unknown error" }));
-    throw new CmxApiError(error.error || `API error: ${response.status}`, response.status, error.code);
+    throw await toCmxApiError(response);
   }
   return response.json();
 }
@@ -68,8 +107,7 @@ async function sdkCustomInstance(url, options) {
     }
   });
   if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: "Unknown error" }));
-    throw new CmxApiError(error.error || `API error: ${response.status}`, response.status, error.code);
+    throw await toCmxApiError(response);
   }
   return response.json();
 }
@@ -90,8 +128,7 @@ async function sdkFetchWithTags(path, tags, revalidate) {
   };
   const response = await fetch(url, fetchOptions);
   if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: "Unknown error" }));
-    throw new CmxApiError(error.error || `API error: ${response.status}`, response.status, error.code);
+    throw await toCmxApiError(response);
   }
   return response.json();
 }
@@ -109,8 +146,7 @@ async function sdkPostFetcher(path, body) {
     cache: "no-store"
   });
   if (!response.ok) {
-    const error = await response.json().catch(() => ({ error: "Unknown error" }));
-    throw new CmxApiError(error.error || `API error: ${response.status}`, response.status, error.code);
+    throw await toCmxApiError(response);
   }
   return response.json();
 }
@@ -783,7 +819,7 @@ function getZodTypeName(zodType) {
 // src/mdx/validator.ts
 import { compile } from "@mdx-js/mdx";
 var FORBIDDEN_PATTERNS = [
-  // import/export statements
+  // import/export statements (at MDX level, not inside code blocks)
   { pattern: /^\s*import\s+/m, message: "import\u6587\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093" },
   { pattern: /^\s*export\s+/m, message: "export\u6587\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093" },
   // JS expressions in curly braces (except component props)
@@ -800,21 +836,111 @@ var FORBIDDEN_PATTERNS = [
   // data: URLs (for images - can be XSS vector)
   { pattern: /src\s*=\s*["']?\s*data:/i, message: "data: URL\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093" }
 ];
+function stripCodeBlocksForPatternCheck(mdx) {
+  let result = mdx.replace(/<CodeBlock[^>]*>([^]*?)<\/CodeBlock>/g, (_match, content) => {
+    const newlineCount = (content.match(/\n/g) || []).length;
+    return "<CodeBlock>__CODE_PLACEHOLDER__" + "\n".repeat(newlineCount) + "</CodeBlock>";
+  });
+  result = result.replace(/```[\s\S]*?```/g, (match) => {
+    const newlineCount = (match.match(/\n/g) || []).length;
+    return "```__CODE_PLACEHOLDER__" + "\n".repeat(Math.max(0, newlineCount - 1)) + "```";
+  });
+  return result;
+}
+function escapeCodeBlocksForCompile(mdx) {
+  let result = mdx.replace(/<CodeBlock([^>]*)>([^]*?)<\/CodeBlock>/g, (_match, attrs, content) => {
+    const escapedContent = content.replace(/^(\s*)(import|export)\s/gm, "$1/* $2 */ ").replace(/\{/g, "&#123;").replace(/\}/g, "&#125;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    return `<CodeBlock${attrs}>${escapedContent}</CodeBlock>`;
+  });
+  result = result.replace(/```([a-z]*)\n([\s\S]*?)```/g, (_match, lang, content) => {
+    const escapedContent = content.replace(/^(\s*)(import|export)\s/gm, "$1/* $2 */ ").replace(/\{/g, "&#123;").replace(/\}/g, "&#125;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    return "```" + lang + "\n" + escapedContent + "```";
+  });
+  return result;
+}
 function extractComponents(mdx) {
   const components = [];
   const lines = mdx.split("\n");
-  const componentPattern = /<([A-Z][a-zA-Z0-9]*)\s*([^>]*?)\s*\/?>/g;
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    let match;
-    while ((match = componentPattern.exec(line)) !== null) {
-      const name = match[1];
-      const propsString = match[2];
-      const props = parseProps(propsString);
+  const lineOffsets = [];
+  let offset = 0;
+  for (const line of lines) {
+    lineOffsets.push(offset);
+    offset += line.length + 1;
+  }
+  function getLineNumber(index) {
+    let lo = 0, hi = lineOffsets.length - 1;
+    while (lo < hi) {
+      const mid = Math.floor((lo + hi + 1) / 2);
+      if (lineOffsets[mid] <= index) {
+        lo = mid;
+      } else {
+        hi = mid - 1;
+      }
+    }
+    return lo + 1;
+  }
+  const stack = [];
+  let i = 0;
+  while (i < mdx.length) {
+    if (mdx[i] !== "<") {
+      i++;
+      continue;
+    }
+    const tagStart = i;
+    i++;
+    if (mdx[i] === "/") {
+      i++;
+      const closeMatch = mdx.slice(i).match(/^([A-Z][a-zA-Z0-9]*)\s*>/);
+      if (closeMatch) {
+        const closingName = closeMatch[1];
+        i += closeMatch[0].length;
+        for (let s = stack.length - 1; s >= 0; s--) {
+          if (stack[s].name === closingName) {
+            const opening = stack[s];
+            const children = mdx.slice(opening.contentStart, tagStart).trim();
+            const props = parseProps(opening.propsString);
+            if (children) {
+              props.children = children;
+            }
+            components.push({
+              name: opening.name,
+              props,
+              line: opening.line
+            });
+            stack.splice(s, 1);
+            break;
+          }
+        }
+      }
+      continue;
+    }
+    if (mdx[i] === "!" && mdx[i + 1] === "-" && mdx[i + 2] === "-") {
+      const commentEnd = mdx.indexOf("-->", i + 3);
+      i = commentEnd !== -1 ? commentEnd + 3 : mdx.length;
+      continue;
+    }
+    const tagMatch = mdx.slice(i).match(/^([A-Z][a-zA-Z0-9]*)([\s\S]*?)(\/)?>/);
+    if (!tagMatch) {
+      continue;
+    }
+    const name = tagMatch[1];
+    const attrsPart = tagMatch[2].trim();
+    const isSelfClosing = tagMatch[3] === "/";
+    i += tagMatch[0].length;
+    if (isSelfClosing) {
       components.push({
         name,
-        props,
-        line: i + 1
+        props: parseProps(attrsPart),
+        line: getLineNumber(tagStart)
+      });
+    } else {
+      stack.push({
+        name,
+        propsString: attrsPart,
+        tagStart,
+        contentStart: tagStart + 1 + tagMatch[0].length,
+        // after '>'
+        line: getLineNumber(tagStart)
       });
     }
   }
@@ -879,9 +1005,10 @@ function extractReferences(components) {
 async function validateMdx(mdx) {
   const errors = [];
   const warnings = [];
+  const mdxWithoutCodeBlocks = stripCodeBlocksForPatternCheck(mdx);
   for (const { pattern, message } of FORBIDDEN_PATTERNS) {
-    if (pattern.test(mdx)) {
-      const lines = mdx.split("\n");
+    if (pattern.test(mdxWithoutCodeBlocks)) {
+      const lines = mdxWithoutCodeBlocks.split("\n");
       for (let i = 0; i < lines.length; i++) {
         if (pattern.test(lines[i])) {
           errors.push({
@@ -894,10 +1021,10 @@ async function validateMdx(mdx) {
       }
     }
   }
+  const escapedMdx = escapeCodeBlocksForCompile(mdx);
   try {
-    await compile(mdx, {
+    await compile(escapedMdx, {
       development: false
-      // Minimal compilation to check syntax
     });
   } catch (error) {
     const err = error;
@@ -908,7 +1035,8 @@ async function validateMdx(mdx) {
       column: err.column
     });
   }
-  const components = extractComponents(mdx);
+  const mdxForComponentExtraction = stripCodeBlocksForPatternCheck(mdx);
+  const components = extractComponents(mdxForComponentExtraction);
   for (const component of components) {
     if (!isValidComponent(component.name)) {
       errors.push({
@@ -941,8 +1069,9 @@ async function validateMdx(mdx) {
 }
 function quickValidateMdx(mdx) {
   const errors = [];
+  const mdxWithoutCodeBlocks = stripCodeBlocksForPatternCheck(mdx);
   for (const { pattern, message } of FORBIDDEN_PATTERNS) {
-    if (pattern.test(mdx)) {
+    if (pattern.test(mdxWithoutCodeBlocks)) {
       errors.push({
         type: "forbidden",
         message