@contrail/cli 1.0.14 → 1.0.15

package/src/types/option-set-uploader.ts

@@ -2,9 +2,29 @@ import { Entities } from '@contrail/sdk';
 import { ReducedOptionSet } from './interfaces';
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
 
 const yaml = require('js-yaml');
 
+export async function UploadOptionSets(args) {
+  try {
+    const userConfig = await authUser();
+    console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
+
+    console.log(`%s Uploading`, chalk.yellow.bold('OPTION SETS'));
+    await uploadOptionSets();
+    console.log(`%s Uploaded`, chalk.yellow.bold('OPTION SETS'));
+
+  }
+  catch (e) {
+    console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Types Upload Complete.', chalk.green.bold('COMPLETE'));
+}
+
 function loadOptionSets(){
   const TARGET_DIR = process.cwd();
   try {
@@ -16,7 +36,7 @@ function loadOptionSets(){
   }
 }
 
-export async function uploadOptionSets() {
+async function uploadOptionSets() {
   const optionSets: ReducedOptionSet[] = loadOptionSets();
 
   const currentOptionSets = await new Entities().get({

package/src/types/parse-types.ts

@@ -0,0 +1,104 @@
+import { TypeProcessor } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import * as csvToJson from 'csvtojson';
+import { authUser } from '../auth/login';
+
+const yaml = require('js-yaml');
+
+export async function ParseTypesFromLocalFiles(args) {
+  try {
+    if (args?.length < 4) {
+      throw new Error('File names must be included.');
+    }
+    console.log(`%s Parsing`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    const fileLocations = (args as Array<string>).slice(3);
+    console.log('Using File Location(s): ', fileLocations);
+
+    await parseTypesFromLocalFiles(fileLocations);
+    console.log(`%s Parsed`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+
+  }
+  catch (e) {
+    console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
+}
+
+export async function ParseTypesFromFiles(args) {
+  try {
+    if (args?.length < 4) {
+      throw new Error('File ids must be included.');
+    }
+    console.log(`%s Parsing`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    const fileIds = (args as Array<string>).slice(3);
+    console.log('Using FileId(s): ', fileIds);
+
+    await parseTypesFromFiles(fileIds);
+    console.log(`%s Parsed`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+
+  }
+  catch (e) {
+    console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
+}
+
+async function loadDataFromCSV(fileName) {
+  const CURRENT_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+    const fullPath = CURRENT_DIR + separator + fileName;
+
+    console.log('Getting file from path: ', fullPath);
+    const csvData = await csvToJson.default().fromFile(fullPath);
+
+    return csvData;
+  } catch (e) {
+    throw new Error(`ERROR PARSING CSV: ${e}`);
+  }
+}
+
+async function parseTypesFromLocalFiles(fileLocations: string[]) {
+
+  const csvJSONData: any[] = [];
+  for (const fileLocation of fileLocations) {
+    try {
+      console.log('Getting data for fileLocation: ', fileLocation);
+      const csvData = await loadDataFromCSV(fileLocation);
+
+      console.log(`CSV import was successful. ${csvData?.length} rows found. Adding to total rows.`);
+      csvJSONData.push(...csvData);
+    }
+    catch (e) {
+      console.log('Error importing csv data.', e);
+      throw e;
+    }
+  }
+
+  console.log(`CSV imports were successful. ${csvJSONData?.length} total rows found.`);
+  const suggestions = await new TypeProcessor().GetSuggestedTypes(csvJSONData)
+  saveData({optionSets: suggestions.OptionSets}, 'parsed_optionSets.yml');
+  saveData({typeProperties: suggestions.TypeProperties}, 'parsed_typeProperties.yml');
+}
+
+async function parseTypesFromFiles(fileIds: string[]) {
+  await authUser();
+
+  const suggestions = await new TypeProcessor().GetSuggestedTypesFromFiles({loadFileIds: fileIds})
+
+  saveData({optionSets: suggestions.OptionSets}, 'parsed_optionSets.yml');
+  saveData({typeProperties: suggestions.TypeProperties}, 'parsed_typeProperties.yml');
+}
+
+function saveData(data, name) {
+  const yamlStr = yaml.dump(data);
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+  fs.writeFileSync(CURRENT_DIR + separator + name, yamlStr, 'utf8');
+}

package/src/types/types-extractor.ts

@@ -1,5 +1,5 @@
 import { Entities } from '@contrail/sdk';
-import { ReducedType, ReducedOptionSet, ReducedTypeProperties } from './interfaces';
+import { ReducedType, ReducedOptionSet, ReducedTypeProperty } from './interfaces';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
@@ -21,7 +21,11 @@ export async function getTypes(args) {
     console.log(`%s Retrieved`, chalk.yellow.bold('OPTION SETS'));
     console.log(`%s Retrieving`, chalk.yellow.bold('TYPES'));
 
-    await getReducedTypes(optionSets);
+    const reducedTypes = await getReducedTypes(optionSets);
+    const typesHolder = {
+      types: reducedTypes,
+    };
+    saveData(typesHolder)
 
     console.log(`%s Retrieved`, chalk.yellow.bold('TYPES'));
 
@@ -59,7 +63,7 @@ async function getOptionSets(optionSets) {
   fs.writeFileSync(CURRENT_DIR + separator + 'option_sets.yml', yamlStr, 'utf8');
 }
 
-async function getReducedTypes(optionSets) {
+export async function getReducedTypes(optionSets) {
   const types = await new Entities().get({
     entityName: 'type',
   });
@@ -81,7 +85,7 @@ async function getReducedTypes(optionSets) {
 
     const reducedTypeProperties = [];
     for (const typeProperty of typeWithProperties.typeProperties) {
-      const reducedTypeProperty: ReducedTypeProperties = {
+      const reducedTypeProperty: ReducedTypeProperty = {
         slug: typeProperty.slug,
         id: typeProperty.id,
         isArchived: typeProperty.isArchived,
@@ -114,14 +118,12 @@ async function getReducedTypes(optionSets) {
   }
 
   reducedTypes = reducedTypes.sort((one, two) => (one.typePath < two.typePath ? -1 : 1));
+  return reducedTypes;
+}
 
-  const typesHolder = {
-    types: reducedTypes,
-  };
-
+function saveData(data) {
+  const yamlStr = yaml.dump(data);
   const CURRENT_DIR = process.cwd();
   const separator = getSeparatorByPlatform();
-
-  const yamlStr = yaml.dump(typesHolder);
   fs.writeFileSync(CURRENT_DIR + separator + 'types.yml', yamlStr, 'utf8');
 }

package/src/types/types-properties-merger.ts

@@ -0,0 +1,85 @@
+import { Entities } from '@contrail/sdk';
+import { getReducedTypes } from './types-extractor';
+import { ReducedTypeProperty, ReducedType } from './interfaces';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
+const yaml = require('js-yaml');
+
+export async function MergeTypeProperties(args) {
+  try {
+    if (args?.length < 5) {
+      throw new Error('File name must be included along with a type path.');
+    }
+    console.log(`%s Importing local file`, chalk.yellow.bold('TYPE PROPERTIES MERGE'));
+    const fileLocation = args[3];
+    console.log('Using File: ', fileLocation);
+
+    const typePaths = (args as Array<string>).slice(4);
+    console.log('Using TypePaths: ', typePaths);
+
+    await mergeTypeProperties(fileLocation, typePaths);
+    console.log(`%s Merged`, chalk.yellow.bold('TYPE PROPERTIES MERGE'));
+
+  }
+  catch (e) {
+    console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Merge Complete.', chalk.green.bold('COMPLETE'));
+}
+
+function loadTypeProperties(fileLocation) {
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+
+    const fullPath = TARGET_DIR + separator + fileLocation;
+    console.log('Getting file from path: ', fullPath);
+
+    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
+    return doc.typeProperties;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+async function mergeTypeProperties(fileLocation, typePaths) {
+  const uploadedTypeProperties: ReducedTypeProperty[] = loadTypeProperties(fileLocation);
+
+  await authUser();
+
+  const optionSets = await new Entities().get({
+    entityName: 'type-property-option-set',
+  });
+
+  const reducedTypes = await getReducedTypes(optionSets);
+
+  for (const typePath of typePaths) {
+    const foundType = reducedTypes.find(reducedTypes => reducedTypes.typePath === typePath);
+    if (!foundType){
+      console.log(`%s No Type found for: ${typePath}`, chalk.red.bold('WARNING'));
+    }
+    mergeType(foundType, uploadedTypeProperties)
+  }
+
+  saveData({types: reducedTypes})
+}
+
+function mergeType(reducedType: ReducedType, typePropertiesToAdd: ReducedTypeProperty[]) {
+  for (const typeProperty of typePropertiesToAdd) {
+    const found = reducedType.typeProperties.find(tp => tp.slug === typeProperty.slug)
+    if (!found) {
+      reducedType.typeProperties.push(typeProperty)
+    }
+  }
+}
+
+function saveData(data) {
+  const yamlStr = yaml.dump(data);
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+  fs.writeFileSync(CURRENT_DIR + separator + 'merged_types.yml', yamlStr, 'utf8');
+}

package/src/types/types-uploader.ts

@@ -1,6 +1,5 @@
 import { Entities, Request } from '@contrail/sdk';
-import { ReducedType, ReducedTypeProperties } from './interfaces';
-import { uploadOptionSets } from './option-set-uploader';
+import { ReducedType, ReducedTypeProperty } from './interfaces';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
@@ -14,10 +13,6 @@ export async function uploadTypes(args) {
     const userConfig = await authUser();
     console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
 
-    console.log(`%s Uploading`, chalk.yellow.bold('OPTION SETS'));
-    await uploadOptionSets();
-    console.log(`%s Uploaded`, chalk.yellow.bold('OPTION SETS'));
-
     console.log(`%s Uploading`, chalk.yellow.bold('TYPES'));
     await uploadReducedTypes();
     console.log(`%s Uploaded`, chalk.yellow.bold('TYPES'));

package/.eslint.js

@@ -1,54 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-    node: true
-
-  },
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/eslint-recommended',
-    'plugin:@typescript-eslint/recommended'
-  ],
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module'
-  },
-  plugins: [
-    '@typescript-eslint',
-    'unused-imports'
-  ],
-  rules: {
-    indent: [
-      'error',
-      2
-    ],
-    'linebreak-style': [
-      'error',
-      'unix'
-    ],
-    'quote-props': ['error', 'as-needed'],
-    quotes: [
-      'error',
-      'single'
-    ],
-    semi: [
-      'error',
-      'always'
-    ],
-    'no-multiple-empty-lines': ['error', { max: 1, maxEOF: 0 }],
-    'no-trailing-spaces': 'error',
-    'no-mixed-spaces-and-tabs': ['error', 'smart-tabs'],
-    '@typescript-eslint/no-empty-function': ['error', { allow: ['arrowFunctions'] }],
-    '@typescript-eslint/no-explicit-any': 'off',
-    '@typescript-eslint/no-var-requires': 'warn',
-    'no-unused-vars': 'off',
-    'unused-imports/no-unused-imports': 'error',
-    'unused-imports/no-unused-vars': [
-      'warn',
-      { vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' }
-    ]
-  }
-};
-

package/.eslintrc.js

@@ -1,20 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-    }
-}

package/lib/types/parse-optionSet.d.ts

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

package/lib/types/parse-optionSet.js

@@ -1,79 +0,0 @@
-import { StringUtil } from '@contrail/util';
-import chalk from 'chalk';
-import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
-import * as csvToJson from 'csvtojson';
-const yaml = require('js-yaml');
-export async function parseOptionSet(args) {
-    try {
-        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
-            throw new Error('File name must be included.');
-        }
-        console.log(`%s Parsing`, chalk.yellow.bold('OPTION SETS'));
-        await parseOptionSets(args[3]);
-        console.log(`%s Parsed`, chalk.yellow.bold('OPTION SETS'));
-    }
-    catch (e) {
-        console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
-        return;
-    }
-    console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
-}
-async function loadDataFromCSV(fileName) {
-    const CURRENT_DIR = process.cwd();
-    try {
-        const separator = getSeparatorByPlatform();
-        const csvData = await csvToJson.default().fromFile(CURRENT_DIR + separator + fileName);
-        return csvData;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING CSV: ${e}`);
-    }
-}
-export async function parseOptionSets(fileName) {
-    const csvData = await loadDataFromCSV(fileName);
-    const removedFields = new Set();
-    const valuesByFieldName = {};
-    for (const row of csvData) {
-        for (const [key, value] of Object.entries(row)) {
-            // Dont parse boolean fields - later log removed fields
-            if (value.toLowerCase() === 'false' || value.toLowerCase() === 'true') {
-                removedFields.add(key);
-                continue;
-            }
-            if (!value) {
-                continue;
-            }
-            if (!valuesByFieldName[key]) {
-                valuesByFieldName[key] = new Set();
-            }
-            valuesByFieldName[key].add(value);
-        }
-    }
-    for (const removed of removedFields.values()) {
-        console.log(`Removed Boolean Field: ${removed}`);
-    }
-    const reducedOptionSets = [];
-    for (const [key, value] of Object.entries(valuesByFieldName)) {
-        const optionSet = [];
-        for (const entry of value.values()) {
-            optionSet.push({
-                value: StringUtil.convertToCamelCase(entry),
-                display: isUpperCase(entry) ? entry : StringUtil.convertToTitleCase(entry),
-            });
-        }
-        const reducedOptionSet = {
-            name: StringUtil.convertToTitleCase(key),
-            isArchived: false,
-            optionSet,
-        };
-        reducedOptionSets.push(reducedOptionSet);
-    }
-    const yamlStr = yaml.dump(reducedOptionSets);
-    const CURRENT_DIR = process.cwd();
-    const separator = getSeparatorByPlatform();
-    fs.writeFileSync(CURRENT_DIR + separator + 'parsed_option_sets.yml', yamlStr, 'utf8');
-}
-function isUpperCase(str) {
-    return str === str.toUpperCase();
-}

package/option_sets.yml

@@ -1,15 +0,0 @@
-optionSets:
-  - name: Collection
-    isArchived: false
-    optionSet:
-      - value: collection_1
-        display: Collection 1
-      - value: collection_2
-        display: Collection 2
-  - name: Gender
-    isArchived: false
-    optionSet:
-      - value: womens
-        display: Women's
-      - value: mens
-        display: Men's

package/src/types/parse-optionSet.ts

@@ -1,96 +0,0 @@
-import { StringUtil } from '@contrail/util';
-import { ReducedOptionSet } from './interfaces';
-import chalk from 'chalk';
-import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
-import * as csvToJson from 'csvtojson';
-
-const yaml = require('js-yaml');
-
-export async function parseOptionSet(args) {
-  try {
-    if (args?.length < 4) {
-      throw new Error('File name must be included.');
-    }
-    console.log(`%s Parsing`, chalk.yellow.bold('OPTION SETS'));
-    await parseOptionSets(args[3]);
-    console.log(`%s Parsed`, chalk.yellow.bold('OPTION SETS'));
-
-  }
-  catch (e) {
-    console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
-}
-
-async function loadDataFromCSV(fileName) {
-  const CURRENT_DIR = process.cwd();
-  try {
-    const separator = getSeparatorByPlatform();
-    const csvData = await csvToJson.default().fromFile(CURRENT_DIR + separator + fileName);
-
-    return csvData;
-  } catch (e) {
-    throw new Error(`ERROR PARSING CSV: ${e}`);
-  }
-}
-
-export async function parseOptionSets(fileName) {
-  const csvData = await loadDataFromCSV(fileName);
-
-  const removedFields = new Set<string>();
-  const valuesByFieldName = {};
-  for (const row of csvData) {
-    for (const [key, value] of Object.entries(row)) {
-
-      // Dont parse boolean fields - later log removed fields
-      if ((value as string).toLowerCase() === 'false' || (value as string).toLowerCase() === 'true') {
-        removedFields.add(key);
-        continue;
-      }
-
-      if (!value) {
-        continue;
-      }
-
-      if (!valuesByFieldName[key]) {
-        valuesByFieldName[key] = new Set<string>();
-      }
-      (valuesByFieldName[key] as Set<string>).add(value as string);
-    }
-  }
-
-  for (const removed of removedFields.values()) {
-    console.log(`Removed Boolean Field: ${removed}`);
-  }
-
-  const reducedOptionSets = [];
-  for (const [key, value] of Object.entries(valuesByFieldName)) {
-    const optionSet = [];
-    for (const entry of (value as Set<string>).values()) {
-      optionSet.push({
-        value: StringUtil.convertToCamelCase(entry),
-        display: isUpperCase(entry) ? entry : StringUtil.convertToTitleCase(entry), // if all uppercase dont convert
-      });
-    }
-
-    const reducedOptionSet: ReducedOptionSet = {
-      name: StringUtil.convertToTitleCase(key),
-      isArchived: false,
-      optionSet,
-    };
-
-    reducedOptionSets.push(reducedOptionSet);
-  }
-
-  const yamlStr = yaml.dump(reducedOptionSets);
-  const CURRENT_DIR = process.cwd();
-  const separator = getSeparatorByPlatform();
-  fs.writeFileSync(CURRENT_DIR + separator + 'parsed_option_sets.yml', yamlStr, 'utf8');
-}
-
-function isUpperCase(str) {
-  return str === str.toUpperCase();
-}

package/test/actions/exampleAction.d.ts

@@ -1 +0,0 @@
-export {};

package/test/actions/exampleAction.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-async function execute(config, event, Functions) {
-    const getBodyFromEvent = (config, event) => {
-        let body = Functions.stringUtil.parseVariables(config.message, event);
-        console.log('body: ', body);
-        if (config.sendDetails) {
-            const data = event;
-            const properties = {};
-            let addedProperty = false;
-            for (const property of config.fieldsToForward) {
-                const variableLevels = property.split('.');
-                let replacementValue = data;
-                for (let i = 0; i < variableLevels.length; i++) {
-                    replacementValue = replacementValue[variableLevels[i]];
-                }
-                properties[property] = replacementValue;
-                addedProperty = true;
-            }
-            if (addedProperty) {
-                body = body + ' Properties: ' + JSON.stringify(properties) + '.';
-            }
-        }
-        return JSON.stringify({ text: body });
-    };
-    const body = getBodyFromEvent(config, event);
-    console.log('Sending message: ', body);
-    const response = await Functions.fetch(config.url, {
-        method: 'POST',
-        body: body,
-        headers: { 'Content-Type': 'application/json' }
-    });
-    if (!response.ok) {
-        console.log('Webhook event failed to publish');
-        console.log('Response: ', JSON.stringify(response));
-    }
-    else {
-        console.log('Published!');
-    }
-}

package/test/actions/exampleAction.ts

@@ -1,39 +0,0 @@
-export { } // Leave empty export - This allows for multiple files with a function named execute.
-async function execute(config, event, Functions) {
-  const getBodyFromEvent = (config, event) => {
-    let body = Functions.stringUtil.parseVariables(config.message, event);
-    console.log('body: ', body);
-    if (config.sendDetails) {
-      const data = event;
-      const properties = {};
-      let addedProperty = false;
-      for (const property of config.fieldsToForward) {
-        const variableLevels = property.split('.');
-        let replacementValue = data;
-        for (let i = 0; i < variableLevels.length; i++) {
-          replacementValue = replacementValue[variableLevels[i]];
-        }
-        properties[property] = replacementValue;
-        addedProperty = true;
-      }
-      if (addedProperty) {
-        body = body + ' Properties: ' + JSON.stringify(properties) + '.';
-      }
-    }
-    return JSON.stringify({ text: body });
-  };
-  const body = getBodyFromEvent(config, event);
-  console.log('Sending message: ', body);
-  const response = await Functions.fetch(config.url, {
-    method: 'POST',
-    body: body,
-    headers: { 'Content-Type': 'application/json' }
-  });
-  if (!response.ok) {
-    console.log('Webhook event failed to publish');
-    console.log('Response: ', JSON.stringify(response));
-  }
-  else {
-    console.log('Published!');
-  }
-}