@hubspot/cli 7.4.8 → 7.4.9-beta.1

package/commands/upload.js

@@ -1,107 +1,112 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const fs = require('fs');
-const path = require('path');
-const { uploadFolder, hasUploadErrors, } = require('@hubspot/local-dev-lib/cms/uploadFolder');
-const { getFileMapperQueryValues, } = require('@hubspot/local-dev-lib/fileMapper');
-const { upload, deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
-const { getCwd, convertToUnixPath, isAllowedExtension, } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { ApiErrorContext, logError } = require('../lib/errorHandlers/index');
-const { validateSrcAndDestPaths, } = require('@hubspot/local-dev-lib/cms/modules');
-const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
-const { getThemePreviewUrl, getThemeJSONPath, } = require('@hubspot/local-dev-lib/cms/themes');
-const { addConfigOptions, addAccountOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, addGlobalOptions, getCmsPublishMode, } = require('../lib/commonOpts');
-const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
-const { confirmPrompt } = require('../lib/prompts/promptUtils');
-const { validateCmsPublishMode } = require('../lib/validation');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const { getUploadableFileList } = require('../lib/upload');
-const { i18n } = require('../lib/lang');
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { FieldsJs, isConvertableFieldJs, cleanupTmpDirSync, } = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
-exports.command = 'upload [src] [dest]';
-exports.describe = i18n('commands.upload.describe');
-const logThemePreview = (filePath, accountId) => {
-    const previewUrl = getThemePreviewUrl(filePath, accountId);
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const uploadFolder_1 = require("@hubspot/local-dev-lib/cms/uploadFolder");
+const fileMapper_1 = require("@hubspot/local-dev-lib/fileMapper");
+const fileMapper_2 = require("@hubspot/local-dev-lib/api/fileMapper");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const modules_1 = require("@hubspot/local-dev-lib/cms/modules");
+const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
+const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
+const handleFieldsJS_1 = require("@hubspot/local-dev-lib/cms/handleFieldsJS");
+const index_1 = require("../lib/errorHandlers/index");
+const commonOpts_1 = require("../lib/commonOpts");
+const uploadPrompt_1 = require("../lib/prompts/uploadPrompt");
+const promptUtils_1 = require("../lib/prompts/promptUtils");
+const validation_1 = require("../lib/validation");
+const usageTracking_1 = require("../lib/usageTracking");
+const upload_1 = require("../lib/upload");
+const lang_1 = require("../lib/lang");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = 'upload [src] [dest]';
+const describe = (0, lang_1.i18n)('commands.upload.describe');
+function logThemePreview(filePath, accountId) {
+    const previewUrl = (0, themes_1.getThemePreviewUrl)(filePath, accountId);
     // Only log if we are actually in a theme
     if (previewUrl) {
-        logger.log(i18n('commands.upload.previewUrl', {
+        logger_1.logger.log((0, lang_1.i18n)('commands.upload.previewUrl', {
             previewUrl,
         }));
     }
-};
-exports.handler = async (options) => {
-    if (!validateCmsPublishMode(options)) {
-        process.exit(EXIT_CODES.WARNING);
+}
+async function handler(args) {
+    if (!(0, validation_1.validateCmsPublishMode)(args)) {
+        process.exit(exitCodes_1.EXIT_CODES.WARNING);
     }
-    const { derivedAccountId } = options;
-    const cmsPublishMode = getCmsPublishMode(options);
-    const uploadPromptAnswers = await uploadPrompt(options);
-    const src = options.src || uploadPromptAnswers.src;
-    const saveOutput = options.saveOutput;
-    let dest = options.dest || uploadPromptAnswers.dest;
-    let absoluteSrcPath = path.resolve(getCwd(), src);
+    const { derivedAccountId } = args;
+    const cmsPublishMode = (0, commonOpts_1.getCmsPublishMode)(args);
+    const uploadPromptAnswers = await (0, uploadPrompt_1.uploadPrompt)(args);
+    const src = args.src || uploadPromptAnswers.src;
+    const saveOutput = args.saveOutput;
+    let dest = args.dest || uploadPromptAnswers.dest;
+    let absoluteSrcPath = path_1.default.resolve((0, path_2.getCwd)(), src);
     if (!dest) {
-        logger.error(i18n('commands.upload.errors.destinationRequired'));
+        logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.destinationRequired'));
         return;
     }
     // Check for theme.json file and determine the root path for the project based on it if it exists
-    const themeJsonPath = getThemeJSONPath(absoluteSrcPath);
+    const themeJsonPath = (0, themes_1.getThemeJSONPath)(absoluteSrcPath);
     const projectRoot = themeJsonPath
-        ? path.dirname(themeJsonPath)
-        : path.dirname(getCwd());
+        ? path_1.default.dirname(themeJsonPath)
+        : path_1.default.dirname((0, path_2.getCwd)());
     const convertFields = projectRoot &&
-        isConvertableFieldJs(projectRoot, absoluteSrcPath, options.convertFields);
+        (0, handleFieldsJS_1.isConvertableFieldJs)(projectRoot, absoluteSrcPath, args.convertFields);
     let fieldsJs;
     if (convertFields) {
-        fieldsJs = await new FieldsJs(projectRoot, absoluteSrcPath, undefined, options.fieldOptions).init();
+        fieldsJs = await new handleFieldsJS_1.FieldsJs(projectRoot, absoluteSrcPath, undefined, args.fieldOptions).init();
         if (fieldsJs.rejected)
             return;
         // Ensures that the dest path is a .json. The user might pass '.js' accidentally - this ensures it just works.
-        absoluteSrcPath = fieldsJs.outputPath;
-        dest = path.join(path.dirname(dest), 'fields.json');
+        if (fieldsJs.outputPath) {
+            absoluteSrcPath = fieldsJs.outputPath;
+        }
+        dest = path_1.default.join(path_1.default.dirname(dest), 'fields.json');
     }
     let stats;
     try {
-        stats = fs.statSync(absoluteSrcPath);
+        stats = fs_1.default.statSync(absoluteSrcPath);
         if (!stats.isFile() && !stats.isDirectory()) {
-            logger.error(i18n('commands.upload.errors.invalidPath', {
+            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.invalidPath', {
                 path: src,
             }));
             return;
         }
     }
     catch (e) {
-        logger.error(i18n('commands.upload.errors.invalidPath', {
+        logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.invalidPath', {
             path: src,
         }));
         return;
     }
-    const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
-    const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
+    const normalizedDest = (0, path_2.convertToUnixPath)(dest);
+    (0, usageTracking_1.trackCommandUsage)('upload', { mode: cmsPublishMode, type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    const srcDestIssues = await (0, modules_1.validateSrcAndDestPaths)({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
-        srcDestIssues.forEach(({ message }) => logger.error(message));
-        process.exit(EXIT_CODES.WARNING);
+        srcDestIssues.forEach(({ message }) => logger_1.logger.error(message));
+        process.exit(exitCodes_1.EXIT_CODES.WARNING);
     }
     if (stats.isFile()) {
-        if (!isAllowedExtension(src) && !convertFields) {
-            logger.error(i18n('commands.upload.errors.invalidPath', {
+        if (!(0, path_2.isAllowedExtension)(src) && !convertFields) {
+            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.invalidPath', {
                 path: src,
             }));
             return;
         }
-        if (shouldIgnoreFile(absoluteSrcPath)) {
-            logger.error(i18n('commands.upload.errors.fileIgnored', {
+        if ((0, ignoreRules_1.shouldIgnoreFile)(absoluteSrcPath)) {
+            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.fileIgnored', {
                 path: src,
             }));
             return;
         }
-        upload(derivedAccountId, absoluteSrcPath, normalizedDest, getFileMapperQueryValues(cmsPublishMode, options))
+        (0, fileMapper_2.upload)(derivedAccountId, absoluteSrcPath, normalizedDest, (0, fileMapper_1.getFileMapperQueryValues)(cmsPublishMode))
             .then(() => {
-            logger.success(i18n('commands.upload.success.fileUploaded', {
+            logger_1.logger.success((0, lang_1.i18n)('commands.upload.success.fileUploaded', {
                 accountId: derivedAccountId,
                 dest: normalizedDest,
                 src,
@@ -109,127 +114,143 @@ exports.handler = async (options) => {
             logThemePreview(src, derivedAccountId);
         })
             .catch(error => {
-            logger.error(i18n('commands.upload.errors.uploadFailed', {
+            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.uploadFailed', {
                 dest: normalizedDest,
                 src,
             }));
-            logError(error, new ApiErrorContext({
+            (0, index_1.logError)(error, new index_1.ApiErrorContext({
                 accountId: derivedAccountId,
                 request: normalizedDest,
                 payload: src,
             }));
-            process.exit(EXIT_CODES.WARNING);
+            process.exit(exitCodes_1.EXIT_CODES.WARNING);
         })
             .finally(() => {
             if (!convertFields)
                 return;
-            if (saveOutput) {
+            if (saveOutput && fieldsJs) {
                 fieldsJs.saveOutput();
             }
-            cleanupTmpDirSync(fieldsJs.rootWriteDir);
+            if (fieldsJs) {
+                (0, handleFieldsJS_1.cleanupTmpDirSync)(fieldsJs.rootWriteDir);
+            }
         });
     }
     else {
-        logger.log(i18n('commands.upload.uploading', {
+        logger_1.logger.log((0, lang_1.i18n)('commands.upload.uploading', {
             accountId: derivedAccountId,
             dest,
             src,
         }));
         // Generate the first-pass file list in here, and pass to uploadFolder.
-        const filePaths = await getUploadableFileList(absoluteSrcPath, options.convertFields);
-        if (options.clean) {
+        const filePaths = await (0, upload_1.getUploadableFileList)(absoluteSrcPath, args.convertFields ?? false);
+        if (args.clean) {
             //  If clean is true, will first delete the dest folder and then upload src. Cleans up files that only exist on HS.
-            let cleanUpload = options.force;
-            if (!options.force) {
-                cleanUpload = await confirmPrompt(i18n('commands.upload.confirmCleanUpload', {
+            let cleanUpload = args.force;
+            if (!args.force) {
+                cleanUpload = await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)('commands.upload.confirmCleanUpload', {
                     accountId: derivedAccountId,
                     path: dest,
                 }), { defaultAnswer: false });
             }
             if (cleanUpload) {
                 try {
-                    await deleteFile(derivedAccountId, dest);
-                    logger.log(i18n('commands.upload.cleaning', {
+                    await (0, fileMapper_2.deleteFile)(derivedAccountId, dest);
+                    logger_1.logger.log((0, lang_1.i18n)('commands.upload.cleaning', {
                         accountId: derivedAccountId,
                         filePath: dest,
                     }));
                 }
                 catch (error) {
-                    logger.error(i18n('commands.upload.errors.deleteFailed', {
+                    logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.deleteFailed', {
                         accountId: derivedAccountId,
                         path: dest,
                     }));
                 }
             }
         }
-        uploadFolder(derivedAccountId, absoluteSrcPath, dest, {
-            cmsPublishMode,
-        }, options, filePaths)
+        (0, uploadFolder_1.uploadFolder)(derivedAccountId, absoluteSrcPath, dest, {}, {
+            convertFields: args.convertFields,
+            // @ts-expect-error - fieldOptions is a string or string[]
+            fieldOptions: args.fieldOptions ?? undefined,
+            saveOutput: args.saveOutput,
+        }, filePaths)
             .then(results => {
-            if (!hasUploadErrors(results)) {
-                logger.success(i18n('commands.upload.success.uploadComplete', {
+            if (!(0, uploadFolder_1.hasUploadErrors)(results)) {
+                logger_1.logger.success((0, lang_1.i18n)('commands.upload.success.uploadComplete', {
                     dest,
                 }));
                 logThemePreview(src, derivedAccountId);
             }
             else {
-                logger.error(i18n('commands.upload.errors.someFilesFailed', {
+                logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.someFilesFailed', {
                     dest,
                 }));
-                process.exit(EXIT_CODES.WARNING);
+                process.exit(exitCodes_1.EXIT_CODES.WARNING);
             }
         })
             .catch(error => {
-            logger.error(i18n('commands.upload.errors.uploadFailed', {
+            logger_1.logger.error((0, lang_1.i18n)('commands.upload.errors.uploadFailed', {
                 dest,
                 src,
             }));
-            logError(error, {
+            (0, index_1.logError)(error, {
                 accountId: derivedAccountId,
             });
-            process.exit(EXIT_CODES.WARNING);
+            process.exit(exitCodes_1.EXIT_CODES.WARNING);
         });
     }
-};
-exports.builder = yargs => {
+}
+function uploadBuilder(yargs) {
     yargs.positional('src', {
-        describe: i18n('commands.upload.positionals.src.describe'),
+        describe: (0, lang_1.i18n)('commands.upload.positionals.src.describe'),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n('commands.upload.positionals.dest.describe'),
+        describe: (0, lang_1.i18n)('commands.upload.positionals.dest.describe'),
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: i18n('commands.upload.options.options.describe'),
+        describe: (0, lang_1.i18n)('commands.upload.options.options.describe'),
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('saveOutput', {
-        describe: i18n('commands.upload.options.saveOutput.describe'),
+        describe: (0, lang_1.i18n)('commands.upload.options.saveOutput.describe'),
         type: 'boolean',
         default: false,
     });
     yargs.option('convertFields', {
-        describe: i18n('commands.upload.options.convertFields.describe'),
+        describe: (0, lang_1.i18n)('commands.upload.options.convertFields.describe'),
         type: 'boolean',
         default: false,
     });
     yargs.option('clean', {
-        describe: i18n('commands.upload.options.clean.describe'),
+        describe: (0, lang_1.i18n)('commands.upload.options.clean.describe'),
         type: 'boolean',
         default: false,
     });
     yargs.option('force', {
-        describe: i18n('commands.upload.options.force.describe'),
+        describe: (0, lang_1.i18n)('commands.upload.options.force.describe'),
         type: 'boolean',
         default: false,
     });
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addCmsPublishModeOptions(yargs, { write: true });
-    addUseEnvironmentOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(uploadBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useCmsPublishModeOptions: true,
+});
+const uploadCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = uploadCommand;
+// TODO remove this after cli.ts is ported to TS
+module.exports = uploadCommand;

package/commands/watch.d.ts

@@ -1 +1,14 @@
-export {};
+import { AccountArgs, CmsPublishModeArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs';
+type WatchCommandArgs = ConfigArgs & AccountArgs & EnvironmentArgs & CommonArgs & CmsPublishModeArgs & {
+    src?: string;
+    dest?: string;
+    fieldOptions?: string[];
+    remove?: boolean;
+    initialUpload?: boolean;
+    disableInitial?: boolean;
+    notify?: string;
+    convertFields?: boolean;
+    saveOutput?: boolean;
+};
+declare const watchCommand: YargsCommandModule<unknown, WatchCommandArgs>;
+export default watchCommand;

package/commands/watch.js

@@ -1,145 +1,156 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const fs = require('fs');
-const path = require('path');
-const { watch } = require('@hubspot/local-dev-lib/cms/watch');
-const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addConfigOptions, addAccountOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, addGlobalOptions, getCmsPublishMode, } = require('../lib/commonOpts');
-const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
-const { validateCmsPublishMode } = require('../lib/validation');
-const { trackCommandUsage } = require('../lib/usageTracking');
-const { i18n } = require('../lib/lang');
-const { getUploadableFileList } = require('../lib/upload');
-const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
-const { EXIT_CODES } = require('../lib/enums/exitCodes');
-exports.command = 'watch [src] [dest]';
-exports.describe = i18n(`commands.watch.describe`);
-exports.handler = async (options) => {
-    const { remove, initialUpload, disableInitial, notify, derivedAccountId } = options;
-    if (!validateCmsPublishMode(options)) {
-        process.exit(EXIT_CODES.ERROR);
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const watch_1 = require("@hubspot/local-dev-lib/cms/watch");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const commonOpts_1 = require("../lib/commonOpts");
+const uploadPrompt_1 = require("../lib/prompts/uploadPrompt");
+const validation_1 = require("../lib/validation");
+const usageTracking_1 = require("../lib/usageTracking");
+const lang_1 = require("../lib/lang");
+const upload_1 = require("../lib/upload");
+const errorHandlers_1 = require("../lib/errorHandlers");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = 'watch [src] [dest]';
+const describe = (0, lang_1.i18n)(`commands.watch.describe`);
+const handler = async (args) => {
+    const { remove, initialUpload, disableInitial, notify, derivedAccountId } = args;
+    if (!(0, validation_1.validateCmsPublishMode)(args)) {
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const cmsPublishMode = getCmsPublishMode(options);
-    const uploadPromptAnswers = await uploadPrompt(options);
-    const src = options.src || uploadPromptAnswers.src;
-    const dest = options.dest || uploadPromptAnswers.dest;
-    const absoluteSrcPath = path.resolve(getCwd(), src);
+    const cmsPublishMode = (0, commonOpts_1.getCmsPublishMode)(args);
+    const uploadPromptAnswers = await (0, uploadPrompt_1.uploadPrompt)(args);
+    const src = args.src || uploadPromptAnswers.src;
+    const dest = args.dest || uploadPromptAnswers.dest;
+    const absoluteSrcPath = path_1.default.resolve((0, path_2.getCwd)(), src);
     try {
-        const stats = fs.statSync(absoluteSrcPath);
+        const stats = fs_1.default.statSync(absoluteSrcPath);
         if (!stats.isDirectory()) {
-            logger.log(i18n(`commands.watch.errors.invalidPath`, {
+            logger_1.logger.log((0, lang_1.i18n)(`commands.watch.errors.invalidPath`, {
                 path: src,
             }));
             return;
         }
     }
     catch (e) {
-        logger.log(i18n(`commands.watch.errors.invalidPath`, {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.watch.errors.invalidPath`, {
             path: src,
         }));
         return;
     }
     if (!dest) {
-        logger.log(i18n(`commands.watch.errors.destinationRequired`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.watch.errors.destinationRequired`));
         return;
     }
     let filesToUpload = [];
     if (disableInitial) {
-        logger.info(i18n(`commands.watch.warnings.disableInitial`));
+        logger_1.logger.info((0, lang_1.i18n)(`commands.watch.warnings.disableInitial`));
     }
     else if (!initialUpload) {
-        logger.info(i18n(`commands.watch.warnings.notUploaded`, { path: src }));
-        logger.info(i18n(`commands.watch.warnings.initialUpload`));
+        logger_1.logger.info((0, lang_1.i18n)(`commands.watch.warnings.notUploaded`, { path: src }));
+        logger_1.logger.info((0, lang_1.i18n)(`commands.watch.warnings.initialUpload`));
     }
     if (initialUpload) {
-        filesToUpload = await getUploadableFileList(absoluteSrcPath, options.convertFields);
+        filesToUpload = await (0, upload_1.getUploadableFileList)(absoluteSrcPath, args.convertFields);
     }
-    trackCommandUsage('watch', { mode: cmsPublishMode }, derivedAccountId);
-    const postInitialUploadCallback = null;
-    const onUploadFolderError = error => {
-        logger.error(i18n(`commands.watch.errors.folderFailed`, {
+    (0, usageTracking_1.trackCommandUsage)('watch', { mode: cmsPublishMode }, derivedAccountId);
+    const onUploadFolderError = (error) => {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.watch.errors.folderFailed`, {
             src,
             dest,
             accountId: derivedAccountId,
         }));
-        logError(error, {
+        (0, errorHandlers_1.logError)(error, {
             accountId: derivedAccountId,
         });
     };
-    const onQueueAddError = null;
-    const onUploadFileError = (file, dest, derivedAccountId) => error => {
-        logger.error(i18n(`commands.watch.errors.fileFailed`, {
+    const onUploadFileError = (file, destPath, accountId) => (error) => {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.watch.errors.fileFailed`, {
             file,
-            dest,
-            accountId: derivedAccountId,
+            dest: destPath,
+            accountId,
         }));
-        logError(error, new ApiErrorContext({
-            accountId: derivedAccountId,
-            request: dest,
+        (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({
+            accountId,
+            request: destPath,
             payload: file,
         }));
     };
-    watch(derivedAccountId, absoluteSrcPath, dest, {
+    (0, watch_1.watch)(derivedAccountId, absoluteSrcPath, dest, {
         cmsPublishMode,
         remove,
-        disableInitial: initialUpload ? false : true,
+        disableInitial: !initialUpload,
         notify,
-        commandOptions: options,
+        commandOptions: args,
         filePaths: filesToUpload,
-    }, postInitialUploadCallback, onUploadFolderError, onQueueAddError, onUploadFileError);
+    }, null, onUploadFolderError, undefined, onUploadFileError);
 };
-exports.builder = yargs => {
+function watchBuilder(yargs) {
     yargs.positional('src', {
-        describe: i18n(`commands.watch.positionals.src.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.positionals.src.describe`),
         type: 'string',
     });
     yargs.positional('dest', {
-        describe: i18n(`commands.watch.positionals.dest.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.positionals.dest.describe`),
         type: 'string',
     });
     yargs.option('fieldOptions', {
-        describe: i18n(`commands.watch.options.options.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.options.options.describe`),
         type: 'array',
         default: [''],
         hidden: true,
     });
     yargs.option('remove', {
         alias: 'r',
-        describe: i18n(`commands.watch.options.remove.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.options.remove.describe`),
         type: 'boolean',
     });
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: i18n(`commands.watch.options.initialUpload.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.options.initialUpload.describe`),
         type: 'boolean',
     });
     yargs.option('disable-initial', {
-        describe: i18n(`commands.watch.options.disableInitial.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.options.disableInitial.describe`),
         type: 'boolean',
         hidden: true,
     });
     yargs.option('notify', {
         alias: 'n',
-        describe: i18n(`commands.watch.options.notify.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.options.notify.describe`),
         type: 'string',
         requiresArg: true,
     });
     yargs.option('convertFields', {
-        describe: i18n(`commands.watch.options.convertFields.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.options.convertFields.describe`),
         type: 'boolean',
         default: false,
     });
     yargs.option('saveOutput', {
-        describe: i18n(`commands.watch.options.saveOutput.describe`),
+        describe: (0, lang_1.i18n)(`commands.watch.options.saveOutput.describe`),
         type: 'boolean',
         default: false,
     });
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addCmsPublishModeOptions(yargs, { write: true });
-    addUseEnvironmentOptions(yargs);
-    addGlobalOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(watchBuilder, command, describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useGlobalOptions: true,
+    useEnvironmentOptions: true,
+    useCmsPublishModeOptions: { write: true },
+});
+const watchCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = watchCommand;
+module.exports = watchCommand;