Merge pull request #764 from Accenture/hotfix

Hotfix 4.3.4

.fork/.prettierrc

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

.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"
+    }
   }
-]
+]

.github/ISSUE_TEMPLATE/bug.yml

@@ -39,6 +39,7 @@ 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

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",

boilerplate/forcedUpdates.json

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

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>

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');
         }

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;