move error matcher definition into dedicated file

lib/codeql.js

@@ -22,6 +22,7 @@ const globalutil = __importStar(require("util"));
 const v4_1 = __importDefault(require("uuid/v4"));
 const api = __importStar(require("./api-client"));
 const defaults = __importStar(require("./defaults.json")); // Referenced from codeql-action-sync-tool!
+const error_matcher_1 = require("./error_matcher");
 const exec_wrapper_1 = require("./exec_wrapper");
 const util = __importStar(require("./util"));
 /**
@@ -296,7 +297,7 @@ function getCodeQLForCmd(cmd) {
                 databasePath,
                 '--',
                 traceCommand
-            ], [[0, new RegExp("(No source code was seen during the build\\.|No JavaScript or TypeScript code found\\.)"), 'foo bar']]);
+            ], error_matcher_1.error_matchers);
         },
         finalizeDatabase: async function (databasePath) {
             await exec_wrapper_1.exec_wrapper(cmd, [
@@ -304,7 +305,7 @@ function getCodeQLForCmd(cmd) {
                 'finalize',
                 ...getExtraOptionsFromEnv(['database', 'finalize']),
                 databasePath
-            ], [[0, new RegExp("(No source code was seen during the build\\.|No JavaScript or TypeScript code found\\.)"), 'foo bar']]);
+            ], error_matcher_1.error_matchers);
         },
         resolveQueries: async function (queries, extraSearchPath) {
             const codeqlArgs = [

lib/error_matcher.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.error_matchers = [
+    [32, new RegExp("No JavaScript or TypeScript code found\\."), 'foo bar']
+];
+//# sourceMappingURL=error_matcher.js.map

lib/error_matcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error_matcher.js","sourceRoot":"","sources":["../src/error_matcher.ts"],"names":[],"mappings":";;AAGa,QAAA,cAAc,GAAmB;IAC5C,CAAC,EAAE,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC,EAAE,SAAS,CAAC;CACzE,CAAC"}

lib/exec_wrapper.js

@@ -64,7 +64,7 @@ async function exec_wrapper(commandLine, args, matchers, options) {
         return returnState;
     if (matchers) {
         for (const [customCode, regex, message] of matchers) {
-            if (customCode === returnState || regex.test(stderr) || regex.test(stdout)) {
+            if (customCode === returnState || regex && (regex.test(stderr) || regex.test(stdout))) {
                 throw new Error(message);
             }
         }

lib/exec_wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec_wrapper.js","sourceRoot":"","sources":["../src/exec_wrapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAMtC;;;;;;;;;;GAUG;AACI,KAAK,UAAU,YAAY,CAAC,WAAmB,EAAE,IAAe,EACpC,QAAyB,EACzB,OAAwB;;IAEzD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,IAAI,SAAS,GAAG;QACd,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,aAAA,OAAO,0CAAE,SAAS,0CAAE,MAAM,MAAK,SAAS,EAAE;gBAC5C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAChC;iBAAM;gBACL,2FAA2F;gBAC3F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;QAEH,CAAC;QACD,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,aAAA,OAAO,0CAAE,SAAS,0CAAE,MAAM,MAAK,SAAS,EAAE;gBAC5C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAChC;iBAAM;gBACL,2FAA2F;gBAC3F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;QACH,CAAC;KACF,CAAC;IAEF,0GAA0G;IAC1G,IAAI,WAAyB,CAAC;IAC9B,IAAI;QACF,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAC3B,WAAW,EACX,IAAI,EACJ;YACE,GAAG,OAAO;YACV,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;KACN;IAAC,OAAO,CAAC,EAAE;QACV,WAAW,GAAG,CAAC,CAAC;KACjB;IAED,mEAAmE;IACnE,IAAI,WAAW,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAE1C,IAAI,QAAQ,EAAE;QACZ,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YACnD,IAAI,UAAU,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAG;gBAC3E,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;aAC1B;SACF;KACF;IAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACnC,qFAAqF;QACrF,UAAI,OAAO,0CAAE,gBAAgB,EAAE;YAC7B,OAAO,WAAW,CAAC;SACpB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,WAAW,4BAA4B,WAAW,EAAE,CAAC,CAAC;SACxF;KACF;SAAM;QACL,MAAM,WAAW,CAAC;KACnB;AACH,CAAC;AAjED,oCAiEC"}
+{"version":3,"file":"exec_wrapper.js","sourceRoot":"","sources":["../src/exec_wrapper.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAAsC;AAKtC;;;;;;;;;;GAUG;AACI,KAAK,UAAU,YAAY,CAAC,WAAmB,EAAE,IAAe,EACpC,QAAyB,EACzB,OAAwB;;IAEzD,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,IAAI,SAAS,GAAG;QACd,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,aAAA,OAAO,0CAAE,SAAS,0CAAE,MAAM,MAAK,SAAS,EAAE;gBAC5C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAChC;iBAAM;gBACL,2FAA2F;gBAC3F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;QAEH,CAAC;QACD,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;;YACvB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,aAAA,OAAO,0CAAE,SAAS,0CAAE,MAAM,MAAK,SAAS,EAAE;gBAC5C,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAChC;iBAAM;gBACL,2FAA2F;gBAC3F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5B;QACH,CAAC;KACF,CAAC;IAEF,0GAA0G;IAC1G,IAAI,WAAyB,CAAC;IAC9B,IAAI;QACF,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAC3B,WAAW,EACX,IAAI,EACJ;YACE,GAAG,OAAO;YACV,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;KACN;IAAC,OAAO,CAAC,EAAE;QACV,WAAW,GAAG,CAAC,CAAC;KACjB;IAED,mEAAmE;IACnE,IAAI,WAAW,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAE1C,IAAI,QAAQ,EAAE;QACZ,KAAK,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YACnD,IAAI,UAAU,KAAK,WAAW,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAG;gBACtF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;aAC1B;SACF;KACF;IAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACnC,qFAAqF;QACrF,UAAI,OAAO,0CAAE,gBAAgB,EAAE;YAC7B,OAAO,WAAW,CAAC;SACpB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,iBAAiB,WAAW,4BAA4B,WAAW,EAAE,CAAC,CAAC;SACxF;KACF;SAAM;QACL,MAAM,WAAW,CAAC;KACnB;AACH,CAAC;AAjED,oCAiEC"}

src/codeql.ts

@@ -12,6 +12,7 @@ import uuidV4 from 'uuid/v4';
 
 import * as api from './api-client';
 import * as defaults from './defaults.json'; // Referenced from codeql-action-sync-tool!
+import { errorMatchers} from './error_matcher';
 import { exec_wrapper } from './exec_wrapper';
 import { Language } from './languages';
 import * as util from './util';
@@ -390,7 +391,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
           '--',
           traceCommand
         ],
-        [[0, new RegExp("(No source code was seen during the build\\.|No JavaScript or TypeScript code found\\.)"), 'foo bar']]
+        errorMatchers
       );
     },
     finalizeDatabase: async function(databasePath: string) {
@@ -401,7 +402,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
           ...getExtraOptionsFromEnv(['database', 'finalize']),
           databasePath
         ],
-        [[0, new RegExp("(No source code was seen during the build\\.|No JavaScript or TypeScript code found\\.)"), 'foo bar']]);
+        errorMatchers);
     },
     resolveQueries: async function(queries: string[], extraSearchPath: string | undefined) {
       const codeqlArgs = [

src/error_matcher.ts

@@ -0,0 +1,19 @@
+
+export type ErrorMatcher = [number|null, RegExp|null, string];
+
+const namedMatchers: { [key: string]: ErrorMatcher } = {
+  noSourceCodeFound: [
+    32,
+    null,
+    `No source code was seen during the build. Please see...
+https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-code-scanning#no-code-found-during-the-build`
+  ],
+  noSourceCodeFoundJavascript: [
+    null,
+    new RegExp("No JavaScript or TypeScript code found\\."),
+    `No source code was seen during the build. Please see...
+https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-code-scanning#no-code-found-during-the-build`
+  ]
+};
+
+export const errorMatchers = Object.values(namedMatchers);

src/exec_wrapper.test.ts

@@ -1,7 +1,8 @@
 import * as exec from '@actions/exec';
 import test from 'ava';
 
-import { exec_wrapper, ErrorMatcher } from './exec_wrapper';
+import { ErrorMatcher } from './error_matcher';
+import { exec_wrapper } from './exec_wrapper';
 import {setupTests} from './testing-utils';
 // import fs from 'fs';
 

src/exec_wrapper.ts

@@ -1,8 +1,7 @@
 import * as exec from '@actions/exec';
 import * as im from '@actions/exec/lib/interfaces';
 
-
-export type ErrorMatcher = [number, RegExp, string];
+import {ErrorMatcher} from './error_matcher';
 
 /**
  * Wrapper for exec.exec which checks for specific return code and/or regex matches in console output.
@@ -64,7 +63,7 @@ export async function exec_wrapper(commandLine: string, args?: string[],
 
   if (matchers) {
     for (const [customCode, regex, message] of matchers) {
-      if (customCode === returnState || regex.test(stderr) || regex.test(stdout) ) {
+      if (customCode === returnState || regex && (regex.test(stderr) || regex.test(stdout)) ) {
         throw new Error(message);
       }
     }