Improve parsing of SPL2 modules for statement names to handle strings, fields, functions, comments.

.github/workflows/package-acceptance-test.yaml

@@ -22,7 +22,7 @@ jobs:
     - run: node --version
     - run: npm install
     - run: npm list
-    - run: npm run compile
+    - run: npm run package
     - run: npm install -g @vscode/vsce
     - run: vsce package
     - uses: actions/upload-artifact@v3

.gitignore

@@ -20,5 +20,5 @@ out/package.json
 .vscode-test
 **/out/notebooks/*.js
 **/out/notebooks/*.map
-**/out/notebooks/spl2/*.js
-**/out/notebooks/spl2/*.map
+**/out/notebooks/**/*.js
+**/out/notebooks/**/*.map

out/notebooks/controller.ts

@@ -8,7 +8,7 @@ import {
     getSearchJobResults,
     wait,
 } from './splunk';
-import { splunkMessagesToOutputItems } from './utils';
+import { splunkMessagesToOutputItems } from './utils/messages';
 
 export class SplunkController {
     public notebookType: string;

out/notebooks/spl2/controller.ts

@@ -5,7 +5,7 @@ import {
     getClient,
 } from '../splunk';
 import { SplunkController } from '../controller';
-import { splunkMessagesToOutputItems } from '../utils';
+import { splunkMessagesToOutputItems } from '../utils/messages';
 import { getAppSubNamespace } from './serializer';
 
 export class Spl2Controller extends SplunkController {

out/notebooks/splunk.ts

@@ -1,7 +1,8 @@
 import * as splunk from 'splunk-sdk';
 import * as needle from 'needle'; // transitive dependency of splunk-sdk
 import * as vscode from 'vscode';
-import { SplunkMessage } from './utils';
+import { SplunkMessage } from './utils/messages';
+import { getModuleStatements } from './utils/parsing';
 
 export function getClient() {
     const config = vscode.workspace.getConfiguration();
@@ -138,16 +139,14 @@ export function dispatchSpl2Module(service: any, spl2Module: string, app: string
     namespace = '';
     app = app || 'search'; // default to search app
     // Get last statement assignment '$my_statement = ...' -> 'my_statement' 
-    const statementMatches = [...spl2Module.matchAll(/^\s*\$([a-zA-Z0-9_]+)[\s]*=/gm)];
-    if (!statementMatches
-        || statementMatches.length < 1
-        || statementMatches[statementMatches.length - 1].length < 2) {
+    const statements = getModuleStatements(spl2Module);
+    if (!statements || (statements.length < 1)) {
         throw new Error(
             'No statements found in SPL2. Please assign at least one statement name ' +
             'using "$". For example: `$my_statement = from _internal`'
         );
     }
-    const statementIdentifier = statementMatches[statementMatches.length - 1][1];
+    const statementIdentifier = statements[statements.length - 1];
     const params = {
         'timezone': 'Etc/UTC',
         'collectFieldSummary': true,

out/notebooks/utils/parsing.ts

@@ -0,0 +1,98 @@
+/**
+ * This helper function retrieves the names of all module-level search statements
+ * 
+ * @param spl2Module module contents
+ * @returns array of regex matches of statements capturing names of each statement
+ */
+export function getModuleStatements(spl2Module: string): string[] {
+    // Remove anything within comments, field literals, string
+    // literals, or between braces { .. } which will eliminate
+    // function/lambda params like `$it -> { $p = 1 }`
+    // and commented-out statements like /* $out = from [{}] */
+    let inBlockComment = false; // /* .. */
+    let inField = false; // ' .. '
+    let inString = false; // " .. "
+    let inLineComment = false; // // .. <EOL>
+    let braceLevel = 0; // { .. }
+
+    let newModule = '';
+    let prev = '';
+    while (spl2Module.length > 0) {
+        let indx = 0;
+        let next = spl2Module.charAt(indx++);
+        let peeked = peek(spl2Module);
+        let crlf = (next === '\r' && peeked === '\n');
+        let newLine = crlf || (next === '\n');
+        if (inBlockComment) {
+            if (next === '*' && peeked === '/') {
+                inBlockComment = false; // exit block comment
+                indx++; // move past */
+            }
+        } else if (inField) {
+            if (next === '\'' && prev !== '\\') { // ignore \'
+                inField = false; // exit field literal
+            }
+        } else if (inString) {
+            if (newLine || (next === '"' && prev !== '\\')) { // ignore \"
+                inString = false; // exit string literal
+                if (crlf) {
+                    indx++; // move past \r\n
+                }
+            }
+        } else if (inLineComment) {
+            if (newLine) {
+                inLineComment = false; // exit line comment
+                if (crlf) {
+                    indx++; // move past \r\n
+                }
+            }
+        } else if (braceLevel > 0) {
+            if (next === '{') {
+                braceLevel++;
+            } else if (next === '}') {
+                braceLevel--;
+            }
+            if (braceLevel === 0) {
+                // insert newlines after blocks like function and dataset declarations
+                // to start new statements/declarations on new lines when possible
+                newModule += '\n';
+            }
+        } else {
+            // Check for entering new block
+            switch (next) {
+                case '/':
+                    if (peeked === '/') {
+                        inLineComment = true;
+                        indx++; // move past //
+                    } else if (peeked === '*') {
+                        inBlockComment = true;
+                        indx++; // move past /*
+                    }
+                    break;
+                case '\'':
+                    inField = true;
+                    break;
+                case '"':
+                    inString = true;
+                    break;
+                case '{':
+                    braceLevel++;
+                    break;
+            }
+            // if we're not in one of the blocks above, write to cleaned module
+            if (!inBlockComment && !inField && !inString && !inLineComment && braceLevel === 0) {
+                newModule += next;
+            }
+        }
+        spl2Module = spl2Module.substring(indx, spl2Module.length);
+    }
+
+    // Match anything that looks like `$statement_1 = ...` and return the statement names
+    return [...newModule.matchAll(/^\s*\$([a-zA-Z0-9_]+)[\s]*=/gm)]
+        .map(group => (group.length > 1) ? group[1] : null)
+        .filter(val => (val !== null));
+}
+
+function peek(str: string): string {
+    return (str.length > 1) ? str.charAt(1) : "";
+}

package.json

@@ -489,9 +489,10 @@
     },
     "scripts": {
         "lint": "eslint .",
-        "pretest": "npm run lint",
+        "pretest": "npm run compile",
         "test": "mocha",
-        "compile": "webpack --mode=production",
+        "package": "webpack --mode=production",
+        "compile": "tsc -p tsconfig.json",
         "compile-tests": "tsc -p tsconfig-test.json",
         "watch": "webpack --watch --mode none"
     }

test/spl2.test.js

@@ -0,0 +1,76 @@
+const { assert } = require('chai');
+const { getModuleStatements } = require("../out/notebooks/utils/parsing");
+
+describe('splunk', () => {
+    describe('getModuleStatements()', () => {
+        it('should find a single statement', () => {
+            const module = `
+                $out = from a;
+            `;
+            const statements = getModuleStatements(module);
+            assert.equal(statements.length, 1);
+            assert.equal(statements[0], 'out');
+        });
+        it('should find each statement when several specified', () => {
+            const module = `
+                $out1 = from a;
+                $out2 = from b;
+                $out3 = from c;
+            `;
+            const statements = getModuleStatements(module);
+            assert.equal(statements.length, 3);
+            assert.equal(statements[0], 'out1');
+            assert.equal(statements[1], 'out2');
+            assert.equal(statements[2], 'out3');
+        });
+        it('should ignore single line comments', () => {
+            const module = `
+                //$out1 = from a;
+                $out2 = from b; // $out3 = from c;
+                // $out4 = from c;
+            `;
+            const statements = getModuleStatements(module);
+            assert.equal(statements.length, 1);
+            assert.equal(statements[0], 'out2');
+        });
+        it('should ignore block comments', () => {
+            const module = `
+                /*$out1 = from a;
+                */$out2 /* * */= from b;
+                /* $out3 = from c;*/
+            `;
+            const statements = getModuleStatements(module);
+            assert.equal(statements.length, 1);
+            assert.equal(statements[0], 'out2');
+        });
+        it('should handle complex comment, field, and function scenarios', () => {
+            const module = `
+                $out1 = from [{s:1}]
+                | eval foo = map([1,2], $it -> {
+                    $lp1 = 1;
+                    return $f;
+                });
+                function func1()
+                dataset ds1 {
+                  '
+                  $dsfield = ': "value"
+                }
+                function func2() {
+                  $p1 = 1;
+                  $p2 = $p1 + 1;
+                  return $p2
+                } $out2 = from [{s:2}] | where '$foo=bar'=2;
+                $out3  /* $f1 = 1;
+                $f2 = 2
+                */ = from [{s:3}];
+                $out4 = from [{'
+                $fieldval = ': "error"}];`;
+            const statements = getModuleStatements(module);
+            assert.equal(statements.length, 4);
+            assert.equal(statements[0], 'out1');
+            assert.equal(statements[1], 'out2');
+            assert.equal(statements[2], 'out3');
+            assert.equal(statements[3], 'out4');
+        });
+    });
+});