tradeblocks-mcp 2.2.0 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tradeblocks-mcp",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "MCP server for options trade analysis",
   "author": "David Romeo <davidmromeo@gmail.com>",
   "type": "module",

package/server/index.js

@@ -3186,8 +3186,8 @@ var CLOSE_KNOWN_FIELDS = /* @__PURE__ */ new Set([
 var STATIC_FIELDS = /* @__PURE__ */ new Set([
   ...DAILY_STATIC_FIELDS
 ]);
-function buildVixJoins() {
-  return VIX_TABLE_ALIASES.map((alias) => `LEFT JOIN market.daily ${alias} ON ${alias}.date = d.date AND ${alias}.ticker = '${VIX_TICKER_FOR_ALIAS[alias]}'`).join("\n      ");
+function buildVixJoins(baseAlias = "d") {
+  return VIX_TABLE_ALIASES.map((alias) => `LEFT JOIN market.daily ${alias} ON ${alias}.date = ${baseAlias}.date AND ${alias}.ticker = '${VIX_TICKER_FOR_ALIAS[alias]}'`).join("\n      ");
 }
 function buildVixSelectCols() {
   return VIX_FIELD_MAPPINGS.map((m) => `${m.tableAlias}."${m.sourceCol}" AS "${m.alias}"`).join(", ");
@@ -3296,22 +3296,28 @@ function buildOutcomeQuery(tradeDatesOrKeys) {
   if (tradeDatesOrKeys.length === 0) {
     return { sql: `SELECT * FROM market.daily WHERE 1=0`, params: [] };
   }
-  const dailyCloseCols = [...DAILY_CLOSE_FIELDS].map((f) => `d."${f}"`).join(", ");
   const vixCloseCols = VIX_FIELD_MAPPINGS.filter((m) => m.timing === "close").map((m) => `${m.tableAlias}."${m.sourceCol}" AS "${m.alias}"`).join(", ");
   const derivedCloseCols = [...DERIVED_CLOSE_FIELDS].map((f) => `cd."${f}"`).join(", ");
-  const vixJoins = buildVixJoins();
   if (typeof tradeDatesOrKeys[0] === "string") {
-    const tradeDates = tradeDatesOrKeys;
-    const placeholders = tradeDates.map((_, i) => `$${i + 1}`).join(", ");
-    const sql2 = `SELECT d.date, ${dailyCloseCols}, ${vixCloseCols}, ${derivedCloseCols}
-    FROM market.daily d
-    ${vixJoins}
-    LEFT JOIN market._context_derived cd ON cd.date = d.date
-    WHERE d.ticker = $${tradeDates.length + 1}
-      AND d.date IN (${placeholders})`;
-    return { sql: sql2, params: [...tradeDates, DEFAULT_MARKET_TICKER] };
+    return buildOutcomeQueryForDates(tradeDatesOrKeys, vixCloseCols, derivedCloseCols);
   }
-  const tradeKeys = tradeDatesOrKeys;
+  return buildOutcomeQueryForKeys(tradeDatesOrKeys, vixCloseCols, derivedCloseCols);
+}
+function buildOutcomeQueryForDates(tradeDates, vixCloseCols, derivedCloseCols) {
+  const a = "d";
+  const dailyCloseCols = [...DAILY_CLOSE_FIELDS].map((f) => `${a}."${f}"`).join(", ");
+  const placeholders = tradeDates.map((_, i) => `$${i + 1}`).join(", ");
+  const sql = `SELECT ${a}.date, ${dailyCloseCols}, ${vixCloseCols}, ${derivedCloseCols}
+    FROM market.daily ${a}
+    ${buildVixJoins(a)}
+    LEFT JOIN market._context_derived cd ON cd.date = ${a}.date
+    WHERE ${a}.ticker = $${tradeDates.length + 1}
+      AND ${a}.date IN (${placeholders})`;
+  return { sql, params: [...tradeDates, DEFAULT_MARKET_TICKER] };
+}
+function buildOutcomeQueryForKeys(tradeKeys, vixCloseCols, derivedCloseCols) {
+  const a = "m";
+  const dailyCloseCols = [...DAILY_CLOSE_FIELDS].map((f) => `${a}."${f}"`).join(", ");
   const normalizedKeys = tradeKeys.map((k) => ({
     date: k.date,
     ticker: k.ticker || DEFAULT_MARKET_TICKER
@@ -3324,13 +3330,13 @@ function buildOutcomeQuery(tradeDatesOrKeys) {
   const sql = `WITH requested(ticker, date) AS (
       VALUES ${valuePlaceholders.join(", ")}
     )
-    SELECT m.ticker, m.date, ${dailyCloseCols}, ${vixCloseCols}, ${derivedCloseCols}
-    FROM market.daily m
-    ${vixJoins.replace(/d\.date/g, "m.date")}
-    LEFT JOIN market._context_derived cd ON cd.date = m.date
+    SELECT ${a}.ticker, ${a}.date, ${dailyCloseCols}, ${vixCloseCols}, ${derivedCloseCols}
+    FROM market.daily ${a}
+    ${buildVixJoins(a)}
+    LEFT JOIN market._context_derived cd ON cd.date = ${a}.date
     JOIN requested
-      ON m.ticker = requested.ticker
-     AND m.date = requested.date`;
+      ON ${a}.ticker = requested.ticker
+     AND ${a}.date = requested.date`;
   return { sql, params: values };
 }