@knocklabs/cli 0.1.21 → 0.1.23

package/dist/commands/guide/push.js

@@ -0,0 +1,171 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return GuidePush;
+    }
+});
+const _core = require("@oclif/core");
+const _basecommand = /*#__PURE__*/ _interop_require_default(require("../../lib/base-command"));
+const _const = require("../../lib/helpers/const");
+const _error = require("../../lib/helpers/error");
+const _flag = /*#__PURE__*/ _interop_require_wildcard(require("../../lib/helpers/flag"));
+const _objectisomorphic = require("../../lib/helpers/object.isomorphic");
+const _request = require("../../lib/helpers/request");
+const _string = require("../../lib/helpers/string");
+const _ux = require("../../lib/helpers/ux");
+const _guide = /*#__PURE__*/ _interop_require_wildcard(require("../../lib/marshal/guide"));
+const _validate = /*#__PURE__*/ _interop_require_default(require("./validate"));
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+class GuidePush extends _basecommand.default {
+    async run() {
+        const { flags } = this.props;
+        // 1. First read all guide directories found for the given command.
+        const target = await _guide.ensureValidCommandTarget(this.props, this.runContext);
+        const [guides, readErrors] = await _guide.readAllForCommandTarget(target, {
+            withExtractedFiles: true
+        });
+        if (readErrors.length > 0) {
+            this.error((0, _error.formatErrors)(readErrors, {
+                prependBy: "\n\n"
+            }));
+        }
+        if (guides.length === 0) {
+            this.error(`No guide directories found in ${target.context.abspath}`);
+        }
+        // 2. Then validate them all ahead of pushing them.
+        _ux.spinner.start(`‣ Validating`);
+        const apiErrors = await _validate.default.validateAll(this.apiV1, this.props, guides);
+        if (apiErrors.length > 0) {
+            this.error((0, _error.formatErrors)(apiErrors, {
+                prependBy: "\n\n"
+            }));
+        }
+        _ux.spinner.stop();
+        // 3. Finally push up each guide, abort on the first error.
+        _ux.spinner.start(`‣ Pushing`);
+        for (const guide of guides){
+            const props = (0, _objectisomorphic.merge)(this.props, {
+                flags: {
+                    annotate: true
+                }
+            });
+            // eslint-disable-next-line no-await-in-loop
+            const resp = await this.apiV1.upsertGuide(props, {
+                ...guide.content,
+                key: guide.key
+            });
+            if ((0, _request.isSuccessResp)(resp)) {
+                // Update the guide directory with the successfully pushed guide
+                // payload from the server.
+                // eslint-disable-next-line no-await-in-loop
+                await _guide.writeGuideDirFromData(guide, resp.data.guide);
+                continue;
+            }
+            const error = new _error.SourceError((0, _request.formatErrorRespMessage)(resp), _guide.guideJsonPath(guide), "ApiError");
+            this.error((0, _error.formatError)(error));
+        }
+        _ux.spinner.stop();
+        // 4. Display a success message.
+        const guideKeys = guides.map((g)=>g.key);
+        const actioned = flags.commit ? "pushed and committed" : "pushed";
+        this.log(`‣ Successfully ${actioned} ${guides.length} guide(s):\n` + (0, _string.indentString)(guideKeys.join("\n"), 4));
+    }
+}
+// Hide until guides are released in GA.
+_define_property(GuidePush, "hidden", true);
+_define_property(GuidePush, "summary", "Push one or more guides from a local file system to Knock.");
+_define_property(GuidePush, "flags", {
+    environment: _core.Flags.string({
+        summary: "Pushing a guide is only allowed in the development environment",
+        default: _const.KnockEnv.Development,
+        options: [
+            _const.KnockEnv.Development
+        ]
+    }),
+    all: _core.Flags.boolean({
+        summary: "Whether to push all guides from the target directory."
+    }),
+    "guides-dir": _flag.dirPath({
+        summary: "The target directory path to find all guides to push.",
+        dependsOn: [
+            "all"
+        ]
+    }),
+    commit: _core.Flags.boolean({
+        summary: "Push and commit the guide(s) at the same time"
+    }),
+    "commit-message": _core.Flags.string({
+        summary: "Use the given value as the commit message",
+        char: "m",
+        dependsOn: [
+            "commit"
+        ]
+    })
+});
+_define_property(GuidePush, "args", {
+    guideKey: _core.Args.string({
+        required: false
+    })
+});

package/dist/commands/guide/validate.js

@@ -0,0 +1,148 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return GuideValidate;
+    }
+});
+const _core = require("@oclif/core");
+const _basecommand = /*#__PURE__*/ _interop_require_default(require("../../lib/base-command"));
+const _const = require("../../lib/helpers/const");
+const _error = require("../../lib/helpers/error");
+const _flag = /*#__PURE__*/ _interop_require_wildcard(require("../../lib/helpers/flag"));
+const _request = require("../../lib/helpers/request");
+const _string = require("../../lib/helpers/string");
+const _ux = require("../../lib/helpers/ux");
+const _guide = /*#__PURE__*/ _interop_require_wildcard(require("../../lib/marshal/guide"));
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+class GuideValidate extends _basecommand.default {
+    async run() {
+        // 1. Read all guide directories found for the given command.
+        const target = await _guide.ensureValidCommandTarget(this.props, this.runContext);
+        const [guides, readErrors] = await _guide.readAllForCommandTarget(target, {
+            withExtractedFiles: true
+        });
+        if (readErrors.length > 0) {
+            this.error((0, _error.formatErrors)(readErrors, {
+                prependBy: "\n\n"
+            }));
+        }
+        if (guides.length === 0) {
+            this.error(`No guide directories found in ${target.context.abspath}`);
+        }
+        // 2. Validate each guide data.
+        _ux.spinner.start(`‣ Validating`);
+        const apiErrors = await GuideValidate.validateAll(this.apiV1, this.props, guides);
+        if (apiErrors.length > 0) {
+            this.error((0, _error.formatErrors)(apiErrors, {
+                prependBy: "\n\n"
+            }));
+        }
+        _ux.spinner.stop();
+        // 3. Display a success message.
+        const guideKeys = guides.map((g)=>g.key);
+        this.log(`‣ Successfully validated ${guides.length} guide(s):\n` + (0, _string.indentString)(guideKeys.join("\n"), 4));
+    }
+    static async validateAll(api, props, guides) {
+        // TODO: Throw an error if a non validation error (e.g. authentication error)
+        // instead of printing out same error messages repeatedly.
+        const errorPromises = guides.map(async (guide)=>{
+            const resp = await api.validateGuide(props, {
+                ...guide.content,
+                key: guide.key
+            });
+            if ((0, _request.isSuccessResp)(resp)) return;
+            const error = new _error.SourceError((0, _request.formatErrorRespMessage)(resp), _guide.guideJsonPath(guide), "ApiError");
+            return error;
+        });
+        const errors = (await Promise.all(errorPromises)).filter((e)=>Boolean(e));
+        return errors;
+    }
+}
+_define_property(GuideValidate, "summary", "Validate one or more guides from a local file system.");
+// Hide until guides are released in GA.
+_define_property(GuideValidate, "hidden", true);
+_define_property(GuideValidate, "flags", {
+    environment: _core.Flags.string({
+        summary: "Validating a guide is only done in the development environment",
+        default: _const.KnockEnv.Development,
+        options: [
+            _const.KnockEnv.Development
+        ]
+    }),
+    all: _core.Flags.boolean({
+        summary: "Whether to validate all guides from the target directory."
+    }),
+    "guides-dir": _flag.dirPath({
+        summary: "The target directory path to find all guides to validate.",
+        dependsOn: [
+            "all"
+        ]
+    })
+});
+_define_property(GuideValidate, "args", {
+    guideKey: _core.Args.string({
+        required: false
+    })
+});

package/dist/commands/pull.js

@@ -0,0 +1,157 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return Pull;
+    }
+});
+const _nodepath = /*#__PURE__*/ _interop_require_wildcard(require("node:path"));
+const _core = require("@oclif/core");
+const _basecommand = /*#__PURE__*/ _interop_require_default(require("../lib/base-command"));
+const _flag = /*#__PURE__*/ _interop_require_wildcard(require("../lib/helpers/flag"));
+const _ux = require("../lib/helpers/ux");
+const _resources = require("../lib/resources");
+const _pull = /*#__PURE__*/ _interop_require_default(require("./layout/pull"));
+const _pull1 = /*#__PURE__*/ _interop_require_default(require("./partial/pull"));
+const _pull2 = /*#__PURE__*/ _interop_require_default(require("./translation/pull"));
+const _pull3 = /*#__PURE__*/ _interop_require_default(require("./workflow/pull"));
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+class Pull extends _basecommand.default {
+    async run() {
+        const { flags } = this.props;
+        const targetDirCtx = flags["knock-dir"];
+        const prompt = targetDirCtx.exists ? `Pull latest resources into ${targetDirCtx.abspath}?\n  This will overwrite the contents of this directory.` : `Create a new resources directory at ${targetDirCtx.abspath}?`;
+        const input = flags.force || await (0, _ux.promptToConfirm)(prompt);
+        if (!input) return;
+        const args = [
+            "--all",
+            "--environment",
+            flags.environment,
+            ...flags["hide-uncommitted-changes"] ? [
+                "--hide-uncommitted-changes"
+            ] : [],
+            ...flags["service-token"] ? [
+                "--service-token",
+                flags["service-token"]
+            ] : [],
+            // Always use the force flag to skip prompts
+            "--force"
+        ];
+        for (const resourceType of _resources.ALL_RESOURCE_TYPES){
+            // eslint-disable-next-line no-await-in-loop
+            await runResourcePullCommand(resourceType, targetDirCtx, args);
+        }
+    }
+}
+_define_property(Pull, "summary", "Pull all resources from an environment into a local file system.");
+_define_property(Pull, "flags", {
+    environment: _core.Flags.string({
+        default: "development",
+        summary: "The environment to use."
+    }),
+    "knock-dir": _flag.dirPath({
+        summary: "The target directory path to pull all resources into.",
+        required: true
+    }),
+    "hide-uncommitted-changes": _core.Flags.boolean({
+        summary: "Hide any uncommitted changes."
+    }),
+    force: _core.Flags.boolean({
+        summary: "Remove the confirmation prompt."
+    })
+});
+const runResourcePullCommand = async (resourceType, targetDirCtx, args)=>{
+    const subdirPath = _nodepath.resolve(targetDirCtx.abspath, _resources.RESOURCE_SUBDIRS[resourceType]);
+    switch(resourceType){
+        case "email_layout":
+            return _pull.default.run([
+                ...args,
+                "--layouts-dir",
+                subdirPath
+            ]);
+        case "partial":
+            return _pull1.default.run([
+                ...args,
+                "--partials-dir",
+                subdirPath
+            ]);
+        case "translation":
+            return _pull2.default.run([
+                ...args,
+                "--translations-dir",
+                subdirPath
+            ]);
+        case "workflow":
+            return _pull3.default.run([
+                ...args,
+                "--workflows-dir",
+                subdirPath
+            ]);
+        default:
+            {
+                const invalidResourceType = resourceType;
+                throw new Error(`Unknown resource type: ${invalidResourceType}`);
+            }
+    }
+};

package/dist/commands/push.js

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return Push;
+    }
+});
+const _nodepath = /*#__PURE__*/ _interop_require_wildcard(require("node:path"));
+const _core = require("@oclif/core");
+const _fsextra = /*#__PURE__*/ _interop_require_wildcard(require("fs-extra"));
+const _basecommand = /*#__PURE__*/ _interop_require_default(require("../lib/base-command"));
+const _const = require("../lib/helpers/const");
+const _flag = /*#__PURE__*/ _interop_require_wildcard(require("../lib/helpers/flag"));
+const _resources = require("../lib/resources");
+const _push = /*#__PURE__*/ _interop_require_default(require("./layout/push"));
+const _push1 = /*#__PURE__*/ _interop_require_default(require("./partial/push"));
+const _push2 = /*#__PURE__*/ _interop_require_default(require("./translation/push"));
+const _push3 = /*#__PURE__*/ _interop_require_default(require("./workflow/push"));
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+class Push extends _basecommand.default {
+    async run() {
+        const { flags } = this.props;
+        const targetDirCtx = flags["knock-dir"];
+        if (!targetDirCtx.exists) {
+            this.error(`Directory ${targetDirCtx.abspath} does not exist`);
+        }
+        const args = [
+            "--all",
+            "--environment",
+            flags.environment,
+            ...flags["service-token"] ? [
+                "--service-token",
+                flags["service-token"]
+            ] : [],
+            ...flags.commit ? [
+                "--commit"
+            ] : [],
+            ...flags["commit-message"] ? [
+                "--commit-message",
+                flags["commit-message"]
+            ] : []
+        ];
+        // Note: Because we're pushing the different resource types sequentially,
+        // if one of the push commands fails, we may end up in a partially pushed
+        // state, with only some of the resources upserted. This is the best we can
+        // do until we have a bulk push mAPI endpoint.
+        for (const resourceType of _resources.ALL_RESOURCE_TYPES){
+            // eslint-disable-next-line no-await-in-loop
+            await runResourcePushCommand(resourceType, targetDirCtx, args);
+        }
+    }
+}
+_define_property(Push, "summary", "Push all resources from a local file system to Knock.");
+_define_property(Push, "flags", {
+    environment: _core.Flags.string({
+        summary: "Pushing resources is only allowed in the development environment",
+        default: _const.KnockEnv.Development,
+        options: [
+            _const.KnockEnv.Development
+        ]
+    }),
+    "knock-dir": _flag.dirPath({
+        summary: "The target directory path to find all resources to push.",
+        required: true
+    }),
+    commit: _core.Flags.boolean({
+        summary: "Push and commit the resource(s) at the same time"
+    }),
+    "commit-message": _core.Flags.string({
+        summary: "Use the given value as the commit message",
+        char: "m",
+        dependsOn: [
+            "commit"
+        ]
+    })
+});
+const runResourcePushCommand = async (resourceType, targetDirCtx, args)=>{
+    const subdirPath = _nodepath.resolve(targetDirCtx.abspath, _resources.RESOURCE_SUBDIRS[resourceType]);
+    const hasResources = await _fsextra.pathExists(subdirPath);
+    if (!hasResources) {
+        return;
+    }
+    switch(resourceType){
+        case "email_layout":
+            return _push.default.run([
+                ...args,
+                "--layouts-dir",
+                subdirPath
+            ]);
+        case "partial":
+            return _push1.default.run([
+                ...args,
+                "--partials-dir",
+                subdirPath
+            ]);
+        case "translation":
+            return _push2.default.run([
+                ...args,
+                "--translations-dir",
+                subdirPath
+            ]);
+        case "workflow":
+            return _push3.default.run([
+                ...args,
+                "--workflows-dir",
+                subdirPath
+            ]);
+        default:
+            {
+                const invalidResourceType = resourceType;
+                throw new Error(`Unknown resource type: ${invalidResourceType}`);
+            }
+    }
+};

package/dist/commands/workflow/generate-types.js

@@ -17,8 +17,9 @@ const _flag = /*#__PURE__*/ _interop_require_wildcard(require("../../lib/helpers
 const _objectisomorphic = require("../../lib/helpers/object.isomorphic");
 const _page = require("../../lib/helpers/page");
 const _request = require("../../lib/helpers/request");
+const _typegen = require("../../lib/helpers/typegen");
 const _ux = require("../../lib/helpers/ux");
-const _typegenerator = require("../../lib/type-generator");
+const _workflow = /*#__PURE__*/ _interop_require_wildcard(require("../../lib/marshal/workflow"));
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -82,17 +83,17 @@ class WorkflowGenerateTypes extends _basecommand.default {
     async run() {
         const { flags } = this.props;
         const fileExtension = flags["output-file"].abspath.split(".").pop();
-        const targetLanguage = (0, _typegenerator.getLanguageFromExtension)(fileExtension);
+        const targetLanguage = (0, _typegen.getLanguageFromExtension)(fileExtension);
         if (!targetLanguage) {
             this.error(new _error.ApiError(`Unsupported file extension: ${fileExtension}. We currently support .ts, .rb, .go, .py files only.`));
         }
         _ux.spinner.start(`‣ Loading workflows`);
-        // 1. List all workflows in the development environment.
+        // 1. List all workflows in the target environment.
         const workflows = await this.listAllWorkflows();
         _ux.spinner.stop();
         // 2. Generate types for all workflows.
         _ux.spinner.start(`‣ Generating types`);
-        const { result, workflows: workflowsWithValidTypes } = await (0, _typegenerator.generateWorkflowTypes)(workflows, targetLanguage);
+        const { result, workflows: workflowsWithValidTypes } = await _workflow.generateWorkflowTypes(workflows, targetLanguage);
         _ux.spinner.stop();
         if (!result) {
             this.log(`‣ No workflows with valid trigger data JSON schema found, skipping type generation`);
@@ -125,7 +126,7 @@ class WorkflowGenerateTypes extends _basecommand.default {
         }, workflows) : workflows;
     }
 }
-_define_property(WorkflowGenerateTypes, "description", "Generate types for all workflows in the development environment and write them to a file.");
+_define_property(WorkflowGenerateTypes, "description", "Generate types for all workflows in an environment and write them to a file.");
 _define_property(WorkflowGenerateTypes, "flags", {
     environment: _core.Flags.string({
         summary: "Select the environment to generate types for.",