@contrail/cli 1.0.49 → 1.0.51

package/lib/cli.js

@@ -4,6 +4,7 @@ import { getTypes } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
 import { UploadOptionSets } from './types/option-set-uploader';
 import { ParseOptionSetsLocalFiles } from './types/option-set-parser';
+import { ParseOptionSetsHierarchyLocalFiles, UploadOptionSetsHierarchyLocalFiles } from './types/option-set-hierarchy-parser';
 import { MergeOptionSets } from './types/option-set-merger';
 import { MergeTypeProperties } from './types/types-properties-merger';
 import { ParseTypesFromFiles, ParseTypesFromLocalFiles, ParseTypesFromTemplateFromLocalFiles, ParseTypesFromTemplateAndDataFromLocalFiles } from './types/parse-types';
@@ -91,6 +92,14 @@ export async function cli(args) {
                     ParseOptionSetsLocalFiles(args);
                     break;
                 }
+                case 'parseOptionSetsHierarchyLocalFiles': {
+                    ParseOptionSetsHierarchyLocalFiles(args);
+                    break;
+                }
+                case 'uploadOptionSetsHierarchyLocalFiles': {
+                    UploadOptionSetsHierarchyLocalFiles(args);
+                    break;
+                }
                 case 'parseTypesFromLocalFiles': {
                     ParseTypesFromLocalFiles(args);
                     break;
@@ -358,7 +367,15 @@ const helpSections = [
             },
             {
                 name: 'parseOptionSetsLocalFiles <File Paths>',
-                summary: 'Parse CSV files into OptionSets'
+                summary: 'Parse CSV files into OptionSets.'
+            },
+            {
+                name: 'parseOptionSetsHierarchyLocalFiles <File Paths>',
+                summary: 'Parse CSV files into OptionSetHierarchies.'
+            },
+            {
+                name: 'uploadOptionSetsHierarchyLocalFiles <File Paths> <name>',
+                summary: 'upload CSV files into OptionSetHierarchies.'
             },
             {
                 name: 'parseTypesFromLocalFiles <File Paths>',

package/lib/loader-process/loader-process.js

@@ -76,7 +76,7 @@ async function getLocalUploadConfig(configFileName) {
 async function uploadFile(incomingFileName) {
     const csvContent = await getLocalFile(incomingFileName);
     const entities = new Entities();
-    const fileName = `${incomingFileName.slice(0, incomingFileName.length - 5)}-Upload-${new Date().getTime()}.csv`;
+    const fileName = `${incomingFileName.slice(0, incomingFileName.length - 4)}-Upload-${new Date().getTime()}.csv`;
     const file = await entities.create({
         entityName: 'file',
         object: { contentType: 'text/csv', fileName: fileName, ttl: 24 * 60 * 60 * 1000 }

package/lib/types/option-set-hierarchy-parser.d.ts

@@ -0,0 +1,2 @@
+export declare function ParseOptionSetsHierarchyLocalFiles(args: any): Promise<void>;
+export declare function UploadOptionSetsHierarchyLocalFiles(args: any): Promise<void>;

package/lib/types/option-set-hierarchy-parser.js

@@ -0,0 +1,140 @@
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import chalk from 'chalk';
+const csv = require('csvtojson');
+import { Entities } from '@contrail/sdk';
+import { StringUtil } from '@contrail/util';
+import { authUser } from '../auth/login';
+export async function ParseOptionSetsHierarchyLocalFiles(args) {
+    try {
+        await authUser();
+        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+            throw new Error('File name must be included.');
+        }
+        console.log('%s Importing local file', chalk.yellow.bold('OPTION SET HIERARCHY PARSE'));
+        const fileLocation = args[3];
+        console.log('Using File: ', fileLocation);
+        await parseAndSaveOptionSetHierarchiesLocalFiles(fileLocation);
+        console.log('%s Parsed', chalk.yellow.bold('OPTION SET HIERARCHY PARSE'));
+    }
+    catch (e) {
+        console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s PARSE Complete.', chalk.green.bold('COMPLETE'));
+}
+export async function UploadOptionSetsHierarchyLocalFiles(args) {
+    try {
+        await authUser();
+        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+            throw new Error('File name must be included.');
+        }
+        console.log('%s Importing local file', chalk.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
+        const fileLocation = args[3];
+        const name = args[4];
+        console.log('Using File: ', fileLocation);
+        console.log('Using Name: ', name);
+        await uploadOptionSetHierarchiesLocalFiles(fileLocation, name);
+        console.log('%s Uploaded', chalk.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
+    }
+    catch (e) {
+        console.log(`%s UPLOAD Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s UPLOAD Complete.', chalk.green.bold('COMPLETE'));
+}
+async function loadOptionSetHierarchyCSV(fileLocation) {
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = TARGET_DIR + separator + fileLocation;
+        console.log('Getting file from path: ', fullPath);
+        return await csv().fromFile(fullPath);
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING CSV: ${e}`);
+    }
+}
+async function parseOptionSetHierarchiesLocalFiles(fileLocation) {
+    const uploadedOptionHierarchyData = await loadOptionSetHierarchyCSV(fileLocation);
+    const optionSetHierarchy = {
+        hierarchy: [],
+        maxDepth: 0,
+        name: 'No Name',
+        options: []
+    };
+    if (!((uploadedOptionHierarchyData === null || uploadedOptionHierarchyData === void 0 ? void 0 : uploadedOptionHierarchyData.length) > 0)) {
+        return optionSetHierarchy;
+    }
+    const keysInOrder = Object.keys(uploadedOptionHierarchyData[0]);
+    const currentOptionSets = await new Entities().get({
+        entityName: 'type-property-option-set',
+    });
+    const currentOptionSetsByName = {};
+    for (const currentOptionSet of currentOptionSets) {
+        currentOptionSetsByName[StringUtil.convertToCamelCase(currentOptionSet.name)] = currentOptionSet;
+    }
+    const optionSetIds = [];
+    for (const key of keysInOrder) {
+        if (currentOptionSetsByName[key]) {
+            optionSetIds.push(currentOptionSetsByName[key].id);
+        }
+        else {
+            throw new Error(`No OptionSet found for ${key}`);
+        }
+    }
+    optionSetHierarchy.maxDepth = keysInOrder.length;
+    optionSetHierarchy.hierarchy = optionSetIds;
+    for (const row of uploadedOptionHierarchyData) {
+        addRowToOptions(optionSetHierarchy, keysInOrder, row);
+    }
+    return optionSetHierarchy;
+}
+async function parseAndSaveOptionSetHierarchiesLocalFiles(fileLocation) {
+    const optionSetHierarchy = await parseOptionSetHierarchiesLocalFiles(fileLocation);
+    saveData(optionSetHierarchy.options);
+}
+async function uploadOptionSetHierarchiesLocalFiles(fileLocation, name) {
+    const optionSetHierarchy = await parseOptionSetHierarchiesLocalFiles(fileLocation);
+    optionSetHierarchy.name = name;
+    const currentOptionSetHierarchies = await new Entities().get({
+        entityName: 'option-set-hierarchy',
+    });
+    const existing = currentOptionSetHierarchies.find(osh => osh.name === name);
+    if (existing) {
+        console.log('Updating: ', optionSetHierarchy.name);
+        await new Entities().update({
+            entityName: 'option-set-hierarchy',
+            id: existing.id,
+            object: optionSetHierarchy,
+        });
+    }
+    else {
+        console.log('Creating: ', optionSetHierarchy.name);
+        await new Entities().create({
+            entityName: 'option-set-hierarchy',
+            object: optionSetHierarchy,
+        });
+    }
+}
+function addRowToOptions(optionSetHierarchy, keysInOrder, row) {
+    let options = optionSetHierarchy.options;
+    for (let i = 0; i < keysInOrder.length; i++) {
+        const optionValues = options.map(op => op.value);
+        const value = row[keysInOrder[i]];
+        if (!optionValues.includes(value)) {
+            const obj = i === (keysInOrder.length - 1) ? { value: value } : { value: value, options: [] };
+            options.push(obj);
+            options = obj.options;
+        }
+        else {
+            const optionObj = options.find(op => op.value === value);
+            options = optionObj.options;
+        }
+    }
+}
+function saveData(data) {
+    const CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    fs.writeFileSync(CURRENT_DIR + separator + 'parsed_local_optionSetHierarchy.json', JSON.stringify(data), 'utf8');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

package/src/cli.ts

@@ -5,6 +5,7 @@ import { getTypes } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
 import { UploadOptionSets } from './types/option-set-uploader';
 import { ParseOptionSetsLocalFiles } from './types/option-set-parser';
+import { ParseOptionSetsHierarchyLocalFiles, UploadOptionSetsHierarchyLocalFiles } from './types/option-set-hierarchy-parser';
 import { MergeOptionSets } from './types/option-set-merger';
 import { MergeTypeProperties } from './types/types-properties-merger';
 import { ParseTypesFromFiles, ParseTypesFromLocalFiles, ParseTypesFromTemplateFromLocalFiles, ParseTypesFromTemplateAndDataFromLocalFiles } from './types/parse-types';
@@ -101,6 +102,14 @@ export async function cli(args) {
       ParseOptionSetsLocalFiles(args);
       break;
     }
+    case 'parseOptionSetsHierarchyLocalFiles': {
+      ParseOptionSetsHierarchyLocalFiles(args);
+      break;
+    }
+    case 'uploadOptionSetsHierarchyLocalFiles': {
+      UploadOptionSetsHierarchyLocalFiles(args);
+      break;
+    }
     case 'parseTypesFromLocalFiles': {
       ParseTypesFromLocalFiles(args);
       break;
@@ -373,7 +382,15 @@ const helpSections = [
       },
       {
         name: 'parseOptionSetsLocalFiles <File Paths>',
-        summary: 'Parse CSV files into OptionSets'
+        summary: 'Parse CSV files into OptionSets.'
+      },
+      {
+        name: 'parseOptionSetsHierarchyLocalFiles <File Paths>',
+        summary: 'Parse CSV files into OptionSetHierarchies.'
+      },
+      {
+        name: 'uploadOptionSetsHierarchyLocalFiles <File Paths> <name>',
+        summary: 'upload CSV files into OptionSetHierarchies.'
       },
       {
         name: 'parseTypesFromLocalFiles <File Paths>',

package/src/loader-process/loader-process.ts

@@ -92,7 +92,7 @@ async function uploadFile(incomingFileName) {
   const csvContent = await getLocalFile(incomingFileName);
 
   const entities = new Entities();
-  const fileName = `${incomingFileName.slice(0, incomingFileName.length - 5)}-Upload-${new Date().getTime()}.csv`;
+  const fileName = `${incomingFileName.slice(0, incomingFileName.length - 4)}-Upload-${new Date().getTime()}.csv`;
   const file = await entities.create({
     entityName: 'file',
     object: { contentType: 'text/csv', fileName: fileName, ttl: 24 * 60 * 60 * 1000 }

package/src/types/option-set-hierarchy-parser.ts

@@ -0,0 +1,169 @@
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import chalk from 'chalk';
+const csv = require('csvtojson');
+import { Entities } from '@contrail/sdk';
+import { StringUtil } from '@contrail/util';
+import { authUser } from '../auth/login';
+
+export async function ParseOptionSetsHierarchyLocalFiles(args) {
+  try {
+    await authUser();
+
+    if (args?.length < 4) {
+      throw new Error('File name must be included.');
+    }
+    console.log('%s Importing local file', chalk.yellow.bold('OPTION SET HIERARCHY PARSE'));
+    const fileLocation = args[3];
+    console.log('Using File: ', fileLocation);
+
+    await parseAndSaveOptionSetHierarchiesLocalFiles(fileLocation);
+    console.log('%s Parsed', chalk.yellow.bold('OPTION SET HIERARCHY PARSE'));
+
+  }
+  catch (e) {
+    console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s PARSE Complete.', chalk.green.bold('COMPLETE'));
+}
+
+export async function UploadOptionSetsHierarchyLocalFiles(args) {
+  try {
+    await authUser();
+
+    if (args?.length < 4) {
+      throw new Error('File name must be included.');
+    }
+    console.log('%s Importing local file', chalk.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
+    const fileLocation = args[3];
+    const name = args[4];
+    console.log('Using File: ', fileLocation);
+    console.log('Using Name: ', name);
+
+    await uploadOptionSetHierarchiesLocalFiles(fileLocation, name);
+    console.log('%s Uploaded', chalk.yellow.bold('OPTION SET HIERARCHY UPLOAD'));
+
+  }
+  catch (e) {
+    console.log(`%s UPLOAD Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s UPLOAD Complete.', chalk.green.bold('COMPLETE'));
+}
+
+async function loadOptionSetHierarchyCSV(fileLocation) {
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+
+    const fullPath = TARGET_DIR + separator + fileLocation;
+    console.log('Getting file from path: ', fullPath);
+
+    return await csv().fromFile(fullPath);
+  } catch (e) {
+    throw new Error(`ERROR PARSING CSV: ${e}`);
+  }
+}
+
+async function parseOptionSetHierarchiesLocalFiles(fileLocation) {
+  const uploadedOptionHierarchyData = await loadOptionSetHierarchyCSV(fileLocation);
+
+  const optionSetHierarchy = {
+    hierarchy:[],
+    maxDepth: 0,
+    name: 'No Name',
+    options: []
+  };
+
+  if (!(uploadedOptionHierarchyData?.length > 0)) {
+    return optionSetHierarchy;
+  }
+
+  const keysInOrder = Object.keys(uploadedOptionHierarchyData[0]);
+  const currentOptionSets = await new Entities().get({
+    entityName: 'type-property-option-set',
+  });
+
+  const currentOptionSetsByName = {};
+  for (const currentOptionSet of currentOptionSets) {
+    currentOptionSetsByName[StringUtil.convertToCamelCase(currentOptionSet.name)] = currentOptionSet;
+  }
+
+  const optionSetIds = [];
+  for(const key of keysInOrder) {
+    if (currentOptionSetsByName[key]) {
+      optionSetIds.push(currentOptionSetsByName[key].id);
+    }
+    else {
+      throw new Error(`No OptionSet found for ${key}`);
+    }
+  }
+
+  optionSetHierarchy.maxDepth = keysInOrder.length;
+  optionSetHierarchy.hierarchy = optionSetIds;
+
+  for (const row of uploadedOptionHierarchyData) {
+    addRowToOptions(optionSetHierarchy, keysInOrder, row);
+  }
+
+  return optionSetHierarchy;
+}
+
+async function parseAndSaveOptionSetHierarchiesLocalFiles(fileLocation) {
+  const optionSetHierarchy = await parseOptionSetHierarchiesLocalFiles(fileLocation);
+  saveData(optionSetHierarchy.options);
+}
+
+async function uploadOptionSetHierarchiesLocalFiles(fileLocation, name) {
+  const optionSetHierarchy = await parseOptionSetHierarchiesLocalFiles(fileLocation);
+  optionSetHierarchy.name = name;
+
+  const currentOptionSetHierarchies = await new Entities().get({
+    entityName: 'option-set-hierarchy',
+  });
+
+  const existing = currentOptionSetHierarchies.find(osh => osh.name === name);
+
+  if (existing) {
+    console.log('Updating: ', optionSetHierarchy.name);
+    await new Entities().update({
+      entityName: 'option-set-hierarchy',
+      id: existing.id,
+      object: optionSetHierarchy,
+    });
+  }
+  else {
+    console.log('Creating: ', optionSetHierarchy.name);
+    await new Entities().create({
+      entityName: 'option-set-hierarchy',
+      object: optionSetHierarchy,
+    });
+  }
+}
+
+function addRowToOptions(optionSetHierarchy, keysInOrder, row) {
+  let options: any[] = optionSetHierarchy.options;
+
+  for (let i = 0; i < keysInOrder.length; i++) {
+    const optionValues = options.map(op => op.value);
+    const value = row[keysInOrder[i]];
+    if (!optionValues.includes(value)) {
+      const obj = i === (keysInOrder.length - 1) ? {value: value} : {value: value, options: []};
+      options.push(obj);
+      options = obj.options;
+    }
+    else {
+      const optionObj = options.find(op => op.value === value);
+      options = optionObj.options;
+    }
+  }
+}
+
+function saveData(data) {
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+  fs.writeFileSync(CURRENT_DIR + separator + 'parsed_local_optionSetHierarchy.json', JSON.stringify(data), 'utf8');
+}