@contrail/cli 2.2.4 → 2.2.6

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.2.4 darwin-arm64 node-v18.13.0
+@contrail/cli/2.2.6 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/commands/types/getAll.js

@@ -131,7 +131,8 @@ function reduceTypePropertyPolicyLinks(data) {
         const typePropertySlug = (_a = typeProperties.find((y) => y.id === x.typePropertyId)) === null || _a === void 0 ? void 0 : _a.slug;
         const typePropertyPolicyIdentifier = (_b = data.typePropertyPolicies.find((y) => y.id === x.typePropertyPolicyId)) === null || _b === void 0 ? void 0 : _b.identifier;
         if (!typeSlug || !typePropertySlug || !typePropertyPolicyIdentifier) {
-            logger_1.default.warn(`Could not reduce bad type property policy link... skipping ${x}`);
+            logger_1.default.debug(`typeSlug: ${typeSlug} typePropertySlug: ${typePropertySlug}, typePropertyPolicyIdentifier: ${typePropertyPolicyIdentifier} `);
+            logger_1.default.warn(`Could not reduce bad type property policy link... skipping ${JSON.stringify(x, null, 2)}`);
             return null;
         }
         return {
@@ -325,6 +326,8 @@ function reduceTypes(dataHolder) {
                 referencedTypeRootSlug: typeProperty.referencedTypeRootSlug,
                 defaultValue: typeProperty.defaultValue,
                 propertyLevel: typeProperty.propertyLevel,
+                carryOverBehavior: typeProperty.carryOverBehavior,
+                carryOverDefault: typeProperty.carryOverDefault,
                 inherited: typeProperty.inherited,
                 formulaFunction: typeProperty.formulaFunction,
                 validationFunction: typeProperty.validationFunction,

package/dist/commands/types/mergeOptionSets.js

@@ -94,7 +94,7 @@ function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
     var _a;
     const merged = {
         name: uploadedOptionSet.name,
-        identifier: uploadedOptionSet.identifier,
+        slug: uploadedOptionSet.slug,
         optionSet: uploadedOptionSet.optionSet,
         isArchived: uploadedOptionSet.isArchived,
     };

package/dist/commands/types/uploadOptionSetHierarchies.js

@@ -78,28 +78,28 @@ async function uploadOSH(loadedOSHs) {
     const currentOSHs = await new sdk_1.Entities().get({
         entityName: 'option-set-hierarchy',
     });
-    const optionSetsByName = {};
+    const optionSetsByIdentifier = {};
     for (const optionSet of optionSets) {
-        optionSetsByName[optionSet.name] = optionSet;
+        optionSetsByIdentifier[optionSet.identifier] = optionSet;
     }
-    const currentOSHByName = {};
+    const currentOSHByIdentifier = {};
     for (const currentOSH of currentOSHs) {
-        currentOSHByName[currentOSH.name] = currentOSH;
+        currentOSHByIdentifier[currentOSH.identifier] = currentOSH;
     }
-    const loadedOSHByName = {};
+    const loadedOSHByIdentifier = {};
     for (const loadedOSH of loadedOSHs) {
-        loadedOSHByName[loadedOSH.name] = loadedOSH;
+        loadedOSHByIdentifier[loadedOSH.identifier] = loadedOSH;
     }
     logger_1.default.debug(`current OSH: ${currentOSHs}`);
     logger_1.default.debug(`loaded OSH: ${loadedOSHs}`);
     for (const osh of loadedOSHs) {
         try {
-            const found = currentOSHByName[osh.name];
+            const found = currentOSHByIdentifier[osh.identifier];
             if (!found) {
                 if (!transformOSHNameToID(osh.hierarchy, optionSets)) {
                     continue;
                 }
-                logger_1.default.debug(`Creating:  ${JSON.stringify(osh)}`);
+                logger_1.default.debug(`Creating:  ${JSON.stringify(osh, null, 2)}`);
                 await new sdk_1.Entities().create({
                     entityName: 'option-set-hierarchy',
                     object: osh,
@@ -118,12 +118,12 @@ async function uploadOSH(loadedOSHs) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading option set hierarchy: ${err}`);
+            logger_1.default.error(`Error Uploading option set hierarchy: ${err}`);
         }
     }
     for (const currentOSH of currentOSHs) {
         try {
-            const found = loadedOSHByName[currentOSH.name];
+            const found = loadedOSHByIdentifier[currentOSH.name];
             if (!found) {
                 logger_1.default.info(`Deleting: ${currentOSH.name}`);
                 await new sdk_1.Entities().delete({
@@ -133,7 +133,7 @@ async function uploadOSH(loadedOSHs) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting Option set hierarchy: ${err}`);
+            logger_1.default.error(`Error Deleting Option set hierarchy: ${err}`);
         }
     }
 }
@@ -141,7 +141,7 @@ async function uploadOSH(loadedOSHs) {
 function transformOSHNameToID(hierarchy, optionSets) {
     logger_1.default.info(`passed hierarchy: ${hierarchy}`);
     for (let i = 0; i < hierarchy.length; i++) {
-        const os = optionSets.find((os) => os.name === hierarchy[i]);
+        const os = optionSets.find((os) => os.slug === hierarchy[i]);
         if (!os) {
             logger_1.default.error(`could not find option set with name ${hierarchy[i]} at position ${i}. skipping...`);
             return false;
@@ -178,7 +178,7 @@ async function uploadOSHLinks(reducedOSHLinks) {
         if (!foundType ||
             !foundOSH ||
             foundTPSlugs.length !== currentLink.hierarchyTypePropertyIds.length) {
-            logger_1.default.info(`skipping unhashable, invalid type option set hierarchy link: ${currentLink}`);
+            logger_1.default.info(`skipping unhashable, invalid type option set hierarchy link: ${JSON.stringify(currentLink, null, 2)}`);
         }
         // don't mutate original array
         const sortedFoundTPSlugs = [...foundTPSlugs].sort();
@@ -201,7 +201,7 @@ async function uploadOSHLinks(reducedOSHLinks) {
                 if (!transformReducedLink(loadedLink, typesWithProperties, currentOSHs)) {
                     continue;
                 }
-                logger_1.default.debug(`Creating:  ${JSON.stringify(loadedLink)}`);
+                logger_1.default.debug(`Creating:  ${JSON.stringify(loadedLink, null, 2)}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-option-set-hierarchy-link',
                     object: {
@@ -213,7 +213,7 @@ async function uploadOSHLinks(reducedOSHLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error uploading type option set hierarchy links: ${err}`);
+            logger_1.default.error(`Error uploading type option set hierarchy links: ${err}`);
         }
     }
     for (const [currentLinkHash, currentLink] of Object.entries(currentOSHLinkHashes)) {
@@ -228,7 +228,7 @@ async function uploadOSHLinks(reducedOSHLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting rule set link: ${err}`);
+            logger_1.default.error(`Error Deleting rule set link: ${err}`);
         }
     }
 }

package/dist/commands/types/uploadOptionSets.js

@@ -65,40 +65,41 @@ async function uploadOS(dir) {
     const currentOptionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
     });
-    const currentOptionSetsByIdentifier = {};
+    const currentOptionSetsBySlug = {};
     for (const currentOptionSet of currentOptionSets) {
-        currentOptionSetsByIdentifier[currentOptionSet.identifier] = currentOptionSet;
+        currentOptionSetsBySlug[currentOptionSet.slug] = currentOptionSet;
     }
-    const newOptionSetsByIdentifier = {};
+    const newOptionSetsBySlug = {};
     for (const optionSet of optionSets) {
-        newOptionSetsByIdentifier[optionSet.identifier] = optionSet;
+        newOptionSetsBySlug[optionSet.slug] = optionSet;
     }
     for (const optionSet of optionSets) {
         try {
-            const found = currentOptionSetsByIdentifier[optionSet.identifier];
+            const found = currentOptionSetsBySlug[optionSet.slug];
             if (!found) {
                 if (!optionSet.optionSet) {
-                    logger_1.default.info(`No OptionSet for: ${optionSet.identifier}`);
+                    logger_1.default.info(`No OptionSet for: ${optionSet.slug}`);
                     continue;
                 }
-                logger_1.default.info(`Creating: ${optionSet.identifier}`);
+                logger_1.default.info(`Creating: ${JSON.stringify(optionSet, null, 2)}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-option-set',
                     object: {
                         name: optionSet.name,
-                        identifier: optionSet.identifier,
+                        slug: optionSet.slug,
                         optionSet: optionSet.optionSet,
                         isArchived: optionSet.isArchived,
                     },
                 });
             }
             else {
-                logger_1.default.info(`Updating: ${optionSet.identifier}`);
+                logger_1.default.info(`Updating: ${optionSet.slug}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-option-set',
                     id: found.id,
                     object: {
                         name: optionSet.name,
+                        slug: optionSet.slug,
                         optionSet: optionSet.optionSet,
                         isArchived: optionSet.isArchived,
                     },
@@ -106,14 +107,14 @@ async function uploadOS(dir) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading OptionSets: ${err}`);
+            logger_1.default.error(`Error Uploading OptionSets: ${err}`);
         }
     }
     for (const currentOptionSet of currentOptionSets) {
         try {
-            const found = newOptionSetsByIdentifier[currentOptionSet.identifier];
+            const found = newOptionSetsBySlug[currentOptionSet.slug];
             if (!found) {
-                logger_1.default.info(`Deleting: ${currentOptionSet.identifier}`);
+                logger_1.default.info(`Deleting: ${currentOptionSet.slug}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-option-set',
                     id: currentOptionSet.id,
@@ -121,7 +122,7 @@ async function uploadOS(dir) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting OptionSets: ${err}`);
+            logger_1.default.error(`Error Deleting OptionSets: ${err}`);
         }
     }
 }

package/dist/commands/types/uploadRuleSets.js

@@ -97,7 +97,7 @@ async function uploadRuleSetObjects(reducedRuleSets) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading rule sets: ${err}`);
+            logger_1.default.error(`Error Uploading rule sets: ${err}`);
         }
     }
     for (const currentRuleSet of currentRuleSets) {
@@ -112,7 +112,7 @@ async function uploadRuleSetObjects(reducedRuleSets) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting rule set: ${err}`);
+            logger_1.default.error(`Error Deleting rule set: ${err}`);
         }
     }
 }
@@ -145,7 +145,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
                 if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
                     continue;
                 }
-                logger_1.default.info(`Creating: ${loadedRuleSetLink}`);
+                logger_1.default.info(`Creating: ${JSON.stringify(loadedRuleSetLink, null, 2)}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-rule-set-link',
                     object: {
@@ -162,7 +162,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading rule set links: ${err}`);
+            logger_1.default.error(`Error Uploading rule set links: ${err}`);
         }
     }
     for (const [currentLinkHash, currentLink] of Object.entries(currentLinksHashes)) {
@@ -177,7 +177,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting rule set link: ${err}`);
+            logger_1.default.error(`Error Deleting rule set link: ${err}`);
         }
     }
 }
@@ -188,7 +188,7 @@ function transformReducedLink(ruleSetLink, types, ruleSets) {
         return false;
     }
     ruleSetLink.type = foundType.id;
-    const foundRuleSet = ruleSets.find((rs) => rs.name === ruleSetLink.ruleSet);
+    const foundRuleSet = ruleSets.find((rs) => rs.identifier === ruleSetLink.ruleSet);
     if (!foundRuleSet) {
         logger_1.default.error(`Could not find rule set with name ${foundType.ruleSet}`);
         return false;

package/dist/commands/types/uploadTypePolicies.js

@@ -133,7 +133,7 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading Type Policy: ${err}`);
+            logger_1.default.error(`Error Uploading Type Policy: ${err}`);
         }
     }
     for (const [identifier, currentTPP] of Object.entries(currentTypePolicyByIdentifier)) {
@@ -148,7 +148,7 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
             }
         }
         catch (err) {
-            throw new Error(`Error Type Policy: ${err}`);
+            logger_1.default.error(`Error Type Policy: ${err}`);
         }
     }
 }
@@ -165,7 +165,7 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
         const foundType = types.find((type) => type.id === currentLink.typeId);
         const foundTypePolicy = currentTypePolicies.find((tp) => tp.id === currentLink.typePolicyId);
         if (!foundType || !foundTypePolicy) {
-            logger_1.default.info(`skipping unhashable, invalid policy link: ${currentLink}`);
+            logger_1.default.info(`skipping unhashable, invalid policy link: ${JSON.stringify(currentLink, null, 2)}`);
         }
         const hash = `${foundType.slug}|${foundTypePolicy.identifier}`;
         currentLinksHashes[hash] = currentLink;
@@ -197,7 +197,7 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading type policy links: ${err}`);
+            logger_1.default.error(`Error Uploading type policy links: ${err}`);
         }
     }
     for (const [currentLinkHash, currentLink] of Object.entries(currentLinksHashes)) {
@@ -212,7 +212,7 @@ async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting rule set link: ${err}`);
+            logger_1.default.error(`Error Deleting rule set link: ${err}`);
         }
     }
 }

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -107,26 +107,26 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
     const currentTPPolicies = await new sdk_1.Entities().get({
         entityName: 'type-property-policy',
     });
-    const currentTPPByLabel = {};
+    const currentTPPByIdentifier = {};
     for (const currentTPP of currentTPPolicies) {
-        currentTPPByLabel[currentTPP.label] = currentTPP;
+        currentTPPByIdentifier[currentTPP.identifier] = currentTPP;
     }
-    const loadedTPPByName = {};
+    const loadedTPPByIdentifier = {};
     for (const loadedTPP of reducedTypePropertyPolicies) {
-        loadedTPPByName[loadedTPP.label] = loadedTPP;
+        loadedTPPByIdentifier[loadedTPP.identifier] = loadedTPP;
     }
-    for (const [label, loadedTPP] of Object.entries(loadedTPPByName)) {
+    for (const [identifier, loadedTPP] of Object.entries(loadedTPPByIdentifier)) {
         try {
-            const found = currentTPPByLabel[label];
+            const found = currentTPPByIdentifier[identifier];
             if (!found) {
-                logger_1.default.info(`Creating:  ${label}`);
+                logger_1.default.info(`Creating:  ${identifier}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-policy',
                     object: loadedTPP,
                 });
             }
             else {
-                logger_1.default.info(`Updating:  ${label}`);
+                logger_1.default.info(`Updating:  ${identifier}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-policy',
                     id: found.id,
@@ -135,14 +135,14 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading Type Property Policy: ${err}`);
+            logger_1.default.error(`Error Uploading Type Property Policy: ${err}`);
         }
     }
-    for (const [label, currentTPP] of Object.entries(currentTPPByLabel)) {
+    for (const [identifier, currentTPP] of Object.entries(currentTPPByIdentifier)) {
         try {
-            const found = loadedTPPByName[label];
+            const found = loadedTPPByIdentifier[identifier];
             if (!found) {
-                logger_1.default.info(`Deleting:  ${label}`);
+                logger_1.default.info(`Deleting:  ${identifier}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-policy',
                     id: currentTPP['id'],
@@ -150,7 +150,7 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
             }
         }
         catch (err) {
-            throw new Error(`Error Type Property Policy: ${err}`);
+            logger_1.default.error(`Error Type Property Policy: ${err}`);
         }
     }
 }
@@ -177,7 +177,8 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
         const foundTypeProperty = typeProperties.find((tp) => tp.id === currentLink.typePropertyId);
         const foundTPP = currentTPPs.find((tpp) => tpp.id === currentLink.typePropertyPolicyId);
         if (!foundTypeProperty || !foundTPP) {
-            logger_1.default.info(`skipping unhashable, invalid policy link: ${currentLink}`);
+            logger_1.default.info(`skipping unhashable, invalid policy link: ${JSON.stringify(currentLink, null, 2)}`);
+            continue;
         }
         const hash = `${foundTypeProperty.typeSlug}${foundTypeProperty.slug}|${foundTPP.identifier}`;
         currentLinksHashes[hash] = currentLink;
@@ -209,7 +210,7 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading type property policy links: ${err}`);
+            logger_1.default.error(`Error Uploading type property policy links: ${err}`);
         }
     }
     for (const [currentLinkHash, currentLink] of Object.entries(currentLinksHashes)) {
@@ -224,7 +225,7 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting type property policy link: ${err}`);
+            logger_1.default.error(`Error Deleting type property policy link: ${err}`);
         }
     }
 }

package/dist/commands/types/uploadUsageInfo.js

@@ -70,7 +70,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
         const foundType = typesWithProperties.find((t) => t.id === currentUI.typeId);
         const foundTypeProperty = typeProperties.find((tp) => tp.id === currentUI.typePropertyId);
         if (!foundType || !foundTypeProperty) {
-            logger_1.default.info(`skipping unhashable, invalid usage info: ${currentUI}`);
+            logger_1.default.info(`skipping unhashable, invalid usage info: ${JSON.stringify(currentUI, null, 2)}`);
             continue;
         }
         const hash = `${foundType.slug}|${foundTypeProperty.slug}`;
@@ -122,7 +122,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
             }
         }
         catch (err) {
-            throw new Error(`Error Uploading usage info: ${err}`);
+            logger_1.default.error(`Error Uploading usage info: ${err}`);
         }
     }
     for (const [hash, currentUI] of Object.entries(currentUsageInfosHashes)) {
@@ -137,7 +137,7 @@ async function uploadUsageInfoObjects(loadedUsageInfo) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting usage info: ${err}`);
+            logger_1.default.error(`Error Deleting usage info: ${err}`);
         }
     }
 }

package/dist/helpers/app/app-config-validators.js

@@ -40,9 +40,7 @@ function visibilityValidator(appDeclaration) {
             error: 'Invalid visibility. Visibility must be "public" or "private".',
         };
     }
-    if (appDeclaration.visibility === 'private' &&
-        Object.prototype.hasOwnProperty.call(appDeclaration, 'hidden') &&
-        appDeclaration.hidden === true) {
+    if (appDeclaration.visibility === 'private' && appDeclaration.hidden !== true) {
         return {
             error: 'Apps can not be private and hidden.',
         };

package/dist/helpers/app/app-config-validators.spec.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const app_config_validators_1 = require("./app-config-validators");
-const app_config_validators_2 = require("./app-config-validators");
 describe('appVersionValidator', () => {
     it('should return an error if "version" field is missing', () => {
         const appDeclaration = {};
@@ -66,41 +65,3 @@ it('should return an error if app version has invalid format', () => {
     const validationResult = (0, app_config_validators_1.appVersionValidator)(appDeclaration);
     expect(validationResult).toEqual(expectedError);
 });
-describe('visibilityValidator', () => {
-    it('should return an error if visibility is neither "public" nor "private"', () => {
-        const appDeclaration = {
-            visibility: 'invalidVisibility',
-        };
-        const expectedError = {
-            error: 'Invalid visibility. Visibility must be "public" or "private".',
-        };
-        const validationResult = (0, app_config_validators_2.visibilityValidator)(appDeclaration);
-        expect(validationResult).toEqual(expectedError);
-    });
-    it('should return an error if app is private and not hidden', () => {
-        const appDeclaration = {
-            visibility: 'private',
-            hidden: true,
-        };
-        const expectedError = {
-            error: 'Apps can not be private and hidden.',
-        };
-        const validationResult = (0, app_config_validators_2.visibilityValidator)(appDeclaration);
-        expect(validationResult).toEqual(expectedError);
-    });
-    it('should not return an error if visibility is "public"', () => {
-        const appDeclaration = {
-            visibility: 'public',
-        };
-        const validationResult = (0, app_config_validators_2.visibilityValidator)(appDeclaration);
-        expect(validationResult).toBeUndefined();
-    });
-    it('should not return an error if app is private and hidden', () => {
-        const appDeclaration = {
-            visibility: 'private',
-            hidden: false,
-        };
-        const validationResult = (0, app_config_validators_2.visibilityValidator)(appDeclaration);
-        expect(validationResult).toBeUndefined();
-    });
-});

package/dist/helpers/types/type-uploader.js

@@ -104,7 +104,7 @@ async function uploadReducedTypes(dir) {
     }
 }
 async function uploadReducedTypeProperties(type, currentPropertyTypes, newPropertyTypes) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const currentPropertyTypeBySlug = {};
     for (const currentPropertyType of currentPropertyTypes) {
         currentPropertyTypeBySlug[currentPropertyType.slug] = currentPropertyType;
@@ -116,9 +116,9 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
     const optionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
     });
-    const optionSetIdByIdentifier = {};
+    const optionSetIdBySlug = {};
     for (const optionSet of optionSets) {
-        optionSetIdByIdentifier[optionSet.identifier] = optionSet.id;
+        optionSetIdBySlug[optionSet.slug] = optionSet.id;
     }
     for (const newPropertyType of newPropertyTypes) {
         try {
@@ -135,9 +135,11 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         editable: newPropertyType.editable,
                         searchable: newPropertyType.searchable,
                         core: newPropertyType.core,
-                        typePropertyOptionSetId: optionSetIdByIdentifier[newPropertyType.typePropertyOptionSetSlug],
+                        typePropertyOptionSetId: optionSetIdBySlug[newPropertyType.typePropertyOptionSetSlug],
                         formula: newPropertyType.formula,
                         referencedTypePath: newPropertyType.referencedTypePath,
+                        carryOverBehavior: newPropertyType.carryOverBehavior,
+                        carryOverDefault: newPropertyType.carryOverDefault,
                         referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
                         defaultValue: newPropertyType.defaultValue,
                         propertyLevel: newPropertyType.propertyLevel,
@@ -154,7 +156,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             }
             else if (found &&
                 !newPropertyType.inherited &&
-                !typePropertiesEqual(found, newPropertyType, optionSetIdByIdentifier)) {
+                !typePropertiesEqual(found, newPropertyType, optionSetIdBySlug)) {
                 logger_1.default.info(`Updating Type-Property:  ${newPropertyType.slug}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property',
@@ -167,16 +169,18 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         editable: (_e = newPropertyType.editable) !== null && _e !== void 0 ? _e : null,
                         searchable: (_f = newPropertyType.searchable) !== null && _f !== void 0 ? _f : null,
                         core: (_g = newPropertyType.core) !== null && _g !== void 0 ? _g : null,
-                        typePropertyOptionSetId: (_h = optionSetIdByIdentifier[newPropertyType.typePropertyOptionSetSlug]) !== null && _h !== void 0 ? _h : null,
+                        typePropertyOptionSetId: (_h = optionSetIdBySlug[newPropertyType.typePropertyOptionSetSlug]) !== null && _h !== void 0 ? _h : null,
                         formula: (_j = newPropertyType.formula) !== null && _j !== void 0 ? _j : null,
                         referencedTypePath: (_k = newPropertyType.referencedTypePath) !== null && _k !== void 0 ? _k : null,
-                        referencedTypeRootSlug: (_l = newPropertyType.referencedTypeRootSlug) !== null && _l !== void 0 ? _l : null,
-                        defaultValue: (_m = newPropertyType.defaultValue) !== null && _m !== void 0 ? _m : null,
-                        propertyLevel: (_o = newPropertyType.propertyLevel) !== null && _o !== void 0 ? _o : null,
-                        formulaFunction: (_p = newPropertyType.formulaFunction) !== null && _p !== void 0 ? _p : null,
-                        validationFunction: (_q = newPropertyType.validationFunction) !== null && _q !== void 0 ? _q : null,
-                        numberFormat: (_r = newPropertyType.numberFormat) !== null && _r !== void 0 ? _r : null,
-                        sequenceSeedValue: (_s = newPropertyType.sequenceSeedValue) !== null && _s !== void 0 ? _s : null,
+                        carryOverBehavior: (_l = newPropertyType.carryOverBehavior) !== null && _l !== void 0 ? _l : null,
+                        carryOverDefault: (_m = newPropertyType.carryOverDefault) !== null && _m !== void 0 ? _m : null,
+                        referencedTypeRootSlug: (_o = newPropertyType.referencedTypeRootSlug) !== null && _o !== void 0 ? _o : null,
+                        defaultValue: (_p = newPropertyType.defaultValue) !== null && _p !== void 0 ? _p : null,
+                        propertyLevel: (_q = newPropertyType.propertyLevel) !== null && _q !== void 0 ? _q : null,
+                        formulaFunction: (_r = newPropertyType.formulaFunction) !== null && _r !== void 0 ? _r : null,
+                        validationFunction: (_s = newPropertyType.validationFunction) !== null && _s !== void 0 ? _s : null,
+                        numberFormat: (_t = newPropertyType.numberFormat) !== null && _t !== void 0 ? _t : null,
+                        sequenceSeedValue: (_u = newPropertyType.sequenceSeedValue) !== null && _u !== void 0 ? _u : null,
                     },
                 });
             }
@@ -219,6 +223,8 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByIdentifi
         referencedTypeRootSlug: typeProperty1.referencedTypeRootSlug,
         defaultValue: typeProperty1.defaultValue,
         propertyLevel: typeProperty1.propertyLevel,
+        carryOverBehavior: typeProperty1.carryOverBehavior,
+        carryOverDefault: typeProperty1.carryOverDefault,
         formulaFunction: typeProperty1.formulaFunction,
         validationFunction: typeProperty1.validationFunction,
         numberFormat: typeProperty1.numberFormat,
@@ -238,6 +244,8 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByIdentifi
         referencedTypeRootSlug: typeProperty2.referencedTypeRootSlug,
         defaultValue: typeProperty2.defaultValue,
         propertyLevel: typeProperty2.propertyLevel,
+        carryOverBehavior: typeProperty2.carryOverBehavior,
+        carryOverDefault: typeProperty2.carryOverDefault,
         formulaFunction: typeProperty2.formulaFunction,
         validationFunction: typeProperty2.validationFunction,
         numberFormat: typeProperty2.numberFormat,

package/dist/interfaces.d.ts

@@ -325,6 +325,8 @@ export interface ReducedTypeProperty {
     isArchived: boolean;
     propertyType: PropertyType;
     slug: string;
+    carryOverDefault: any;
+    carryOverBehavior: string;
     label: string;
     editable: boolean;
     searchable: boolean;
@@ -343,7 +345,7 @@ export interface ReducedTypeProperty {
 }
 export interface ReducedOptionSet {
     name: string;
-    identifier: string;
+    slug: string;
     isArchived: boolean;
     optionSet: any[];
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.2.4",
+  "version": "2.2.6",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",