added client support for structuredText for kdb+ connections

KxSystems · Jan 2, 2025 · 2893f92 · 2893f92
1 parent 7108970
commit 2893f92
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 147 deletions.
diff --git a/resources/evaluate.q b/resources/evaluate.q
@@ -1,137 +1,206 @@
-{[ctx; code; stringify]
- if [-10h ~ type ctx;
- ctx: enlist ctx];
- toString: {[data]
- text : .Q.s data;
- : $[all text in " \r\n";
- .Q.s1[data] , "\n"; 
- text];
- };
- removeMultilineComments: {[text]
- text: "\n" , text;
- lines: (where text = "\n") cut text;
- potentialStart: where lines like "\n/*";
- start: potentialStart where all each (2_/:lines potentialStart) in "\t ";
- potentialEnd: where lines like "\n\\*";
- end: 1 + potentialEnd where all each (2_/:lines potentialEnd) in "\t ";
- lines[0]: 1 _ lines[0];
- boundaries: (`start,' start), (`end,' end);
- boundaries: boundaries iasc boundaries[;1];
- if [`end ~ first first boundaries;
- : "\n" sv (boundaries[0;1] - 1) # lines];
- filteredList: ();
- lastBoundary: `end;
- index: 0;
- do [count boundaries;
- if [lastBoundary <> first boundaries index;
- lastBoundary: first boundaries index;
- filteredList,: enlist boundaries index];
- index+: 1];
- result: raze first each 2 cut raze each (0, filteredList[;1]) cut lines;
- : $[result ~ ();
- "";
- result];
- };
- tokenize: {[text]
- parsed: -4!text;
- cmtInd: where ((1 < count each parsed) & parsed[;0] in "/ \t\n") & not  parsed ~\: "/:";
- parsed[cmtInd] : (parsed[cmtInd]?\:"/")#'parsed[cmtInd];
- parsed where (0 <> count each parsed)
- };
- stripTrailingSemi: {[tokenize; str]
- str: tokenize str;
- $[  ("" ~ str) or (() ~ str);
- "";
- {(neg sum &\[reverse x in "\r\n; \t"]) _ x} trim raze str]
- } tokenize;
- splitExpression: {[expr]
- tokens: -4!expr;
- newlines: where enlist["\n"] ~/: tokens;
- : "c"$raze each (0 , 1 + newlines where not tokens[1 + newlines] in enlist each " \t\r\n") _ tokens
- };
- fixSpecialSyntax: {[stripTrailingSemi; expr]
- escape: {[str]
- chars: (`char$til 255)!(string each `char$til 255);
- chars[("\\";"\"";"\t";"\n";"\r")]: ("\\\\";"\\\"";"\\t";"\\n";"\\r");
- : raze chars str;
- };
- $[  
- expr like "[kq])*";
- "value \"",(2#expr), escape[stripTrailingSemi 2_expr], "\";";
- expr like "\\*";
- "system \"", escape[trim 1_expr], "\";";
- {s:rtrim first l:(0,x ss "::")_x; (1<count l) & (all s in .Q.an) and 0 < count s} expr;
- "value \"", escape[trim expr], "\";";
- expr like "[a-zA-Z])*";
- "value \"",(2#expr), escape[2_expr], "\";";
- expr]
- } stripTrailingSemi;
- wrapLines: {[fixSpecialSyntax; expn]
- tokenizeAndSplit: {[expn]
- : $[.z.K <= 3.4;
- "\n" vs expn;
- [   
- tokens: -4!"\n" , expn;
- tokens: raze {[token; isMerged]
- $[  isMerged;
- (enlist "\n"; 1 _ token);
- enlist token]
- } ./: flip (tokens; tokens like "\n/*");
- "" sv/: 1_/:(where tokens ~\: enlist "\n") cut tokens]];
- };
- lines: @[tokenizeAndSplit;
- expn;
- {[expn; err] "\n" vs expn} expn];
- lines:{[acc; line]
- $[  0 = count acc;
- acc,: enlist line;
- (last[acc] like "[a-zA-Z])*") and line[0] in " \t/";
- [   acc[count[acc] - 1]: last[acc],"\n",line;
- acc];
- acc,: enlist line]
- }/[();] lines;
- : "\n" sv fixSpecialSyntax each lines;
- } fixSpecialSyntax;
- evalInContext: {[ctx; expressions]
- cachedCtx: string system "d";
- system "d ", ctx;
- index: 0;
- do [count expressions;
- expr: expressions index;
- isLastLine: (index + 1) = count expressions;
- if ["\n" ~ last expr;
- expr: -1_expr];
- prefix: ";[::;";
- suffix: $[(not isLastLine) and not ";" ~ last expr; ";]"; "]"];
- expr: prefix , expr , suffix;
- result: .Q.trp[{[expr] `result`errored`error`backtrace!({$[x ~ (::); (::); x]} value expr; 0b; ""; ())};
- expr;
- {[suffix; prefix; err; backtrace]
- if [err ~ enlist " ";
- err: "syntax error"];
- userCode: (-1 + last where (.Q.trp ~ first first @) each backtrace) # backtrace;
- userCode[;3]: reverse 1 + til count userCode;
- userCode[-1 + count userCode; 1; 3]: (neg count suffix) _ (count prefix) _ userCode[-1 + count userCode; 1; 3];
- userCode[-1 + count userCode; 2]-: count prefix;
- (!) . flip (
- (`result;    ::);
- (`errored;   1b);
- (`error;     err);
- (`backtrace; .Q.sbt userCode);
- (`base64;    0b))
- }[suffix; prefix]];
- if [isLastLine or result`errored;
- system "d ", cachedCtx;
- : result];
- index +: 1];
- };
- result: evalInContext[ctx; splitExpression stripTrailingSemi wrapLines removeMultilineComments code]; 
- if[result `errored; :result];
- if[type[result[`result]] = 99h;
- if[`output in key result[`result]; 
- if[type[result[`result][`output]] = 99h;
- if[`bytes in key result[`result][`output]; 
- result[`base64]:1b; result[`result]: .Q.btoa result[`result][`output][`bytes]; :result]]]];
- if [stringify; result[`result]: toString result `result];
- result
- }
+{[ctx; code; returnFormat]
+  if [-10h ~ type ctx;
+  ctx: enlist ctx];
+  toString: {[data]
+  text : .Q.s data;
+  : $[all text in " \r\n";
+  .Q.s1[data] , "\n"; 
+  text];
+  };
+  removeMultilineComments: {[text]
+  text: "\n" , text;
+  lines: (where text = "\n") cut text;
+  potentialStart: where lines like "\n/*";
+  start: potentialStart where all each (2_/:lines potentialStart) in "\t ";
+  potentialEnd: where lines like "\n\\*";
+  end: 1 + potentialEnd where all each (2_/:lines potentialEnd) in "\t ";
+  lines[0]: 1 _ lines[0];
+  boundaries: (`start,' start), (`end,' end);
+  boundaries: boundaries iasc boundaries[;1];
+  if [`end ~ first first boundaries;
+  : "\n" sv (boundaries[0;1] - 1) # lines];
+  filteredList: ();
+  lastBoundary: `end;
+  index: 0;
+  do [count boundaries;
+  if [lastBoundary <> first boundaries index;
+  lastBoundary: first boundaries index;
+  filteredList,: enlist boundaries index];
+  index+: 1];
+  result: raze first each 2 cut raze each (0, filteredList[;1]) cut lines;
+  : $[result ~ ();
+  "";
+  result];
+  };
+  tokenize: {[text]
+  parsed: -4!text;
+  cmtInd: where ((1 < count each parsed) & parsed[;0] in "/ \t\n") & not  parsed ~\: "/:";
+  parsed[cmtInd] : (parsed[cmtInd]?\:"/")#'parsed[cmtInd];
+  parsed where (0 <> count each parsed)
+  };
+  stripTrailingSemi: {[tokenize; str]
+  str: tokenize str;
+  $[  ("" ~ str) or (() ~ str);
+  "";
+  {(neg sum &\[reverse x in "\r\n; \t"]) _ x} trim raze str]
+  } tokenize;
+  splitExpression: {[expr]
+  tokens: -4!expr;
+  newlines: where enlist["\n"] ~/: tokens;
+  : "c"$raze each (0 , 1 + newlines where not tokens[1 + newlines] in enlist each " \t\r\n") _ tokens
+  };
+  fixSpecialSyntax: {[stripTrailingSemi; expr]
+  escape: {[str]
+  chars: (`char$til 255)!(string each `char$til 255);
+  chars[("\\";"\"";"\t";"\n";"\r")]: ("\\\\";"\\\"";"\\t";"\\n";"\\r");
+  : raze chars str;
+  };
+  $[  
+  expr like "[kq])*";
+  "value \"",(2#expr), escape[stripTrailingSemi 2_expr], "\";";
+  expr like "\\*";
+  "system \"", escape[trim 1_expr], "\";";
+  {s:rtrim first l:(0,x ss "::")_x; (1<count l) & (all s in .Q.an) and 0 < count s} expr;
+  "value \"", escape[trim expr], "\";";
+  expr like "[a-zA-Z])*";
+  "value \"",(2#expr), escape[2_expr], "\";";
+  expr]
+  } stripTrailingSemi;
+  wrapLines: {[fixSpecialSyntax; expn]
+  tokenizeAndSplit: {[expn]
+  : $[.z.K <= 3.4;
+  "\n" vs expn;
+  [   
+  tokens: -4!"\n" , expn;
+  tokens: raze {[token; isMerged]
+  $[  isMerged;
+  (enlist "\n"; 1 _ token);
+  enlist token]
+  } ./: flip (tokens; tokens like "\n/*");
+  "" sv/: 1_/:(where tokens ~\: enlist "\n") cut tokens]];
+  };
+  lines: @[tokenizeAndSplit;
+  expn;
+  {[expn; err] "\n" vs expn} expn];
+  lines:{[acc; line]
+  $[  0 = count acc;
+  acc,: enlist line;
+  (last[acc] like "[a-zA-Z])*") and line[0] in " \t/";
+  [   acc[count[acc] - 1]: last[acc],"\n",line;
+  acc];
+  acc,: enlist line]
+  }/[();] lines;
+  : "\n" sv fixSpecialSyntax each lines;
+  } fixSpecialSyntax;
+  evalInContext: {[ctx; expressions]
+  cachedCtx: string system "d";
+  system "d ", ctx;
+  index: 0;
+  do [count expressions;
+  expr: expressions index;
+  isLastLine: (index + 1) = count expressions;
+  if ["\n" ~ last expr;
+  expr: -1_expr];
+  prefix: ";[::;";
+  suffix: $[(not isLastLine) and not ";" ~ last expr; ";]"; "]"];
+  expr: prefix , expr , suffix;
+  result: .Q.trp[{[expr] `result`errored`error`backtrace!({$[x ~ (::); (::); x]} value expr; 0b; ""; ())};
+  expr;
+  {[suffix; prefix; err; backtrace]
+  if [err ~ enlist " ";
+  err: "syntax error"];
+  userCode: (-1 + last where (.Q.trp ~ first first @) each backtrace) # backtrace;
+  userCode[;3]: reverse 1 + til count userCode;
+  userCode[-1 + count userCode; 1; 3]: (neg count suffix) _ (count prefix) _ userCode[-1 + count userCode; 1; 3];
+  userCode[-1 + count userCode; 2]-: count prefix;
+  (!) . flip (
+  (`result;    ::);
+  (`errored;   1b);
+  (`error;     err);
+  (`backtrace; .Q.sbt userCode);
+  (`base64;    0b))
+  }[suffix; prefix]];
+  if [isLastLine or result`errored;
+  system "d ", cachedCtx;
+  : result];
+  index +: 1];
+  };
+  .axq.i_PRIMCODE: `undefined`boolean`guid`undefined`byte`short`int`long`real`float`char`symbol`timestamp`month`date`datetime`timespan`minute`second`time`enum;
+  .axq.i_NONPRIMCODE:
+  `general`booleans`guids`undefined`bytes`shorts`ints`longs`reals`floats`chars`symbols`timestamps`months`dates`datetimes`timespans`minutes`seconds`times,
+  `enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum,
+  `enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum,
+  `enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum`enum,
+  `compoundGeneral`compoundBoolean`compoundGuid`compoundUndefined`compoundByte`compoundShort`compoundInt`compoundLong`compoundReal`compoundFloat,
+  `compoundChar`compoundSymbol`compoundTimestamp`compoundMonth`compoundDate`compoundDatetime`compoundTimespan`compoundMinute`compoundSecond,
+  `compoundTime`compoundEnum`table`dictionary`lambda`unary`binary`ternary`projection`composition,
+  `$("f'";"f/";"f\\";"f':";"f/:";"f\\:";"dynamicload");
+    removeTrailingNewline: {[text]
+  if ["\n" = last text;
+  text: -1 _ text];
+  text
+  };
+  generateColumns:{[removeTrailingNewline; toString; originalType; isAtom; isKey; data; name]
+  types: $[
+  isAtom;
+  originalType;
+  originalType ~ `chars;
+  `chars;
+  .axq.i_NONPRIMCODE type data];
+  values: ('[removeTrailingNewline; toString] each data);
+  order: $[1 ~ count data; iasc enlist data; iasc data];
+  returnDictionary: `name`type`values`order!(name;types;values;order);
+  if[isKey; returnDictionary[`isKey]: isKey];
+  if[attr[data] <> `; returnDictionary[`attributes]: attr data];
+  :returnDictionary
+  }[removeTrailingNewline;toString];
+  generateTableColumns:{[generateColumns; originalType; isAtom; isKey; data]
+  if [.Q.qp data;
+  ' "Partitioned tables cannot be displayed in this view"];
+  if [0b ~ .Q.qp data;
+  ' "This view is not supported for splayed tables"];
+  generateColumns[originalType; isAtom; isKey] ./: flip (value; key) @\: flip data
+  }[generateColumns];
+  toStructuredText:{[generateTableColumns; generateColumns; data; quantity; isAtom; originalType]
+  if[(type data) ~ 10h; data: enlist data];
+  isTable: .Q.qt data;
+  isDict: 99h ~ type data;
+  columns: $[
+  isTable and isDict;
+  raze (generateTableColumns[::;0b;1b;key data]; generateTableColumns[::;0b;0b;value data]);
+  isDict;
+  (generateColumns[::;0b;1b;key data;"key"]; generateColumns[::;0b;0b;value data;"values"]);
+  isTable;
+  generateTableColumns[originalType;isAtom;0b;data];
+  ];
+  : .j.j `count`columns!(quantity; columns)
+  }[generateTableColumns; generateColumns];
+  typeOf: {$[0>type x; .axq.i_PRIMCODE neg type x; .axq.i_NONPRIMCODE type x]};
+  isAtom: {not type[x] within 0 99h};
+  // sample: {[sampleFn; sampleSize; data]
+  // sampleSize: min (sampleSize; count data);
+  // fn: $[  sampleFn ~ "random";
+  // {[sampleSize; data]
+  // $[  type[data] ~ 99h;
+  // [   ii: neg[sampleSize]?count data;
+  // (key[data] ii)!value[data]ii];
+  // neg[sampleSize]?data]
+  // };
+  // sampleFn ~ "first"; #;
+  // sampleFn ~ "last";  {neg[x]#y};
+  // ' "Unrecognized sample function"];
+  // fn[sampleSize; data]
+  // }
+  result: evalInContext[ctx; splitExpression stripTrailingSemi wrapLines removeMultilineComments code];
+  if[result `errored; :result];
+  if[type[result[`result]] = 99h;
+  if[`output in key result[`result]; 
+  if[type[result[`result][`output]] = 99h;
+  if[`bytes in key result[`result][`output]; 
+  result[`base64]:1b; result[`result]: .Q.btoa result[`result][`output][`bytes]; :result]]]];
+  if [returnFormat ~ "text";
+  result[`result]: toString result `result];
+  if [returnFormat ~ "structuredText";
+  result[`result]: toStructuredText[result `result;count result`result; isAtom result`result; typeOf result`result]];
+  result
+  }
diff --git a/src/classes/localConnection.ts b/src/classes/localConnection.ts
@@ -187,7 +187,7 @@ export class LocalConnection {
     if (isPython) {
       args.push(!!stringify, command);
     } else {
-      args.push(context ?? ".", command, !!stringify);
+      args.push(context ?? ".", command, stringify ? "text" : "structuredText");
     }
 
     args.push((err: Error, res: QueryResult) => {
@@ -219,6 +219,10 @@ export class LocalConnection {
       return { base64, result };
     }
 
+    if (!stringify) {
+      return JSON.parse(result);
+    }
+
     if (ext.isResultsTabVisible && stringify) {
       if (this.isError) {
         this.isError = false;

diff --git a/src/services/resultsPanelProvider.ts b/src/services/resultsPanelProvider.ts
@@ -197,9 +197,9 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
     );
 
     columns.forEach((column) => {
-      const { name, values, order } = column;
-      order.forEach((pos, index) => {
-        rowData[index][name] = decodeQUTF(values[pos]);
+      const { name, values } = column;
+      values.forEach((value, index) => {
+        rowData[index][name] = decodeQUTF(value);
       });
     });
 
@@ -235,7 +235,7 @@ export class KdbResultsViewProvider implements WebviewViewProvider {
     let rowData = [];
     let columnDefs = [];
 
-    if (connVersion && compareVersions(connVersion, 1.12)) {
+    if (!isInsights || (connVersion && compareVersions(connVersion, 1.12))) {
       rowData = this.updatedExtractRowData(results);
       columnDefs = this.updatedExtractColumnDefs(results);
     } else {