@capawesome/cli 1.14.0 → 2.0.1

package/dist/commands/organizations/create.js

@@ -0,0 +1,25 @@
+import authorizationService from '../../services/authorization-service.js';
+import organizationsService from '../../services/organizations.js';
+import { prompt } from '../../utils/prompt.js';
+import { defineCommand, defineOptions } from '@robingenz/zli';
+import consola from 'consola';
+import { z } from 'zod';
+export default defineCommand({
+    description: 'Create a new organization.',
+    options: defineOptions(z.object({
+        name: z.string().optional().describe('Name of the organization.'),
+    })),
+    action: async (options, args) => {
+        let { name } = options;
+        if (!authorizationService.hasAuthorizationToken()) {
+            consola.error('You must be logged in to run this command.');
+            process.exit(1);
+        }
+        if (!name) {
+            name = await prompt('Enter the name of the organization:', { type: 'text' });
+        }
+        const response = await organizationsService.create({ name });
+        consola.success('Organization created successfully.');
+        consola.info(`Organization ID: ${response.id}`);
+    },
+});

package/dist/commands/organizations/create.test.js

@@ -0,0 +1,80 @@
+import { DEFAULT_API_BASE_URL } from '../../config/consts.js';
+import authorizationService from '../../services/authorization-service.js';
+import { prompt } from '../../utils/prompt.js';
+import userConfig from '../../utils/user-config.js';
+import consola from 'consola';
+import nock from 'nock';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import createOrganizationCommand from './create.js';
+// Mock dependencies
+vi.mock('@/utils/user-config.js');
+vi.mock('@/utils/prompt.js');
+vi.mock('@/services/authorization-service.js');
+vi.mock('consola');
+describe('organizations-create', () => {
+    const mockUserConfig = vi.mocked(userConfig);
+    const mockPrompt = vi.mocked(prompt);
+    const mockConsola = vi.mocked(consola);
+    const mockAuthorizationService = vi.mocked(authorizationService);
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockUserConfig.read.mockReturnValue({ token: 'test-token' });
+        mockAuthorizationService.getCurrentAuthorizationToken.mockReturnValue('test-token');
+        mockAuthorizationService.hasAuthorizationToken.mockReturnValue(true);
+        vi.spyOn(process, 'exit').mockImplementation((code) => {
+            throw new Error(`Process exited with code ${code}`);
+        });
+    });
+    afterEach(() => {
+        nock.cleanAll();
+        vi.restoreAllMocks();
+    });
+    it('should create organization with provided name', async () => {
+        const organizationName = 'Test Organization';
+        const organizationId = 'org-456';
+        const testToken = 'test-token';
+        const options = { name: organizationName };
+        const scope = nock(DEFAULT_API_BASE_URL)
+            .post('/v1/organizations', { name: organizationName })
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(201, { id: organizationId, name: organizationName });
+        await createOrganizationCommand.action(options, undefined);
+        expect(scope.isDone()).toBe(true);
+        expect(mockConsola.success).toHaveBeenCalledWith('Organization created successfully.');
+        expect(mockConsola.info).toHaveBeenCalledWith(`Organization ID: ${organizationId}`);
+    });
+    it('should prompt for organization name when not provided', async () => {
+        const promptedOrganizationName = 'Prompted Organization';
+        const organizationId = 'org-456';
+        const testToken = 'test-token';
+        const options = {};
+        const scope = nock(DEFAULT_API_BASE_URL)
+            .post('/v1/organizations', { name: promptedOrganizationName })
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(201, { id: organizationId, name: promptedOrganizationName });
+        mockPrompt.mockResolvedValueOnce(promptedOrganizationName);
+        await createOrganizationCommand.action(options, undefined);
+        expect(scope.isDone()).toBe(true);
+        expect(mockPrompt).toHaveBeenCalledWith('Enter the name of the organization:', { type: 'text' });
+        expect(mockConsola.success).toHaveBeenCalledWith('Organization created successfully.');
+        expect(mockConsola.info).toHaveBeenCalledWith(`Organization ID: ${organizationId}`);
+    });
+    it('should exit when not logged in', async () => {
+        const organizationName = 'Test Organization';
+        const options = { name: organizationName };
+        mockAuthorizationService.hasAuthorizationToken.mockReturnValue(false);
+        await expect(createOrganizationCommand.action(options, undefined)).rejects.toThrow('Process exited with code 1');
+        expect(mockConsola.error).toHaveBeenCalledWith('You must be logged in to run this command.');
+    });
+    it('should handle API error during creation', async () => {
+        const organizationName = 'Test Organization';
+        const testToken = 'test-token';
+        const options = { name: organizationName };
+        const scope = nock(DEFAULT_API_BASE_URL)
+            .post('/v1/organizations', { name: organizationName })
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(400, { message: 'Organization name already exists' });
+        await expect(createOrganizationCommand.action(options, undefined)).rejects.toThrow();
+        expect(scope.isDone()).toBe(true);
+    });
+});

package/dist/commands/whoami.js

@@ -1,41 +1,30 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const citty_1 = require("citty");
-const consola_1 = __importDefault(require("consola"));
-const users_1 = __importDefault(require("../services/users"));
-const userConfig_1 = __importDefault(require("../utils/userConfig"));
-exports.default = (0, citty_1.defineCommand)({
-    meta: {
-        name: 'whoami',
-        description: 'Show current user',
-    },
-    run: () => __awaiter(void 0, void 0, void 0, function* () {
-        const { token } = userConfig_1.default.read();
+import usersService from '../services/users.js';
+import userConfig from '../utils/user-config.js';
+import { defineCommand } from '@robingenz/zli';
+import { AxiosError } from 'axios';
+import consola from 'consola';
+export default defineCommand({
+    description: 'Show current user',
+    action: async (options, args) => {
+        const { token } = userConfig.read();
         if (token) {
             try {
-                const user = yield users_1.default.me();
-                consola_1.default.info(`Logged in as ${user.email}.`);
+                const user = await usersService.me();
+                consola.info(`Logged in as ${user.email}.`);
             }
             catch (error) {
-                consola_1.default.error('Token is invalid. Please sign in again.');
-                process.exit(1);
+                if (error instanceof AxiosError && error.response?.status === 401) {
+                    consola.error('Token is invalid. Please sign in again.');
+                    process.exit(1);
+                }
+                else {
+                    throw error;
+                }
             }
         }
         else {
-            consola_1.default.error('Not logged in.');
+            consola.error('Not logged in.');
             process.exit(1);
         }
-    }),
+    },
 });

package/dist/commands/whoami.test.js

@@ -0,0 +1,30 @@
+import { DEFAULT_API_BASE_URL } from '../config/consts.js';
+import userConfig from '../utils/user-config.js';
+import nock from 'nock';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import whoamiCommand from './whoami.js';
+// Mock only the dependencies we need to control
+vi.mock('@/utils/user-config.js');
+describe('whoami', () => {
+    const mockUserConfig = vi.mocked(userConfig);
+    beforeEach(() => {
+        vi.clearAllMocks();
+        vi.spyOn(process, 'exit').mockImplementation(() => undefined);
+    });
+    afterEach(() => {
+        nock.cleanAll();
+        vi.restoreAllMocks();
+    });
+    it('should send Bearer token in Authorization header when checking current user', async () => {
+        const testToken = 'user-token-456';
+        // Mock userConfig.read to return our test token
+        mockUserConfig.read.mockReturnValue({ token: testToken });
+        // Set up nock to intercept the /v1/users/me request
+        const scope = nock(DEFAULT_API_BASE_URL)
+            .get('/v1/users/me')
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(200, { id: 'user-456', email: 'user@example.com' });
+        await whoamiCommand.action({}, undefined);
+        expect(scope.isDone()).toBe(true);
+    });
+});

package/dist/config/consts.js

@@ -1,5 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_CONCURRENT_UPLOADS = exports.MANIFEST_JSON_FILE_NAME = void 0;
-exports.MANIFEST_JSON_FILE_NAME = 'capawesome-live-update-manifest.json'; // Do NOT change this!
-exports.MAX_CONCURRENT_UPLOADS = 20;
+export const DEFAULT_API_BASE_URL = 'https://api.cloud.capawesome.io';
+export const DEFAULT_CONSOLE_BASE_URL = 'https://console.cloud.capawesome.io';
+export const MANIFEST_JSON_FILE_NAME = 'capawesome-live-update-manifest.json'; // Do NOT change this!
+export const MAX_CONCURRENT_UPLOADS = 20;

package/dist/config/index.js

@@ -1,17 +1 @@
-"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("./consts"), exports);
+export * from './consts.js';

package/dist/index.js

@@ -1,81 +1,44 @@
 #!/usr/bin/env node
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Sentry = __importStar(require("@sentry/node"));
-const citty_1 = require("citty");
-const consola_1 = __importDefault(require("consola"));
-const package_json_1 = __importDefault(require("../package.json"));
-const config_1 = __importDefault(require("./services/config"));
-const update_1 = __importDefault(require("./services/update"));
-const error_1 = require("./utils/error");
-const main = (0, citty_1.defineCommand)({
+import configService from './services/config.js';
+import updateService from './services/update.js';
+import { getMessageFromUnknownError } from './utils/error.js';
+import { defineConfig, processConfig, ZliError } from '@robingenz/zli';
+import * as Sentry from '@sentry/node';
+import consola from 'consola';
+import pkg from '../package.json' with { type: 'json' };
+const config = defineConfig({
     meta: {
-        name: package_json_1.default.name,
-        version: package_json_1.default.version,
-        description: package_json_1.default.description,
-    },
-    setup() {
-        // No op
+        name: pkg.name,
+        version: pkg.version,
+        description: pkg.description,
     },
-    cleanup() {
-        return update_1.default.checkForUpdate();
-    },
-    subCommands: {
-        whoami: Promise.resolve().then(() => __importStar(require('./commands/whoami'))).then((mod) => mod.default),
-        login: Promise.resolve().then(() => __importStar(require('./commands/login'))).then((mod) => mod.default),
-        logout: Promise.resolve().then(() => __importStar(require('./commands/logout'))).then((mod) => mod.default),
-        doctor: Promise.resolve().then(() => __importStar(require('./commands/doctor'))).then((mod) => mod.default),
-        'apps:create': Promise.resolve().then(() => __importStar(require('./commands/apps/create'))).then((mod) => mod.default),
-        'apps:delete': Promise.resolve().then(() => __importStar(require('./commands/apps/delete'))).then((mod) => mod.default),
-        'apps:bundles:create': Promise.resolve().then(() => __importStar(require('./commands/apps/bundles/create'))).then((mod) => mod.default),
-        'apps:bundles:delete': Promise.resolve().then(() => __importStar(require('./commands/apps/bundles/delete'))).then((mod) => mod.default),
-        'apps:bundles:update': Promise.resolve().then(() => __importStar(require('./commands/apps/bundles/update'))).then((mod) => mod.default),
-        'apps:channels:create': Promise.resolve().then(() => __importStar(require('./commands/apps/channels/create'))).then((mod) => mod.default),
-        'apps:channels:delete': Promise.resolve().then(() => __importStar(require('./commands/apps/channels/delete'))).then((mod) => mod.default),
-        'apps:channels:get': Promise.resolve().then(() => __importStar(require('./commands/apps/channels/get'))).then((mod) => mod.default),
-        'apps:channels:list': Promise.resolve().then(() => __importStar(require('./commands/apps/channels/list'))).then((mod) => mod.default),
-        'apps:channels:update': Promise.resolve().then(() => __importStar(require('./commands/apps/channels/update'))).then((mod) => mod.default),
-        'apps:devices:delete': Promise.resolve().then(() => __importStar(require('./commands/apps/devices/delete'))).then((mod) => mod.default),
-        'manifests:generate': Promise.resolve().then(() => __importStar(require('./commands/manifests/generate'))).then((mod) => mod.default),
+    commands: {
+        whoami: await import('./commands/whoami.js').then((mod) => mod.default),
+        login: await import('./commands/login.js').then((mod) => mod.default),
+        logout: await import('./commands/logout.js').then((mod) => mod.default),
+        doctor: await import('./commands/doctor.js').then((mod) => mod.default),
+        'apps:create': await import('./commands/apps/create.js').then((mod) => mod.default),
+        'apps:delete': await import('./commands/apps/delete.js').then((mod) => mod.default),
+        'apps:bundles:create': await import('./commands/apps/bundles/create.js').then((mod) => mod.default),
+        'apps:bundles:delete': await import('./commands/apps/bundles/delete.js').then((mod) => mod.default),
+        'apps:bundles:update': await import('./commands/apps/bundles/update.js').then((mod) => mod.default),
+        'apps:channels:create': await import('./commands/apps/channels/create.js').then((mod) => mod.default),
+        'apps:channels:delete': await import('./commands/apps/channels/delete.js').then((mod) => mod.default),
+        'apps:channels:get': await import('./commands/apps/channels/get.js').then((mod) => mod.default),
+        'apps:channels:list': await import('./commands/apps/channels/list.js').then((mod) => mod.default),
+        'apps:channels:update': await import('./commands/apps/channels/update.js').then((mod) => mod.default),
+        'apps:devices:delete': await import('./commands/apps/devices/delete.js').then((mod) => mod.default),
+        'manifests:generate': await import('./commands/manifests/generate.js').then((mod) => mod.default),
+        'organizations:create': await import('./commands/organizations/create.js').then((mod) => mod.default),
     },
 });
-const captureException = (error) => __awaiter(void 0, void 0, void 0, function* () {
-    const environment = yield config_1.default.getValueForKey('ENVIRONMENT');
+const captureException = async (error) => {
+    // Check if the error is from the CLI itself
+    if (error instanceof ZliError) {
+        // Ignore CLI errors like "No command found."
+        return;
+    }
+    const environment = await configService.getValueForKey('ENVIRONMENT');
     if (environment !== 'production') {
         return;
     }
@@ -83,19 +46,35 @@ const captureException = (error) => __awaiter(void 0, void 0, void 0, function*
         dsn: 'https://19f30f2ec4b91899abc33818568ceb42@o4507446340747264.ingest.de.sentry.io/4508506426966096',
     });
     Sentry.captureException(error);
-    yield Sentry.close();
-});
-(0, citty_1.runMain)(main).catch((error) => __awaiter(void 0, void 0, void 0, function* () {
+    await Sentry.close();
+};
+try {
+    if (!process.argv.includes('@capawesome/cli')) {
+        consola.warn('The `capawesome` command is deprecated. Please use `@capawesome/cli` instead.');
+    }
+    const result = processConfig(config, process.argv.slice(2));
+    await result.command.action(result.options, result.args);
+}
+catch (error) {
     try {
-        yield captureException(error).catch(() => {
+        await captureException(error).catch(() => {
             // No op
         });
         // Print the error message
-        const message = (0, error_1.getMessageFromUnknownError)(error);
-        consola_1.default.error(message);
+        const message = getMessageFromUnknownError(error);
+        consola.error(message);
     }
     finally {
+        // Suggest opening an issue
+        consola.log('If you think this is a bug, please open an issue at:');
+        consola.log('  https://github.com/capawesome-team/cli/issues/new/choose');
+        // Check for updates
+        await updateService.checkForUpdate();
         // Exit with a non-zero code
         process.exit(1);
     }
-}));
+}
+finally {
+    // Check for updates
+    await updateService.checkForUpdate();
+}