bug/1511 dont recognize code as SSJS if the script tag has "language=ampscript" in it

lib/metadataTypes/Journey.js

@@ -116,15 +116,15 @@ class Journey extends MetadataType {
                 let parsed;
                 if (retrieveDir) {
                     const searchName = mode === 'name' ? key.slice(5) : null;
-                    let foundKey;
+                    const foundKey = [];
                     // get extra details for saving this
                     const details = results.items
                         ? await Promise.all(
                               results.items.map(async (a) => {
                                   if (mode === 'name') {
                                       // when filtering by name, the API in fact does a LIKE search with placeholders left and right of the search term - and also searches the description field.
                                       if (searchName === a[this.definition.nameField]) {
-                                          foundKey = a[this.definition.keyField];
+                                          foundKey.push(a[this.definition.keyField]);
                                       } else {
                                           // skip because the name does not match
                                           return null;
@@ -163,7 +163,9 @@ class Journey extends MetadataType {
                     const savedMetadata = await this.saveResults(parsed, retrieveDir, null, null);
                     Util.logger.info(
                         `Downloaded: ${this.definition.type} (${Object.keys(savedMetadata).length})` +
-                            Util.getKeysString(mode === 'name' ? `${foundKey} (${key})` : key)
+                            Util.getKeysString(
+                                mode === 'name' ? `${foundKey.join(', ')} (${key})` : key
+                            )
                     );
                 } else {
                     // limit to main details for caching

lib/util/util.js

@@ -878,18 +878,26 @@ export const Util = {
         // (.*)     capture any character, zero or more times
         // /s      dotall flag
         // ideally the code looks like <script runat="server">...</script>
-        const scriptRegex = /^<\s*script [^>]*?>(.*)<\/\s*script\s*>$/s;
+
+        // regex that matches <script runat="server">...</script>, <script runat="server" language="javascript">...</script> or <script language="JavaScript" runat="server">...</script>, but it may not match <script language="ampscript" runat="server">...</script> and it may also not match <script runat="server" language="ampscript">...</script>
+        const scriptRegex =
+            /^<\s*script\s*(language=["']{1}javascript["']{1})?\s?[^>]*?runat\s*=\s*["']{1}server["']{1}\s*?(language=["']{1}javascript["']{1})?\s*>(.*)<\/\s*script\s*>$/is;
+
         code = code.trim();
         const regexMatches = scriptRegex.exec(code);
-        if (regexMatches?.length > 1) {
+        // regexMatches indexes:
+        // 1: first optional language block
+        // 2: second optional language block
+        // 3: the actual code
+        if (regexMatches?.length > 1 && regexMatches[3]) {
             // script found
             /* eslint-disable unicorn/prefer-ternary */
-            if (regexMatches[1].includes('<script')) {
+            if (regexMatches[3].includes('<script')) {
                 // nested script found
                 return null;
             } else {
-                // no nested script found
-                return regexMatches[1];
+                // no nested script found: return the assumed SSJS-code
+                return regexMatches[3];
             }
             /* eslint-enable unicorn/prefer-ternary */
         }