@logto/cli 1.0.0-beta.19 → 1.0.0-rc.1

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

@@ -2,7 +2,7 @@ import type { DatabasePool } from 'slonik';
 import type { CommandModule } from 'yargs';
 import type { AlterationFile } from './type.js';
 export declare const getLatestAlterationTimestamp: () => Promise<number>;
-export declare const getUndeployedAlterations: (pool: DatabasePool) => Promise<AlterationFile[]>;
+export declare const getAvailableAlterations: (pool: DatabasePool, compareMode?: 'gt' | 'lte') => Promise<AlterationFile[]>;
 declare const alteration: CommandModule<unknown, {
     action: string;
     target?: string;

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

@@ -1,10 +1,10 @@
 import { conditionalString } from '@silverhand/essentials';
 import chalk from 'chalk';
 import { createPoolFromConfig } from '../../../database.js';
-import { getCurrentDatabaseAlterationTimestamp, updateDatabaseTimestamp, } from '../../../queries/logto-config.js';
+import { getCurrentDatabaseAlterationTimestamp, updateDatabaseTimestamp, } from '../../../queries/system.js';
 import { log } from '../../../utilities.js';
 import { getAlterationFiles, getTimestampFromFilename } from './utils.js';
-import { chooseAlterationsByVersion } from './version.js';
+import { chooseAlterationsByVersion, chooseRevertAlterationsByVersion } from './version.js';
 const importAlterationScript = async (filePath) => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const module = await import(filePath);
@@ -19,17 +19,28 @@ export const getLatestAlterationTimestamp = async () => {
     }
     return getTimestampFromFilename(lastFile.filename);
 };
-export const getUndeployedAlterations = async (pool) => {
+export const getAvailableAlterations = async (pool, compareMode = 'gt') => {
     const databaseTimestamp = await getCurrentDatabaseAlterationTimestamp(pool);
     const files = await getAlterationFiles();
-    return files.filter(({ filename }) => getTimestampFromFilename(filename) > databaseTimestamp);
+    return files.filter(({ filename }) => compareMode === 'gt'
+        ? getTimestampFromFilename(filename) > databaseTimestamp
+        : getTimestampFromFilename(filename) <= databaseTimestamp);
 };
-const deployAlteration = async (pool, { path: filePath, filename }) => {
-    const { up } = await importAlterationScript(filePath);
+const deployAlteration = async (pool, { path: filePath, filename }, action = 'up') => {
+    const { up, down } = await importAlterationScript(filePath);
     try {
         await pool.transaction(async (connection) => {
-            await up(connection);
-            await updateDatabaseTimestamp(connection, getTimestampFromFilename(filename));
+            if (action === 'up') {
+                await up(connection);
+                await updateDatabaseTimestamp(connection, getTimestampFromFilename(filename));
+            }
+            if (action === 'down') {
+                await down(connection);
+                const newTimestamp = getTimestampFromFilename(filename) - 1;
+                if (newTimestamp > 0) {
+                    await updateDatabaseTimestamp(connection, newTimestamp);
+                }
+            }
         });
     }
     catch (error) {
@@ -39,14 +50,14 @@ const deployAlteration = async (pool, { path: filePath, filename }) => {
             "  This alteration didn't change anything since it was in a transaction.\n" +
             '  Try to fix the error and deploy again.');
     }
-    log.info(`Run alteration ${filename} succeeded`);
+    log.info(`Run alteration ${filename} \`${action}()\` function succeeded`);
 };
 const alteration = {
     command: ['alteration <action> [target]', 'alt', 'alter'],
     describe: 'Perform database alteration',
     builder: (yargs) => yargs
         .positional('action', {
-        describe: 'The action to perform, now it only accepts `deploy` and `list`',
+        describe: 'The action to perform, accepts `list`, `deploy`, and `rollback` (or `r`).',
         type: 'string',
         demandOption: true,
     })
@@ -63,7 +74,7 @@ const alteration = {
         }
         else if (action === 'deploy') {
             const pool = await createPoolFromConfig();
-            const alterations = await chooseAlterationsByVersion(await getUndeployedAlterations(pool), target);
+            const alterations = await chooseAlterationsByVersion(await getAvailableAlterations(pool), target);
             log.info(`Found ${alterations.length} alteration${conditionalString(alterations.length > 1 && 's')} to deploy`);
             // The await inside the loop is intended, alterations should run in order
             for (const alteration of alterations) {
@@ -72,6 +83,18 @@ const alteration = {
             }
             await pool.end();
         }
+        else if (['rollback', 'r'].includes(action)) {
+            const pool = await createPoolFromConfig();
+            const alterations = await chooseRevertAlterationsByVersion(await getAvailableAlterations(pool, 'lte'), target ?? '');
+            log.info(`Found ${alterations.length} alteration${conditionalString(alterations.length > 1 && 's')} to revert`);
+            // The await inside the loop is intended, alterations should run in order
+            // eslint-disable-next-line @silverhand/fp/no-mutating-methods
+            for (const alteration of alterations.slice().reverse()) {
+                // eslint-disable-next-line no-await-in-loop
+                await deployAlteration(pool, alteration, 'down');
+            }
+            await pool.end();
+        }
         else {
             log.error('Unsupported action');
         }

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

@@ -15,18 +15,18 @@ const files = Object.freeze([
 await mockEsmWithActual('./utils.js', () => ({
     getAlterationFiles: async () => files,
 }));
-const { getCurrentDatabaseAlterationTimestamp } = await mockEsmWithActual('../../../queries/logto-config.js', () => ({
+const { getCurrentDatabaseAlterationTimestamp } = await mockEsmWithActual('../../../queries/system.js', () => ({
     getCurrentDatabaseAlterationTimestamp: jest.fn(),
 }));
-const { getUndeployedAlterations } = await import('./index.js');
-describe('getUndeployedAlterations()', () => {
+const { getAvailableAlterations } = await import('./index.js');
+describe('getAvailableAlterations()', () => {
     it('returns all files if database timestamp is 0', async () => {
         getCurrentDatabaseAlterationTimestamp.mockResolvedValue(0);
-        await expect(getUndeployedAlterations(pool)).resolves.toEqual(files);
+        await expect(getAvailableAlterations(pool)).resolves.toEqual(files);
     });
     it('returns files whose timestamp is greater then database timestamp', async () => {
         getCurrentDatabaseAlterationTimestamp.mockResolvedValue(1663923770);
-        await expect(getUndeployedAlterations(pool)).resolves.toEqual([files[1], files[2]]);
+        await expect(getAvailableAlterations(pool)).resolves.toEqual([files[1], files[2]]);
     });
 });
 describe('chooseAlterationsByVersion()', () => {

package/lib/commands/database/alteration/utils.js

@@ -4,9 +4,8 @@ import { fileURLToPath } from 'node:url';
 import path from 'path';
 import { findPackage } from '@logto/shared';
 import { getPathInModule } from '../../../utilities.js';
-import { metaUrl } from './meta-url.js';
-const currentDirname = path.dirname(fileURLToPath(metaUrl));
-const alterationFilenameRegex = /-(\d+)-?.*\.js$/;
+const currentDirname = path.dirname(fileURLToPath(import.meta.url));
+const alterationFilenameRegex = /-([\d.]+)-?.*\.js$/;
 export const getTimestampFromFilename = (filename) => {
     const match = alterationFilenameRegex.exec(filename);
     if (!match?.[1]) {

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

@@ -1,2 +1,3 @@
 import type { AlterationFile } from './type.js';
 export declare const chooseAlterationsByVersion: (alterations: readonly AlterationFile[], initialVersion?: string) => Promise<AlterationFile[]>;
+export declare const chooseRevertAlterationsByVersion: (alterations: readonly AlterationFile[], version: string) => Promise<AlterationFile[]>;

package/lib/commands/database/alteration/version.js

@@ -3,12 +3,20 @@ import chalk from 'chalk';
 import inquirer from 'inquirer';
 import { SemVer, compare, eq, gt } from 'semver';
 import { findLastIndex, isTty, log } from '../../../utilities.js';
+const getVersionStringFromFilename = (filename) => filename.split('-')[0]?.replaceAll('_', '-') ?? 'unknown';
 const getVersionFromFilename = (filename) => {
     try {
-        return new SemVer(filename.split('-')[0]?.replaceAll('_', '-') ?? 'unknown');
+        return new SemVer(getVersionStringFromFilename(filename));
     }
     catch { }
 };
+const getAlterationVersions = (alterations) => alterations
+    .map(({ filename }) => getVersionFromFilename(filename))
+    .filter((version) => version instanceof SemVer)
+    // Cannot use `Set` to deduplicate since it's a class
+    .filter((version, index, self) => index === self.findIndex((another) => eq(version, another)))
+    .slice()
+    .sort((i, j) => compare(j, i));
 const latestTag = 'latest';
 const nextTag = 'next';
 export const chooseAlterationsByVersion = async (alterations, initialVersion) => {
@@ -20,13 +28,7 @@ export const chooseAlterationsByVersion = async (alterations, initialVersion) =>
         log.info(`Deploy target ${chalk.green(nextTag)}`);
         return alterations.slice(0, endIndex + 1);
     }
-    const versions = alterations
-        .map(({ filename }) => getVersionFromFilename(filename))
-        .filter((version) => version instanceof SemVer)
-        // Cannot use `Set` to deduplicate since it's a class
-        .filter((version, index, self) => index === self.findIndex((another) => eq(version, another)))
-        .slice()
-        .sort((i, j) => compare(j, i));
+    const versions = getAlterationVersions(alterations);
     const initialSemVersion = conditional(initialVersion && initialVersion !== latestTag && new SemVer(initialVersion));
     const firstVersion = versions[0];
     if (!firstVersion) {
@@ -60,3 +62,14 @@ export const chooseAlterationsByVersion = async (alterations, initialVersion) =>
         return version && !gt(version, targetVersion);
     });
 };
+export const chooseRevertAlterationsByVersion = async (alterations, version) => {
+    const semVersion = new SemVer(version);
+    log.info(`Revert target ${chalk.green(semVersion.version)}`);
+    return alterations.filter(({ filename }) => {
+        if (getVersionStringFromFilename(filename) === nextTag) {
+            return true;
+        }
+        const version = getVersionFromFilename(filename);
+        return version && gt(version, semVersion);
+    });
+};

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

@@ -1,18 +1,37 @@
 import { readdir, readFile } from 'fs/promises';
 import path from 'path';
 import { generateStandardId } from '@logto/core-kit';
-import { logtoConfigGuards, LogtoOidcConfigKey, managementResource, defaultSignInExperience, createDefaultSetting, createDemoAppApplication, defaultRole, } from '@logto/schemas';
-import { Hooks } from '@logto/schemas/models';
+import { logtoConfigGuards, LogtoOidcConfigKey, managementResource, defaultSignInExperience, createDefaultAdminConsoleConfig, createDemoAppApplication, defaultRole, managementResourceScope, defaultRoleScopeRelation, defaultTenant, } from '@logto/schemas';
+import { Hooks, Tenants } from '@logto/schemas/models';
 import chalk from 'chalk';
 import { sql } from 'slonik';
 import { raw } from 'slonik-sql-tag-raw';
 import { z } from 'zod';
 import { createPoolAndDatabaseIfNeeded, insertInto } from '../../../database.js';
-import { getRowsByKeys, doesConfigsTableExist, updateDatabaseTimestamp, updateValueByKey, } from '../../../queries/logto-config.js';
+import { getRowsByKeys, doesConfigsTableExist, updateValueByKey, } from '../../../queries/logto-config.js';
+import { updateDatabaseTimestamp } from '../../../queries/system.js';
 import { getPathInModule, log, oraPromise } from '../../../utilities.js';
 import { getLatestAlterationTimestamp } from '../alteration/index.js';
 import { getAlterationDirectory } from '../alteration/utils.js';
 import { oidcConfigReaders } from './oidc-config.js';
+const getExplicitOrder = (query) => {
+    const matched = /\/\*\s*init_order\s*=\s*([\d.]+)\s*\*\//.exec(query)?.[1];
+    return matched ? Number(matched) : undefined;
+};
+const compareQuery = ([t1, q1], [t2, q2]) => {
+    const o1 = getExplicitOrder(q1);
+    const o2 = getExplicitOrder(q2);
+    if (o1 === undefined && o2 === undefined) {
+        return t1.localeCompare(t2);
+    }
+    if (o1 === undefined) {
+        return 1;
+    }
+    if (o2 === undefined) {
+        return -1;
+    }
+    return o1 - o2;
+};
 const createTables = async (connection) => {
     const tableDirectory = getPathInModule('@logto/schemas', 'tables');
     const directoryFiles = await readdir(tableDirectory);
@@ -21,23 +40,27 @@ const createTables = async (connection) => {
         file,
         await readFile(path.join(tableDirectory, file), 'utf8'),
     ]));
-    // Await in loop is intended for better error handling
-    for (const [, query] of queries) {
+    const allQueries = [
+        [Hooks.tableName, Hooks.raw],
+        [Tenants.tableName, Tenants.raw],
+        ...queries,
+    ];
+    const sorted = allQueries.slice().sort(compareQuery);
+    for (const [, query] of sorted) {
         // eslint-disable-next-line no-await-in-loop
         await connection.query(sql `${raw(query)}`);
     }
-    for (const table of [Hooks]) {
-        // eslint-disable-next-line no-await-in-loop
-        await connection.query(sql `${raw(table.raw)}`);
-    }
 };
 const seedTables = async (connection, latestTimestamp) => {
+    await connection.query(insertInto(defaultTenant, 'tenants'));
     await Promise.all([
         connection.query(insertInto(managementResource, 'resources')),
-        connection.query(insertInto(createDefaultSetting(), 'settings')),
+        connection.query(insertInto(managementResourceScope, 'scopes')),
+        connection.query(insertInto(createDefaultAdminConsoleConfig(), 'logto_configs')),
         connection.query(insertInto(defaultSignInExperience, 'sign_in_experiences')),
         connection.query(insertInto(createDemoAppApplication(generateStandardId()), 'applications')),
         connection.query(insertInto(defaultRole, 'roles')),
+        connection.query(insertInto(defaultRoleScopeRelation, 'roles_scopes')),
         updateDatabaseTimestamp(connection, latestTimestamp),
     ]);
 };

package/lib/commands/database/seed/oidc-config.js

@@ -1,6 +1,6 @@
 import { readFile } from 'fs/promises';
 import { LogtoOidcConfigKey } from '@logto/schemas';
-import { getEnv, getEnvAsStringArray } from '@silverhand/essentials';
+import { getEnvAsStringArray } from '@silverhand/essentials';
 import { generateOidcCookieKey, generateOidcPrivateKey } from '../utilities.js';
 const isBase64FormatPrivateKey = (key) => !key.includes('-');
 /**
@@ -51,10 +51,4 @@ export const oidcConfigReaders = {
         const keys = getEnvAsStringArray(envKey);
         return { value: keys.length > 0 ? keys : [generateOidcCookieKey()], fromEnv: keys.length > 0 };
     },
-    [LogtoOidcConfigKey.RefreshTokenReuseInterval]: async () => {
-        const envKey = 'OIDC_REFRESH_TOKEN_REUSE_INTERVAL';
-        const raw = Number(getEnv(envKey));
-        const value = Math.max(3, raw || 0);
-        return { value, fromEnv: raw === value };
-    },
 };

package/lib/commands/database/utilities.d.ts

@@ -1,2 +1,2 @@
-export declare const generateOidcPrivateKey: () => Promise<string>;
+export declare const generateOidcPrivateKey: (type?: 'rsa' | 'ec') => Promise<string>;
 export declare const generateOidcCookieKey: () => string;

package/lib/commands/database/utilities.js

@@ -1,18 +1,37 @@
 import { generateKeyPair } from 'crypto';
 import { promisify } from 'util';
 import { nanoid } from 'nanoid';
-export const generateOidcPrivateKey = async () => {
-    const { privateKey } = await promisify(generateKeyPair)('rsa', {
-        modulusLength: 4096,
-        publicKeyEncoding: {
-            type: 'spki',
-            format: 'pem',
-        },
-        privateKeyEncoding: {
-            type: 'pkcs8',
-            format: 'pem',
-        },
-    });
-    return privateKey;
+export const generateOidcPrivateKey = async (type = 'ec') => {
+    if (type === 'rsa') {
+        const { privateKey } = await promisify(generateKeyPair)('rsa', {
+            modulusLength: 4096,
+            publicKeyEncoding: {
+                type: 'spki',
+                format: 'pem',
+            },
+            privateKeyEncoding: {
+                type: 'pkcs8',
+                format: 'pem',
+            },
+        });
+        return privateKey;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (type === 'ec') {
+        const { privateKey } = await promisify(generateKeyPair)('ec', {
+            // https://security.stackexchange.com/questions/78621/which-elliptic-curve-should-i-use
+            namedCurve: 'secp384r1',
+            publicKeyEncoding: {
+                type: 'spki',
+                format: 'pem',
+            },
+            privateKeyEncoding: {
+                type: 'pkcs8',
+                format: 'pem',
+            },
+        });
+        return privateKey;
+    }
+    throw new Error(`Unsupported private key ${String(type)}`);
 };
 export const generateOidcCookieKey = () => nanoid();

package/lib/commands/install/utils.js

@@ -15,7 +15,7 @@ import { seedByPool } from '../database/seed/index.js';
 export const defaultPath = path.join(os.homedir(), 'logto');
 const pgRequired = new semver.SemVer('14.0.0');
 export const validateNodeVersion = () => {
-    const required = [new semver.SemVer('16.13.0'), new semver.SemVer('18.12.0')];
+    const required = [new semver.SemVer('18.12.0')];
     const requiredVersionString = required.map((version) => '^' + version.version).join(' || ');
     const current = new semver.SemVer(execSync('node -v', { encoding: 'utf8', stdio: 'pipe' }));
     if (required.every((version) => version.major !== current.major)) {

package/lib/package-json.d.ts

@@ -66,7 +66,6 @@ export declare const packageJson: {
     devDependencies: {
         "@silverhand/eslint-config": string;
         "@silverhand/ts-config": string;
-        "@types/fs-extra": string;
         "@types/inquirer": string;
         "@types/jest": string;
         "@types/node": string;
@@ -78,12 +77,14 @@ export declare const packageJson: {
         jest: string;
         "lint-staged": string;
         prettier: string;
-        rimraf: string;
         sinon: string;
         typescript: string;
     };
     eslintConfig: {
         extends: string;
+        rules: {
+            complexity: (string | number)[];
+        };
         ignorePatterns: string[];
     };
     prettier: string;

package/lib/package-json.js

@@ -1,6 +1,6 @@
 export const packageJson = {
     "name": "@logto/cli",
-    "version": "1.0.0-beta.19",
+    "version": "1.0.0-rc.1",
     "description": "Logto CLI.",
     "author": "Silverhand Inc. <contact@silverhand.io>",
     "homepage": "https://github.com/logto-io/logto#readme",
@@ -24,8 +24,8 @@ export const packageJson = {
     "scripts": {
         "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",
+        "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",
         "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental",
         "start": "node .",
         "start:dev": "pnpm build && node .",
@@ -37,7 +37,7 @@ export const packageJson = {
         "prepack": "pnpm build"
     },
     "engines": {
-        "node": "^16.13.0 || ^18.12.0"
+        "node": "^18.12.0"
     },
     "bugs": {
         "url": "https://github.com/logto-io/logto/issues"
@@ -52,7 +52,7 @@ export const packageJson = {
         "dotenv": "^16.0.0",
         "got": "^12.5.3",
         "hpagent": "^1.2.0",
-        "inquirer": "^8.2.2",
+        "inquirer": "^9.0.0",
         "nanoid": "^4.0.0",
         "ora": "^6.1.2",
         "p-limit": "^4.0.0",
@@ -69,10 +69,9 @@ export const packageJson = {
     "devDependencies": {
         "@silverhand/eslint-config": "1.3.0",
         "@silverhand/ts-config": "1.2.1",
-        "@types/fs-extra": "^9.0.13",
-        "@types/inquirer": "^8.2.1",
+        "@types/inquirer": "^9.0.0",
         "@types/jest": "^29.1.2",
-        "@types/node": "^16.0.0",
+        "@types/node": "^18.11.18",
         "@types/semver": "^7.3.12",
         "@types/sinon": "^10.0.13",
         "@types/tar": "^6.1.2",
@@ -81,12 +80,17 @@ export const packageJson = {
         "jest": "^29.3.1",
         "lint-staged": "^13.0.0",
         "prettier": "^2.8.1",
-        "rimraf": "^3.0.2",
         "sinon": "^15.0.0",
         "typescript": "^4.9.4"
     },
     "eslintConfig": {
         "extends": "@silverhand",
+        "rules": {
+            "complexity": [
+                "error",
+                11
+            ]
+        },
         "ignorePatterns": [
             "src/package-json.ts"
         ]

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

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

package/lib/queries/logto-config.js

@@ -1,7 +1,6 @@
-import { logtoConfigGuards, LogtoConfigs, AlterationStateKey } from '@logto/schemas';
+import { LogtoConfigs } 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`);
@@ -14,28 +13,6 @@ export const getRowsByKeys = async (pool, keys) => pool.query(sql `
 export const updateValueByKey = async (pool, key, value) => pool.query(sql `
       insert into ${table} (${fields.key}, ${fields.value}) 
         values (${key}, ${sql.jsonb(value)})
-        on conflict (${fields.key}) do update set ${fields.value}=excluded.${fields.value}
+        on conflict (${fields.tenantId}, ${fields.key})
+          do update set ${fields.value}=excluded.${fields.value}
     `);
-export const getCurrentDatabaseAlterationTimestamp = async (pool) => {
-    try {
-        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 = 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') {
-            return 0;
-        }
-        throw error;
-    }
-};
-export const updateDatabaseTimestamp = async (connection, timestamp) => {
-    const value = {
-        timestamp,
-        updatedAt: new Date().toISOString(),
-    };
-    return updateValueByKey(connection, AlterationStateKey.AlterationState, value);
-};

package/lib/queries/system.d.ts

@@ -0,0 +1,4 @@
+import type { CommonQueryMethods, DatabaseTransactionConnection } from 'slonik';
+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>;

package/lib/queries/system.js

@@ -0,0 +1,43 @@
+import { systemGuards, Systems, AlterationStateKey } from '@logto/schemas';
+import { convertToIdentifiers } from '@logto/shared';
+import { sql } from 'slonik';
+import { z } from 'zod';
+const { fields } = convertToIdentifiers(Systems);
+const doesTableExist = async (pool, table) => {
+    const { rows } = await pool.query(sql `select to_regclass(${table}) as regclass`);
+    return Boolean(rows[0]?.regclass);
+};
+export const doesSystemsTableExist = async (pool) => doesTableExist(pool, Systems.table);
+const legacyLogtoConfigsTable = '_logto_configs';
+const getAlterationStateTable = async (pool) => (await doesSystemsTableExist(pool))
+    ? sql.identifier([Systems.table])
+    : sql.identifier([legacyLogtoConfigsTable]); // Fall back to the old config table
+export const getCurrentDatabaseAlterationTimestamp = async (pool) => {
+    const table = await getAlterationStateTable(pool);
+    try {
+        const result = await pool.maybeOne(sql `select * from ${table} where ${fields.key}=${AlterationStateKey.AlterationState}`);
+        const parsed = systemGuards[AlterationStateKey.AlterationState].safeParse(result?.value);
+        return (parsed.success && parsed.data.timestamp) || 0;
+    }
+    catch (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') {
+            return 0;
+        }
+        throw error;
+    }
+};
+export const updateDatabaseTimestamp = async (connection, timestamp) => {
+    const table = await getAlterationStateTable(connection);
+    const value = {
+        timestamp,
+        updatedAt: new Date().toISOString(),
+    };
+    await connection.query(sql `
+      insert into ${table} (${fields.key}, ${fields.value}) 
+        values (${AlterationStateKey.AlterationState}, ${sql.jsonb(value)})
+        on conflict (${fields.key}) do update set ${fields.value}=excluded.${fields.value}
+    `);
+};

package/lib/queries/{logto-config.test.js → system.test.js}

@@ -1,8 +1,8 @@
-import { AlterationStateKey, LogtoConfigs } from '@logto/schemas';
+import { AlterationStateKey, Systems } 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';
+import { updateDatabaseTimestamp, getCurrentDatabaseAlterationTimestamp } from './system.js';
 const { jest } = import.meta;
 const mockQuery = jest.fn();
 const pool = createMockPool({
@@ -10,18 +10,21 @@ const pool = createMockPool({
         return mockQuery(sql, values);
     },
 });
-const { table, fields } = convertToIdentifiers(LogtoConfigs);
+const { table, fields } = convertToIdentifiers(Systems);
 const timestamp = 1663923776;
+const systemsTableExists = async () => createMockQueryResult([{ regclass: true }]);
 describe('getCurrentDatabaseAlterationTimestamp()', () => {
     it('returns 0 if query failed (table not found)', async () => {
-        mockQuery.mockRejectedValueOnce({ code: '42P01' });
+        mockQuery.mockImplementationOnce(systemsTableExists).mockRejectedValueOnce({ code: '42P01' });
         await expect(getCurrentDatabaseAlterationTimestamp(pool)).resolves.toBe(0);
     });
     it('returns 0 if the row is not found', async () => {
         const expectSql = sql `
       select * from ${table} where ${fields.key}=$1
     `;
-        mockQuery.mockImplementationOnce(async (sql, values) => {
+        mockQuery
+            .mockImplementationOnce(systemsTableExists)
+            .mockImplementationOnce(async (sql, values) => {
             expectSqlAssert(sql, expectSql.sql);
             expect(values).toEqual([AlterationStateKey.AlterationState]);
             return createMockQueryResult([]);
@@ -32,7 +35,9 @@ describe('getCurrentDatabaseAlterationTimestamp()', () => {
         const expectSql = sql `
       select * from ${table} where ${fields.key}=$1
     `;
-        mockQuery.mockImplementationOnce(async (sql, values) => {
+        mockQuery
+            .mockImplementationOnce(systemsTableExists)
+            .mockImplementationOnce(async (sql, values) => {
             expectSqlAssert(sql, expectSql.sql);
             expect(values).toEqual([AlterationStateKey.AlterationState]);
             return createMockQueryResult([{ value: 'some_value' }]);
@@ -43,7 +48,9 @@ describe('getCurrentDatabaseAlterationTimestamp()', () => {
         const expectSql = sql `
       select * from ${table} where ${fields.key}=$1
     `;
-        mockQuery.mockImplementationOnce(async (sql, values) => {
+        mockQuery
+            .mockImplementationOnce(systemsTableExists)
+            .mockImplementationOnce(async (sql, values) => {
             expectSqlAssert(sql, expectSql.sql);
             expect(values).toEqual([AlterationStateKey.AlterationState]);
             // @ts-expect-error createMockQueryResult doesn't support jsonb
@@ -67,7 +74,9 @@ describe('updateDatabaseTimestamp()', () => {
         jest.useRealTimers();
     });
     it('sends upsert sql with timestamp and updatedAt', async () => {
-        mockQuery.mockImplementationOnce(async (sql, values) => {
+        mockQuery
+            .mockImplementationOnce(systemsTableExists)
+            .mockImplementationOnce(async (sql, values) => {
             expectSqlAssert(sql, expectSql.sql);
             expect(values).toEqual([
                 AlterationStateKey.AlterationState,

package/lib/utilities.js

@@ -10,7 +10,6 @@ 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 execSync(command, { encoding: 'utf8', stdio: 'pipe' });
@@ -66,7 +65,7 @@ export const downloadFile = async (url, destination) => {
 };
 export const getPathInModule = (moduleName, relativePath = '/') => 
 // https://stackoverflow.com/a/49455609/12514940
-path.join(path.dirname(createRequire(metaUrl).resolve(`${moduleName}/package.json`)), relativePath);
+path.join(path.dirname(createRequire(import.meta.url).resolve(`${moduleName}/package.json`)), relativePath);
 export const oraPromise = async (promise, options, exitOnError = false) => {
     const spinner = ora(options).start();
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/cli",
-  "version": "1.0.0-beta.19",
+  "version": "1.0.0-rc.1",
   "description": "Logto CLI.",
   "author": "Silverhand Inc. <contact@silverhand.io>",
   "homepage": "https://github.com/logto-io/logto#readme",
@@ -22,7 +22,7 @@
     "url": "git+https://github.com/logto-io/logto.git"
   },
   "engines": {
-    "node": "^16.13.0 || ^18.12.0"
+    "node": "^18.12.0"
   },
   "bugs": {
     "url": "https://github.com/logto-io/logto/issues"
@@ -34,7 +34,7 @@
     "dotenv": "^16.0.0",
     "got": "^12.5.3",
     "hpagent": "^1.2.0",
-    "inquirer": "^8.2.2",
+    "inquirer": "^9.0.0",
     "nanoid": "^4.0.0",
     "ora": "^6.1.2",
     "p-limit": "^4.0.0",
@@ -47,17 +47,16 @@
     "tar": "^6.1.11",
     "yargs": "^17.6.0",
     "zod": "^3.20.2",
-    "@logto/core-kit": "1.0.0-beta.30",
-    "@logto/schemas": "1.0.0-beta.18",
-    "@logto/shared": "1.0.0-beta.18"
+    "@logto/core-kit": "1.0.0-rc.0",
+    "@logto/schemas": "1.0.0-rc.0",
+    "@logto/shared": "1.0.0-rc.0"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "1.3.0",
     "@silverhand/ts-config": "1.2.1",
-    "@types/fs-extra": "^9.0.13",
-    "@types/inquirer": "^8.2.1",
+    "@types/inquirer": "^9.0.0",
     "@types/jest": "^29.1.2",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.11.18",
     "@types/semver": "^7.3.12",
     "@types/sinon": "^10.0.13",
     "@types/tar": "^6.1.2",
@@ -66,12 +65,17 @@
     "jest": "^29.3.1",
     "lint-staged": "^13.0.0",
     "prettier": "^2.8.1",
-    "rimraf": "^3.0.2",
     "sinon": "^15.0.0",
     "typescript": "^4.9.4"
   },
   "eslintConfig": {
     "extends": "@silverhand",
+    "rules": {
+      "complexity": [
+        "error",
+        11
+      ]
+    },
     "ignorePatterns": [
       "src/package-json.ts"
     ]
@@ -80,8 +84,8 @@
   "scripts": {
     "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",
+    "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",
     "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput --incremental",
     "start": "node .",
     "start:dev": "pnpm build && node .",

package/lib/commands/database/alteration/meta-url.d.ts

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

package/lib/commands/database/alteration/meta-url.js

@@ -1,4 +0,0 @@
-// 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/meta-url.d.ts

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

package/lib/meta-url.js

@@ -1,4 +0,0 @@
-// 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;