@logto/cli 1.14.0 → 1.16.0

package/lib/commands/connector/utils.js

@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import { got } from 'got';
 import pLimit from 'p-limit';
 import pRetry from 'p-retry';
-import tar from 'tar';
+import { extract } from 'tar';
 import { z } from 'zod';
 import { connectorDirectory, coreDirectory } from '../../constants.js';
 import { consoleLog, getConnectorPackagesFromDirectory, inquireInstancePath, oraPromise, } from '../../utils.js';
@@ -68,7 +68,7 @@ export const addConnectorsToPath = async (cwd, packageNames) => {
             const packageDirectory = path.join(cwd, name.replaceAll('/', '-'));
             await fs.rm(packageDirectory, { force: true, recursive: true });
             await fs.mkdir(packageDirectory, { recursive: true });
-            await tar.extract({ cwd: packageDirectory, file: tarPath, strip: 1 });
+            await extract({ cwd: packageDirectory, file: tarPath, strip: 1 });
             await fs.unlink(tarPath);
             consoleLog.succeed(`Added ${chalk.green(name)} v${version}`);
         };

package/lib/commands/database/alteration/index.d.ts

@@ -1,4 +1,4 @@
-import type { DatabasePool } from 'slonik';
+import type { DatabasePool } from '@silverhand/slonik';
 import type { CommandModule } from 'yargs';
 import type { AlterationFile } from './type.js';
 export declare const getLatestAlterationTimestamp: () => Promise<number>;

package/lib/commands/database/alteration/index.test.js

@@ -1,22 +1,25 @@
-import { createMockUtils } from '@logto/shared/esm';
+import { createMockPool } from '@silverhand/slonik';
 import Sinon from 'sinon';
-import { createMockPool } from 'slonik';
+import { vi, expect, afterAll, describe, it } from 'vitest';
 import { chooseAlterationsByVersion } from './version.js';
-const { jest } = import.meta;
-const { mockEsmWithActual } = createMockUtils(jest);
 const pool = createMockPool({
-    query: jest.fn(),
+    query: vi.fn(),
 });
 const files = Object.freeze([
     { filename: '1.0.0-1663923770-a.js', path: '/alterations-js/1.0.0-1663923770-a.js' },
     { filename: '1.0.0-1663923771-b.js', path: '/alterations-js/1.0.0-1663923771-b.js' },
     { filename: '1.0.0-1663923772-c.js', path: '/alterations-js/1.0.0-1663923772-c.js' },
 ]);
-await mockEsmWithActual('./utils.js', () => ({
+vi.mock('./utils.js', async (importOriginal) => ({
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    ...(await importOriginal()),
     getAlterationFiles: async () => files,
 }));
-const { getCurrentDatabaseAlterationTimestamp } = await mockEsmWithActual('../../../queries/system.js', () => ({
-    getCurrentDatabaseAlterationTimestamp: jest.fn(),
+const getCurrentDatabaseAlterationTimestamp = vi.fn();
+vi.doMock('../../../queries/system.js', async (importOriginal) => ({
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    ...(await importOriginal()),
+    getCurrentDatabaseAlterationTimestamp,
 }));
 const { getAvailableAlterations } = await import('./index.js');
 describe('getAvailableAlterations()', () => {

package/lib/commands/database/seed/cloud.d.ts

@@ -1,4 +1,4 @@
-import type { CommonQueryMethods } from 'slonik';
+import type { CommonQueryMethods } from '@silverhand/slonik';
 /**
  * Append Redirect URIs for the default tenant callback in cloud Admin Console.
  * It reads the same env variables as core to construct the cloud `UrlSet`.

package/lib/commands/database/seed/cloud.js

@@ -1,7 +1,7 @@
 import { adminConsoleApplicationId, adminTenantId, defaultTenantId, createTenantMachineToMachineApplication, createAdminTenantApplicationRole, createCloudConnectionConfig, AdminTenantRole, } from '@logto/schemas';
 import { GlobalValues } from '@logto/shared';
 import { appendPath } from '@silverhand/essentials';
-import { sql } from 'slonik';
+import { sql } from '@silverhand/slonik';
 import { insertInto } from '../../../database.js';
 import { consoleLog } from '../../../utils.js';
 /**

package/lib/commands/database/seed/index.d.ts

@@ -1,4 +1,4 @@
-import type { DatabasePool } from 'slonik';
+import type { DatabasePool } from '@silverhand/slonik';
 import type { CommandModule } from 'yargs';
 export declare const seedByPool: (pool: DatabasePool, cloud?: boolean, test?: boolean, encryptBaseRole?: boolean) => Promise<void>;
 declare const seed: CommandModule<Record<string, unknown>, {

package/lib/commands/database/seed/oidc-config.d.ts

@@ -1,6 +1,6 @@
 import type { LogtoOidcConfigType } from '@logto/schemas';
 import { LogtoOidcConfigKey } from '@logto/schemas';
-import type { DatabaseTransactionConnection } from 'slonik';
+import type { DatabaseTransactionConnection } from '@silverhand/slonik';
 export declare const seedOidcConfigs: (pool: DatabaseTransactionConnection, tenantId: string) => Promise<void>;
 /**
  * Each config reader will do the following things in order:

package/lib/commands/database/seed/tables.d.ts

@@ -1,4 +1,4 @@
-import type { DatabaseTransactionConnection } from 'slonik';
+import type { DatabaseTransactionConnection } from '@silverhand/slonik';
 export declare const createTables: (connection: DatabaseTransactionConnection, encryptBaseRole: boolean) => Promise<{
     password: string;
 }>;

package/lib/commands/database/seed/tables.js

@@ -3,12 +3,12 @@ import path from 'node:path';
 import { createDefaultAdminConsoleConfig, defaultTenantId, adminTenantId, defaultManagementApi, createAdminDataInAdminTenant, createMeApiInAdminTenant, createDefaultSignInExperience, createAdminTenantSignInExperience, createDefaultAdminConsoleApplication, createCloudApi, createTenantApplicationRole, CloudScope, Roles, UsersRoles, LogtoConfigs, SignInExperiences, Applications, OrganizationUserRelations, getTenantOrganizationId, Users, OrganizationRoleUserRelations, TenantRole, } from '@logto/schemas';
 import { getTenantRole } from '@logto/schemas';
 import { Tenants } from '@logto/schemas/models';
-import { convertToIdentifiers, generateStandardId } from '@logto/shared';
-import { sql } from 'slonik';
-import { raw } from 'slonik-sql-tag-raw';
+import { generateStandardId } from '@logto/shared';
+import { sql } from '@silverhand/slonik';
 import { insertInto } from '../../../database.js';
 import { getDatabaseName } from '../../../queries/database.js';
 import { updateDatabaseTimestamp } from '../../../queries/system.js';
+import { convertToIdentifiers } from '../../../sql.js';
 import { consoleLog, getPathInModule } from '../../../utils.js';
 import { appendAdminConsoleRedirectUris, seedTenantCloudServiceApplication } from './cloud.js';
 import { seedOidcConfigs } from './oidc-config.js';
@@ -48,7 +48,7 @@ export const createTables = async (connection, encryptBaseRole) => {
     const runLifecycleQuery = async (lifecycle, parameters = {}) => {
         const query = queries.find(([file]) => file.slice(1, -4) === lifecycle)?.[1];
         if (query) {
-            await connection.query(sql `${raw(
+            await connection.query(sql `${sql.raw(
             /* eslint-disable no-template-curly-in-string */
             query
                 .replaceAll('${name}', parameters.name ?? '')
@@ -68,7 +68,7 @@ export const createTables = async (connection, encryptBaseRole) => {
     await runLifecycleQuery('before_all', { database, password });
     /* eslint-disable no-await-in-loop */
     for (const [file, query] of sorted) {
-        await connection.query(sql `${raw(query)}`);
+        await connection.query(sql `${sql.raw(query)}`);
         if (!query.includes('/* no_after_each */')) {
             await runLifecycleQuery('after_each', { name: file.split('.')[0], database });
         }
@@ -93,7 +93,9 @@ export const seedTables = async (connection, latestTimestamp, isCloud) => {
     const applicationRole = createTenantApplicationRole();
     await connection.query(insertInto(applicationRole, Roles.table));
     await assignScopesToRole(connection, adminTenantId, applicationRole.id, ...cloudAdditionalScopes
-        .filter(({ name }) => name === CloudScope.SendSms || name === CloudScope.SendEmail)
+        .filter(({ name }) => name === CloudScope.SendSms ||
+        name === CloudScope.SendEmail ||
+        name === CloudScope.FetchCustomJwt)
         .map(({ id }) => id));
     await Promise.all([
         seedLegacyManagementApiUserRole(connection),
@@ -103,10 +105,15 @@ export const seedTables = async (connection, latestTimestamp, isCloud) => {
         connection.query(insertInto(createDefaultSignInExperience(defaultTenantId, isCloud), SignInExperiences.table)),
         connection.query(insertInto(createAdminTenantSignInExperience(), SignInExperiences.table)),
         connection.query(insertInto(createDefaultAdminConsoleApplication(), Applications.table)),
-        updateDatabaseTimestamp(connection, latestTimestamp),
+    ]);
+    // The below seed data is for the Logto Cloud only. We put it here for the sack of simplicity.
+    // The data is not harmful for OSS, since they are all admin tenant data. OSS will not use them
+    // and they cannot be seen by the Console.
+    await Promise.all([
         seedTenantOrganizations(connection),
         seedManagementApiProxyApplications(connection),
     ]);
+    await updateDatabaseTimestamp(connection, latestTimestamp);
     consoleLog.succeed('Seed data');
 };
 export const seedCloud = async (connection) => {

package/lib/commands/database/seed/tenant-organizations.d.ts

@@ -1,4 +1,4 @@
-import type { DatabaseTransactionConnection } from 'slonik';
+import type { DatabaseTransactionConnection } from '@silverhand/slonik';
 /**
  * Seed initial data in the admin tenant for tenant organizations (`default` and `admin`):
  *

package/lib/commands/database/seed/tenant.d.ts

@@ -1,5 +1,5 @@
 import { type AdminData, type UpdateAdminData, type CreateScope } from '@logto/schemas';
-import type { CommonQueryMethods, DatabaseTransactionConnection } from 'slonik';
+import type { CommonQueryMethods, DatabaseTransactionConnection } from '@silverhand/slonik';
 export declare const createTenant: (pool: CommonQueryMethods, tenantId: string) => Promise<void>;
 export declare const seedAdminData: (pool: CommonQueryMethods, data: AdminData | UpdateAdminData, ...additionalScopes: CreateScope[]) => Promise<void>;
 export declare const assignScopesToRole: (pool: CommonQueryMethods, tenantId: string, roleId: string, ...scopeIds: string[]) => Promise<void>;

package/lib/commands/database/seed/tenant.js

@@ -2,8 +2,7 @@ import { createTenantMetadata } from '@logto/core-kit';
 import { defaultTenantId, adminTenantId, Applications, ApplicationsRoles, getMapiProxyM2mApp, getMapiProxyRole, defaultManagementApiAdminName, Roles, PredefinedScope, getManagementApiResourceIndicator, } from '@logto/schemas';
 import { generateStandardId } from '@logto/shared';
 import { assert } from '@silverhand/essentials';
-import { sql } from 'slonik';
-import { raw } from 'slonik-sql-tag-raw';
+import { sql } from '@silverhand/slonik';
 import { insertInto } from '../../../database.js';
 import { getDatabaseName } from '../../../queries/database.js';
 import { consoleLog } from '../../../utils.js';
@@ -18,7 +17,7 @@ export const createTenant = async (pool, tenantId) => {
     await pool.query(insertInto(createTenant, 'tenants'));
     await pool.query(sql `
     create role ${sql.identifier([role])} with inherit login
-      password '${raw(password)}'
+      password '${sql.raw(password)}'
       in role ${sql.identifier([parentRole])};
   `);
 };

package/lib/commands/install/utils.js

@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import { got, RequestError } from 'got';
 import inquirer from 'inquirer';
 import * as semver from 'semver';
-import tar from 'tar';
+import { extract } from 'tar';
 import { defaultPath } from '../../constants.js';
 import { createPoolAndDatabaseIfNeeded } from '../../database.js';
 import { packageJson } from '../../package-json.js';
@@ -98,7 +98,7 @@ export const decompress = async (toPath, tarPath) => {
     const run = async () => {
         try {
             await fs.mkdir(toPath);
-            await tar.extract({ file: tarPath, cwd: toPath, strip: 1 });
+            await extract({ file: tarPath, cwd: toPath, strip: 1 });
         }
         catch (error) {
             consoleLog.fatal(error);

package/lib/commands/translate/openai.js

@@ -8,7 +8,7 @@ import { getTranslationPromptMessages } from './prompts.js';
 export const createOpenaiApi = () => {
     const proxy = getProxy();
     return got.extend({
-        prefixUrl: 'https://api.openai.com/v1',
+        prefixUrl: process.env.OPENAI_API_PROXY_ENDPOINT ?? 'https://api.openai.com/v1',
         headers: {
             Authorization: `Bearer ${process.env.OPENAI_API_KEY ?? ''}`,
         },
@@ -29,7 +29,8 @@ export const translate = async ({ api, targetLanguage, sourceFilePath, extraProm
     const response = await trySafe(api
         .post('chat/completions', {
         json: {
-            model: 'gpt-3.5-turbo-1106',
+            // The full list of OPENAI model can be found at https://platform.openai.com/docs/models.
+            model: process.env.OPENAI_MODEL_NAME ?? 'gpt-3.5-turbo-0125',
             messages: getTranslationPromptMessages({
                 sourceFileContent,
                 targetLanguage,

package/lib/connector/factories.d.ts

@@ -1,3 +1,3 @@
 import type { BaseRoutes, Router } from '@withtyped/server';
 import type { ConnectorFactory, ConnectorPackage } from './types.js';
-export declare const loadConnectorFactories: (connectorPackages: ConnectorPackage[], ignoreVersionMismatch: boolean) => Promise<ConnectorFactory<Router<any, BaseRoutes, string>>[]>;
+export declare const loadConnectorFactories: (connectorPackages: ConnectorPackage[], ignoreVersionMismatch: boolean) => Promise<ConnectorFactory<Router<any, any, BaseRoutes, string>>[]>;

package/lib/connector/factories.js

@@ -3,7 +3,7 @@ import { consoleLog } from '../utils.js';
 import { notImplemented } from './consts.js';
 import { loadConnector } from './loader.js';
 import { parseMetadata, validateConnectorModule } from './utils.js';
-// eslint-disable-next-line @silverhand/fp/no-let, @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @silverhand/fp/no-let
 let cachedConnectorFactories;
 export const loadConnectorFactories = async (connectorPackages, ignoreVersionMismatch) => {
     if (cachedConnectorFactories) {
@@ -31,8 +31,8 @@ export const loadConnectorFactories = async (connectorPackages, ignoreVersionMis
         }
     }));
     // eslint-disable-next-line @silverhand/fp/no-mutation
-    cachedConnectorFactories = connectorFactories.filter(
+    cachedConnectorFactories = connectorFactories.filter((connectorFactory
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (connectorFactory) => connectorFactory !== undefined);
+    ) => connectorFactory !== undefined);
     return cachedConnectorFactories;
 };

package/lib/connector/types.d.ts

@@ -3,7 +3,7 @@ import type { BaseRoutes, Router } from '@withtyped/server';
 /**
  * Dynamic loaded connector type.
  */
-export type ConnectorFactory<T extends Router<any, BaseRoutes, string>, U extends AllConnector = AllConnector> = Pick<U, 'type' | 'metadata' | 'configGuard'> & {
+export type ConnectorFactory<T extends Router<any, any, BaseRoutes, string>, U extends AllConnector = AllConnector> = Pick<U, 'type' | 'metadata' | 'configGuard'> & {
     createConnector: CreateConnector<U, T>;
     path: string;
 };

package/lib/connector/utils.d.ts

@@ -5,7 +5,7 @@ import type { ConnectorFactory } from './types.js';
 export declare function validateConnectorModule(connector: Partial<BaseConnector<ConnectorType>>): asserts connector is BaseConnector<ConnectorType>;
 export declare const readUrl: (url: string, baseUrl: string, type: 'text' | 'image') => Promise<string>;
 export declare const parseMetadata: (metadata: AllConnector['metadata'], packagePath: string) => Promise<AllConnector['metadata']>;
-export declare const buildRawConnector: <T extends Router<any, BaseRoutes, string>, U extends AllConnector = AllConnector>(connectorFactory: ConnectorFactory<T, U>, getConnectorConfig?: GetConnectorConfig, getCloudServiceClient?: GetCloudServiceClient<T> | undefined) => Promise<{
+export declare const buildRawConnector: <T extends Router<any, any, BaseRoutes, string>, U extends AllConnector = AllConnector>(connectorFactory: ConnectorFactory<T, U>, getConnectorConfig?: GetConnectorConfig, getCloudServiceClient?: GetCloudServiceClient<T> | undefined) => Promise<{
     rawConnector: U;
     rawMetadata: ConnectorMetadata;
 }>;

package/lib/database.d.ts

@@ -1,16 +1,16 @@
 import type { SchemaLike } from '@logto/schemas';
 export declare const defaultDatabaseUrl = "postgresql://localhost:5432/logto";
 export declare const getDatabaseUrlFromConfig: () => Promise<string>;
-export declare const createPoolFromConfig: () => Promise<import("slonik").DatabasePool>;
+export declare const createPoolFromConfig: () => Promise<import("@silverhand/slonik").DatabasePool>;
 /**
  * Create a database pool with the URL in CLI config; if no URL found, prompt to input.
  * If the given database does not exists, it will try to create a new database by connecting to the maintenance database `postgres`.
  *
  * @returns A new database pool with the database URL in config.
  */
-export declare const createPoolAndDatabaseIfNeeded: () => Promise<import("slonik").DatabasePool>;
+export declare const createPoolAndDatabaseIfNeeded: () => Promise<import("@silverhand/slonik").DatabasePool>;
 /**
  * Build an `insert into` query from the given payload. If the payload is an array, it will insert
  * multiple rows.
  */
-export declare const insertInto: <T extends SchemaLike<string>>(payload: T | T[], table: string) => import("slonik").TaggedTemplateLiteralInvocation<import("slonik").QueryResultRow>;
+export declare const insertInto: <T extends SchemaLike<string>>(payload: T | T[], table: string) => import("@silverhand/slonik").TaggedTemplateLiteralInvocation<import("@silverhand/slonik").QueryResultRow>;

package/lib/database.js

@@ -1,9 +1,8 @@
-import { convertToPrimitiveOrSql } from '@logto/shared';
 import { assert } from '@silverhand/essentials';
+import { createPool, parseDsn, sql, stringifyDsn, createInterceptorsPreset, } from '@silverhand/slonik';
 import decamelize from 'decamelize';
 import { DatabaseError } from 'pg-protocol';
-import { createPool, parseDsn, sql, stringifyDsn } from 'slonik';
-import { createInterceptors } from 'slonik-interceptor-preset';
+import { convertToPrimitiveOrSql } from './sql.js';
 import { ConfigKey, consoleLog, getCliConfigWithPrompt } from './utils.js';
 export const defaultDatabaseUrl = 'postgresql://localhost:5432/logto';
 export const getDatabaseUrlFromConfig = async () => (await getCliConfigWithPrompt({
@@ -15,7 +14,7 @@ export const createPoolFromConfig = async () => {
     const databaseUrl = await getDatabaseUrlFromConfig();
     assert(parseDsn(databaseUrl).databaseName, new Error('Database name is required in URL'));
     return createPool(databaseUrl, {
-        interceptors: createInterceptors(),
+        interceptors: createInterceptorsPreset(),
     });
 };
 /**
@@ -41,7 +40,7 @@ export const createPoolAndDatabaseIfNeeded = async () => {
         // - It will throw error when creating database using '?'
         const databaseName = dsn.databaseName ?? '?';
         const maintenancePool = await createPool(stringifyDsn({ ...dsn, databaseName: 'postgres' }), {
-            interceptors: createInterceptors(),
+            interceptors: createInterceptorsPreset(),
         });
         await maintenancePool.query(sql `
       create database ${sql.identifier([databaseName])}

package/lib/package-json.d.ts

@@ -28,7 +28,6 @@ export declare const packageJson: {
         "start:dev": string;
         lint: string;
         "lint:report": string;
-        "test:only": string;
         test: string;
         "test:ci": string;
         prepack: string;
@@ -48,6 +47,7 @@ export declare const packageJson: {
         "@logto/schemas": string;
         "@logto/shared": string;
         "@silverhand/essentials": string;
+        "@silverhand/slonik": string;
         chalk: string;
         decamelize: string;
         dotenv: string;
@@ -62,9 +62,6 @@ export declare const packageJson: {
         "pg-protocol": string;
         roarr: string;
         semver: string;
-        slonik: string;
-        "slonik-interceptor-preset": string;
-        "slonik-sql-tag-raw": string;
         tar: string;
         typescript: string;
         yargs: string;
@@ -73,19 +70,19 @@ export declare const packageJson: {
     devDependencies: {
         "@silverhand/eslint-config": string;
         "@silverhand/ts-config": string;
-        "@withtyped/server": string;
         "@types/inquirer": string;
-        "@types/jest": string;
         "@types/node": string;
         "@types/semver": string;
         "@types/sinon": string;
         "@types/tar": string;
         "@types/yargs": string;
+        "@vitest/coverage-v8": string;
+        "@withtyped/server": string;
         eslint: string;
-        jest: string;
         "lint-staged": string;
         prettier: string;
         sinon: string;
+        vitest: string;
     };
     eslintConfig: {
         extends: string;

package/lib/package-json.js

@@ -1,6 +1,6 @@
 export const packageJson = {
     "name": "@logto/cli",
-    "version": "1.14.0",
+    "version": "1.16.0",
     "description": "Logto CLI.",
     "author": "Silverhand Inc. <contact@silverhand.io>",
     "homepage": "https://github.com/logto-io/logto#readme",
@@ -25,15 +25,14 @@ export const packageJson = {
         "precommit": "lint-staged",
         "prepare:package-json": "node -p \"'export const packageJson = ' + JSON.stringify(require('./package.json'), undefined, 2) + ';'\" > src/package-json.ts",
         "build": "rm -rf lib && pnpm prepare:package-json && tsc -p tsconfig.build.json",
-        "build:test": "rm -rf lib/ && pnpm prepare:package-json && tsc -p tsconfig.test.json --sourcemap",
+        "build:test": "pnpm build",
         "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental",
         "start": "node .",
         "start:dev": "pnpm build && node .",
         "lint": "eslint --ext .ts src",
         "lint:report": "pnpm lint --format json --output-file report.json",
-        "test:only": "NODE_OPTIONS=--experimental-vm-modules jest",
-        "test": "pnpm build:test && pnpm test:only",
-        "test:ci": "pnpm test:only",
+        "test": "vitest src",
+        "test:ci": "pnpm run test --silent --coverage",
         "prepack": "pnpm build"
     },
     "engines": {
@@ -43,14 +42,15 @@ export const packageJson = {
         "url": "https://github.com/logto-io/logto/issues"
     },
     "dependencies": {
-        "@logto/connector-kit": "workspace:^2.1.0",
-        "@logto/core-kit": "workspace:^2.3.0",
+        "@logto/connector-kit": "workspace:^3.0.0",
+        "@logto/core-kit": "workspace:^2.4.0",
         "@logto/language-kit": "workspace:^1.1.0",
-        "@logto/phrases": "workspace:^1.9.0",
-        "@logto/phrases-experience": "workspace:^1.6.0",
-        "@logto/schemas": "workspace:1.14.0",
-        "@logto/shared": "workspace:^3.1.0",
+        "@logto/phrases": "workspace:^1.10.1",
+        "@logto/phrases-experience": "workspace:^1.6.1",
+        "@logto/schemas": "workspace:1.16.0",
+        "@logto/shared": "workspace:^3.1.1",
         "@silverhand/essentials": "^2.9.0",
+        "@silverhand/slonik": "31.0.0-beta.2",
         "chalk": "^5.0.0",
         "decamelize": "^6.0.0",
         "dotenv": "^16.0.0",
@@ -65,30 +65,27 @@ export const packageJson = {
         "pg-protocol": "^1.6.0",
         "roarr": "^7.11.0",
         "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",
+        "tar": "^7.0.0",
         "typescript": "^5.3.3",
         "yargs": "^17.6.0",
         "zod": "^3.22.4"
     },
     "devDependencies": {
-        "@silverhand/eslint-config": "5.0.0",
-        "@silverhand/ts-config": "5.0.0",
-        "@withtyped/server": "^0.12.9",
+        "@silverhand/eslint-config": "6.0.1",
+        "@silverhand/ts-config": "6.0.0",
         "@types/inquirer": "^9.0.0",
-        "@types/jest": "^29.4.0",
         "@types/node": "^20.9.5",
         "@types/semver": "^7.3.12",
         "@types/sinon": "^17.0.0",
-        "@types/tar": "^6.1.2",
+        "@types/tar": "^6.1.12",
         "@types/yargs": "^17.0.13",
-        "eslint": "^8.44.0",
-        "jest": "^29.7.0",
+        "@vitest/coverage-v8": "^1.4.0",
+        "@withtyped/server": "^0.13.6",
+        "eslint": "^8.56.0",
         "lint-staged": "^15.0.0",
         "prettier": "^3.0.0",
-        "sinon": "^17.0.0"
+        "sinon": "^17.0.0",
+        "vitest": "^1.4.0"
     },
     "eslintConfig": {
         "extends": "@silverhand",

package/lib/queries/database.d.ts

@@ -1,2 +1,2 @@
-import type { CommonQueryMethods } from 'slonik';
+import type { CommonQueryMethods } from '@silverhand/slonik';
 export declare const getDatabaseName: (pool: CommonQueryMethods, normalized?: boolean) => Promise<string>;

package/lib/queries/database.js

@@ -1,4 +1,4 @@
-import { sql } from 'slonik';
+import { sql } from '@silverhand/slonik';
 export const getDatabaseName = async (pool, normalized = false) => {
     const { currentDatabase } = await pool.one(sql `
     select current_database();

package/lib/queries/logto-config.d.ts

@@ -1,6 +1,6 @@
 import type { LogtoConfig, LogtoConfigKey, logtoConfigGuards } from '@logto/schemas';
-import type { CommonQueryMethods } from 'slonik';
+import type { CommonQueryMethods } from '@silverhand/slonik';
 import type { z } from 'zod';
 export declare const doesConfigsTableExist: (pool: CommonQueryMethods) => Promise<boolean>;
-export declare const getRowsByKeys: (pool: CommonQueryMethods, tenantId: string, keys: LogtoConfigKey[]) => Promise<import("slonik").QueryResult<LogtoConfig>>;
-export declare const updateValueByKey: <T extends LogtoConfigKey>(pool: CommonQueryMethods, tenantId: string, key: T, value: z.TypeOf<import("@logto/schemas").LogtoConfigGuard[T]>) => Promise<import("slonik").QueryResult<import("slonik").QueryResultRow>>;
+export declare const getRowsByKeys: (pool: CommonQueryMethods, tenantId: string, keys: LogtoConfigKey[]) => Promise<import("@silverhand/slonik").QueryResult<LogtoConfig>>;
+export declare const updateValueByKey: <T extends LogtoConfigKey>(pool: CommonQueryMethods, tenantId: string, key: T, value: z.TypeOf<import("@logto/schemas").LogtoConfigGuard[T]>) => Promise<import("@silverhand/slonik").QueryResult<import("@silverhand/slonik").QueryResultRow>>;

package/lib/queries/logto-config.js

@@ -1,6 +1,6 @@
 import { LogtoConfigs } from '@logto/schemas';
-import { convertToIdentifiers } from '@logto/shared';
-import { sql } from 'slonik';
+import { sql } from '@silverhand/slonik';
+import { convertToIdentifiers } from '../sql.js';
 const { table, fields } = convertToIdentifiers(LogtoConfigs);
 export const doesConfigsTableExist = async (pool) => {
     const { rows } = await pool.query(sql `select to_regclass(${LogtoConfigs.table}) as regclass`);

package/lib/queries/system.d.ts

@@ -1,9 +1,9 @@
 import type { System, SystemKey } from '@logto/schemas';
 import { systemGuards } from '@logto/schemas';
-import type { CommonQueryMethods, DatabaseTransactionConnection } from 'slonik';
+import type { CommonQueryMethods, DatabaseTransactionConnection } from '@silverhand/slonik';
 import type { z } from 'zod';
 export declare const doesSystemsTableExist: (pool: CommonQueryMethods) => Promise<boolean>;
 export declare const getCurrentDatabaseAlterationTimestamp: (pool: CommonQueryMethods) => Promise<number>;
 export declare const updateDatabaseTimestamp: (connection: DatabaseTransactionConnection, timestamp: number) => Promise<void>;
 export declare const getRowByKey: (pool: CommonQueryMethods, key: SystemKey) => Promise<System | null>;
-export declare const updateValueByKey: <T extends SystemKey>(pool: CommonQueryMethods, key: T, value: z.TypeOf<import("@logto/schemas").SystemGuard[T]>) => Promise<import("slonik").QueryResult<import("slonik").QueryResultRow>>;
+export declare const updateValueByKey: <T extends SystemKey>(pool: CommonQueryMethods, key: T, value: z.TypeOf<import("@logto/schemas").SystemGuard[T]>) => Promise<import("@silverhand/slonik").QueryResult<import("@silverhand/slonik").QueryResultRow>>;

package/lib/queries/system.js

@@ -1,7 +1,7 @@
 import { systemGuards, Systems, AlterationStateKey } from '@logto/schemas';
-import { convertToIdentifiers } from '@logto/shared';
+import { sql } from '@silverhand/slonik';
 import { DatabaseError } from 'pg-protocol';
-import { sql } from 'slonik';
+import { convertToIdentifiers } from '../sql.js';
 const { fields, table } = convertToIdentifiers(Systems);
 const doesTableExist = async (pool, table) => {
     const { rows } = await pool.query(sql `select to_regclass(${table}) as regclass`);

package/lib/queries/system.test.js

@@ -1,11 +1,11 @@
 import { AlterationStateKey, Systems } from '@logto/schemas';
-import { convertToIdentifiers } from '@logto/shared';
+import { createMockPool, createMockQueryResult, sql } from '@silverhand/slonik';
 import { DatabaseError } from 'pg-protocol';
-import { createMockPool, createMockQueryResult, sql } from 'slonik';
+import { describe, it, expect, vi, afterAll, beforeAll } from 'vitest';
+import { convertToIdentifiers } from '../sql.js';
 import { expectSqlAssert } from '../test-utils.js';
 import { updateDatabaseTimestamp, getCurrentDatabaseAlterationTimestamp } from './system.js';
-const { jest } = import.meta;
-const mockQuery = jest.fn();
+const mockQuery = vi.fn();
 const pool = createMockPool({
     query: async (sql, values) => {
         return mockQuery(sql, values);
@@ -71,11 +71,11 @@ describe('updateDatabaseTimestamp()', () => {
   `;
     const updatedAt = '2022-09-21T06:32:46.583Z';
     beforeAll(() => {
-        jest.useFakeTimers();
-        jest.setSystemTime(new Date(updatedAt));
+        vi.useFakeTimers();
+        vi.setSystemTime(new Date(updatedAt));
     });
     afterAll(() => {
-        jest.useRealTimers();
+        vi.useRealTimers();
     });
     it('sends upsert sql with timestamp and updatedAt', async () => {
         mockQuery

package/lib/sql.d.ts

@@ -0,0 +1,27 @@
+/**
+ * @fileoverview Copied from `@logto/core`. Originally we put them in `@logto/shared` but it
+ * requires `slonik` which makes the package too heavy.
+ *
+ * Since `@logto/cli` only use these functions in a stable manner, we copy them here for now. If
+ * the number of functions grows, we should consider moving them to a separate package. (Actually,
+ * we should remove the dependency on `slonik` at all, and this may not be an issue then.)
+ */
+import { type SchemaValue, type SchemaValuePrimitive, type Table } from '@logto/shared';
+import { type IdentifierSqlToken, type SqlToken } from '@silverhand/slonik';
+/**
+ * Note `undefined` is removed from the acceptable list,
+ * since you should NOT call this function if ignoring the field is the desired behavior.
+ * Calling this function with `null` means an explicit `null` setting in database is expected.
+ * @param key The key of value. Will treat as `timestamp` if it ends with `_at` or 'At' AND value is a number;
+ * @param value The value to convert.
+ * @returns A primitive that can be saved into database.
+ */
+export declare const convertToPrimitiveOrSql: (key: string, value: SchemaValue) => NonNullable<SchemaValuePrimitive> | SqlToken | null;
+type FieldIdentifiers<Key extends string> = {
+    [key in Key]: IdentifierSqlToken;
+};
+export declare const convertToIdentifiers: <Key extends string>({ table, fields }: Table<Key>, withPrefix?: boolean) => {
+    table: IdentifierSqlToken;
+    fields: FieldIdentifiers<Key>;
+};
+export {};

package/lib/sql.js

@@ -0,0 +1,52 @@
+/**
+ * @fileoverview Copied from `@logto/core`. Originally we put them in `@logto/shared` but it
+ * requires `slonik` which makes the package too heavy.
+ *
+ * Since `@logto/cli` only use these functions in a stable manner, we copy them here for now. If
+ * the number of functions grows, we should consider moving them to a separate package. (Actually,
+ * we should remove the dependency on `slonik` at all, and this may not be an issue then.)
+ */
+import { sql } from '@silverhand/slonik';
+/**
+ * Note `undefined` is removed from the acceptable list,
+ * since you should NOT call this function if ignoring the field is the desired behavior.
+ * Calling this function with `null` means an explicit `null` setting in database is expected.
+ * @param key The key of value. Will treat as `timestamp` if it ends with `_at` or 'At' AND value is a number;
+ * @param value The value to convert.
+ * @returns A primitive that can be saved into database.
+ */
+export const convertToPrimitiveOrSql = (key, value
+// eslint-disable-next-line @typescript-eslint/ban-types
+) => {
+    if (value === null) {
+        return null;
+    }
+    if (typeof value === 'object') {
+        return JSON.stringify(value);
+    }
+    if ((['_at', 'At'].some((value) => key.endsWith(value)) || key === 'date') &&
+        typeof value === 'number') {
+        return sql `to_timestamp(${value}::double precision / 1000)`;
+    }
+    if (typeof value === 'number' || typeof value === 'boolean') {
+        return value;
+    }
+    if (typeof value === 'string') {
+        if (value === '') {
+            return null;
+        }
+        return value;
+    }
+    throw new Error(`Cannot convert ${key} to primitive`);
+};
+export const convertToIdentifiers = ({ table, fields }, withPrefix = false) => {
+    const fieldsIdentifiers = Object.entries(fields).map(
+    // eslint-disable-next-line no-restricted-syntax -- Object.entries can only return string keys
+    ([key, value]) => [key, sql.identifier(withPrefix ? [table, value] : [value])]);
+    return {
+        table: sql.identifier([table]),
+        // Key value inferred from the original fields directly
+        // eslint-disable-next-line no-restricted-syntax
+        fields: Object.fromEntries(fieldsIdentifiers),
+    };
+};

package/lib/test-utils.d.ts

@@ -1,5 +1,5 @@
-import type { QueryResult, QueryResultRow } from 'slonik';
-import type { PrimitiveValueExpression } from 'slonik/dist/src/types.js';
+import type { QueryResult, QueryResultRow } from '@silverhand/slonik';
+import type { PrimitiveValueExpression } from '@silverhand/slonik/dist/src/types.js';
 export type QueryType = (sql: string, values: readonly PrimitiveValueExpression[]) => Promise<QueryResult<QueryResultRow>>;
 /**
  *  Slonik Query Mock Utils

package/lib/test-utils.js

@@ -1,4 +1,5 @@
 // Copied from core
+import { expect } from 'vitest';
 /**
  *  Slonik Query Mock Utils
  **/

package/lib/utils.js

@@ -55,7 +55,7 @@ export const downloadFile = async (url, destination) => {
         });
         file.on('error', (error) => {
             spinner.fail();
-            reject(error.message);
+            reject(new Error(error.message));
         });
         file.on('finish', () => {
             file.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.14.0",
+  "version": "1.16.0",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -28,14 +28,15 @@
     "url": "https://github.com/logto-io/logto/issues"
   },
   "dependencies": {
-    "@logto/connector-kit": "^2.1.0",
-    "@logto/core-kit": "^2.3.0",
+    "@logto/connector-kit": "^3.0.0",
+    "@logto/core-kit": "^2.4.0",
     "@logto/language-kit": "^1.1.0",
-    "@logto/phrases": "^1.9.0",
-    "@logto/phrases-experience": "^1.6.0",
-    "@logto/schemas": "1.14.0",
-    "@logto/shared": "^3.1.0",
+    "@logto/phrases": "^1.10.1",
+    "@logto/phrases-experience": "^1.6.1",
+    "@logto/schemas": "1.16.0",
+    "@logto/shared": "^3.1.1",
     "@silverhand/essentials": "^2.9.0",
+    "@silverhand/slonik": "31.0.0-beta.2",
     "chalk": "^5.0.0",
     "decamelize": "^6.0.0",
     "dotenv": "^16.0.0",
@@ -50,30 +51,27 @@
     "pg-protocol": "^1.6.0",
     "roarr": "^7.11.0",
     "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",
+    "tar": "^7.0.0",
     "typescript": "^5.3.3",
     "yargs": "^17.6.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@silverhand/eslint-config": "5.0.0",
-    "@silverhand/ts-config": "5.0.0",
-    "@withtyped/server": "^0.12.9",
+    "@silverhand/eslint-config": "6.0.1",
+    "@silverhand/ts-config": "6.0.0",
     "@types/inquirer": "^9.0.0",
-    "@types/jest": "^29.4.0",
     "@types/node": "^20.9.5",
     "@types/semver": "^7.3.12",
     "@types/sinon": "^17.0.0",
-    "@types/tar": "^6.1.2",
+    "@types/tar": "^6.1.12",
     "@types/yargs": "^17.0.13",
-    "eslint": "^8.44.0",
-    "jest": "^29.7.0",
+    "@vitest/coverage-v8": "^1.4.0",
+    "@withtyped/server": "^0.13.6",
+    "eslint": "^8.56.0",
     "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",
-    "sinon": "^17.0.0"
+    "sinon": "^17.0.0",
+    "vitest": "^1.4.0"
   },
   "eslintConfig": {
     "extends": "@silverhand",
@@ -89,14 +87,13 @@
     "precommit": "lint-staged",
     "prepare:package-json": "node -p \"'export const packageJson = ' + JSON.stringify(require('./package.json'), undefined, 2) + ';'\" > src/package-json.ts",
     "build": "rm -rf lib && pnpm prepare:package-json && tsc -p tsconfig.build.json",
-    "build:test": "rm -rf lib/ && pnpm prepare:package-json && tsc -p tsconfig.test.json --sourcemap",
+    "build:test": "pnpm build",
     "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental",
     "start": "node .",
     "start:dev": "pnpm build && node .",
     "lint": "eslint --ext .ts src",
     "lint:report": "pnpm lint --format json --output-file report.json",
-    "test:only": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "test": "pnpm build:test && pnpm test:only",
-    "test:ci": "pnpm test:only"
+    "test": "vitest src",
+    "test:ci": "pnpm run test --silent --coverage"
   }
 }