@logto/cli 1.0.0-beta.15 → 1.0.0-beta.18

package/lib/utilities.js

@@ -1,53 +1,48 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConnectorPackagesFromDirectory = exports.findLastIndex = exports.getCliConfigWithPrompt = exports.cliConfig = exports.ConfigKey = exports.isTty = exports.oraPromise = exports.getPathInModule = exports.downloadFile = exports.log = exports.safeExecSync = void 0;
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const path_1 = __importDefault(require("path"));
-const essentials_1 = require("@silverhand/essentials");
-const chalk_1 = __importDefault(require("chalk"));
-const got_1 = __importDefault(require("got"));
-const hpagent_1 = require("hpagent");
-const inquirer_1 = __importDefault(require("inquirer"));
-const ora_1 = __importDefault(require("ora"));
-const zod_1 = require("zod");
-const safeExecSync = (command) => {
+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 { conditionalString } from '@silverhand/essentials';
+import chalk from 'chalk';
+import { got } from 'got';
+import { HttpsProxyAgent } from 'hpagent';
+import inquirer from 'inquirer';
+import ora from 'ora';
+import { z } from 'zod';
+import { metaUrl } from './meta-url.js';
+export const safeExecSync = (command) => {
     try {
-        return (0, child_process_1.execSync)(command, { encoding: 'utf8', stdio: 'pipe' });
+        return execSync(command, { encoding: 'utf8', stdio: 'pipe' });
     }
     catch { }
 };
-exports.safeExecSync = safeExecSync;
-exports.log = Object.freeze({
+export const log = Object.freeze({
     info: (...args) => {
-        console.log(chalk_1.default.blue('[info]'), ...args);
+        console.log(chalk.blue('[info]'), ...args);
     },
     succeed: (...args) => {
-        exports.log.info(chalk_1.default.green('✔'), ...args);
+        log.info(chalk.green('✔'), ...args);
     },
     warn: (...args) => {
-        console.warn(chalk_1.default.yellow('[warn]'), ...args);
+        console.warn(chalk.yellow('[warn]'), ...args);
     },
     error: (...args) => {
-        console.error(chalk_1.default.red('[error]'), ...args);
+        console.error(chalk.red('[error]'), ...args);
         // eslint-disable-next-line unicorn/no-process-exit
         process.exit(1);
     },
 });
-const downloadFile = async (url, destination) => {
+export const downloadFile = async (url, destination) => {
     const { HTTPS_PROXY, HTTP_PROXY, https_proxy, http_proxy } = process.env;
-    const file = (0, fs_1.createWriteStream)(destination);
+    const file = createWriteStream(destination);
     const proxy = HTTPS_PROXY ?? https_proxy ?? HTTP_PROXY ?? http_proxy;
-    const stream = got_1.default.stream(url, {
-        ...(proxy && { agent: { https: new hpagent_1.HttpsProxyAgent({ proxy }) } }),
+    const stream = got.stream(url, {
+        ...(proxy && { agent: { https: new HttpsProxyAgent({ proxy }) } }),
     });
-    const spinner = (0, ora_1.default)({
+    const spinner = ora({
         text: 'Connecting',
-        prefixText: chalk_1.default.blue('[info]'),
+        prefixText: chalk.blue('[info]'),
     }).start();
     stream.pipe(file);
     return new Promise((resolve, reject) => {
@@ -69,16 +64,11 @@ const downloadFile = async (url, destination) => {
         });
     });
 };
-exports.downloadFile = downloadFile;
-const getPathInModule = (moduleName, relativePath = '/') => 
+export const getPathInModule = (moduleName, relativePath = '/') => 
 // https://stackoverflow.com/a/49455609/12514940
-path_1.default.join(
-// Until we migrate to ESM
-// eslint-disable-next-line unicorn/prefer-module
-path_1.default.dirname(require.resolve(`${moduleName}/package.json`)), relativePath);
-exports.getPathInModule = getPathInModule;
-const oraPromise = async (promise, options, exitOnError = false) => {
-    const spinner = (0, ora_1.default)(options).start();
+path.join(path.dirname(createRequire(metaUrl).resolve(`${moduleName}/package.json`)), relativePath);
+export const oraPromise = async (promise, options, exitOnError = false) => {
+    const spinner = ora(options).start();
     try {
         const result = await promise;
         spinner.succeed();
@@ -87,33 +77,30 @@ const oraPromise = async (promise, options, exitOnError = false) => {
     catch (error) {
         spinner.fail();
         if (exitOnError) {
-            exports.log.error(error);
+            log.error(error);
         }
         throw error;
     }
 };
-exports.oraPromise = oraPromise;
-const isTty = () => process.stdin.isTTY;
-exports.isTty = isTty;
-var ConfigKey;
+export const isTty = () => process.stdin.isTTY;
+export var ConfigKey;
 (function (ConfigKey) {
     ConfigKey["DatabaseUrl"] = "DB_URL";
-})(ConfigKey = exports.ConfigKey || (exports.ConfigKey = {}));
-exports.cliConfig = new Map();
-const getCliConfigWithPrompt = async ({ key, readableKey, comments, defaultValue, }) => {
-    if (exports.cliConfig.has(key) || !(0, exports.isTty)()) {
-        return exports.cliConfig.get(key);
+})(ConfigKey || (ConfigKey = {}));
+export const cliConfig = new Map();
+export const getCliConfigWithPrompt = async ({ key, readableKey, comments, defaultValue, }) => {
+    if (cliConfig.has(key) || !isTty()) {
+        return cliConfig.get(key);
     }
-    const { input } = await inquirer_1.default.prompt({
+    const { input } = await inquirer.prompt({
         type: 'input',
         name: 'input',
-        message: `Enter your ${readableKey}${(0, essentials_1.conditionalString)(comments && ' ' + comments)}`,
+        message: `Enter your ${readableKey}${conditionalString(comments && ' ' + comments)}`,
         default: defaultValue,
     });
-    exports.cliConfig.set(key, input);
+    cliConfig.set(key, input);
     return input;
 };
-exports.getCliConfigWithPrompt = getCliConfigWithPrompt;
 // https://stackoverflow.com/a/53187807/12514940
 /**
  * Returns the index of the last element in the array where predicate is true, and -1
@@ -123,7 +110,7 @@ exports.getCliConfigWithPrompt = getCliConfigWithPrompt;
  * order, until it finds one where predicate returns true. If such an element is found,
  * findLastIndex immediately returns that element index. Otherwise, findLastIndex returns -1.
  */
-function findLastIndex(array, predicate) {
+export function findLastIndex(array, predicate) {
     // eslint-disable-next-line @silverhand/fp/no-let
     let { length } = array;
     // eslint-disable-next-line @silverhand/fp/no-mutation
@@ -135,24 +122,22 @@ function findLastIndex(array, predicate) {
     }
     return -1;
 }
-exports.findLastIndex = findLastIndex;
 const getConnectorPackageName = async (directory) => {
-    const filePath = path_1.default.join(directory, 'package.json');
-    if (!(0, fs_1.existsSync)(filePath)) {
+    const filePath = path.join(directory, 'package.json');
+    if (!existsSync(filePath)) {
         return;
     }
-    const json = await (0, promises_1.readFile)(filePath, 'utf8');
-    const { name } = zod_1.z.object({ name: zod_1.z.string() }).parse(JSON.parse(json));
+    const json = await readFile(filePath, 'utf8');
+    const { name } = z.object({ name: z.string() }).parse(JSON.parse(json));
     if (name.startsWith('connector-') || Boolean(name.split('/')[1]?.startsWith('connector-'))) {
         return name;
     }
 };
-const getConnectorPackagesFromDirectory = async (directory) => {
-    const content = await (0, promises_1.readdir)(directory, 'utf8');
+export const getConnectorPackagesFromDirectory = async (directory) => {
+    const content = await readdir(directory, 'utf8');
     const rawPackages = await Promise.all(content.map(async (value) => {
-        const currentDirectory = path_1.default.join(directory, value);
+        const currentDirectory = path.join(directory, value);
         return { name: await getConnectorPackageName(currentDirectory), path: currentDirectory };
     }));
     return rawPackages.filter((packageInfo) => typeof packageInfo.name === 'string');
 };
-exports.getConnectorPackagesFromDirectory = getConnectorPackagesFromDirectory;

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@logto/cli",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.18",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
   "license": "MPL-2.0",
+  "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "main": "lib/index.js",
   "bin": {
-    "logto": "bin/logto"
+    "logto": "bin/logto.js"
   },
   "files": [
     "bin",
@@ -27,46 +28,47 @@
     "url": "https://github.com/logto-io/logto/issues"
   },
   "dependencies": {
-    "@silverhand/essentials": "^1.3.0",
-    "chalk": "^4.1.2",
-    "decamelize": "^5.0.0",
+    "@silverhand/essentials": "2.1.0",
+    "chalk": "^5.0.0",
+    "decamelize": "^6.0.0",
     "dotenv": "^16.0.0",
-    "fs-extra": "^10.1.0",
-    "got": "^11.8.5",
-    "hpagent": "^1.0.0",
+    "got": "^12.5.3",
+    "hpagent": "^1.2.0",
     "inquirer": "^8.2.2",
-    "nanoid": "^3.3.4",
-    "ora": "^5.0.0",
-    "p-retry": "^4.6.1",
+    "nanoid": "^4.0.0",
+    "ora": "^6.1.2",
+    "p-limit": "^4.0.0",
+    "p-retry": "^5.1.2",
     "roarr": "^7.11.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "slonik": "^30.0.0",
     "slonik-interceptor-preset": "^1.2.10",
     "slonik-sql-tag-raw": "^1.1.4",
     "tar": "^6.1.11",
     "yargs": "^17.6.0",
-    "zod": "^3.19.1",
-    "@logto/schemas": "^1.0.0-beta.15",
-    "@logto/shared": "^1.0.0-beta.15"
+    "zod": "^3.20.2",
+    "@logto/core-kit": "1.0.0-beta.30",
+    "@logto/schemas": "1.0.0-beta.17",
+    "@logto/shared": "1.0.0-beta.17"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "1.3.0",
-    "@silverhand/jest-config": "1.2.2",
     "@silverhand/ts-config": "1.2.1",
     "@types/fs-extra": "^9.0.13",
     "@types/inquirer": "^8.2.1",
     "@types/jest": "^29.1.2",
     "@types/node": "^16.0.0",
     "@types/semver": "^7.3.12",
+    "@types/sinon": "^10.0.13",
     "@types/tar": "^6.1.2",
     "@types/yargs": "^17.0.13",
     "eslint": "^8.21.0",
-    "jest": "^29.1.2",
+    "jest": "^29.3.1",
     "lint-staged": "^13.0.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.7.4"
+    "sinon": "^15.0.0",
+    "typescript": "^4.9.4"
   },
   "eslintConfig": {
     "extends": "@silverhand",
@@ -79,12 +81,14 @@
     "precommit": "lint-staged",
     "prepare:package-json": "node -p \"'export const packageJson = ' + JSON.stringify(require('./package.json'), undefined, 2) + ';'\" > src/package-json.ts",
     "build": "rimraf lib && pnpm prepare:package-json && tsc -p tsconfig.build.json",
+    "build:test": "rimraf lib/ && pnpm prepare:package-json && tsc -p tsconfig.test.json --sourcemap",
     "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental",
     "start": "node .",
-    "start:dev": "ts-node --files src/index.ts",
+    "start:dev": "pnpm build && node .",
     "lint": "eslint --ext .ts src",
     "lint:report": "pnpm lint --format json --output-file report.json",
-    "test": "jest",
-    "test:ci": "jest"
+    "test:only": "NODE_OPTIONS=--experimental-vm-modules jest",
+    "test": "pnpm build:test && pnpm test:only",
+    "test:ci": "pnpm test:only"
   }
 }

package/bin/logto

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