@youcan/cli 1.0.8 → 1.1.0-beta.2

package/bin/exec.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\exec.js" %*

package/bin/exec.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+process.removeAllListeners('warning');
+
+// eslint-disable-next-line import/first
+import execCli from '../dist/index.js';
+
+execCli(false);

package/dist/cli/commands/auth/login.d.ts

@@ -1,2 +1,4 @@
-import type { CLI, CommandDefinition } from '@/cli/commands/types';
-export default function command(cli: CLI): CommandDefinition;
+import { Cli } from '@youcan/cli-kit';
+export default class Login extends Cli.Command {
+    run(): Promise<void>;
+}

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

@@ -1,88 +1,10 @@
-import { exit } from 'node:process';
-import prompts from 'prompts';
-import config from '../../../config/index.js';
-import stdout from '../../../utils/system/stdout.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, Session } from '@youcan/cli-kit';
 
-function command(cli) {
-    return {
-        name: 'login',
-        group: 'auth',
-        description: 'Log into a YouCan store',
-        action: async () => {
-            if (!(await isPortAvailable(config.OAUTH_CALLBACK_PORT))) {
-                stdout.warn(`YouCan CLI requires that the port ${config.OAUTH_CALLBACK_PORT} be available`);
-                const prompt = await prompts({
-                    initial: false,
-                    type: 'confirm',
-                    name: 'terminate',
-                    message: 'Terminate the process to free the port?',
-                });
-                if (!prompt.terminate) {
-                    stdout.log('Exiting..');
-                    exit(1);
-                }
-                const pid = await getPidByPort(config.OAUTH_CALLBACK_PORT);
-                if (pid) {
-                    await LoadingSpinner.exec(`Terminating process ${pid}..`, async (spinner) => {
-                        try {
-                            await kill(pid, 'SIGTERM', 30_000);
-                        }
-                        catch (err) {
-                            spinner.error('Could not terminate process, proceeding..');
-                        }
-                    });
-                }
-            }
-            const loading = new LoadingSpinner('Authenticating...');
-            try {
-                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) {
-                const error = JSON.parse(err.message);
-                loading.error(error.detail);
-            }
-        },
-    };
+class Login extends Cli.Command {
+    async run() {
+        const session = await Session.authenticate(this);
+        this.output.info(`Logged in as ${session.slug}`);
+    }
 }
 
-export { command as default };
+export { Login as default };

package/dist/cli/commands/auth/logout.d.ts

@@ -1,2 +1,4 @@
-import type { CLI, CommandDefinition } from '@/cli/commands/types';
-export default function command(cli: CLI): CommandDefinition;
+import { Cli } from '@youcan/cli-kit';
+export default class Login extends Cli.Command {
+    run(): Promise<void>;
+}

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

@@ -1,21 +1,12 @@
-import config from '../../../config/index.js';
-import messages from '../../../config/messages.js';
-import deleteFile from '../../../utils/system/deleteFile.js';
-import stdout from '../../../utils/system/stdout.js';
+import { Cli, Config } from '@youcan/cli-kit';
 
-function command(cli) {
-    return {
-        name: 'logout',
-        group: 'auth',
-        description: 'Log out from the current store',
-        action: async () => {
-            if (!cli.client.isAuthenticated()) {
-                return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
-            }
-            deleteFile(config.CLI_GLOBAL_CONFIG_PATH);
-            stdout.info(messages.AUTH_USER_LOGGED_OUT);
-        },
-    };
+class Login extends Cli.Command {
+    async run() {
+        Config
+            .manager({ projectName: 'youcan-cli' })
+            .delete('store_session');
+        return this.output.info('Successfully logged out..');
+    }
 }
 
-export { command as default };
+export { Login as default };

package/dist/index.d.ts

@@ -1 +1,2 @@
-export {};
+declare function execCli(development: boolean): Promise<void>;
+export default execCli;

package/dist/index.js

@@ -1,3 +1,21 @@
-import cli from './cli/index.js';
+import fs from 'node:fs';
+import { Cli } from '@youcan/cli-kit';
 
-cli.init();
+process.on('uncaughtException', (err) => {
+    fs.writeSync(process.stderr.fd, `${err.stack}\n`);
+    process.exit(1);
+});
+const signals = ['SIGINT', 'SIGTERM', 'SIGQUIT'];
+signals.forEach((signal) => {
+    process.on(signal, () => {
+        process.exit(1);
+    });
+});
+async function execCli(development) {
+    await Cli.exec({
+        moduleUrl: import.meta.url,
+        development,
+    });
+}
+
+export { execCli as default };

package/package.json

@@ -1,61 +1,79 @@
 {
   "name": "@youcan/cli",
   "type": "module",
-  "version": "1.0.8",
-  "description": "YouCan CLI for developers.",
+  "version": "1.1.0-beta.2",
+  "description": "A CLI for creating YouCan Shop apps",
   "author": "YouCan <contact@youcan.shop> (https://youcan.shop)",
-  "keywords": [],
+  "license": "MIT",
+  "homepage": "https://github.com/youcan-shop/cli#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/youcan-shop/cli/edit/main/packages/cli"
+  },
+  "keywords": [
+    "youcan",
+    "youcan-cli",
+    "youcan-app"
+  ],
   "exports": {
     ".": {
-      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     }
   },
   "main": "./dist/index.js",
-  "types": "./dist/dts/index.d.ts",
   "bin": {
-    "youcan": "bin/index.js"
+    "youcan": "./bin/exec.js"
   },
   "files": [
-    "bin",
-    "dist"
+    "/dist",
+    "/bin/exec.js",
+    "/bin/exec.cmd",
+    "/oclif.manifest.json"
   ],
   "dependencies": {
-    "archiver": "^5.3.2",
-    "cac": "^6.7.14",
-    "chokidar": "^3.5.3",
-    "decompress": "^4.2.1",
-    "execa": "^6.1.0",
-    "formdata-node": "^5.0.1",
-    "kleur": "^4.1.5",
-    "node-fetch": "^3.3.2",
-    "prompts": "^2.4.2",
-    "puppeteer": "^19.11.1",
-    "ramda": "^0.28.0",
-    "socket.io": "^4.7.2",
-    "socket.io-client": "^4.7.2"
+    "@oclif/core": "^2.15.0",
+    "@oclif/plugin-commands": "^2.2.26",
+    "@oclif/plugin-help": "^5.2.19",
+    "@oclif/plugin-plugins": "^3.8.2",
+    "@youcan/app": "1.1.0-beta.2",
+    "@youcan/cli-kit": "1.1.0-beta.2",
+    "@youcan/theme": "1.1.0-beta.2"
   },
   "devDependencies": {
-    "@azuradara/eslint-config-base": "^0.1.3",
-    "@azuradara/eslint-config-ts": "^0.1.3",
-    "@types/archiver": "^5.3.3",
-    "@types/file-saver": "^2.0.5",
+    "@oclif/plugin-legacy": "^1.3.0",
     "@types/node": "^18.18.0",
-    "@types/prompts": "^2.4.5",
-    "@types/ramda": "^0.28.25",
-    "@types/rimraf": "^3.0.2",
-    "esno": "^0.16.3",
-    "pnpm": "^7.33.6",
-    "rimraf": "^3.0.2",
-    "rollup": "^3.29.3",
-    "rollup-plugin-dts": "^5.3.1",
-    "rollup-plugin-node-externals": "^6.1.1",
-    "rollup-plugin-typescript2": "^0.34.1",
-    "typescript": "^4.9.5"
+    "shx": "^0.3.4"
+  },
+  "oclif": {
+    "bin": "youcan",
+    "scope": "youcan",
+    "commands": "./dist/cli/commands",
+    "plugins": [
+      "@youcan/app",
+      "@youcan/theme",
+      "@oclif/plugin-help",
+      "@oclif/plugin-commands"
+    ],
+    "topicSeparator": " ",
+    "topics": {
+      "theme": {
+        "description": "Build YouCan themes."
+      },
+      "app": {
+        "description": "Build YouCan apps."
+      },
+      "auth": {
+        "description": "Authenticate with your YouCan account."
+      }
+    },
+    "additionalHelpFlags": [
+      "-h"
+    ]
   },
   "scripts": {
-    "build": "tsc --noEmit && rollup --config rollup.config.js",
-    "dev": "rollup --config rollup.config.js --watch",
+    "build": "shx rm -rf dist && tsc --noEmit && rollup --config rollup.config.js",
+    "dev": "shx rm -rf dist && rollup --config rollup.config.js --watch",
     "release": "pnpm publish --access public",
     "type-check": "tsc --noEmit",
     "relink": "pnpm link --global"

package/bin/index.js

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import('../dist/index.js');

package/dist/cli/commands/apps/create.d.ts

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

package/dist/cli/commands/apps/create.js

@@ -1,65 +0,0 @@
-import fs from 'node:fs';
-import prompts from 'prompts';
-import stdout from '../../../utils/system/stdout.js';
-import messages from '../../../config/messages.js';
-import { LoadingSpinner } from '../../../utils/common.js';
-
-function command(cli) {
-    return {
-        name: 'apps:create',
-        group: 'apps',
-        description: 'Create your app',
-        action: async () => {
-            if (!cli.client.isAuthenticated()) {
-                return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
-            }
-            const loading = new LoadingSpinner('Creating your app ...');
-            try {
-                const inquiries = [
-                    {
-                        type: 'text',
-                        name: 'name',
-                        message: 'Type your app name',
-                        validate: value => value !== '' && value.length > 3,
-                    },
-                ];
-                const app = await prompts(inquiries);
-                loading.start();
-                await cli.client.createApp({ name: app.name });
-                const appPath = `./${app.name}`;
-                fs.mkdir(appPath, (err) => {
-                    if (err) {
-                        loading.error(`Error creating directory: ${err}`);
-                    }
-                });
-                const packageContent = {
-                    name: app.name,
-                    version: '0.0.1',
-                    description: 'Your package description',
-                    main: 'index.js',
-                    scripts: {
-                        start: `node index.js && youcan apps:install -n ${app.name}`,
-                    },
-                    dependencies: {},
-                };
-                fs.writeFile(`${appPath}/package.json`, JSON.stringify(packageContent, null, 2), (err) => {
-                    if (err) {
-                        stdout.error(`Error creating the package.json file: ${err}`);
-                    }
-                });
-                fs.writeFile(`${appPath}/index.js`, 'console.log(\'Hello, World!\')', (err) => {
-                    if (err) {
-                        stdout.error(`Error creating the index.js file: ${err}`);
-                    }
-                });
-                loading.stop();
-            }
-            catch (err) {
-                const error = JSON.parse(err.message);
-                loading.error(error.detail);
-            }
-        },
-    };
-}
-
-export { command as default };

package/dist/cli/commands/apps/install.d.ts

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

package/dist/cli/commands/apps/install.js

@@ -1,28 +0,0 @@
-import stdout from '../../../utils/system/stdout.js';
-import messages from '../../../config/messages.js';
-
-function command(cli) {
-    return {
-        name: 'apps:install',
-        group: 'apps',
-        description: 'Generate app installation url',
-        options: [
-            { name: '-n, --name <app>', description: 'Specify a app name e.g. codmanager' },
-        ],
-        action: async (options) => {
-            if (!cli.client.isAuthenticated()) {
-                return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
-            }
-            try {
-                const response = await cli.client.generateAppInstallationUrl(options.name);
-                stdout.info(`To test the app within your store hit the following url : ${response.url}`);
-            }
-            catch (err) {
-                const error = JSON.parse(err.message);
-                stdout.error(error);
-            }
-        },
-    };
-}
-
-export { command as default };

package/dist/cli/commands/auth/types.d.ts

@@ -1,6 +0,0 @@
-export interface TokenResponse {
-    token_type: string;
-    expires_in: string;
-    access_token: string;
-    refresh_toekn: string;
-}

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

@@ -1,12 +0,0 @@
-export { default as LoginCommand } from './auth/login';
-export { default as LogoutCommand } from './auth/logout';
-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';
-export { default as CreateAppCommand } from './apps/create';
-export { default as InstallAppCommand } from './apps/install';

package/dist/cli/commands/index.js

@@ -1,14 +0,0 @@
-export { default as LoginCommand } from './auth/login.js';
-export { default as LogoutCommand } from './auth/logout.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';
-export { default as CreateAppCommand } from './apps/create.js';
-export { default as InstallAppCommand } from './apps/install.js';
-
-//  auth

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

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

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

@@ -1,29 +0,0 @@
-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.d.ts

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

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

@@ -1,59 +0,0 @@
-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/store/types.d.ts

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

package/dist/cli/commands/theme/delete.d.ts

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

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

@@ -1,46 +0,0 @@
-import prompts from 'prompts';
-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:delete',
-        group: 'theme',
-        description: 'Delete a remote development theme',
-        options: [],
-        action: async () => {
-            if (!cli.client.isAuthenticated()) {
-                return stdout.error(messages.AUTH_USER_NOT_LOGGED_IN);
-            }
-            const { dev: devThemes } = await cli.client.listThemes();
-            if (!devThemes.length) {
-                return stdout.error(messages.NO_REMOTE_THEMES);
-            }
-            const choices = devThemes.map(theme => ({
-                title: theme.name,
-                value: theme.id,
-            }));
-            const { themeId } = await prompts({
-                type: 'select',
-                name: 'themeId',
-                message: messages.DELETE_SELECT_THEME,
-                choices,
-            });
-            if (!themeId) {
-                return stdout.error(messages.DELETE_NO_THEME_SELECTED);
-            }
-            await LoadingSpinner.exec(`${messages.DELETE_IN_PROGRESS} ${themeId}..`, async (spinner) => {
-                try {
-                    await cli.client.deleteTheme(themeId);
-                }
-                catch (err) {
-                    spinner.error(messages.DELETE_ERROR);
-                }
-            });
-            stdout.info(messages.DELETE_THEME_DELETED);
-        },
-    };
-}
-
-export { command as default };

package/dist/cli/commands/theme/dev.d.ts

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