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

package/lib/database.js

@@ -1,75 +1,65 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.insertInto = exports.createPoolAndDatabaseIfNeeded = exports.createPoolFromConfig = exports.getDatabaseUrlFromConfig = exports.defaultDatabaseUrl = void 0;
-const shared_1 = require("@logto/shared");
-const essentials_1 = require("@silverhand/essentials");
-const decamelize_1 = __importDefault(require("decamelize"));
-const slonik_1 = require("slonik");
-const slonik_interceptor_preset_1 = require("slonik-interceptor-preset");
-const zod_1 = require("zod");
-const utilities_1 = require("./utilities");
-exports.defaultDatabaseUrl = 'postgresql://localhost:5432/logto';
-const getDatabaseUrlFromConfig = async () => (await (0, utilities_1.getCliConfigWithPrompt)({
-    key: utilities_1.ConfigKey.DatabaseUrl,
+import { convertToPrimitiveOrSql } from '@logto/shared';
+import { assert } from '@silverhand/essentials';
+import decamelize from 'decamelize';
+import { createPool, parseDsn, sql, stringifyDsn } from 'slonik';
+import { createInterceptors } from 'slonik-interceptor-preset';
+import { z } from 'zod';
+import { ConfigKey, getCliConfigWithPrompt, log } from './utilities.js';
+export const defaultDatabaseUrl = 'postgresql://localhost:5432/logto';
+export const getDatabaseUrlFromConfig = async () => (await getCliConfigWithPrompt({
+    key: ConfigKey.DatabaseUrl,
     readableKey: 'Logto database URL',
-    defaultValue: exports.defaultDatabaseUrl,
+    defaultValue: defaultDatabaseUrl,
 })) ?? '';
-exports.getDatabaseUrlFromConfig = getDatabaseUrlFromConfig;
-const createPoolFromConfig = async () => {
-    const databaseUrl = await (0, exports.getDatabaseUrlFromConfig)();
-    (0, essentials_1.assert)((0, slonik_1.parseDsn)(databaseUrl).databaseName, new Error('Database name is required in URL'));
-    return (0, slonik_1.createPool)(databaseUrl, {
-        interceptors: (0, slonik_interceptor_preset_1.createInterceptors)(),
+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(),
     });
 };
-exports.createPoolFromConfig = createPoolFromConfig;
 /**
  * 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.
  */
-const createPoolAndDatabaseIfNeeded = async () => {
+export const createPoolAndDatabaseIfNeeded = async () => {
     try {
-        return await (0, exports.createPoolFromConfig)();
+        return await createPoolFromConfig();
     }
     catch (error) {
-        const result = zod_1.z.object({ code: zod_1.z.string() }).safeParse(error);
+        const result = z.object({ code: z.string() }).safeParse(error);
         // Database does not exist, try to create one
         // https://www.postgresql.org/docs/14/errcodes-appendix.html
         if (!(result.success && result.data.code === '3D000')) {
-            utilities_1.log.error(error);
+            log.error(error);
         }
-        const databaseUrl = await (0, exports.getDatabaseUrlFromConfig)();
-        const dsn = (0, slonik_1.parseDsn)(databaseUrl);
+        const databaseUrl = await getDatabaseUrlFromConfig();
+        const dsn = parseDsn(databaseUrl);
         // It's ok to fall back to '?' since:
         // - Database name is required to connect in the previous pool
         // - It will throw error when creating database using '?'
         const databaseName = dsn.databaseName ?? '?';
-        const maintenancePool = await (0, slonik_1.createPool)((0, slonik_1.stringifyDsn)({ ...dsn, databaseName: 'postgres' }), {
-            interceptors: (0, slonik_interceptor_preset_1.createInterceptors)(),
+        const maintenancePool = await createPool(stringifyDsn({ ...dsn, databaseName: 'postgres' }), {
+            interceptors: createInterceptors(),
         });
-        await maintenancePool.query((0, slonik_1.sql) `
-      create database ${slonik_1.sql.identifier([databaseName])}
+        await maintenancePool.query(sql `
+      create database ${sql.identifier([databaseName])}
         with
         encoding = 'UTF8'
         connection_limit = -1;
     `);
         await maintenancePool.end();
-        utilities_1.log.succeed(`Created database ${databaseName}`);
-        return (0, exports.createPoolFromConfig)();
+        log.succeed(`Created database ${databaseName}`);
+        return createPoolFromConfig();
     }
 };
-exports.createPoolAndDatabaseIfNeeded = createPoolAndDatabaseIfNeeded;
-const insertInto = (object, table) => {
+export const insertInto = (object, table) => {
     const keys = Object.keys(object);
-    return (0, slonik_1.sql) `
-    insert into ${slonik_1.sql.identifier([table])}
-    (${slonik_1.sql.join(keys.map((key) => slonik_1.sql.identifier([(0, decamelize_1.default)(key)])), (0, slonik_1.sql) `, `)})
-    values (${slonik_1.sql.join(keys.map((key) => (0, shared_1.convertToPrimitiveOrSql)(key, object[key] ?? null)), (0, slonik_1.sql) `, `)})
+    return sql `
+    insert into ${sql.identifier([table])}
+    (${sql.join(keys.map((key) => sql.identifier([decamelize(key)])), sql `, `)})
+    values (${sql.join(keys.map((key) => convertToPrimitiveOrSql(key, object[key] ?? null)), sql `, `)})
   `;
 };
-exports.insertInto = insertInto;

package/lib/index.js

@@ -1,18 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chalk_1 = __importDefault(require("chalk"));
-const dotenv_1 = __importDefault(require("dotenv"));
-const yargs_1 = __importDefault(require("yargs"));
-const helpers_1 = require("yargs/helpers");
-const connector_1 = __importDefault(require("./commands/connector"));
-const database_1 = __importDefault(require("./commands/database"));
-const install_1 = __importDefault(require("./commands/install"));
-const package_json_1 = require("./package-json");
-const utilities_1 = require("./utilities");
-void (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
+import chalk from 'chalk';
+import dotenv from 'dotenv';
+import yargs from 'yargs';
+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 { packageJson } from './package-json.js';
+import { cliConfig, ConfigKey } from './utilities.js';
+void yargs(hideBin(process.argv))
     .version(false)
     .option('env', {
     alias: ['e', 'env-file'],
@@ -32,23 +27,23 @@ void (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
 })
     .middleware(({ version }) => {
     if (version) {
-        console.log(package_json_1.packageJson.name + ' v' + package_json_1.packageJson.version);
+        console.log(packageJson.name + ' v' + packageJson.version);
         // eslint-disable-next-line unicorn/no-process-exit
         process.exit(0);
     }
 }, true)
     .middleware(({ env, db: databaseUrl }) => {
-    dotenv_1.default.config({ path: env });
-    const initialDatabaseUrl = databaseUrl ?? process.env[utilities_1.ConfigKey.DatabaseUrl];
+    dotenv.config({ path: env });
+    const initialDatabaseUrl = databaseUrl ?? process.env[ConfigKey.DatabaseUrl];
     if (initialDatabaseUrl) {
-        utilities_1.cliConfig.set(utilities_1.ConfigKey.DatabaseUrl, initialDatabaseUrl);
+        cliConfig.set(ConfigKey.DatabaseUrl, initialDatabaseUrl);
     }
 })
-    .command(install_1.default)
-    .command(database_1.default)
-    .command(connector_1.default)
+    .command(install)
+    .command(database)
+    .command(connector)
     .demandCommand(1)
-    .showHelpOnFail(false, `Specify ${chalk_1.default.green('--help')} for available options`)
+    .showHelpOnFail(false, `Specify ${chalk.green('--help')} for available options`)
     .strict()
     .parserConfiguration({
     'dot-notation': false,

package/lib/meta-url.d.ts

@@ -0,0 +1 @@
+export declare const metaUrl: string;

package/lib/meta-url.js

@@ -0,0 +1,4 @@
+// Have to define this in a separate file since Jest sticks with CJS
+// We need to mock this before running tests
+// https://github.com/facebook/jest/issues/12952
+export const metaUrl = import.meta.url;

package/lib/package-json.d.ts

@@ -5,6 +5,7 @@ export declare const packageJson: {
     author: string;
     homepage: string;
     license: string;
+    type: string;
     publishConfig: {
         access: string;
     };
@@ -21,11 +22,13 @@ export declare const packageJson: {
         precommit: string;
         "prepare:package-json": string;
         build: string;
+        "build:test": string;
         dev: string;
         start: string;
         "start:dev": string;
         lint: string;
         "lint:report": string;
+        "test:only": string;
         test: string;
         "test:ci": string;
         prepack: string;
@@ -37,18 +40,19 @@ export declare const packageJson: {
         url: string;
     };
     dependencies: {
+        "@logto/core-kit": string;
         "@logto/schemas": string;
         "@logto/shared": string;
         "@silverhand/essentials": string;
         chalk: string;
         decamelize: string;
         dotenv: string;
-        "fs-extra": string;
         got: string;
         hpagent: string;
         inquirer: string;
         nanoid: string;
         ora: string;
+        "p-limit": string;
         "p-retry": string;
         roarr: string;
         semver: string;
@@ -61,13 +65,13 @@ export declare const packageJson: {
     };
     devDependencies: {
         "@silverhand/eslint-config": string;
-        "@silverhand/jest-config": string;
         "@silverhand/ts-config": string;
         "@types/fs-extra": string;
         "@types/inquirer": string;
         "@types/jest": string;
         "@types/node": string;
         "@types/semver": string;
+        "@types/sinon": string;
         "@types/tar": string;
         "@types/yargs": string;
         eslint: string;
@@ -75,7 +79,7 @@ export declare const packageJson: {
         "lint-staged": string;
         prettier: string;
         rimraf: string;
-        "ts-node": string;
+        sinon: string;
         typescript: string;
     };
     eslintConfig: {

package/lib/package-json.js

@@ -1,19 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageJson = void 0;
-exports.packageJson = {
+export const packageJson = {
     "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,13 +25,15 @@ exports.packageJson = {
         "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",
         "prepack": "pnpm build"
     },
     "engines": {
@@ -43,46 +43,47 @@ exports.packageJson = {
         "url": "https://github.com/logto-io/logto/issues"
     },
     "dependencies": {
-        "@logto/schemas": "workspace:^",
-        "@logto/shared": "workspace:^",
-        "@silverhand/essentials": "^1.3.0",
-        "chalk": "^4.1.2",
-        "decamelize": "^5.0.0",
+        "@logto/core-kit": "workspace:*",
+        "@logto/schemas": "workspace:*",
+        "@logto/shared": "workspace:*",
+        "@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"
+        "zod": "^3.20.2"
     },
     "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",

package/lib/queries/logto-config.js

@@ -1,35 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDatabaseTimestamp = exports.getCurrentDatabaseAlterationTimestamp = exports.updateValueByKey = exports.getRowsByKeys = exports.doesConfigsTableExist = void 0;
-const schemas_1 = require("@logto/schemas");
-const shared_1 = require("@logto/shared");
-const slonik_1 = require("slonik");
-const zod_1 = require("zod");
-const { table, fields } = (0, shared_1.convertToIdentifiers)(schemas_1.LogtoConfigs);
-const doesConfigsTableExist = async (pool) => {
-    const { rows } = await pool.query((0, slonik_1.sql) `select to_regclass(${schemas_1.LogtoConfigs.table}) as regclass`);
+import { logtoConfigGuards, LogtoConfigs, AlterationStateKey } from '@logto/schemas';
+import { convertToIdentifiers } from '@logto/shared';
+import { sql } from 'slonik';
+import { z } from 'zod';
+const { table, fields } = convertToIdentifiers(LogtoConfigs);
+export const doesConfigsTableExist = async (pool) => {
+    const { rows } = await pool.query(sql `select to_regclass(${LogtoConfigs.table}) as regclass`);
     return Boolean(rows[0]?.regclass);
 };
-exports.doesConfigsTableExist = doesConfigsTableExist;
-const getRowsByKeys = async (pool, keys) => pool.query((0, slonik_1.sql) `
-    select ${slonik_1.sql.join([fields.key, fields.value], (0, slonik_1.sql) `,`)} from ${table}
-      where ${fields.key} in (${slonik_1.sql.join(keys, (0, slonik_1.sql) `,`)})
+export const getRowsByKeys = async (pool, keys) => pool.query(sql `
+    select ${sql.join([fields.key, fields.value], sql `,`)} from ${table}
+      where ${fields.key} in (${sql.join(keys, sql `,`)})
   `);
-exports.getRowsByKeys = getRowsByKeys;
-const updateValueByKey = async (pool, key, value) => pool.query((0, slonik_1.sql) `
+export const updateValueByKey = async (pool, key, value) => pool.query(sql `
       insert into ${table} (${fields.key}, ${fields.value}) 
-        values (${key}, ${slonik_1.sql.jsonb(value)})
+        values (${key}, ${sql.jsonb(value)})
         on conflict (${fields.key}) do update set ${fields.value}=excluded.${fields.value}
     `);
-exports.updateValueByKey = updateValueByKey;
-const getCurrentDatabaseAlterationTimestamp = async (pool) => {
+export const getCurrentDatabaseAlterationTimestamp = async (pool) => {
     try {
-        const result = await pool.maybeOne((0, slonik_1.sql) `select * from ${table} where ${fields.key}=${schemas_1.AlterationStateKey.AlterationState}`);
-        const parsed = schemas_1.logtoConfigGuards[schemas_1.AlterationStateKey.AlterationState].safeParse(result?.value);
+        const result = await pool.maybeOne(sql `select * from ${table} where ${fields.key}=${AlterationStateKey.AlterationState}`);
+        const parsed = logtoConfigGuards[AlterationStateKey.AlterationState].safeParse(result?.value);
         return (parsed.success && parsed.data.timestamp) || 0;
     }
     catch (error) {
-        const result = zod_1.z.object({ code: zod_1.z.string() }).safeParse(error);
+        const result = z.object({ code: z.string() }).safeParse(error);
         // Relation does not exist, treat as 0
         // https://www.postgresql.org/docs/14/errcodes-appendix.html
         if (result.success && result.data.code === '42P01') {
@@ -38,12 +32,10 @@ const getCurrentDatabaseAlterationTimestamp = async (pool) => {
         throw error;
     }
 };
-exports.getCurrentDatabaseAlterationTimestamp = getCurrentDatabaseAlterationTimestamp;
-const updateDatabaseTimestamp = async (connection, timestamp) => {
+export const updateDatabaseTimestamp = async (connection, timestamp) => {
     const value = {
         timestamp,
         updatedAt: new Date().toISOString(),
     };
-    return (0, exports.updateValueByKey)(connection, schemas_1.AlterationStateKey.AlterationState, value);
+    return updateValueByKey(connection, AlterationStateKey.AlterationState, value);
 };
-exports.updateDatabaseTimestamp = updateDatabaseTimestamp;

package/lib/queries/logto-config.test.js

@@ -1,60 +1,59 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const schemas_1 = require("@logto/schemas");
-const shared_1 = require("@logto/shared");
-const slonik_1 = require("slonik");
-const test_utilities_1 = require("../test-utilities");
-const logto_config_1 = require("./logto-config");
+import { AlterationStateKey, LogtoConfigs } from '@logto/schemas';
+import { convertToIdentifiers } from '@logto/shared';
+import { createMockPool, createMockQueryResult, sql } from 'slonik';
+import { expectSqlAssert } from '../test-utilities.js';
+import { updateDatabaseTimestamp, getCurrentDatabaseAlterationTimestamp } from './logto-config.js';
+const { jest } = import.meta;
 const mockQuery = jest.fn();
-const pool = (0, slonik_1.createMockPool)({
+const pool = createMockPool({
     query: async (sql, values) => {
         return mockQuery(sql, values);
     },
 });
-const { table, fields } = (0, shared_1.convertToIdentifiers)(schemas_1.LogtoConfigs);
+const { table, fields } = convertToIdentifiers(LogtoConfigs);
 const timestamp = 1663923776;
 describe('getCurrentDatabaseAlterationTimestamp()', () => {
     it('returns 0 if query failed (table not found)', async () => {
         mockQuery.mockRejectedValueOnce({ code: '42P01' });
-        await expect((0, logto_config_1.getCurrentDatabaseAlterationTimestamp)(pool)).resolves.toBe(0);
+        await expect(getCurrentDatabaseAlterationTimestamp(pool)).resolves.toBe(0);
     });
     it('returns 0 if the row is not found', async () => {
-        const expectSql = (0, slonik_1.sql) `
+        const expectSql = sql `
       select * from ${table} where ${fields.key}=$1
     `;
         mockQuery.mockImplementationOnce(async (sql, values) => {
-            (0, test_utilities_1.expectSqlAssert)(sql, expectSql.sql);
-            expect(values).toEqual([schemas_1.AlterationStateKey.AlterationState]);
-            return (0, slonik_1.createMockQueryResult)([]);
+            expectSqlAssert(sql, expectSql.sql);
+            expect(values).toEqual([AlterationStateKey.AlterationState]);
+            return createMockQueryResult([]);
         });
-        await expect((0, logto_config_1.getCurrentDatabaseAlterationTimestamp)(pool)).resolves.toBe(0);
+        await expect(getCurrentDatabaseAlterationTimestamp(pool)).resolves.toBe(0);
     });
     it('returns 0 if the value is in bad format', async () => {
-        const expectSql = (0, slonik_1.sql) `
+        const expectSql = sql `
       select * from ${table} where ${fields.key}=$1
     `;
         mockQuery.mockImplementationOnce(async (sql, values) => {
-            (0, test_utilities_1.expectSqlAssert)(sql, expectSql.sql);
-            expect(values).toEqual([schemas_1.AlterationStateKey.AlterationState]);
-            return (0, slonik_1.createMockQueryResult)([{ value: 'some_value' }]);
+            expectSqlAssert(sql, expectSql.sql);
+            expect(values).toEqual([AlterationStateKey.AlterationState]);
+            return createMockQueryResult([{ value: 'some_value' }]);
         });
-        await expect((0, logto_config_1.getCurrentDatabaseAlterationTimestamp)(pool)).resolves.toBe(0);
+        await expect(getCurrentDatabaseAlterationTimestamp(pool)).resolves.toBe(0);
     });
     it('returns the timestamp from database', async () => {
-        const expectSql = (0, slonik_1.sql) `
+        const expectSql = sql `
       select * from ${table} where ${fields.key}=$1
     `;
         mockQuery.mockImplementationOnce(async (sql, values) => {
-            (0, test_utilities_1.expectSqlAssert)(sql, expectSql.sql);
-            expect(values).toEqual([schemas_1.AlterationStateKey.AlterationState]);
+            expectSqlAssert(sql, expectSql.sql);
+            expect(values).toEqual([AlterationStateKey.AlterationState]);
             // @ts-expect-error createMockQueryResult doesn't support jsonb
-            return (0, slonik_1.createMockQueryResult)([{ value: { timestamp, updatedAt: 'now' } }]);
+            return createMockQueryResult([{ value: { timestamp, updatedAt: 'now' } }]);
         });
-        await expect((0, logto_config_1.getCurrentDatabaseAlterationTimestamp)(pool)).resolves.toEqual(timestamp);
+        await expect(getCurrentDatabaseAlterationTimestamp(pool)).resolves.toEqual(timestamp);
     });
 });
 describe('updateDatabaseTimestamp()', () => {
-    const expectSql = (0, slonik_1.sql) `
+    const expectSql = sql `
     insert into ${table} (${fields.key}, ${fields.value}) 
       values ($1, $2::jsonb)
       on conflict (${fields.key}) do update set ${fields.value}=excluded.${fields.value}
@@ -69,13 +68,13 @@ describe('updateDatabaseTimestamp()', () => {
     });
     it('sends upsert sql with timestamp and updatedAt', async () => {
         mockQuery.mockImplementationOnce(async (sql, values) => {
-            (0, test_utilities_1.expectSqlAssert)(sql, expectSql.sql);
+            expectSqlAssert(sql, expectSql.sql);
             expect(values).toEqual([
-                schemas_1.AlterationStateKey.AlterationState,
+                AlterationStateKey.AlterationState,
                 JSON.stringify({ timestamp, updatedAt }),
             ]);
-            return (0, slonik_1.createMockQueryResult)([]);
+            return createMockQueryResult([]);
         });
-        await (0, logto_config_1.updateDatabaseTimestamp)(pool, timestamp);
+        await updateDatabaseTimestamp(pool, timestamp);
     });
 });

package/lib/test-utilities.d.ts

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

package/lib/test-utilities.js

@@ -1,11 +1,8 @@
-"use strict";
 // Copied from core
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectSqlAssert = void 0;
 /**
  *  Slonik Query Mock Utils
  **/
-const expectSqlAssert = (sql, expectSql) => {
+export const expectSqlAssert = (sql, expectSql) => {
     expect(sql
         .split('\n')
         .map((row) => row.trim())
@@ -14,4 +11,3 @@ const expectSqlAssert = (sql, expectSql) => {
         .map((row) => row.trim())
         .filter(Boolean));
 };
-exports.expectSqlAssert = expectSqlAssert;

package/lib/utilities.d.ts

@@ -1,7 +1,7 @@
 import type { Optional } from '@silverhand/essentials';
-import ora from 'ora';
+import type { Options } from 'ora';
 export declare const safeExecSync: (command: string) => string | undefined;
-declare type Log = Readonly<{
+type Log = Readonly<{
     info: typeof console.log;
     succeed: typeof console.log;
     warn: typeof console.log;
@@ -10,13 +10,13 @@ declare type Log = Readonly<{
 export declare const log: Log;
 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?: ora.Options, exitOnError?: boolean) => Promise<T>;
+export declare const oraPromise: <T>(promise: PromiseLike<T>, options?: Options, exitOnError?: boolean) => Promise<T>;
 export declare const isTty: () => boolean;
 export declare enum ConfigKey {
     DatabaseUrl = "DB_URL"
 }
 export declare const cliConfig: Map<ConfigKey, Optional<string>>;
-export declare type GetCliConfigWithPrompt = {
+export type GetCliConfigWithPrompt = {
     key: ConfigKey;
     readableKey: string;
     comments?: string;
@@ -32,7 +32,7 @@ export declare const getCliConfigWithPrompt: ({ key, readableKey, comments, defa
  * findLastIndex immediately returns that element index. Otherwise, findLastIndex returns -1.
  */
 export declare function findLastIndex<T>(array: readonly T[], predicate: (value: T, index: number, object: readonly T[]) => boolean): number;
-export declare type ConnectorPackage = {
+export type ConnectorPackage = {
     name: string;
     path: string;
 };