@contrail/cli 2.0.21 → 2.0.22

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.0.21 darwin-arm64 node-v18.13.0
+@contrail/cli/2.0.22 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -764,11 +764,11 @@ Get all Types and associated data for your Org
 
 ```
 USAGE
-  $ contrail types getAll [-d <value>] [--overwrite]
+  $ contrail types getAll [-d <value>] [-f]
 
 FLAGS
   -d, --outDir=<value>  [default: .] The directory to which to export the type data. Defaults to the current directory
-  --overwrite           Replaces any existing export files in outDir
+  -f, --overwrite       Replaces any existing export files in outDir
 
 DESCRIPTION
   Get all Types and associated data for your Org

package/dist/api/types.d.ts

@@ -1,5 +1,6 @@
 export declare function getOptionSets(): Promise<any>;
 export declare function getOptionSetHierarchies(): Promise<any>;
+export declare function getOptionSetHierarchyLinks(): Promise<any>;
 export declare function getRuleSets(): Promise<any>;
 export declare function getRuleSetLinks(): Promise<any>;
 export declare function getUsageInfo(): Promise<any>;

package/dist/api/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTypePolicyLinks = exports.getTypePolicies = exports.getTypePropertyPolicyLinks = exports.getTypePropertyPolicies = exports.getUsageInfo = exports.getRuleSetLinks = exports.getRuleSets = exports.getOptionSetHierarchies = exports.getOptionSets = void 0;
+exports.getTypePolicyLinks = exports.getTypePolicies = exports.getTypePropertyPolicyLinks = exports.getTypePropertyPolicies = exports.getUsageInfo = exports.getRuleSetLinks = exports.getRuleSets = exports.getOptionSetHierarchyLinks = exports.getOptionSetHierarchies = exports.getOptionSets = void 0;
 const sdk_1 = require("@contrail/sdk");
 async function getOptionSets() {
     return await new sdk_1.Entities().get({
@@ -15,6 +15,13 @@ async function getOptionSetHierarchies() {
     });
 }
 exports.getOptionSetHierarchies = getOptionSetHierarchies;
+async function getOptionSetHierarchyLinks() {
+    const entitiesClient = new sdk_1.Entities();
+    return await entitiesClient.get({
+        entityName: 'type-option-set-hierarchy-link',
+    });
+}
+exports.getOptionSetHierarchyLinks = getOptionSetHierarchyLinks;
 async function getRuleSets() {
     const entitiesClient = new sdk_1.Entities();
     return await entitiesClient.get({

package/dist/commands/types/getAll.d.ts

@@ -3,6 +3,7 @@ export interface DataHolder {
     types: any[];
     optionSets: any[];
     optionSetHierarchies: any[];
+    optionSetHierarchyLinks: any[];
     ruleSets: any[];
     ruleSetLinks: any[];
     usageInfo: any[];
@@ -15,6 +16,7 @@ export interface ReducedDataHolder {
     reducedTypes: any[];
     reducedOptionSets: any[];
     reducedOptionSetHierarchies: any[];
+    reducedOptionSetHierarchyLinks: any[];
     reducedRuleSets: any[];
     reducedRuleSetLinks: any[];
     reducedUsageInfo: any[];

package/dist/commands/types/getAll.js

@@ -26,7 +26,7 @@ GetAllTypes.examples = [
 ];
 GetAllTypes.flags = {
     outDir: core_1.Flags.string({ char: 'd', description: 'The directory to which to export the type data. Defaults to the current directory', required: false, default: '.' }),
-    overwrite: core_1.Flags.boolean({ description: 'Replaces any existing export files in outDir', required: false, default: false })
+    overwrite: core_1.Flags.boolean({ char: 'f', description: 'Replaces any existing export files in outDir', required: false, default: false })
 };
 async function getAll(outDir, overwrite) {
     try {
@@ -40,6 +40,7 @@ async function getAll(outDir, overwrite) {
             types: await (0, type_extractor_1.getTypes)(),
             optionSets: await (0, types_1.getOptionSets)(),
             optionSetHierarchies: await (0, types_1.getOptionSetHierarchies)(),
+            optionSetHierarchyLinks: await (0, types_1.getOptionSetHierarchyLinks)(),
             ruleSets: await (0, types_1.getRuleSets)(),
             ruleSetLinks: await (0, types_1.getRuleSetLinks)(),
             usageInfo: await (0, types_1.getUsageInfo)(),
@@ -247,6 +248,36 @@ function reduceOptionSetHierarchies(data) {
         };
     });
 }
+function reduceOptionSetHierarchyLinks(data) {
+    var _a;
+    return (_a = data.optionSetHierarchyLinks) === null || _a === void 0 ? void 0 : _a.map(x => {
+        var _a;
+        const osh = data.optionSetHierarchies.find(y => y.id === x.optionSetHierarchyId);
+        if (!osh) {
+            console.log('OSH Link: could not find option set hierarchy', x.optionSetHierarchyId, 'skipping...');
+            return null;
+        }
+        const type = data.types.find(y => y.id === x.typeId);
+        if (!type) {
+            console.log('OSH Link: could not find type', x.typeId, 'skipping...');
+            return null;
+        }
+        const typePropertySlugs = [];
+        for (const tpId of x.hierarchyTypePropertyIds) {
+            const typePropertySlug = (_a = type.typeProperties.find(y => y.id === tpId)) === null || _a === void 0 ? void 0 : _a.slug;
+            if (!typePropertySlug) {
+                console.log('OSH Link: could not find type property', tpId, 'skipping...');
+                return null;
+            }
+            typePropertySlugs.push(typePropertySlug);
+        }
+        return {
+            optionSetHierarchyName: osh.name,
+            typeSlug: type.slug,
+            typePropertySlugs,
+        };
+    }).filter(x => !!x);
+}
 function reduceTypes(dataHolder) {
     console.log('Found types: ', dataHolder.types.length);
     let reducedTypes = [];
@@ -269,6 +300,7 @@ function reduceTypes(dataHolder) {
                 typePropertyOptionSetName: optionSetNameById[typeProperty.typePropertyOptionSetId],
                 formula: typeProperty.formula,
                 referencedTypePath: typeProperty.referencedTypePath,
+                referencedTypeRootSlug: typeProperty.referencedTypeRootSlug,
                 defaultValue: typeProperty.defaultValue,
                 propertyLevel: typeProperty.propertyLevel,
                 inherited: typeProperty.inherited,
@@ -301,6 +333,7 @@ async function reduceData(data) {
         reducedTypes: reduceTypes(data),
         reducedOptionSets: reduceOptionSets(data),
         reducedOptionSetHierarchies: reduceOptionSetHierarchies(data),
+        reducedOptionSetHierarchyLinks: reduceOptionSetHierarchyLinks(data),
         reducedRuleSets: reduceRuleSets(data),
         reducedRuleSetLinks: reduceRuleSetLinks(data),
         reducedUsageInfo: reduceUsageInfo(data),
@@ -349,6 +382,7 @@ async function saveData(reducedData, dir, overwrite) {
         reducedTypes: { filename: 'types', split: false, fileLabel: 'slug', saveFunction: saveTypesFunction },
         reducedOptionSets: { filename: 'option-sets', split: true, fileLabel: 'name' },
         reducedOptionSetHierarchies: { filename: 'option-set-hierarchies', split: true, fileLabel: 'name' },
+        reducedOptionSetHierarchyLinks: { filename: 'type-option-set-hierarchy-links', split: false, fileLabel: '' },
         reducedRuleSets: { filename: 'rule-sets', split: true, fileLabel: 'name' },
         reducedRuleSetLinks: { filename: 'rule-set-links', split: false, fileLabel: '' },
         reducedUsageInfo: { filename: 'usage-info', split: false, fileLabel: '' },

package/dist/commands/types/loadAll.js

@@ -31,8 +31,8 @@ async function loadAll(dir, skipPolicies = false) {
     try {
         await (0, login_1.authUser)();
         await (0, uploadOptionSets_1.uploadOptionSets)(dir);
-        await (0, uploadOptionSetHierarchies_1.uploadOptionSetHierarchies)(dir);
         await (0, type_uploader_1.uploadTypes)(dir);
+        await (0, uploadOptionSetHierarchies_1.uploadOptionSetHierarchies)(dir);
         await (0, uploadUsageInfo_1.uploadUsageInfo)(dir);
         await (0, uploadRuleSets_1.uploadRuleSets)(dir);
         if (!skipPolicies) {

package/dist/commands/types/mergeTypeProperties.js

@@ -58,6 +58,7 @@ async function mergeTypeProperties(fileLocation, typePaths) {
         types: await (0, type_extractor_1.getTypes)(),
         optionSets: await (0, types_1.getOptionSets)(),
         optionSetHierarchies: [],
+        optionSetHierarchyLinks: [],
         ruleSets: [],
         ruleSetLinks: [],
         usageInfo: [],

package/dist/commands/types/uploadOptionSetHierarchies.js

@@ -8,6 +8,7 @@ const path = tslib_1.__importStar(require("path"));
 const login_1 = require("../../auth/login");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
+const type_extractor_1 = require("../../helpers/types/type-extractor");
 const yaml = require('js-yaml');
 class UploadOptionSetHierarchies extends core_1.Command {
     async run() {
@@ -30,6 +31,8 @@ async function uploadOptionSetHierarchies(dir) {
         console.log('%s Uploading', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
         const optionSetHierarchies = await loadOptionSetHierarchies(dir);
         await uploadOSH(optionSetHierarchies);
+        const optionSetHierarchyLinks = await loadOptionSetHierarchyLinks(dir);
+        await uploadOSHLinks(optionSetHierarchyLinks);
         console.log('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
     }
     catch (e) {
@@ -53,6 +56,14 @@ function loadOptionSetHierarchies(fromDir) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
     }
 }
+function loadOptionSetHierarchyLinks(fromDir) {
+    try {
+        return yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'type-option-set-hierarchy-links.yml'), 'utf8'));
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
 async function uploadOSH(loadedOSHs) {
     const optionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
@@ -132,3 +143,96 @@ function transformOSHNameToID(hierarchy, optionSets) {
     }
     return true;
 }
+async function uploadOSHLinks(reducedOSHLinks) {
+    const typesWithProperties = await (0, type_extractor_1.getTypes)();
+    const typeProperties = [];
+    typesWithProperties.forEach(type => {
+        if (type.typeProperties) {
+            for (const tp of type.typeProperties) {
+                tp.typeId = type.id;
+                tp.typeSlug = type.slug;
+                typeProperties.push(tp);
+            }
+        }
+    });
+    const currentOSHs = await new sdk_1.Entities().get({
+        entityName: 'option-set-hierarchy',
+    });
+    const currentOSHLinks = await new sdk_1.Entities().get({
+        entityName: 'type-option-set-hierarchy-link',
+    });
+    const currentOSHLinkHashes = {};
+    for (const currentLink of currentOSHLinks) {
+        const foundType = typesWithProperties.find(x => x.id === currentLink.typeId);
+        const foundOSH = currentOSHs.find(osh => osh.id === currentLink.optionSetHierarchyId);
+        const foundTPSlugs = typeProperties.filter(x => { var _a; return (_a = currentLink === null || currentLink === void 0 ? void 0 : currentLink.hierarchyTypePropertyIds) === null || _a === void 0 ? void 0 : _a.includes(x.id); }).map(x => x.slug);
+        if (!foundType || !foundOSH || (foundTPSlugs.length !== currentLink.hierarchyTypePropertyIds.length)) {
+            console.log('skipping unhashable, invalid type option set hierarchy link:', currentLink);
+        }
+        const hash = `${foundType.slug}|${foundOSH.name}|${foundTPSlugs.sort().join('|')}`;
+        currentOSHLinkHashes[hash] = currentLink;
+    }
+    const reducedLinksByHashes = {};
+    for (const loadedLink of reducedOSHLinks) {
+        const hash = `${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyName}|${loadedLink.typePropertySlugs.sort().join('|')}}`;
+        reducedLinksByHashes[hash] = loadedLink;
+    }
+    for (const loadedLink of reducedOSHLinks) {
+        try {
+            const found = currentOSHLinkHashes[`${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyName}|${loadedLink.typePropertySlugs.sort().join('|')}`];
+            if (!found) {
+                if (!transformReducedLink(loadedLink, typesWithProperties, currentOSHs)) {
+                    continue;
+                }
+                await new sdk_1.Entities().create({
+                    entityName: 'type-option-set-hierarchy-link',
+                    object: {
+                        hierarchyTypePropertyIds: loadedLink.hierarchyTypePropertyIds,
+                        optionSetHierarchyId: loadedLink.optionSetHierarchyId,
+                        typeId: loadedLink.typeId,
+                    },
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error uploading type option set hierarchy links: ${err}`);
+        }
+    }
+    for (const [currentLinkHash, currentLink] of Object.entries(currentOSHLinkHashes)) {
+        try {
+            const found = reducedLinksByHashes[currentLinkHash];
+            if (!found) {
+                console.log('Deleting: ', currentLinkHash);
+                await new sdk_1.Entities().delete({
+                    entityName: 'type-option-set-hierarchy-link',
+                    id: currentLink['id'],
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error Deleting rule set link: ${err}`);
+        }
+    }
+}
+function transformReducedLink(OSHLink, typesWithProperties, OSHs) {
+    var _a, _b;
+    const foundType = typesWithProperties.find(x => x.slug === OSHLink.typeSlug);
+    if (!foundType) {
+        console.error('OSH Links: Could not find type with slug', OSHLink.typeSlug);
+        return false;
+    }
+    OSHLink.typeId = foundType.id;
+    const foundTPs = (_b = (_a = foundType === null || foundType === void 0 ? void 0 : foundType.typeProperties) === null || _a === void 0 ? void 0 : _a.filter(x => OSHLink.typePropertySlugs.includes(x.slug))) !== null && _b !== void 0 ? _b : [];
+    if (foundTPs.length !== OSHLink.typePropertySlugs.length) {
+        console.error('OSH Links: Could not find all type properties with slugs', OSHLink.typePropertySlugs);
+        return false;
+    }
+    OSHLink.hierarchyTypePropertyIds = foundTPs.map(x => x.id);
+    const foundOSH = OSHs.find(x => x.name === OSHLink.optionSetHierarchyName);
+    if (!foundOSH) {
+        console.error('OSH Links: Could not find option set hierarchy with name', OSHLink.optionSetHierarchyName);
+        return false;
+    }
+    OSHLink.optionSetHierarchyId = foundOSH.id;
+    return true;
+}

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -217,7 +217,7 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting rule set link: ${err}`);
+            throw new Error(`Error Deleting type property policy link: ${err}`);
         }
     }
 }

package/dist/helpers/types/type-extractor.d.ts

@@ -1 +1 @@
-export declare function getTypes(): Promise<any[]>;
+export declare function getTypes(withTypes?: boolean): Promise<any>;

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

@@ -6,13 +6,16 @@ const sdk_1 = require("@contrail/sdk");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const p_limit_1 = tslib_1.__importDefault(require("p-limit"));
 const limit = (0, p_limit_1.default)(30);
-async function getTypes() {
+async function getTypes(withTypes = true) {
     console.log('%s Retrieving', chalk_1.default.yellow.bold('TYPES'));
     const entitiesClient = new sdk_1.Entities();
     const types = await entitiesClient.get({
         entityName: 'type',
     });
     console.log(`${chalk_1.default.yellow.bold('TYPES')} Found ${types.length} types`);
+    if (!withTypes) {
+        return types;
+    }
     const typesWithProperties = [];
     const promises = [];
     for (const type of types) {

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

@@ -149,10 +149,12 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
                         formula: newPropertyType.formula,
                         referencedTypePath: newPropertyType.referencedTypePath,
+                        referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
                         defaultValue: newPropertyType.defaultValue,
                         propertyLevel: newPropertyType.propertyLevel,
                         formulaFunction: newPropertyType.formulaFunction,
                         validationFunction: newPropertyType.validationFunction,
+                        numberFormat: newPropertyType.numberFormat,
                     }),
                     headers: {
                         Accept: 'application/json',
@@ -176,10 +178,12 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
                         formula: newPropertyType.formula,
                         referencedTypePath: newPropertyType.referencedTypePath,
+                        referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
                         defaultValue: newPropertyType.defaultValue,
                         propertyLevel: newPropertyType.propertyLevel,
                         formulaFunction: newPropertyType.formulaFunction,
                         validationFunction: newPropertyType.validationFunction,
+                        numberFormat: newPropertyType.numberFormat,
                     },
                 });
             }
@@ -219,6 +223,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         typePropertyOptionSetId: optionSetIdByName[typeProperty1.typePropertyOptionSetName],
         formula: typeProperty1.formula,
         referencedTypePath: typeProperty1.referencedTypePath,
+        referencedTypeRootSlug: typeProperty1.referencedTypeRootSlug,
         defaultValue: typeProperty1.defaultValue,
         propertyLevel: typeProperty1.propertyLevel,
         formulaFunction: typeProperty1.formulaFunction,
@@ -235,6 +240,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         typePropertyOptionSetId: optionSetIdByName[typeProperty2.typePropertyOptionSetName],
         formula: typeProperty2.formula,
         referencedTypePath: typeProperty2.referencedTypePath,
+        referencedTypeRootSlug: typeProperty2.referencedTypeRootSlug,
         defaultValue: typeProperty2.defaultValue,
         propertyLevel: typeProperty2.propertyLevel,
         formulaFunction: typeProperty2.formulaFunction,

package/dist/interfaces.d.ts

@@ -302,6 +302,7 @@ export interface ReducedTypeProperty {
     typePropertyOptionSetName: string;
     formula: string;
     referencedTypePath: string;
+    referencedTypeRootSlug: string;
     defaultValue: string;
     propertyLevel: string;
     inherited: boolean;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.21",
+  "version": "2.0.22",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -547,6 +547,7 @@
         "overwrite": {
           "name": "overwrite",
           "type": "boolean",
+          "char": "f",
           "description": "Replaces any existing export files in outDir",
           "required": false,
           "allowNo": false

package/package.json

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