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

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.3-alpha.8e9fe43 linux-x64 node-v24.16.0
+@contrail/cli/3.5.3-alpha.acdaae3 linux-x64 node-v24.18.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -1611,31 +1611,25 @@ EXAMPLES
 
 ## `contrail workflow-templates export`
 
-Export all workflows in the org. By default exports one file per app to the current directory.
+Export all workflows in the org.
 
 ```
 USAGE
-  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [-d <value>]
-  [--overwrite]
+  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [--overwrite]
 
 FLAGS
-  -d, --dir=<value>                [default: .] Directory to write per-app workflow files
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>
-  -f, --outFile=<value>            Export all workflows to a single file at this path (overrides per-app export)
+  -f, --outFile=<value>            [default: workflows.yml] The location for the file to be saved
   -l, --logLevel=<option>          The Log Level
                                    <options: error|warn|info|debug>
   --overwrite                      Replaces existing files if they exist
 
 DESCRIPTION
-  Export all workflows in the org. By default exports one file per app to the current directory.
+  Export all workflows in the org.
 
 EXAMPLES
   $ contrail workflow-templates export
-
-  $ contrail workflow-templates export --dir ./workflows
-
-  $ contrail workflow-templates export --outFile workflows.yml
 ```
 
 ## `contrail workflow-templates list`

package/dist/commands/types/getAll.js

@@ -99,7 +99,7 @@ const saveTypesFunction = async (data, dir, overwrite) => {
         if (!fileLabel) {
             logger_1.default.warn(`skipping bad type root: ${root}`);
         }
-        const pathToWrite = path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`);
+        const pathToWrite = path.join(subDir, `${(0, common_1.sanitizeFileName)(fileLabel)}.yml`);
         if (fs_1.default.existsSync(pathToWrite)) {
             await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
         }
@@ -150,7 +150,7 @@ async function saveData(reducedData, dir, overwrite) {
                     logger_1.default.warn(`skipping bad data: ${item}`);
                     continue;
                 }
-                const pathToWrite = path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`);
+                const pathToWrite = path.join(subDir, `${(0, common_1.sanitizeFileName)(fileLabel)}.yml`);
                 if (fs_1.default.existsSync(pathToWrite)) {
                     await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
                 }

package/dist/commands/types/getOptionSets.js

@@ -136,7 +136,7 @@ async function saveOptionSetsToCSV(optionSets, dir, fileLabel, overwrite, combin
         }
         else {
             dataToAdd = [];
-            pathToWrite = path.join(dir, `${(0, common_1.removeSlash)(fileLabelValue)}.csv`);
+            pathToWrite = path.join(dir, `${(0, common_1.sanitizeFileName)(fileLabelValue)}.csv`);
             const csvHeaders = 'Option Set Name,Value Key,Label\n'; // CSV headers
             if (!fs_1.default.existsSync(pathToWrite)) {
                 fs_1.default.writeFileSync(pathToWrite, csvHeaders, 'utf8');
@@ -162,7 +162,7 @@ async function saveOptionSetsToYAML(optionSets, dir, fileLabel, overwrite) {
             logger_1.default.warn('skipping bad data:', item);
             continue;
         }
-        const pathToWrite = path.join(dir, `${(0, common_1.removeSlash)(fileLabelValue)}.yml`);
+        const pathToWrite = path.join(dir, `${(0, common_1.sanitizeFileName)(fileLabelValue)}.yml`);
         if (fs_1.default.existsSync(pathToWrite)) {
             await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
         }

package/dist/commands/types/parseOptionSetsLocalFiles.js

@@ -139,7 +139,7 @@ function saveDataInFolders(data) {
         if (!fileLabel) {
             logger_1.default.warn('skipping bad data:', item);
         }
-        fs_1.default.writeFileSync(path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`), yamlStr, 'utf8');
+        fs_1.default.writeFileSync(path.join(subDir, `${(0, common_1.sanitizeFileName)(fileLabel)}.yml`), yamlStr, 'utf8');
     }
 }
 /**

package/dist/commands/types/parseOptionSetsToFolderStructure.js

@@ -63,6 +63,6 @@ function saveDataInFolders(data) {
         if (!fileLabel) {
             logger_1.default.warn('skipping bad data:', item);
         }
-        fs_1.default.writeFileSync(path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`), yamlStr, 'utf8');
+        fs_1.default.writeFileSync(path.join(subDir, `${(0, common_1.sanitizeFileName)(fileLabel)}.yml`), yamlStr, 'utf8');
     }
 }

package/dist/commands/workflow-templates/export.d.ts

@@ -5,12 +5,10 @@ export default class ExportWorkflows extends BaseCommand {
     static examples: string[];
     static flags: {
         outFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         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 exportWorkflowsByApp(outputDir: string, overwrite: boolean): Promise<void>;
-export declare function exportWorkflowsToFile(fileLocation: string, overwrite: boolean): Promise<void>;
+export declare function exportWorkflows(fileLocation: string, overwrite: boolean): Promise<void>;

package/dist/commands/workflow-templates/export.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exportWorkflowsToFile = exports.exportWorkflowsByApp = exports.DEFAULT_FILE_LOCATION = void 0;
+exports.exportWorkflows = exports.DEFAULT_FILE_LOCATION = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -11,30 +11,22 @@ const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const event_workflow_templates_1 = require("../../api/event-workflow-templates");
-const schedules_1 = require("../../api/schedules");
-const apps_1 = require("../../api/apps");
 const helper_1 = require("../../helpers/workflow-templates/helper");
 const basecommand_1 = require("../../basecommand");
 exports.DEFAULT_FILE_LOCATION = 'workflows.yml';
 class ExportWorkflows extends basecommand_1.BaseCommand {
-    static description = 'Export all workflows in the org. By default exports one file per app to the current directory.';
+    static description = 'Export all workflows in the org.';
     static examples = [
-        `$ contrail workflow-templates export`,
-        `$ contrail workflow-templates export --dir ./workflows`,
-        `$ contrail workflow-templates export --outFile workflows.yml`,
+        `$ contrail workflow-templates export
+`,
     ];
     static flags = {
         ...basecommand_1.BaseCommand.baseFlags,
         outFile: core_1.Flags.string({
             char: 'f',
-            description: 'Export all workflows to a single file at this path (overrides per-app export)',
+            description: 'The location for the file to be saved',
             required: false,
-        }),
-        dir: core_1.Flags.string({
-            char: 'd',
-            description: 'Directory to write per-app workflow files',
-            required: false,
-            default: '.',
+            default: exports.DEFAULT_FILE_LOCATION,
         }),
         overwrite: core_1.Flags.boolean({
             description: 'Replaces existing files if they exist',
@@ -46,12 +38,7 @@ class ExportWorkflows extends basecommand_1.BaseCommand {
         try {
             await (0, login_1.authUser)();
             this.log(`${chalk_1.default.blue.bold('START')} Getting Workflows.`);
-            if (this.flags.outFile) {
-                await exportWorkflowsToFile(this.flags.outFile, this.flags.overwrite);
-            }
-            else {
-                await exportWorkflowsByApp(this.flags.dir ?? '.', this.flags.overwrite);
-            }
+            await exportWorkflows(this.flags.outFile ?? exports.DEFAULT_FILE_LOCATION, this.flags.overwrite);
             this.log(`${chalk_1.default.yellow.bold('WORKFLOWS')} Done`);
         }
         catch (e) {
@@ -62,92 +49,31 @@ class ExportWorkflows extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ExportWorkflows;
-async function exportWorkflowsByApp(outputDir, overwrite) {
+async function exportWorkflows(fileLocation, overwrite) {
     const allWorkflowsInOrg = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
-    const allSchedules = await (0, schedules_1.getExistingSchedules)();
-    const installedApps = await (0, apps_1.getInstalledApps)();
-    const appIdToIdentifier = new Map(installedApps.map((a) => [a.appId, a.app.identifier]));
-    const workflowsByApp = new Map();
-    const unassigned = [];
-    for (const workflow of allWorkflowsInOrg) {
-        let appIdentifier = workflow.supportingAppId
-            ? appIdToIdentifier.get(workflow.supportingAppId)
-            : undefined;
-        // If no supportingAppId, try to extract app identifier from workflow identifier
-        // Format: @{appIdentifier}@{randomId}:{workflowName}
-        if (!appIdentifier && workflow.identifier) {
-            const match = workflow.identifier.match(/^@([^@]+)@/);
-            if (match) {
-                appIdentifier = match[1];
-            }
-        }
-        if (appIdentifier) {
-            if (!workflowsByApp.has(appIdentifier)) {
-                workflowsByApp.set(appIdentifier, []);
-            }
-            const workflows = workflowsByApp.get(appIdentifier);
-            if (workflows) {
-                workflows.push(workflow);
-            }
-        }
-        else {
-            unassigned.push(workflow);
-        }
-    }
-    const resolvedDir = path.resolve(process.cwd(), outputDir);
-    for (const [appIdentifier, workflows] of workflowsByApp.entries()) {
-        const exportObj = { appIdentifier, workflows: [] };
-        for (const workflow of workflows) {
-            exportObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
-        }
-        const filePath = path.join(resolvedDir, `workflows-${appIdentifier}.yml`);
-        await writeYamlFile(exportObj, filePath, overwrite);
-        console.log(`${chalk_1.default.green('EXPORTED')} ${filePath}`);
-    }
-    if (unassigned.length > 0) {
-        const exportObj = { workflows: [] };
-        for (const workflow of unassigned) {
-            exportObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
-        }
-        const filePath = path.join(resolvedDir, exports.DEFAULT_FILE_LOCATION);
-        await writeYamlFile(exportObj, filePath, overwrite);
-        console.log(`${chalk_1.default.green('EXPORTED')} ${filePath}`);
-    }
-}
-exports.exportWorkflowsByApp = exportWorkflowsByApp;
-async function exportWorkflowsToFile(fileLocation, overwrite) {
-    const allWorkflowsInOrg = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
-    const allSchedules = await (0, schedules_1.getExistingSchedules)();
     const workflowsObj = { workflows: [] };
     for (const workflow of allWorkflowsInOrg) {
-        workflowsObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
-    }
-    const pathToWrite = path.resolve(process.cwd(), fileLocation);
-    await writeYamlFile(workflowsObj, pathToWrite, overwrite);
-}
-exports.exportWorkflowsToFile = exportWorkflowsToFile;
-async function buildExportWorkflow(workflow, allSchedules) {
-    const exportWorkflow = lodash_1.default.pick(workflow, [
-        'identifier',
-        'name',
-        'triggerKey',
-        'isActive',
-        'messageGroup',
-        'dynamicMessageGroupId',
-        'parallelWorkerCount',
-        'workflowDefinition',
-    ]);
-    const schedules = allSchedules.filter((s) => s.ownerReference === `event-workflow-template:${workflow.id}`);
-    if (schedules.length > 0) {
-        exportWorkflow.crons = schedules.map((s) => ({ name: s.name, cron: s.cron }));
+        const exportWorkflow = lodash_1.default.pick(workflow, [
+            'triggerKey',
+            'workflowDefinition',
+            'name',
+            'isActive',
+            'identifier',
+            'messageGroup',
+            'dynamicMessageGroupId',
+        ]);
+        await (0, helper_1.populateActionIdentifiers)(exportWorkflow);
+        workflowsObj.workflows.push(exportWorkflow);
     }
-    await (0, helper_1.populateActionIdentifiers)(exportWorkflow);
-    (0, helper_1.extractShortActionKeys)(exportWorkflow);
-    return exportWorkflow;
+    await saveData(workflowsObj, fileLocation, overwrite);
 }
-async function writeYamlFile(data, absolutePath, overwrite) {
-    if (fs_1.default.existsSync(absolutePath)) {
-        await (0, file_helpers_1.safeFileOverwrite)(absolutePath, overwrite);
+exports.exportWorkflows = exportWorkflows;
+async function saveData(data, fileLocation, overwrite) {
+    const yamlStr = js_yaml_1.default.dump(data);
+    const CURRENT_DIR = process.cwd();
+    const pathToWrite = path.resolve(path.join(CURRENT_DIR, fileLocation));
+    if (fs_1.default.existsSync(pathToWrite)) {
+        await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
     }
-    fs_1.default.writeFileSync(absolutePath, js_yaml_1.default.dump(data), 'utf8');
+    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
 }

package/dist/common.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="node" />
 export declare function getSeparatorByPlatform(): string;
 export declare function delay(ms: number): Promise<NodeJS.Timeout>;
-export declare function removeSlash(string: any): string;
+export declare function sanitizeFileName(name: string): string;

package/dist/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSlash = exports.delay = exports.getSeparatorByPlatform = void 0;
+exports.sanitizeFileName = exports.delay = exports.getSeparatorByPlatform = void 0;
 function getSeparatorByPlatform() {
     const isWin = process.platform === 'win32';
     const separator = isWin ? '\\' : '/';
@@ -11,8 +11,15 @@ function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 exports.delay = delay;
-function removeSlash(string) {
-    const re = /\//gi;
-    return string.replace(re, '-');
+// Characters that are invalid in Windows filenames (superset of POSIX, which only forbids `/`)
+// eslint-disable-next-line no-control-regex
+const INVALID_FILENAME_CHARS = /[<>:"/\\|?*\x00-\x1f]/g;
+const WINDOWS_RESERVED_NAMES = /^(con|prn|aux|nul|com\d|lpt\d)$/i;
+function sanitizeFileName(name) {
+    let sanitized = name.replace(INVALID_FILENAME_CHARS, '-').replace(/[. ]+$/, '');
+    if (WINDOWS_RESERVED_NAMES.test(sanitized)) {
+        sanitized = `${sanitized}-`;
+    }
+    return sanitized;
 }
-exports.removeSlash = removeSlash;
+exports.sanitizeFileName = sanitizeFileName;

package/dist/common.spec.d.ts

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

package/dist/common.spec.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("./common");
+describe('sanitizeFileName', () => {
+    it('replaces slashes with dashes', () => {
+        expect((0, common_1.sanitizeFileName)('a/b/c')).toEqual('a-b-c');
+    });
+    it('replaces Windows-invalid characters with dashes', () => {
+        expect((0, common_1.sanitizeFileName)('isArchived?')).toEqual('isArchived-');
+        expect((0, common_1.sanitizeFileName)('a<b>c:d"e\\f|g?h*i')).toEqual('a-b-c-d-e-f-g-h-i');
+    });
+    it('strips trailing dots and spaces', () => {
+        expect((0, common_1.sanitizeFileName)('label. ')).toEqual('label');
+    });
+    it('escapes Windows reserved device names', () => {
+        expect((0, common_1.sanitizeFileName)('CON')).toEqual('CON-');
+        expect((0, common_1.sanitizeFileName)('com1')).toEqual('com1-');
+    });
+    it('leaves safe labels unchanged', () => {
+        expect((0, common_1.sanitizeFileName)('My Label - v2')).toEqual('My Label - v2');
+    });
+});

package/dist/helpers/workflow-templates/helper.d.ts

@@ -18,4 +18,3 @@ export declare class WorkflowTemplateDeployer {
 export declare function deleteWorkflowTemplates(): Promise<void>;
 export declare function localDeployWorkflowTemplate(saveFileLocation: string): Promise<void>;
 export declare function populateActionIdentifiers(workflowTemplate: WorkflowTemplate): Promise<void>;
-export declare function extractShortActionKeys(workflowTemplate: WorkflowTemplate): void;

package/dist/helpers/workflow-templates/helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractShortActionKeys = exports.populateActionIdentifiers = exports.localDeployWorkflowTemplate = exports.deleteWorkflowTemplates = exports.WorkflowTemplateDeployer = exports.getActionByIdentifier = exports.getWorkflowTemplateIdentifier = exports.LocalWorkflowTemplateDeployer = void 0;
+exports.populateActionIdentifiers = exports.localDeployWorkflowTemplate = exports.deleteWorkflowTemplates = exports.WorkflowTemplateDeployer = exports.getActionByIdentifier = exports.getWorkflowTemplateIdentifier = exports.LocalWorkflowTemplateDeployer = void 0;
 const tslib_1 = require("tslib");
 const util_1 = require("@contrail/util");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -44,8 +44,6 @@ class LocalWorkflowTemplateDeployer {
             isActive: workflowTemplate.isActive,
             supportingAppId: workflowTemplate.supportingAppId,
             messageGroupId: workflowTemplate.messageGroupId,
-            messageGroup: workflowTemplate.messageGroup,
-            dynamicMessageGroupId: workflowTemplate.dynamicMessageGroupId,
             parallelWorkerCount: workflowTemplate.parallelWorkerCount,
         };
         const newWorkflowTemplate = await (0, event_workflow_templates_1.createWorkflowTemplate)(newObject);
@@ -88,7 +86,7 @@ class LocalWorkflowTemplateDeployer {
         }
     }
     async createWorkflowSchedule(workflowTemplate, workflowId) {
-        if (!workflowTemplate?.crons?.length) {
+        if (!workflowTemplate?.crons?.length || !workflowTemplate.id) {
             return;
         }
         const crons = [];
@@ -285,21 +283,3 @@ async function populateActionIdentifiers(workflowTemplate) {
     }
 }
 exports.populateActionIdentifiers = populateActionIdentifiers;
-function extractShortActionKeys(workflowTemplate) {
-    if (!workflowTemplate?.workflowDefinition?.paths) {
-        return;
-    }
-    for (const wfPath of workflowTemplate.workflowDefinition.paths) {
-        if (!wfPath?.actionDefinitionConfigs) {
-            continue;
-        }
-        for (const actionConfig of wfPath.actionDefinitionConfigs) {
-            if (actionConfig.action?.includes(':')) {
-                // Full identifier format: "app-id@version:action-name" -> "action-name"
-                actionConfig.action = actionConfig.action.split(':').pop();
-            }
-            delete actionConfig.identifier;
-        }
-    }
-}
-exports.extractShortActionKeys = extractShortActionKeys;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.3-alpha.8e9fe43",
+  "version": "3.5.3-alpha.acdaae3",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -2956,16 +2956,14 @@
     },
     "workflow-templates:export": {
       "id": "workflow-templates:export",
-      "description": "Export all workflows in the org. By default exports one file per app to the current directory.",
+      "description": "Export all workflows in the org.",
       "strict": true,
       "pluginName": "@contrail/cli",
       "pluginAlias": "@contrail/cli",
       "pluginType": "core",
       "aliases": [],
       "examples": [
-        "$ contrail workflow-templates export",
-        "$ contrail workflow-templates export --dir ./workflows",
-        "$ contrail workflow-templates export --outFile workflows.yml"
+        "$ contrail workflow-templates export\n"
       ],
       "flags": {
         "logLevel": {
@@ -2999,18 +2997,10 @@
           "name": "outFile",
           "type": "option",
           "char": "f",
-          "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",
+          "description": "The location for the file to be saved",
           "required": false,
           "multiple": false,
-          "default": "."
+          "default": "workflows.yml"
         },
         "overwrite": {
           "name": "overwrite",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.3-alpha.8e9fe43",
+  "version": "3.5.3-alpha.acdaae3",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",