mcdev 3.1.1 → 3.1.2

package/.github/ISSUE_TEMPLATE/bug.yml

@@ -39,7 +39,10 @@ body:
     label: Version
     description: What version of our software are you running? (mcdev --version)
     options:
-      - 3.1.0 (Default)
+      - 3.2.0
+      - 3.1.2
+      - 3.1.1
+      - 3.1.0
       - 3.0.3
       - 3.0.2
       - 3.0.1

package/docs/dist/documentation.md

@@ -1061,7 +1061,7 @@ Automation MetadataType
     * [.retrieve(retrieveDir)](#Automation.retrieve) ⇒ <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code>
     * [.retrieveChangelog()](#Automation.retrieveChangelog) ⇒ <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code>
     * [.retrieveForCache()](#Automation.retrieveForCache) ⇒ <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code>
-    * [.retrieveAsTemplate(templateDir, name, variables)](#Automation.retrieveAsTemplate) ⇒ <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code>
+    * [.retrieveAsTemplate(templateDir, name, templateVariables)](#Automation.retrieveAsTemplate) ⇒ <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code>
     * [.postRetrieveTasks(metadata, [_], [isTemplating])](#Automation.postRetrieveTasks) ⇒ <code>AutomationItem</code>
     * [.deploy(metadata, targetBU, retrieveDir)](#Automation.deploy) ⇒ [<code>Promise.&lt;AutomationMap&gt;</code>](#AutomationMap)
     * [.create(metadata)](#Automation.create) ⇒ <code>Promise</code>
@@ -1105,7 +1105,7 @@ Retrieves automation metadata for caching
 **Returns**: <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code> - Promise of metadata  
 <a name="Automation.retrieveAsTemplate"></a>
 
-### Automation.retrieveAsTemplate(templateDir, name, variables) ⇒ <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code>
+### Automation.retrieveAsTemplate(templateDir, name, templateVariables) ⇒ <code>Promise.&lt;{metadata:AutomationMap, type:string}&gt;</code>
 Retrieve a specific Automation Definition by Name
 
 **Kind**: static method of [<code>Automation</code>](#Automation)  
@@ -1115,7 +1115,7 @@ Retrieve a specific Automation Definition by Name
 | --- | --- | --- |
 | templateDir | <code>string</code> | Directory where retrieved metadata directory will be saved |
 | name | <code>string</code> | name of the metadata file |
-| variables | <code>Util.TemplateMap</code> | variables to be replaced in the metadata |
+| templateVariables | <code>Util.TemplateMap</code> | variables to be replaced in the metadata |
 
 <a name="Automation.postRetrieveTasks"></a>
 
@@ -1369,7 +1369,7 @@ DataExtension MetadataType
     * [.document(buObject, [metadata], [isDeploy])](#DataExtension.document) ⇒ <code>Promise.&lt;void&gt;</code>
     * [.deleteByKey(buObject, customerKey)](#DataExtension.deleteByKey) ⇒ <code>Promise.&lt;void&gt;</code>
     * [.retrieveForCache(buObject, [_], [isDeploy])](#DataExtension.retrieveForCache) ⇒ <code>Promise</code>
-    * [.retrieveAsTemplate(templateDir, name, variables)](#DataExtension.retrieveAsTemplate) ⇒ <code>Promise.&lt;{metadata:DataExtensionMap, type:string}&gt;</code>
+    * [.retrieveAsTemplate(templateDir, name, templateVariables)](#DataExtension.retrieveAsTemplate) ⇒ <code>Promise.&lt;{metadata:DataExtensionMap, type:string}&gt;</code>
 
 <a name="DataExtension.client"></a>
 
@@ -1534,7 +1534,7 @@ Retrieves folder metadata into local filesystem. Also creates a uniquePath attri
 
 <a name="DataExtension.retrieveAsTemplate"></a>
 
-### DataExtension.retrieveAsTemplate(templateDir, name, variables) ⇒ <code>Promise.&lt;{metadata:DataExtensionMap, type:string}&gt;</code>
+### DataExtension.retrieveAsTemplate(templateDir, name, templateVariables) ⇒ <code>Promise.&lt;{metadata:DataExtensionMap, type:string}&gt;</code>
 Retrieves dataExtension metadata in template format.
 
 **Kind**: static method of [<code>DataExtension</code>](#DataExtension)  
@@ -1544,7 +1544,7 @@ Retrieves dataExtension metadata in template format.
 | --- | --- | --- |
 | templateDir | <code>string</code> | Directory where retrieved metadata directory will be saved |
 | name | <code>string</code> | name of the metadata item |
-| variables | <code>Util.TemplateMap</code> | variables to be replaced in the metadata |
+| templateVariables | <code>Util.TemplateMap</code> | variables to be replaced in the metadata |
 
 <a name="DataExtensionField"></a>
 
@@ -1671,7 +1671,7 @@ DataExtract MetadataType
 * [DataExtract](#DataExtract) ⇐ [<code>MetadataType</code>](#MetadataType)
     * [.retrieve(retrieveDir)](#DataExtract.retrieve) ⇒ <code>Promise.&lt;Object&gt;</code>
     * [.retrieveForCache()](#DataExtract.retrieveForCache) ⇒ <code>Promise.&lt;Object&gt;</code>
-    * [.retrieveAsTemplate(templateDir, name, variables)](#DataExtract.retrieveAsTemplate) ⇒ <code>Promise.&lt;Object&gt;</code>
+    * [.retrieveAsTemplate(templateDir, name, templateVariables)](#DataExtract.retrieveAsTemplate) ⇒ <code>Promise.&lt;Object&gt;</code>
     * [.postRetrieveTasks(fileTransfer)](#DataExtract.postRetrieveTasks) ⇒ <code>Array.&lt;Object&gt;</code>
     * [.create(dataExtract)](#DataExtract.create) ⇒ <code>Promise</code>
     * [.update(dataExtract)](#DataExtract.update) ⇒ <code>Promise</code>
@@ -1700,7 +1700,7 @@ Retrieves Metadata of  Data Extract Activity for caching
 **Returns**: <code>Promise.&lt;Object&gt;</code> - Promise of metadata  
 <a name="DataExtract.retrieveAsTemplate"></a>
 
-### DataExtract.retrieveAsTemplate(templateDir, name, variables) ⇒ <code>Promise.&lt;Object&gt;</code>
+### DataExtract.retrieveAsTemplate(templateDir, name, templateVariables) ⇒ <code>Promise.&lt;Object&gt;</code>
 Retrieve a specific dataExtract Definition by Name
 
 **Kind**: static method of [<code>DataExtract</code>](#DataExtract)  
@@ -1710,7 +1710,7 @@ Retrieve a specific dataExtract Definition by Name
 | --- | --- | --- |
 | templateDir | <code>String</code> | Directory where retrieved metadata directory will be saved |
 | name | <code>String</code> | name of the metadata file |
-| variables | <code>Object</code> | variables to be replaced in the metadata |
+| templateVariables | <code>Object</code> | variables to be replaced in the metadata |
 
 <a name="DataExtract.postRetrieveTasks"></a>
 
@@ -1977,7 +1977,7 @@ EventDefinition MetadataType
 * [EventDefinition](#EventDefinition) ⇐ [<code>MetadataType</code>](#MetadataType)
     * [.retrieve(retrieveDir)](#EventDefinition.retrieve) ⇒ <code>Promise.&lt;Object&gt;</code>
     * [.retrieveForCache()](#EventDefinition.retrieveForCache) ⇒ <code>Promise.&lt;Object&gt;</code>
-    * [.retrieveAsTemplate(templateDir, name, variables)](#EventDefinition.retrieveAsTemplate) ⇒ <code>Promise.&lt;Object&gt;</code>
+    * [.retrieveAsTemplate(templateDir, name, templateVariables)](#EventDefinition.retrieveAsTemplate) ⇒ <code>Promise.&lt;Object&gt;</code>
     * [.postRetrieveTasks(eventDef)](#EventDefinition.postRetrieveTasks) ⇒ <code>Array.&lt;Object&gt;</code>
     * [.create(EventDefinition)](#EventDefinition.create) ⇒ <code>Promise</code>
     * [.update(EventDefinition)](#EventDefinition.update) ⇒ <code>Promise</code>
@@ -2007,7 +2007,7 @@ Retrieves event definition metadata for caching
 **Returns**: <code>Promise.&lt;Object&gt;</code> - Promise of metadata  
 <a name="EventDefinition.retrieveAsTemplate"></a>
 
-### EventDefinition.retrieveAsTemplate(templateDir, name, variables) ⇒ <code>Promise.&lt;Object&gt;</code>
+### EventDefinition.retrieveAsTemplate(templateDir, name, templateVariables) ⇒ <code>Promise.&lt;Object&gt;</code>
 Retrieve a specific Event Definition by Name
 
 **Kind**: static method of [<code>EventDefinition</code>](#EventDefinition)  
@@ -2017,7 +2017,7 @@ Retrieve a specific Event Definition by Name
 | --- | --- | --- |
 | templateDir | <code>String</code> | Directory where retrieved metadata directory will be saved |
 | name | <code>String</code> | name of the metadata file |
-| variables | <code>Object</code> | variables to be replaced in the metadata |
+| templateVariables | <code>Object</code> | variables to be replaced in the metadata |
 
 <a name="EventDefinition.postRetrieveTasks"></a>
 
@@ -2090,7 +2090,7 @@ FileTransfer MetadataType
 * [FileTransfer](#FileTransfer) ⇐ [<code>MetadataType</code>](#MetadataType)
     * [.retrieve(retrieveDir)](#FileTransfer.retrieve) ⇒ <code>Promise</code>
     * [.retrieveForCache()](#FileTransfer.retrieveForCache) ⇒ <code>Promise</code>
-    * [.retrieveAsTemplate(templateDir, name, variables)](#FileTransfer.retrieveAsTemplate) ⇒ <code>Promise</code>
+    * [.retrieveAsTemplate(templateDir, name, templateVariables)](#FileTransfer.retrieveAsTemplate) ⇒ <code>Promise</code>
     * [.postRetrieveTasks(metadata)](#FileTransfer.postRetrieveTasks) ⇒ <code>Array.&lt;Object&gt;</code>
     * [.create(fileTransfer)](#FileTransfer.create) ⇒ <code>Promise</code>
     * [.update(fileTransfer)](#FileTransfer.update) ⇒ <code>Promise</code>
@@ -2119,7 +2119,7 @@ Retrieves Metadata of  FileTransfer Activity for caching
 **Returns**: <code>Promise</code> - Promise  
 <a name="FileTransfer.retrieveAsTemplate"></a>
 
-### FileTransfer.retrieveAsTemplate(templateDir, name, variables) ⇒ <code>Promise</code>
+### FileTransfer.retrieveAsTemplate(templateDir, name, templateVariables) ⇒ <code>Promise</code>
 Retrieve a specific File Transfer Definition by Name
 
 **Kind**: static method of [<code>FileTransfer</code>](#FileTransfer)  
@@ -2129,7 +2129,7 @@ Retrieve a specific File Transfer Definition by Name
 | --- | --- | --- |
 | templateDir | <code>String</code> | Directory where retrieved metadata directory will be saved |
 | name | <code>String</code> | name of the metadata file |
-| variables | <code>Object</code> | variables to be replaced in the metadata |
+| templateVariables | <code>Object</code> | variables to be replaced in the metadata |
 
 <a name="FileTransfer.postRetrieveTasks"></a>
 
@@ -2404,7 +2404,7 @@ ImportFile MetadataType
 * [ImportFile](#ImportFile) ⇐ [<code>MetadataType</code>](#MetadataType)
     * [.retrieve(retrieveDir)](#ImportFile.retrieve) ⇒ <code>Promise</code>
     * [.retrieveForCache()](#ImportFile.retrieveForCache) ⇒ <code>Promise</code>
-    * [.retrieveAsTemplate(templateDir, name, variables)](#ImportFile.retrieveAsTemplate) ⇒ <code>Promise</code>
+    * [.retrieveAsTemplate(templateDir, name, templateVariables)](#ImportFile.retrieveAsTemplate) ⇒ <code>Promise</code>
     * [.postRetrieveTasks(importDef)](#ImportFile.postRetrieveTasks) ⇒ <code>Array.&lt;Object&gt;</code>
     * [.create(importFile)](#ImportFile.create) ⇒ <code>Promise</code>
     * [.update(importFile)](#ImportFile.update) ⇒ <code>Promise</code>
@@ -2434,7 +2434,7 @@ Retrieves import definition metadata for caching
 **Returns**: <code>Promise</code> - Promise  
 <a name="ImportFile.retrieveAsTemplate"></a>
 
-### ImportFile.retrieveAsTemplate(templateDir, name, variables) ⇒ <code>Promise</code>
+### ImportFile.retrieveAsTemplate(templateDir, name, templateVariables) ⇒ <code>Promise</code>
 Retrieve a specific Import Definition by Name
 
 **Kind**: static method of [<code>ImportFile</code>](#ImportFile)  
@@ -2444,7 +2444,7 @@ Retrieve a specific Import Definition by Name
 | --- | --- | --- |
 | templateDir | <code>String</code> | Directory where retrieved metadata directory will be saved |
 | name | <code>String</code> | name of the metadata file |
-| variables | <code>Object</code> | variables to be replaced in the metadata |
+| templateVariables | <code>Object</code> | variables to be replaced in the metadata |
 
 <a name="ImportFile.postRetrieveTasks"></a>
 

package/lib/metadataTypes/Automation.js

@@ -202,10 +202,10 @@ class Automation extends MetadataType {
      * Retrieve a specific Automation Definition by Name
      * @param {string} templateDir Directory where retrieved metadata directory will be saved
      * @param {string} name name of the metadata file
-     * @param {Util.TemplateMap} variables variables to be replaced in the metadata
+     * @param {Util.TemplateMap} templateVariables variables to be replaced in the metadata
      * @returns {Promise<{metadata:AutomationMap,type:string}>} Promise of metadata
      */
-    static async retrieveAsTemplate(templateDir, name, variables) {
+    static async retrieveAsTemplate(templateDir, name, templateVariables) {
         const results = await new Promise((resolve) => {
             this.client.SoapClient.retrieve(
                 'Program',
@@ -239,12 +239,14 @@ class Automation extends MetadataType {
                 })
             ).body;
             let val = null;
+            let originalKey;
             // if parsing fails, we should just save what we get
             try {
                 const parsedDetails = this.parseMetadata(details);
+                originalKey = parsedDetails[this.definition.keyField];
                 if (parsedDetails !== null) {
                     val = JSON.parse(
-                        Util.replaceByObject(JSON.stringify(parsedDetails), variables)
+                        Util.replaceByObject(JSON.stringify(parsedDetails), templateVariables)
                     );
                 }
             } catch (ex) {
@@ -259,7 +261,7 @@ class Automation extends MetadataType {
             this.keepTemplateFields(val);
             File.writeJSONToFile(
                 [templateDir, this.definition.type].join('/'),
-                val[this.definition.keyField] + '.' + this.definition.type + '-meta',
+                originalKey + '.' + this.definition.type + '-meta',
                 val
             );
             Util.logger.info(

package/lib/metadataTypes/DataExtension.js

@@ -868,10 +868,10 @@ class DataExtension extends MetadataType {
      * Retrieves dataExtension metadata in template format.
      * @param {string} templateDir Directory where retrieved metadata directory will be saved
      * @param {string} name name of the metadata item
-     * @param {Util.TemplateMap} variables variables to be replaced in the metadata
+     * @param {Util.TemplateMap} templateVariables variables to be replaced in the metadata
      * @returns {Promise<{metadata:DataExtensionMap,type:string}>} Promise of items
      */
-    static async retrieveAsTemplate(templateDir, name, variables) {
+    static async retrieveAsTemplate(templateDir, name, templateVariables) {
         const options = {
             filter: {
                 leftOperand: 'Name',
@@ -896,20 +896,20 @@ class DataExtension extends MetadataType {
                 // API returns field unsorted
                 metadata[key].Fields.sort((a, b) => a.Ordinal - b.Ordinal);
 
+                const originalKey = key;
                 const metadataCleaned = JSON.parse(
-                    JSON.stringify(await this.postRetrieveTasks(metadata[key], null, !!variables))
+                    JSON.stringify(
+                        await this.postRetrieveTasks(metadata[key], null, !!templateVariables)
+                    )
                 );
 
                 this.keepTemplateFields(metadataCleaned);
                 const metadataTemplated = JSON.parse(
-                    Util.replaceByObject(JSON.stringify(metadataCleaned), variables)
+                    Util.replaceByObject(JSON.stringify(metadataCleaned), templateVariables)
                 );
                 File.writeJSONToFile(
                     [templateDir, this.definition.type].join('/'),
-                    metadataTemplated[this.definition.keyField] +
-                        '.' +
-                        this.definition.type +
-                        '-meta',
+                    originalKey + '.' + this.definition.type + '-meta',
                     metadataTemplated
                 );
             } catch (ex) {

package/lib/metadataTypes/DataExtract.js

@@ -30,10 +30,10 @@ class DataExtract extends MetadataType {
      * Retrieve a specific dataExtract Definition by Name
      * @param {String} templateDir Directory where retrieved metadata directory will be saved
      * @param {String} name name of the metadata file
-     * @param {Object} variables variables to be replaced in the metadata
+     * @param {Object} templateVariables variables to be replaced in the metadata
      * @returns {Promise<Object>} Promise of metadata
      */
-    static async retrieveAsTemplate(templateDir, name, variables) {
+    static async retrieveAsTemplate(templateDir, name, templateVariables) {
         const options = {
             uri: '/automation/v1/dataextracts/?$filter=name%20eq%20' + name.split(' ').join('%20'),
         };
@@ -51,16 +51,20 @@ class DataExtract extends MetadataType {
             const extended = await this.client.RestClient.get({
                 uri: '/automation/v1/dataextracts/' + metadata.id,
             });
+            const originalKey = extended.body[this.definition.keyField];
             const val = JSON.parse(
-                Util.replaceByObject(JSON.stringify(this.parseMetadata(extended.body)), variables)
+                Util.replaceByObject(
+                    JSON.stringify(this.parseMetadata(extended.body)),
+                    templateVariables
+                )
             );
 
             // remove all fields listed in Definition for templating
             this.keepTemplateFields(val);
             File.writeJSONToFile(
                 [templateDir, this.definition.type].join('/'),
-                val.customerKey + '.' + this.definition.type + '-meta',
-                JSON.parse(Util.replaceByObject(JSON.stringify(val), variables))
+                originalKey + '.' + this.definition.type + '-meta',
+                JSON.parse(Util.replaceByObject(JSON.stringify(val), templateVariables))
             );
             Util.logger.info(
                 `Dataextracts.retrieveAsTemplate:: Written Metadata to filesystem (${name})`

package/lib/metadataTypes/EventDefinition.js

@@ -32,10 +32,10 @@ class EventDefinition extends MetadataType {
      * Retrieve a specific Event Definition by Name
      * @param {String} templateDir Directory where retrieved metadata directory will be saved
      * @param {String} name name of the metadata file
-     * @param {Object} variables variables to be replaced in the metadata
+     * @param {Object} templateVariables variables to be replaced in the metadata
      * @returns {Promise<Object>} Promise of metadata
      */
-    static async retrieveAsTemplate(templateDir, name, variables) {
+    static async retrieveAsTemplate(templateDir, name, templateVariables) {
         // todo template based on name
         const options = {
             uri: '/interaction/v1/EventDefinitions?name=' + encodeURIComponent(name),
@@ -51,8 +51,12 @@ class EventDefinition extends MetadataType {
                         `please rename to be unique to avoid issues`
                 );
             } else if (event && event.length === 1) {
+                const originalKey = event[0][this.definition.keyField];
                 const eventDef = JSON.parse(
-                    Util.replaceByObject(JSON.stringify(this.parseMetadata(event[0])), variables)
+                    Util.replaceByObject(
+                        JSON.stringify(this.parseMetadata(event[0])),
+                        templateVariables
+                    )
                 );
                 if (!eventDef.dataExtensionId) {
                     throw new Error(
@@ -67,8 +71,8 @@ class EventDefinition extends MetadataType {
                 this.keepTemplateFields(eventDef);
                 File.writeJSONToFile(
                     [templateDir, this.definition.type].join('/'),
-                    eventDef.customerKey + '.' + this.definition.type + '-meta',
-                    JSON.parse(Util.replaceByObject(JSON.stringify(eventDef), variables))
+                    originalKey + '.' + this.definition.type + '-meta',
+                    JSON.parse(Util.replaceByObject(JSON.stringify(eventDef), templateVariables))
                 );
                 Util.logger.info(
                     `EventDefinition.retrieveAsTemplate:: Written Metadata to filesystem (${name})`

package/lib/metadataTypes/FileTransfer.js

@@ -30,10 +30,10 @@ class FileTransfer extends MetadataType {
      * Retrieve a specific File Transfer Definition by Name
      * @param {String} templateDir Directory where retrieved metadata directory will be saved
      * @param {String} name name of the metadata file
-     * @param {Object} variables variables to be replaced in the metadata
+     * @param {Object} templateVariables variables to be replaced in the metadata
      * @returns {Promise} Promise
      */
-    static async retrieveAsTemplate(templateDir, name, variables) {
+    static async retrieveAsTemplate(templateDir, name, templateVariables) {
         const options = {
             uri: '/automation/v1/filetransfers/?$filter=name%20eq%20' + name.split(' ').join('%20'),
         };
@@ -51,16 +51,20 @@ class FileTransfer extends MetadataType {
             const extended = await this.client.RestClient.get({
                 uri: '/automation/v1/filetransfers/' + metadata.id,
             });
+            const originalKey = extended.body[this.definition.keyField];
             const val = JSON.parse(
-                Util.replaceByObject(JSON.stringify(this.parseMetadata(extended.body)), variables)
+                Util.replaceByObject(
+                    JSON.stringify(this.parseMetadata(extended.body)),
+                    templateVariables
+                )
             );
 
             // remove all fields listed in Definition for templating
             this.keepTemplateFields(val);
             File.writeJSONToFile(
                 [templateDir, this.definition.type].join('/'),
-                val.customerKey + '.' + this.definition.type + '-meta',
-                JSON.parse(Util.replaceByObject(JSON.stringify(val), variables))
+                originalKey + '.' + this.definition.type + '-meta',
+                JSON.parse(Util.replaceByObject(JSON.stringify(val), templateVariables))
             );
             Util.logger.info(
                 `FileTransfer.retrieveAsTemplate:: Written Metadata to filesystem (${name})`

package/lib/metadataTypes/ImportFile.js

@@ -32,10 +32,10 @@ class ImportFile extends MetadataType {
      * Retrieve a specific Import Definition by Name
      * @param {String} templateDir Directory where retrieved metadata directory will be saved
      * @param {String} name name of the metadata file
-     * @param {Object} variables variables to be replaced in the metadata
+     * @param {Object} templateVariables variables to be replaced in the metadata
      * @returns {Promise} Promise
      */
-    static async retrieveAsTemplate(templateDir, name, variables) {
+    static async retrieveAsTemplate(templateDir, name, templateVariables) {
         const options = {
             uri: '/automation/v1/imports/?$filter=name%20eq%20' + name.split(' ').join('%20'),
         };
@@ -48,17 +48,20 @@ class ImportFile extends MetadataType {
                 Util.logger.error(`No ${this.definition.typeName} found with name "${name}"`);
                 return;
             }
-
+            const originalKey = metadata[this.definition.keyField];
             const val = JSON.parse(
-                Util.replaceByObject(JSON.stringify(this.parseMetadata(metadata)), variables)
+                Util.replaceByObject(
+                    JSON.stringify(this.parseMetadata(metadata)),
+                    templateVariables
+                )
             );
 
             // remove all fields listed in Definition for templating
             this.keepTemplateFields(val);
             File.writeJSONToFile(
                 [templateDir, this.definition.type].join('/'),
-                val.customerKey + '.' + this.definition.type + '-meta',
-                JSON.parse(Util.replaceByObject(JSON.stringify(val), variables))
+                originalKey + '.' + this.definition.type + '-meta',
+                JSON.parse(Util.replaceByObject(JSON.stringify(val), templateVariables))
             );
             Util.logger.info(
                 `ImportFile.retrieveAsTemplate:: Written Metadata to filesystem (${name})`

package/lib/metadataTypes/MetadataType.js

@@ -1072,11 +1072,11 @@ class MetadataType {
         const savedResults = {};
         const subtypeExtension = '.' + (overrideType || this.definition.type) + '-meta';
         let filterCounter = 0;
-        for (const metadataEntry in results) {
+        for (const originalKey in results) {
             try {
                 if (
-                    this.isFiltered(results[metadataEntry], true) ||
-                    this.isFiltered(results[metadataEntry], false)
+                    this.isFiltered(results[originalKey], true) ||
+                    this.isFiltered(results[originalKey], false)
                 ) {
                     // if current metadata entry is filtered don't save it
                     filterCounter++;
@@ -1085,21 +1085,21 @@ class MetadataType {
                 // define directory into which the current metdata shall be saved
                 const baseDir = [retrieveDir, ...(overrideType || this.definition.type).split('-')];
 
-                results[metadataEntry] = await this.postRetrieveTasks(
-                    results[metadataEntry],
+                results[originalKey] = await this.postRetrieveTasks(
+                    results[originalKey],
                     retrieveDir,
                     templateVariables ? true : false
                 );
-                if (!results[metadataEntry] || results[metadataEntry] === null) {
+                if (!results[originalKey] || results[originalKey] === null) {
                     // we encountered a situation in our postRetrieveTasks that made us want to filter this record
-                    delete results[metadataEntry];
+                    delete results[originalKey];
                     filterCounter++;
                     continue;
                 }
 
                 if (
-                    this.isFilteredFolder(results[metadataEntry], true) ||
-                    this.isFilteredFolder(results[metadataEntry], false)
+                    this.isFilteredFolder(results[originalKey], true) ||
+                    this.isFilteredFolder(results[originalKey], false)
                 ) {
                     // if current metadata entry is filtered don't save it
                     filterCounter++;
@@ -1107,20 +1107,20 @@ class MetadataType {
                 }
 
                 // for complex types like asset, script, query we need to save the scripts that were extracted from the JSON
-                if (results[metadataEntry].json && results[metadataEntry].codeArr) {
+                if (results[originalKey].json && results[originalKey].codeArr) {
                     // replace market values with template variable placeholders (do not do it on .codeArr)
                     if (templateVariables) {
-                        results[metadataEntry].json = Util.replaceByObject(
-                            results[metadataEntry].json,
+                        results[originalKey].json = Util.replaceByObject(
+                            results[originalKey].json,
                             templateVariables
                         );
-                        results[metadataEntry].subFolder = Util.replaceByObject(
-                            results[metadataEntry].subFolder,
+                        results[originalKey].subFolder = Util.replaceByObject(
+                            results[originalKey].subFolder,
                             templateVariables
                         );
                     }
 
-                    const postRetrieveData = results[metadataEntry];
+                    const postRetrieveData = results[originalKey];
                     if (postRetrieveData.subFolder) {
                         // very complex types have their own subfolder
                         baseDir.push(...postRetrieveData.subFolder);
@@ -1141,13 +1141,13 @@ class MetadataType {
                         );
                     }
                     // normalize results[metadataEntry]
-                    results[metadataEntry] = postRetrieveData.json;
+                    results[originalKey] = postRetrieveData.json;
                 } else {
                     // not a complex type, run the the entire JSON through templating
                     // replace market values with template variable placeholders
                     if (templateVariables) {
-                        results[metadataEntry] = Util.replaceByObject(
-                            results[metadataEntry],
+                        results[originalKey] = Util.replaceByObject(
+                            results[originalKey],
                             templateVariables
                         );
                     }
@@ -1156,7 +1156,7 @@ class MetadataType {
                 // we dont store Id on local disk, but we need it for caching logic,
                 // so its in retrieve but not in save. Here we put into the clone so that the original
                 // object used for caching doesnt have the Id removed.
-                const saveClone = JSON.parse(JSON.stringify(results[metadataEntry]));
+                const saveClone = JSON.parse(JSON.stringify(results[originalKey]));
                 if (!this.definition.keepId) {
                     delete saveClone[this.definition.idField];
                 }
@@ -1166,22 +1166,16 @@ class MetadataType {
                 } else {
                     this.keepRetrieveFields(saveClone);
                 }
-                savedResults[metadataEntry] = saveClone;
+                savedResults[originalKey] = saveClone;
                 File.writeJSONToFile(
                     // manage subtypes
                     baseDir,
-                    saveClone[this.definition.keyField] + subtypeExtension,
+                    originalKey + subtypeExtension,
                     saveClone
                 );
             } catch (ex) {
                 console.log(ex.stack);
-                Util.metadataLogger(
-                    'error',
-                    this.definition.type,
-                    'saveResults',
-                    ex,
-                    metadataEntry
-                );
+                Util.metadataLogger('error', this.definition.type, 'saveResults', ex, originalKey);
             }
         }
         if (filterCounter) {

package/lib/metadataTypes/Script.js

@@ -178,12 +178,12 @@ class Script extends MetadataType {
         templateName
     ) {
         // get SSJS from filesystem
-        let code = this._mergeCode(metadata, templateDir, templateName);
-
+        let code = await this._mergeCode(metadata, templateDir, templateName);
         // replace template variables with their values
         try {
             code = Mustache.render(code, variables);
         } catch (ex) {
+            Util.logger.debug('script.buildDefinitionForExtracts: ' + ex.message);
             throw new Error(
                 `${this.definition.type}:: Error applying template variables on ${
                     metadata[this.definition.keyField] + '.' + this.definition.type

package/package.json

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