@logto/cli 1.0.3 → 1.2.0

package/lib/connector/loader.js

@@ -1,6 +1,7 @@
-import path from 'path';
+import path from 'node:path';
 import connectorKitMeta from '@logto/connector-kit/package.json' assert { type: 'json' };
 import { satisfies } from 'semver';
+import { consoleLog } from '../utils.js';
 import { isKeyInObject } from './utils.js';
 const connectorKit = '@logto/connector-kit';
 const { version: currentVersion } = connectorKitMeta;
@@ -8,12 +9,12 @@ const checkConnectorKitVersion = (dependencies, ignoreVersionMismatch) => {
     if (isKeyInObject(dependencies, connectorKit)) {
         const value = dependencies[connectorKit];
         if (typeof value === 'string') {
-            if (satisfies(currentVersion, value)) {
+            if (value.startsWith('workspace:') || satisfies(currentVersion, value)) {
                 return;
             }
             const message = `Connector requires ${connectorKit} to be ${value}, but the version here is ${currentVersion}.`;
             if (ignoreVersionMismatch) {
-                console.warn(`[warn] ${message}\n\nThis is highly discouraged in production.`);
+                consoleLog.warn(`${message}\n\nThis is highly discouraged in production.`);
                 return;
             }
             throw new Error(message);
@@ -33,7 +34,7 @@ export const loadConnector = async (connectorPath, ignoreVersionMismatch) => {
         // CJS pattern
         if (isKeyInObject(loaded.default, 'default')) {
             if (typeof loaded.default.default === 'function') {
-                console.log(`[warn] Load connector ${connectorPath} in CJS mode`);
+                consoleLog.warn(`Load connector ${connectorPath} in CJS mode`);
                 // eslint-disable-next-line no-restricted-syntax
                 return loaded.default.default;
             }

package/lib/connector/utils.js

@@ -1,6 +1,6 @@
-import { existsSync } from 'fs';
-import { readFile } from 'fs/promises';
-import path from 'path';
+import { existsSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
 import { ConnectorError, ConnectorErrorCodes, ConnectorType } from '@logto/connector-kit';
 import { notImplemented } from './consts.js';
 export function validateConnectorModule(connector) {

package/lib/database.js

@@ -4,7 +4,7 @@ import decamelize from 'decamelize';
 import { DatabaseError } from 'pg-protocol';
 import { createPool, parseDsn, sql, stringifyDsn } from 'slonik';
 import { createInterceptors } from 'slonik-interceptor-preset';
-import { ConfigKey, getCliConfigWithPrompt, log } from './utils.js';
+import { ConfigKey, consoleLog, getCliConfigWithPrompt } from './utils.js';
 export const defaultDatabaseUrl = 'postgresql://localhost:5432/logto';
 export const getDatabaseUrlFromConfig = async () => (await getCliConfigWithPrompt({
     key: ConfigKey.DatabaseUrl,
@@ -32,7 +32,7 @@ export const createPoolAndDatabaseIfNeeded = async () => {
         // Database does not exist, try to create one
         // https://www.postgresql.org/docs/14/errcodes-appendix.html
         if (!(error instanceof DatabaseError && error.code === '3D000')) {
-            log.error(error);
+            consoleLog.fatal(error);
         }
         const databaseUrl = await getDatabaseUrlFromConfig();
         const dsn = parseDsn(databaseUrl);
@@ -50,7 +50,7 @@ export const createPoolAndDatabaseIfNeeded = async () => {
         connection_limit = -1;
     `);
         await maintenancePool.end();
-        log.succeed(`Created database ${databaseName}`);
+        consoleLog.succeed(`Created database ${databaseName}`);
         return createPoolFromConfig();
     }
 };

package/lib/index.js

@@ -5,8 +5,9 @@ import { hideBin } from 'yargs/helpers';
 import connector from './commands/connector/index.js';
 import database from './commands/database/index.js';
 import install from './commands/install/index.js';
+import translate from './commands/translate/index.js';
 import { packageJson } from './package-json.js';
-import { cliConfig, ConfigKey } from './utils.js';
+import { cliConfig, ConfigKey, consoleLog } from './utils.js';
 void yargs(hideBin(process.argv))
     .version(false)
     .option('env', {
@@ -27,7 +28,7 @@ void yargs(hideBin(process.argv))
 })
     .middleware(({ version }) => {
     if (version) {
-        console.log(packageJson.name + ' v' + packageJson.version);
+        consoleLog.plain(packageJson.name + ' v' + packageJson.version);
         // eslint-disable-next-line unicorn/no-process-exit
         process.exit(0);
     }
@@ -42,6 +43,7 @@ void yargs(hideBin(process.argv))
     .command(install)
     .command(database)
     .command(connector)
+    .command(translate)
     .demandCommand(1)
     .showHelpOnFail(false, `Specify ${chalk.green('--help')} for available options`)
     .strict()

package/lib/package-json.d.ts

@@ -42,6 +42,9 @@ export declare const packageJson: {
     dependencies: {
         "@logto/connector-kit": string;
         "@logto/core-kit": string;
+        "@logto/language-kit": string;
+        "@logto/phrases": string;
+        "@logto/phrases-ui": string;
         "@logto/schemas": string;
         "@logto/shared": string;
         "@silverhand/essentials": string;
@@ -54,6 +57,7 @@ export declare const packageJson: {
         nanoid: string;
         ora: string;
         "p-limit": string;
+        "p-queue": string;
         "p-retry": string;
         "pg-protocol": string;
         roarr: string;
@@ -84,6 +88,9 @@ export declare const packageJson: {
     };
     eslintConfig: {
         extends: string;
+        rules: {
+            "no-console": string;
+        };
         ignorePatterns: string[];
     };
     prettier: string;

package/lib/package-json.js

@@ -1,6 +1,6 @@
 export const packageJson = {
     "name": "@logto/cli",
-    "version": "1.0.3",
+    "version": "1.2.0",
     "description": "Logto CLI.",
     "author": "Silverhand Inc. <contact@silverhand.io>",
     "homepage": "https://github.com/logto-io/logto#readme",
@@ -43,10 +43,13 @@ export const packageJson = {
         "url": "https://github.com/logto-io/logto/issues"
     },
     "dependencies": {
-        "@logto/connector-kit": "workspace:^",
-        "@logto/core-kit": "workspace:^",
-        "@logto/schemas": "workspace:^",
-        "@logto/shared": "workspace:^",
+        "@logto/connector-kit": "workspace:^1.1.1",
+        "@logto/core-kit": "workspace:^2.0.0",
+        "@logto/language-kit": "workspace:^1.0.0",
+        "@logto/phrases": "workspace:^1.2.0",
+        "@logto/phrases-ui": "workspace:^1.2.0",
+        "@logto/schemas": "workspace:^1.2.0",
+        "@logto/shared": "workspace:^2.0.0",
         "@silverhand/essentials": "^2.5.0",
         "chalk": "^5.0.0",
         "decamelize": "^6.0.0",
@@ -57,6 +60,7 @@ export const packageJson = {
         "nanoid": "^4.0.0",
         "ora": "^6.1.2",
         "p-limit": "^4.0.0",
+        "p-queue": "^7.3.4",
         "p-retry": "^5.1.2",
         "pg-protocol": "^1.6.0",
         "roarr": "^7.11.0",
@@ -69,8 +73,8 @@ export const packageJson = {
         "zod": "^3.20.2"
     },
     "devDependencies": {
-        "@silverhand/eslint-config": "2.0.1",
-        "@silverhand/ts-config": "2.0.3",
+        "@silverhand/eslint-config": "3.0.1",
+        "@silverhand/ts-config": "3.0.0",
         "@types/inquirer": "^9.0.0",
         "@types/jest": "^29.4.0",
         "@types/node": "^18.11.18",
@@ -87,6 +91,9 @@ export const packageJson = {
     },
     "eslintConfig": {
         "extends": "@silverhand",
+        "rules": {
+            "no-console": "error"
+        },
         "ignorePatterns": [
             "src/package-json.ts"
         ]

package/lib/utils.d.ts

@@ -1,13 +1,9 @@
+import { ConsoleLog } from '@logto/shared';
 import type { Optional } from '@silverhand/essentials';
 import type { Options } from 'ora';
 export declare const safeExecSync: (command: string) => string | undefined;
-type Log = Readonly<{
-    info: typeof console.log;
-    succeed: typeof console.log;
-    warn: typeof console.log;
-    error: (...args: Parameters<typeof console.log>) => never;
-}>;
-export declare const log: Log;
+export declare const consoleLog: ConsoleLog;
+export declare const getProxy: () => string | undefined;
 export declare const downloadFile: (url: string, destination: string) => Promise<unknown>;
 export declare const getPathInModule: (moduleName: string, relativePath?: string) => string;
 export declare const oraPromise: <T>(promise: PromiseLike<T>, options?: Options, exitOnError?: boolean) => Promise<T>;
@@ -37,4 +33,3 @@ export type ConnectorPackage = {
     path: string;
 };
 export declare const getConnectorPackagesFromDirectory: (directory: string) => Promise<ConnectorPackage[]>;
-export {};

package/lib/utils.js

@@ -1,8 +1,9 @@
-import { execSync } from 'child_process';
-import { createWriteStream, existsSync } from 'fs';
-import { readdir, readFile } from 'fs/promises';
-import { createRequire } from 'module';
-import path from 'path';
+import { execSync } from 'node:child_process';
+import { createWriteStream, existsSync } from 'node:fs';
+import { readdir, readFile } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import path from 'node:path';
+import { ConsoleLog } from '@logto/shared';
 import { conditionalString } from '@silverhand/essentials';
 import chalk from 'chalk';
 import { got } from 'got';
@@ -16,26 +17,24 @@ export const safeExecSync = (command) => {
     }
     catch { }
 };
-export const log = Object.freeze({
-    info: (...args) => {
-        console.log(chalk.blue('[info]'), ...args);
-    },
-    succeed: (...args) => {
-        log.info(chalk.green('✔'), ...args);
-    },
-    warn: (...args) => {
-        console.warn(chalk.yellow('[warn]'), ...args);
-    },
-    error: (...args) => {
-        console.error(chalk.red('[error]'), ...args);
-        // eslint-disable-next-line unicorn/no-process-exit
-        process.exit(1);
-    },
-});
-export const downloadFile = async (url, destination) => {
+// The explicit type annotation is required to make `.fatal()`
+// works correctly without `return`:
+//
+// ```ts
+// const foo: number | undefined;
+// consoleLog.fatal();
+// typeof foo // Still `number | undefined` without explicit type annotation
+// ```
+//
+// For now I have no idea why.
+export const consoleLog = new ConsoleLog();
+export const getProxy = () => {
     const { HTTPS_PROXY, HTTP_PROXY, https_proxy, http_proxy } = process.env;
+    return HTTPS_PROXY ?? https_proxy ?? HTTP_PROXY ?? http_proxy;
+};
+export const downloadFile = async (url, destination) => {
     const file = createWriteStream(destination);
-    const proxy = HTTPS_PROXY ?? https_proxy ?? HTTP_PROXY ?? http_proxy;
+    const proxy = getProxy();
     const stream = got.stream(url, {
         ...(proxy && { agent: { https: new HttpsProxyAgent({ proxy }) } }),
     });
@@ -76,7 +75,7 @@ export const oraPromise = async (promise, options, exitOnError = false) => {
     catch (error) {
         spinner.fail();
         if (exitOnError) {
-            log.error(error);
+            consoleLog.fatal(error);
         }
         throw error;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -28,6 +28,13 @@
     "url": "https://github.com/logto-io/logto/issues"
   },
   "dependencies": {
+    "@logto/connector-kit": "^1.1.1",
+    "@logto/core-kit": "^2.0.0",
+    "@logto/language-kit": "^1.0.0",
+    "@logto/phrases": "^1.2.0",
+    "@logto/phrases-ui": "^1.2.0",
+    "@logto/schemas": "^1.2.0",
+    "@logto/shared": "^2.0.0",
     "@silverhand/essentials": "^2.5.0",
     "chalk": "^5.0.0",
     "decamelize": "^6.0.0",
@@ -38,6 +45,7 @@
     "nanoid": "^4.0.0",
     "ora": "^6.1.2",
     "p-limit": "^4.0.0",
+    "p-queue": "^7.3.4",
     "p-retry": "^5.1.2",
     "pg-protocol": "^1.6.0",
     "roarr": "^7.11.0",
@@ -47,15 +55,11 @@
     "slonik-sql-tag-raw": "^1.1.4",
     "tar": "^6.1.11",
     "yargs": "^17.6.0",
-    "zod": "^3.20.2",
-    "@logto/core-kit": "^1.1.0",
-    "@logto/schemas": "^1.0.7",
-    "@logto/shared": "^1.0.2",
-    "@logto/connector-kit": "^1.1.0"
+    "zod": "^3.20.2"
   },
   "devDependencies": {
-    "@silverhand/eslint-config": "2.0.1",
-    "@silverhand/ts-config": "2.0.3",
+    "@silverhand/eslint-config": "3.0.1",
+    "@silverhand/ts-config": "3.0.0",
     "@types/inquirer": "^9.0.0",
     "@types/jest": "^29.4.0",
     "@types/node": "^18.11.18",
@@ -72,6 +76,9 @@
   },
   "eslintConfig": {
     "extends": "@silverhand",
+    "rules": {
+      "no-console": "error"
+    },
     "ignorePatterns": [
       "src/package-json.ts"
     ]