@internxt/cli 1.6.2 → 1.6.3

package/dist/commands/add-cert.d.ts

@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 export default class AddCert extends Command {
     static readonly args: {};
     static readonly description = "Add a self-signed certificate to the trusted store for macOS, Linux, and Windows.";
-    static readonly aliases: never[];
+    static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {};
     static readonly enableJsonFlag = true;

package/dist/commands/add-cert.js

@@ -12,7 +12,7 @@ const configs_1 = require("../constants/configs");
 class AddCert extends core_1.Command {
     static args = {};
     static description = 'Add a self-signed certificate to the trusted store for macOS, Linux, and Windows.';
-    static aliases = [];
+    static aliases = ['add:cert'];
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {};
     static enableJsonFlag = true;

package/dist/commands/config.d.ts

@@ -4,7 +4,11 @@ export default class Config extends Command {
     static readonly description = "Display useful information from the user logged into the Internxt CLI.";
     static readonly aliases: never[];
     static readonly examples: string[];
-    static readonly flags: {};
+    static readonly flags: {
+        extended: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
         success: boolean;
@@ -18,4 +22,6 @@ export default class Config extends Command {
         config?: undefined;
     }>;
     catch: (error: Error) => Promise<never>;
+    private readonly tryGetUsage;
+    private readonly tryGetSpaceLimit;
 }

package/dist/commands/config.js

@@ -5,29 +5,42 @@ const config_service_1 = require("../services/config.service");
 const cli_utils_1 = require("../utils/cli.utils");
 const usage_service_1 = require("../services/usage.service");
 const format_utils_1 = require("../utils/format.utils");
+const async_utils_1 = require("../utils/async.utils");
+const MAX_USAGE_TIMEOUT = 15_000;
 class Config extends core_1.Command {
     static args = {};
     static description = 'Display useful information from the user logged into the Internxt CLI.';
     static aliases = [];
     static examples = ['<%= config.bin %> <%= command.id %>'];
-    static flags = {};
+    static flags = {
+        ...cli_utils_1.CLIUtils.CommonFlags,
+        extended: core_1.Flags.boolean({
+            char: 'e',
+            description: 'Displays additional information in the list.',
+            required: false,
+        }),
+    };
     static enableJsonFlag = true;
     run = async () => {
+        const { flags } = await this.parse(Config);
         const userCredentials = await config_service_1.ConfigService.instance.readUser();
         if (userCredentials?.user) {
-            const usedSpace = format_utils_1.FormatUtils.humanFileSize((await usage_service_1.UsageService.instance.fetchUsage()).total);
-            const availableSpace = format_utils_1.FormatUtils.formatLimit(await usage_service_1.UsageService.instance.fetchSpaceLimit());
+            const [usedSpace, availableSpace] = await Promise.all([this.tryGetUsage(), this.tryGetSpaceLimit()]);
             const configList = [
                 { key: 'Email', value: userCredentials.user.email },
+                { key: 'User name', value: `${userCredentials.user.name} ${userCredentials.user.lastname}` },
                 { key: 'Root folder ID', value: userCredentials.user.rootFolderId },
                 { key: 'Used space', value: usedSpace },
                 { key: 'Available space', value: availableSpace },
             ];
-            const header = [
+            if (flags.extended) {
+                configList.push({ key: 'User ID', value: userCredentials.user.uuid }, { key: 'Created at', value: userCredentials.user.createdAt });
+            }
+            const headers = [
                 { value: 'key', alias: 'Key' },
                 { value: 'value', alias: 'Value' },
             ];
-            cli_utils_1.CLIUtils.table(this.log.bind(this), header, configList);
+            cli_utils_1.CLIUtils.table(this.log.bind(this), headers, configList);
             return { success: true, config: Object.fromEntries(configList.map(({ key, value }) => [key, value])) };
         }
         else {
@@ -46,5 +59,23 @@ class Config extends core_1.Command {
         });
         this.exit(1);
     };
+    tryGetUsage = async () => {
+        try {
+            const usage = await async_utils_1.AsyncUtils.withTimeout(usage_service_1.UsageService.instance.fetchUsage(), MAX_USAGE_TIMEOUT, 'Usage fetch timeout');
+            return format_utils_1.FormatUtils.humanFileSize(usage);
+        }
+        catch {
+            return '-';
+        }
+    };
+    tryGetSpaceLimit = async () => {
+        try {
+            const limit = await async_utils_1.AsyncUtils.withTimeout(usage_service_1.UsageService.instance.fetchSpaceLimit(), MAX_USAGE_TIMEOUT, 'Space limit timeout');
+            return format_utils_1.FormatUtils.formatLimit(limit);
+        }
+        catch {
+            return '-';
+        }
+    };
 }
 exports.default = Config;

package/dist/commands/create-folder.d.ts

@@ -2,12 +2,13 @@ import { Command } from '@oclif/core';
 export default class CreateFolder extends Command {
     static readonly args: {};
     static readonly description = "Create a folder in your Internxt Drive";
-    static readonly aliases: never[];
+    static readonly aliases: string[];
     static readonly examples: string[];
     static readonly flags: {
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/create-folder.js

@@ -7,10 +7,11 @@ const config_service_1 = require("../services/config.service");
 const validation_service_1 = require("../services/validation.service");
 const command_types_1 = require("../types/command.types");
 const async_utils_1 = require("../utils/async.utils");
+const auth_service_1 = require("../services/auth.service");
 class CreateFolder extends core_1.Command {
     static args = {};
     static description = 'Create a folder in your Internxt Drive';
-    static aliases = [];
+    static aliases = ['create:folder'];
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
         ...cli_utils_1.CLIUtils.CommonFlags,
@@ -34,12 +35,10 @@ class CreateFolder extends core_1.Command {
         if (!userCredentials)
             throw new command_types_1.MissingCredentialsError();
         const folderName = await this.getFolderName(flags['name'], nonInteractive);
-        let folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-        if (folderUuid.trim().length === 0) {
-            folderUuid = userCredentials.user.rootFolderId;
-        }
+        const folderUuidFromFlag = await this.getFolderUuid(flags['id'], nonInteractive);
+        const folderUuid = await cli_utils_1.CLIUtils.fallbackToRootFolderIdIfEmpty(folderUuidFromFlag);
         cli_utils_1.CLIUtils.doing('Creating folder...', flags['json']);
-        const [createNewFolder, requestCanceler] = drive_folder_service_1.DriveFolderService.instance.createFolder({
+        const [createNewFolder, requestCanceler] = await drive_folder_service_1.DriveFolderService.instance.createFolder({
             plainName: folderName,
             parentFolderUuid: folderUuid,
         });
@@ -50,7 +49,11 @@ class CreateFolder extends core_1.Command {
         const newFolder = await createNewFolder;
         await async_utils_1.AsyncUtils.sleep(500);
         cli_utils_1.CLIUtils.done(flags['json']);
-        const message = `Folder ${newFolder.plainName} created successfully, view it at ${config_service_1.ConfigService.instance.get('DRIVE_WEB_URL')}/folder/${newFolder.uuid}`;
+        const workspace = await auth_service_1.AuthService.instance.getCurrentWorkspace();
+        const workspaceId = workspace?.workspaceData.workspace.id;
+        const message = `Folder ${newFolder.plainName} created successfully, view it at ` +
+            `${config_service_1.ConfigService.instance.get('DRIVE_WEB_URL')}/folder/${newFolder.uuid}` +
+            `${workspaceId ? `?workspaceid=${workspaceId}` : ''}`;
         cli_utils_1.CLIUtils.success(this.log.bind(this), message);
         return { success: true, message, folder: newFolder };
     };

package/dist/commands/delete-permanently-file.d.ts

@@ -7,6 +7,7 @@ export default class DeletePermanentlyFile extends Command {
     static readonly flags: {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/delete-permanently-folder.d.ts

@@ -7,6 +7,7 @@ export default class DeletePermanentlyFolder extends Command {
     static readonly flags: {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/download-file.d.ts

@@ -10,6 +10,7 @@ export default class DownloadFile extends Command {
         directory: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         overwrite: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/download-file.js

@@ -63,9 +63,11 @@ class DownloadFile extends core_1.Command {
                 throw new command_types_1.NotValidFileIdError();
             }
             const { user } = await auth_service_1.AuthService.instance.getAuthDetails();
-            const networkFacade = cli_utils_1.CLIUtils.prepareNetwork({ loginUserDetails: user, jsonFlag: flags['json'] });
+            cli_utils_1.CLIUtils.doing('Preparing Network', flags['json']);
+            const { networkFacade, bucket, mnemonic } = await cli_utils_1.CLIUtils.prepareNetwork(user);
+            cli_utils_1.CLIUtils.done(flags['json']);
             const fileWriteStream = (0, node_fs_1.createWriteStream)(downloadPath);
-            const [executeDownload, abortable] = await networkFacade.downloadToStream(driveFile.bucket, user.mnemonic, driveFile.fileId, driveFile.size, stream_utils_1.StreamUtils.writeStreamToWritableStream(fileWriteStream), undefined, {
+            const [executeDownload, abortable] = await networkFacade.downloadToStream(bucket, mnemonic, driveFile.fileId, driveFile.size, stream_utils_1.StreamUtils.writeStreamToWritableStream(fileWriteStream), undefined, {
                 abortController: new AbortController(),
                 progressCallback: (progress) => {
                     progressBar?.update(progress * 0.99);

package/dist/commands/list.d.ts

@@ -8,6 +8,7 @@ export default class List extends Command {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         extended: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/list.js

@@ -33,10 +33,8 @@ class List extends core_1.Command {
         const userCredentials = await config_service_1.ConfigService.instance.readUser();
         if (!userCredentials)
             throw new command_types_1.MissingCredentialsError();
-        let folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-        if (folderUuid.trim().length === 0) {
-            folderUuid = userCredentials.user.rootFolderId;
-        }
+        const folderUuidFromFlag = await this.getFolderUuid(flags['id'], nonInteractive);
+        const folderUuid = await cli_utils_1.CLIUtils.fallbackToRootFolderIdIfEmpty(folderUuidFromFlag);
         const { folders, files } = await drive_folder_service_1.DriveFolderService.instance.getFolderContent(folderUuid);
         const allItems = [
             ...folders.map((folder) => {

package/dist/commands/login-legacy.d.ts

@@ -10,6 +10,7 @@ export default class LoginLegacy extends Command {
         twofactor: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         twofactortoken: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/move-file.d.ts

@@ -8,6 +8,7 @@ export default class MoveFile extends Command {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -35,5 +36,4 @@ export default class MoveFile extends Command {
     }>;
     catch: (error: Error) => Promise<never>;
     private getFileUuid;
-    private getDestinationFolderUuid;
 }

package/dist/commands/move-file.js

@@ -33,10 +33,13 @@ class MoveFile extends core_1.Command {
         if (!userCredentials)
             throw new command_types_1.MissingCredentialsError();
         const fileUuid = await this.getFileUuid(flags['id'], nonInteractive);
-        let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
-        if (destinationFolderUuid.trim().length === 0) {
-            destinationFolderUuid = userCredentials.user.rootFolderId;
-        }
+        const destinationFolderUuidFromFlag = await cli_utils_1.CLIUtils.getDestinationFolderUuid({
+            destinationFolderUuidFlag: flags['destination'],
+            destinationFlagName: MoveFile.flags['destination'].name,
+            nonInteractive,
+            reporter: this.log.bind(this),
+        });
+        const destinationFolderUuid = await cli_utils_1.CLIUtils.fallbackToRootFolderIdIfEmpty(destinationFolderUuidFromFlag);
         const newFile = await drive_file_service_1.DriveFileService.instance.moveFile(fileUuid, { destinationFolder: destinationFolderUuid });
         const message = `File moved successfully to: ${destinationFolderUuid}`;
         cli_utils_1.CLIUtils.success(this.log.bind(this), message);
@@ -68,22 +71,5 @@ class MoveFile extends core_1.Command {
         }, this.log.bind(this));
         return fileUuid;
     };
-    getDestinationFolderUuid = async (destinationFolderUuidFlag, nonInteractive) => {
-        const destinationFolderUuid = await cli_utils_1.CLIUtils.getValueFromFlag({
-            value: destinationFolderUuidFlag,
-            name: MoveFile.flags['destination'].name,
-        }, {
-            nonInteractive,
-            prompt: {
-                message: 'What is the destination folder id? (leave empty for the root folder)',
-                options: { type: 'input' },
-            },
-        }, {
-            validate: validation_service_1.ValidationService.instance.validateUUIDv4,
-            error: new command_types_1.NotValidFolderUuidError(),
-            canBeEmpty: true,
-        }, this.log.bind(this));
-        return destinationFolderUuid;
-    };
 }
 exports.default = MoveFile;

package/dist/commands/move-folder.d.ts

@@ -8,6 +8,7 @@ export default class MoveFolder extends Command {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -17,5 +18,4 @@ export default class MoveFolder extends Command {
     }>;
     catch: (error: Error) => Promise<never>;
     private getFolderUuid;
-    private getDestinationFolderUuid;
 }

package/dist/commands/move-folder.js

@@ -33,10 +33,13 @@ class MoveFolder extends core_1.Command {
         if (!userCredentials)
             throw new command_types_1.MissingCredentialsError();
         const folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-        let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
-        if (destinationFolderUuid.trim().length === 0) {
-            destinationFolderUuid = userCredentials.user.rootFolderId;
-        }
+        const destinationFolderUuidFromFlag = await cli_utils_1.CLIUtils.getDestinationFolderUuid({
+            destinationFolderUuidFlag: flags['destination'],
+            destinationFlagName: MoveFolder.flags['destination'].name,
+            nonInteractive,
+            reporter: this.log.bind(this),
+        });
+        const destinationFolderUuid = await cli_utils_1.CLIUtils.fallbackToRootFolderIdIfEmpty(destinationFolderUuidFromFlag);
         const newFolder = await drive_folder_service_1.DriveFolderService.instance.moveFolder(folderUuid, {
             destinationFolder: destinationFolderUuid,
         });
@@ -70,22 +73,5 @@ class MoveFolder extends core_1.Command {
         }, this.log.bind(this));
         return folderUuid;
     };
-    getDestinationFolderUuid = async (destinationFolderUuidFlag, nonInteractive) => {
-        const destinationFolderUuid = await cli_utils_1.CLIUtils.getValueFromFlag({
-            value: destinationFolderUuidFlag,
-            name: MoveFolder.flags['destination'].name,
-        }, {
-            nonInteractive,
-            prompt: {
-                message: 'What is the destination folder id? (leave empty for the root folder)',
-                options: { type: 'input' },
-            },
-        }, {
-            validate: validation_service_1.ValidationService.instance.validateUUIDv4,
-            error: new command_types_1.NotValidFolderUuidError(),
-            canBeEmpty: true,
-        }, this.log.bind(this));
-        return destinationFolderUuid;
-    };
 }
 exports.default = MoveFolder;

package/dist/commands/rename-file.d.ts

@@ -8,6 +8,7 @@ export default class RenameFile extends Command {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/rename-folder.d.ts

@@ -8,6 +8,7 @@ export default class RenameFolder extends Command {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/trash-clear.d.ts

@@ -7,6 +7,7 @@ export default class TrashClear extends Command {
     static readonly flags: {
         force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/trash-file.d.ts

@@ -7,6 +7,7 @@ export default class TrashFile extends Command {
     static readonly flags: {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/trash-folder.d.ts

@@ -7,6 +7,7 @@ export default class TrashFolder extends Command {
     static readonly flags: {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{

package/dist/commands/trash-restore-file.d.ts

@@ -8,6 +8,7 @@ export default class TrashRestoreFile extends Command {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -35,5 +36,4 @@ export default class TrashRestoreFile extends Command {
     }>;
     catch: (error: Error) => Promise<never>;
     private getFileUuid;
-    private getDestinationFolderUuid;
 }

package/dist/commands/trash-restore-file.js

@@ -33,10 +33,13 @@ class TrashRestoreFile extends core_1.Command {
         if (!userCredentials)
             throw new command_types_1.MissingCredentialsError();
         const fileUuid = await this.getFileUuid(flags['id'], nonInteractive);
-        let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
-        if (destinationFolderUuid.trim().length === 0) {
-            destinationFolderUuid = userCredentials.user.rootFolderId;
-        }
+        const destinationFolderUuidFromFlag = await cli_utils_1.CLIUtils.getDestinationFolderUuid({
+            destinationFolderUuidFlag: flags['destination'],
+            destinationFlagName: TrashRestoreFile.flags['destination'].name,
+            nonInteractive,
+            reporter: this.log.bind(this),
+        });
+        const destinationFolderUuid = await cli_utils_1.CLIUtils.fallbackToRootFolderIdIfEmpty(destinationFolderUuidFromFlag);
         const file = await drive_file_service_1.DriveFileService.instance.moveFile(fileUuid, { destinationFolder: destinationFolderUuid });
         const message = `File restored successfully to: ${destinationFolderUuid}`;
         cli_utils_1.CLIUtils.success(this.log.bind(this), message);
@@ -68,22 +71,5 @@ class TrashRestoreFile extends core_1.Command {
         }, this.log.bind(this));
         return fileUuid;
     };
-    getDestinationFolderUuid = async (destinationFolderUuidFlag, nonInteractive) => {
-        const destinationFolderUuid = await cli_utils_1.CLIUtils.getValueFromFlag({
-            value: destinationFolderUuidFlag,
-            name: TrashRestoreFile.flags['destination'].name,
-        }, {
-            nonInteractive,
-            prompt: {
-                message: 'What is the destination folder id? (leave empty for the root folder)',
-                options: { type: 'input' },
-            },
-        }, {
-            validate: validation_service_1.ValidationService.instance.validateUUIDv4,
-            error: new command_types_1.NotValidFolderUuidError(),
-            canBeEmpty: true,
-        }, this.log.bind(this));
-        return destinationFolderUuid;
-    };
 }
 exports.default = TrashRestoreFile;

package/dist/commands/trash-restore-folder.d.ts

@@ -8,6 +8,7 @@ export default class TrashRestoreFolder extends Command {
         id: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -17,5 +18,4 @@ export default class TrashRestoreFolder extends Command {
     }>;
     catch: (error: Error) => Promise<never>;
     private getFolderUuid;
-    private getDestinationFolderUuid;
 }

package/dist/commands/trash-restore-folder.js

@@ -33,10 +33,13 @@ class TrashRestoreFolder extends core_1.Command {
         if (!userCredentials)
             throw new command_types_1.MissingCredentialsError();
         const folderUuid = await this.getFolderUuid(flags['id'], nonInteractive);
-        let destinationFolderUuid = await this.getDestinationFolderUuid(flags['destination'], nonInteractive);
-        if (destinationFolderUuid.trim().length === 0) {
-            destinationFolderUuid = userCredentials.user.rootFolderId;
-        }
+        const destinationFolderUuidFromFlag = await cli_utils_1.CLIUtils.getDestinationFolderUuid({
+            destinationFolderUuidFlag: flags['destination'],
+            destinationFlagName: TrashRestoreFolder.flags['destination'].name,
+            nonInteractive,
+            reporter: this.log.bind(this),
+        });
+        const destinationFolderUuid = await cli_utils_1.CLIUtils.fallbackToRootFolderIdIfEmpty(destinationFolderUuidFromFlag);
         const folder = await drive_folder_service_1.DriveFolderService.instance.moveFolder(folderUuid, {
             destinationFolder: destinationFolderUuid,
         });
@@ -70,22 +73,5 @@ class TrashRestoreFolder extends core_1.Command {
         }, this.log.bind(this));
         return folderUuid;
     };
-    getDestinationFolderUuid = async (destinationFolderUuidFlag, nonInteractive) => {
-        const destinationFolderUuid = await cli_utils_1.CLIUtils.getValueFromFlag({
-            value: destinationFolderUuidFlag,
-            name: TrashRestoreFolder.flags['destination'].name,
-        }, {
-            nonInteractive,
-            prompt: {
-                message: 'What is the destination folder id? (leave empty for the root folder)',
-                options: { type: 'input' },
-            },
-        }, {
-            validate: validation_service_1.ValidationService.instance.validateUUIDv4,
-            error: new command_types_1.NotValidFolderUuidError(),
-            canBeEmpty: true,
-        }, this.log.bind(this));
-        return destinationFolderUuid;
-    };
 }
 exports.default = TrashRestoreFolder;

package/dist/commands/upload-file.d.ts

@@ -8,6 +8,7 @@ export default class UploadFile extends Command {
         file: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         destination: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'non-interactive': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        debug: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static readonly enableJsonFlag = true;
     run: () => Promise<{
@@ -17,11 +18,8 @@ export default class UploadFile extends Command {
             plainName: string;
             name: string;
             status: "EXISTS" | "TRASHED" | "DELETED";
-            id: number;
-            uuid: string;
-            fileId: string | null;
             bucket: string;
-            folderId: number;
+            uuid: string;
             folderUuid: string;
             itemType: "file";
             size: number;
@@ -29,7 +27,8 @@ export default class UploadFile extends Command {
             updatedAt: Date;
             creationTime: Date;
             modificationTime: Date;
-            type?: string | null;
+            type: string | null;
+            fileId: string | null;
         };
     }>;
     catch: (error: Error) => Promise<never>;