@contrail/cli 3.5.2 → 3.5.3-alpha.8e9fe43

package/node_modules/@contrail/org-config-migration/lib/users/import.js

@@ -1,41 +1,41 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadUsers = void 0;
-const sdk_1 = require("@contrail/sdk");
-const p_limit_1 = __importDefault(require("p-limit"));
-const limit = (0, p_limit_1.default)(5);
-function uploadUsers(users, entitiesInstance = new sdk_1.Entities()) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield Promise.all(users.map((user) => limit(() => __awaiter(this, void 0, void 0, function* () {
-            const { email } = user, rest = __rest(user, ["email"]);
-            yield entitiesInstance.create({
-                entityName: 'user-org',
-                object: Object.assign({ userEmail: email }, rest),
-            });
-        }))));
-    });
-}
-exports.uploadUsers = uploadUsers;
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadUsers = void 0;
+const sdk_1 = require("@contrail/sdk");
+const p_limit_1 = __importDefault(require("p-limit"));
+const limit = (0, p_limit_1.default)(5);
+function uploadUsers(users, entitiesInstance = new sdk_1.Entities()) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield Promise.all(users.map((user) => limit(() => __awaiter(this, void 0, void 0, function* () {
+            const { email } = user, rest = __rest(user, ["email"]);
+            yield entitiesInstance.create({
+                entityName: 'user-org',
+                object: Object.assign({ userEmail: email }, rest),
+            });
+        }))));
+    });
+}
+exports.uploadUsers = uploadUsers;

package/node_modules/@contrail/org-config-migration/lib/users/index.d.ts

@@ -1,2 +1,2 @@
-export * from './export';
-export * from './import';
+export * from './export';
+export * from './import';

package/node_modules/@contrail/org-config-migration/lib/users/index.js

@@ -1,18 +1,18 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./export"), exports);
-__exportStar(require("./import"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./export"), exports);
+__exportStar(require("./import"), exports);

package/node_modules/@contrail/org-config-migration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/org-config-migration",
-  "version": "1.1.13",
+  "version": "1.2.0",
   "description": "A collection of utilities that helps with importing and exporting of types, users, groups, and workflows.",
   "main": "index.js",
   "scripts": {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.2",
+  "version": "3.5.3-alpha.8e9fe43",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -2520,57 +2520,6 @@
       },
       "args": {}
     },
-    "types:uploadUsageInfo": {
-      "id": "types:uploadUsageInfo",
-      "description": "Upload extracted usage info",
-      "strict": true,
-      "pluginName": "@contrail/cli",
-      "pluginAlias": "@contrail/cli",
-      "pluginType": "core",
-      "aliases": [],
-      "examples": [
-        "$ contrail types uploadUsageInfo\n"
-      ],
-      "flags": {
-        "logLevel": {
-          "name": "logLevel",
-          "type": "option",
-          "char": "l",
-          "description": "The Log Level",
-          "required": false,
-          "multiple": false,
-          "options": [
-            "error",
-            "warn",
-            "info",
-            "debug"
-          ]
-        },
-        "alwaysConfirmEnv": {
-          "name": "alwaysConfirmEnv",
-          "type": "option",
-          "char": "e",
-          "description": "The Environment variables",
-          "required": false,
-          "multiple": false,
-          "options": [
-            "true",
-            "false"
-          ],
-          "default": "true"
-        },
-        "dir": {
-          "name": "dir",
-          "type": "option",
-          "char": "d",
-          "description": "The directory from which to export the usage info data. Defaults to the current directory. The usage info data will be loaded from $dir/usage-info.yml",
-          "required": false,
-          "multiple": false,
-          "default": "."
-        }
-      },
-      "args": {}
-    },
     "users:export": {
       "id": "users:export",
       "description": "Export all users in the org.",
@@ -3007,14 +2956,16 @@
     },
     "workflow-templates:export": {
       "id": "workflow-templates:export",
-      "description": "Export all workflows in the org.",
+      "description": "Export all workflows in the org. By default exports one file per app to the current directory.",
       "strict": true,
       "pluginName": "@contrail/cli",
       "pluginAlias": "@contrail/cli",
       "pluginType": "core",
       "aliases": [],
       "examples": [
-        "$ contrail workflow-templates export\n"
+        "$ contrail workflow-templates export",
+        "$ contrail workflow-templates export --dir ./workflows",
+        "$ contrail workflow-templates export --outFile workflows.yml"
       ],
       "flags": {
         "logLevel": {
@@ -3048,10 +2999,18 @@
           "name": "outFile",
           "type": "option",
           "char": "f",
-          "description": "The location for the file to be saved",
+          "description": "Export all workflows to a single file at this path (overrides per-app export)",
+          "required": false,
+          "multiple": false
+        },
+        "dir": {
+          "name": "dir",
+          "type": "option",
+          "char": "d",
+          "description": "Directory to write per-app workflow files",
           "required": false,
           "multiple": false,
-          "default": "workflows.yml"
+          "default": "."
         },
         "overwrite": {
           "name": "overwrite",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.2",
+  "version": "3.5.3-alpha.8e9fe43",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@contrail/entity-types": "^1.6.1",
     "@contrail/loader": "^2.0.9",
-    "@contrail/org-config-migration": "^1.1.13",
+    "@contrail/org-config-migration": "^1.2.0",
     "@contrail/sdk": "^1.5.13",
     "@contrail/types": "^3.1.5",
     "@contrail/util": "^1.2.0",

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

@@ -1,15 +0,0 @@
-import { BaseCommand } from '../../basecommand';
-import { PersistReducedUsageInfo } from '../../interfaces';
-export default class UploadUsageInfo extends BaseCommand {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    run(): Promise<void>;
-}
-export declare function uploadUsageInfo(dir: string): Promise<void>;
-export declare const persistReducedUsageInfoFields: readonly ["typeId", "typePropertyId", "editable", "used", "formulaFunction", "validationFunction", "numberFormat", "defaultValue", "label", "required", "searchable", "isUniqueProperty", "isUniquePropertyInFamily", "copyBehavior", "copyDefault", "propertyLevel", "isArchived", "isFederationProperty", "carryOverBehavior", "carryOverDefault"];
-export declare function transformReducedUsageInfoToTypeIdsFromPath(reducedUsageInfo: any, types: any): PersistReducedUsageInfo | undefined;

package/dist/commands/types/uploadUsageInfo.js

@@ -1,180 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformReducedUsageInfoToTypeIdsFromPath = exports.persistReducedUsageInfoFields = exports.uploadUsageInfo = void 0;
-const tslib_1 = require("tslib");
-const sdk_1 = require("@contrail/sdk");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const login_1 = require("../../auth/login");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const path = tslib_1.__importStar(require("path"));
-const core_1 = require("@oclif/core");
-const type_extractor_1 = require("../../helpers/types/type-extractor");
-const basecommand_1 = require("../../basecommand");
-const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
-class UploadUsageInfo extends basecommand_1.BaseCommand {
-    static description = 'Upload extracted usage info';
-    static examples = [
-        `$ contrail types uploadUsageInfo
-`,
-    ];
-    static flags = {
-        ...basecommand_1.BaseCommand.baseFlags,
-        dir: core_1.Flags.string({
-            char: 'd',
-            description: 'The directory from which to export the usage info data. Defaults to the current directory. The usage info data will be loaded from $dir/usage-info.yml',
-            required: false,
-            default: '.',
-        }),
-    };
-    async run() {
-        await uploadUsageInfo(this.flags.dir);
-    }
-}
-exports.default = UploadUsageInfo;
-async function uploadUsageInfo(dir) {
-    try {
-        await (0, login_1.authUser)();
-        logger_1.default.info(`${chalk_1.default.yellow.bold('USAGE INFO')} Uploading`);
-        const reducedUsageInfo = await loadUsageInfo(dir);
-        await uploadUsageInfoObjects(reducedUsageInfo);
-        logger_1.default.info(`${chalk_1.default.yellow.bold('USAGE INFO')} Uploaded`);
-    }
-    catch (e) {
-        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Usage Info Upload Failed . ${e}`);
-        return;
-    }
-    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Usage Info Upload Complete.`);
-}
-exports.uploadUsageInfo = uploadUsageInfo;
-function loadUsageInfo(dir) {
-    try {
-        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, 'usage-info.yml'), 'utf8'));
-        return doc;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function uploadUsageInfoObjects(loadedUsageInfo) {
-    const typesWithProperties = await (0, type_extractor_1.getTypes)();
-    const currentUsageInfo = await new sdk_1.Entities().get({
-        entityName: 'type-property-usage-info',
-    });
-    const currentUsageInfosHashes = {};
-    for (const currentUI of currentUsageInfo) {
-        const foundType = typesWithProperties.find((t) => t.id === currentUI.typeId);
-        const typeProperties = foundType?.typeProperties || [];
-        const foundTypeProperty = typeProperties.find((tp) => tp.id === currentUI.typePropertyId);
-        if (!foundType || !foundTypeProperty) {
-            logger_1.default.info(`skipping unhashable, invalid usage info: ${JSON.stringify(currentUI, null, 2)}`);
-            continue;
-        }
-        const hash = `${foundType.typePath}|${foundTypeProperty.slug}`;
-        currentUsageInfosHashes[hash] = currentUI;
-    }
-    const reducedUsageInfoHashes = {};
-    for (const loadedUI of loadedUsageInfo) {
-        const hash = `${loadedUI.typePath}|${loadedUI.typePropertySlug}`;
-        reducedUsageInfoHashes[hash] = loadedUI;
-    }
-    logger_1.default.debug(`current usage info: ${JSON.stringify(currentUsageInfo)}`);
-    logger_1.default.debug(`loaded usage info: ${JSON.stringify(loadedUsageInfo)}`);
-    for (const loadedUI of loadedUsageInfo) {
-        try {
-            const found = currentUsageInfosHashes[`${loadedUI.typePath}|${loadedUI.typePropertySlug}`];
-            const transformedUI = transformReducedUsageInfoToTypeIdsFromPath(loadedUI, typesWithProperties);
-            if (!transformedUI) {
-                continue;
-            }
-            if (!found) {
-                logger_1.default.debug(`Creating:  ${JSON.stringify(transformedUI)}`);
-                await new sdk_1.Entities().create({
-                    entityName: 'type-property-usage-info',
-                    object: transformedUI,
-                });
-            }
-            else {
-                logger_1.default.info(`Updating:  ${JSON.stringify(transformedUI)}`);
-                await new sdk_1.Entities().update({
-                    entityName: 'type-property-usage-info',
-                    id: found.id,
-                    object: transformedUI,
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Uploading usage info: ${err}`);
-        }
-    }
-    for (const [hash, currentUI] of Object.entries(currentUsageInfosHashes)) {
-        try {
-            const found = reducedUsageInfoHashes[hash];
-            if (!found) {
-                logger_1.default.debug(`Creating:  ${hash}`);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-property-usage-info',
-                    id: currentUI['id'],
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting usage info: ${err}`);
-        }
-    }
-}
-//This should contain the property keys in PersistReducedUsageInfo in interfaces.ts
-//except for typePath and typePropertySlug which are used for transformation but not persisted to the database.
-// If you add a new property to PersistReducedUsageInfo, you need to add it to this array to be persisted to the database.
-exports.persistReducedUsageInfoFields = [
-    // 'typePath',
-    // 'typePropertySlug',
-    'typeId',
-    'typePropertyId',
-    'editable',
-    'used',
-    'formulaFunction',
-    'validationFunction',
-    'numberFormat',
-    'defaultValue',
-    'label',
-    'required',
-    'searchable',
-    'isUniqueProperty',
-    'isUniquePropertyInFamily',
-    'copyBehavior',
-    'copyDefault',
-    'propertyLevel',
-    'isArchived',
-    'isFederationProperty',
-    'carryOverBehavior',
-    'carryOverDefault',
-];
-// transforms the reduced Usage Info from name slugs to ids
-function transformReducedUsageInfoToTypeIdsFromPath(reducedUsageInfo, types) {
-    const foundType = types.find((t) => t.typePath === reducedUsageInfo.typePath);
-    if (!foundType) {
-        logger_1.default.error(`Could not find type with typePath ${reducedUsageInfo.typePath} while transforming ${reducedUsageInfo.typePropertySlug}`);
-        return undefined;
-    }
-    const foundTypeProperty = foundType.typeProperties?.find((tp) => tp.slug === reducedUsageInfo.typePropertySlug);
-    if (!foundTypeProperty) {
-        logger_1.default.error(`Could not find type property with slug ${reducedUsageInfo.typePropertySlug} while transforming ${JSON.stringify(reducedUsageInfo)}`);
-        return undefined;
-    }
-    // Create a new object with only the properties that are in the persistReducedUsageInfoFields array
-    // If there is a compile error on the code below, it means you added a new property to PersistReducedUsageInfo
-    // interface in interfaces.ts but forgot to add it to the persistReducedUsageInfoFields array above,
-    // It needs to be added to be persisted to the database.
-    const persistedUsageInfo = {
-        typeId: foundType.id,
-        typePropertyId: foundTypeProperty.id,
-    };
-    for (const key of Object.keys(reducedUsageInfo)) {
-        if (exports.persistReducedUsageInfoFields.includes(key)) {
-            persistedUsageInfo[key] = reducedUsageInfo[key];
-        }
-    }
-    return persistedUsageInfo;
-}
-exports.transformReducedUsageInfoToTypeIdsFromPath = transformReducedUsageInfoToTypeIdsFromPath;

package/dist/commands/types/uploadUsageInfo.spec.d.ts

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