mcdev 4.3.2 → 4.3.4

package/.fork/.prettierrc

@@ -0,0 +1,6 @@
+{
+  "useTabs": false,
+  "tabWidth": 2,
+  "printWidth": 40,
+  "trailingComma": "none"
+}

package/.fork/custom-commands.json

@@ -10,5 +10,17 @@
       "type": "url",
       "url": "https://github.com/Accenture/sfmc-devtools/compare/develop...$shortname?expand=1"
     }
+  },
+  {
+    "name": "Create PR to hotfix branch",
+    "target": "ref",
+    "refTargets": [
+      "localbranch",
+      "remotebranch"
+    ],
+    "action": {
+      "type": "url",
+      "url": "https://github.com/Accenture/sfmc-devtools/compare/hotfix...$shortname?expand=1"
+    }
   }
-]
+]

package/.github/ISSUE_TEMPLATE/bug.yml

@@ -39,6 +39,8 @@ body:
           label: Version
           description: What version of our software are you running? (mcdev --version)
           options:
+              - 4.3.4
+              - 4.3.3
               - 4.3.2
               - 4.3.1
               - 4.3.0

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,5 @@
 # PR details
 
-## What is the purpose of this pull request? (put an "X" next to an item)
-
-_Please delete options that are not relevant._
-
-- [ ] Documentation update
-- [ ] Bugfix
-- [ ] New metadata support
-- [ ] Enhanced metadata
-- [ ] Add a CLI option
-- [ ] Add something to the core
-- [ ] Technical debt removed
-- [ ] Dependencies added / updated
-- [ ] Other, please explain:
-
 ## What changes did you make? (Give an overview)
 
 ...

package/.github/pr-labeler.yml

@@ -1,3 +1,3 @@
 enhancement: ['feature/*', 'feat/*']
-bug: ['bugfix/*', 'bug/*', 'fix/*']
+bug: ['bugfix/*', 'bug/*', 'fix/*', 'hotfix/*']
 chore: ['chore/*', 'task/*']

package/.github/workflows/close_issues_on_merge.yml

@@ -5,6 +5,7 @@ on:
     types: [closed]
     branches:
       - develop
+      - hotfix
 
 jobs:
   closeIssueOnPrMergeTrigger:

package/.github/workflows/code-analysis.yml

@@ -13,10 +13,10 @@ name: 'CodeAnalysis'
 
 on:
     push:
-        branches: [main, develop]
+        branches: [main, develop, hotfix]
     pull_request:
         # The branches below must be a subset of the branches above
-        branches: [main, develop]
+        branches: [main, develop, hotfix]
 
 jobs:
     analyzeAndTest:

package/boilerplate/files/.vscode/settings.json

@@ -18,6 +18,7 @@
         "*-meta.ssjs": "${capture}-meta.json",
         "*.asset-asset-meta.html": "${dirname}.asset-asset-meta.json",
         "*.asset-message-meta.html": "${dirname}.asset-message-meta.json",
+        "*.asset-template-meta.html": "${dirname}.asset-template-meta.json",
         "*.css": "${capture}.asset-code-meta.json",
         "*.docx": "${capture}.asset-document-meta.json",
         "*.eps": "${capture}.asset-image-meta.json",

package/boilerplate/forcedUpdates.json

@@ -1,4 +1,8 @@
 [
+    {
+        "version": "4.3.4",
+        "files": [".vscode/settings.json"]
+    },
     {
         "version": "4.1.12",
         "files": [".vscode/settings.json"]

package/docs/dist/documentation.md

@@ -5096,6 +5096,7 @@ CLI entry for SFMC DevTools
     * [.logSubtypes(subTypeArr)](#Util.logSubtypes) ⇒ <code>void</code>
     * [.getKeysString(keyArr, [isId])](#Util.getKeysString) ⇒ <code>string</code>
     * [.sleep(ms)](#Util.sleep) ⇒ <code>Promise.&lt;void&gt;</code>
+    * [.getSsjs(code)](#Util.getSsjs) ⇒ <code>string</code>
 
 <a name="Util.skipInteraction"></a>
 
@@ -5402,6 +5403,33 @@ pause execution of code; useful when multiple server calls are dependent on each
 | --- | --- | --- |
 | ms | <code>number</code> | time in miliseconds to wait |
 
+<a name="Util.getSsjs"></a>
+
+### Util.getSsjs(code) ⇒ <code>string</code>
+helper for [_extractCode](#Asset._extractCode) and [prepExtractedCode](#Script.prepExtractedCode) to determine if a code block is a valid SSJS block
+
+**Kind**: static method of [<code>Util</code>](#Util)  
+**Returns**: <code>string</code> - the SSJS code if code block is a valid SSJS block, otherwise null  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| code | <code>string</code> | code block to check |
+
+**Example**  
+```js
+the following is invalid:
+<script runat="server">
+      // 1
+  </script>
+  <script runat="server">
+      // 2
+  </script>
+
+  the following is valid:
+  <script runat="server">
+      // 3
+  </script>
+```
 <a name="MetadataTypeDefinitions"></a>
 
 ## MetadataTypeDefinitions
@@ -5665,7 +5693,8 @@ DevOps helper class
 * [DevOps](#DevOps)
     * [.getDeltaList(properties, [range], [saveToDeployDir], [filterPaths])](#DevOps.getDeltaList) ⇒ <code>Promise.&lt;Array.&lt;TYPE.DeltaPkgItem&gt;&gt;</code>
         * [~delta](#DevOps.getDeltaList..delta) : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
-        * [~copied](#DevOps.getDeltaList..copied) : <code>TYPE.DeltaPkgItem</code>
+        * [~buObjects](#DevOps.getDeltaList..buObjects) : <code>Object.&lt;string, TYPE.BuObject&gt;</code>
+        * [~copied](#DevOps.getDeltaList..copied) : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
     * [.buildDeltaDefinitions(properties, range, [diffArr])](#DevOps.buildDeltaDefinitions) ⇒ <code>Promise.&lt;Array.&lt;TYPE.DeltaPkgItem&gt;&gt;</code>
         * [~deltaDeployAll](#DevOps.buildDeltaDefinitions..deltaDeployAll) : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
     * [.document(directory, jsonReport)](#DevOps.document) ⇒ <code>void</code>
@@ -5690,15 +5719,20 @@ Interactive commit selection if no commits are passed.
 
 * [.getDeltaList(properties, [range], [saveToDeployDir], [filterPaths])](#DevOps.getDeltaList) ⇒ <code>Promise.&lt;Array.&lt;TYPE.DeltaPkgItem&gt;&gt;</code>
     * [~delta](#DevOps.getDeltaList..delta) : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
-    * [~copied](#DevOps.getDeltaList..copied) : <code>TYPE.DeltaPkgItem</code>
+    * [~buObjects](#DevOps.getDeltaList..buObjects) : <code>Object.&lt;string, TYPE.BuObject&gt;</code>
+    * [~copied](#DevOps.getDeltaList..copied) : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
 
 <a name="DevOps.getDeltaList..delta"></a>
 
 #### getDeltaList~delta : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
 **Kind**: inner constant of [<code>getDeltaList</code>](#DevOps.getDeltaList)  
+<a name="DevOps.getDeltaList..buObjects"></a>
+
+#### getDeltaList~buObjects : <code>Object.&lt;string, TYPE.BuObject&gt;</code>
+**Kind**: inner constant of [<code>getDeltaList</code>](#DevOps.getDeltaList)  
 <a name="DevOps.getDeltaList..copied"></a>
 
-#### getDeltaList~copied : <code>TYPE.DeltaPkgItem</code>
+#### getDeltaList~copied : <code>Array.&lt;TYPE.DeltaPkgItem&gt;</code>
 **Kind**: inner constant of [<code>getDeltaList</code>](#DevOps.getDeltaList)  
 <a name="DevOps.buildDeltaDefinitions"></a>
 
@@ -6911,6 +6945,7 @@ Util that contains logger and simple util methods
     * [.logSubtypes(subTypeArr)](#Util.logSubtypes) ⇒ <code>void</code>
     * [.getKeysString(keyArr, [isId])](#Util.getKeysString) ⇒ <code>string</code>
     * [.sleep(ms)](#Util.sleep) ⇒ <code>Promise.&lt;void&gt;</code>
+    * [.getSsjs(code)](#Util.getSsjs) ⇒ <code>string</code>
 
 <a name="Util.skipInteraction"></a>
 
@@ -7217,6 +7252,33 @@ pause execution of code; useful when multiple server calls are dependent on each
 | --- | --- | --- |
 | ms | <code>number</code> | time in miliseconds to wait |
 
+<a name="Util.getSsjs"></a>
+
+### Util.getSsjs(code) ⇒ <code>string</code>
+helper for [_extractCode](#Asset._extractCode) and [prepExtractedCode](#Script.prepExtractedCode) to determine if a code block is a valid SSJS block
+
+**Kind**: static method of [<code>Util</code>](#Util)  
+**Returns**: <code>string</code> - the SSJS code if code block is a valid SSJS block, otherwise null  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| code | <code>string</code> | code block to check |
+
+**Example**  
+```js
+the following is invalid:
+<script runat="server">
+      // 1
+  </script>
+  <script runat="server">
+      // 2
+  </script>
+
+  the following is valid:
+  <script runat="server">
+      // 3
+  </script>
+```
 <a name="csvToArray"></a>
 
 ## csvToArray(csv) ⇒ <code>Array.&lt;string&gt;</code>

package/lib/Deployer.js

@@ -38,8 +38,6 @@ class Deployer {
         // prep folders for auto-creation
         MetadataTypeInfo.folder.client = auth.getSDK(buObject);
         MetadataTypeInfo.folder.properties = this.properties;
-        // Remove tmp folder of previous deploys
-        File.removeSync('tmp');
     }
     /**
      * Deploys all metadata located in the 'deploy' directory to the specified business unit
@@ -239,13 +237,14 @@ class Deployer {
             );
         }
         const foundDeployTypes = Object.keys(this.metadata)
+            // remove empty types
+            .filter((type) => Object.keys(this.metadata[type]).length)
+            // make sure we keep the subtype in this list if that's what the user defined
             .map((type) =>
                 type === 'asset' && Util.includesStartsWith(typeArr, type)
                     ? typeArr[Util.includesStartsWithIndex(typeArr, type)]
                     : type
-            )
-            // remove empty types
-            .filter((type) => Object.keys(this.metadata[type]).length);
+            );
         if (!foundDeployTypes.length) {
             throw new Error('No metadata found for deployment');
         }
@@ -333,7 +332,13 @@ class Deployer {
         const folderMetadata = {};
         const allowedDeFolderContentTypes = ['dataextension', 'shared_dataextension'];
         for (const metadataType of metadataTypeArr) {
-            if (!MetadataTypeInfo[metadataType].definition.dependencies.includes('folder')) {
+            // check if folder or folder-like metadata type is in dependencies
+            if (
+                !MetadataTypeInfo[metadataType].definition.dependencies.includes('folder') &&
+                !MetadataTypeInfo[metadataType].definition.dependencies.some((dep) =>
+                    dep.startsWith('folder-')
+                )
+            ) {
                 Util.logger.debug(` ☇ skipping ${metadataType} folders: folder not a dependency`);
                 continue;
             }

package/lib/Retriever.js

@@ -65,7 +65,10 @@ class Retriever {
         for (const type in deployOrder) {
             const subTypeArr = deployOrder[type];
             // if types were added by getMetadataHierachy() for caching, make sure the key-list is set to [null] for them which will retrieve all
-            typeKeyMap[type] = typeKeyMap[type] || [null];
+            // if we have a subtype, we need to find the correct key-list for it
+            typeKeyMap[type] = typeKeyMap[type] ||
+                typeKeyMap[Object.keys(typeKeyMap).find((k) => k.startsWith(type + '-'))] || [null];
+
             // add client to metadata process class instead of passing every time
             MetadataTypeInfo[type].client = auth.getSDK(this.buObject);
             MetadataTypeInfo[type].properties = this.properties;

package/lib/metadataTypes/Asset.js

@@ -113,6 +113,7 @@ class Asset extends MetadataType {
      * @returns {Promise} Promise
      */
     static create(metadata) {
+        delete metadata.businessUnitAvailability;
         const uri = '/asset/v1/content/assets/';
         return super.createREST(metadata, uri);
     }
@@ -818,16 +819,17 @@ class Asset extends MetadataType {
 
                 // metadata.views.html.content (mandatory)
                 // the main content can be empty (=not set up yet) hence check if we did extract sth or else readFile() will print error msgs
+                const fileName = 'views.html.content' + subtypeExtension;
                 if (
                     (await File.pathExists(
-                        File.normalizePath([...readDirArr, `index${subtypeExtension}.html`])
+                        File.normalizePath([...readDirArr, `${fileName}.html`])
                     )) &&
                     metadata.views.html
                 ) {
                     if (!fileListOnly) {
                         metadata.views.html.content = await File.readFilteredFilename(
                             readDirArr,
-                            'index' + subtypeExtension,
+                            fileName,
                             'html'
                         );
                     }
@@ -836,7 +838,7 @@ class Asset extends MetadataType {
                         // to use this method in templating, store a copy of the info in fileList
                         fileList.push({
                             subFolder: [...subDirArr, customerKey],
-                            fileName: 'index' + subtypeExtension,
+                            fileName: fileName,
                             fileExt: 'html',
                             content: metadata.views.html.content,
                         });
@@ -859,6 +861,59 @@ class Asset extends MetadataType {
                 }
                 break;
             }
+            case 'template': {
+                // template-template
+                // this complex type always creates its own subdir per asset
+                subDirArr = [this.definition.type, subType];
+                readDirArr = [deployDir, ...subDirArr, templateName || customerKey];
+                const fileName = 'content' + subtypeExtension;
+
+                const fileExtArr = ['html']; // eslint-disable-line no-case-declarations
+                for (const ext of fileExtArr) {
+                    if (
+                        await File.pathExists(
+                            File.normalizePath([...readDirArr, `${fileName}.${ext}`])
+                        )
+                    ) {
+                        // the main content can be empty (=not set up yet) hence check if we did extract sth or else readFile() will print error msgs
+                        if (!fileListOnly) {
+                            metadata.content = await File.readFilteredFilename(
+                                readDirArr,
+                                fileName,
+                                ext
+                            );
+                        }
+                        if (templateName) {
+                            // to use this method in templating, store a copy of the info in fileList
+                            fileList.push({
+                                subFolder: subDirArr,
+                                fileName: fileName,
+                                fileExt: ext,
+                                content: metadata.content,
+                            });
+                        }
+                        // break loop when found
+                        break;
+                    }
+                }
+
+                // metadata.slots.<>.blocks.<>.content (optional)
+                if (metadata?.slots) {
+                    await this._mergeCode_slots(
+                        'slots',
+                        metadata.slots,
+                        readDirArr,
+                        subtypeExtension,
+                        subDirArr,
+                        fileList,
+                        customerKey,
+                        templateName,
+                        fileListOnly
+                    );
+                }
+
+                break;
+            }
             case 'textonlyemail': {
                 // message
                 // metadata.views.text.content
@@ -970,7 +1025,6 @@ class Asset extends MetadataType {
 
                 break;
             }
-            case 'template': // template-template
             case 'buttonblock': // block - Button Block
             case 'freeformblock': // block
             case 'htmlblock': // block
@@ -983,12 +1037,7 @@ class Asset extends MetadataType {
                 // metadata.content
                 subDirArr = [this.definition.type, subType];
                 readDirArr = [deployDir, ...subDirArr];
-                const fileExtArr = ['html']; // eslint-disable-line no-case-declarations
-                if (metadata.assetType.name === 'codesnippetblock') {
-                    // extracted code snippets should end on the right extension
-                    // we are making a few assumptions during retrieve to pick the right one
-                    fileExtArr.push('amp', 'sjss');
-                }
+                const fileExtArr = ['html', 'ssjs', 'amp']; // eslint-disable-line no-case-declarations
                 for (const ext of fileExtArr) {
                     if (
                         await File.pathExists(
@@ -1005,6 +1054,9 @@ class Asset extends MetadataType {
                                 (templateName || customerKey) + subtypeExtension,
                                 ext
                             );
+                            if (ext === 'ssjs') {
+                                metadata.content = `<script runat="server">\n${metadata.content}</script>`;
+                            }
                         }
                         if (templateName) {
                             // to use this method in templating, store a copy of the info in fileList
@@ -1117,14 +1169,14 @@ class Asset extends MetadataType {
         // unfortunately, asset's key can contain spaces at beginning/end which can break the file system when folders are created with it
         const customerKey = metadata.customerKey.trim();
         switch (metadata.assetType.name) {
-            case 'templatebasedemail': // message
+            case 'templatebasedemail': // message-templatebasedemail
             case 'htmlemail': {
-                // message
+                // message-htmlemail
                 // metadata.views.html.content (mandatory)
                 if (metadata.views?.html?.content?.length) {
                     codeArr.push({
                         subFolder: null,
-                        fileName: 'index',
+                        fileName: 'views.html.content',
                         fileExt: 'html',
                         content: metadata.views.html.content,
                     });
@@ -1142,8 +1194,32 @@ class Asset extends MetadataType {
                     subFolder: [customerKey],
                 };
             }
+            case 'template': {
+                // template-template
+                // metadata.content
+                const fileExt = 'html'; // eslint-disable-line no-case-declarations
+                if (metadata?.content?.length) {
+                    codeArr.push({
+                        subFolder: null,
+                        fileName: 'content',
+                        fileExt: fileExt,
+                        content: metadata.content,
+                    });
+                    delete metadata.content;
+                }
+                // metadata.slots.<>.blocks.<>.content (optional)
+                if (metadata.slots) {
+                    this._extractCode_slots('slots', metadata.slots, codeArr);
+                }
+
+                return {
+                    json: metadata,
+                    codeArr: codeArr,
+                    subFolder: [customerKey],
+                };
+            }
             case 'textonlyemail': {
-                // message
+                // message-textonlyemail
                 // metadata.views.text.content
                 if (metadata.views?.text?.content?.length) {
                     codeArr.push({
@@ -1157,7 +1233,7 @@ class Asset extends MetadataType {
                 return { json: metadata, codeArr: codeArr, subFolder: null };
             }
             case 'webpage': {
-                // asset
+                // asset-webpage
                 // metadata.views.html.content (pre & post 20222)
                 if (metadata.views?.html?.content?.length) {
                     codeArr.push({
@@ -1192,31 +1268,37 @@ class Asset extends MetadataType {
                     subFolder: [customerKey],
                 };
             }
-            case 'template': // template-template
-            case 'buttonblock': // block - Button Block
-            case 'freeformblock': // block
-            case 'htmlblock': // block
-            case 'icemailformblock': // block - Interactive Content Email Form
-            case 'imageblock': // block - Image Block
-            case 'textblock': // block
-            case 'smartcaptureblock': // other
+            case 'buttonblock': // block-buttonblock
+            case 'freeformblock': // block-freeformblock
+            case 'htmlblock': // block-htmlblock
+            case 'icemailformblock': // block-icemailformblock - Interactive Content Email Form
+            case 'imageblock': // block-imageblock - Image Block
+            case 'textblock': // block-textblock
+            case 'smartcaptureblock': // other-smartcaptureblock
             case 'codesnippetblock': {
-                // other
+                // other-codesnippetblock
                 // metadata.content
-                let fileExt = 'html'; // eslint-disable-line no-case-declarations
-                if (
+                let fileExt;
+                let content = metadata?.content;
+                const ssjs = Util.getSsjs(metadata?.content);
+
+                if (ssjs) {
+                    fileExt = 'ssjs';
+                    content = ssjs;
+                } else if (
                     metadata.assetType.name === 'codesnippetblock' && // extracted code snippets should end on the right extension
-                    // we are making a few assumptions during retrieve to pick the right one
-                    metadata?.content?.includes('%%[')
+                    content?.includes('%%[')
                 ) {
                     fileExt = 'amp';
+                } else {
+                    fileExt = 'html';
                 }
-                if (metadata?.content?.length) {
+                if (content?.length) {
                     codeArr.push({
                         subFolder: null,
                         fileName: customerKey,
                         fileExt: fileExt,
-                        content: metadata.content,
+                        content: content,
                     });
                     delete metadata.content;
                 }

package/lib/metadataTypes/Automation.js

@@ -419,6 +419,14 @@ class Automation extends MetadataType {
                     }
                     if (schedule !== null) {
                         try {
+                            // remove the fields that are not needed for the schedule but only for CLI output
+                            const schedule_StartDateTime = schedule._StartDateTime;
+                            delete schedule._StartDateTime;
+                            const schedule_interval = schedule._interval;
+                            delete schedule._interval;
+                            const schedule_timezoneString = schedule._timezoneString;
+                            delete schedule._timezoneString;
+                            // start the automation
                             await this.client.soap.schedule(
                                 'Automation',
                                 schedule,
@@ -431,17 +439,17 @@ class Automation extends MetadataType {
                                 {}
                             );
                             const intervalString =
-                                (schedule._interval > 1 ? `${schedule._interval} ` : '') +
+                                (schedule_interval > 1 ? `${schedule_interval} ` : '') +
                                 (schedule.RecurrenceType === 'Daily'
                                     ? 'Day'
                                     : schedule.RecurrenceType.slice(0, -2) +
-                                      (schedule._interval > 1 ? 's' : ''));
+                                      (schedule_interval > 1 ? 's' : ''));
                             Util.logger.warn(
                                 ` - scheduled automation '${
                                     originalMetadata[key].name
                                 }' deployed Active: runs every ${intervalString} starting ${
-                                    schedule._StartDateTime.split('T').join(' ').split('.')[0]
-                                } ${schedule._timezoneString}`
+                                    schedule_StartDateTime.split('T').join(' ').split('.')[0]
+                                } ${schedule_timezoneString}`
                             );
                         } catch (ex) {
                             Util.logger.error(
@@ -673,9 +681,7 @@ class Automation extends MetadataType {
             ? 'ByDay'
             : 'Interval';
         schedule.Recurrence[keyStem + 'lyRecurrencePatternType'] = patternType;
-        schedule.Recurrence['$'] = {
-            'xsi:type': keyStem + 'lyRecurrence',
-        };
+        schedule.Recurrence['@_xsi:type'] = keyStem + 'lyRecurrence';
         schedule.RecurrenceType = keyStem + 'ly';
         if (keyStem === 'Dai') {
             schedule.Recurrence['DayInterval'] = recurHelper.INTERVAL;

package/lib/metadataTypes/Script.js

@@ -287,12 +287,11 @@ class Script extends MetadataType {
      * @returns {{fileExt:string,code:string}} returns found extension and file content
      */
     static prepExtractedCode(metadataScript, metadataName) {
-        const regex = /<\s*script .*?>(.+?)<\s*\/script>/gms;
         let code;
         let fileExt;
-        const regexMatches = regex.exec(metadataScript);
-        if (regexMatches?.length > 1) {
-            code = regexMatches[1];
+        const ssjs = Util.getSsjs(metadataScript);
+        if (ssjs) {
+            code = ssjs;
             fileExt = 'ssjs';
         } else {
             code = metadataScript;

package/lib/metadataTypes/definitions/Asset.definition.js

@@ -72,10 +72,7 @@ module.exports = {
             template: true,
         },
         businessUnitAvailability: {
-            isCreateable: false,
-            isUpdateable: true,
-            retrieving: true,
-            template: true,
+            skipValidation: true,
         },
         category: {
             isCreateable: true,

package/lib/util/devops.js

@@ -3,6 +3,7 @@ const File = require('./file');
 const path = require('node:path');
 const inquirer = require('inquirer');
 const Util = require('./util');
+const Cli = require('./cli');
 const git = require('simple-git')();
 const Builder = require('../Builder');
 const MetadataType = require('../MetadataTypeInfo');
@@ -104,7 +105,7 @@ const DevOps = {
                 }
 
                 // get metadata type from file name
-                file.type = path.basename(file.file).split('.')[1].split('-').shift();
+                file.type = file.file.split('/')[3];
 
                 return file;
             })
@@ -130,7 +131,14 @@ const DevOps = {
                     file.externalKey = null;
                     file.name = path.basename(file.file).split('.').shift();
                 } else {
-                    file.externalKey = path.basename(file.file).split('.').shift();
+                    // find the key in paths like:
+                    // - retrieve/cred/bu/asset/block/016aecc7-7063-4b78-93f4-aa119ea933c7.asset-block-meta.html
+                    // - retrieve/cred/bu/asset/message/003c1ef5-f538-473a-91da-26942024a64a/blocks/views.html.slots.[bottom-8frq7iw2k99].asset-message-meta.html
+                    // - retrieve/cred/bu/query/03efd5f1-ba1f-487a-9c9a-36aeb2ae5192.query-meta.sql
+                    file.externalKey =
+                        file.type === 'asset'
+                            ? file.file.split('/')[5].split('.')[0] // assets have an additional folder level for their subtype
+                            : file.file.split('/')[4].split('.')[0];
                     file.name = null;
                 }
 
@@ -207,8 +215,83 @@ const DevOps = {
         Util.logger.info(`Saved report in ${path.join(directoryDeltaPkg, 'delta_package.md')}`);
 
         // Copy filtered list of files into deploy directory
+        // only do that if we do not use templating
         if (saveToDeployDir) {
-            /** @type {TYPE.DeltaPkgItem} */
+            // if templating is not used, we need to add related files to the delta package
+            const typeKeysMap = {};
+            /** @type {Object.<string, TYPE.BuObject>} */
+            const buObjects = {};
+            for (const file of delta) {
+                if (file.gitAction === 'delete' || file.type === 'folder') {
+                    continue;
+                }
+                if (typeKeysMap[file.type]) {
+                    typeKeysMap[file.type].push(file.externalKey);
+                } else {
+                    typeKeysMap[file.type] = [file.externalKey];
+                }
+                if (!buObjects[`${file._credential}/${file._businessUnit}`]) {
+                    buObjects[`${file._credential}/${file._businessUnit}`] =
+                        await Cli.getCredentialObject(
+                            properties,
+                            `${file._credential}/${file._businessUnit}`
+                        );
+                }
+            }
+            // a bit crude but works for now
+            for (const buObject of Object.values(buObjects)) {
+                for (const type in typeKeysMap) {
+                    MetadataType[type].buObject = buObject;
+                    MetadataType[type].properties = properties;
+                    const additionalFiles = await MetadataType[type].getFilesToCommit(
+                        typeKeysMap[type]
+                    );
+                    if (additionalFiles?.length) {
+                        delta.push(
+                            ...additionalFiles
+                                .map((filePath) => ({
+                                    file: path.normalize(filePath).split('\\').join('/'),
+                                    type,
+                                    gitAction: 'add/update',
+                                }))
+                                .filter(
+                                    // avoid adding files that we already have in the list
+                                    (addFile) =>
+                                        !delta.find((existFile) => existFile.file === addFile.file)
+                                )
+                        );
+                    }
+                }
+            }
+
+            let responses;
+            if (!Util.skipInteraction) {
+                // deploy folder is in targets for definition creation
+                // recommend to purge their content first
+                responses = await inquirer.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'isPurgeDeployFolder',
+                        message:
+                            'Do you want to empty the deploy folder (ensures no files from previous deployments remain)?',
+                        default: true,
+                    },
+                ]);
+            }
+            if (Util.skipInteraction || responses.isPurgeDeployFolder) {
+                // Clear output folder structure for selected sub-type
+                for (const buObject of Object.values(buObjects)) {
+                    await File.remove(
+                        File.normalizePath([
+                            properties.directories.deploy,
+                            buObject.credential,
+                            buObject.businessUnit,
+                        ])
+                    );
+                }
+            }
+
+            /** @type {TYPE.DeltaPkgItem[]} */
             const copied = delta.map((file) =>
                 File.copyFile(
                     file.file,
@@ -395,7 +478,7 @@ const DevOps = {
                         },
                     ]);
                 }
-                if (skipInteraction || responses.isPurgeDeployFolders) {
+                if (skipInteraction || responses.isPurgeDeployFolder) {
                     // Clear output folder structure for selected sub-type
                     await File.remove(File.normalizePath([properties.directories.deploy]));
                 }

package/lib/util/util.js

@@ -587,6 +587,51 @@ const Util = {
             setTimeout(resolve, ms);
         });
     },
+    /**
+     * helper for {@link Asset._extractCode} and {@link Script.prepExtractedCode} to determine if a code block is a valid SSJS block
+     *
+     * @example the following is invalid:
+     * <script runat="server">
+     *       // 1
+     *   </script>
+     *   <script runat="server">
+     *       // 2
+     *   </script>
+     *
+     *   the following is valid:
+     *   <script runat="server">
+     *       // 3
+     *   </script>
+     * @param {string} code code block to check
+     * @returns {string} the SSJS code if code block is a valid SSJS block, otherwise null
+     */
+    getSsjs(code) {
+        if (!code) {
+            return null;
+        }
+        // \s*      whitespace characters, zero or more times
+        // [^>]*?   any character that is not a >, zero or more times, un-greedily
+        // (.*)     capture any character, zero or more times
+        // /ms      multiline and dotall flags
+        // ideally the code looks like <script runat="server">...</script>
+        const scriptRegex = /^<\s*script [^>]*?>(.*)<\/\s*script\s*>$/ms;
+        code = code.trim();
+        const regexMatches = scriptRegex.exec(code);
+        if (regexMatches?.length > 1) {
+            // script found
+            /* eslint-disable unicorn/prefer-ternary */
+            if (regexMatches[1].includes('<script')) {
+                // nested script found
+                return null;
+            } else {
+                // no nested script found
+                return regexMatches[1];
+            }
+            /* eslint-enable unicorn/prefer-ternary */
+        }
+        // no script found
+        return null;
+    },
 };
 /**
  * wrapper around our standard winston logging to console and logfile

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "4.3.2",
+    "version": "4.3.4",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",

package/test/mockRoot/.mcdevrc.json

@@ -74,5 +74,5 @@
             "triggeredSendDefinition"
         ]
     },
-    "version": "4.3.2"
+    "version": "4.3.4"
 }