@youcan/cli 1.0.5 → 1.0.6

package/dist/cli/commands/auth/login.js

@@ -1,61 +1,14 @@
-import { createServer } from 'http';
 import { exit } from 'process';
 import prompts from 'prompts';
 import config from '../../../config/index.js';
-import openLink from '../../../utils/system/openLink.js';
 import stdout from '../../../utils/system/stdout.js';
-import { post } from '../../../utils/http.js';
 import writeToFile from '../../../utils/system/writeToFile.js';
 import messages from '../../../config/messages.js';
 import { isPortAvailable, getPidByPort } from '../../../utils/network.js';
 import { kill } from '../../../utils/system.js';
 import { LoadingSpinner } from '../../../utils/common.js';
+import cli from '../../index.js';
 
-/**
- * Spin up a local server to handle the OAuth redirect. Times out after 10 seconds.
- * @returns A promise that resolves when the code is received.
-*/
-function captureAuthorization() {
-    return new Promise((resolve, reject) => {
-        let timeOut;
-        const server = createServer((req, res) => {
-            const { url } = req;
-            const code = (url === null || url === void 0 ? void 0 : url.split('=')[1]) || '';
-            if (!code)
-                reject(new Error('authorization code is required.'));
-            res.end('You can close this window now.');
-            clearTimeout(timeOut);
-            server.close();
-            resolve(code);
-        });
-        server.listen(config.OAUTH_CALLBACK_PORT, () => {
-            timeOut = setTimeout(() => {
-                reject(new Error('Timeout'));
-            }, config.OAUTH_CALLBACK_SERVER_TIMEOUT);
-        });
-    });
-}
-/**
- * Exchange code for access token
- * @param authorizationCode string
- */
-async function exchangeAuthCode(authorizationCode) {
-    const formParams = {
-        grant_type: 'authorization_code',
-        client_id: config.OAUTH_CLIENT_ID,
-        client_secret: config.OAUTH_CLIENT_SECRET,
-        redirect_uri: config.OAUTH_CALLBACK_URL,
-        code: authorizationCode,
-    };
-    const res = await post(config.OAUTH_ACCESS_TOKEN_URL, {
-        method: 'POST',
-        body: new URLSearchParams(formParams),
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-        },
-    });
-    return res.access_token;
-}
 function command(_cli) {
     return {
         name: 'login',
@@ -86,18 +39,49 @@ function command(_cli) {
                     });
                 }
             }
+            const loading = new LoadingSpinner('Authenticating...');
             try {
-                openLink(config.OAUTH_AUTH_CODE_URL);
+                const inquiries = [
+                    {
+                        type: 'text',
+                        name: 'email',
+                        message: 'Type your email',
+                        validate: value => value !== '',
+                    },
+                    {
+                        type: 'password',
+                        name: 'password',
+                        message: 'Type your password',
+                        validate: value => value !== '',
+                    },
+                ];
+                const credentials = await prompts(inquiries);
+                loading.start();
+                const response = await cli.client.auth({ email: credentials.email, password: credentials.password });
+                let token = response.token;
+                loading.stop();
+                cli.client.setAccessToken(response.token);
+                if (response.stores.length > 1) {
+                    const choices = response.stores.map(store => ({
+                        title: store.slug,
+                        value: store.store_id,
+                    }));
+                    const { storeId } = await prompts({
+                        type: 'select',
+                        name: 'storeId',
+                        message: messages.SELECT_STORE,
+                        choices,
+                    });
+                    const selectStoreResponse = await cli.client.selectStore({ id: storeId });
+                    token = selectStoreResponse.token;
+                }
+                writeToFile(config.CLI_GLOBAL_CONFIG_PATH, JSON.stringify({ access_token: token }));
+                stdout.info(messages.LOGIN_SUCCESS);
             }
             catch (err) {
-                stdout.log(messages.LOGIN_OPEN_LINK);
-                stdout.info(config.OAUTH_AUTH_CODE_URL);
+                const error = JSON.parse(err.message);
+                loading.error(error.detail);
             }
-            await LoadingSpinner.exec('Authenticating..', async () => {
-                const authorization = await captureAuthorization();
-                writeToFile(config.CLI_GLOBAL_CONFIG_PATH, JSON.stringify({ access_token: await exchangeAuthCode(authorization) }));
-            });
-            stdout.info(messages.LOGIN_SUCCESS);
         },
     };
 }

package/dist/cli/commands/index.js

@@ -1,9 +1,12 @@
 export { default as LoginCommand } from './auth/login.js';
 export { default as LogoutCommand } from './auth/logout.js';
-export { default as InitCommand } from './theme/init.js';
-export { default as DevCommand } from './theme/dev.js';
-export { default as DeleteCommand } from './theme/delete.js';
-export { default as PullCommand } from './theme/pull.js';
-export { default as PackCommand } from './theme/pack.js';
+export { default as ThemeInitCommand } from './theme/init.js';
+export { default as ThemeListCommand } from './theme/list.js';
+export { default as ThemeDevCommand } from './theme/dev.js';
+export { default as ThemeDeleteCommand } from './theme/delete.js';
+export { default as ThemePullCommand } from './theme/pull.js';
+export { default as ThemePackCommand } from './theme/pack.js';
+export { default as StoreInfoCommand } from './store/info.js';
+export { default as StoreSwitchCommand } from './store/switch.js';
 
 //  auth

package/dist/cli/commands/store/info.js

@@ -0,0 +1,28 @@
+import messages from '../../../config/messages.js';
+import stdout from '../../../utils/system/stdout.js';
+import { LoadingSpinner } from '../../../utils/common.js';
+
+function command(cli) {
+    return {
+        name: 'store:info',
+        group: 'theme',
+        description: 'Current development store info',
+        options: [],
+        action: async () => {
+            if (!cli.client.isAuthenticated())
+                return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
+            await LoadingSpinner.exec(`${messages.FETCHING_CURRENT_STORE_INFO}..`, async (spinner) => {
+                try {
+                    const storeInfo = await cli.client.getStoreInfo();
+                    spinner.stop();
+                    stdout.info(`${messages.CURRENT_DEVELOPMENT_STORE}: ${storeInfo.slug}`);
+                }
+                catch (err) {
+                    spinner.error(messages.ERROR_WHILE_FETCHING_CURRENT_STORE_INFO);
+                }
+            });
+        },
+    };
+}
+
+export { command as default };

package/dist/cli/commands/store/switch.js

@@ -0,0 +1,56 @@
+import prompts from 'prompts';
+import messages from '../../../config/messages.js';
+import stdout from '../../../utils/system/stdout.js';
+import { LoadingSpinner } from '../../../utils/common.js';
+import writeToFile from '../../../utils/system/writeToFile.js';
+import config from '../../../config/index.js';
+
+function command(cli) {
+    return {
+        name: 'store:switch',
+        group: 'theme',
+        description: 'Switch the development store',
+        options: [],
+        action: async () => {
+            if (!cli.client.isAuthenticated())
+                return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
+            let storeInfo;
+            await LoadingSpinner.exec(`${messages.FETCHING_CURRENT_STORE_INFO}..`, async (spinner) => {
+                try {
+                    storeInfo = await cli.client.getStoreInfo();
+                }
+                catch (err) {
+                    spinner.error(messages.ERROR_WHILE_FETCHING_CURRENT_STORE_INFO);
+                }
+            });
+            stdout.info(`${messages.CURRENT_DEVELOPMENT_STORE}: ${storeInfo.slug}`);
+            const { stores } = await cli.client.listStores();
+            if (!stores.length)
+                return stdout.error(messages.NO_STORE_FOUND);
+            const choices = stores.map(store => ({
+                title: store.slug,
+                value: store.store_id,
+            }));
+            const { storeId } = await prompts({
+                type: 'select',
+                name: 'storeId',
+                message: messages.SELECT_STORE,
+                choices,
+            });
+            if (!storeId)
+                return stdout.error(messages.NO_STORE_SELECTED);
+            await LoadingSpinner.exec(`${messages.SELECT_STORE_IN_PROGRESS}..`, async (spinner) => {
+                try {
+                    const selectStoreResponse = await cli.client.selectStore({ id: storeId });
+                    writeToFile(config.CLI_GLOBAL_CONFIG_PATH, JSON.stringify({ access_token: selectStoreResponse.token }));
+                }
+                catch (err) {
+                    spinner.error(messages.CANNOT_SELECT_STORE);
+                }
+            });
+            stdout.info(messages.STORE_SELECTED);
+        },
+    };
+}
+
+export { command as default };

package/dist/cli/commands/theme/delete.js

@@ -5,7 +5,7 @@ import { LoadingSpinner } from '../../../utils/common.js';
 
 function command(cli) {
     return {
-        name: 'delete',
+        name: 'theme:delete',
         group: 'theme',
         description: 'Delete a remote development theme',
         options: [],
@@ -14,7 +14,7 @@ function command(cli) {
                 return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
             const { dev: devThemes } = await cli.client.listThemes();
             if (!devThemes.length)
-                return stdout.error(messages.DELETE_NO_REMOTE_THEMES);
+                return stdout.error(messages.NO_REMOTE_THEMES);
             const choices = devThemes.map(theme => ({
                 title: theme.name,
                 value: theme.id,

package/dist/cli/commands/theme/dev.js

@@ -103,7 +103,7 @@ async function syncChanges(cli, themeId) {
 }
 function command(cli) {
     return {
-        name: 'dev',
+        name: 'theme:dev',
         group: 'theme',
         description: 'starts a dev server and watches over the current directory',
         options: [

package/dist/cli/commands/theme/init.js

@@ -58,7 +58,7 @@ function getSelectedTheme(optionTheme) {
 }
 function command(cli) {
     return {
-        name: 'init',
+        name: 'theme:init',
         group: 'theme',
         description: 'Create a new theme or clone existing one.',
         options: [

package/dist/cli/commands/theme/list.js

@@ -0,0 +1,33 @@
+import messages from '../../../config/messages.js';
+import stdout from '../../../utils/system/stdout.js';
+import { LoadingSpinner } from '../../../utils/common.js';
+
+function command(cli) {
+    return {
+        name: 'theme:list',
+        group: 'theme',
+        description: 'List my development themes',
+        options: [],
+        action: async () => {
+            if (!cli.client.isAuthenticated())
+                return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
+            await LoadingSpinner.exec(`${messages.FETCHING_DEV_THEMES}..`, async (spinner) => {
+                try {
+                    const devThemes = await cli.client.listThemes();
+                    spinner.stop();
+                    if (!devThemes.dev.length)
+                        return stdout.error(messages.NO_REMOTE_THEMES);
+                    stdout.table(devThemes.dev.map((theme) => ({
+                        Name: theme.name,
+                        Size: theme.size,
+                    })));
+                }
+                catch (err) {
+                    spinner.error(messages.ERROR_WHILE_FETCHING_DEV_THEMES);
+                }
+            });
+        },
+    };
+}
+
+export { command as default };

package/dist/cli/commands/theme/pack.js

@@ -7,7 +7,7 @@ import config from '../../../config/index.js';
 
 function command(cli) {
     return {
-        name: 'pack',
+        name: 'theme:pack',
         group: 'theme',
         description: 'Package a theme',
         options: [],

package/dist/cli/commands/theme/pull.js

@@ -10,7 +10,7 @@ import messages from '../../../config/messages.js';
 
 function command(cli) {
     return {
-        name: 'pull',
+        name: 'theme:pull',
         group: 'theme',
         description: 'Pull a theme',
         options: [],

package/dist/config/messages.js

@@ -1,13 +1,24 @@
 var messages = {
     LOGIN_OPEN_LINK: 'Open this link in your browser to continue authentication:',
     LOGIN_SUCCESS: 'You have been successfully logged in.',
+    FETCHING_CURRENT_STORE_INFO: 'Fetching current store info',
+    CURRENT_DEVELOPMENT_STORE: 'Current development store',
+    ERROR_WHILE_FETCHING_CURRENT_STORE_INFO: 'Error while fetching current store info',
+    SELECT_STORE: 'Which development store you would like to use?',
+    NO_STORE_FOUND: 'No development store found!',
+    NO_STORE_SELECTED: 'No development store selected.',
+    SELECT_STORE_IN_PROGRESS: 'Selecting store in progress',
+    CANNOT_SELECT_STORE: 'Could not select the development store.',
+    STORE_SELECTED: 'Store selected',
+    FETCHING_DEV_THEMES: 'Fetching current development themes',
+    ERROR_WHILE_FETCHING_DEV_THEMES: 'Error while fetching current development themes',
     INIT_SUCCESS: 'The theme has been initiated with id: ',
     INIT_CLONE_START: 'Cloning your theme from github',
     AUTH_USER_NOT_LOGGED_IN: 'You are not currently logged into any store.',
     AUTH_USER_LOGGED_OUT: 'You have been successfully logged out.',
     DELETE_NO_THEME_SELECTED: 'No theme selected.',
     DELETE_THEME_DELETED: 'Theme deleted successfully.',
-    DELETE_NO_REMOTE_THEMES: 'This store does not have any development themes.',
+    NO_REMOTE_THEMES: 'This store does not have any development themes.',
     DELETE_SELECT_THEME: 'Which remote development theme would you like to delete?',
     DELETE_IN_PROGRESS: 'Deleting theme',
     DELETE_ERROR: 'Could not delete remote development theme.',

package/dist/core/client/client.js

@@ -18,6 +18,17 @@ class Client {
     isAuthenticated() {
         return this.accessToken != null;
     }
+    async auth(data) {
+        const form = new FormData();
+        Object.entries(data).forEach(([key, value]) => form.append(key, value));
+        return await post(`${config.SELLER_AREA_API_BASE_URI}/auth/login`, this.withDefaults({ body: form }));
+    }
+    async listStores() {
+        return await get(`${config.SELLER_AREA_API_BASE_URI}/stores`, this.withDefaults({}));
+    }
+    async selectStore(data) {
+        return await post(`${config.SELLER_AREA_API_BASE_URI}/switch-store/${data.id}`, this.withDefaults({}));
+    }
     async initTheme(data) {
         const form = new FormData();
         Object.entries(data).forEach(([key, value]) => form.append(key, value));

package/dist/lib/cli/commands/index.d.ts

@@ -1,7 +1,10 @@
 export { default as LoginCommand } from './auth/login';
 export { default as LogoutCommand } from './auth/logout';
-export { default as InitCommand } from './theme/init';
-export { default as DevCommand } from './theme/dev';
-export { default as DeleteCommand } from './theme/delete';
-export { default as PullCommand } from './theme/pull';
-export { default as PackCommand } from './theme/pack';
+export { default as ThemeInitCommand } from './theme/init';
+export { default as ThemeListCommand } from './theme/list';
+export { default as ThemeDevCommand } from './theme/dev';
+export { default as ThemeDeleteCommand } from './theme/delete';
+export { default as ThemePullCommand } from './theme/pull';
+export { default as ThemePackCommand } from './theme/pack';
+export { default as StoreInfoCommand } from './store/info';
+export { default as StoreSwitchCommand } from './store/switch';

package/dist/lib/cli/commands/store/info.d.ts

@@ -0,0 +1,2 @@
+import type { CLI, CommandDefinition } from '@/cli/commands/types';
+export default function command(cli: CLI): CommandDefinition;

package/dist/lib/cli/commands/store/switch.d.ts

@@ -0,0 +1,2 @@
+import type { CLI, CommandDefinition } from '@/cli/commands/types';
+export default function command(cli: CLI): CommandDefinition;

package/dist/lib/cli/commands/store/types.d.ts

@@ -0,0 +1,4 @@
+import type { Store } from '@/core/client/types';
+export interface listStoresResponse {
+    stores: Store[];
+}

package/dist/lib/cli/commands/theme/list.d.ts

@@ -0,0 +1,2 @@
+import type { CLI, CommandDefinition } from '@/cli/commands/types';
+export default function command(cli: CLI): CommandDefinition;

package/dist/lib/cli/commands/theme/switch-store.d.ts

@@ -0,0 +1,2 @@
+import type { CLI, CommandDefinition } from '@/cli/commands/types';
+export default function command(cli: CLI): CommandDefinition;

package/dist/lib/cli/index.d.ts

@@ -5,7 +5,7 @@ declare const cli: {
     client: Client;
     handler: import("cac").CAC;
     registerCommand(command: (cli: typeof this) => CommandDefinition): void;
-    getAvailableCommands(): (typeof commands.LoginCommand | typeof commands.LogoutCommand | typeof commands.InitCommand | typeof commands.DevCommand | typeof commands.DeleteCommand | typeof commands.PullCommand | typeof commands.PackCommand)[];
+    getAvailableCommands(): (typeof commands.LoginCommand | typeof commands.LogoutCommand | typeof commands.ThemeInitCommand | typeof commands.ThemeListCommand | typeof commands.ThemeDevCommand | typeof commands.ThemeDeleteCommand | typeof commands.ThemePullCommand | typeof commands.ThemePackCommand | typeof commands.StoreInfoCommand | typeof commands.StoreSwitchCommand)[];
     init(): Promise<void>;
     prepareClient(): Promise<void>;
 };

package/dist/lib/config/messages.d.ts

@@ -1,13 +1,24 @@
 declare const _default: {
     LOGIN_OPEN_LINK: string;
     LOGIN_SUCCESS: string;
+    FETCHING_CURRENT_STORE_INFO: string;
+    CURRENT_DEVELOPMENT_STORE: string;
+    ERROR_WHILE_FETCHING_CURRENT_STORE_INFO: string;
+    SELECT_STORE: string;
+    NO_STORE_FOUND: string;
+    NO_STORE_SELECTED: string;
+    SELECT_STORE_IN_PROGRESS: string;
+    CANNOT_SELECT_STORE: string;
+    STORE_SELECTED: string;
+    FETCHING_DEV_THEMES: string;
+    ERROR_WHILE_FETCHING_DEV_THEMES: string;
     INIT_SUCCESS: string;
     INIT_CLONE_START: string;
     AUTH_USER_NOT_LOGGED_IN: string;
     AUTH_USER_LOGGED_OUT: string;
     DELETE_NO_THEME_SELECTED: string;
     DELETE_THEME_DELETED: string;
-    DELETE_NO_REMOTE_THEMES: string;
+    NO_REMOTE_THEMES: string;
     DELETE_SELECT_THEME: string;
     DELETE_IN_PROGRESS: string;
     DELETE_ERROR: string;

package/dist/lib/core/client/client.d.ts

@@ -1,10 +1,14 @@
-import type { DeleteThemeFileRequestData, InitThemeRequest as InitThemeRequestData, StoreInfoResponse, ThemeMetaResponse, UpdateThemeFileRequestData } from './types';
+import type { DeleteThemeFileRequestData, InitThemeRequest as InitThemeRequestData, LoginRequest, LoginResponse, SelectStoreRequest, SelectStoreResponse, StoreInfoResponse, ThemeMetaResponse, UpdateThemeFileRequestData } from './types';
+import type { listStoresResponse } from '@/cli/commands/store/types';
 export default class Client {
     private accessToken;
     constructor();
     setAccessToken(token: string): void;
     getAccessToken(): string | null;
     isAuthenticated(): boolean;
+    auth(data: LoginRequest): Promise<LoginResponse>;
+    listStores(): Promise<listStoresResponse>;
+    selectStore(data: SelectStoreRequest): Promise<SelectStoreResponse>;
     initTheme(data: InitThemeRequestData): Promise<string>;
     getThemeMeta(themeId: string): Promise<ThemeMetaResponse>;
     pullTheme(themeId: string): Promise<import("node-fetch").Response>;

package/dist/lib/core/client/types.d.ts

@@ -7,6 +7,25 @@ export interface InitThemeRequest {
     theme_support_url: string;
     theme_documentation_url: string;
 }
+export interface LoginRequest {
+    email: string;
+    password: string;
+}
+export interface LoginResponse {
+    token: string;
+    stores: Store[];
+}
+export interface SelectStoreRequest {
+    id: string;
+}
+export interface SelectStoreResponse {
+    token: string;
+}
+export interface Store {
+    store_id: string;
+    slug: string;
+    is_active: boolean;
+}
 export interface UpdateThemeFileRequestData {
     file_type: string;
     file_name: string;

package/dist/lib/utils/system/stdout.d.ts

@@ -7,6 +7,7 @@ declare function warn(arg: string): void;
 declare function error(arg: string): void;
 declare function success(arg: string): void;
 declare function clear(): void;
+declare function table(arg: any): void;
 declare const _default: {
     log: typeof log;
     info: typeof info;
@@ -14,5 +15,6 @@ declare const _default: {
     error: typeof error;
     clear: typeof clear;
     success: typeof success;
+    table: typeof table;
 };
 export default _default;

package/dist/utils/system/stdout.js

@@ -10,6 +10,7 @@ function warn(arg) { return log(kleur.yellow(arg)); }
 function error(arg) { return log(kleur.bgRed().white(arg)); }
 function success(arg) { return log(kleur.green(arg)); }
 function clear() { return stdout.clear(); }
-var stdout$1 = { log, info, warn, error, clear, success };
+function table(arg) { return stdout.table(arg); }
+var stdout$1 = { log, info, warn, error, clear, success, table };
 
 export { stdout$1 as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/cli",
   "type": "module",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "YouCan CLI for developers.",
   "author": "YouCan <contact@youcan.shop> (https://youcan.shop)",
   "keywords": [],