@trops/dash-core 0.1.53 → 0.1.54

package/dist/index.js

@@ -9546,18 +9546,29 @@ function headerTemplateToRows(headerTemplate, nextRowId) {
 }
 
 /**
- * Serialize the current form state into a standard MCP JSON config string.
+ * Serialize the current form state into a bare MCP JSON config string.
  *
- * Output format:
+ * Output format (stdio):
  * {
- *   "mcpServers": {
- *     "<name>": { "command": ..., "args": [...], "env": {...} }
- *   }
+ *   "type": "stdio",
+ *   "command": "npx",
+ *   "args": ["-y", "package-name"],
+ *   "env": { "API_KEY": "${API_KEY}" }
  * }
  *
- * @param {string} name - The provider name
+ * Output format (HTTP):
+ * {
+ *   "type": "streamable_http",
+ *   "url": "https://example.com/mcp",
+ *   "headerTemplate": { "Authorization": "Bearer {{apiKey}}" }
+ * }
+ *
+ * Credential values are NOT embedded — env values use ${FIELD_NAME} syntax
+ * to reference credential fields entered separately in the form.
+ *
+ * @param {string} name - The provider name (unused in output, kept for API compat)
  * @param {string} transport - "stdio" or "streamable_http"
- * @param {object} fields - { command, args, envMappingRows, url, headerRows, credentialData }
+ * @param {object} fields - { command, args, envMappingRows, url, headerRows }
  * @returns {string} Formatted JSON string
  */
 function formStateToMcpJson(name, transport, fields) {
@@ -9570,9 +9581,7 @@ function formStateToMcpJson(name, transport, fields) {
     _fields$url = fields.url,
     url = _fields$url === void 0 ? "" : _fields$url,
     _fields$headerRows = fields.headerRows,
-    headerRows = _fields$headerRows === void 0 ? [] : _fields$headerRows,
-    _fields$credentialDat = fields.credentialData,
-    credentialData = _fields$credentialDat === void 0 ? {} : _fields$credentialDat;
+    headerRows = _fields$headerRows === void 0 ? [] : _fields$headerRows;
   var serverConfig;
   if (transport === "stdio") {
     var argsArray = args.trim().split(/\s+/).filter(Boolean);
@@ -9580,11 +9589,12 @@ function formStateToMcpJson(name, transport, fields) {
     envMappingRows.forEach(function (row) {
       var envVar = row.envVar.trim();
       var credField = row.credField.trim();
-      if (envVar) {
-        env[envVar] = credentialData[credField] || "";
+      if (envVar && credField) {
+        env[envVar] = "${".concat(credField, "}");
       }
     });
     serverConfig = {
+      type: "stdio",
       command: command.trim()
     };
     if (argsArray.length > 0) serverConfig.args = argsArray;
@@ -9592,29 +9602,36 @@ function formStateToMcpJson(name, transport, fields) {
   } else {
     // streamable_http
     serverConfig = {
+      type: "streamable_http",
       url: url.trim()
     };
-    var headers = {};
+    var headerTemplate = {};
     headerRows.forEach(function (row) {
       var hName = row.headerName.trim();
       var hValue = row.headerValue.trim();
       if (hName && hValue) {
-        headers[hName] = hValue;
+        headerTemplate[hName] = hValue;
       }
     });
-    if (Object.keys(headers).length > 0) serverConfig.headers = headers;
+    if (Object.keys(headerTemplate).length > 0) serverConfig.headerTemplate = headerTemplate;
   }
-  return JSON.stringify({
-    mcpServers: _defineProperty({}, name || "server-name", serverConfig)
-  }, null, 2);
+  return JSON.stringify(serverConfig, null, 2);
 }
 
 /**
- * Parse a standard MCP JSON config string back into form state.
+ * Parse an MCP JSON config string back into form state.
+ *
+ * Accepts multiple input formats:
+ * - Bare config: { "command": ..., "args": [...], "env": { "KEY": "${FIELD}" } }
+ * - Wrapped: { "mcpServers": { "name": { ... } } } — unwraps and uses key as providerName
  *
- * Accepts:
- * - { "mcpServers": { "name": { ... } } }
- * - Bare server config: { "command": ..., "args": [...] }
+ * Transport detection:
+ * - Explicit `type` or `transport` field
+ * - Inferred: `url` present → streamable_http, `command` present → stdio
+ *
+ * stdio env value parsing:
+ * - "${FIELD_NAME}" → envVar = key, credField = FIELD_NAME (reference syntax)
+ * - "literal-value" → envVar = key, credField = key, credentialData[key] = value
  *
  * @param {string} jsonString - The JSON to parse
  * @param {Function} nextRowId - Function that returns a unique row ID
@@ -9641,15 +9658,22 @@ function mcpJsonToFormState(jsonString, nextRowId) {
     var _entries$ = _slicedToArray(entries[0], 2);
     providerName = _entries$[0];
     serverConfig = _entries$[1];
-  } else if (parsed.command || parsed.url) {
+  } else if (parsed.command || parsed.url || parsed.type || parsed.transport) {
     serverConfig = parsed;
   } else {
     return {
-      error: "Unrecognized format: expected mcpServers object or bare server config"
+      error: "Unrecognized format: expected a server config with command, url, or type"
     };
   }
-  var isHttp = !!serverConfig.url;
-  var transport = isHttp ? "streamable_http" : "stdio";
+
+  // Determine transport from type/transport field or infer from contents
+  var explicitType = serverConfig.type || serverConfig.transport;
+  var transport;
+  if (explicitType) {
+    transport = explicitType === "stdio" ? "stdio" : "streamable_http";
+  } else {
+    transport = serverConfig.url ? "streamable_http" : "stdio";
+  }
   var result = {
     providerName: providerName,
     transport: transport,
@@ -9669,12 +9693,24 @@ function mcpJsonToFormState(jsonString, nextRowId) {
         var _ref6 = _slicedToArray(_ref5, 2),
           envVar = _ref6[0],
           value = _ref6[1];
-        result.envMappingRows.push({
-          id: nextRowId(),
-          envVar: envVar,
-          credField: envVar
-        });
-        result.credentialData[envVar] = value || "";
+        // Check for ${FIELD_NAME} reference syntax
+        var refMatch = typeof value === "string" && value.match(/^\$\{(.+)\}$/);
+        if (refMatch) {
+          // Reference syntax — credField is the extracted name, no credential value
+          result.envMappingRows.push({
+            id: nextRowId(),
+            envVar: envVar,
+            credField: refMatch[1]
+          });
+        } else {
+          // Literal value — use envVar as credField and store the value
+          result.envMappingRows.push({
+            id: nextRowId(),
+            envVar: envVar,
+            credField: envVar
+          });
+          result.credentialData[envVar] = value || "";
+        }
       });
     }
   } else {
@@ -26775,7 +26811,7 @@ var CustomMcpServerForm = function CustomMcpServerForm(_ref2) {
             setJsonError(null);
           },
           language: "json",
-          placeholder: '{\n  "mcpServers": {\n    "server-name": {\n      "command": "npx",\n      "args": ["-y", "package-name"],\n      "env": {\n        "API_KEY": "your-key"\n      }\n    }\n  }\n}'
+          placeholder: '{\n  "type": "stdio",\n  "command": "npx",\n  "args": ["-y", "package-name"],\n  "env": {\n    "API_KEY": "${API_KEY}"\n  }\n}'
         })]
       }), viewMode === "form" && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [/*#__PURE__*/jsxRuntime.jsxs("div", {