@contrail/cli 3.5.3-alpha.73bd011 → 3.5.3-alpha.b5668f4

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.3-alpha.73bd011 linux-x64 node-v24.15.0
+@contrail/cli/3.5.3-alpha.b5668f4 linux-x64 node-v24.16.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -1611,25 +1611,31 @@ EXAMPLES
 
 ## `contrail workflow-templates export`
 
-Export all workflows in the org.
+Export all workflows in the org. By default exports one file per app to the current directory.
 
 ```
 USAGE
-  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [--overwrite]
+  $ contrail workflow-templates export [-l error|warn|info|debug] [-e true|false] [-f <value>] [-d <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>            [default: workflows.yml] The location for the file to be saved
+  -f, --outFile=<value>            Export all workflows to a single file at this path (overrides per-app export)
   -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.
+  Export all workflows in the org. By default exports one file per app to the current directory.
 
 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/workflow-templates/export.d.ts

@@ -5,10 +5,12 @@ 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 exportWorkflows(fileLocation: string, overwrite: boolean): Promise<void>;
+export declare function exportWorkflowsByApp(outputDir: string, overwrite: boolean): Promise<void>;
+export declare function exportWorkflowsToFile(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.exportWorkflows = exports.DEFAULT_FILE_LOCATION = void 0;
+exports.exportWorkflowsToFile = exports.exportWorkflowsByApp = 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,22 +11,30 @@ 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.';
+    static description = 'Export all workflows in the org. By default exports one file per app to the current directory.';
     static examples = [
-        `$ contrail workflow-templates export
-`,
+        `$ contrail workflow-templates export`,
+        `$ contrail workflow-templates export --dir ./workflows`,
+        `$ contrail workflow-templates export --outFile workflows.yml`,
     ];
     static flags = {
         ...basecommand_1.BaseCommand.baseFlags,
         outFile: core_1.Flags.string({
             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,
-            default: exports.DEFAULT_FILE_LOCATION,
+        }),
+        dir: core_1.Flags.string({
+            char: 'd',
+            description: 'Directory to write per-app workflow files',
+            required: false,
+            default: '.',
         }),
         overwrite: core_1.Flags.boolean({
             description: 'Replaces existing files if they exist',
@@ -38,7 +46,12 @@ class ExportWorkflows extends basecommand_1.BaseCommand {
         try {
             await (0, login_1.authUser)();
             this.log(`${chalk_1.default.blue.bold('START')} Getting Workflows.`);
-            await exportWorkflows(this.flags.outFile ?? exports.DEFAULT_FILE_LOCATION, this.flags.overwrite);
+            if (this.flags.outFile) {
+                await exportWorkflowsToFile(this.flags.outFile, this.flags.overwrite);
+            }
+            else {
+                await exportWorkflowsByApp(this.flags.dir ?? '.', this.flags.overwrite);
+            }
             this.log(`${chalk_1.default.yellow.bold('WORKFLOWS')} Done`);
         }
         catch (e) {
@@ -49,31 +62,89 @@ class ExportWorkflows extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ExportWorkflows;
-async function exportWorkflows(fileLocation, overwrite) {
+async function exportWorkflowsByApp(outputDir, 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) {
+                // Keep the @ prefix in the appIdentifier
+                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 safeAppIdentifier = appIdentifier.replace(/[\\/]/g, '-');
+        const filePath = path.join(resolvedDir, `workflows-${safeAppIdentifier}.yml`);
+        await writeYamlFile(exportObj, filePath, overwrite);
+        console.log(`${chalk_1.default.green('EXPORTED')} ${filePath}`);
+    }
+    if (unassigned.length > 0) {
+        console.log(`${chalk_1.default.yellow('SKIPPED')} ${unassigned.length} workflows could not be associated with an app. Re-run with --outFile to export them to a single file.`);
+    }
+}
+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) {
-        const exportWorkflow = lodash_1.default.pick(workflow, [
-            'triggerKey',
-            'workflowDefinition',
-            'name',
-            'isActive',
-            'identifier',
-            'messageGroup',
-            'dynamicMessageGroupId',
-        ]);
-        await (0, helper_1.populateActionIdentifiers)(exportWorkflow);
-        workflowsObj.workflows.push(exportWorkflow);
+        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 }));
     }
-    await saveData(workflowsObj, fileLocation, overwrite);
+    await (0, helper_1.populateActionIdentifiers)(exportWorkflow);
+    (0, helper_1.extractShortActionKeys)(exportWorkflow);
+    return exportWorkflow;
 }
-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);
+async function writeYamlFile(data, absolutePath, overwrite) {
+    if (fs_1.default.existsSync(absolutePath)) {
+        await (0, file_helpers_1.safeFileOverwrite)(absolutePath, overwrite);
     }
-    fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
+    fs_1.default.mkdirSync(path.dirname(absolutePath), { recursive: true });
+    fs_1.default.writeFileSync(absolutePath, js_yaml_1.default.dump(data), 'utf8');
 }

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

@@ -18,3 +18,4 @@ 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.populateActionIdentifiers = exports.localDeployWorkflowTemplate = exports.deleteWorkflowTemplates = exports.WorkflowTemplateDeployer = exports.getActionByIdentifier = exports.getWorkflowTemplateIdentifier = exports.LocalWorkflowTemplateDeployer = void 0;
+exports.extractShortActionKeys = 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"));
@@ -20,7 +20,6 @@ class LocalWorkflowTemplateDeployer {
         const existingWorkflows = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
         // UPSERT / DELETE BASED ON WORKFLOW TEMPLATES IDENTIFIER
         logger_1.default.info(`${chalk_1.default.yellow.bold('WORKFLOW TEMPLATES')} Deploying workflow templates.`);
-        logger_1.default.info(wtDeclaration);
         for (const workflowKey of Object.keys(wtDeclaration.workflows)) {
             await this.deployWorkflowTemplate(wtDeclaration.workflows[workflowKey], existingWorkflows, wtDeclaration.appIdentifier);
         }
@@ -35,15 +34,17 @@ class LocalWorkflowTemplateDeployer {
         return await this.createNewWorkflowTemplate(identifier, workflow, appIdentifier);
     }
     async createNewWorkflowTemplate(workflowKey, workflowTemplate, appIdentifier) {
-        await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
+        const resolvedAppId = await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const newObject = {
             identifier: getWorkflowTemplateIdentifier(workflowTemplate),
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
             workflowDefinition: workflowTemplate.workflowDefinition,
             isActive: workflowTemplate.isActive,
-            supportingAppId: workflowTemplate.supportingAppId,
+            supportingAppId: resolvedAppId ?? workflowTemplate.supportingAppId,
             messageGroupId: workflowTemplate.messageGroupId,
+            messageGroup: workflowTemplate.messageGroup,
+            dynamicMessageGroupId: workflowTemplate.dynamicMessageGroupId,
             parallelWorkerCount: workflowTemplate.parallelWorkerCount,
         };
         const newWorkflowTemplate = await (0, event_workflow_templates_1.createWorkflowTemplate)(newObject);
@@ -55,10 +56,12 @@ class LocalWorkflowTemplateDeployer {
     }
     async populateActionIds(workflowTemplate, workflowKey, appIdentifier) {
         const installedApps = await (0, apps_1.getInstalledApps)();
-        const appOrg = installedApps.find((x) => x.app.identifier === appIdentifier);
-        logger_1.default.info('workflow template:', JSON.stringify(workflowTemplate, null, 2));
+        const appOrg = installedApps.find((x) => x.app?.identifier === appIdentifier);
+        if (!appOrg) {
+            throw new Error(`Could not find installed app with identifier "${appIdentifier}". Make sure the app is installed in this org before importing workflows.`);
+        }
         if (!workflowTemplate?.workflowDefinition?.paths) {
-            return;
+            return appOrg.appId;
         }
         for (const path of workflowTemplate.workflowDefinition.paths) {
             if (!path?.actionDefinitionConfigs) {
@@ -84,9 +87,10 @@ class LocalWorkflowTemplateDeployer {
                 }
             }
         }
+        return appOrg.appId;
     }
     async createWorkflowSchedule(workflowTemplate, workflowId) {
-        if (!workflowTemplate?.crons?.length || !workflowTemplate.id) {
+        if (!workflowTemplate?.crons?.length) {
             return;
         }
         const crons = [];
@@ -152,12 +156,13 @@ class LocalWorkflowTemplateDeployer {
         }
     }
     async updateWorkflowTemplate(workflowKey, existingWorkflowTemplate, workflowTemplate, appIdentifier) {
-        await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
+        const resolvedAppId = await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const updates = Object.assign(new Object(), {
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
             builtIn: workflowTemplate.builtIn,
             workflowDefinition: workflowTemplate.workflowDefinition,
+            supportingAppId: resolvedAppId ?? existingWorkflowTemplate.supportingAppId,
             dynamicMessageGroupId: workflowTemplate.dynamicMessageGroupId ?? existingWorkflowTemplate.dynamicMessageGroupId,
             parallelWorkerCount: workflowTemplate.parallelWorkerCount ?? existingWorkflowTemplate.parallelWorkerCount,
         });
@@ -283,3 +288,21 @@ 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/node_modules/@contrail/org-config-migration/.github/workflows/publish-to-npm.yml

@@ -0,0 +1,117 @@
+name: Publish to NPM
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: ['**']
+
+jobs:
+  check-version:
+    name: Verify version is available on npm
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check version not already published
+        run: |
+          PACKAGE_NAME=$(node -p "require('./package.json').name")
+          VERSION=$(node -p "require('./package.json').version")
+          echo "Checking if ${PACKAGE_NAME}@${VERSION} exists on npm..."
+          if npm view "${PACKAGE_NAME}@${VERSION}" version 2>/dev/null; then
+            echo "::error::Version ${VERSION} is already published on npm. Bump the version in package.json before merging."
+            exit 1
+          else
+            echo "Version ${VERSION} is available."
+          fi
+
+  check-dependencies:
+    name: Verify no private dependencies
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Verify no private dependencies
+        run: |
+          node -e "
+            const deps = require('./package.json').dependencies || {};
+            const { execSync } = require('child_process');
+            let failed = false;
+            for (const pkg of Object.keys(deps)) {
+              try {
+                execSync('npm view ' + pkg, { stdio: 'pipe' });
+              } catch {
+                console.error('::error::Dependency ' + pkg + ' is not publicly accessible on npm');
+                failed = true;
+              }
+            }
+            if (failed) process.exit(1);
+            console.log('All ' + Object.keys(deps).length + ' dependencies are public.');
+          "
+
+  publish-alpha:
+    name: Publish alpha
+    needs: check-dependencies
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    outputs:
+      version: ${{ steps.publish.outputs.version }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install and build
+        run: npm ci && npm run build
+
+      - name: Publish alpha
+        id: publish
+        run: |
+          SHORT_SHA=$(echo ${{ github.event.pull_request.head.sha }} | cut -c1-7)
+          VERSION=$(node -p "require('./package.json').version")-alpha.${SHORT_SHA}
+          npm version $VERSION --no-git-tag-version
+          OUTPUT=$(npm publish --tag alpha 2>&1) && {
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
+          } || {
+            if echo "$OUTPUT" | grep -q "You cannot publish over the previously published versions"; then
+              echo "::warning::Alpha ${VERSION} already published, skipping."
+            else
+              echo "::error::Failed to publish alpha ${VERSION}"
+              echo "$OUTPUT"
+              exit 1
+            fi
+          }
+
+  publish-release:
+    name: Publish release
+    needs: check-dependencies
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    outputs:
+      version: ${{ steps.publish.outputs.version }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install and build
+        run: npm ci && npm run build
+
+      - name: Publish release
+        id: publish
+        run: |
+          npm publish
+          echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT

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

@@ -1,3 +1,3 @@
-export * from './types';
-export * from './services';
-export * from './users';
+export * from './types';
+export * from './services';
+export * from './users';

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

@@ -1,19 +1,19 @@
-"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("./types"), exports);
-__exportStar(require("./services"), exports);
-__exportStar(require("./users"), 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("./types"), exports);
+__exportStar(require("./services"), exports);
+__exportStar(require("./users"), exports);