From 289455b5b1751fad69135ec281d908bfdc9e243f Mon Sep 17 00:00:00 2001 From: Douglas Midgley Date: Wed, 3 May 2023 23:07:50 +0200 Subject: [PATCH 01/17] es6 Module - migration just script cjs-to-es6 lib/ --- lib/Builder.js | 16 +-- lib/Deployer.js | 20 ++-- lib/MetadataTypeDefinitions.js | 105 ++++++++++++------ lib/MetadataTypeInfo.js | 105 ++++++++++++------ lib/Retriever.js | 16 +-- lib/cli.js | 10 +- lib/index.js | 34 +++--- lib/metadataTypes/Asset.js | 16 +-- lib/metadataTypes/AttributeGroup.js | 6 +- lib/metadataTypes/Automation.js | 14 +-- lib/metadataTypes/Campaign.js | 10 +- lib/metadataTypes/ContentArea.js | 10 +- lib/metadataTypes/DataExtension.js | 20 ++-- lib/metadataTypes/DataExtensionField.js | 8 +- lib/metadataTypes/DataExtensionTemplate.js | 6 +- lib/metadataTypes/DataExtract.js | 12 +- lib/metadataTypes/DataExtractType.js | 6 +- lib/metadataTypes/Discovery.js | 8 +- lib/metadataTypes/Email.js | 8 +- lib/metadataTypes/EmailSend.js | 10 +- lib/metadataTypes/Event.js | 12 +- lib/metadataTypes/FileLocation.js | 6 +- lib/metadataTypes/FileTransfer.js | 12 +- lib/metadataTypes/Filter.js | 6 +- lib/metadataTypes/Folder.js | 14 +-- lib/metadataTypes/ImportFile.js | 12 +- lib/metadataTypes/Journey.js | 14 +-- lib/metadataTypes/List.js | 14 +-- lib/metadataTypes/MetadataType.js | 18 +-- lib/metadataTypes/MobileCode.js | 6 +- lib/metadataTypes/MobileKeyword.js | 12 +- lib/metadataTypes/MobileMessage.js | 12 +- lib/metadataTypes/Query.js | 14 +-- lib/metadataTypes/Role.js | 12 +- lib/metadataTypes/Script.js | 10 +- lib/metadataTypes/SendClassification.js | 6 +- lib/metadataTypes/SetDefinition.js | 6 +- lib/metadataTypes/TransactionalEmail.js | 10 +- lib/metadataTypes/TransactionalMessage.js | 8 +- lib/metadataTypes/TransactionalPush.js | 10 +- lib/metadataTypes/TransactionalSMS.js | 14 +-- lib/metadataTypes/TriggeredSend.js | 19 ++-- lib/metadataTypes/User.js | 12 +- .../definitions/Asset.definition.js | 2 +- .../definitions/AttributeGroup.definition.js | 2 +- .../definitions/Automation.definition.js | 2 +- .../definitions/Campaign.definition.js | 2 +- .../definitions/ContentArea.definition.js | 2 +- .../definitions/DataExtension.definition.js | 2 +- .../DataExtensionField.definition.js | 2 +- .../DataExtensionTemplate.definition.js | 2 +- .../definitions/DataExtract.definition.js | 2 +- .../definitions/DataExtractType.definition.js | 2 +- .../definitions/Discovery.definition.js | 2 +- .../definitions/Email.definition.js | 2 +- .../definitions/EmailSend.definition.js | 2 +- .../definitions/Event.definition.js | 2 +- .../definitions/FileLocation.definition.js | 2 +- .../definitions/FileTransfer.definition.js | 2 +- .../definitions/Filter.definition.js | 2 +- .../definitions/Folder.definition.js | 2 +- .../definitions/ImportFile.definition.js | 2 +- .../definitions/Journey.definition.js | 2 +- .../definitions/List.definition.js | 2 +- .../definitions/MobileCode.definition.js | 2 +- .../definitions/MobileKeyword.definition.js | 2 +- .../definitions/MobileMessage.definition.js | 2 +- .../definitions/Query.definition.js | 2 +- .../definitions/Role.definition.js | 2 +- .../definitions/Script.definition.js | 2 +- .../SendClassification.definition.js | 2 +- .../definitions/SetDefinition.definition.js | 2 +- .../TransactionalEmail.definition.js | 2 +- .../TransactionalPush.definition.js | 2 +- .../TransactionalSMS.definition.js | 2 +- .../definitions/TriggeredSend.definition.js | 2 +- .../definitions/User.definition.js | 2 +- lib/retrieveChangelog.js | 11 +- lib/util/auth.js | 12 +- lib/util/businessUnit.js | 10 +- lib/util/cache.js | 6 +- lib/util/cli.js | 20 ++-- lib/util/config.js | 14 +-- lib/util/devops.js | 23 ++-- lib/util/file.js | 18 +-- lib/util/init.config.js | 18 +-- lib/util/init.git.js | 15 ++- lib/util/init.js | 20 ++-- lib/util/init.npm.js | 10 +- lib/util/util.js | 16 +-- 90 files changed, 519 insertions(+), 441 deletions(-) diff --git a/lib/Builder.js b/lib/Builder.js index d3479a782..b0f8e39b3 100644 --- a/lib/Builder.js +++ b/lib/Builder.js @@ -1,12 +1,12 @@ 'use strict'; -const TYPE = require('../types/mcdev.d'); -const Util = require('./util/util'); -const File = require('./util/file'); -const config = require('./util/config'); -const Cli = require('./util/cli'); -const auth = require('./util/auth'); -const MetadataTypeInfo = require('./MetadataTypeInfo'); +import TYPE from '../types/mcdev.d'; +import Util from './util/util'; +import File from './util/file'; +import config from './util/config'; +import Cli from './util/cli'; +import auth from './util/auth'; +import MetadataTypeInfo from './MetadataTypeInfo'; // @ts-ignore /** @@ -244,4 +244,4 @@ saved } } -module.exports = Builder; +export default Builder; diff --git a/lib/Deployer.js b/lib/Deployer.js index b81448374..3b553c32f 100644 --- a/lib/Deployer.js +++ b/lib/Deployer.js @@ -1,14 +1,14 @@ 'use strict'; -const TYPE = require('../types/mcdev.d'); -const MetadataTypeInfo = require('./MetadataTypeInfo'); -const path = require('node:path'); -const Cli = require('./util/cli'); -const Util = require('./util/util'); -const File = require('./util/file'); -const config = require('./util/config'); -const cache = require('./util/cache'); -const auth = require('./util/auth'); +import TYPE from '../types/mcdev.d'; +import MetadataTypeInfo from './MetadataTypeInfo'; +import path from 'node:path'; +import Cli from './util/cli'; +import Util from './util/util'; +import File from './util/file'; +import config from './util/config'; +import cache from './util/cache'; +import auth from './util/auth'; /** * Reads metadata from local directory and deploys it to specified target business unit. @@ -433,4 +433,4 @@ class Deployer { } } -module.exports = Deployer; +export default Deployer; diff --git a/lib/MetadataTypeDefinitions.js b/lib/MetadataTypeDefinitions.js index 2e55ea5c4..b808cf8c4 100644 --- a/lib/MetadataTypeDefinitions.js +++ b/lib/MetadataTypeDefinitions.js @@ -1,43 +1,78 @@ 'use strict'; +import asset from './metadataTypes/definitions/Asset.definition'; +import attributeGroup from './metadataTypes/definitions/AttributeGroup.definition'; +import automation from './metadataTypes/definitions/Automation.definition'; +import campaign from './metadataTypes/definitions/Campaign.definition'; +import contentArea from './metadataTypes/definitions/ContentArea.definition'; +import dataExtension from './metadataTypes/definitions/DataExtension.definition'; +import dataExtensionField from './metadataTypes/definitions/DataExtensionField.definition'; +import dataExtensionTemplate from './metadataTypes/definitions/DataExtensionTemplate.definition'; +import dataExtract from './metadataTypes/definitions/DataExtract.definition'; +import dataExtractType from './metadataTypes/definitions/DataExtractType.definition'; +import discovery from './metadataTypes/definitions/Discovery.definition'; +import email from './metadataTypes/definitions/Email.definition'; +import emailSend from './metadataTypes/definitions/EmailSend.definition'; +import event from './metadataTypes/definitions/Event.definition'; +import fileLocation from './metadataTypes/definitions/FileLocation.definition'; +import fileTransfer from './metadataTypes/definitions/FileTransfer.definition'; +import filter from './metadataTypes/definitions/Filter.definition'; +import folder from './metadataTypes/definitions/Folder.definition'; +import importFile from './metadataTypes/definitions/ImportFile.definition'; +import journey from './metadataTypes/definitions/Journey.definition'; +import list from './metadataTypes/definitions/List.definition'; +import mobileCode from './metadataTypes/definitions/MobileCode.definition'; +import mobileKeyword from './metadataTypes/definitions/MobileKeyword.definition'; +import mobileMessage from './metadataTypes/definitions/MobileMessage.definition'; +import query from './metadataTypes/definitions/Query.definition'; +import role from './metadataTypes/definitions/Role.definition'; +import script from './metadataTypes/definitions/Script.definition'; +import sendClassification from './metadataTypes/definitions/SendClassification.definition'; +import setDefinition from './metadataTypes/definitions/SetDefinition.definition'; +import transactionalEmail from './metadataTypes/definitions/TransactionalEmail.definition'; +import transactionalPush from './metadataTypes/definitions/TransactionalPush.definition'; +import transactionalSMS from './metadataTypes/definitions/TransactionalSMS.definition'; +import triggeredSend from './metadataTypes/definitions/TriggeredSend.definition'; +import user from './metadataTypes/definitions/User.definition'; + /** * Provides access to all metadataType classes */ const MetadataTypeDefinitions = { - asset: require('./metadataTypes/definitions/Asset.definition'), - attributeGroup: require('./metadataTypes/definitions/AttributeGroup.definition'), - automation: require('./metadataTypes/definitions/Automation.definition'), - campaign: require('./metadataTypes/definitions/Campaign.definition'), - contentArea: require('./metadataTypes/definitions/ContentArea.definition'), - dataExtension: require('./metadataTypes/definitions/DataExtension.definition'), - dataExtensionField: require('./metadataTypes/definitions/DataExtensionField.definition'), - dataExtensionTemplate: require('./metadataTypes/definitions/DataExtensionTemplate.definition'), - dataExtract: require('./metadataTypes/definitions/DataExtract.definition'), - dataExtractType: require('./metadataTypes/definitions/DataExtractType.definition'), - discovery: require('./metadataTypes/definitions/Discovery.definition'), - email: require('./metadataTypes/definitions/Email.definition'), - emailSend: require('./metadataTypes/definitions/EmailSend.definition'), - event: require('./metadataTypes/definitions/Event.definition'), - fileLocation: require('./metadataTypes/definitions/FileLocation.definition'), - fileTransfer: require('./metadataTypes/definitions/FileTransfer.definition'), - filter: require('./metadataTypes/definitions/Filter.definition'), - folder: require('./metadataTypes/definitions/Folder.definition'), - importFile: require('./metadataTypes/definitions/ImportFile.definition'), - journey: require('./metadataTypes/definitions/Journey.definition'), - list: require('./metadataTypes/definitions/List.definition'), - mobileCode: require('./metadataTypes/definitions/MobileCode.definition'), - mobileKeyword: require('./metadataTypes/definitions/MobileKeyword.definition'), - mobileMessage: require('./metadataTypes/definitions/MobileMessage.definition'), - query: require('./metadataTypes/definitions/Query.definition'), - role: require('./metadataTypes/definitions/Role.definition'), - script: require('./metadataTypes/definitions/Script.definition'), - sendClassification: require('./metadataTypes/definitions/SendClassification.definition'), - setDefinition: require('./metadataTypes/definitions/SetDefinition.definition'), - transactionalEmail: require('./metadataTypes/definitions/TransactionalEmail.definition'), - transactionalPush: require('./metadataTypes/definitions/TransactionalPush.definition'), - transactionalSMS: require('./metadataTypes/definitions/TransactionalSMS.definition'), - triggeredSend: require('./metadataTypes/definitions/TriggeredSend.definition'), - user: require('./metadataTypes/definitions/User.definition'), + asset, + attributeGroup, + automation, + campaign, + contentArea, + dataExtension, + dataExtensionField, + dataExtensionTemplate, + dataExtract, + dataExtractType, + discovery, + email, + emailSend, + event, + fileLocation, + fileTransfer, + filter, + folder, + importFile, + journey, + list, + mobileCode, + mobileKeyword, + mobileMessage, + query, + role, + script, + sendClassification, + setDefinition, + transactionalEmail, + transactionalPush, + transactionalSMS, + triggeredSend, + user, }; -module.exports = MetadataTypeDefinitions; +export default MetadataTypeDefinitions; diff --git a/lib/MetadataTypeInfo.js b/lib/MetadataTypeInfo.js index 9b77ba266..38e1a5307 100644 --- a/lib/MetadataTypeInfo.js +++ b/lib/MetadataTypeInfo.js @@ -1,43 +1,78 @@ 'use strict'; +import asset from './metadataTypes/Asset'; +import attributeGroup from './metadataTypes/AttributeGroup'; +import automation from './metadataTypes/Automation'; +import campaign from './metadataTypes/Campaign'; +import contentArea from './metadataTypes/ContentArea'; +import dataExtension from './metadataTypes/DataExtension'; +import dataExtensionField from './metadataTypes/DataExtensionField'; +import dataExtensionTemplate from './metadataTypes/DataExtensionTemplate'; +import dataExtract from './metadataTypes/DataExtract'; +import dataExtractType from './metadataTypes/DataExtractType'; +import discovery from './metadataTypes/Discovery'; +import email from './metadataTypes/Email'; +import emailSend from './metadataTypes/EmailSend'; +import event from './metadataTypes/Event'; +import fileLocation from './metadataTypes/FileLocation'; +import fileTransfer from './metadataTypes/FileTransfer'; +import filter from './metadataTypes/Filter'; +import folder from './metadataTypes/Folder'; +import importFile from './metadataTypes/ImportFile'; +import journey from './metadataTypes/Journey'; +import list from './metadataTypes/List'; +import mobileCode from './metadataTypes/MobileCode'; +import mobileKeyword from './metadataTypes/MobileKeyword'; +import mobileMessage from './metadataTypes/MobileMessage'; +import query from './metadataTypes/Query'; +import role from './metadataTypes/Role'; +import script from './metadataTypes/Script'; +import sendClassification from './metadataTypes/SendClassification'; +import setDefinition from './metadataTypes/SetDefinition'; +import transactionalEmail from './metadataTypes/TransactionalEmail'; +import transactionalPush from './metadataTypes/TransactionalPush'; +import transactionalSMS from './metadataTypes/TransactionalSMS'; +import triggeredSend from './metadataTypes/TriggeredSend'; +import user from './metadataTypes/User'; + /** * Provides access to all metadataType classes */ const MetadataTypeInfo = { - asset: require('./metadataTypes/Asset'), - attributeGroup: require('./metadataTypes/AttributeGroup'), - automation: require('./metadataTypes/Automation'), - campaign: require('./metadataTypes/Campaign'), - contentArea: require('./metadataTypes/ContentArea'), - dataExtension: require('./metadataTypes/DataExtension'), - dataExtensionField: require('./metadataTypes/DataExtensionField'), - dataExtensionTemplate: require('./metadataTypes/DataExtensionTemplate'), - dataExtract: require('./metadataTypes/DataExtract'), - dataExtractType: require('./metadataTypes/DataExtractType'), - discovery: require('./metadataTypes/Discovery'), - email: require('./metadataTypes/Email'), - emailSend: require('./metadataTypes/EmailSend'), - event: require('./metadataTypes/Event'), - fileLocation: require('./metadataTypes/FileLocation'), - fileTransfer: require('./metadataTypes/FileTransfer'), - filter: require('./metadataTypes/Filter'), - folder: require('./metadataTypes/Folder'), - importFile: require('./metadataTypes/ImportFile'), - journey: require('./metadataTypes/Journey'), - list: require('./metadataTypes/List'), - mobileCode: require('./metadataTypes/MobileCode'), - mobileKeyword: require('./metadataTypes/MobileKeyword'), - mobileMessage: require('./metadataTypes/MobileMessage'), - query: require('./metadataTypes/Query'), - role: require('./metadataTypes/Role'), - script: require('./metadataTypes/Script'), - sendClassification: require('./metadataTypes/SendClassification'), - setDefinition: require('./metadataTypes/SetDefinition'), - transactionalEmail: require('./metadataTypes/TransactionalEmail'), - transactionalPush: require('./metadataTypes/TransactionalPush'), - transactionalSMS: require('./metadataTypes/TransactionalSMS'), - triggeredSend: require('./metadataTypes/TriggeredSend'), - user: require('./metadataTypes/User'), + asset, + attributeGroup, + automation, + campaign, + contentArea, + dataExtension, + dataExtensionField, + dataExtensionTemplate, + dataExtract, + dataExtractType, + discovery, + email, + emailSend, + event, + fileLocation, + fileTransfer, + filter, + folder, + importFile, + journey, + list, + mobileCode, + mobileKeyword, + mobileMessage, + query, + role, + script, + sendClassification, + setDefinition, + transactionalEmail, + transactionalPush, + transactionalSMS, + triggeredSend, + user, }; -module.exports = MetadataTypeInfo; +export default MetadataTypeInfo; diff --git a/lib/Retriever.js b/lib/Retriever.js index 86ecf781e..ea1955ca3 100644 --- a/lib/Retriever.js +++ b/lib/Retriever.js @@ -1,12 +1,12 @@ 'use strict'; -const TYPE = require('../types/mcdev.d'); -const MetadataTypeInfo = require('./MetadataTypeInfo'); -const MetadataDefinitions = require('./MetadataTypeDefinitions'); -const Util = require('./util/util'); -const File = require('./util/file'); -const cache = require('./util/cache'); -const auth = require('./util/auth'); +import TYPE from '../types/mcdev.d'; +import MetadataTypeInfo from './MetadataTypeInfo'; +import MetadataDefinitions from './MetadataTypeDefinitions'; +import Util from './util/util'; +import File from './util/file'; +import cache from './util/cache'; +import auth from './util/auth'; /** * Retrieves metadata from a business unit and saves it to the local filesystem. */ @@ -210,4 +210,4 @@ class Retriever { } } -module.exports = Retriever; +export default Retriever; diff --git a/lib/cli.js b/lib/cli.js index 7efceb3ff..8ad6310f6 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -1,13 +1,13 @@ -#!/usr/bin/env node -'use strict'; +#!/usr/bin/env node'use strict'; /** * CLI entry for SFMC DevTools */ -const Util = require('./util/util'); -const yargs = require('yargs'); -const Mcdev = require('./index'); +import Util from './util/util'; + +import yargs from 'yargs'; +import Mcdev from './index'; yargs .scriptName('mcdev') diff --git a/lib/index.js b/lib/index.js index 476528856..ab120cd6b 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,21 +1,21 @@ 'use strict'; -const TYPE = require('../types/mcdev.d'); -const Util = require('./util/util'); -const auth = require('./util/auth'); -const File = require('./util/file'); -const config = require('./util/config'); -const Init = require('./util/init'); -const InitGit = require('./util/init.git'); -const Cli = require('./util/cli'); -const DevOps = require('./util/devops'); -const BuHelper = require('./util/businessUnit'); -const Builder = require('./Builder'); -const Deployer = require('./Deployer'); -const MetadataTypeInfo = require('./MetadataTypeInfo'); -const MetadataTypeDefinitions = require('./MetadataTypeDefinitions'); -const Retriever = require('./Retriever'); -const cache = require('./util/cache'); +import TYPE from '../types/mcdev.d'; +import Util from './util/util'; +import auth from './util/auth'; +import File from './util/file'; +import config from './util/config'; +import Init from './util/init'; +import InitGit from './util/init.git'; +import Cli from './util/cli'; +import DevOps from './util/devops'; +import BuHelper from './util/businessUnit'; +import Builder from './Builder'; +import Deployer from './Deployer'; +import MetadataTypeInfo from './MetadataTypeInfo'; +import MetadataTypeDefinitions from './MetadataTypeDefinitions'; +import Retriever from './Retriever'; +import cache from './util/cache'; /** * main class @@ -672,4 +672,4 @@ class Mcdev { } } -module.exports = Mcdev; +export default Mcdev; diff --git a/lib/metadataTypes/Asset.js b/lib/metadataTypes/Asset.js index c4c370167..a9fa9a39f 100644 --- a/lib/metadataTypes/Asset.js +++ b/lib/metadataTypes/Asset.js @@ -1,12 +1,12 @@ 'use strict'; -const MetadataType = require('./MetadataType'); -const TYPE = require('../../types/mcdev.d'); -const Util = require('../util/util'); -const File = require('../util/file'); -const pLimit = require('p-limit'); -const cliProgress = require('cli-progress'); -const cache = require('../util/cache'); +import MetadataType from './MetadataType'; +import TYPE from '../../types/mcdev.d'; +import Util from '../util/util'; +import File from '../util/file'; +import pLimit from 'p-limit'; +import cliProgress from 'cli-progress'; +import cache from '../util/cache'; /** * FileTransfer MetadataType @@ -1633,4 +1633,4 @@ class Asset extends MetadataType { // Assign definition to static attributes Asset.definition = require('../MetadataTypeDefinitions').asset; -module.exports = Asset; +export default Asset; diff --git a/lib/metadataTypes/AttributeGroup.js b/lib/metadataTypes/AttributeGroup.js index cf84ede2a..ebe9b3183 100644 --- a/lib/metadataTypes/AttributeGroup.js +++ b/lib/metadataTypes/AttributeGroup.js @@ -1,7 +1,7 @@ 'use strict'; -const MetadataType = require('./MetadataType'); -const TYPE = require('../../types/mcdev.d'); +import MetadataType from './MetadataType'; +import TYPE from '../../types/mcdev.d'; /** * AttributeGroup MetadataType @@ -39,4 +39,4 @@ class AttributeGroup extends MetadataType { // Assign definition to static attributes AttributeGroup.definition = require('../MetadataTypeDefinitions').attributeGroup; -module.exports = AttributeGroup; +export default AttributeGroup; diff --git a/lib/metadataTypes/Automation.js b/lib/metadataTypes/Automation.js index 83d6b54d3..8c601c5da 100644 --- a/lib/metadataTypes/Automation.js +++ b/lib/metadataTypes/Automation.js @@ -1,11 +1,11 @@ 'use strict'; -const MetadataType = require('./MetadataType'); -const TYPE = require('../../types/mcdev.d'); -const Util = require('../util/util'); -const File = require('../util/file'); -const Definitions = require('../MetadataTypeDefinitions'); -const cache = require('../util/cache'); +import MetadataType from './MetadataType'; +import TYPE from '../../types/mcdev.d'; +import Util from '../util/util'; +import File from '../util/file'; +import Definitions from '../MetadataTypeDefinitions'; +import cache from '../util/cache'; /** * Automation MetadataType @@ -1048,4 +1048,4 @@ class Automation extends MetadataType { // Assign definition to static attributes Automation.definition = Definitions.automation; -module.exports = Automation; +export default Automation; diff --git a/lib/metadataTypes/Campaign.js b/lib/metadataTypes/Campaign.js index 251fa5a3e..a907f3b2e 100644 --- a/lib/metadataTypes/Campaign.js +++ b/lib/metadataTypes/Campaign.js @@ -1,9 +1,9 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; /** * Campaign MetadataType @@ -73,4 +73,4 @@ class Campaign extends MetadataType { // Assign definition to static attributes Campaign.definition = require('../MetadataTypeDefinitions').campaign; -module.exports = Campaign; +export default Campaign; diff --git a/lib/metadataTypes/ContentArea.js b/lib/metadataTypes/ContentArea.js index f6e4a2493..f08ccd16c 100644 --- a/lib/metadataTypes/ContentArea.js +++ b/lib/metadataTypes/ContentArea.js @@ -1,9 +1,9 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import cache from '../util/cache'; /** * ContentArea MetadataType @@ -101,4 +101,4 @@ class ContentArea extends MetadataType { // Assign definition to static attributes ContentArea.definition = require('../MetadataTypeDefinitions').contentArea; -module.exports = ContentArea; +export default ContentArea; diff --git a/lib/metadataTypes/DataExtension.js b/lib/metadataTypes/DataExtension.js index daca42809..f2734a972 100644 --- a/lib/metadataTypes/DataExtension.js +++ b/lib/metadataTypes/DataExtension.js @@ -1,14 +1,14 @@ 'use strict'; -const jsonToTable = require('json-to-table'); -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const DataExtensionField = require('./DataExtensionField'); -const Folder = require('./Folder'); -const Util = require('../util/util'); -const File = require('../util/file'); -const auth = require('../util/auth'); -const cache = require('../util/cache'); +import jsonToTable from 'json-to-table'; +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import DataExtensionField from './DataExtensionField'; +import Folder from './Folder'; +import Util from '../util/util'; +import File from '../util/file'; +import auth from '../util/auth'; +import cache from '../util/cache'; /** * DataExtension MetadataType @@ -1074,4 +1074,4 @@ class DataExtension extends MetadataType { // Assign definition to static attributes DataExtension.definition = require('../MetadataTypeDefinitions').dataExtension; -module.exports = DataExtension; +export default DataExtension; diff --git a/lib/metadataTypes/DataExtensionField.js b/lib/metadataTypes/DataExtensionField.js index 43ec0e190..cced28c96 100644 --- a/lib/metadataTypes/DataExtensionField.js +++ b/lib/metadataTypes/DataExtensionField.js @@ -1,8 +1,8 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; /** * DataExtensionField MetadataType @@ -335,4 +335,4 @@ class DataExtensionField extends MetadataType { // Assign definition to static attributes DataExtensionField.definition = require('../MetadataTypeDefinitions').dataExtensionField; -module.exports = DataExtensionField; +export default DataExtensionField; diff --git a/lib/metadataTypes/DataExtensionTemplate.js b/lib/metadataTypes/DataExtensionTemplate.js index 021dc554b..928e40b4f 100644 --- a/lib/metadataTypes/DataExtensionTemplate.js +++ b/lib/metadataTypes/DataExtensionTemplate.js @@ -1,7 +1,7 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; /** * DataExtensionTemplate MetadataType @@ -37,4 +37,4 @@ class DataExtensionTemplate extends MetadataType { // Assign definition to static attributes DataExtensionTemplate.definition = require('../MetadataTypeDefinitions').dataExtensionTemplate; -module.exports = DataExtensionTemplate; +export default DataExtensionTemplate; diff --git a/lib/metadataTypes/DataExtract.js b/lib/metadataTypes/DataExtract.js index 077f724c4..94f7f85af 100644 --- a/lib/metadataTypes/DataExtract.js +++ b/lib/metadataTypes/DataExtract.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * DataExtract MetadataType @@ -162,4 +162,4 @@ class DataExtract extends MetadataType { // Assign definition to static attributes DataExtract.definition = require('../MetadataTypeDefinitions').dataExtract; -module.exports = DataExtract; +export default DataExtract; diff --git a/lib/metadataTypes/DataExtractType.js b/lib/metadataTypes/DataExtractType.js index 1b1ea6f28..a056a8eaa 100644 --- a/lib/metadataTypes/DataExtractType.js +++ b/lib/metadataTypes/DataExtractType.js @@ -1,7 +1,7 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; /** * DataExtractType MetadataType @@ -36,4 +36,4 @@ class DataExtractType extends MetadataType { // Assign definition to static attributes DataExtractType.definition = require('../MetadataTypeDefinitions').dataExtractType; -module.exports = DataExtractType; +export default DataExtractType; diff --git a/lib/metadataTypes/Discovery.js b/lib/metadataTypes/Discovery.js index 8f6191e71..a8de9678d 100644 --- a/lib/metadataTypes/Discovery.js +++ b/lib/metadataTypes/Discovery.js @@ -1,8 +1,8 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; /** * ImportFile MetadataType @@ -50,4 +50,4 @@ class Discovery extends MetadataType { // Assign definition to static attributes Discovery.definition = require('../MetadataTypeDefinitions').discovery; -module.exports = Discovery; +export default Discovery; diff --git a/lib/metadataTypes/Email.js b/lib/metadataTypes/Email.js index 57cf606e8..3354bf2a7 100644 --- a/lib/metadataTypes/Email.js +++ b/lib/metadataTypes/Email.js @@ -1,8 +1,8 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; /** * Email MetadataType @@ -89,4 +89,4 @@ class Email extends MetadataType { // Assign definition to static attributes Email.definition = require('../MetadataTypeDefinitions').email; -module.exports = Email; +export default Email; diff --git a/lib/metadataTypes/EmailSend.js b/lib/metadataTypes/EmailSend.js index 7084805f9..d492ae01c 100644 --- a/lib/metadataTypes/EmailSend.js +++ b/lib/metadataTypes/EmailSend.js @@ -1,9 +1,9 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import cache from '../util/cache'; /** * MessageSendActivity MetadataType @@ -294,4 +294,4 @@ class EmailSend extends MetadataType { // Assign definition to static attributes EmailSend.definition = require('../MetadataTypeDefinitions').emailSend; -module.exports = EmailSend; +export default EmailSend; diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 3062acfd4..49322f1e5 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * Event MetadataType @@ -216,4 +216,4 @@ class Event extends MetadataType { // Assign definition to static attributes Event.definition = require('../MetadataTypeDefinitions').event; -module.exports = Event; +export default Event; diff --git a/lib/metadataTypes/FileLocation.js b/lib/metadataTypes/FileLocation.js index 849df3b68..8d5c36f6d 100644 --- a/lib/metadataTypes/FileLocation.js +++ b/lib/metadataTypes/FileLocation.js @@ -1,7 +1,7 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; /** * ImportFile MetadataType @@ -36,4 +36,4 @@ class FtpLocation extends MetadataType { // Assign definition to static attributes FtpLocation.definition = require('../MetadataTypeDefinitions').fileLocation; -module.exports = FtpLocation; +export default FtpLocation; diff --git a/lib/metadataTypes/FileTransfer.js b/lib/metadataTypes/FileTransfer.js index 7cdd2a577..4c89e924c 100644 --- a/lib/metadataTypes/FileTransfer.js +++ b/lib/metadataTypes/FileTransfer.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * FileTransfer MetadataType @@ -167,4 +167,4 @@ class FileTransfer extends MetadataType { // Assign definition to static attributes FileTransfer.definition = require('../MetadataTypeDefinitions').fileTransfer; -module.exports = FileTransfer; +export default FileTransfer; diff --git a/lib/metadataTypes/Filter.js b/lib/metadataTypes/Filter.js index dafa8691f..9a09a0e2c 100644 --- a/lib/metadataTypes/Filter.js +++ b/lib/metadataTypes/Filter.js @@ -1,7 +1,7 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; /** * Filter MetadataType @@ -29,4 +29,4 @@ class Filter extends MetadataType { // Assign definition to static attributes Filter.definition = require('../MetadataTypeDefinitions').filter; -module.exports = Filter; +export default Filter; diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index e1f691873..01d48e21b 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -1,11 +1,11 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const toposort = require('toposort'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import toposort from 'toposort'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * Folder MetadataType @@ -631,4 +631,4 @@ class Folder extends MetadataType { // Assign definition to static attributes Folder.definition = require('../MetadataTypeDefinitions').folder; -module.exports = Folder; +export default Folder; diff --git a/lib/metadataTypes/ImportFile.js b/lib/metadataTypes/ImportFile.js index 1aef70c7e..e298213f3 100644 --- a/lib/metadataTypes/ImportFile.js +++ b/lib/metadataTypes/ImportFile.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * ImportFile MetadataType @@ -234,4 +234,4 @@ class ImportFile extends MetadataType { // Assign definition to static attributes ImportFile.definition = require('../MetadataTypeDefinitions').importFile; -module.exports = ImportFile; +export default ImportFile; diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index ae4d4fb24..34226c94f 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -1,11 +1,11 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const TransactionalEmail = require('./TransactionalEmail'); -const Util = require('../util/util'); -const cache = require('../util/cache'); -const File = require('../util/file'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import TransactionalEmail from './TransactionalEmail'; +import Util from '../util/util'; +import cache from '../util/cache'; +import File from '../util/file'; /** * Journey MetadataType @@ -959,4 +959,4 @@ class Journey extends MetadataType { // Assign definition to static attributes Journey.definition = require('../MetadataTypeDefinitions').journey; -module.exports = Journey; +export default Journey; diff --git a/lib/metadataTypes/List.js b/lib/metadataTypes/List.js index 4b0ed2d11..a51f93169 100644 --- a/lib/metadataTypes/List.js +++ b/lib/metadataTypes/List.js @@ -1,11 +1,11 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Folder = require('./Folder'); -const Util = require('../util/util'); -const cache = require('../util/cache'); -const auth = require('../util/auth'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Folder from './Folder'; +import Util from '../util/util'; +import cache from '../util/cache'; +import auth from '../util/auth'; /** * List MetadataType @@ -207,4 +207,4 @@ class List extends MetadataType { // Assign definition to static attributes List.definition = require('../MetadataTypeDefinitions').list; -module.exports = List; +export default List; diff --git a/lib/metadataTypes/MetadataType.js b/lib/metadataTypes/MetadataType.js index 5b09b345c..044795c41 100644 --- a/lib/metadataTypes/MetadataType.js +++ b/lib/metadataTypes/MetadataType.js @@ -7,14 +7,14 @@ * in the generic version of the method */ -const TYPE = require('../../types/mcdev.d'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); - -const deepEqual = require('deep-equal'); -const pLimit = require('p-limit'); -const Mustache = require('mustache'); +import TYPE from '../../types/mcdev.d'; + +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; +import deepEqual from 'deep-equal'; +import pLimit from 'p-limit'; +import Mustache from 'mustache'; /** * ensure that Mustache does not escape any characters * @@ -1846,4 +1846,4 @@ MetadataType.subType = null; */ MetadataType.buObject = null; -module.exports = MetadataType; +export default MetadataType; diff --git a/lib/metadataTypes/MobileCode.js b/lib/metadataTypes/MobileCode.js index 661ad2420..fce938f55 100644 --- a/lib/metadataTypes/MobileCode.js +++ b/lib/metadataTypes/MobileCode.js @@ -1,7 +1,7 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; /** * MobileCode MetadataType @@ -41,4 +41,4 @@ class MobileCode extends MetadataType { // Assign definition to static attributes MobileCode.definition = require('../MetadataTypeDefinitions').mobileCode; -module.exports = MobileCode; +export default MobileCode; diff --git a/lib/metadataTypes/MobileKeyword.js b/lib/metadataTypes/MobileKeyword.js index 2466c60af..c32e2bcd2 100644 --- a/lib/metadataTypes/MobileKeyword.js +++ b/lib/metadataTypes/MobileKeyword.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * MobileKeyword MetadataType @@ -382,4 +382,4 @@ class MobileKeyword extends MetadataType { // Assign definition to static attributes MobileKeyword.definition = require('../MetadataTypeDefinitions').mobileKeyword; -module.exports = MobileKeyword; +export default MobileKeyword; diff --git a/lib/metadataTypes/MobileMessage.js b/lib/metadataTypes/MobileMessage.js index c26ed3056..de52c4b1e 100644 --- a/lib/metadataTypes/MobileMessage.js +++ b/lib/metadataTypes/MobileMessage.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * MobileMessage MetadataType @@ -460,4 +460,4 @@ class MobileMessage extends MetadataType { // Assign definition to static attributes MobileMessage.definition = require('../MetadataTypeDefinitions').mobileMessage; -module.exports = MobileMessage; +export default MobileMessage; diff --git a/lib/metadataTypes/Query.js b/lib/metadataTypes/Query.js index 1b3d331d3..03e29a575 100644 --- a/lib/metadataTypes/Query.js +++ b/lib/metadataTypes/Query.js @@ -1,11 +1,11 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const Util = require('../util/util'); -const MetadataType = require('./MetadataType'); -const File = require('../util/file'); -const cache = require('../util/cache'); -const Mustache = require('mustache'); +import TYPE from '../../types/mcdev.d'; +import Util from '../util/util'; +import MetadataType from './MetadataType'; +import File from '../util/file'; +import cache from '../util/cache'; +import Mustache from 'mustache'; /** * ensure that Mustache does not escape any characters * @@ -431,4 +431,4 @@ class Query extends MetadataType { // Assign definition & cache to static attributes Query.definition = require('../MetadataTypeDefinitions').query; -module.exports = Query; +export default Query; diff --git a/lib/metadataTypes/Role.js b/lib/metadataTypes/Role.js index d6d4d7c85..76425307a 100644 --- a/lib/metadataTypes/Role.js +++ b/lib/metadataTypes/Role.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * ImportFile MetadataType @@ -328,4 +328,4 @@ class Role extends MetadataType { // Assign definition to static attributes Role.definition = require('../MetadataTypeDefinitions').role; -module.exports = Role; +export default Role; diff --git a/lib/metadataTypes/Script.js b/lib/metadataTypes/Script.js index aec027bfb..fc66986c0 100644 --- a/lib/metadataTypes/Script.js +++ b/lib/metadataTypes/Script.js @@ -1,9 +1,9 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; /** * Script MetadataType @@ -329,4 +329,4 @@ class Script extends MetadataType { // Assign definition & cache to static attributes Script.definition = require('../MetadataTypeDefinitions').script; -module.exports = Script; +export default Script; diff --git a/lib/metadataTypes/SendClassification.js b/lib/metadataTypes/SendClassification.js index 8a10becb5..20c39ea59 100644 --- a/lib/metadataTypes/SendClassification.js +++ b/lib/metadataTypes/SendClassification.js @@ -1,7 +1,7 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; /** * SendClassification MetadataType @@ -37,4 +37,4 @@ class SendClassification extends MetadataType { // Assign definition to static attributes SendClassification.definition = require('../MetadataTypeDefinitions').sendClassification; -module.exports = SendClassification; +export default SendClassification; diff --git a/lib/metadataTypes/SetDefinition.js b/lib/metadataTypes/SetDefinition.js index 551320874..bb8b1a75e 100644 --- a/lib/metadataTypes/SetDefinition.js +++ b/lib/metadataTypes/SetDefinition.js @@ -1,7 +1,7 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; /** * SetDefinition MetadataType @@ -34,4 +34,4 @@ class SetDefinition extends MetadataType { // Assign definition to static attributes SetDefinition.definition = require('../MetadataTypeDefinitions').setDefinition; -module.exports = SetDefinition; +export default SetDefinition; diff --git a/lib/metadataTypes/TransactionalEmail.js b/lib/metadataTypes/TransactionalEmail.js index 560bfdc61..c33e64bf2 100644 --- a/lib/metadataTypes/TransactionalEmail.js +++ b/lib/metadataTypes/TransactionalEmail.js @@ -1,9 +1,9 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const TransactionalMessage = require('./TransactionalMessage'); -const Util = require('../util/util'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import TransactionalMessage from './TransactionalMessage'; +import Util from '../util/util'; +import cache from '../util/cache'; /** * TransactionalEmail MetadataType @@ -159,4 +159,4 @@ class TransactionalEmail extends TransactionalMessage { // Assign definition to static attributes TransactionalEmail.definition = require('../MetadataTypeDefinitions').transactionalEmail; -module.exports = TransactionalEmail; +export default TransactionalEmail; diff --git a/lib/metadataTypes/TransactionalMessage.js b/lib/metadataTypes/TransactionalMessage.js index 58587d7db..63e6d316c 100644 --- a/lib/metadataTypes/TransactionalMessage.js +++ b/lib/metadataTypes/TransactionalMessage.js @@ -1,8 +1,8 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; /** * TransactionalMessage MetadataType @@ -116,4 +116,4 @@ class TransactionalMessage extends MetadataType { // ! using SMS definitions here as placeholder to have auto completion TransactionalMessage.definition = require('../MetadataTypeDefinitions').transactionalSMS; -module.exports = TransactionalMessage; +export default TransactionalMessage; diff --git a/lib/metadataTypes/TransactionalPush.js b/lib/metadataTypes/TransactionalPush.js index 1b97b6922..978037867 100644 --- a/lib/metadataTypes/TransactionalPush.js +++ b/lib/metadataTypes/TransactionalPush.js @@ -1,9 +1,9 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const TransactionalMessage = require('./TransactionalMessage'); -const Util = require('../util/util'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import TransactionalMessage from './TransactionalMessage'; +import Util from '../util/util'; +import cache from '../util/cache'; /** * TransactionalPush TransactionalMessage @@ -74,4 +74,4 @@ class TransactionalPush extends TransactionalMessage { // Assign definition to static attributes TransactionalPush.definition = require('../MetadataTypeDefinitions').transactionalPush; -module.exports = TransactionalPush; +export default TransactionalPush; diff --git a/lib/metadataTypes/TransactionalSMS.js b/lib/metadataTypes/TransactionalSMS.js index 5b429c491..00569c3fd 100644 --- a/lib/metadataTypes/TransactionalSMS.js +++ b/lib/metadataTypes/TransactionalSMS.js @@ -1,11 +1,11 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const TransactionalMessage = require('./TransactionalMessage'); -const Util = require('../util/util'); -const File = require('../util/file'); -const beautifier = require('beauty-amp-core'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import TransactionalMessage from './TransactionalMessage'; +import Util from '../util/util'; +import File from '../util/file'; +import beautifier from 'beauty-amp-core'; +import cache from '../util/cache'; /** * TransactionalSMS MetadataType @@ -343,4 +343,4 @@ class TransactionalSMS extends TransactionalMessage { // Assign definition to static attributes TransactionalSMS.definition = require('../MetadataTypeDefinitions').transactionalSMS; -module.exports = TransactionalSMS; +export default TransactionalSMS; diff --git a/lib/metadataTypes/TriggeredSend.js b/lib/metadataTypes/TriggeredSend.js index 26b3ca33d..0d150418d 100644 --- a/lib/metadataTypes/TriggeredSend.js +++ b/lib/metadataTypes/TriggeredSend.js @@ -1,14 +1,17 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import cache from '../util/cache'; +import asset from './Asset'; +import folder from './Folder'; +import list from './List'; const cacheTypes = { - asset: require('./Asset'), - folder: require('./Folder'), - list: require('./List'), + asset, + folder, + list, }; /** @@ -433,4 +436,4 @@ class TriggeredSend extends MetadataType { // Assign definition to static attributes TriggeredSend.definition = require('../MetadataTypeDefinitions').triggeredSend; -module.exports = TriggeredSend; +export default TriggeredSend; diff --git a/lib/metadataTypes/User.js b/lib/metadataTypes/User.js index 6e30896d0..07494afa2 100644 --- a/lib/metadataTypes/User.js +++ b/lib/metadataTypes/User.js @@ -1,10 +1,10 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataType = require('./MetadataType'); -const Util = require('../util/util'); -const File = require('../util/file'); -const cache = require('../util/cache'); +import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType'; +import Util from '../util/util'; +import File from '../util/file'; +import cache from '../util/cache'; /** * MetadataType @@ -1174,4 +1174,4 @@ class User extends MetadataType { // Assign definition to static attributes User.definition = require('../MetadataTypeDefinitions').user; -module.exports = User; +export default User; diff --git a/lib/metadataTypes/definitions/Asset.definition.js b/lib/metadataTypes/definitions/Asset.definition.js index 1d695ba9a..35491d89c 100644 --- a/lib/metadataTypes/definitions/Asset.definition.js +++ b/lib/metadataTypes/definitions/Asset.definition.js @@ -1,5 +1,5 @@ // asset types https://developer.salesforce.com/docs/atlas.en-us.noversion.mc-apis.meta/mc-apis/base-asset-types.htm -module.exports = { +export default { bodyIteratorField: 'items', dependencies: ['folder-asset', 'folder-asset-shared'], folderType: 'asset', diff --git a/lib/metadataTypes/definitions/AttributeGroup.definition.js b/lib/metadataTypes/definitions/AttributeGroup.definition.js index cc6048fd8..ec8593215 100644 --- a/lib/metadataTypes/definitions/AttributeGroup.definition.js +++ b/lib/metadataTypes/definitions/AttributeGroup.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'attributeGroupDefinitions', dependencies: [], // future may have dependency on Data Extensions hasExtended: false, diff --git a/lib/metadataTypes/definitions/Automation.definition.js b/lib/metadataTypes/definitions/Automation.definition.js index d07b4bab0..caf412432 100644 --- a/lib/metadataTypes/definitions/Automation.definition.js +++ b/lib/metadataTypes/definitions/Automation.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { activityTypeMapping: { dataExtract: 73, dataFactoryUtility: 425, diff --git a/lib/metadataTypes/definitions/Campaign.definition.js b/lib/metadataTypes/definitions/Campaign.definition.js index cd8893b31..93644cb2a 100644 --- a/lib/metadataTypes/definitions/Campaign.definition.js +++ b/lib/metadataTypes/definitions/Campaign.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'entry', dependencies: [], hasExtended: false, diff --git a/lib/metadataTypes/definitions/ContentArea.definition.js b/lib/metadataTypes/definitions/ContentArea.definition.js index a0b9c61be..7ce7b43bb 100644 --- a/lib/metadataTypes/definitions/ContentArea.definition.js +++ b/lib/metadataTypes/definitions/ContentArea.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: ['folder'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/DataExtension.definition.js b/lib/metadataTypes/definitions/DataExtension.definition.js index ca22f8f21..db5f21e1e 100644 --- a/lib/metadataTypes/definitions/DataExtension.definition.js +++ b/lib/metadataTypes/definitions/DataExtension.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: [ 'folder-hidden', diff --git a/lib/metadataTypes/definitions/DataExtensionField.definition.js b/lib/metadataTypes/definitions/DataExtensionField.definition.js index 196a1162a..0ae65b759 100644 --- a/lib/metadataTypes/definitions/DataExtensionField.definition.js +++ b/lib/metadataTypes/definitions/DataExtensionField.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: [], filter: {}, diff --git a/lib/metadataTypes/definitions/DataExtensionTemplate.definition.js b/lib/metadataTypes/definitions/DataExtensionTemplate.definition.js index c6fa9463d..6586b2a5f 100644 --- a/lib/metadataTypes/definitions/DataExtensionTemplate.definition.js +++ b/lib/metadataTypes/definitions/DataExtensionTemplate.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: [], filter: {}, diff --git a/lib/metadataTypes/definitions/DataExtract.definition.js b/lib/metadataTypes/definitions/DataExtract.definition.js index bf9b69893..10e9493c6 100644 --- a/lib/metadataTypes/definitions/DataExtract.definition.js +++ b/lib/metadataTypes/definitions/DataExtract.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: ['dataExtension', 'dataExtractType'], hasExtended: true, diff --git a/lib/metadataTypes/definitions/DataExtractType.definition.js b/lib/metadataTypes/definitions/DataExtractType.definition.js index 86fae7628..785ddbb0c 100644 --- a/lib/metadataTypes/definitions/DataExtractType.definition.js +++ b/lib/metadataTypes/definitions/DataExtractType.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: [], dependencies: [], hasExtended: false, diff --git a/lib/metadataTypes/definitions/Discovery.definition.js b/lib/metadataTypes/definitions/Discovery.definition.js index eae40b7f3..483b37612 100644 --- a/lib/metadataTypes/definitions/Discovery.definition.js +++ b/lib/metadataTypes/definitions/Discovery.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: null, dependencies: [], endPointMapping: { diff --git a/lib/metadataTypes/definitions/Email.definition.js b/lib/metadataTypes/definitions/Email.definition.js index 92c47638d..c448aaed7 100644 --- a/lib/metadataTypes/definitions/Email.definition.js +++ b/lib/metadataTypes/definitions/Email.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: ['folder-hidden', 'folder-email', 'folder-shared_email_default'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/EmailSend.definition.js b/lib/metadataTypes/definitions/EmailSend.definition.js index 2e750d44c..1cfe40674 100644 --- a/lib/metadataTypes/definitions/EmailSend.definition.js +++ b/lib/metadataTypes/definitions/EmailSend.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: ['folder-userinitiatedsends', 'email', 'asset-message', 'dataExtension', 'list'], // filter(+), sendClassification(+), SenderProfile(n/a), DeliveryProfile(n/a) folderType: 'userinitiatedsends', diff --git a/lib/metadataTypes/definitions/Event.definition.js b/lib/metadataTypes/definitions/Event.definition.js index 99711d510..e1854d97e 100644 --- a/lib/metadataTypes/definitions/Event.definition.js +++ b/lib/metadataTypes/definitions/Event.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: ['dataExtension'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/FileLocation.definition.js b/lib/metadataTypes/definitions/FileLocation.definition.js index 69a9dfd16..44b418cc6 100644 --- a/lib/metadataTypes/definitions/FileLocation.definition.js +++ b/lib/metadataTypes/definitions/FileLocation.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: [], hasExtended: false, diff --git a/lib/metadataTypes/definitions/FileTransfer.definition.js b/lib/metadataTypes/definitions/FileTransfer.definition.js index d22a9c05b..c097e9017 100644 --- a/lib/metadataTypes/definitions/FileTransfer.definition.js +++ b/lib/metadataTypes/definitions/FileTransfer.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: ['fileLocation'], hasExtended: true, diff --git a/lib/metadataTypes/definitions/Filter.definition.js b/lib/metadataTypes/definitions/Filter.definition.js index 317a1bad1..deef1dbfe 100644 --- a/lib/metadataTypes/definitions/Filter.definition.js +++ b/lib/metadataTypes/definitions/Filter.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: [], hasExtended: false, diff --git a/lib/metadataTypes/definitions/Folder.definition.js b/lib/metadataTypes/definitions/Folder.definition.js index fd3024cac..f6f72215f 100644 --- a/lib/metadataTypes/definitions/Folder.definition.js +++ b/lib/metadataTypes/definitions/Folder.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: [], subTypes: [ diff --git a/lib/metadataTypes/definitions/ImportFile.definition.js b/lib/metadataTypes/definitions/ImportFile.definition.js index 62cb45a8e..f7681976e 100644 --- a/lib/metadataTypes/definitions/ImportFile.definition.js +++ b/lib/metadataTypes/definitions/ImportFile.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: ['fileLocation', 'dataExtension', 'list'], destinationObjectTypeMapping: { diff --git a/lib/metadataTypes/definitions/Journey.definition.js b/lib/metadataTypes/definitions/Journey.definition.js index a9322b5b1..c935c96e3 100644 --- a/lib/metadataTypes/definitions/Journey.definition.js +++ b/lib/metadataTypes/definitions/Journey.definition.js @@ -2,7 +2,7 @@ // obj definition: https://developer.salesforce.com/docs/marketing/marketing-cloud/guide/getting-started-spec.html // insert: https://developer.salesforce.com/docs/marketing/marketing-cloud/guide/postCreateInteraction.html // update: https://developer.salesforce.com/docs/marketing/marketing-cloud/guide/putUpdateInteraction.html -module.exports = { +export default { bodyIteratorField: 'items', dependencies: [ 'folder-journey', diff --git a/lib/metadataTypes/definitions/List.definition.js b/lib/metadataTypes/definitions/List.definition.js index 867a2c64b..7fa728837 100644 --- a/lib/metadataTypes/definitions/List.definition.js +++ b/lib/metadataTypes/definitions/List.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: ['folder-mysubs', 'folder-list', 'folder-publication'], folderType: 'list', diff --git a/lib/metadataTypes/definitions/MobileCode.definition.js b/lib/metadataTypes/definitions/MobileCode.definition.js index 2ebc5ebab..e047790a0 100644 --- a/lib/metadataTypes/definitions/MobileCode.definition.js +++ b/lib/metadataTypes/definitions/MobileCode.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'entry', dependencies: [], hasExtended: false, diff --git a/lib/metadataTypes/definitions/MobileKeyword.definition.js b/lib/metadataTypes/definitions/MobileKeyword.definition.js index b474c75cf..ff6868343 100644 --- a/lib/metadataTypes/definitions/MobileKeyword.definition.js +++ b/lib/metadataTypes/definitions/MobileKeyword.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'entry', dependencies: ['mobileCode'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/MobileMessage.definition.js b/lib/metadataTypes/definitions/MobileMessage.definition.js index 9feec0a56..73e25cfb4 100644 --- a/lib/metadataTypes/definitions/MobileMessage.definition.js +++ b/lib/metadataTypes/definitions/MobileMessage.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'entry', dependencies: ['mobileCode', 'mobileKeyword', 'campaign'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/Query.definition.js b/lib/metadataTypes/definitions/Query.definition.js index 8ed76bdd6..2851462ea 100644 --- a/lib/metadataTypes/definitions/Query.definition.js +++ b/lib/metadataTypes/definitions/Query.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: ['folder-queryactivity', 'dataExtension'], folderType: 'queryactivity', diff --git a/lib/metadataTypes/definitions/Role.definition.js b/lib/metadataTypes/definitions/Role.definition.js index ec00780b3..5827387b5 100644 --- a/lib/metadataTypes/definitions/Role.definition.js +++ b/lib/metadataTypes/definitions/Role.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: [], deployBlacklist: [ diff --git a/lib/metadataTypes/definitions/Script.definition.js b/lib/metadataTypes/definitions/Script.definition.js index 0c38bd745..00e06ff22 100644 --- a/lib/metadataTypes/definitions/Script.definition.js +++ b/lib/metadataTypes/definitions/Script.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'items', dependencies: ['folder-ssjsactivity'], folderType: 'ssjsactivity', diff --git a/lib/metadataTypes/definitions/SendClassification.definition.js b/lib/metadataTypes/definitions/SendClassification.definition.js index cc794b222..2807ce43d 100644 --- a/lib/metadataTypes/definitions/SendClassification.definition.js +++ b/lib/metadataTypes/definitions/SendClassification.definition.js @@ -1,5 +1,5 @@ // https://developer.salesforce.com/docs/marketing/marketing-cloud/guide/sendclassification.html -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: [], filter: {}, diff --git a/lib/metadataTypes/definitions/SetDefinition.definition.js b/lib/metadataTypes/definitions/SetDefinition.definition.js index e5b7f9176..67ddea49d 100644 --- a/lib/metadataTypes/definitions/SetDefinition.definition.js +++ b/lib/metadataTypes/definitions/SetDefinition.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'setDefinition', dependencies: [], // future may have dependency on Data Extensions hasExtended: false, diff --git a/lib/metadataTypes/definitions/TransactionalEmail.definition.js b/lib/metadataTypes/definitions/TransactionalEmail.definition.js index 96a2f457f..27f8cd277 100644 --- a/lib/metadataTypes/definitions/TransactionalEmail.definition.js +++ b/lib/metadataTypes/definitions/TransactionalEmail.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'definitions', dependencies: ['asset-message', 'dataExtension', 'list', 'journey'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/TransactionalPush.definition.js b/lib/metadataTypes/definitions/TransactionalPush.definition.js index 66e663375..bb3bb9743 100644 --- a/lib/metadataTypes/definitions/TransactionalPush.definition.js +++ b/lib/metadataTypes/definitions/TransactionalPush.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'definitions', dependencies: ['asset-asset'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/TransactionalSMS.definition.js b/lib/metadataTypes/definitions/TransactionalSMS.definition.js index 2cb1c7af7..743a62d99 100644 --- a/lib/metadataTypes/definitions/TransactionalSMS.definition.js +++ b/lib/metadataTypes/definitions/TransactionalSMS.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'definitions', dependencies: ['mobileCode', 'mobileKeyword'], hasExtended: false, diff --git a/lib/metadataTypes/definitions/TriggeredSend.definition.js b/lib/metadataTypes/definitions/TriggeredSend.definition.js index adee58ee4..0c6e30499 100644 --- a/lib/metadataTypes/definitions/TriggeredSend.definition.js +++ b/lib/metadataTypes/definitions/TriggeredSend.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: [ 'folder-hidden', diff --git a/lib/metadataTypes/definitions/User.definition.js b/lib/metadataTypes/definitions/User.definition.js index 5e8481c59..759856345 100644 --- a/lib/metadataTypes/definitions/User.definition.js +++ b/lib/metadataTypes/definitions/User.definition.js @@ -1,4 +1,4 @@ -module.exports = { +export default { bodyIteratorField: 'Results', dependencies: ['role'], folderType: null, diff --git a/lib/retrieveChangelog.js b/lib/retrieveChangelog.js index 3d42e6592..0b9d8ac89 100644 --- a/lib/retrieveChangelog.js +++ b/lib/retrieveChangelog.js @@ -1,5 +1,5 @@ -#!/usr/bin/env node -'use strict'; +#!/usr/bin/env node'use strict'; + /* eslint-disable unicorn/prefer-top-level-await */ /** * sample file on how to retrieve a simple changelog to use in GUIs or automated processing of any kind @@ -16,9 +16,10 @@ }] */ -const mcdev = require('./index'); -const Definition = require('./MetadataTypeDefinitions'); -const MetadataType = require('./MetadataTypeInfo'); +import mcdev from './index'; + +import Definition from './MetadataTypeDefinitions'; +import MetadataType from './MetadataTypeInfo'; // disable cli logs // mcdev._setLoggingLevel({ silent: true }); diff --git a/lib/util/auth.js b/lib/util/auth.js index 74080b0ba..8cdb9ed3b 100644 --- a/lib/util/auth.js +++ b/lib/util/auth.js @@ -1,8 +1,8 @@ -const TYPE = require('../../types/mcdev.d'); -const Util = require('./util'); -const File = require('./file'); -const SDK = require('sfmc-sdk'); -const Conf = require('conf'); +import TYPE from '../../types/mcdev.d'; +import Util from './util'; +import File from './file'; +import SDK from 'sfmc-sdk'; +import Conf from 'conf'; const credentialStore = new Conf({ configName: 'sessions', clearInvalidConfig: true }); // const currentMID = null; const initializedSDKs = {}; @@ -147,4 +147,4 @@ function setupSDK(sessionKey, authObject) { }); } -module.exports = Auth; +export default Auth; diff --git a/lib/util/businessUnit.js b/lib/util/businessUnit.js index f9b6b3ef6..c58170fc9 100644 --- a/lib/util/businessUnit.js +++ b/lib/util/businessUnit.js @@ -1,9 +1,9 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const Util = require('./util'); -const File = require('./file'); -const auth = require('./auth'); +import TYPE from '../../types/mcdev.d'; +import Util from './util'; +import File from './file'; +import auth from './auth'; /** * Helper that handles retrieval of BU info @@ -104,4 +104,4 @@ const BusinessUnit = { }, }; -module.exports = BusinessUnit; +export default BusinessUnit; diff --git a/lib/util/cache.js b/lib/util/cache.js index bcea3a35d..d1cdba36b 100644 --- a/lib/util/cache.js +++ b/lib/util/cache.js @@ -1,11 +1,11 @@ -const TYPE = require('../../types/mcdev.d'); -const Util = require('./util'); +import TYPE from '../../types/mcdev.d'; +import Util from './util'; /** @type {TYPE.Cache} */ const dataStore = {}; let currentMID = null; -module.exports = { +export default { /** * Method to setup buObject * NOTE: in future this may need to restore, rather than wipe the cache diff --git a/lib/util/cli.js b/lib/util/cli.js index 5ebc5ccb7..d748f7a24 100644 --- a/lib/util/cli.js +++ b/lib/util/cli.js @@ -1,14 +1,14 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const BuHelper = require('./businessUnit'); -const File = require('./file'); -const config = require('./config'); -const inquirer = require('inquirer'); -const MetadataDefinitions = require('./../MetadataTypeDefinitions'); -const Util = require('./util'); -const auth = require('./auth'); -require('console.table'); +import TYPE from '../../types/mcdev.d'; +import BuHelper from './businessUnit'; +import File from './file'; +import config from './config'; +import inquirer from 'inquirer'; +import MetadataDefinitions from './../MetadataTypeDefinitions'; +import Util from './util'; +import auth from './auth'; +import 'console.table'; /** * CLI helper class @@ -614,4 +614,4 @@ const Cli = { }, }; -module.exports = Cli; +export default Cli; diff --git a/lib/util/config.js b/lib/util/config.js index cab81b61c..375fab40a 100644 --- a/lib/util/config.js +++ b/lib/util/config.js @@ -1,9 +1,9 @@ -const TYPE = require('../../types/mcdev.d'); -const Util = require('./util'); -const File = require('./file'); -const inquirer = require('inquirer'); -const semver = require('semver'); -const path = require('node:path'); +import TYPE from '../../types/mcdev.d'; +import Util from './util'; +import File from './file'; +import inquirer from 'inquirer'; +import semver from 'semver'; +import path from 'node:path'; /** * Central class for loading and validating properties from config and auth */ @@ -300,4 +300,4 @@ const config = { return defaultProperties; }, }; -module.exports = config; +export default config; diff --git a/lib/util/devops.js b/lib/util/devops.js index 208e838a0..82641ca92 100644 --- a/lib/util/devops.js +++ b/lib/util/devops.js @@ -1,13 +1,14 @@ -const TYPE = require('../../types/mcdev.d'); -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'); -const jsonToTable = require('json-to-table'); +import TYPE from '../../types/mcdev.d'; +import File from './file'; +import path from 'node:path'; +import inquirer from 'inquirer'; +import Util from './util'; +import Cli from './cli'; +import gitFactory from 'simple-git'; +const git = gitFactory(); +import Builder from '../Builder'; +import MetadataType from '../MetadataTypeInfo'; +import jsonToTable from 'json-to-table'; /** * DevOps helper class */ @@ -568,4 +569,4 @@ const DevOps = { }, }; -module.exports = DevOps; +export default DevOps; diff --git a/lib/util/file.js b/lib/util/file.js index d4d9c6946..173fce1de 100644 --- a/lib/util/file.js +++ b/lib/util/file.js @@ -1,14 +1,14 @@ /* eslint-disable no-control-regex */ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const fs = require('fs-extra'); -const packageJson = require('../../package.json'); -const path = require('node:path'); -const prettier = require('prettier'); -const beautyAmp = require('beauty-amp-core'); -const Util = require('./util'); -const updateNotifier = require('update-notifier'); +import TYPE from '../../types/mcdev.d'; +import fs from 'fs-extra'; +import packageJson from '../../package.json'; +import path from 'node:path'; +import prettier from 'prettier'; +import beautyAmp from 'beauty-amp-core'; +import Util from './util'; +import updateNotifier from 'update-notifier'; // inform user when there is an update const notifier = updateNotifier({ @@ -548,4 +548,4 @@ const File = { const FileFs = { ...fs, ...File }; FileFs.prettierConfig = null; -module.exports = FileFs; +export default FileFs; diff --git a/lib/util/init.config.js b/lib/util/init.config.js index 4d6e3eab6..860e5756b 100644 --- a/lib/util/init.config.js +++ b/lib/util/init.config.js @@ -1,13 +1,13 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const Cli = require('./cli'); -const File = require('./file'); -const config = require('./config'); -const Util = require('./util'); -const inquirer = require('inquirer'); -const path = require('node:path'); -const semver = require('semver'); +import TYPE from '../../types/mcdev.d'; +import Cli from './cli'; +import File from './file'; +import config from './config'; +import Util from './util'; +import inquirer from 'inquirer'; +import path from 'node:path'; +import semver from 'semver'; /** * CLI helper class @@ -425,4 +425,4 @@ const Init = { }, }; -module.exports = Init; +export default Init; diff --git a/lib/util/init.git.js b/lib/util/init.git.js index e91de4b58..fc4d9d5ab 100644 --- a/lib/util/init.git.js +++ b/lib/util/init.git.js @@ -1,10 +1,13 @@ 'use strict'; + // const TYPE = require('../../types/mcdev.d'); -const File = require('./file'); -const inquirer = require('inquirer'); -const Util = require('./util'); -const commandExists = require('command-exists'); -const git = require('simple-git')(); +import File from './file'; + +import inquirer from 'inquirer'; +import Util from './util'; +import commandExists from 'command-exists'; +import gitFactory from 'simple-git'; +const git = gitFactory(); /** * CLI helper class @@ -259,4 +262,4 @@ const Init = { }, }; -module.exports = Init; +export default Init; diff --git a/lib/util/init.js b/lib/util/init.js index 22aa7b966..7ecc6b409 100644 --- a/lib/util/init.js +++ b/lib/util/init.js @@ -1,13 +1,13 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const Cli = require('./cli'); -const File = require('./file'); -const config = require('./config'); -const InitGit = require('./init.git'); -const InitNpm = require('./init.npm'); -const InitConfig = require('./init.config'); -const inquirer = require('inquirer'); -const Util = require('./util'); +import TYPE from '../../types/mcdev.d'; +import Cli from './cli'; +import File from './file'; +import config from './config'; +import InitGit from './init.git'; +import InitNpm from './init.npm'; +import InitConfig from './init.config'; +import inquirer from 'inquirer'; +import Util from './util'; /** * CLI helper class @@ -422,4 +422,4 @@ const Init = { }, }; -module.exports = Init; +export default Init; diff --git a/lib/util/init.npm.js b/lib/util/init.npm.js index 29fd7d7d2..fe7f4f488 100644 --- a/lib/util/init.npm.js +++ b/lib/util/init.npm.js @@ -1,9 +1,9 @@ 'use strict'; -const File = require('./file'); -const path = require('node:path'); -const Util = require('./util'); -const semver = require('semver'); +import File from './file'; +import path from 'node:path'; +import Util from './util'; +import semver from 'semver'; /** * CLI helper class @@ -154,4 +154,4 @@ const Init = { }, }; -module.exports = Init; +export default Init; diff --git a/lib/util/util.js b/lib/util/util.js index 62711cc9c..8d101baeb 100644 --- a/lib/util/util.js +++ b/lib/util/util.js @@ -1,12 +1,12 @@ 'use strict'; -const TYPE = require('../../types/mcdev.d'); -const MetadataDefinitions = require('./../MetadataTypeDefinitions'); -const packageJsonMcdev = require('../../package.json'); -const process = require('node:process'); -const toposort = require('toposort'); -const winston = require('winston'); -const child_process = require('node:child_process'); +import TYPE from '../../types/mcdev.d'; +import MetadataDefinitions from './../MetadataTypeDefinitions'; +import packageJsonMcdev from '../../package.json'; +import process from 'node:process'; +import toposort from 'toposort'; +import winston from 'winston'; +import child_process from 'node:child_process'; /** * Util that contains logger and simple util methods @@ -755,4 +755,4 @@ function startLogger() { } startLogger(); -module.exports = Util; +export default Util; From d7f4015cefc07d03442956d751bc4a70e49b3488 Mon Sep 17 00:00:00 2001 From: Douglas Midgley Date: Thu, 4 May 2023 00:12:25 +0200 Subject: [PATCH 02/17] removing requires https://vscode.dev/github/Accenture/sfmc-devtools/blob/289455b5b1751fad69135ec281d908bfdc9e243f/lib/metadataTypes/DataExtension.js#L1076-L1077 --- lib/Builder.js | 14 ++--- lib/Deployer.js | 16 ++--- lib/MetadataTypeDefinitions.js | 72 +++++++++++----------- lib/MetadataTypeInfo.js | 68 ++++++++++---------- lib/Retriever.js | 14 ++--- lib/cli.js | 6 +- lib/index.js | 32 +++++----- lib/metadataTypes/Asset.js | 14 +++-- lib/metadataTypes/AttributeGroup.js | 7 ++- lib/metadataTypes/Automation.js | 12 ++-- lib/metadataTypes/Campaign.js | 11 ++-- lib/metadataTypes/ContentArea.js | 11 ++-- lib/metadataTypes/DataExtension.js | 21 ++++--- lib/metadataTypes/DataExtensionField.js | 8 +-- lib/metadataTypes/DataExtensionTemplate.js | 6 +- lib/metadataTypes/DataExtract.js | 12 ++-- lib/metadataTypes/DataExtractType.js | 6 +- lib/metadataTypes/Discovery.js | 8 +-- lib/metadataTypes/Email.js | 8 +-- lib/metadataTypes/EmailSend.js | 10 +-- lib/metadataTypes/Event.js | 12 ++-- lib/metadataTypes/FileLocation.js | 6 +- lib/metadataTypes/FileTransfer.js | 12 ++-- lib/metadataTypes/Filter.js | 6 +- lib/metadataTypes/Folder.js | 12 ++-- lib/metadataTypes/ImportFile.js | 12 ++-- lib/metadataTypes/Journey.js | 14 ++--- lib/metadataTypes/List.js | 14 ++--- lib/metadataTypes/MetadataType.js | 8 +-- lib/metadataTypes/MobileCode.js | 6 +- lib/metadataTypes/MobileKeyword.js | 12 ++-- lib/metadataTypes/MobileMessage.js | 12 ++-- lib/metadataTypes/Query.js | 12 ++-- lib/metadataTypes/Role.js | 12 ++-- lib/metadataTypes/Script.js | 10 +-- lib/metadataTypes/SendClassification.js | 6 +- lib/metadataTypes/SetDefinition.js | 6 +- lib/metadataTypes/TransactionalEmail.js | 10 +-- lib/metadataTypes/TransactionalMessage.js | 8 +-- lib/metadataTypes/TransactionalPush.js | 10 +-- lib/metadataTypes/TransactionalSMS.js | 12 ++-- lib/metadataTypes/TriggeredSend.js | 16 ++--- lib/metadataTypes/User.js | 12 ++-- lib/retrieveChangelog.js | 6 +- lib/util/auth.js | 6 +- lib/util/businessUnit.js | 8 +-- lib/util/cache.js | 4 +- lib/util/cli.js | 14 ++--- lib/util/config.js | 6 +- lib/util/devops.js | 12 ++-- lib/util/file.js | 6 +- lib/util/init.config.js | 10 +-- lib/util/init.git.js | 4 +- lib/util/init.js | 16 ++--- lib/util/init.npm.js | 4 +- lib/util/util.js | 10 ++- package.json | 7 +-- 57 files changed, 355 insertions(+), 354 deletions(-) diff --git a/lib/Builder.js b/lib/Builder.js index b0f8e39b3..1d655808a 100644 --- a/lib/Builder.js +++ b/lib/Builder.js @@ -1,12 +1,12 @@ 'use strict'; -import TYPE from '../types/mcdev.d'; -import Util from './util/util'; -import File from './util/file'; -import config from './util/config'; -import Cli from './util/cli'; -import auth from './util/auth'; -import MetadataTypeInfo from './MetadataTypeInfo'; +// import TYPE from '../types/mcdev.d.js'; +import { Util } from './util/util.js'; +import File from './util/file.js'; +import config from './util/config.js'; +import Cli from './util/cli.js'; +import auth from './util/auth.js'; +import MetadataTypeInfo from './MetadataTypeInfo.js'; // @ts-ignore /** diff --git a/lib/Deployer.js b/lib/Deployer.js index 3b553c32f..818a5c910 100644 --- a/lib/Deployer.js +++ b/lib/Deployer.js @@ -1,14 +1,14 @@ 'use strict'; -import TYPE from '../types/mcdev.d'; -import MetadataTypeInfo from './MetadataTypeInfo'; +// import TYPE from '../types/mcdev.d.js'; +import MetadataTypeInfo from './MetadataTypeInfo.js'; import path from 'node:path'; -import Cli from './util/cli'; -import Util from './util/util'; -import File from './util/file'; -import config from './util/config'; -import cache from './util/cache'; -import auth from './util/auth'; +import Cli from './util/cli.js'; +import { Util } from './util/util.js'; +import File from './util/file.js'; +import config from './util/config.js'; +import cache from './util/cache.js'; +import auth from './util/auth.js'; /** * Reads metadata from local directory and deploys it to specified target business unit. diff --git a/lib/MetadataTypeDefinitions.js b/lib/MetadataTypeDefinitions.js index b808cf8c4..648408b3b 100644 --- a/lib/MetadataTypeDefinitions.js +++ b/lib/MetadataTypeDefinitions.js @@ -1,44 +1,44 @@ 'use strict'; -import asset from './metadataTypes/definitions/Asset.definition'; -import attributeGroup from './metadataTypes/definitions/AttributeGroup.definition'; -import automation from './metadataTypes/definitions/Automation.definition'; -import campaign from './metadataTypes/definitions/Campaign.definition'; -import contentArea from './metadataTypes/definitions/ContentArea.definition'; -import dataExtension from './metadataTypes/definitions/DataExtension.definition'; -import dataExtensionField from './metadataTypes/definitions/DataExtensionField.definition'; -import dataExtensionTemplate from './metadataTypes/definitions/DataExtensionTemplate.definition'; -import dataExtract from './metadataTypes/definitions/DataExtract.definition'; -import dataExtractType from './metadataTypes/definitions/DataExtractType.definition'; -import discovery from './metadataTypes/definitions/Discovery.definition'; -import email from './metadataTypes/definitions/Email.definition'; -import emailSend from './metadataTypes/definitions/EmailSend.definition'; -import event from './metadataTypes/definitions/Event.definition'; -import fileLocation from './metadataTypes/definitions/FileLocation.definition'; -import fileTransfer from './metadataTypes/definitions/FileTransfer.definition'; -import filter from './metadataTypes/definitions/Filter.definition'; -import folder from './metadataTypes/definitions/Folder.definition'; -import importFile from './metadataTypes/definitions/ImportFile.definition'; -import journey from './metadataTypes/definitions/Journey.definition'; -import list from './metadataTypes/definitions/List.definition'; -import mobileCode from './metadataTypes/definitions/MobileCode.definition'; -import mobileKeyword from './metadataTypes/definitions/MobileKeyword.definition'; -import mobileMessage from './metadataTypes/definitions/MobileMessage.definition'; -import query from './metadataTypes/definitions/Query.definition'; -import role from './metadataTypes/definitions/Role.definition'; -import script from './metadataTypes/definitions/Script.definition'; -import sendClassification from './metadataTypes/definitions/SendClassification.definition'; -import setDefinition from './metadataTypes/definitions/SetDefinition.definition'; -import transactionalEmail from './metadataTypes/definitions/TransactionalEmail.definition'; -import transactionalPush from './metadataTypes/definitions/TransactionalPush.definition'; -import transactionalSMS from './metadataTypes/definitions/TransactionalSMS.definition'; -import triggeredSend from './metadataTypes/definitions/TriggeredSend.definition'; -import user from './metadataTypes/definitions/User.definition'; +import asset from './metadataTypes/definitions/Asset.definition.js'; +import attributeGroup from './metadataTypes/definitions/AttributeGroup.definition.js'; +import automation from './metadataTypes/definitions/Automation.definition.js'; +import campaign from './metadataTypes/definitions/Campaign.definition.js'; +import contentArea from './metadataTypes/definitions/ContentArea.definition.js'; +import dataExtension from './metadataTypes/definitions/DataExtension.definition.js'; +import dataExtensionField from './metadataTypes/definitions/DataExtensionField.definition.js'; +import dataExtensionTemplate from './metadataTypes/definitions/DataExtensionTemplate.definition.js'; +import dataExtract from './metadataTypes/definitions/DataExtract.definition.js'; +import dataExtractType from './metadataTypes/definitions/DataExtractType.definition.js'; +import discovery from './metadataTypes/definitions/Discovery.definition.js'; +import email from './metadataTypes/definitions/Email.definition.js'; +import emailSend from './metadataTypes/definitions/EmailSend.definition.js'; +import event from './metadataTypes/definitions/Event.definition.js'; +import fileLocation from './metadataTypes/definitions/FileLocation.definition.js'; +import fileTransfer from './metadataTypes/definitions/FileTransfer.definition.js'; +import filter from './metadataTypes/definitions/Filter.definition.js'; +import folder from './metadataTypes/definitions/Folder.definition.js'; +import importFile from './metadataTypes/definitions/ImportFile.definition.js'; +import journey from './metadataTypes/definitions/Journey.definition.js'; +import list from './metadataTypes/definitions/List.definition.js'; +import mobileCode from './metadataTypes/definitions/MobileCode.definition.js'; +import mobileKeyword from './metadataTypes/definitions/MobileKeyword.definition.js'; +import mobileMessage from './metadataTypes/definitions/MobileMessage.definition.js'; +import query from './metadataTypes/definitions/Query.definition.js'; +import role from './metadataTypes/definitions/Role.definition.js'; +import script from './metadataTypes/definitions/Script.definition.js'; +import sendClassification from './metadataTypes/definitions/SendClassification.definition.js'; +import setDefinition from './metadataTypes/definitions/SetDefinition.definition.js'; +import transactionalEmail from './metadataTypes/definitions/TransactionalEmail.definition.js'; +import transactionalPush from './metadataTypes/definitions/TransactionalPush.definition.js'; +import transactionalSMS from './metadataTypes/definitions/TransactionalSMS.definition.js'; +import triggeredSend from './metadataTypes/definitions/TriggeredSend.definition.js'; +import user from './metadataTypes/definitions/User.definition.js'; /** * Provides access to all metadataType classes */ -const MetadataTypeDefinitions = { +export default { asset, attributeGroup, automation, @@ -74,5 +74,3 @@ const MetadataTypeDefinitions = { triggeredSend, user, }; - -export default MetadataTypeDefinitions; diff --git a/lib/MetadataTypeInfo.js b/lib/MetadataTypeInfo.js index 38e1a5307..5f0bfefbb 100644 --- a/lib/MetadataTypeInfo.js +++ b/lib/MetadataTypeInfo.js @@ -1,39 +1,39 @@ 'use strict'; -import asset from './metadataTypes/Asset'; -import attributeGroup from './metadataTypes/AttributeGroup'; -import automation from './metadataTypes/Automation'; -import campaign from './metadataTypes/Campaign'; -import contentArea from './metadataTypes/ContentArea'; -import dataExtension from './metadataTypes/DataExtension'; -import dataExtensionField from './metadataTypes/DataExtensionField'; -import dataExtensionTemplate from './metadataTypes/DataExtensionTemplate'; -import dataExtract from './metadataTypes/DataExtract'; -import dataExtractType from './metadataTypes/DataExtractType'; -import discovery from './metadataTypes/Discovery'; -import email from './metadataTypes/Email'; -import emailSend from './metadataTypes/EmailSend'; -import event from './metadataTypes/Event'; -import fileLocation from './metadataTypes/FileLocation'; -import fileTransfer from './metadataTypes/FileTransfer'; -import filter from './metadataTypes/Filter'; -import folder from './metadataTypes/Folder'; -import importFile from './metadataTypes/ImportFile'; -import journey from './metadataTypes/Journey'; -import list from './metadataTypes/List'; -import mobileCode from './metadataTypes/MobileCode'; -import mobileKeyword from './metadataTypes/MobileKeyword'; -import mobileMessage from './metadataTypes/MobileMessage'; -import query from './metadataTypes/Query'; -import role from './metadataTypes/Role'; -import script from './metadataTypes/Script'; -import sendClassification from './metadataTypes/SendClassification'; -import setDefinition from './metadataTypes/SetDefinition'; -import transactionalEmail from './metadataTypes/TransactionalEmail'; -import transactionalPush from './metadataTypes/TransactionalPush'; -import transactionalSMS from './metadataTypes/TransactionalSMS'; -import triggeredSend from './metadataTypes/TriggeredSend'; -import user from './metadataTypes/User'; +import asset from './metadataTypes/Asset.js'; +import attributeGroup from './metadataTypes/AttributeGroup.js'; +import automation from './metadataTypes/Automation.js'; +import campaign from './metadataTypes/Campaign.js'; +import contentArea from './metadataTypes/ContentArea.js'; +import dataExtension from './metadataTypes/DataExtension.js'; +import dataExtensionField from './metadataTypes/DataExtensionField.js'; +import dataExtensionTemplate from './metadataTypes/DataExtensionTemplate.js'; +import dataExtract from './metadataTypes/DataExtract.js'; +import dataExtractType from './metadataTypes/DataExtractType.js'; +import discovery from './metadataTypes/Discovery.js'; +import email from './metadataTypes/Email.js'; +import emailSend from './metadataTypes/EmailSend.js'; +import event from './metadataTypes/Event.js'; +import fileLocation from './metadataTypes/FileLocation.js'; +import fileTransfer from './metadataTypes/FileTransfer.js'; +import filter from './metadataTypes/Filter.js'; +import folder from './metadataTypes/Folder.js'; +import importFile from './metadataTypes/ImportFile.js'; +import journey from './metadataTypes/Journey.js'; +import list from './metadataTypes/List.js'; +import mobileCode from './metadataTypes/MobileCode.js'; +import mobileKeyword from './metadataTypes/MobileKeyword.js'; +import mobileMessage from './metadataTypes/MobileMessage.js'; +import query from './metadataTypes/Query.js'; +import role from './metadataTypes/Role.js'; +import script from './metadataTypes/Script.js'; +import sendClassification from './metadataTypes/SendClassification.js'; +import setDefinition from './metadataTypes/SetDefinition.js'; +import transactionalEmail from './metadataTypes/TransactionalEmail.js'; +import transactionalPush from './metadataTypes/TransactionalPush.js'; +import transactionalSMS from './metadataTypes/TransactionalSMS.js'; +import triggeredSend from './metadataTypes/TriggeredSend.js'; +import user from './metadataTypes/User.js'; /** * Provides access to all metadataType classes diff --git a/lib/Retriever.js b/lib/Retriever.js index ea1955ca3..a9040a073 100644 --- a/lib/Retriever.js +++ b/lib/Retriever.js @@ -1,12 +1,12 @@ 'use strict'; -import TYPE from '../types/mcdev.d'; -import MetadataTypeInfo from './MetadataTypeInfo'; -import MetadataDefinitions from './MetadataTypeDefinitions'; -import Util from './util/util'; -import File from './util/file'; -import cache from './util/cache'; -import auth from './util/auth'; +// import TYPE from '../types/mcdev.d.js'; +import MetadataTypeInfo from './MetadataTypeInfo.js'; +import MetadataDefinitions from './MetadataTypeDefinitions.js'; +import { Util } from './util/util.js'; +import File from './util/file.js'; +import cache from './util/cache.js'; +import auth from './util/auth.js'; /** * Retrieves metadata from a business unit and saves it to the local filesystem. */ diff --git a/lib/cli.js b/lib/cli.js index 8ad6310f6..567e0abf2 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -1,13 +1,13 @@ -#!/usr/bin/env node'use strict'; +#!/usr/bin/env node /** * CLI entry for SFMC DevTools */ -import Util from './util/util'; +import { Util } from './util/util.js'; import yargs from 'yargs'; -import Mcdev from './index'; +import Mcdev from './index.js'; yargs .scriptName('mcdev') diff --git a/lib/index.js b/lib/index.js index ab120cd6b..4ebc1f416 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,21 +1,21 @@ 'use strict'; -import TYPE from '../types/mcdev.d'; -import Util from './util/util'; -import auth from './util/auth'; -import File from './util/file'; -import config from './util/config'; -import Init from './util/init'; -import InitGit from './util/init.git'; -import Cli from './util/cli'; -import DevOps from './util/devops'; -import BuHelper from './util/businessUnit'; -import Builder from './Builder'; -import Deployer from './Deployer'; -import MetadataTypeInfo from './MetadataTypeInfo'; -import MetadataTypeDefinitions from './MetadataTypeDefinitions'; -import Retriever from './Retriever'; -import cache from './util/cache'; +// import TYPE from '../types/mcdev.d.js'; +import { Util } from './util/util.js'; +import auth from './util/auth.js'; +import File from './util/file.js'; +import config from './util/config.js'; +import Init from './util/init.js'; +import InitGit from './util/init.git.js'; +import Cli from './util/cli.js'; +import DevOps from './util/devops.js'; +import BuHelper from './util/businessUnit.js'; +import Builder from './Builder.js'; +import Deployer from './Deployer.js'; +import MetadataTypeInfo from './MetadataTypeInfo.js'; +import MetadataTypeDefinitions from './MetadataTypeDefinitions.js'; +import Retriever from './Retriever.js'; +import cache from './util/cache.js'; /** * main class diff --git a/lib/metadataTypes/Asset.js b/lib/metadataTypes/Asset.js index a9fa9a39f..88e3172ee 100644 --- a/lib/metadataTypes/Asset.js +++ b/lib/metadataTypes/Asset.js @@ -1,12 +1,12 @@ 'use strict'; -import MetadataType from './MetadataType'; -import TYPE from '../../types/mcdev.d'; -import Util from '../util/util'; -import File from '../util/file'; +import MetadataType from './MetadataType.js'; +// import TYPE from '../../types/mcdev.d.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; import pLimit from 'p-limit'; import cliProgress from 'cli-progress'; -import cache from '../util/cache'; +import cache from '../util/cache.js'; /** * FileTransfer MetadataType @@ -1631,6 +1631,8 @@ class Asset extends MetadataType { } // Assign definition to static attributes -Asset.definition = require('../MetadataTypeDefinitions').asset; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; + +Asset.definition = MetadataTypeDefinitions.asset; export default Asset; diff --git a/lib/metadataTypes/AttributeGroup.js b/lib/metadataTypes/AttributeGroup.js index ebe9b3183..7219ff8dc 100644 --- a/lib/metadataTypes/AttributeGroup.js +++ b/lib/metadataTypes/AttributeGroup.js @@ -1,7 +1,7 @@ 'use strict'; -import MetadataType from './MetadataType'; -import TYPE from '../../types/mcdev.d'; +import MetadataType from './MetadataType.js'; +// import TYPE from '../../types/mcdev.d.js'; /** * AttributeGroup MetadataType @@ -37,6 +37,7 @@ class AttributeGroup extends MetadataType { } // Assign definition to static attributes -AttributeGroup.definition = require('../MetadataTypeDefinitions').attributeGroup; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +AttributeGroup.definition = MetadataTypeDefinitions.attributeGroup; export default AttributeGroup; diff --git a/lib/metadataTypes/Automation.js b/lib/metadataTypes/Automation.js index 8c601c5da..7b8c5f16d 100644 --- a/lib/metadataTypes/Automation.js +++ b/lib/metadataTypes/Automation.js @@ -1,11 +1,11 @@ 'use strict'; -import MetadataType from './MetadataType'; -import TYPE from '../../types/mcdev.d'; -import Util from '../util/util'; -import File from '../util/file'; -import Definitions from '../MetadataTypeDefinitions'; -import cache from '../util/cache'; +import MetadataType from './MetadataType.js'; +// import TYPE from '../../types/mcdev.d.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import Definitions from '../MetadataTypeDefinitions.js'; +import cache from '../util/cache.js'; /** * Automation MetadataType diff --git a/lib/metadataTypes/Campaign.js b/lib/metadataTypes/Campaign.js index a907f3b2e..e0f01fb64 100644 --- a/lib/metadataTypes/Campaign.js +++ b/lib/metadataTypes/Campaign.js @@ -1,9 +1,9 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; /** * Campaign MetadataType @@ -71,6 +71,7 @@ class Campaign extends MetadataType { } } // Assign definition to static attributes -Campaign.definition = require('../MetadataTypeDefinitions').campaign; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Campaign.definition = MetadataTypeDefinitions.campaign; export default Campaign; diff --git a/lib/metadataTypes/ContentArea.js b/lib/metadataTypes/ContentArea.js index f08ccd16c..35c3bc6e8 100644 --- a/lib/metadataTypes/ContentArea.js +++ b/lib/metadataTypes/ContentArea.js @@ -1,9 +1,9 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import cache from '../util/cache.js'; /** * ContentArea MetadataType @@ -99,6 +99,7 @@ class ContentArea extends MetadataType { } // Assign definition to static attributes -ContentArea.definition = require('../MetadataTypeDefinitions').contentArea; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +ContentArea.definition = MetadataTypeDefinitions.contentArea; export default ContentArea; diff --git a/lib/metadataTypes/DataExtension.js b/lib/metadataTypes/DataExtension.js index f2734a972..b4c9f5447 100644 --- a/lib/metadataTypes/DataExtension.js +++ b/lib/metadataTypes/DataExtension.js @@ -1,14 +1,14 @@ 'use strict'; import jsonToTable from 'json-to-table'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import DataExtensionField from './DataExtensionField'; -import Folder from './Folder'; -import Util from '../util/util'; -import File from '../util/file'; -import auth from '../util/auth'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import DataExtensionField from './DataExtensionField.js'; +import Folder from './Folder.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import auth from '../util/auth.js'; +import cache from '../util/cache.js'; /** * DataExtension MetadataType @@ -394,7 +394,7 @@ class DataExtension extends MetadataType { cache.mergeMetadata('folder', result.metadata, this.buObject.eid); // get the types and clean out non-shared ones - const folderTypesFromParent = require('../MetadataTypeDefinitions').folder + const folderTypesFromParent = require('../MetadataTypeDefinitions.js').folder .folderTypesFromParent; for (const metadataEntry in metadataParentBu) { try { @@ -1072,6 +1072,7 @@ class DataExtension extends MetadataType { } // Assign definition to static attributes -DataExtension.definition = require('../MetadataTypeDefinitions').dataExtension; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +DataExtension.definition = MetadataTypeDefinitions.dataExtension; export default DataExtension; diff --git a/lib/metadataTypes/DataExtensionField.js b/lib/metadataTypes/DataExtensionField.js index cced28c96..73ac2db67 100644 --- a/lib/metadataTypes/DataExtensionField.js +++ b/lib/metadataTypes/DataExtensionField.js @@ -1,8 +1,8 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; /** * DataExtensionField MetadataType @@ -333,6 +333,6 @@ class DataExtensionField extends MetadataType { } // Assign definition to static attributes -DataExtensionField.definition = require('../MetadataTypeDefinitions').dataExtensionField; +DataExtensionField.definition = require('../MetadataTypeDefinitions.js').dataExtensionField; export default DataExtensionField; diff --git a/lib/metadataTypes/DataExtensionTemplate.js b/lib/metadataTypes/DataExtensionTemplate.js index 928e40b4f..ec0b8fe84 100644 --- a/lib/metadataTypes/DataExtensionTemplate.js +++ b/lib/metadataTypes/DataExtensionTemplate.js @@ -1,7 +1,7 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; /** * DataExtensionTemplate MetadataType @@ -35,6 +35,6 @@ class DataExtensionTemplate extends MetadataType { } // Assign definition to static attributes -DataExtensionTemplate.definition = require('../MetadataTypeDefinitions').dataExtensionTemplate; +DataExtensionTemplate.definition = require('../MetadataTypeDefinitions.js').dataExtensionTemplate; export default DataExtensionTemplate; diff --git a/lib/metadataTypes/DataExtract.js b/lib/metadataTypes/DataExtract.js index 94f7f85af..b545f1131 100644 --- a/lib/metadataTypes/DataExtract.js +++ b/lib/metadataTypes/DataExtract.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * DataExtract MetadataType @@ -160,6 +160,6 @@ class DataExtract extends MetadataType { } // Assign definition to static attributes -DataExtract.definition = require('../MetadataTypeDefinitions').dataExtract; +DataExtract.definition = require('../MetadataTypeDefinitions.js').dataExtract; export default DataExtract; diff --git a/lib/metadataTypes/DataExtractType.js b/lib/metadataTypes/DataExtractType.js index a056a8eaa..112b591a6 100644 --- a/lib/metadataTypes/DataExtractType.js +++ b/lib/metadataTypes/DataExtractType.js @@ -1,7 +1,7 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; /** * DataExtractType MetadataType @@ -34,6 +34,6 @@ class DataExtractType extends MetadataType { } // Assign definition to static attributes -DataExtractType.definition = require('../MetadataTypeDefinitions').dataExtractType; +DataExtractType.definition = require('../MetadataTypeDefinitions.js').dataExtractType; export default DataExtractType; diff --git a/lib/metadataTypes/Discovery.js b/lib/metadataTypes/Discovery.js index a8de9678d..e94d3e06e 100644 --- a/lib/metadataTypes/Discovery.js +++ b/lib/metadataTypes/Discovery.js @@ -1,8 +1,8 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; /** * ImportFile MetadataType @@ -48,6 +48,6 @@ class Discovery extends MetadataType { } // Assign definition to static attributes -Discovery.definition = require('../MetadataTypeDefinitions').discovery; +Discovery.definition = require('../MetadataTypeDefinitions.js').discovery; export default Discovery; diff --git a/lib/metadataTypes/Email.js b/lib/metadataTypes/Email.js index 3354bf2a7..612920812 100644 --- a/lib/metadataTypes/Email.js +++ b/lib/metadataTypes/Email.js @@ -1,8 +1,8 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; /** * Email MetadataType @@ -87,6 +87,6 @@ class Email extends MetadataType { } // Assign definition to static attributes -Email.definition = require('../MetadataTypeDefinitions').email; +Email.definition = require('../MetadataTypeDefinitions.js').email; export default Email; diff --git a/lib/metadataTypes/EmailSend.js b/lib/metadataTypes/EmailSend.js index d492ae01c..231a69c69 100644 --- a/lib/metadataTypes/EmailSend.js +++ b/lib/metadataTypes/EmailSend.js @@ -1,9 +1,9 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import cache from '../util/cache.js'; /** * MessageSendActivity MetadataType @@ -292,6 +292,6 @@ class EmailSend extends MetadataType { } // Assign definition to static attributes -EmailSend.definition = require('../MetadataTypeDefinitions').emailSend; +EmailSend.definition = require('../MetadataTypeDefinitions.js').emailSend; export default EmailSend; diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 49322f1e5..4eac34dbb 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * Event MetadataType @@ -214,6 +214,6 @@ class Event extends MetadataType { } // Assign definition to static attributes -Event.definition = require('../MetadataTypeDefinitions').event; +Event.definition = require('../MetadataTypeDefinitions.js').event; export default Event; diff --git a/lib/metadataTypes/FileLocation.js b/lib/metadataTypes/FileLocation.js index 8d5c36f6d..397557568 100644 --- a/lib/metadataTypes/FileLocation.js +++ b/lib/metadataTypes/FileLocation.js @@ -1,7 +1,7 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; /** * ImportFile MetadataType @@ -34,6 +34,6 @@ class FtpLocation extends MetadataType { } // Assign definition to static attributes -FtpLocation.definition = require('../MetadataTypeDefinitions').fileLocation; +FtpLocation.definition = require('../MetadataTypeDefinitions.js').fileLocation; export default FtpLocation; diff --git a/lib/metadataTypes/FileTransfer.js b/lib/metadataTypes/FileTransfer.js index 4c89e924c..a6cfd49b7 100644 --- a/lib/metadataTypes/FileTransfer.js +++ b/lib/metadataTypes/FileTransfer.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * FileTransfer MetadataType @@ -165,6 +165,6 @@ class FileTransfer extends MetadataType { } // Assign definition to static attributes -FileTransfer.definition = require('../MetadataTypeDefinitions').fileTransfer; +FileTransfer.definition = require('../MetadataTypeDefinitions.js').fileTransfer; export default FileTransfer; diff --git a/lib/metadataTypes/Filter.js b/lib/metadataTypes/Filter.js index 9a09a0e2c..978a930bf 100644 --- a/lib/metadataTypes/Filter.js +++ b/lib/metadataTypes/Filter.js @@ -1,7 +1,7 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; /** * Filter MetadataType @@ -27,6 +27,6 @@ class Filter extends MetadataType { } // Assign definition to static attributes -Filter.definition = require('../MetadataTypeDefinitions').filter; +Filter.definition = require('../MetadataTypeDefinitions.js').filter; export default Filter; diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index 01d48e21b..709ca4063 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -1,11 +1,11 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; import toposort from 'toposort'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * Folder MetadataType @@ -629,6 +629,6 @@ class Folder extends MetadataType { } // Assign definition to static attributes -Folder.definition = require('../MetadataTypeDefinitions').folder; +Folder.definition = require('../MetadataTypeDefinitions.js').folder; export default Folder; diff --git a/lib/metadataTypes/ImportFile.js b/lib/metadataTypes/ImportFile.js index e298213f3..8f1c347dd 100644 --- a/lib/metadataTypes/ImportFile.js +++ b/lib/metadataTypes/ImportFile.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * ImportFile MetadataType @@ -232,6 +232,6 @@ class ImportFile extends MetadataType { } // Assign definition to static attributes -ImportFile.definition = require('../MetadataTypeDefinitions').importFile; +ImportFile.definition = require('../MetadataTypeDefinitions.js').importFile; export default ImportFile; diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index 34226c94f..159cc0bac 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -1,11 +1,11 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import TransactionalEmail from './TransactionalEmail'; -import Util from '../util/util'; -import cache from '../util/cache'; -import File from '../util/file'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import TransactionalEmail from './TransactionalEmail.js'; +import { Util } from '../util/util.js'; +import cache from '../util/cache.js'; +import File from '../util/file.js'; /** * Journey MetadataType @@ -957,6 +957,6 @@ class Journey extends MetadataType { } // Assign definition to static attributes -Journey.definition = require('../MetadataTypeDefinitions').journey; +Journey.definition = require('../MetadataTypeDefinitions.js').journey; export default Journey; diff --git a/lib/metadataTypes/List.js b/lib/metadataTypes/List.js index a51f93169..fb5e2842f 100644 --- a/lib/metadataTypes/List.js +++ b/lib/metadataTypes/List.js @@ -1,11 +1,11 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Folder from './Folder'; -import Util from '../util/util'; -import cache from '../util/cache'; -import auth from '../util/auth'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import Folder from './Folder.js'; +import { Util } from '../util/util.js'; +import cache from '../util/cache.js'; +import auth from '../util/auth.js'; /** * List MetadataType @@ -205,6 +205,6 @@ class List extends MetadataType { } } // Assign definition to static attributes -List.definition = require('../MetadataTypeDefinitions').list; +List.definition = require('../MetadataTypeDefinitions.js').list; export default List; diff --git a/lib/metadataTypes/MetadataType.js b/lib/metadataTypes/MetadataType.js index 044795c41..5ecf5c06f 100644 --- a/lib/metadataTypes/MetadataType.js +++ b/lib/metadataTypes/MetadataType.js @@ -7,11 +7,11 @@ * in the generic version of the method */ -import TYPE from '../../types/mcdev.d'; +// import TYPE from '../../types/mcdev.d.js'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; import deepEqual from 'deep-equal'; import pLimit from 'p-limit'; import Mustache from 'mustache'; diff --git a/lib/metadataTypes/MobileCode.js b/lib/metadataTypes/MobileCode.js index fce938f55..af755f369 100644 --- a/lib/metadataTypes/MobileCode.js +++ b/lib/metadataTypes/MobileCode.js @@ -1,7 +1,7 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; /** * MobileCode MetadataType @@ -39,6 +39,6 @@ class MobileCode extends MetadataType { } // Assign definition to static attributes -MobileCode.definition = require('../MetadataTypeDefinitions').mobileCode; +MobileCode.definition = require('../MetadataTypeDefinitions.js').mobileCode; export default MobileCode; diff --git a/lib/metadataTypes/MobileKeyword.js b/lib/metadataTypes/MobileKeyword.js index c32e2bcd2..a18ac03c1 100644 --- a/lib/metadataTypes/MobileKeyword.js +++ b/lib/metadataTypes/MobileKeyword.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * MobileKeyword MetadataType @@ -380,6 +380,6 @@ class MobileKeyword extends MetadataType { } // Assign definition to static attributes -MobileKeyword.definition = require('../MetadataTypeDefinitions').mobileKeyword; +MobileKeyword.definition = require('../MetadataTypeDefinitions.js').mobileKeyword; export default MobileKeyword; diff --git a/lib/metadataTypes/MobileMessage.js b/lib/metadataTypes/MobileMessage.js index de52c4b1e..256545f6e 100644 --- a/lib/metadataTypes/MobileMessage.js +++ b/lib/metadataTypes/MobileMessage.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * MobileMessage MetadataType @@ -458,6 +458,6 @@ class MobileMessage extends MetadataType { } // Assign definition to static attributes -MobileMessage.definition = require('../MetadataTypeDefinitions').mobileMessage; +MobileMessage.definition = require('../MetadataTypeDefinitions.js').mobileMessage; export default MobileMessage; diff --git a/lib/metadataTypes/Query.js b/lib/metadataTypes/Query.js index 03e29a575..028c86c87 100644 --- a/lib/metadataTypes/Query.js +++ b/lib/metadataTypes/Query.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import Util from '../util/util'; -import MetadataType from './MetadataType'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import { Util } from '../util/util.js'; +import MetadataType from './MetadataType.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; import Mustache from 'mustache'; /** * ensure that Mustache does not escape any characters @@ -429,6 +429,6 @@ class Query extends MetadataType { } // Assign definition & cache to static attributes -Query.definition = require('../MetadataTypeDefinitions').query; +Query.definition = require('../MetadataTypeDefinitions.js').query; export default Query; diff --git a/lib/metadataTypes/Role.js b/lib/metadataTypes/Role.js index 76425307a..97b996ef6 100644 --- a/lib/metadataTypes/Role.js +++ b/lib/metadataTypes/Role.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * ImportFile MetadataType @@ -326,6 +326,6 @@ class Role extends MetadataType { } // Assign definition to static attributes -Role.definition = require('../MetadataTypeDefinitions').role; +Role.definition = require('../MetadataTypeDefinitions.js').role; export default Role; diff --git a/lib/metadataTypes/Script.js b/lib/metadataTypes/Script.js index fc66986c0..9927d2234 100644 --- a/lib/metadataTypes/Script.js +++ b/lib/metadataTypes/Script.js @@ -1,9 +1,9 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; /** * Script MetadataType @@ -327,6 +327,6 @@ class Script extends MetadataType { } // Assign definition & cache to static attributes -Script.definition = require('../MetadataTypeDefinitions').script; +Script.definition = require('../MetadataTypeDefinitions.js').script; export default Script; diff --git a/lib/metadataTypes/SendClassification.js b/lib/metadataTypes/SendClassification.js index 20c39ea59..d67833506 100644 --- a/lib/metadataTypes/SendClassification.js +++ b/lib/metadataTypes/SendClassification.js @@ -1,7 +1,7 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; /** * SendClassification MetadataType @@ -35,6 +35,6 @@ class SendClassification extends MetadataType { } // Assign definition to static attributes -SendClassification.definition = require('../MetadataTypeDefinitions').sendClassification; +SendClassification.definition = require('../MetadataTypeDefinitions.js').sendClassification; export default SendClassification; diff --git a/lib/metadataTypes/SetDefinition.js b/lib/metadataTypes/SetDefinition.js index bb8b1a75e..765ab66db 100644 --- a/lib/metadataTypes/SetDefinition.js +++ b/lib/metadataTypes/SetDefinition.js @@ -1,7 +1,7 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; /** * SetDefinition MetadataType @@ -32,6 +32,6 @@ class SetDefinition extends MetadataType { } // Assign definition to static attributes -SetDefinition.definition = require('../MetadataTypeDefinitions').setDefinition; +SetDefinition.definition = require('../MetadataTypeDefinitions.js').setDefinition; export default SetDefinition; diff --git a/lib/metadataTypes/TransactionalEmail.js b/lib/metadataTypes/TransactionalEmail.js index c33e64bf2..86aece928 100644 --- a/lib/metadataTypes/TransactionalEmail.js +++ b/lib/metadataTypes/TransactionalEmail.js @@ -1,9 +1,9 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import TransactionalMessage from './TransactionalMessage'; -import Util from '../util/util'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import TransactionalMessage from './TransactionalMessage.js'; +import { Util } from '../util/util.js'; +import cache from '../util/cache.js'; /** * TransactionalEmail MetadataType @@ -157,6 +157,6 @@ class TransactionalEmail extends TransactionalMessage { } // Assign definition to static attributes -TransactionalEmail.definition = require('../MetadataTypeDefinitions').transactionalEmail; +TransactionalEmail.definition = require('../MetadataTypeDefinitions.js').transactionalEmail; export default TransactionalEmail; diff --git a/lib/metadataTypes/TransactionalMessage.js b/lib/metadataTypes/TransactionalMessage.js index 63e6d316c..b7ce79d9b 100644 --- a/lib/metadataTypes/TransactionalMessage.js +++ b/lib/metadataTypes/TransactionalMessage.js @@ -1,8 +1,8 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; /** * TransactionalMessage MetadataType @@ -114,6 +114,6 @@ class TransactionalMessage extends MetadataType { // Assign definition to static attributes // ! using SMS definitions here as placeholder to have auto completion -TransactionalMessage.definition = require('../MetadataTypeDefinitions').transactionalSMS; +TransactionalMessage.definition = require('../MetadataTypeDefinitions.js').transactionalSMS; export default TransactionalMessage; diff --git a/lib/metadataTypes/TransactionalPush.js b/lib/metadataTypes/TransactionalPush.js index 978037867..120e4b5ae 100644 --- a/lib/metadataTypes/TransactionalPush.js +++ b/lib/metadataTypes/TransactionalPush.js @@ -1,9 +1,9 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import TransactionalMessage from './TransactionalMessage'; -import Util from '../util/util'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import TransactionalMessage from './TransactionalMessage.js'; +import { Util } from '../util/util.js'; +import cache from '../util/cache.js'; /** * TransactionalPush TransactionalMessage @@ -72,6 +72,6 @@ class TransactionalPush extends TransactionalMessage { } // Assign definition to static attributes -TransactionalPush.definition = require('../MetadataTypeDefinitions').transactionalPush; +TransactionalPush.definition = require('../MetadataTypeDefinitions.js').transactionalPush; export default TransactionalPush; diff --git a/lib/metadataTypes/TransactionalSMS.js b/lib/metadataTypes/TransactionalSMS.js index 00569c3fd..bda5b4084 100644 --- a/lib/metadataTypes/TransactionalSMS.js +++ b/lib/metadataTypes/TransactionalSMS.js @@ -1,11 +1,11 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import TransactionalMessage from './TransactionalMessage'; -import Util from '../util/util'; -import File from '../util/file'; +// 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'; +import cache from '../util/cache.js'; /** * TransactionalSMS MetadataType @@ -341,6 +341,6 @@ class TransactionalSMS extends TransactionalMessage { } // Assign definition to static attributes -TransactionalSMS.definition = require('../MetadataTypeDefinitions').transactionalSMS; +TransactionalSMS.definition = require('../MetadataTypeDefinitions.js').transactionalSMS; export default TransactionalSMS; diff --git a/lib/metadataTypes/TriggeredSend.js b/lib/metadataTypes/TriggeredSend.js index 0d150418d..5ea408c5f 100644 --- a/lib/metadataTypes/TriggeredSend.js +++ b/lib/metadataTypes/TriggeredSend.js @@ -1,12 +1,12 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import cache from '../util/cache'; -import asset from './Asset'; -import folder from './Folder'; -import list from './List'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import cache from '../util/cache.js'; +import asset from './Asset.js'; +import folder from './Folder.js'; +import list from './List.js'; const cacheTypes = { asset, @@ -434,6 +434,6 @@ class TriggeredSend extends MetadataType { } // Assign definition to static attributes -TriggeredSend.definition = require('../MetadataTypeDefinitions').triggeredSend; +TriggeredSend.definition = require('../MetadataTypeDefinitions.js').triggeredSend; export default TriggeredSend; diff --git a/lib/metadataTypes/User.js b/lib/metadataTypes/User.js index 07494afa2..8f0cfeb58 100644 --- a/lib/metadataTypes/User.js +++ b/lib/metadataTypes/User.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataType from './MetadataType'; -import Util from '../util/util'; -import File from '../util/file'; -import cache from '../util/cache'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataType from './MetadataType.js'; +import { Util } from '../util/util.js'; +import File from '../util/file.js'; +import cache from '../util/cache.js'; /** * MetadataType @@ -1172,6 +1172,6 @@ class User extends MetadataType { } // Assign definition to static attributes -User.definition = require('../MetadataTypeDefinitions').user; +User.definition = require('../MetadataTypeDefinitions.js').user; export default User; diff --git a/lib/retrieveChangelog.js b/lib/retrieveChangelog.js index 0b9d8ac89..e0fe55ad3 100644 --- a/lib/retrieveChangelog.js +++ b/lib/retrieveChangelog.js @@ -16,10 +16,10 @@ }] */ -import mcdev from './index'; +import mcdev from './index.js'; -import Definition from './MetadataTypeDefinitions'; -import MetadataType from './MetadataTypeInfo'; +import Definition from './MetadataTypeDefinitions.js'; +import MetadataType from './MetadataTypeInfo.js'; // disable cli logs // mcdev._setLoggingLevel({ silent: true }); diff --git a/lib/util/auth.js b/lib/util/auth.js index 8cdb9ed3b..e33fbc472 100644 --- a/lib/util/auth.js +++ b/lib/util/auth.js @@ -1,6 +1,6 @@ -import TYPE from '../../types/mcdev.d'; -import Util from './util'; -import File from './file'; +// import TYPE from '../../types/mcdev.d.js'; +import { Util } from './util.js'; +import File from './file.js'; import SDK from 'sfmc-sdk'; import Conf from 'conf'; const credentialStore = new Conf({ configName: 'sessions', clearInvalidConfig: true }); diff --git a/lib/util/businessUnit.js b/lib/util/businessUnit.js index c58170fc9..7489ae1ac 100644 --- a/lib/util/businessUnit.js +++ b/lib/util/businessUnit.js @@ -1,9 +1,9 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import Util from './util'; -import File from './file'; -import auth from './auth'; +// import TYPE from '../../types/mcdev.d.js'; +import { Util } from './util.js'; +import File from './file.js'; +import auth from './auth.js'; /** * Helper that handles retrieval of BU info diff --git a/lib/util/cache.js b/lib/util/cache.js index d1cdba36b..52046cf27 100644 --- a/lib/util/cache.js +++ b/lib/util/cache.js @@ -1,5 +1,5 @@ -import TYPE from '../../types/mcdev.d'; -import Util from './util'; +// import TYPE from '../../types/mcdev.d.js'; +import { Util } from './util.js'; /** @type {TYPE.Cache} */ const dataStore = {}; diff --git a/lib/util/cli.js b/lib/util/cli.js index d748f7a24..572728698 100644 --- a/lib/util/cli.js +++ b/lib/util/cli.js @@ -1,13 +1,13 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import BuHelper from './businessUnit'; -import File from './file'; -import config from './config'; +// import TYPE from '../../types/mcdev.d.js'; +import BuHelper from './businessUnit.js'; +import File from './file.js'; +import config from './config.js'; import inquirer from 'inquirer'; -import MetadataDefinitions from './../MetadataTypeDefinitions'; -import Util from './util'; -import auth from './auth'; +import MetadataDefinitions from './../MetadataTypeDefinitions.js'; +import { Util } from './util.js'; +import auth from './auth.js'; import 'console.table'; /** diff --git a/lib/util/config.js b/lib/util/config.js index 375fab40a..03245403e 100644 --- a/lib/util/config.js +++ b/lib/util/config.js @@ -1,6 +1,6 @@ -import TYPE from '../../types/mcdev.d'; -import Util from './util'; -import File from './file'; +// import TYPE from '../../types/mcdev.d.js'; +import { Util } from './util.js'; +import File from './file.js'; import inquirer from 'inquirer'; import semver from 'semver'; import path from 'node:path'; diff --git a/lib/util/devops.js b/lib/util/devops.js index 82641ca92..582353b56 100644 --- a/lib/util/devops.js +++ b/lib/util/devops.js @@ -1,13 +1,13 @@ -import TYPE from '../../types/mcdev.d'; -import File from './file'; +// import TYPE from '../../types/mcdev.d.js'; +import File from './file.js'; import path from 'node:path'; import inquirer from 'inquirer'; -import Util from './util'; -import Cli from './cli'; +import { Util } from './util.js'; +import Cli from './cli.js'; import gitFactory from 'simple-git'; const git = gitFactory(); -import Builder from '../Builder'; -import MetadataType from '../MetadataTypeInfo'; +import Builder from '../Builder.js'; +import MetadataType from '../MetadataTypeInfo.js'; import jsonToTable from 'json-to-table'; /** * DevOps helper class diff --git a/lib/util/file.js b/lib/util/file.js index 173fce1de..c9dabd2bb 100644 --- a/lib/util/file.js +++ b/lib/util/file.js @@ -1,13 +1,13 @@ /* eslint-disable no-control-regex */ 'use strict'; -import TYPE from '../../types/mcdev.d'; +// import TYPE from '../../types/mcdev.d.js'; import fs from 'fs-extra'; -import packageJson from '../../package.json'; +import packageJson from '../../package.json' assert { type: 'json' }; import path from 'node:path'; import prettier from 'prettier'; import beautyAmp from 'beauty-amp-core'; -import Util from './util'; +import { Util } from './util.js'; import updateNotifier from 'update-notifier'; // inform user when there is an update diff --git a/lib/util/init.config.js b/lib/util/init.config.js index 860e5756b..12c723726 100644 --- a/lib/util/init.config.js +++ b/lib/util/init.config.js @@ -1,10 +1,10 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import Cli from './cli'; -import File from './file'; -import config from './config'; -import Util from './util'; +// import TYPE from '../../types/mcdev.d.js'; +import Cli from './cli.js'; +import File from './file.js'; +import config from './config.js'; +import { Util } from './util.js'; import inquirer from 'inquirer'; import path from 'node:path'; import semver from 'semver'; diff --git a/lib/util/init.git.js b/lib/util/init.git.js index fc4d9d5ab..b72ae7fde 100644 --- a/lib/util/init.git.js +++ b/lib/util/init.git.js @@ -1,10 +1,10 @@ 'use strict'; // const TYPE = require('../../types/mcdev.d'); -import File from './file'; +import File from './file.js'; import inquirer from 'inquirer'; -import Util from './util'; +import { Util } from './util.js'; import commandExists from 'command-exists'; import gitFactory from 'simple-git'; const git = gitFactory(); diff --git a/lib/util/init.js b/lib/util/init.js index 7ecc6b409..e4c64d6b0 100644 --- a/lib/util/init.js +++ b/lib/util/init.js @@ -1,13 +1,13 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import Cli from './cli'; -import File from './file'; -import config from './config'; -import InitGit from './init.git'; -import InitNpm from './init.npm'; -import InitConfig from './init.config'; +// import TYPE from '../../types/mcdev.d.js'; +import Cli from './cli.js'; +import File from './file.js'; +import config from './config.js'; +import InitGit from './init.git.js'; +import InitNpm from './init.npm.js'; +import InitConfig from './init.config.js'; import inquirer from 'inquirer'; -import Util from './util'; +import { Util } from './util.js'; /** * CLI helper class diff --git a/lib/util/init.npm.js b/lib/util/init.npm.js index fe7f4f488..db1fed5f8 100644 --- a/lib/util/init.npm.js +++ b/lib/util/init.npm.js @@ -1,8 +1,8 @@ 'use strict'; -import File from './file'; +import File from './file.js'; import path from 'node:path'; -import Util from './util'; +import { Util } from './util.js'; import semver from 'semver'; /** diff --git a/lib/util/util.js b/lib/util/util.js index 8d101baeb..5c03cbccf 100644 --- a/lib/util/util.js +++ b/lib/util/util.js @@ -1,8 +1,8 @@ 'use strict'; -import TYPE from '../../types/mcdev.d'; -import MetadataDefinitions from './../MetadataTypeDefinitions'; -import packageJsonMcdev from '../../package.json'; +// import TYPE from '../../types/mcdev.d.js'; +import MetadataDefinitions from './../MetadataTypeDefinitions.js'; +import packageJsonMcdev from '../../package.json' assert { type: 'json' }; import process from 'node:process'; import toposort from 'toposort'; import winston from 'winston'; @@ -11,7 +11,7 @@ import child_process from 'node:child_process'; /** * Util that contains logger and simple util methods */ -const Util = { +export const Util = { authFileName: '.mcdev-auth.json', boilerplateDirectory: '../../boilerplate', configFileName: '.mcdevrc.json', @@ -754,5 +754,3 @@ function startLogger() { Util.logger.debug(`:: mcdev ${packageJsonMcdev.version} ::`); } startLogger(); - -export default Util; diff --git a/package.json b/package.json index 443cda6b7..caa8c2915 100644 --- a/package.json +++ b/package.json @@ -106,8 +106,7 @@ "fsevents": "*" }, "lint-staged": { - "*.{js,jsx,ts,tsx}": [ - "eslint --fix" - ] - } + "*.{js,jsx,ts,tsx}": ["eslint --fix"] + }, + "type": "module" } From deedd2a15004a4d43136950400b860b78c47f0b5 Mon Sep 17 00:00:00 2001 From: Douglas Midgley Date: Mon, 8 May 2023 23:22:47 +0200 Subject: [PATCH 03/17] #354: removed all require() and yargs runs --- lib/cli.js | 6 +++--- lib/metadataTypes/DataExtensionField.js | 3 ++- lib/metadataTypes/DataExtensionTemplate.js | 3 ++- lib/metadataTypes/DataExtract.js | 3 ++- lib/metadataTypes/DataExtractType.js | 3 ++- lib/metadataTypes/Discovery.js | 3 ++- lib/metadataTypes/Email.js | 3 ++- lib/metadataTypes/EmailSend.js | 3 ++- lib/metadataTypes/Event.js | 3 ++- lib/metadataTypes/FileLocation.js | 3 ++- lib/metadataTypes/FileTransfer.js | 3 ++- lib/metadataTypes/Filter.js | 3 ++- lib/metadataTypes/Folder.js | 3 ++- lib/metadataTypes/ImportFile.js | 3 ++- lib/metadataTypes/Journey.js | 3 ++- lib/metadataTypes/List.js | 3 ++- lib/metadataTypes/MobileCode.js | 3 ++- lib/metadataTypes/MobileKeyword.js | 3 ++- lib/metadataTypes/MobileMessage.js | 3 ++- lib/metadataTypes/Query.js | 3 ++- lib/metadataTypes/Role.js | 3 ++- lib/metadataTypes/Script.js | 3 ++- lib/metadataTypes/SendClassification.js | 3 ++- lib/metadataTypes/SetDefinition.js | 3 ++- lib/metadataTypes/TransactionalEmail.js | 3 ++- lib/metadataTypes/TransactionalMessage.js | 3 ++- lib/metadataTypes/TransactionalPush.js | 3 ++- lib/metadataTypes/TransactionalSMS.js | 3 ++- lib/metadataTypes/TriggeredSend.js | 3 ++- lib/metadataTypes/User.js | 3 ++- 30 files changed, 61 insertions(+), 32 deletions(-) diff --git a/lib/cli.js b/lib/cli.js index 567e0abf2..c3eecd568 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -7,9 +7,9 @@ import { Util } from './util/util.js'; import yargs from 'yargs'; +import { hideBin } from 'yargs/helpers'; import Mcdev from './index.js'; - -yargs +yargs(hideBin(process.argv)) .scriptName('mcdev') .usage('$0 [options]') .command({ @@ -411,7 +411,7 @@ yargs .demandCommand(1, 'Please enter a valid command') .strict() .recommendCommands() - .wrap(yargs.terminalWidth()) + .wrap(yargs(hideBin(process.argv)).terminalWidth()) .epilog( 'Copyright 2023. Accenture. Get support at https://github.com/Accenture/sfmc-devtools/issues' ) diff --git a/lib/metadataTypes/DataExtensionField.js b/lib/metadataTypes/DataExtensionField.js index 73ac2db67..5a72076de 100644 --- a/lib/metadataTypes/DataExtensionField.js +++ b/lib/metadataTypes/DataExtensionField.js @@ -333,6 +333,7 @@ class DataExtensionField extends MetadataType { } // Assign definition to static attributes -DataExtensionField.definition = require('../MetadataTypeDefinitions.js').dataExtensionField; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +DataExtensionField.definition = MetadataTypeDefinitions.dataExtensionField; export default DataExtensionField; diff --git a/lib/metadataTypes/DataExtensionTemplate.js b/lib/metadataTypes/DataExtensionTemplate.js index ec0b8fe84..7175a28df 100644 --- a/lib/metadataTypes/DataExtensionTemplate.js +++ b/lib/metadataTypes/DataExtensionTemplate.js @@ -35,6 +35,7 @@ class DataExtensionTemplate extends MetadataType { } // Assign definition to static attributes -DataExtensionTemplate.definition = require('../MetadataTypeDefinitions.js').dataExtensionTemplate; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +DataExtensionTemplate.definition = MetadataTypeDefinitions.dataExtensionTemplate; export default DataExtensionTemplate; diff --git a/lib/metadataTypes/DataExtract.js b/lib/metadataTypes/DataExtract.js index b545f1131..17cf4e4a0 100644 --- a/lib/metadataTypes/DataExtract.js +++ b/lib/metadataTypes/DataExtract.js @@ -160,6 +160,7 @@ class DataExtract extends MetadataType { } // Assign definition to static attributes -DataExtract.definition = require('../MetadataTypeDefinitions.js').dataExtract; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +DataExtract.definition = MetadataTypeDefinitions.dataExtract; export default DataExtract; diff --git a/lib/metadataTypes/DataExtractType.js b/lib/metadataTypes/DataExtractType.js index 112b591a6..ef0150e2b 100644 --- a/lib/metadataTypes/DataExtractType.js +++ b/lib/metadataTypes/DataExtractType.js @@ -34,6 +34,7 @@ class DataExtractType extends MetadataType { } // Assign definition to static attributes -DataExtractType.definition = require('../MetadataTypeDefinitions.js').dataExtractType; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +DataExtractType.definition = MetadataTypeDefinitions.dataExtractType; export default DataExtractType; diff --git a/lib/metadataTypes/Discovery.js b/lib/metadataTypes/Discovery.js index e94d3e06e..251054125 100644 --- a/lib/metadataTypes/Discovery.js +++ b/lib/metadataTypes/Discovery.js @@ -48,6 +48,7 @@ class Discovery extends MetadataType { } // Assign definition to static attributes -Discovery.definition = require('../MetadataTypeDefinitions.js').discovery; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Discovery.definition = MetadataTypeDefinitions.discovery; export default Discovery; diff --git a/lib/metadataTypes/Email.js b/lib/metadataTypes/Email.js index 612920812..6c25efa92 100644 --- a/lib/metadataTypes/Email.js +++ b/lib/metadataTypes/Email.js @@ -87,6 +87,7 @@ class Email extends MetadataType { } // Assign definition to static attributes -Email.definition = require('../MetadataTypeDefinitions.js').email; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Email.definition = MetadataTypeDefinitions.email; export default Email; diff --git a/lib/metadataTypes/EmailSend.js b/lib/metadataTypes/EmailSend.js index 231a69c69..df95bea5b 100644 --- a/lib/metadataTypes/EmailSend.js +++ b/lib/metadataTypes/EmailSend.js @@ -292,6 +292,7 @@ class EmailSend extends MetadataType { } // Assign definition to static attributes -EmailSend.definition = require('../MetadataTypeDefinitions.js').emailSend; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +EmailSend.definition = MetadataTypeDefinitions.emailSend; export default EmailSend; diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 4eac34dbb..8483fcf96 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -214,6 +214,7 @@ class Event extends MetadataType { } // Assign definition to static attributes -Event.definition = require('../MetadataTypeDefinitions.js').event; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Event.definition = MetadataTypeDefinitions.event; export default Event; diff --git a/lib/metadataTypes/FileLocation.js b/lib/metadataTypes/FileLocation.js index 397557568..2bb4eaa3e 100644 --- a/lib/metadataTypes/FileLocation.js +++ b/lib/metadataTypes/FileLocation.js @@ -34,6 +34,7 @@ class FtpLocation extends MetadataType { } // Assign definition to static attributes -FtpLocation.definition = require('../MetadataTypeDefinitions.js').fileLocation; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +FtpLocation.definition = MetadataTypeDefinitions.fileLocation; export default FtpLocation; diff --git a/lib/metadataTypes/FileTransfer.js b/lib/metadataTypes/FileTransfer.js index a6cfd49b7..e7de714ea 100644 --- a/lib/metadataTypes/FileTransfer.js +++ b/lib/metadataTypes/FileTransfer.js @@ -165,6 +165,7 @@ class FileTransfer extends MetadataType { } // Assign definition to static attributes -FileTransfer.definition = require('../MetadataTypeDefinitions.js').fileTransfer; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +FileTransfer.definition = MetadataTypeDefinitions.fileTransfer; export default FileTransfer; diff --git a/lib/metadataTypes/Filter.js b/lib/metadataTypes/Filter.js index 978a930bf..2d7f60999 100644 --- a/lib/metadataTypes/Filter.js +++ b/lib/metadataTypes/Filter.js @@ -27,6 +27,7 @@ class Filter extends MetadataType { } // Assign definition to static attributes -Filter.definition = require('../MetadataTypeDefinitions.js').filter; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Filter.definition = MetadataTypeDefinitions.filter; export default Filter; diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index 709ca4063..d3f0b4488 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -629,6 +629,7 @@ class Folder extends MetadataType { } // Assign definition to static attributes -Folder.definition = require('../MetadataTypeDefinitions.js').folder; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Folder.definition = MetadataTypeDefinitions.folder; export default Folder; diff --git a/lib/metadataTypes/ImportFile.js b/lib/metadataTypes/ImportFile.js index 8f1c347dd..c75abfab2 100644 --- a/lib/metadataTypes/ImportFile.js +++ b/lib/metadataTypes/ImportFile.js @@ -232,6 +232,7 @@ class ImportFile extends MetadataType { } // Assign definition to static attributes -ImportFile.definition = require('../MetadataTypeDefinitions.js').importFile; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +ImportFile.definition = MetadataTypeDefinitions.importFile; export default ImportFile; diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index 159cc0bac..ebc151b40 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -957,6 +957,7 @@ class Journey extends MetadataType { } // Assign definition to static attributes -Journey.definition = require('../MetadataTypeDefinitions.js').journey; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Journey.definition = MetadataTypeDefinitions.journey; export default Journey; diff --git a/lib/metadataTypes/List.js b/lib/metadataTypes/List.js index fb5e2842f..cd5135c2c 100644 --- a/lib/metadataTypes/List.js +++ b/lib/metadataTypes/List.js @@ -205,6 +205,7 @@ class List extends MetadataType { } } // Assign definition to static attributes -List.definition = require('../MetadataTypeDefinitions.js').list; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +List.definition = MetadataTypeDefinitions.list; export default List; diff --git a/lib/metadataTypes/MobileCode.js b/lib/metadataTypes/MobileCode.js index af755f369..59c193029 100644 --- a/lib/metadataTypes/MobileCode.js +++ b/lib/metadataTypes/MobileCode.js @@ -39,6 +39,7 @@ class MobileCode extends MetadataType { } // Assign definition to static attributes -MobileCode.definition = require('../MetadataTypeDefinitions.js').mobileCode; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +MobileCode.definition = MetadataTypeDefinitions.mobileCode; export default MobileCode; diff --git a/lib/metadataTypes/MobileKeyword.js b/lib/metadataTypes/MobileKeyword.js index a18ac03c1..ff61697fb 100644 --- a/lib/metadataTypes/MobileKeyword.js +++ b/lib/metadataTypes/MobileKeyword.js @@ -380,6 +380,7 @@ class MobileKeyword extends MetadataType { } // Assign definition to static attributes -MobileKeyword.definition = require('../MetadataTypeDefinitions.js').mobileKeyword; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +MobileKeyword.definition = MetadataTypeDefinitions.mobileKeyword; export default MobileKeyword; diff --git a/lib/metadataTypes/MobileMessage.js b/lib/metadataTypes/MobileMessage.js index 256545f6e..291f821cd 100644 --- a/lib/metadataTypes/MobileMessage.js +++ b/lib/metadataTypes/MobileMessage.js @@ -458,6 +458,7 @@ class MobileMessage extends MetadataType { } // Assign definition to static attributes -MobileMessage.definition = require('../MetadataTypeDefinitions.js').mobileMessage; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +MobileMessage.definition = MetadataTypeDefinitions.mobileMessage; export default MobileMessage; diff --git a/lib/metadataTypes/Query.js b/lib/metadataTypes/Query.js index 028c86c87..ed8e45f97 100644 --- a/lib/metadataTypes/Query.js +++ b/lib/metadataTypes/Query.js @@ -429,6 +429,7 @@ class Query extends MetadataType { } // Assign definition & cache to static attributes -Query.definition = require('../MetadataTypeDefinitions.js').query; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Query.definition = MetadataTypeDefinitions.query; export default Query; diff --git a/lib/metadataTypes/Role.js b/lib/metadataTypes/Role.js index 97b996ef6..9f6775654 100644 --- a/lib/metadataTypes/Role.js +++ b/lib/metadataTypes/Role.js @@ -326,6 +326,7 @@ class Role extends MetadataType { } // Assign definition to static attributes -Role.definition = require('../MetadataTypeDefinitions.js').role; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Role.definition = MetadataTypeDefinitions.role; export default Role; diff --git a/lib/metadataTypes/Script.js b/lib/metadataTypes/Script.js index 9927d2234..2983e3532 100644 --- a/lib/metadataTypes/Script.js +++ b/lib/metadataTypes/Script.js @@ -327,6 +327,7 @@ class Script extends MetadataType { } // Assign definition & cache to static attributes -Script.definition = require('../MetadataTypeDefinitions.js').script; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +Script.definition = MetadataTypeDefinitions.script; export default Script; diff --git a/lib/metadataTypes/SendClassification.js b/lib/metadataTypes/SendClassification.js index d67833506..9408d62ef 100644 --- a/lib/metadataTypes/SendClassification.js +++ b/lib/metadataTypes/SendClassification.js @@ -35,6 +35,7 @@ class SendClassification extends MetadataType { } // Assign definition to static attributes -SendClassification.definition = require('../MetadataTypeDefinitions.js').sendClassification; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +SendClassification.definition = MetadataTypeDefinitions.sendClassification; export default SendClassification; diff --git a/lib/metadataTypes/SetDefinition.js b/lib/metadataTypes/SetDefinition.js index 765ab66db..87401077f 100644 --- a/lib/metadataTypes/SetDefinition.js +++ b/lib/metadataTypes/SetDefinition.js @@ -32,6 +32,7 @@ class SetDefinition extends MetadataType { } // Assign definition to static attributes -SetDefinition.definition = require('../MetadataTypeDefinitions.js').setDefinition; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +SetDefinition.definition = MetadataTypeDefinitions.setDefinition; export default SetDefinition; diff --git a/lib/metadataTypes/TransactionalEmail.js b/lib/metadataTypes/TransactionalEmail.js index 86aece928..07462af6a 100644 --- a/lib/metadataTypes/TransactionalEmail.js +++ b/lib/metadataTypes/TransactionalEmail.js @@ -157,6 +157,7 @@ class TransactionalEmail extends TransactionalMessage { } // Assign definition to static attributes -TransactionalEmail.definition = require('../MetadataTypeDefinitions.js').transactionalEmail; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +TransactionalEmail.definition = MetadataTypeDefinitions.transactionalEmail; export default TransactionalEmail; diff --git a/lib/metadataTypes/TransactionalMessage.js b/lib/metadataTypes/TransactionalMessage.js index b7ce79d9b..e1821fe0e 100644 --- a/lib/metadataTypes/TransactionalMessage.js +++ b/lib/metadataTypes/TransactionalMessage.js @@ -114,6 +114,7 @@ class TransactionalMessage extends MetadataType { // Assign definition to static attributes // ! using SMS definitions here as placeholder to have auto completion -TransactionalMessage.definition = require('../MetadataTypeDefinitions.js').transactionalSMS; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +TransactionalMessage.definition = MetadataTypeDefinitions.transactionalSMS; export default TransactionalMessage; diff --git a/lib/metadataTypes/TransactionalPush.js b/lib/metadataTypes/TransactionalPush.js index 120e4b5ae..820fb96fc 100644 --- a/lib/metadataTypes/TransactionalPush.js +++ b/lib/metadataTypes/TransactionalPush.js @@ -72,6 +72,7 @@ class TransactionalPush extends TransactionalMessage { } // Assign definition to static attributes -TransactionalPush.definition = require('../MetadataTypeDefinitions.js').transactionalPush; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +TransactionalPush.definition = MetadataTypeDefinitions.transactionalPush; export default TransactionalPush; diff --git a/lib/metadataTypes/TransactionalSMS.js b/lib/metadataTypes/TransactionalSMS.js index bda5b4084..10a4346cc 100644 --- a/lib/metadataTypes/TransactionalSMS.js +++ b/lib/metadataTypes/TransactionalSMS.js @@ -341,6 +341,7 @@ class TransactionalSMS extends TransactionalMessage { } // Assign definition to static attributes -TransactionalSMS.definition = require('../MetadataTypeDefinitions.js').transactionalSMS; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +TransactionalSMS.definition = MetadataTypeDefinitions.transactionalSMS; export default TransactionalSMS; diff --git a/lib/metadataTypes/TriggeredSend.js b/lib/metadataTypes/TriggeredSend.js index 5ea408c5f..3c659d68f 100644 --- a/lib/metadataTypes/TriggeredSend.js +++ b/lib/metadataTypes/TriggeredSend.js @@ -434,6 +434,7 @@ class TriggeredSend extends MetadataType { } // Assign definition to static attributes -TriggeredSend.definition = require('../MetadataTypeDefinitions.js').triggeredSend; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +TriggeredSend.definition = MetadataTypeDefinitions.triggeredSend; export default TriggeredSend; diff --git a/lib/metadataTypes/User.js b/lib/metadataTypes/User.js index 8f0cfeb58..d7c5afc74 100644 --- a/lib/metadataTypes/User.js +++ b/lib/metadataTypes/User.js @@ -1172,6 +1172,7 @@ class User extends MetadataType { } // Assign definition to static attributes -User.definition = require('../MetadataTypeDefinitions.js').user; +import MetadataTypeDefinitions from '../MetadataTypeDefinitions.js'; +User.definition = MetadataTypeDefinitions.user; export default User; From f889c275394a7ad55ac6a691533d54dddc5d8a56 Mon Sep 17 00:00:00 2001 From: Douglas Midgley Date: Mon, 8 May 2023 23:24:15 +0200 Subject: [PATCH 04/17] #354: Test class bulk convert --- test/dataExtension.test.js | 8 ++++---- test/general.test.js | 8 ++++---- test/journey.test.js | 10 +++++----- test/mobileKeyword.test.js | 10 +++++----- test/mobileMessage.test.js | 10 +++++----- test/query.test.js | 12 +++++++----- test/resourceFactory.js | 22 +++++++++++++--------- test/transactionalEmail.test.js | 10 +++++----- test/transactionalPush.test.js | 10 +++++----- test/transactionalSMS.test.js | 10 +++++----- test/user.test.js | 8 ++++---- test/utils.js | 21 ++++++++++++--------- 12 files changed, 74 insertions(+), 65 deletions(-) diff --git a/test/dataExtension.test.js b/test/dataExtension.test.js index d6a0ae56a..081f018a0 100644 --- a/test/dataExtension.test.js +++ b/test/dataExtension.test.js @@ -1,7 +1,7 @@ -const assert = require('chai').assert; -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import { assert } from 'chai'; +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('dataExtension', () => { beforeEach(() => { diff --git a/test/general.test.js b/test/general.test.js index 387c31050..6a049e19a 100644 --- a/test/general.test.js +++ b/test/general.test.js @@ -1,10 +1,10 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; const expect = chai.expect; chai.use(chaiFiles); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import testUtils from './utils'; +import handler from '../lib/index'; describe('GENERAL', () => { beforeEach(() => { diff --git a/test/journey.test.js b/test/journey.test.js index b1be94bd6..c8be8df46 100644 --- a/test/journey.test.js +++ b/test/journey.test.js @@ -1,10 +1,10 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; chai.use(chaiFiles); -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('journey', () => { beforeEach(() => { diff --git a/test/mobileKeyword.test.js b/test/mobileKeyword.test.js index 7b4a18277..837ba16ef 100644 --- a/test/mobileKeyword.test.js +++ b/test/mobileKeyword.test.js @@ -1,12 +1,12 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; chai.use(chaiFiles); const expect = chai.expect; const file = chaiFiles.file; -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('mobileKeyword', () => { beforeEach(() => { diff --git a/test/mobileMessage.test.js b/test/mobileMessage.test.js index 70dc347cd..d44120a60 100644 --- a/test/mobileMessage.test.js +++ b/test/mobileMessage.test.js @@ -1,12 +1,12 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; chai.use(chaiFiles); const expect = chai.expect; const file = chaiFiles.file; -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('mobileMessage', () => { beforeEach(() => { diff --git a/test/query.test.js b/test/query.test.js index 3fa8471a1..f4c504bb9 100644 --- a/test/query.test.js +++ b/test/query.test.js @@ -1,13 +1,15 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; chai.use(chaiFiles); const expect = chai.expect; const file = chaiFiles.file; + // const dir = chaiFiles.dir; -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import cache from '../lib/util/cache'; + +import testUtils from './utils'; +import handler from '../lib/index'; describe('query', () => { beforeEach(() => { diff --git a/test/resourceFactory.js b/test/resourceFactory.js index b422ad79b..aabcb90b7 100644 --- a/test/resourceFactory.js +++ b/test/resourceFactory.js @@ -1,9 +1,10 @@ -const fs = require('fs-extra'); -const path = require('node:path'); -const { XMLParser } = require('fast-xml-parser'); -const { color } = require('../lib/util/util'); +import fs from 'fs-extra'; +import path from 'node:path'; +import { XMLParser } from 'fast-xml-parser'; +import { color } from '../lib/util/util'; const parser = new XMLParser(); const attributeParser = new XMLParser({ ignoreAttributes: false }); + /** * gets mock SOAP metadata for responding * @@ -12,7 +13,7 @@ const attributeParser = new XMLParser({ ignoreAttributes: false }); * @param {string} mid of Business Unit * @returns {string} relevant metadata stringified */ -exports.loadSOAPRecords = async (mcdevAction, type, mid) => { +export const loadSOAPRecords = async (mcdevAction, type, mid) => { type = type[0].toLowerCase() + type.slice(1); const testPath = path.join( 'test', @@ -36,13 +37,14 @@ exports.loadSOAPRecords = async (mcdevAction, type, mid) => { encoding: 'utf8', }); }; + /** * based on request, respond with different soap data * * @param {object} config mock api request object * @returns {Promise.} status code plus response in string form */ -exports.handleSOAPRequest = async (config) => { +export const handleSOAPRequest = async (config) => { const jObj = parser.parse(config.data); const fullObj = attributeParser.parse(config.data); let responseXML; @@ -93,12 +95,13 @@ exports.handleSOAPRequest = async (config) => { return [200, responseXML]; }; + /** * helper to return soap base URL * * @returns {string} soap URL */ -exports.soapUrl = 'https://mct0l7nxfq2r988t1kxfy8sc4xxx.soap.marketingcloudapis.com/Service.asmx'; +export const soapUrl = 'https://mct0l7nxfq2r988t1kxfy8sc4xxx.soap.marketingcloudapis.com/Service.asmx'; /** * based on request, respond with different soap data @@ -106,7 +109,7 @@ exports.soapUrl = 'https://mct0l7nxfq2r988t1kxfy8sc4xxx.soap.marketingcloudapis. * @param {object} config mock api request object * @returns {Promise.} status code plus response in string form */ -exports.handleRESTRequest = async (config) => { +export const handleRESTRequest = async (config) => { try { // check if filtered const urlObj = new URL(config.baseURL + config.url.slice(1)); @@ -161,9 +164,10 @@ exports.handleRESTRequest = async (config) => { return [500, {}]; } }; + /** * helper to return rest base URL * * @returns {string} test URL */ -exports.restUrl = 'https://mct0l7nxfq2r988t1kxfy8sc4xxx.rest.marketingcloudapis.com/'; +export const restUrl = 'https://mct0l7nxfq2r988t1kxfy8sc4xxx.rest.marketingcloudapis.com/'; diff --git a/test/transactionalEmail.test.js b/test/transactionalEmail.test.js index 2385b9d68..ee5fcf81d 100644 --- a/test/transactionalEmail.test.js +++ b/test/transactionalEmail.test.js @@ -1,10 +1,10 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; chai.use(chaiFiles); -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('transactionalEmail', () => { beforeEach(() => { diff --git a/test/transactionalPush.test.js b/test/transactionalPush.test.js index 0c5b00b3d..0ab641203 100644 --- a/test/transactionalPush.test.js +++ b/test/transactionalPush.test.js @@ -1,10 +1,10 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; chai.use(chaiFiles); -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('transactionalPush', () => { beforeEach(() => { diff --git a/test/transactionalSMS.test.js b/test/transactionalSMS.test.js index d95f5b7b5..6ba8b33e2 100644 --- a/test/transactionalSMS.test.js +++ b/test/transactionalSMS.test.js @@ -1,12 +1,12 @@ -const chai = require('chai'); -const chaiFiles = require('chai-files'); +import chai from 'chai'; +import chaiFiles from 'chai-files'; const assert = chai.assert; chai.use(chaiFiles); const expect = chai.expect; const file = chaiFiles.file; -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('transactionalSMS', () => { beforeEach(() => { diff --git a/test/user.test.js b/test/user.test.js index 339d4975b..9f69bc0ef 100644 --- a/test/user.test.js +++ b/test/user.test.js @@ -1,7 +1,7 @@ -const assert = require('chai').assert; -const cache = require('../lib/util/cache'); -const testUtils = require('./utils'); -const handler = require('../lib/index'); +import { assert } from 'chai'; +import cache from '../lib/util/cache'; +import testUtils from './utils'; +import handler from '../lib/index'; describe('user', () => { beforeEach(() => { diff --git a/test/utils.js b/test/utils.js index 095b28846..141c56379 100644 --- a/test/utils.js +++ b/test/utils.js @@ -1,16 +1,19 @@ -const File = require('../lib/util/file'); -const path = require('node:path'); -const axios = require('axios'); -const MockAdapter = require('axios-mock-adapter'); -const auth = require('../lib/util/auth'); -const Util = require('../lib/util/util'); +import File from '../lib/util/file'; +import path from 'node:path'; +import axios from 'axios'; +import MockAdapter from 'axios-mock-adapter'; +import auth from '../lib/util/auth'; +import Util from '../lib/util/util'; +import { fileURLToPath } from 'node:url'; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); // for some reason doesnt realize below reference // eslint-disable-next-line no-unused-vars -const fsmock = require('mock-fs'); +import fsmock from 'mock-fs'; + let apimock; -const authResources = require('./resources/auth.json'); -const resourceFactory = require('./resourceFactory'); +import authResources from './resources/auth.json'; +import resourceFactory from './resourceFactory'; /** * gets file from Retrieve folder From d712d9559a4ae09fefd140046cb7c9d8954e8052 Mon Sep 17 00:00:00 2001 From: Douglas Midgley Date: Mon, 8 May 2023 23:32:13 +0200 Subject: [PATCH 05/17] #354: dirname migration & endings --- lib/util/config.js | 3 +++ lib/util/init.config.js | 2 ++ lib/util/init.npm.js | 2 ++ 3 files changed, 7 insertions(+) diff --git a/lib/util/config.js b/lib/util/config.js index 03245403e..9a9e49ac5 100644 --- a/lib/util/config.js +++ b/lib/util/config.js @@ -4,6 +4,9 @@ import File from './file.js'; import inquirer from 'inquirer'; import semver from 'semver'; import path from 'node:path'; +import { fileURLToPath } from 'node:url'; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + /** * Central class for loading and validating properties from config and auth */ diff --git a/lib/util/init.config.js b/lib/util/init.config.js index 12c723726..cabe491f8 100644 --- a/lib/util/init.config.js +++ b/lib/util/init.config.js @@ -8,6 +8,8 @@ import { Util } from './util.js'; import inquirer from 'inquirer'; import path from 'node:path'; import semver from 'semver'; +import { fileURLToPath } from 'node:url'; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); /** * CLI helper class diff --git a/lib/util/init.npm.js b/lib/util/init.npm.js index db1fed5f8..6b7ff27e2 100644 --- a/lib/util/init.npm.js +++ b/lib/util/init.npm.js @@ -4,6 +4,8 @@ import File from './file.js'; import path from 'node:path'; import { Util } from './util.js'; import semver from 'semver'; +import { fileURLToPath } from 'node:url'; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); /** * CLI helper class From 12659632b952c18eaa14a667fa224d48c1c5c02e Mon Sep 17 00:00:00 2001 From: Douglas Midgley Date: Mon, 8 May 2023 23:33:46 +0200 Subject: [PATCH 06/17] #354: types reenabled --- lib/metadataTypes/Asset.js | 2 +- lib/metadataTypes/AttributeGroup.js | 2 +- lib/metadataTypes/Automation.js | 2 +- lib/metadataTypes/Campaign.js | 2 +- lib/metadataTypes/ContentArea.js | 2 +- lib/metadataTypes/DataExtension.js | 2 +- lib/metadataTypes/DataExtensionField.js | 2 +- lib/metadataTypes/DataExtensionTemplate.js | 2 +- lib/metadataTypes/DataExtract.js | 2 +- lib/metadataTypes/DataExtractType.js | 2 +- lib/metadataTypes/Discovery.js | 2 +- lib/metadataTypes/Email.js | 2 +- lib/metadataTypes/EmailSend.js | 2 +- lib/metadataTypes/Event.js | 2 +- lib/metadataTypes/FileLocation.js | 2 +- lib/metadataTypes/FileTransfer.js | 2 +- lib/metadataTypes/Filter.js | 2 +- lib/metadataTypes/Folder.js | 2 +- lib/metadataTypes/ImportFile.js | 2 +- lib/metadataTypes/Journey.js | 2 +- lib/metadataTypes/List.js | 2 +- lib/metadataTypes/MetadataType.js | 2 +- lib/metadataTypes/MobileCode.js | 2 +- lib/metadataTypes/MobileKeyword.js | 2 +- lib/metadataTypes/MobileMessage.js | 2 +- lib/metadataTypes/Query.js | 2 +- lib/metadataTypes/Role.js | 2 +- lib/metadataTypes/Script.js | 2 +- lib/metadataTypes/SendClassification.js | 2 +- lib/metadataTypes/SetDefinition.js | 2 +- lib/metadataTypes/TransactionalEmail.js | 2 +- lib/metadataTypes/TransactionalMessage.js | 2 +- lib/metadataTypes/TransactionalPush.js | 2 +- lib/metadataTypes/TransactionalSMS.js | 2 +- lib/metadataTypes/TriggeredSend.js | 2 +- lib/metadataTypes/User.js | 2 +- lib/util/auth.js | 2 +- lib/util/businessUnit.js | 2 +- lib/util/cache.js | 2 +- lib/util/cli.js | 2 +- lib/util/config.js | 2 +- lib/util/devops.js | 2 +- lib/util/file.js | 2 +- lib/util/init.config.js | 2 +- lib/util/init.js | 2 +- lib/util/util.js | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/metadataTypes/Asset.js b/lib/metadataTypes/Asset.js index 88e3172ee..1e5fe83e0 100644 --- a/lib/metadataTypes/Asset.js +++ b/lib/metadataTypes/Asset.js @@ -1,7 +1,7 @@ 'use strict'; import MetadataType from './MetadataType.js'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; import pLimit from 'p-limit'; diff --git a/lib/metadataTypes/AttributeGroup.js b/lib/metadataTypes/AttributeGroup.js index 7219ff8dc..7a5c3e891 100644 --- a/lib/metadataTypes/AttributeGroup.js +++ b/lib/metadataTypes/AttributeGroup.js @@ -1,7 +1,7 @@ 'use strict'; import MetadataType from './MetadataType.js'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; /** * AttributeGroup MetadataType diff --git a/lib/metadataTypes/Automation.js b/lib/metadataTypes/Automation.js index 7b8c5f16d..7d94f4370 100644 --- a/lib/metadataTypes/Automation.js +++ b/lib/metadataTypes/Automation.js @@ -1,7 +1,7 @@ 'use strict'; import MetadataType from './MetadataType.js'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; import Definitions from '../MetadataTypeDefinitions.js'; diff --git a/lib/metadataTypes/Campaign.js b/lib/metadataTypes/Campaign.js index e0f01fb64..00032f1d7 100644 --- a/lib/metadataTypes/Campaign.js +++ b/lib/metadataTypes/Campaign.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/ContentArea.js b/lib/metadataTypes/ContentArea.js index 35c3bc6e8..a67049c92 100644 --- a/lib/metadataTypes/ContentArea.js +++ b/lib/metadataTypes/ContentArea.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import cache from '../util/cache.js'; diff --git a/lib/metadataTypes/DataExtension.js b/lib/metadataTypes/DataExtension.js index b4c9f5447..18f073d8e 100644 --- a/lib/metadataTypes/DataExtension.js +++ b/lib/metadataTypes/DataExtension.js @@ -1,7 +1,7 @@ 'use strict'; import jsonToTable from 'json-to-table'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import DataExtensionField from './DataExtensionField.js'; import Folder from './Folder.js'; diff --git a/lib/metadataTypes/DataExtensionField.js b/lib/metadataTypes/DataExtensionField.js index 5a72076de..d597417f6 100644 --- a/lib/metadataTypes/DataExtensionField.js +++ b/lib/metadataTypes/DataExtensionField.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; diff --git a/lib/metadataTypes/DataExtensionTemplate.js b/lib/metadataTypes/DataExtensionTemplate.js index 7175a28df..edff5cb33 100644 --- a/lib/metadataTypes/DataExtensionTemplate.js +++ b/lib/metadataTypes/DataExtensionTemplate.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; /** diff --git a/lib/metadataTypes/DataExtract.js b/lib/metadataTypes/DataExtract.js index 17cf4e4a0..c6cdf0168 100644 --- a/lib/metadataTypes/DataExtract.js +++ b/lib/metadataTypes/DataExtract.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/DataExtractType.js b/lib/metadataTypes/DataExtractType.js index ef0150e2b..5f6185686 100644 --- a/lib/metadataTypes/DataExtractType.js +++ b/lib/metadataTypes/DataExtractType.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; /** diff --git a/lib/metadataTypes/Discovery.js b/lib/metadataTypes/Discovery.js index 251054125..803c96e14 100644 --- a/lib/metadataTypes/Discovery.js +++ b/lib/metadataTypes/Discovery.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; diff --git a/lib/metadataTypes/Email.js b/lib/metadataTypes/Email.js index 6c25efa92..f4b3c0d4c 100644 --- a/lib/metadataTypes/Email.js +++ b/lib/metadataTypes/Email.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; diff --git a/lib/metadataTypes/EmailSend.js b/lib/metadataTypes/EmailSend.js index df95bea5b..38474bd56 100644 --- a/lib/metadataTypes/EmailSend.js +++ b/lib/metadataTypes/EmailSend.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import cache from '../util/cache.js'; diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js index 8483fcf96..1fa3da5f3 100644 --- a/lib/metadataTypes/Event.js +++ b/lib/metadataTypes/Event.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/FileLocation.js b/lib/metadataTypes/FileLocation.js index 2bb4eaa3e..2b5927ba6 100644 --- a/lib/metadataTypes/FileLocation.js +++ b/lib/metadataTypes/FileLocation.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; /** diff --git a/lib/metadataTypes/FileTransfer.js b/lib/metadataTypes/FileTransfer.js index e7de714ea..35067f816 100644 --- a/lib/metadataTypes/FileTransfer.js +++ b/lib/metadataTypes/FileTransfer.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/Filter.js b/lib/metadataTypes/Filter.js index 2d7f60999..6fc64079f 100644 --- a/lib/metadataTypes/Filter.js +++ b/lib/metadataTypes/Filter.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; /** diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index d3f0b4488..52742ab9a 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import toposort from 'toposort'; import { Util } from '../util/util.js'; diff --git a/lib/metadataTypes/ImportFile.js b/lib/metadataTypes/ImportFile.js index c75abfab2..5348a4909 100644 --- a/lib/metadataTypes/ImportFile.js +++ b/lib/metadataTypes/ImportFile.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js index ebc151b40..1e373d6a7 100644 --- a/lib/metadataTypes/Journey.js +++ b/lib/metadataTypes/Journey.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import TransactionalEmail from './TransactionalEmail.js'; import { Util } from '../util/util.js'; diff --git a/lib/metadataTypes/List.js b/lib/metadataTypes/List.js index cd5135c2c..2c57375f7 100644 --- a/lib/metadataTypes/List.js +++ b/lib/metadataTypes/List.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import Folder from './Folder.js'; import { Util } from '../util/util.js'; diff --git a/lib/metadataTypes/MetadataType.js b/lib/metadataTypes/MetadataType.js index 5ecf5c06f..86e01b58a 100644 --- a/lib/metadataTypes/MetadataType.js +++ b/lib/metadataTypes/MetadataType.js @@ -7,7 +7,7 @@ * in the generic version of the method */ -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/MobileCode.js b/lib/metadataTypes/MobileCode.js index 59c193029..5101af3f8 100644 --- a/lib/metadataTypes/MobileCode.js +++ b/lib/metadataTypes/MobileCode.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; /** diff --git a/lib/metadataTypes/MobileKeyword.js b/lib/metadataTypes/MobileKeyword.js index ff61697fb..90d2d0f2c 100644 --- a/lib/metadataTypes/MobileKeyword.js +++ b/lib/metadataTypes/MobileKeyword.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/MobileMessage.js b/lib/metadataTypes/MobileMessage.js index 291f821cd..c9f093aad 100644 --- a/lib/metadataTypes/MobileMessage.js +++ b/lib/metadataTypes/MobileMessage.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/Query.js b/lib/metadataTypes/Query.js index ed8e45f97..649540dd6 100644 --- a/lib/metadataTypes/Query.js +++ b/lib/metadataTypes/Query.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from '../util/util.js'; import MetadataType from './MetadataType.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/Role.js b/lib/metadataTypes/Role.js index 9f6775654..f209bcd55 100644 --- a/lib/metadataTypes/Role.js +++ b/lib/metadataTypes/Role.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/Script.js b/lib/metadataTypes/Script.js index 2983e3532..a64901408 100644 --- a/lib/metadataTypes/Script.js +++ b/lib/metadataTypes/Script.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/SendClassification.js b/lib/metadataTypes/SendClassification.js index 9408d62ef..d71c450e3 100644 --- a/lib/metadataTypes/SendClassification.js +++ b/lib/metadataTypes/SendClassification.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; /** diff --git a/lib/metadataTypes/SetDefinition.js b/lib/metadataTypes/SetDefinition.js index 87401077f..747014726 100644 --- a/lib/metadataTypes/SetDefinition.js +++ b/lib/metadataTypes/SetDefinition.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; /** diff --git a/lib/metadataTypes/TransactionalEmail.js b/lib/metadataTypes/TransactionalEmail.js index 07462af6a..88b9ad3cc 100644 --- a/lib/metadataTypes/TransactionalEmail.js +++ b/lib/metadataTypes/TransactionalEmail.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import TransactionalMessage from './TransactionalMessage.js'; import { Util } from '../util/util.js'; import cache from '../util/cache.js'; diff --git a/lib/metadataTypes/TransactionalMessage.js b/lib/metadataTypes/TransactionalMessage.js index e1821fe0e..5fe2c0df2 100644 --- a/lib/metadataTypes/TransactionalMessage.js +++ b/lib/metadataTypes/TransactionalMessage.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; diff --git a/lib/metadataTypes/TransactionalPush.js b/lib/metadataTypes/TransactionalPush.js index 820fb96fc..90930c6c5 100644 --- a/lib/metadataTypes/TransactionalPush.js +++ b/lib/metadataTypes/TransactionalPush.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import TransactionalMessage from './TransactionalMessage.js'; import { Util } from '../util/util.js'; import cache from '../util/cache.js'; diff --git a/lib/metadataTypes/TransactionalSMS.js b/lib/metadataTypes/TransactionalSMS.js index 10a4346cc..b2ea8c891 100644 --- a/lib/metadataTypes/TransactionalSMS.js +++ b/lib/metadataTypes/TransactionalSMS.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import TransactionalMessage from './TransactionalMessage.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/metadataTypes/TriggeredSend.js b/lib/metadataTypes/TriggeredSend.js index 3c659d68f..c48cd5fcf 100644 --- a/lib/metadataTypes/TriggeredSend.js +++ b/lib/metadataTypes/TriggeredSend.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import cache from '../util/cache.js'; diff --git a/lib/metadataTypes/User.js b/lib/metadataTypes/User.js index d7c5afc74..8bee608cc 100644 --- a/lib/metadataTypes/User.js +++ b/lib/metadataTypes/User.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataType from './MetadataType.js'; import { Util } from '../util/util.js'; import File from '../util/file.js'; diff --git a/lib/util/auth.js b/lib/util/auth.js index e33fbc472..3b82744cf 100644 --- a/lib/util/auth.js +++ b/lib/util/auth.js @@ -1,4 +1,4 @@ -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from './util.js'; import File from './file.js'; import SDK from 'sfmc-sdk'; diff --git a/lib/util/businessUnit.js b/lib/util/businessUnit.js index 7489ae1ac..b26e010fc 100644 --- a/lib/util/businessUnit.js +++ b/lib/util/businessUnit.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from './util.js'; import File from './file.js'; import auth from './auth.js'; diff --git a/lib/util/cache.js b/lib/util/cache.js index 52046cf27..31feb0d19 100644 --- a/lib/util/cache.js +++ b/lib/util/cache.js @@ -1,4 +1,4 @@ -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from './util.js'; /** @type {TYPE.Cache} */ diff --git a/lib/util/cli.js b/lib/util/cli.js index 572728698..12c888de9 100644 --- a/lib/util/cli.js +++ b/lib/util/cli.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import BuHelper from './businessUnit.js'; import File from './file.js'; import config from './config.js'; diff --git a/lib/util/config.js b/lib/util/config.js index 9a9e49ac5..b5a33918d 100644 --- a/lib/util/config.js +++ b/lib/util/config.js @@ -1,4 +1,4 @@ -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import { Util } from './util.js'; import File from './file.js'; import inquirer from 'inquirer'; diff --git a/lib/util/devops.js b/lib/util/devops.js index 582353b56..2523e51ba 100644 --- a/lib/util/devops.js +++ b/lib/util/devops.js @@ -1,4 +1,4 @@ -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import File from './file.js'; import path from 'node:path'; import inquirer from 'inquirer'; diff --git a/lib/util/file.js b/lib/util/file.js index c9dabd2bb..9a6e75012 100644 --- a/lib/util/file.js +++ b/lib/util/file.js @@ -1,7 +1,7 @@ /* eslint-disable no-control-regex */ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import fs from 'fs-extra'; import packageJson from '../../package.json' assert { type: 'json' }; import path from 'node:path'; diff --git a/lib/util/init.config.js b/lib/util/init.config.js index cabe491f8..a8309d4d1 100644 --- a/lib/util/init.config.js +++ b/lib/util/init.config.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import Cli from './cli.js'; import File from './file.js'; import config from './config.js'; diff --git a/lib/util/init.js b/lib/util/init.js index e4c64d6b0..a5889070d 100644 --- a/lib/util/init.js +++ b/lib/util/init.js @@ -1,5 +1,5 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import Cli from './cli.js'; import File from './file.js'; import config from './config.js'; diff --git a/lib/util/util.js b/lib/util/util.js index 5c03cbccf..75347530e 100644 --- a/lib/util/util.js +++ b/lib/util/util.js @@ -1,6 +1,6 @@ 'use strict'; -// import TYPE from '../../types/mcdev.d.js'; +import TYPE from '../../types/mcdev.d.js'; import MetadataDefinitions from './../MetadataTypeDefinitions.js'; import packageJsonMcdev from '../../package.json' assert { type: 'json' }; import process from 'node:process'; From 1110982fd947458c6afdfcc389224fbe86627229 Mon Sep 17 00:00:00 2001 From: Douglas Midgley Date: Mon, 15 May 2023 23:51:03 +0200 Subject: [PATCH 07/17] #354: Run, but test failure --- docs/dist/documentation.md | 414 +---------------- jsconfig.json | 6 +- lib/util/file.js | 22 +- lib/util/util.js | 40 +- package-lock.json | 793 +++++++++++++++++++------------- package.json | 30 +- test/dataExtension.test.js | 6 +- test/general.test.js | 4 +- test/journey.test.js | 6 +- test/mobileKeyword.test.js | 6 +- test/mobileMessage.test.js | 6 +- test/query.test.js | 6 +- test/resourceFactory.js | 12 +- test/transactionalEmail.test.js | 6 +- test/transactionalPush.test.js | 6 +- test/transactionalSMS.test.js | 6 +- test/user.test.js | 6 +- test/utils.js | 104 ++--- types/mcdev.d.js | 4 +- 19 files changed, 589 insertions(+), 894 deletions(-) diff --git a/docs/dist/documentation.md b/docs/dist/documentation.md index d3943772c..6d8617642 100644 --- a/docs/dist/documentation.md +++ b/docs/dist/documentation.md @@ -134,18 +134,9 @@ Provides default functionality that can be overwritten by child metadata type cl ## Constants
-
Util
-

CLI entry for SFMC DevTools

-
-
MetadataTypeDefinitions
-

Provides access to all metadataType classes

-
MetadataTypeInfo

Provides access to all metadataType classes

-
mcdev
-

sample file on how to retrieve a simple changelog to use in GUIs or automated processing of any kind

-
BusinessUnit

Helper that handles retrieval of BU info

@@ -5728,404 +5719,12 @@ helper for [retrieve](retrieve) to get all dependencies of the given types | --- | --- | --- | | metadataTypes | Array.<TYPE.SupportedMetadataTypes> | list of metadata types to retrieve; can include subtypes! | - - -## Util -CLI entry for SFMC DevTools - -**Kind**: global constant - -* [Util](#Util) - * [.skipInteraction](#Util.skipInteraction) : TYPE.skipInteraction - * [.logger](#Util.logger) : TYPE.Logger - * [.filterObjByKeys(originalObj, [whitelistArr])](#Util.filterObjByKeys) ⇒ Object.<string, \*> - * [.includesStartsWith(arr, search)](#Util.includesStartsWith) ⇒ boolean - * [.includesStartsWithIndex(arr, search)](#Util.includesStartsWithIndex) ⇒ number - * [.checkMarket(market, properties)](#Util.checkMarket) ⇒ boolean - * [.verifyMarketList(mlName, properties)](#Util.verifyMarketList) ⇒ void - * [.signalFatalError()](#Util.signalFatalError) ⇒ void - * [.isTrue(attrValue)](#Util.isTrue) ⇒ boolean - * [.isFalse(attrValue)](#Util.isFalse) ⇒ boolean - * [._isValidType(selectedType, [handleOutside])](#Util._isValidType) ⇒ boolean - * [.getTypeAndSubType(selectedType)](#Util.getTypeAndSubType) ⇒ Array.<string> - * [.getRetrieveTypeChoices()](#Util.getRetrieveTypeChoices) ⇒ Array.<TYPE.SupportedMetadataTypes> - * [.metadataLogger(level, type, method, payload, [source])](#Util.metadataLogger) ⇒ void - * [.replaceByObject(str, obj)](#Util.replaceByObject) ⇒ string \| object - * [.inverseGet(objs, val)](#Util.inverseGet) ⇒ string - * [.getMetadataHierachy(metadataTypes)](#Util.getMetadataHierachy) ⇒ Object.<string, Array.<string>> - * [.resolveObjPath(path, obj)](#Util.resolveObjPath) ⇒ any - * [.execSync(cmd, [args], [hideOutput])](#Util.execSync) ⇒ string - * [.templateSearchResult(results, keyToSearch, searchValue)](#Util.templateSearchResult) ⇒ TYPE.MetadataTypeItem - * [.setLoggingLevel(argv)](#Util.setLoggingLevel) ⇒ void - * [.logBeta(type)](#Util.logBeta) - * [.getGrayMsg(msg)](#Util.getGrayMsg) ⇒ string - * [.logSubtypes(subTypeArr)](#Util.logSubtypes) ⇒ void - * [.getKeysString(keyArr, [isId])](#Util.getKeysString) ⇒ string - * [.sleep(ms)](#Util.sleep) ⇒ Promise.<void> - * [.getSsjs(code)](#Util.getSsjs) ⇒ string - - - -### Util.skipInteraction : TYPE.skipInteraction -**Kind**: static property of [Util](#Util) - - -### Util.logger : TYPE.Logger -Logger that creates timestamped log file in 'logs/' directory - -**Kind**: static property of [Util](#Util) - - -### Util.filterObjByKeys(originalObj, [whitelistArr]) ⇒ Object.<string, \*> -helper that allows filtering an object by its keys - -**Kind**: static method of [Util](#Util) -**Returns**: Object.<string, \*> - filtered object that only contains keys you provided - -| Param | Type | Description | -| --- | --- | --- | -| originalObj | Object.<string, \*> | object that you want to filter | -| [whitelistArr] | Array.<string> | positive filter. if not provided, returns originalObj without filter | - - - -### Util.includesStartsWith(arr, search) ⇒ boolean -extended Array.includes method that allows check if an array-element starts with a certain string - -**Kind**: static method of [Util](#Util) -**Returns**: boolean - found / not found - -| Param | Type | Description | -| --- | --- | --- | -| arr | Array.<string> | your array of strigns | -| search | string | the string you are looking for | - - - -### Util.includesStartsWithIndex(arr, search) ⇒ number -extended Array.includes method that allows check if an array-element starts with a certain string - -**Kind**: static method of [Util](#Util) -**Returns**: number - array index 0..n or -1 of not found - -| Param | Type | Description | -| --- | --- | --- | -| arr | Array.<string> | your array of strigns | -| search | string | the string you are looking for | - - - -### Util.checkMarket(market, properties) ⇒ boolean -check if a market name exists in current mcdev config - -**Kind**: static method of [Util](#Util) -**Returns**: boolean - found market or not - -| Param | Type | Description | -| --- | --- | --- | -| market | string | market localizations | -| properties | TYPE.Mcdevrc | local mcdev config | - - - -### Util.verifyMarketList(mlName, properties) ⇒ void -ensure provided MarketList exists and it's content including markets and BUs checks out - -**Kind**: static method of [Util](#Util) -**Returns**: void - throws errors if problems were found - -| Param | Type | Description | -| --- | --- | --- | -| mlName | string | name of marketList | -| properties | TYPE.Mcdevrc | General configuration to be used in retrieve | - - - -### Util.signalFatalError() ⇒ void -used to ensure the program tells surrounding software that an unrecoverable error occured - -**Kind**: static method of [Util](#Util) - - -### Util.isTrue(attrValue) ⇒ boolean -SFMC accepts multiple true values for Boolean attributes for which we are checking here - -**Kind**: static method of [Util](#Util) -**Returns**: boolean - attribute value == true ? true : false - -| Param | Type | Description | -| --- | --- | --- | -| attrValue | \* | value | - - - -### Util.isFalse(attrValue) ⇒ boolean -SFMC accepts multiple false values for Boolean attributes for which we are checking here - -**Kind**: static method of [Util](#Util) -**Returns**: boolean - attribute value == false ? true : false - -| Param | Type | Description | -| --- | --- | --- | -| attrValue | \* | value | - - - -### Util.\_isValidType(selectedType, [handleOutside]) ⇒ boolean -helper for [retrieve](#Mcdev.retrieve), [retrieveAsTemplate](#Mcdev.retrieveAsTemplate) and [deploy](#Mcdev.deploy) - -**Kind**: static method of [Util](#Util) -**Returns**: boolean - type ok or not - -| Param | Type | Description | -| --- | --- | --- | -| selectedType | TYPE.SupportedMetadataTypes | type or type-subtype | -| [handleOutside] | boolean | if the API reponse is irregular this allows you to handle it outside of this generic method | - - - -### Util.getTypeAndSubType(selectedType) ⇒ Array.<string> -helper that deals with extracting type and subtype - -**Kind**: static method of [Util](#Util) -**Returns**: Array.<string> - first elem is type, second elem is subType - -| Param | Type | Description | -| --- | --- | --- | -| selectedType | string | "type" or "type-subtype" | - - - -### Util.getRetrieveTypeChoices() ⇒ Array.<TYPE.SupportedMetadataTypes> -helper for getDefaultProperties() - -**Kind**: static method of [Util](#Util) -**Returns**: Array.<TYPE.SupportedMetadataTypes> - type choices - - -### Util.metadataLogger(level, type, method, payload, [source]) ⇒ void -Logger helper for Metadata functions - -**Kind**: static method of [Util](#Util) - -| Param | Type | Description | -| --- | --- | --- | -| level | string | of log (error, info, warn) | -| type | string | of metadata being referenced | -| method | string | name which log was called from | -| payload | \* | generic object which details the error | -| [source] | string | key/id of metadata which relates to error | - - - -### Util.replaceByObject(str, obj) ⇒ string \| object -replaces values in a JSON object string, based on a series of -key-value pairs (obj) - -**Kind**: static method of [Util](#Util) -**Returns**: string \| object - replaced version of str - -| Param | Type | Description | -| --- | --- | --- | -| str | string \| object | JSON object or its stringified version, which has values to be replaced | -| obj | TYPE.TemplateMap | key value object which contains keys to be replaced and values to be replaced with | - - - -### Util.inverseGet(objs, val) ⇒ string -get key of an object based on the first matching value - -**Kind**: static method of [Util](#Util) -**Returns**: string - key - -| Param | Type | Description | -| --- | --- | --- | -| objs | object | object of objects to be searched | -| val | string | value to be searched for | - - - -### Util.getMetadataHierachy(metadataTypes) ⇒ Object.<string, Array.<string>> -Returns Order in which metadata needs to be retrieved/deployed - -**Kind**: static method of [Util](#Util) -**Returns**: Object.<string, Array.<string>> - retrieve/deploy order as array - -| Param | Type | Description | -| --- | --- | --- | -| metadataTypes | Array.<string> | which should be retrieved/deployed | - - - -### Util.resolveObjPath(path, obj) ⇒ any -let's you dynamically walk down an object and get a value - -**Kind**: static method of [Util](#Util) -**Returns**: any - value of obj.path - -| Param | Type | Description | -| --- | --- | --- | -| path | string | 'fieldA.fieldB.fieldC' | -| obj | object | some parent object | - - - -### Util.execSync(cmd, [args], [hideOutput]) ⇒ string -helper to run other commands as if run manually by user - -**Kind**: static method of [Util](#Util) -**Returns**: string - output of command if hideOutput is true - -| Param | Type | Description | -| --- | --- | --- | -| cmd | string | to be executed command | -| [args] | Array.<string> | list of arguments | -| [hideOutput] | boolean | if true, output of command will be hidden from CLI | - - - -### Util.templateSearchResult(results, keyToSearch, searchValue) ⇒ TYPE.MetadataTypeItem -standardize check to ensure only one result is returned from template search - -**Kind**: static method of [Util](#Util) -**Returns**: TYPE.MetadataTypeItem - metadata to be used in building template - -| Param | Type | Description | -| --- | --- | --- | -| results | Array.<TYPE.MetadataTypeItem> | array of metadata | -| keyToSearch | string | the field which contains the searched value | -| searchValue | string | the value which is being looked for | - - - -### Util.setLoggingLevel(argv) ⇒ void -configures what is displayed in the console - -**Kind**: static method of [Util](#Util) - -| Param | Type | Description | -| --- | --- | --- | -| argv | object | list of command line parameters given by user | -| [argv.silent] | boolean | only errors printed to CLI | -| [argv.verbose] | boolean | chatty user CLI output | -| [argv.debug] | boolean | enables developer output & features | - - - -### Util.logBeta(type) -outputs a warning that the given type is still in beta - -**Kind**: static method of [Util](#Util) - -| Param | Type | Description | -| --- | --- | --- | -| type | string | api name of the type thats in beta | - - - -### Util.getGrayMsg(msg) ⇒ string -helper that wraps a message in the correct color codes to have them printed gray - -**Kind**: static method of [Util](#Util) -**Returns**: string - gray msg - -| Param | Type | Description | -| --- | --- | --- | -| msg | string | log message that should be wrapped with color codes | - - - -### Util.logSubtypes(subTypeArr) ⇒ void -helper to print the subtypes we filtered by - -**Kind**: static method of [Util](#Util) - -| Param | Type | Description | -| --- | --- | --- | -| subTypeArr | Array.<string> | list of subtypes to be printed | - - - -### Util.getKeysString(keyArr, [isId]) ⇒ string -helper to print the subtypes we filtered by - -**Kind**: static method of [Util](#Util) -**Returns**: string - string to be appended to log message - -| Param | Type | Description | -| --- | --- | --- | -| keyArr | Array.<string> \| string | list of subtypes to be printed | -| [isId] | boolean | optional flag to indicate if key is an id | - - - -### Util.sleep(ms) ⇒ Promise.<void> -pause execution of code; useful when multiple server calls are dependent on each other and might not be executed right away - -**Kind**: static method of [Util](#Util) -**Returns**: Promise.<void> - - promise to wait for - -| Param | Type | Description | -| --- | --- | --- | -| ms | number | time in miliseconds to wait | - - - -### Util.getSsjs(code) ⇒ string -helper for [_extractCode](#Asset._extractCode) and [prepExtractedCode](#Script.prepExtractedCode) to determine if a code block is a valid SSJS block - -**Kind**: static method of [Util](#Util) -**Returns**: string - the SSJS code if code block is a valid SSJS block, otherwise null - -| Param | Type | Description | -| --- | --- | --- | -| code | string | code block to check | - -**Example** -```js -the following is invalid: - - - - the following is valid: - -``` - - -## MetadataTypeDefinitions -Provides access to all metadataType classes - -**Kind**: global constant ## MetadataTypeInfo Provides access to all metadataType classes **Kind**: global constant - - -## mcdev -sample file on how to retrieve a simple changelog to use in GUIs or automated processing of any kind - -**Kind**: global constant -**Example** -```js -[{ - name: 'deName', - key: 'deKey', - t: 'dataExtension', - cd: '2020-05-06T00:16:00.737', - cb: 'name of creator', - ld: '2020-05-06T00:16:00.737', - lb: 'name of lastmodified' - }] -``` ## BusinessUnit @@ -6552,8 +6151,7 @@ Saves json content to a file in the local file system. Will create the parent di ### File.writePrettyToFile(directory, filename, filetype, content, [templateVariables]) ⇒ Promise.<boolean> -Saves beautified files in the local file system. Will create the parent directory if it does not exist -! Important: run 'await File.initPrettier()' in your MetadataType.retrieve() once before hitting this +Saves beautified files in the local file system. Will create the parent directory if it does not exist ! Important: run 'await File.initPrettier()' in your MetadataType.retrieve() once before hitting this **Kind**: static method of [File](#File) **Returns**: Promise.<boolean> - Promise @@ -6581,8 +6179,7 @@ helper for [writePrettyToFile](#File.writePrettyToFile), applying beautyAmp onto ### File.\_beautify\_prettier(directory, filename, filetype, content) ⇒ string -helper for [writePrettyToFile](#File.writePrettyToFile), applying prettier onto given stringified content -! Important: run 'await File.initPrettier()' in your MetadataType.retrieve() once before hitting this +helper for [writePrettyToFile](#File.writePrettyToFile), applying prettier onto given stringified content ! Important: run 'await File.initPrettier()' in your MetadataType.retrieve() once before hitting this **Kind**: static method of [File](#File) **Returns**: string - original string on error; formatted string on success @@ -6643,8 +6240,7 @@ reads file from local file system. ### File.readDirectories(directory, depth, [includeStem], [_stemLength]) ⇒ Promise.<Array.<string>> -reads directories to a specific depth returning an array -of file paths to be iterated over +reads directories to a specific depth returning an array of file paths to be iterated over **Kind**: static method of [File](#File) **Returns**: Promise.<Array.<string>> - array of fully defined file paths @@ -6663,9 +6259,7 @@ of file paths to be iterated over ### File.readDirectoriesSync(directory, [depth], [includeStem], [_stemLength]) ⇒ Array.<string> \| void -reads directories to a specific depth returning an array -of file paths to be iterated over using sync api (required in constructors) -TODO - merge with readDirectories. so far the logic is really different +reads directories to a specific depth returning an array of file paths to be iterated over using sync api (required in constructors) TODO - merge with readDirectories. so far the logic is really different **Kind**: static method of [File](#File) **Returns**: Array.<string> \| void - array of fully defined file paths; void on error diff --git a/jsconfig.json b/jsconfig.json index fa25a623b..55b6aa9c4 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,3 +1,7 @@ { - "include": ["lib/**/*.js", "types/**/*.js"] + "include": ["lib/**/*.js", "types/**/*.js", "test/**/*.js"], + "compilerOptions": { + "module": "es6", + "target": "esnext" + } } diff --git a/lib/util/file.js b/lib/util/file.js index 9a6e75012..2b90dd9cd 100644 --- a/lib/util/file.js +++ b/lib/util/file.js @@ -3,7 +3,7 @@ import TYPE from '../../types/mcdev.d.js'; import fs from 'fs-extra'; -import packageJson from '../../package.json' assert { type: 'json' }; + import path from 'node:path'; import prettier from 'prettier'; import beautyAmp from 'beauty-amp-core'; @@ -12,7 +12,7 @@ import updateNotifier from 'update-notifier'; // inform user when there is an update const notifier = updateNotifier({ - pkg: packageJson, + pkg: Util.packageJsonMcdev, updateCheckInterval: 1000 * 3600 * 24, // once per day }); // Notify using the built-in convenience method @@ -24,7 +24,6 @@ notifier.notify(); const File = { /** * copies a file from one path to another - * * @param {string} from - full filepath including name of existing file * @param {string} to - full filepath including name where file should go * @returns {object} - results object @@ -46,7 +45,6 @@ const File = { }, /** * makes sure Windows accepts path names - * * @param {string} path - filename or path * @returns {string} - corrected string */ @@ -83,7 +81,6 @@ const File = { /** * makes sure Windows accepts file names - * * @param {string} filename - filename or path * @returns {string} - corrected string */ @@ -114,7 +111,6 @@ const File = { /** * makes sure Windows accepts file names - * * @param {string} filename - filename or path * @returns {string} - corrected string */ @@ -124,7 +120,6 @@ const File = { /** * Takes various types of path strings and formats into a platform specific path - * * @param {string|string[]} denormalizedPath directory the file will be written to * @returns {string} Path strings */ @@ -141,7 +136,6 @@ const File = { }, /** * Saves json content to a file in the local file system. Will create the parent directory if it does not exist - * * @param {string|string[]} directory directory the file will be written to * @param {string} filename name of the file without '.json' ending * @param {object} content filecontent @@ -160,7 +154,6 @@ const File = { /** * Saves beautified files in the local file system. Will create the parent directory if it does not exist * ! Important: run 'await File.initPrettier()' in your MetadataType.retrieve() once before hitting this - * * @param {string|string[]} directory directory the file will be written to * @param {string} filename name of the file without suffix * @param {string} filetype filetype ie. JSON or SSJS @@ -180,7 +173,6 @@ 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 */ @@ -213,7 +205,6 @@ const File = { /** * helper for {@link File.writePrettyToFile}, applying prettier onto given stringified content * ! Important: run 'await File.initPrettier()' in your MetadataType.retrieve() once before hitting this - * * @param {string|string[]} directory directory the file will be written to * @param {string} filename name of the file without suffix * @param {string} filetype filetype ie. JSON or SSJS @@ -313,7 +304,6 @@ const File = { }, /** * Saves text content to a file in the local file system. Will create the parent directory if it does not exist - * * @param {string|string[]} directory directory the file will be written to * @param {string} filename name of the file without '.json' ending * @param {string} filetype filetype suffix @@ -341,7 +331,6 @@ const File = { /** * Saves json content to a file in the local file system. Will create the parent directory if it does not exist - * * @param {string | string[]} directory directory where the file is stored * @param {string} filename name of the file without '.json' ending * @param {boolean} sync should execute sync (default is async) @@ -377,7 +366,6 @@ const File = { }, /** * reads file from local file system. - * * @param {string | string[]} directory directory where the file is stored * @param {string} filename name of the file without '.json' ending * @param {string} filetype filetype suffix @@ -396,7 +384,6 @@ const File = { /** * reads directories to a specific depth returning an array * of file paths to be iterated over - * * @example ['deploy/mcdev/bu1'] * @param {string} directory directory to checkin * @param {number} depth how many levels to check (1 base) @@ -451,7 +438,6 @@ const File = { * reads directories to a specific depth returning an array * of file paths to be iterated over using sync api (required in constructors) * TODO - merge with readDirectories. so far the logic is really different - * * @example ['deploy/mcdev/bu1'] * @param {string} directory directory to checkin * @param {number} [depth] how many levels to check (1 base) @@ -500,20 +486,18 @@ const File = { }, /** * helper that splits the config back into auth & config parts to save them separately - * * @param {TYPE.Mcdevrc} properties central properties object * @returns {Promise.} - */ async saveConfigFile(properties) { // we want to save to save the full version here to allow us to upgrade configs properly in the future - properties.version = packageJson.version; + properties.version = Util.packageJsonMcdev.version; await this.writeJSONToFile('', Util.configFileName.split('.json')[0], properties); Util.logger.info(`✔️ ${Util.configFileName} and ${Util.authFileName} saved successfully`); }, /** * Initalises Prettier formatting lib async. - * * @param {string} [filetype='html'] filetype ie. JSON or SSJS * @returns {Promise.} success of config load */ diff --git a/lib/util/util.js b/lib/util/util.js index 75347530e..d8da403ce 100644 --- a/lib/util/util.js +++ b/lib/util/util.js @@ -2,11 +2,15 @@ import TYPE from '../../types/mcdev.d.js'; import MetadataDefinitions from './../MetadataTypeDefinitions.js'; -import packageJsonMcdev from '../../package.json' assert { type: 'json' }; import process from 'node:process'; import toposort from 'toposort'; import winston from 'winston'; import child_process from 'node:child_process'; +import path from 'node:path'; +// import just to resolve cyclical - TO DO consider if could move to file or context +import { readJsonSync } from 'fs-extra/esm'; +import { fileURLToPath } from 'node:url'; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); /** * Util that contains logger and simple util methods @@ -19,11 +23,10 @@ export const Util = { standardizedSplitChar: '/', /** @type {TYPE.skipInteraction} */ skipInteraction: false, - packageJsonMcdev: packageJsonMcdev, + packageJsonMcdev: readJsonSync(path.join(__dirname, '../../package.json')), OPTIONS: {}, /** * helper that allows filtering an object by its keys - * * @param {Object.} originalObj object that you want to filter * @param {string[]} [whitelistArr] positive filter. if not provided, returns originalObj without filter * @returns {Object.} filtered object that only contains keys you provided @@ -41,7 +44,6 @@ export const Util = { }, /** * extended Array.includes method that allows check if an array-element starts with a certain string - * * @param {string[]} arr your array of strigns * @param {string} search the string you are looking for * @returns {boolean} found / not found @@ -51,7 +53,6 @@ export const Util = { }, /** * extended Array.includes method that allows check if an array-element starts with a certain string - * * @param {string[]} arr your array of strigns * @param {string} search the string you are looking for * @returns {number} array index 0..n or -1 of not found @@ -61,7 +62,6 @@ export const Util = { }, /** * check if a market name exists in current mcdev config - * * @param {string} market market localizations * @param {TYPE.Mcdevrc} properties local mcdev config * @returns {boolean} found market or not @@ -81,7 +81,6 @@ export const Util = { }, /** * ensure provided MarketList exists and it's content including markets and BUs checks out - * * @param {string} mlName name of marketList * @param {TYPE.Mcdevrc} properties General configuration to be used in retrieve * @returns {void} throws errors if problems were found @@ -126,7 +125,6 @@ export const Util = { }, /** * used to ensure the program tells surrounding software that an unrecoverable error occured - * * @returns {void} */ signalFatalError() { @@ -135,7 +133,6 @@ export const Util = { }, /** * SFMC accepts multiple true values for Boolean attributes for which we are checking here - * * @param {*} attrValue value * @returns {boolean} attribute value == true ? true : false */ @@ -144,7 +141,6 @@ export const Util = { }, /** * SFMC accepts multiple false values for Boolean attributes for which we are checking here - * * @param {*} attrValue value * @returns {boolean} attribute value == false ? true : false */ @@ -153,7 +149,6 @@ export const Util = { }, /** * helper for {@link Mcdev.retrieve}, {@link Mcdev.retrieveAsTemplate} and {@link Mcdev.deploy} - * * @param {TYPE.SupportedMetadataTypes} selectedType type or type-subtype * @param {boolean} [handleOutside] if the API reponse is irregular this allows you to handle it outside of this generic method * @returns {boolean} type ok or not @@ -180,7 +175,6 @@ export const Util = { /** * helper that deals with extracting type and subtype - * * @param {string} selectedType "type" or "type-subtype" * @returns {string[]} first elem is type, second elem is subType */ @@ -197,7 +191,6 @@ export const Util = { /** * helper for getDefaultProperties() - * * @returns {TYPE.SupportedMetadataTypes[]} type choices */ getRetrieveTypeChoices() { @@ -230,14 +223,12 @@ export const Util = { loggerTransports: null, /** * Logger that creates timestamped log file in 'logs/' directory - * * @type {TYPE.Logger} */ logger: null, restartLogger: startLogger, /** * Logger helper for Metadata functions - * * @param {string} level of log (error, info, warn) * @param {string} type of metadata being referenced * @param {string} method name which log was called from @@ -264,7 +255,6 @@ export const Util = { /** * replaces values in a JSON object string, based on a series of * key-value pairs (obj) - * * @param {string | object} str JSON object or its stringified version, which has values to be replaced * @param {TYPE.TemplateMap} obj key value object which contains keys to be replaced and values to be replaced with * @returns {string | object} replaced version of str @@ -297,7 +287,6 @@ export const Util = { }, /** * get key of an object based on the first matching value - * * @param {object} objs object of objects to be searched * @param {string} val value to be searched for * @returns {string} key @@ -313,7 +302,6 @@ export const Util = { /** * Returns Order in which metadata needs to be retrieved/deployed - * * @param {string[]} metadataTypes which should be retrieved/deployed * @returns {Object.} retrieve/deploy order as array */ @@ -401,7 +389,6 @@ export const Util = { /** * let's you dynamically walk down an object and get a value - * * @param {string} path 'fieldA.fieldB.fieldC' * @param {object} obj some parent object * @returns {any} value of obj.path @@ -411,7 +398,6 @@ export const Util = { }, /** * helper to run other commands as if run manually by user - * * @param {string} cmd to be executed command * @param {string[]} [args] list of arguments * @param {boolean} [hideOutput] if true, output of command will be hidden from CLI @@ -436,7 +422,6 @@ export const Util = { }, /** * standardize check to ensure only one result is returned from template search - * * @param {TYPE.MetadataTypeItem[]} results array of metadata * @param {string} keyToSearch the field which contains the searched value * @param {string} searchValue the value which is being looked for @@ -457,7 +442,6 @@ export const Util = { }, /** * configures what is displayed in the console - * * @param {object} argv list of command line parameters given by user * @param {boolean} [argv.silent] only errors printed to CLI * @param {boolean} [argv.verbose] chatty user CLI output @@ -496,7 +480,6 @@ export const Util = { }, /** * outputs a warning that the given type is still in beta - * * @param {string} type api name of the type thats in beta */ logBeta(type) { @@ -536,7 +519,6 @@ export const Util = { }, /** * helper that wraps a message in the correct color codes to have them printed gray - * * @param {string} msg log message that should be wrapped with color codes * @returns {string} gray msg */ @@ -545,7 +527,6 @@ export const Util = { }, /** * helper to print the subtypes we filtered by - * * @param {string[]} subTypeArr list of subtypes to be printed * @returns {void} */ @@ -560,7 +541,6 @@ export const Util = { }, /** * helper to print the subtypes we filtered by - * * @param {string[] | string} keyArr list of subtypes to be printed * @param {boolean} [isId] optional flag to indicate if key is an id * @returns {string} string to be appended to log message @@ -582,7 +562,6 @@ export const Util = { }, /** * pause execution of code; useful when multiple server calls are dependent on each other and might not be executed right away - * * @param {number} ms time in miliseconds to wait * @returns {Promise.} - promise to wait for */ @@ -593,7 +572,6 @@ export const Util = { }, /** * 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: *