@contrail/cli 3.0.0 → 3.0.2-alpha.1

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.0.0 darwin-x64 node-v18.16.0
+@contrail/cli/3.0.2-alpha.1 darwin-x64 node-v18.17.1
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/commands/types/uploadOptionSets.js

@@ -64,7 +64,7 @@ function loadOptionSets(fromDir) {
 function parseOptionSetValuesToString(optionSet) {
     return (0, lodash_1.cloneDeepWith)(optionSet, (value) => {
         // If the value is an object or array, let cloneDeepWith handle it
-        if ((0, lodash_1.isObject)(value) || (0, lodash_1.isArray)(value)) {
+        if ((0, lodash_1.isObject)(value) || (0, lodash_1.isArray)(value) || typeof value === 'boolean') {
             return undefined;
         }
         // Otherwise, convert the value to string
@@ -74,6 +74,7 @@ function parseOptionSetValuesToString(optionSet) {
 exports.parseOptionSetValuesToString = parseOptionSetValuesToString;
 async function uploadOS(dir) {
     const optionSets = loadOptionSets(dir);
+    validateOptionSets(optionSets);
     const currentOptionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
     });
@@ -126,6 +127,18 @@ async function uploadOS(dir) {
             logger_1.default.error(`Error Uploading OptionSets: ${err}`);
         }
     }
+    function validateOptionSets(optionSets) {
+        optionSets.forEach((optionSet) => {
+            optionSet.optionSet.forEach((option) => {
+                validateOption(option, optionSet.slug);
+            });
+        });
+    }
+    function validateOption(option, slug) {
+        if (typeof option.disabled !== 'boolean') {
+            throw new Error(`Invalid type for "disabled" property: expected a boolean but received "${typeof option.disabled}" for Option Set with slug "${slug}" and value "${option.value}".`);
+        }
+    }
     // for (const currentOptionSet of currentOptionSets) {
     //   try {
     //     const found = newOptionSetsBySlug[currentOptionSet.slug];

package/dist/helpers/load/validators.js

@@ -23,14 +23,17 @@ class LoadValidators {
         if (!config?.federatedMappings?.name) {
             errors.push('"name" is required in the config file');
         }
-        if (!config?.conditionalColumns?.length) {
-            errors.push('Conditional columns with "toProperty": "typePath" and "default": "color" properties are required in the config file');
-        }
-        if (config?.conditionalColumns &&
+        if (config?.conditionalColumns?.length &&
             config?.conditionalColumns[0].toProperty === 'typePath' &&
             config?.conditionalColumns[0].default !== 'color') {
             errors.push('"typePath" must be "color" in the config file');
         }
+        else if (csvHeaders.includes('typePath')) {
+            const hasCorrectTypePath = colorsData.every((row) => row.typePath === 'color');
+            if (!hasCorrectTypePath) {
+                errors.push('"typePath" must be "color" in each row in the csv file');
+            }
+        }
         if (!csvHeaders.includes(config?.federatedMappings?.federatedId)) {
             errors.push(`Federated ID column (${config?.federatedMappings?.federatedId}) not found in the CSV file`);
         }
@@ -74,9 +77,6 @@ class LoadValidators {
         if (!config?.federatedMappings?.name) {
             errors.push('"name" is required in the config file');
         }
-        if (!config?.conditionalColumns?.length) {
-            errors.push('"typePath" is required in the config file');
-        }
         if (!csvHeaders.includes(config?.federatedMappings?.federatedId)) {
             errors.push(`Federated ID column (${config?.federatedMappings?.federatedId}) not found in the CSV file`);
         }
@@ -87,6 +87,23 @@ class LoadValidators {
         if (duplicateFederatedIdErrors.length) {
             errors.push(`Duplicate FederatedIds found: ${duplicateFederatedIdErrors.join(', ')}`);
         }
+        if (Array.isArray(config?.conditionalColumns) && config.conditionalColumns.length) {
+            const hasRequiredConditionalColumn = config.conditionalColumns.some((column) => column.toProperty === 'typePath' &&
+                column.default?.startsWith('custom-entity:') &&
+                column.default?.split(':')[1]?.length > 0);
+            if (!hasRequiredConditionalColumn) {
+                errors.push('"typePath" must be "custom-entity:<subtypepath>" in the config file');
+            }
+        }
+        else if (csvHeaders.includes('typePath')) {
+            const hasCorrectTypePath = customEntityData.every((row) => row.typePath?.startsWith('custom-entity:') && row.typePath?.split(':')[1]?.length > 0);
+            if (!hasCorrectTypePath) {
+                errors.push('"typePath" must be "custom-entity:<subtypepath>" in each row in the csv file');
+            }
+        }
+        else {
+            errors.push('Missing "typePath" column in the csv file or config file');
+        }
         return { errors, warnings };
     }
     static ValidateLineSheetLoadFile(lineSheetData, config) {

package/dist/helpers/load/validators.spec.js

@@ -3,14 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const validators_1 = require("./validators");
 describe('LoadValidators', () => {
     describe('ValidateColorsLoadFile', () => {
-        it('should return multiple errors if properties are missing in the config file', () => {
-            const colorsData = [{ id: 1, name: 'Red', hex: '#FF0000' }];
-            const config = { federatedMappings: { name: 'Colors' } };
-            const result = validators_1.LoadValidators.ValidateColorsLoadFile(colorsData, config);
-            expect(result.errors).toContain('"federatedId" is required in the config file');
-            expect(result.errors).toContain('"loadType" is required in the config file');
-            expect(result.errors).toContain('Conditional columns with "toProperty": "typePath" and "default": "color" properties are required in the config file');
-        });
         it('should return errors if Federated ID is missing in the config file', () => {
             const colorsData = [{ id: 1, name: 'Red', hex: '#FF0000' }];
             const config = {
@@ -116,6 +108,38 @@ describe('LoadValidators', () => {
             const result = validators_1.LoadValidators.ValidateColorsLoadFile(colorsData, config);
             expect(result.errors).toContain('Duplicate FederatedIds found: 1');
         });
+        it('should throw error if typePath is present in the csv header but have incorrect typePath', () => {
+            const colorsData = [{ name: 'color1', typePath: 'color1' }];
+            const config = {
+                loadType: ['COLOR'],
+                conditionalColumns: [],
+                federatedMappings: {
+                    red: 'red',
+                    green: 'green',
+                    blue: 'blue',
+                    name: 'Colors',
+                    federatedId: 'id',
+                },
+            };
+            const result = validators_1.LoadValidators.ValidateColorsLoadFile(colorsData, config);
+            expect(result.errors).toContain('"typePath" must be "color" in each row in the csv file');
+        });
+        it('should not throw error if typepath is present in the csv header and have correct typePath', () => {
+            const colorsData = [{ name: 'color1', typePath: 'color' }];
+            const config = {
+                loadType: ['COLOR'],
+                conditionalColumns: [],
+                federatedMappings: {
+                    red: 'red',
+                    green: 'green',
+                    blue: 'blue',
+                    name: 'name',
+                    federatedId: 'name',
+                },
+            };
+            const result = validators_1.LoadValidators.ValidateColorsLoadFile(colorsData, config);
+            expect(result.errors).toHaveLength(0);
+        });
     });
     describe('ValidateCustomEntityLoadFile', () => {
         it('should return error if config is null', () => {
@@ -150,24 +174,24 @@ describe('LoadValidators', () => {
             const result = validators_1.LoadValidators.ValidateCustomEntityLoadFile(customEntityData, config);
             expect(result.errors).toContain('"name" is required in the config file');
         });
-        it('should return error if conditionalColumns is missing in config', () => {
-            const customEntityData = [{ id: 1, name: 'Test' }];
+        it('should return error if federatedId column is missing in CSV', () => {
+            const customEntityData = [{ name: 'Test' }];
             const config = {
                 loadType: ['CUSTOM_ENTITY'],
                 federatedMappings: { federatedId: 'id', name: 'name' },
+                conditionalColumns: ['typePath'],
             };
             const result = validators_1.LoadValidators.ValidateCustomEntityLoadFile(customEntityData, config);
-            expect(result.errors).toContain('"typePath" is required in the config file');
+            expect(result.errors).toContain('Federated ID column (id) not found in the CSV file');
         });
-        it('should return error if federatedId column is missing in CSV', () => {
-            const customEntityData = [{ name: 'Test' }];
+        it('should return error if conditionalColumns is missing in config', () => {
+            const customEntityData = [{ id: 1, name: 'Test' }];
             const config = {
                 loadType: ['CUSTOM_ENTITY'],
                 federatedMappings: { federatedId: 'id', name: 'name' },
-                conditionalColumns: ['typePath'],
             };
             const result = validators_1.LoadValidators.ValidateCustomEntityLoadFile(customEntityData, config);
-            expect(result.errors).toContain('Federated ID column (id) not found in the CSV file');
+            expect(result.errors).toContain('Missing "typePath" column in the csv file or config file');
         });
         it('should return error if name column is missing in CSV', () => {
             const customEntityData = [{ id: 1 }];
@@ -184,7 +208,7 @@ describe('LoadValidators', () => {
             const config = {
                 loadType: ['CUSTOM_ENTITY'],
                 federatedMappings: { federatedId: 'id', name: 'name' },
-                conditionalColumns: [{ toProperty: 'typePath', default: 'custom-entity' }],
+                conditionalColumns: [{ toProperty: 'typePath', default: 'custom-entity:material' }],
             };
             const result = validators_1.LoadValidators.ValidateCustomEntityLoadFile(customEntityData, config);
             expect(result.errors).toHaveLength(0);
@@ -203,6 +227,26 @@ describe('LoadValidators', () => {
             const result = validators_1.LoadValidators.ValidateCustomEntityLoadFile(customEntityData, config);
             expect(result.errors).toContain('Duplicate FederatedIds found: 1');
         });
+        it('should throw error if typepath is present in the csv header but have incorrect typePath', () => {
+            const customEntityData = [{ name: 'custom-entity1', typePath: 'custom-entity1' }];
+            const config = {
+                loadType: ['CUSTOM_ENTITY'],
+                federatedMappings: { federatedId: 'name', name: 'name' },
+                conditionalColumns: [],
+            };
+            const result = validators_1.LoadValidators.ValidateCustomEntityLoadFile(customEntityData, config);
+            expect(result.errors).toContain('"typePath" must be "custom-entity:<subtypepath>" in each row in the csv file');
+        });
+        it('should not throw error if typepath is present in the csv header but have correct typePath', () => {
+            const customEntityData = [{ name: 'custom-entity1', typePath: 'custom-entity:material' }];
+            const config = {
+                loadType: ['CUSTOM_ENTITY'],
+                federatedMappings: { federatedId: 'name', name: 'name' },
+                conditionalColumns: [],
+            };
+            const result = validators_1.LoadValidators.ValidateCustomEntityLoadFile(customEntityData, config);
+            expect(result.errors).toHaveLength(0);
+        });
     });
     describe('ValidateLineSheetLoadFile', () => {
         it('should return an error if config is empty', () => {

package/dist/helpers/types/uploadOptionSets.spec.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const uploadOptionSets_1 = require("../../commands/types/uploadOptionSets");
 describe('parseOptionSetValuesToString', () => {
-    it('should convert all option set values to strings', () => {
+    it('should convert all option set values to strings except for booleans', () => {
         const input = {
             value1: 123,
             value2: true,
@@ -10,7 +10,7 @@ describe('parseOptionSetValuesToString', () => {
         };
         const expectedOutput = {
             value1: '123',
-            value2: 'true',
+            value2: true,
             value3: { nested: 'object' },
         };
         const result = (0, uploadOptionSets_1.parseOptionSetValuesToString)(input);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.0.0",
+  "version": "3.0.2-alpha.1",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.0.0",
+  "version": "3.0.2-alpha.1",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@contrail/entity-types": "^1.1.17",
-    "@contrail/org-config-migration": "^1.0.3",
+    "@contrail/org-config-migration": "1.1.1-alpha.1",
     "@contrail/sdk": "^1.4.6",
     "@contrail/types": "^3.0.48",
     "@contrail/util": "^1.0.41",
@@ -141,4 +141,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}