@contrail/cli 1.0.63 → 1.0.64

package/lib/types/types-extractor.d.ts

@@ -8,49 +8,20 @@ export interface DataHolder {
     typePropertyPolicies: any[];
     typePropertyPolicyLinks: any[];
 }
+export interface ReducedDataHolder {
+    reducedTypes: any[];
+    reducedOptionSets: any[];
+    reducedOptionSetHierarchies: any[];
+    reducedRuleSets: any[];
+    reducedRuleSetLinks: any[];
+    reducedUsageInfo: any[];
+    reducedTypePropertyPolicies: any[];
+    reducedTypePropertyPolicyLinks: any[];
+}
 export declare function getAll(args: any): Promise<void>;
 /**
  *  stores reduced option sets and returns full option sets */
 export declare function getOptionSets(): Promise<any>;
 export declare function getTypes(): Promise<any[]>;
 export declare function reduceTypes(dataHolder: DataHolder): any[];
-export declare function reduceData(data: DataHolder): {
-    reducedTypes: any[];
-    reducedOptionSets: {
-        name: any;
-        isArchived: any;
-        optionSet: any;
-    }[];
-    reducedOptionSetHierarchies: {
-        hierarchy: any;
-        options: any;
-        name: any;
-    }[];
-    reducedRuleSets: {
-        ruleSet: any;
-        name: any;
-    }[];
-    reducedRuleSetLinks: any[];
-    reducedUsageInfo: {
-        used: any;
-        editable: any;
-        formulaFunction: any;
-        validationFunction: any;
-        numberFormat: any;
-        defaultValue: any;
-        label: any;
-        typeSlug: any;
-        typePropertySlug: any;
-    }[];
-    reducedTypePropertyPolicies: {
-        label: any;
-        policy: {
-            version: any;
-            statements: any;
-        };
-    }[];
-    reducedTypePropertyPolicyLinks: {
-        typePropertySlug: any;
-        typePropertyPolicyLabel: any;
-    }[];
-};
+export declare function reduceData(data: DataHolder): ReducedDataHolder;

package/lib/types/types-extractor.js

@@ -247,9 +247,38 @@ export function reduceData(data) {
         reducedTypePropertyPolicyLinks: reduceTypePropertyPolicyLinks(data),
     };
 }
+const saveTypesFunction = function (data, dir) {
+    const roots = {};
+    for (const type of data.reducedTypes) {
+        const typePathParts = type.typePath.split(':');
+        if (!typePathParts) {
+            console.warn('skipping bad type with no path', type);
+        }
+        const root = typePathParts[0];
+        if (roots[root]) {
+            roots[root].push(type);
+        }
+        else {
+            roots[root] = [type];
+        }
+    }
+    for (const [root, types] of Object.entries(roots)) {
+        const CURRENT_DIR = process.cwd();
+        const subDir = path.join(CURRENT_DIR, dir, 'types');
+        if (!fs.existsSync(subDir)) {
+            fs.mkdirSync(subDir);
+        }
+        const yamlStr = yaml.dump(types);
+        const fileLabel = root;
+        if (!fileLabel) {
+            console.warn('skipping bad type root:', root);
+        }
+        fs.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
+    }
+};
 function saveData(reducedData, dir) {
     const propertyToFolderMap = {
-        reducedTypes: { filename: 'types', split: true, fileLabel: 'slug' },
+        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' },
         reducedRuleSets: { filename: 'rule-sets', split: true, fileLabel: 'name' },
@@ -260,7 +289,10 @@ function saveData(reducedData, dir) {
     };
     for (const [key, folder] of Object.entries(propertyToFolderMap)) {
         const CURRENT_DIR = process.cwd();
-        if (folder.split) {
+        if (folder['saveFunction']) {
+            folder['saveFunction'](reducedData, dir);
+        }
+        else if (folder.split) {
             const subDir = path.join(CURRENT_DIR, dir, folder.filename);
             if (!fs.existsSync(subDir)) {
                 fs.mkdirSync(subDir);

package/lib/types/types-uploader.js

@@ -25,7 +25,7 @@ function loadReducedTypes() {
         const files = fs.readdirSync(path.join(TARGET_DIR, 'types'));
         const types = [];
         for (const file of files) {
-            types.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'types', file), 'utf8')));
+            types.push(...yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'types', file), 'utf8')));
         }
         return types;
     }

package/package.json

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

package/src/types/types-extractor.ts

@@ -8,6 +8,10 @@ import pLimit from 'p-limit';
 const limit = pLimit(30);
 
 const yaml = require('js-yaml');
+interface StoreFunction
+{
+    (data: ReducedDataHolder, dir: string): void;
+}
 
 export interface DataHolder {
   types: any[],
@@ -20,6 +24,17 @@ export interface DataHolder {
   typePropertyPolicyLinks: any[],
 }
 
+export interface ReducedDataHolder {
+  reducedTypes: any[],
+  reducedOptionSets: any[],
+  reducedOptionSetHierarchies: any[],
+  reducedRuleSets: any[],
+  reducedRuleSetLinks: any[],
+  reducedUsageInfo: any[],
+  reducedTypePropertyPolicies: any[],
+  reducedTypePropertyPolicyLinks: any[],
+}
+
 export async function getAll(args) {
   try {
     const userConfig = await authUser();
@@ -268,7 +283,7 @@ export function reduceTypes(dataHolder: DataHolder) {
   return reducedTypes;
 }
 
-export function reduceData(data: DataHolder) {
+export function reduceData(data: DataHolder): ReducedDataHolder {
   return {
     reducedTypes: reduceTypes(data),
     reducedOptionSets: reduceOptionSets(data),
@@ -281,10 +296,40 @@ export function reduceData(data: DataHolder) {
   };
 }
 
+const saveTypesFunction: StoreFunction = function (data: ReducedDataHolder, dir: string) {
+  const roots = {};
+  for(const type of data.reducedTypes) {
+    const typePathParts = type.typePath.split(':');
+    if(!typePathParts) {
+      console.warn('skipping bad type with no path', type);
+    }
+    const root = typePathParts[0];
+    if(roots[root]) {
+      roots[root].push(type);
+    } else {
+      roots[root] = [type];
+    }
+  }
+  for(const [root, types] of Object.entries(roots)) {
+    const CURRENT_DIR = process.cwd();
+    const subDir = path.join(CURRENT_DIR, dir, 'types');
+    if(!fs.existsSync(subDir)) {
+      fs.mkdirSync(subDir);
+    }
+    const yamlStr = yaml.dump(types);
+    const fileLabel = root;
+    if(!fileLabel) {
+      console.warn('skipping bad type root:', root);
+    }
+    fs.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
+  }
+
+};
+
 function saveData(reducedData, dir: string) {
 
   const propertyToFolderMap = {
-    reducedTypes: { filename: 'types', split: true, fileLabel: 'slug' },
+    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' },
     reducedRuleSets: { filename: 'rule-sets', split: true, fileLabel: 'name' },
@@ -295,7 +340,9 @@ function saveData(reducedData, dir: string) {
   };
   for(const [key, folder] of Object.entries(propertyToFolderMap)) {
     const CURRENT_DIR = process.cwd();
-    if(folder.split) {
+    if(folder['saveFunction']) {
+      folder['saveFunction'](reducedData, dir);
+    } else if(folder.split) {
       const subDir = path.join(CURRENT_DIR, dir, folder.filename);
       if(!fs.existsSync(subDir)) {
         fs.mkdirSync(subDir);

package/src/types/types-uploader.ts

@@ -32,7 +32,7 @@ function loadReducedTypes(){
     const files = fs.readdirSync(path.join(TARGET_DIR, 'types'));
     const types = [];
     for(const file of files) {
-      types.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'types', file), 'utf8')));
+      types.push(...yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'types', file), 'utf8')));
     }
     return types;
   } catch (e) {