mcdev 6.0.2 → 7.0.0

package/lib/metadataTypes/AttributeGroup.js

@@ -1,10 +1,14 @@
 'use strict';
 
 import MetadataType from './MetadataType.js';
-import TYPE from '../../types/mcdev.d.js';
 import { Util } from '../util/util.js';
 import cache from '../util/cache.js';
 
+/**
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItem} MetadataTypeItem
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeMapObj} MetadataTypeMapObj
+ */
+
 /**
  * AttributeGroup MetadataType
  *
@@ -15,10 +19,10 @@ class AttributeGroup extends MetadataType {
      * Retrieves Metadata of schema attribute groups.
      *
      * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
-     * @param {void} [_] unused parameter
-     * @param {void} [__] unused parameter
+     * @param {void | string[]} [_] unused parameter
+     * @param {void | string[]} [__] unused parameter
      * @param {string} [key] customer key of single item to retrieve
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of metadata
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static async retrieve(retrieveDir, _, __, key) {
         return super.retrieveREST(
@@ -31,7 +35,7 @@ class AttributeGroup extends MetadataType {
     /**
      * Retrieves Metadata of schema attribute groups for caching.
      *
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise of metadata
+     * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static retrieveForCache() {
         return super.retrieveREST(null, '/hub/v1/contacts/schema/attributeGroups');
@@ -40,15 +44,15 @@ class AttributeGroup extends MetadataType {
     /**
      * manages post retrieve steps
      *
-     * @param {TYPE.MetadataTypeItem} metadata a single metadata
-     * @returns {TYPE.MetadataTypeItem} metadata
+     * @param {MetadataTypeItem} metadata a single metadata
+     * @returns {MetadataTypeItem} metadata
      */
     static postRetrieveTasks(metadata) {
         // Member ID
         delete metadata.mID;
 
         // attributeSet
-        metadata.attributeSetIdentifiers = metadata.attributeSetIdentifiers.map((attributeSet) => {
+        metadata.r__attributeSet_key = metadata.attributeSetIdentifiers.map((attributeSet) => {
             try {
                 const key = cache.searchForField(
                     'attributeSet',
@@ -57,8 +61,8 @@ class AttributeGroup extends MetadataType {
                     'definitionKey'
                 );
                 if (key !== attributeSet.definitionKey) {
-                    throw new Error(
-                        `AttributeSet key mismatch. Found ${key} instead of ${attributeSet.definitionKey}`
+                    Util.logger.debug(
+                        `AttributeSet key mismatch. Overwriting ${attributeSet.definitionKey} with ${key}`
                     );
                 }
                 return key;
@@ -71,6 +75,7 @@ class AttributeGroup extends MetadataType {
                 return attributeSet;
             }
         });
+        delete metadata.attributeSetIdentifiers;
 
         // requiredRelationships
         // TODO: implement
@@ -105,8 +110,8 @@ class AttributeGroup extends MetadataType {
     /**
      * prepares for deployment
      *
-     * @param {TYPE.MetadataTypeItem} metadata a single item
-     * @returns {TYPE.MetadataTypeItem} Promise
+     * @param {MetadataTypeItem} metadata a single item
+     * @returns {MetadataTypeItem} Promise
      */
 }
 

package/lib/metadataTypes/AttributeSet.js

@@ -2,24 +2,30 @@
 
 import AttributeGroup from './AttributeGroup.js';
 import MetadataType from './MetadataType.js';
-import TYPE from '../../types/mcdev.d.js';
 import { Util } from '../util/util.js';
 import cache from '../util/cache.js';
 
+/**
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeItem} MetadataTypeItem
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeMap} MetadataTypeMap
+ * @typedef {import('../../types/mcdev.d.js').MetadataTypeMapObj} MetadataTypeMapObj
+ */
+
 /**
  * AttributeSet MetadataType
  *
  * @augments MetadataType
  */
 class AttributeSet extends MetadataType {
+    static systemValueDefinitions;
     /**
      * Retrieves Metadata of schema set Definitions.
      *
      * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
-     * @param {void} [_] unused parameter
-     * @param {void} [__] unused parameter
+     * @param {void | string[]} [_] unused parameter
+     * @param {void | string[]} [__] unused parameter
      * @param {string} [key] customer key of single item to retrieve
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise
+     * @returns {Promise.<MetadataTypeMapObj>} Promise
      */
     static async retrieve(retrieveDir, _, __, key) {
         if (retrieveDir && !cache.getCache()?.attributeGroup) {
@@ -36,7 +42,7 @@ class AttributeSet extends MetadataType {
     /**
      * Retrieves Metadata of schema set definitions for caching.
      *
-     * @returns {Promise.<TYPE.MetadataTypeMapObj>} Promise
+     * @returns {Promise.<MetadataTypeMapObj>} Promise
      */
     static retrieveForCache() {
         return super.retrieveREST(null, '/hub/v1/contacts/schema/setDefinitions');
@@ -150,8 +156,8 @@ class AttributeSet extends MetadataType {
      * Builds map of metadata entries mapped to their keyfields
      *
      * @param {object} body json of response body
-     * @param {string|number} [singleRetrieve] key of single item to filter by
-     * @returns {TYPE.MetadataTypeMap} keyField => metadata map
+     * @param {string} [singleRetrieve] key of single item to filter by
+     * @returns {MetadataTypeMap} keyField => metadata map
      */
     static parseResponseBody(body, singleRetrieve) {
         const metadataCache = super.parseResponseBody(body);
@@ -167,8 +173,8 @@ class AttributeSet extends MetadataType {
     /**
      * manages post retrieve steps
      *
-     * @param {TYPE.MetadataTypeItem} metadata a single metadata
-     * @returns {TYPE.MetadataTypeItem} metadata
+     * @param {MetadataTypeItem} metadata a single metadata
+     * @returns {MetadataTypeItem} metadata
      */
     static postRetrieveTasks(metadata) {
         // folder
@@ -183,7 +189,7 @@ class AttributeSet extends MetadataType {
             case 'DataExtension': {
                 // shared / local DEs
                 try {
-                    metadata.r__dataExtension_CustomerKey = cache.searchForField(
+                    metadata.r__dataExtension_key = cache.searchForField(
                         'dataExtension',
                         metadata.storageReferenceID.value,
                         'ObjectID',
@@ -238,7 +244,7 @@ class AttributeSet extends MetadataType {
                     switch (relationship[type + 'Item'].relationshipType) {
                         case 'AttributeGroup': {
                             try {
-                                relationship[type + 'Item'].r__attributeGroup_definitionKey =
+                                relationship[type + 'Item'].r__attributeGroup_key =
                                     cache.searchForField(
                                         'attributeGroup',
                                         relationship[type + 'Item']?.identifier,
@@ -261,7 +267,7 @@ class AttributeSet extends MetadataType {
                         }
                         case 'AttributeSet': {
                             try {
-                                relationship[type + 'Item'].r__attributeSet_definitionKey =
+                                relationship[type + 'Item'].r__attributeSet_key =
                                     cache.searchForField(
                                         'attributeSet',
                                         relationship[type + 'Item']?.identifier,
@@ -273,13 +279,12 @@ class AttributeSet extends MetadataType {
                                 // get relationship fieldnames
                                 // check if its a self-reference to metadata.valueDefinitions or if it's a reference to another attributeSet
                                 relationshipObj =
-                                    relationship[type + 'Item'].r__attributeSet_definitionKey ===
+                                    relationship[type + 'Item'].r__attributeSet_key ===
                                     metadata.definitionKey
                                         ? metadata
                                         : cache.getByKey(
                                               'attributeSet',
-                                              relationship[type + 'Item']
-                                                  .r__attributeSet_definitionKey
+                                              relationship[type + 'Item'].r__attributeSet_key
                                           );
                             } catch (ex) {
                                 Util.logger.warn(