mcdev 6.0.0 → 6.0.2

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:
+              - 6.0.2
+              - 6.0.1
               - 6.0.0
               - 5.3.0
               - 5.2.0

package/.github/PULL_REQUEST_TEMPLATE/pr_template_release.md

@@ -4,15 +4,16 @@
 
 - [ ] Wiki updated with info in ticket listed under **Documentation**
 - [ ] ran `npm audit fix`
+- [ ] ran `lint:fix`
 - [ ] ran task version:major/minor/patch
 - [ ] updated [bug template](/.github/ISSUE_TEMPLATE/bug.yml) to include the new version
-- [ ] updated [.mcdevrc](/test/mockRoot/.mcdevrc.json) to the new version
+- [ ] updated [.mcdevrc](/test/mockRoot/.mcdevrc.json) for tests to the new version
 - [ ] (after merge) moved version tag to merge commit
-- [ ] created [new GitHub Release](https://github.com/Accenture/sfmc-devtools/releases/new) 
+- [ ] created [new GitHub Release](https://github.com/Accenture/sfmc-devtools/releases/new)
 
 ## Documentation
 
-- closes #123456
+... insert updated documentation here ...
 
 ## Issues
 

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

@@ -22,7 +22,7 @@ jobs:
             - name: Checkout repository
               uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 16
                   registry-url: https://registry.npmjs.org/

package/.github/workflows/coverage-base-update.yml

@@ -24,7 +24,7 @@ jobs:
                   git fetch origin ${{ github.event.pull_request.base.ref }} --depth=1000
 
             - name: Download artifact for base branch
-              uses: dawidd6/action-download-artifact@v2
+              uses: dawidd6/action-download-artifact@v3
               continue-on-error: true
               with:
                   workflow: ${{ github.event.pull_request.base.ref == 'main' && 'coverage-main-branch.yml' || github.event.pull_request.base.ref == 'develop' && 'coverage-develop-branch.yml' || 'coverage.yml' }}
@@ -35,7 +35,7 @@ jobs:
                   search_artifacts: true
 
             - name: Download artifact for to be merged branch
-              uses: dawidd6/action-download-artifact@v2
+              uses: dawidd6/action-download-artifact@v3
               continue-on-error: true
               with:
                   workflow: 'coverage.yml'

package/.github/workflows/coverage-develop-branch.yml

@@ -20,7 +20,7 @@ jobs:
                   ref: ${{ github.event.ref }}
                   fetch-depth: 1000
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 16
 

package/.github/workflows/coverage-main-branch.yml

@@ -20,7 +20,7 @@ jobs:
                   ref: ${{ github.event.ref }}
                   fetch-depth: 1000
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 16
 

package/.github/workflows/coverage.yml

@@ -17,7 +17,7 @@ jobs:
                   ref: ${{ github.event.pull_request.head.sha }}
                   fetch-depth: 1000
 
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 16
 
@@ -56,7 +56,7 @@ jobs:
                   GITHUB_TOKEN: ${{ github.token }}
 
             - name: Download artifact for base branch if available, previous
-              uses: dawidd6/action-download-artifact@v2
+              uses: dawidd6/action-download-artifact@v3
               continue-on-error: true
               with:
                   workflow: ${{ github.event.pull_request.base.ref == 'main' && 'coverage-main-branch.yml' || github.event.pull_request.base.ref == 'develop' && 'coverage-develop-branch.yml' || 'coverage.yml' }}

package/.github/workflows/npm-publish.yml

@@ -12,7 +12,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 16
             - run: npm ci
@@ -23,7 +23,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-            - uses: actions/setup-node@v3
+            - uses: actions/setup-node@v4
               with:
                   node-version: 16
                   registry-url: https://registry.npmjs.org/

package/.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true,
-        "source.fixAll.markdownlint": true
+        "source.fixAll.eslint": "explicit",
+        "source.fixAll.markdownlint": "explicit"
     },
     "editor.formatOnSave": true,
     "files.associations": {

package/docs/dist/documentation.md

@@ -2472,7 +2472,6 @@ MessageSendActivity MetadataType
     * [.deleteByKey(customerKey)](#EmailSend.deleteByKey) ⇒ <code>Promise.&lt;boolean&gt;</code>
     * [.preDeployTasks(metadata)](#EmailSend.preDeployTasks) ⇒ <code>Promise.&lt;TYPE.MetadataTypeItem&gt;</code>
     * [.postRetrieveTasks(metadata)](#EmailSend.postRetrieveTasks) ⇒ <code>TYPE.MetadataTypeItem</code>
-    * [.parseMetadata(metadata)](#EmailSend.parseMetadata) ⇒ <code>TYPE.MetadataTypeItem</code>
 
 <a name="EmailSend.retrieve"></a>
 
@@ -2549,18 +2548,6 @@ manages post retrieve steps
 | --- | --- | --- |
 | metadata | <code>TYPE.MetadataTypeItem</code> | a single query |
 
-<a name="EmailSend.parseMetadata"></a>
-
-### EmailSend.parseMetadata(metadata) ⇒ <code>TYPE.MetadataTypeItem</code>
-parses retrieved Metadata before saving
-
-**Kind**: static method of [<code>EmailSend</code>](#EmailSend)  
-**Returns**: <code>TYPE.MetadataTypeItem</code> - Array with one metadata object and one sql string  
-
-| Param | Type | Description |
-| --- | --- | --- |
-| metadata | <code>TYPE.MetadataTypeItem</code> | a single query activity definition |
-
 <a name="Event"></a>
 
 ## Event ⇐ [<code>MetadataType</code>](#MetadataType)
@@ -5645,8 +5632,8 @@ TransactionalSMS MetadataType
     * [.postDeleteTasks(customerKey)](#TransactionalSMS.postDeleteTasks) ⇒ <code>void</code>
     * [.preDeployTasks(metadata, deployDir)](#TransactionalSMS.preDeployTasks) ⇒ <code>Promise.&lt;TYPE.MetadataTypeItem&gt;</code>
     * [._mergeCode(metadata, deployDir, [templateName])](#TransactionalSMS._mergeCode) ⇒ <code>Promise.&lt;string&gt;</code>
-    * [.postRetrieveTasks(metadata)](#TransactionalSMS.postRetrieveTasks) ⇒ <code>TYPE.CodeExtractItem</code>
-    * [.prepExtractedCode(metadataScript)](#TransactionalSMS.prepExtractedCode) ⇒ <code>Object</code>
+    * [.postRetrieveTasks(metadata)](#TransactionalSMS.postRetrieveTasks) ⇒ <code>Promise.&lt;TYPE.CodeExtractItem&gt;</code>
+    * [.prepExtractedCode(metadataScript)](#TransactionalSMS.prepExtractedCode) ⇒ <code>Promise.&lt;{fileExt:string, code:string}&gt;</code>
     * [.buildDefinitionForNested(templateDir, targetDir, metadata, templateVariables, templateName)](#TransactionalSMS.buildDefinitionForNested) ⇒ <code>Promise.&lt;Array.&lt;Array.&lt;string&gt;&gt;&gt;</code>
     * [.buildTemplateForNested(templateDir, targetDir, metadata, templateVariables, templateName)](#TransactionalSMS.buildTemplateForNested) ⇒ <code>Promise.&lt;Array.&lt;Array.&lt;string&gt;&gt;&gt;</code>
     * [._buildForNested(templateDir, targetDir, metadata, templateVariables, templateName, mode)](#TransactionalSMS._buildForNested) ⇒ <code>Promise.&lt;Array.&lt;Array.&lt;string&gt;&gt;&gt;</code>
@@ -5693,11 +5680,11 @@ helper for [preDeployTasks](#TransactionalSMS.preDeployTasks) that loads extract
 
 <a name="TransactionalSMS.postRetrieveTasks"></a>
 
-### TransactionalSMS.postRetrieveTasks(metadata) ⇒ <code>TYPE.CodeExtractItem</code>
+### TransactionalSMS.postRetrieveTasks(metadata) ⇒ <code>Promise.&lt;TYPE.CodeExtractItem&gt;</code>
 manages post retrieve steps
 
 **Kind**: static method of [<code>TransactionalSMS</code>](#TransactionalSMS)  
-**Returns**: <code>TYPE.CodeExtractItem</code> - Array with one metadata object and one ssjs string  
+**Returns**: <code>Promise.&lt;TYPE.CodeExtractItem&gt;</code> - Array with one metadata object and one ssjs string  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -5705,11 +5692,11 @@ manages post retrieve steps
 
 <a name="TransactionalSMS.prepExtractedCode"></a>
 
-### TransactionalSMS.prepExtractedCode(metadataScript) ⇒ <code>Object</code>
+### TransactionalSMS.prepExtractedCode(metadataScript) ⇒ <code>Promise.&lt;{fileExt:string, code:string}&gt;</code>
 helper for [postRetrieveTasks](#TransactionalSMS.postRetrieveTasks) and [_buildForNested](#TransactionalSMS._buildForNested)
 
 **Kind**: static method of [<code>TransactionalSMS</code>](#TransactionalSMS)  
-**Returns**: <code>Object</code> - returns found extension and file content  
+**Returns**: <code>Promise.&lt;{fileExt:string, code:string}&gt;</code> - returns found extension and file content  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -6637,7 +6624,7 @@ File extends fs-extra. It adds logger and util methods for file handling
     * [.normalizePath(denormalizedPath)](#File.normalizePath) ⇒ <code>string</code>
     * [.writeJSONToFile(directory, filename, content)](#File.writeJSONToFile) ⇒ <code>Promise</code>
     * [.writePrettyToFile(directory, filename, filetype, content, [templateVariables])](#File.writePrettyToFile) ⇒ <code>Promise.&lt;boolean&gt;</code>
-    * [._beautify_beautyAmp(content)](#File._beautify_beautyAmp) ⇒ <code>string</code>
+    * [.beautify_beautyAmp(content, formatHTML)](#File.beautify_beautyAmp) ⇒ <code>Promise.&lt;string&gt;</code>
     * [._beautify_prettier(directory, filename, filetype, content)](#File._beautify_prettier) ⇒ <code>Promise.&lt;string&gt;</code>
     * [.writeToFile(directory, filename, filetype, content, [encoding])](#File.writeToFile) ⇒ <code>Promise.&lt;boolean&gt;</code>
     * [.readJSONFile(directory, filename, sync, cleanPath)](#File.readJSONFile) ⇒ <code>Promise.&lt;object&gt;</code> \| <code>object</code> \| <code>void</code>
@@ -6739,17 +6726,18 @@ Saves beautified files in the local file system. Will create the parent director
 | content | <code>string</code> | filecontent |
 | [templateVariables] | <code>TYPE.TemplateMap</code> | templating variables to be replaced in the metadata |
 
-<a name="File._beautify_beautyAmp"></a>
+<a name="File.beautify_beautyAmp"></a>
 
-### File.\_beautify\_beautyAmp(content) ⇒ <code>string</code>
+### File.beautify\_beautyAmp(content, formatHTML) ⇒ <code>Promise.&lt;string&gt;</code>
 helper for [writePrettyToFile](#File.writePrettyToFile), applying beautyAmp onto given stringified content
 
 **Kind**: static method of [<code>File</code>](#File)  
-**Returns**: <code>string</code> - original string on error; formatted string on success  
+**Returns**: <code>Promise.&lt;string&gt;</code> - original string on error; formatted string on success  
 
 | Param | Type | Description |
 | --- | --- | --- |
 | content | <code>string</code> | filecontent |
+| formatHTML | <code>boolean</code> | should we format HTML or not via prettier included in beautyAmp |
 
 <a name="File._beautify_prettier"></a>
 

package/lib/Retriever.js

@@ -66,8 +66,9 @@ class Retriever {
             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
             // 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];
+            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);

package/lib/cli.js

@@ -617,13 +617,13 @@ function csvToArray(csv) {
     return !csv
         ? null
         : csv.includes(',')
-        ? csv
-              .split(',')
-              .map((item) =>
-                  // allow whitespace in comma-separated lists
-                  item.trim()
-              )
-              // make sure trailing commas are ignored
-              .filter(Boolean)
-        : [csv.trim()].filter(Boolean);
+          ? csv
+                .split(',')
+                .map((item) =>
+                    // allow whitespace in comma-separated lists
+                    item.trim()
+                )
+                // make sure trailing commas are ignored
+                .filter(Boolean)
+          : [csv.trim()].filter(Boolean);
 }

package/lib/metadataTypes/Automation.js

@@ -945,8 +945,8 @@ class Automation extends MetadataType {
                 item.type = scheduleHelper
                     ? 'scheduled'
                     : item.fileTrigger
-                    ? 'triggered'
-                    : undefined;
+                      ? 'triggered'
+                      : undefined;
 
                 // el.schedule.timezoneName
                 if (item.type === 'scheduled') {
@@ -1203,10 +1203,10 @@ class Automation extends MetadataType {
         const patternType = recurHelper['BYMONTH']
             ? 'ByMonth'
             : recurHelper['BYWEEK']
-            ? 'ByWeek'
-            : recurHelper['BYDAY']
-            ? 'ByDay'
-            : 'Interval';
+              ? 'ByWeek'
+              : recurHelper['BYDAY']
+                ? 'ByDay'
+                : 'Interval';
         schedule.Recurrence[keyStem + 'lyRecurrencePatternType'] = patternType;
         schedule.Recurrence['@_xsi:type'] = keyStem + 'lyRecurrence';
         schedule.RecurrenceType = keyStem + 'ly';
@@ -1387,8 +1387,8 @@ class Automation extends MetadataType {
                               ical.COUNT
                                   ? ` for ${ical.COUNT} times`
                                   : ical.UNTIL
-                                  ? ' until end date'
-                                  : ''
+                                    ? ' until end date'
+                                    : ''
                           }`;
                 output += '\n';
             } else if (json.schedule) {

package/lib/metadataTypes/DataExtension.js

@@ -28,24 +28,14 @@ class DataExtension extends MetadataType {
      */
     static async upsert(metadataMap) {
         // get existing DE-fields for DE-keys in deployment package to properly handle add/update/delete of fields
-        const fieldOptions = {};
-        for (const key of Object.keys(metadataMap)) {
-            fieldOptions.filter = fieldOptions.filter
-                ? {
-                      leftOperand: {
-                          leftOperand: 'DataExtension.CustomerKey',
-                          operator: 'equals',
-                          rightOperand: key,
-                      },
-                      operator: 'OR',
-                      rightOperand: fieldOptions.filter,
-                  }
-                : {
-                      leftOperand: 'DataExtension.CustomerKey',
-                      operator: 'equals',
-                      rightOperand: key,
-                  };
-        }
+        // we need to use IN here because it would fail otherwise if we try to deploy too many DEs at the same time
+        const fieldOptions = {
+            filter: {
+                leftOperand: 'DataExtension.CustomerKey',
+                operator: 'IN',
+                rightOperand: Object.keys(metadataMap),
+            },
+        };
         Util.logger.info(` - Caching dependent Metadata: dataExtensionField`);
         await this.#attachFields(metadataMap, fieldOptions);
 
@@ -868,6 +858,7 @@ class DataExtension extends MetadataType {
     static async #attachFields(metadata, fieldOptions, additionalFields) {
         const fieldsObj = await this._retrieveFields(fieldOptions, additionalFields);
         const fieldKeys = Object.keys(fieldsObj);
+
         // add fields to corresponding DE
         for (const key of fieldKeys) {
             const field = fieldsObj[key];

package/lib/metadataTypes/EmailSend.js

@@ -96,8 +96,8 @@ class EmailSend extends MetadataType {
         metadata.IsPlatformObject = false;
         // folder
         super.setFolderId(metadata);
-        // email
-        metadata.Email = {};
+        // email; in case we still have Email.ID, keep it but warn
+        metadata.Email ||= {};
         if (metadata.r__email_Name) {
             // classic
             metadata.Email.ID = cache.searchForField('email', metadata.r__email_Name, 'Name', 'ID');
@@ -131,6 +131,30 @@ class EmailSend extends MetadataType {
                 delete metadata.r__assetMessage_Key;
                 delete metadata.r__assetMessage_Name;
             }
+        } else if (metadata.Email.ID) {
+            Util.logger.warn(
+                ` - ${this.definition.type} ${metadata[this.definition.nameField]} (${
+                    metadata[this.definition.keyField]
+                }): Email.ID was provided manually in your deployment file. We recommend using r__assetMessage_Key instead.`
+            );
+            try {
+                // content builder - test only
+                cache.searchForField(
+                    'asset',
+                    metadata.Email.ID,
+                    'legacyData.legacyId',
+                    'customerKey'
+                );
+            } catch {
+                try {
+                    // classic - test only
+                    cache.searchForField('email', metadata.Email.ID, 'ID', 'Name');
+                } catch {
+                    throw new Error(
+                        ` ☇ skipping ${this.definition.type} ${metadata.Name} (${metadata.CustomerKey}): Could not find email with ID ${metadata.Email.ID} in Content Builder or Classic Emails.`
+                    );
+                }
+            }
         }
         // Target Audience DataExtension
         // normalize first because this can be an array
@@ -189,15 +213,6 @@ class EmailSend extends MetadataType {
      * @returns {TYPE.MetadataTypeItem} Array with one metadata object and one query string
      */
     static postRetrieveTasks(metadata) {
-        return this.parseMetadata(metadata);
-    }
-    /**
-     * parses retrieved Metadata before saving
-     *
-     * @param {TYPE.MetadataTypeItem} metadata a single query activity definition
-     * @returns {TYPE.MetadataTypeItem} Array with one metadata object and one sql string
-     */
-    static parseMetadata(metadata) {
         // remove IsPlatformObject, always has to be 'false'
         delete metadata.IsPlatformObject;
         // folder
@@ -206,27 +221,32 @@ class EmailSend extends MetadataType {
         // email
         if (metadata.Email?.ID) {
             try {
-                // classic
-                const classicEmail = cache.searchForField('email', metadata.Email.ID, 'ID', 'Name');
-                metadata.r__email_Name = classicEmail;
+                // content builder
+                const contentBuilderEmailName = cache.searchForField(
+                    'asset',
+                    metadata.Email.ID,
+                    'legacyData.legacyId',
+                    'name'
+                );
+                metadata.r__assetMessage_Name = contentBuilderEmailName;
+                const contentBuilderEmailKey = cache.searchForField(
+                    'asset',
+                    metadata.Email.ID,
+                    'legacyData.legacyId',
+                    'customerKey'
+                );
+                metadata.r__assetMessage_Key = contentBuilderEmailKey;
                 delete metadata.Email;
             } catch {
                 try {
-                    // content builder
-                    const contentBuilderEmailName = cache.searchForField(
-                        'asset',
-                        metadata.Email.ID,
-                        'legacyData.legacyId',
-                        'name'
-                    );
-                    metadata.r__assetMessage_Name = contentBuilderEmailName;
-                    const contentBuilderEmailKey = cache.searchForField(
-                        'asset',
+                    // classic
+                    const classicEmail = cache.searchForField(
+                        'email',
                         metadata.Email.ID,
-                        'legacyData.legacyId',
-                        'customerKey'
+                        'ID',
+                        'Name'
                     );
-                    metadata.r__assetMessage_Key = contentBuilderEmailKey;
+                    metadata.r__email_Name = classicEmail;
                     delete metadata.Email;
                 } catch {
                     Util.logger.warn(
@@ -234,7 +254,7 @@ class EmailSend extends MetadataType {
                             metadata[this.definition.keyField]
                         }): Could not find email with ID ${
                             metadata.Email.ID
-                        } in Classic nor in Content Builder.`
+                        } Content Builder or Classic Emails.`
                     );
                 }
             }

package/lib/metadataTypes/Journey.js

@@ -571,7 +571,7 @@ class Journey extends MetadataType {
                                     'mobileKeyword',
                                     activity.configurationArguments.nextKeywordId,
                                     'id',
-                                    'keyword'
+                                    'c__codeKeyword'
                                 );
                             delete activity.configurationArguments.nextKeywordId;
                         }
@@ -853,7 +853,7 @@ class Journey extends MetadataType {
                         activity.configurationArguments.nextKeywordId = cache.searchForField(
                             'mobileKeyword',
                             activity.configurationArguments.c__next_mobileKeyword,
-                            'keyword',
+                            'c__codeKeyword',
                             'id'
                         );
                         delete activity.configurationArguments.c__next_mobileKeyword;

package/lib/metadataTypes/TransactionalSMS.js

@@ -4,7 +4,6 @@ import TYPE from '../../types/mcdev.d.js';
 import TransactionalMessage from './TransactionalMessage.js';
 import { Util } from '../util/util.js';
 import File from '../util/file.js';
-import beautifier from 'beauty-amp-core';
 import cache from '../util/cache.js';
 
 /**
@@ -52,16 +51,16 @@ class TransactionalSMS extends TransactionalMessage {
         if (metadata.subscriptions?.shortCode) {
             // we merely want to be able to show an error if it does not exist
             cache.searchForField('mobileCode', metadata.subscriptions.shortCode, 'code', 'code');
-        }
-        // subscriptions: mobileKeyword
-        if (metadata.subscriptions?.keyword) {
-            // we merely want to be able to show an error if it does not exist
-            cache.searchForField(
-                'mobileKeyword',
-                metadata.subscriptions.shortCode + '.' + metadata.subscriptions.keyword,
-                'c__codeKeyword',
-                'id'
-            );
+            // subscriptions: mobileKeyword
+            if (metadata.subscriptions?.keyword) {
+                // we merely want to be able to show an error if it does not exist
+                cache.searchForField(
+                    'mobileKeyword',
+                    metadata.subscriptions.shortCode + '.' + metadata.subscriptions.keyword,
+                    'c__codeKeyword',
+                    'id'
+                );
+            }
         }
         return metadata;
     }
@@ -95,13 +94,13 @@ class TransactionalSMS extends TransactionalMessage {
      * manages post retrieve steps
      *
      * @param {TYPE.MetadataTypeItem} metadata a single item
-     * @returns {TYPE.CodeExtractItem} Array with one metadata object and one ssjs string
+     * @returns {Promise.<TYPE.CodeExtractItem>} Array with one metadata object and one ssjs string
      */
-    static postRetrieveTasks(metadata) {
+    static async postRetrieveTasks(metadata) {
         // extract message body
         const codeArr = [];
         // keep between tags
-        const { fileExt, code } = this.prepExtractedCode(metadata.content?.message);
+        const { fileExt, code } = await this.prepExtractedCode(metadata.content?.message);
         delete metadata.content;
         codeArr.push({
             subFolder: null,
@@ -143,7 +142,7 @@ class TransactionalSMS extends TransactionalMessage {
                 cache.searchForField(
                     'mobileKeyword',
                     metadata.subscriptions.shortCode + '.' + metadata.subscriptions.keyword,
-                    'keyword',
+                    'c__codeKeyword',
                     'id'
                 );
             } catch {
@@ -161,29 +160,10 @@ class TransactionalSMS extends TransactionalMessage {
      * helper for {@link TransactionalSMS.postRetrieveTasks} and {@link TransactionalSMS._buildForNested}
      *
      * @param {string} metadataScript the code of the file
-     * @returns {{fileExt:string,code:string}} returns found extension and file content
+     * @returns {Promise.<{fileExt:string,code:string}>} returns found extension and file content
      */
-    static prepExtractedCode(metadataScript) {
-        // immutable at the moment:
-        const ampscript = {
-            capitalizeAndOrNot: true,
-            capitalizeIfFor: true,
-            capitalizeSet: true,
-            capitalizeVar: true,
-            maxParametersPerLine: 4,
-        };
-        // immutable at the moment:
-        const editor = {
-            insertSpaces: true,
-            tabSize: 4,
-        };
-        // logs trough console only for the moment.
-        const logs = {
-            loggerOn: false, // <= disable logging
-        };
-
-        beautifier.setup(ampscript, editor, logs);
-        const code = beautifier.beautify(metadataScript);
+    static async prepExtractedCode(metadataScript) {
+        const code = await File.beautify_beautyAmp(metadataScript, false);
         const fileExt = 'amp';
 
         return { fileExt, code };
@@ -266,7 +246,7 @@ class TransactionalSMS extends TransactionalMessage {
     ) {
         // get code from filesystem
         let code = await this._mergeCode(metadata, templateDir, templateName);
-        const file = this.prepExtractedCode(code, metadata.name);
+        const file = await this.prepExtractedCode(code, metadata.name);
         const fileExt = file.fileExt;
         code = file.code;
         // apply templating

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

@@ -5,7 +5,7 @@ export default {
     idField: 'id',
     keyIsFixed: false, // custom field but mapped to normal fields
     keyField: 'c__codeKeyword',
-    nameField: 'keyword',
+    nameField: 'c__codeKeyword',
     createdDateField: 'createdDate',
     createdNameField: 'createdBy.name',
     lastmodDateField: 'lastUpdated',

package/lib/util/file.js

@@ -6,7 +6,7 @@ import fs from 'fs-extra';
 
 import path from 'node:path';
 import prettier from 'prettier';
-import beautyAmp from 'beauty-amp-core';
+import beautyAmp from 'beauty-amp-core2';
 import { Util } from './util.js';
 import updateNotifier from 'update-notifier';
 
@@ -171,7 +171,7 @@ const File = {
     writePrettyToFile: async function (directory, filename, filetype, content, templateVariables) {
         let formatted =
             filetype === 'amp'
-                ? this._beautify_beautyAmp(content)
+                ? await this.beautify_beautyAmp(content, false)
                 : await this._beautify_prettier(directory, filename, filetype, content);
         if (templateVariables) {
             formatted = Util.replaceByObject(formatted, templateVariables);
@@ -182,10 +182,10 @@ const File = {
      * helper for {@link File.writePrettyToFile}, applying beautyAmp onto given stringified content
      *
      * @param {string} content filecontent
-     * @returns {string} original string on error; formatted string on success
+     * @param {boolean} formatHTML should we format HTML or not via prettier included in beautyAmp
+     * @returns {Promise.<string>} original string on error; formatted string on success
      */
-    _beautify_beautyAmp: function (content) {
-        // immutable at the moment:
+    beautify_beautyAmp: async function (content, formatHTML = true) {
         const ampscript = {
             capitalizeAndOrNot: true,
             capitalizeIfFor: true,
@@ -193,7 +193,6 @@ const File = {
             capitalizeVar: true,
             maxParametersPerLine: 4,
         };
-        // immutable at the moment:
         const editor = {
             insertSpaces: true,
             tabSize: 4,
@@ -204,9 +203,10 @@ const File = {
         };
         try {
             beautyAmp.setup(ampscript, editor, logs);
-            return beautyAmp.beautify(content);
+            // Note: we need to trim the result as beautyAmp adds a leading new line; but we also want to ensure there is a single new line at the end to comply with standard linting rules
+            return (await beautyAmp.beautify(content, formatHTML)).trim() + '\n';
         } catch (ex) {
-            Util.logger.debug('File._beautify_beautyAmp:: error | ' + ex.message);
+            Util.logger.debug('File.beautify_beautyAmp:: error | ' + ex.message);
             return content;
         }
     },
@@ -229,7 +229,7 @@ const File = {
             } else if (content.includes('%%[') || content.includes('%%=')) {
                 // in case we find AMPScript we need to abort beautifying as prettier
                 // will throw an error falsely assuming bad syntax
-                return this._beautify_beautyAmp(content);
+                return await this.beautify_beautyAmp(content, true);
             }
             // load the right prettier config relative to our file
             switch (filetype) {