Infrastructure/logto
0
Fork 0
mirror of https://github.com/logto-io/logto.git synced 2025-03-17 22:31:28 -05:00
Code Issues Activity

refactor: use esm (batch 2)

Browse source
This commit is contained in:
Gao Sun 2022-11-21 11:32:32 +08:00
parent a7dbeb9c77
commit 10e818e828
No known key found for this signature in database
GPG key ID: 13EBE123E4773688
19 changed files with 53 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/bin/logto
View file

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

4
packages/cli/src/commands/connector/add.ts
View file

@ -1,7 +1,7 @@
import type { CommandModule } from 'yargs';
import { log } from '../../utilities';
import { addConnectors, addOfficialConnectors, inquireInstancePath } from './utils';
import { log } from '../../utilities.js';
import { addConnectors, addOfficialConnectors, inquireInstancePath } from './utils.js';
const add: CommandModule<
{ path?: string },

6
packages/cli/src/commands/connector/index.ts
View file

@ -1,9 +1,9 @@
import { noop } from '@silverhand/essentials';
import type { CommandModule } from 'yargs';
import add from './add';
import list from './list';
import remove from './remove';
import add from './add.js';
import list from './list.js';
import remove from './remove.js';
const connector: CommandModule = {
command: ['connector', 'c', 'connectors'],

2
packages/cli/src/commands/connector/list.ts
View file

@ -1,7 +1,7 @@
import chalk from 'chalk';
import type { CommandModule } from 'yargs';
import { getConnectorPackagesFrom, isOfficialConnector } from './utils';
import { getConnectorPackagesFrom, isOfficialConnector } from './utils.js';
const logConnectorNames = (type: string, names: string[]) => {
if (names.length === 0) {

4
packages/cli/src/commands/connector/remove.ts
View file

@ -2,8 +2,8 @@ import chalk from 'chalk';
import fsExtra from 'fs-extra';
import type { CommandModule } from 'yargs';
import { log } from '../../utilities';
import { getConnectorPackagesFrom } from './utils';
import { log } from '../../utilities.js';
import { getConnectorPackagesFrom } from './utils.js';
const remove: CommandModule<{ path?: string }, { path?: string; packages?: string[] }> = {
command: ['remove [packages...]', 'rm', 'delete'],

6
packages/cli/src/commands/connector/utils.ts
View file

@ -12,9 +12,9 @@ import pRetry from 'p-retry';
import tar from 'tar';
import { z } from 'zod';
import { connectorDirectory } from '../../constants';
import { getConnectorPackagesFromDirectory, isTty, log, oraPromise } from '../../utilities';
import { defaultPath } from '../install/utils';
import { connectorDirectory } from '../../constants.js';
import { getConnectorPackagesFromDirectory, isTty, log, oraPromise } from '../../utilities.js';
import { defaultPath } from '../install/utils.js';
const coreDirectory = 'packages/core';
const execPromise = promisify(exec);

8
packages/cli/src/commands/database/alteration/index.test.ts
View file

@ -1,9 +1,9 @@
import { createMockPool } from 'slonik';
import * as functions from '.';
import * as queries from '../../../queries/logto-config';
import type { QueryType } from '../../../test-utilities';
import { chooseAlterationsByVersion } from './version';
import * as queries from '../../../queries/logto-config.js';
import type { QueryType } from '../../../test-utilities.js';
import * as functions from './index.js';
import { chooseAlterationsByVersion } from './version.js';
const mockQuery: jest.MockedFunction<QueryType> = jest.fn();

10
packages/cli/src/commands/database/alteration/index.ts
View file

@ -8,14 +8,14 @@ import { copy, existsSync, remove, readdir } from 'fs-extra';
import type { DatabasePool } from 'slonik';
import type { CommandModule } from 'yargs';
import { createPoolFromConfig } from '../../../database';
import { createPoolFromConfig } from '../../../database.js';
import {
getCurrentDatabaseAlterationTimestamp,
updateDatabaseTimestamp,
} from '../../../queries/logto-config';
import { getPathInModule, log } from '../../../utilities';
import type { AlterationFile } from './type';
import { chooseAlterationsByVersion } from './version';
} from '../../../queries/logto-config.js';
import { getPathInModule, log } from '../../../utilities.js';
import type { AlterationFile } from './type.js';
import { chooseAlterationsByVersion } from './version.js';
const alterationFilenameRegex = /-(\d+)-?.*\.js$/;

4
packages/cli/src/commands/database/alteration/version.ts
View file

@ -3,8 +3,8 @@ import chalk from 'chalk';
import inquirer from 'inquirer';
import { SemVer, compare, eq, gt } from 'semver';
import { findLastIndex, isTty, log } from '../../../utilities';
import type { AlterationFile } from './type';
import { findLastIndex, isTty, log } from '../../../utilities.js';
import type { AlterationFile } from './type.js';
const getVersionFromFilename = (filename: string) => {
try {

8
packages/cli/src/commands/database/config.ts
View file

@ -4,10 +4,10 @@ import { deduplicate, noop } from '@silverhand/essentials';
import chalk from 'chalk';
import type { CommandModule } from 'yargs';
import { createPoolFromConfig } from '../../database';
import { getRowsByKeys, updateValueByKey } from '../../queries/logto-config';
import { log } from '../../utilities';
import { generateOidcCookieKey, generateOidcPrivateKey } from './utilities';
import { createPoolFromConfig } from '../../database.js';
import { getRowsByKeys, updateValueByKey } from '../../queries/logto-config.js';
import { log } from '../../utilities.js';
import { generateOidcCookieKey, generateOidcPrivateKey } from './utilities.js';
const validKeysDisplay = chalk.green(logtoConfigKeys.join(', '));

6
packages/cli/src/commands/database/index.ts
View file

@ -1,9 +1,9 @@
import { noop } from '@silverhand/essentials';
import type { CommandModule } from 'yargs';
import alteration from './alteration';
import config from './config';
import seed from './seed';
import alteration from './alteration/index.js';
import config from './config.js';
import seed from './seed/index.js';
const database: CommandModule = {
command: ['database', 'db'],

10
packages/cli/src/commands/database/seed/index.ts
View file

@ -10,16 +10,16 @@ import { raw } from 'slonik-sql-tag-raw';
import type { CommandModule } from 'yargs';
import { z } from 'zod';
import { createPoolAndDatabaseIfNeeded, insertInto } from '../../../database';
import { createPoolAndDatabaseIfNeeded, insertInto } from '../../../database.js';
import {
getRowsByKeys,
doesConfigsTableExist,
updateDatabaseTimestamp,
updateValueByKey,
} from '../../../queries/logto-config';
import { getPathInModule, log, oraPromise } from '../../../utilities';
import { getLatestAlterationTimestamp } from '../alteration';
import { oidcConfigReaders } from './oidc-config';
} from '../../../queries/logto-config.js';
import { getPathInModule, log, oraPromise } from '../../../utilities.js';
import { getLatestAlterationTimestamp } from '../alteration/index.js';
import { oidcConfigReaders } from './oidc-config.js';
const createTables = async (connection: DatabaseTransactionConnection) => {
const tableDirectory = getPathInModule('@logto/schemas', 'tables');

2
packages/cli/src/commands/database/seed/oidc-config.ts
View file

@ -4,7 +4,7 @@ import type { LogtoOidcConfigType } from '@logto/schemas';
import { LogtoOidcConfigKey } from '@logto/schemas';
import { getEnv, getEnvAsStringArray } from '@silverhand/essentials';
import { generateOidcCookieKey, generateOidcPrivateKey } from '../utilities';
import { generateOidcCookieKey, generateOidcPrivateKey } from '../utilities.js';
const isBase64FormatPrivateKey = (key: string) => !key.includes('-');

8
packages/cli/src/commands/install/index.ts
View file

@ -1,9 +1,9 @@
import chalk from 'chalk';
import type { CommandModule } from 'yargs';
import { getDatabaseUrlFromConfig } from '../../database';
import { log } from '../../utilities';
import { addOfficialConnectors } from '../connector/utils';
import { getDatabaseUrlFromConfig } from '../../database.js';
import { log } from '../../utilities.js';
import { addOfficialConnectors } from '../connector/utils.js';
import {
validateNodeVersion,
inquireInstancePath,
@ -15,7 +15,7 @@ import {
decompress,
inquireOfficialConnectors,
isUrl,
} from './utils';
} from './utils.js';
export type InstallArgs = {
path?: string;

6
packages/cli/src/commands/install/utils.ts
View file

@ -11,7 +11,7 @@ import inquirer from 'inquirer';
import * as semver from 'semver';
import tar from 'tar';
import { createPoolAndDatabaseIfNeeded } from '../../database';
import { createPoolAndDatabaseIfNeeded } from '../../database.js';
import {
cliConfig,
ConfigKey,
@ -20,8 +20,8 @@ import {
log,
oraPromise,
safeExecSync,
} from '../../utilities';
import { seedByPool } from '../database/seed';
} from '../../utilities.js';
import { seedByPool } from '../database/seed/index.js';
export const defaultPath = path.join(os.homedir(), 'logto');
const pgRequired = new semver.SemVer('14.0.0');

2
packages/cli/src/database.ts
View file

@ -6,7 +6,7 @@ import { createPool, parseDsn, sql, stringifyDsn } from 'slonik';
import { createInterceptors } from 'slonik-interceptor-preset';
import { z } from 'zod';
import { ConfigKey, getCliConfigWithPrompt, log } from './utilities';
import { ConfigKey, getCliConfigWithPrompt, log } from './utilities.js';
export const defaultDatabaseUrl = 'postgresql://localhost:5432/logto';

10
packages/cli/src/index.ts
View file

@ -3,11 +3,11 @@ import dotenv from 'dotenv';
import yargs from 'yargs';
import { hideBin } from 'yargs/helpers';
import connector from './commands/connector';
import database from './commands/database';
import install from './commands/install';
import { packageJson } from './package-json';
import { cliConfig, ConfigKey } from './utilities';
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)

6
packages/cli/src/queries/logto-config.test.ts
View file

@ -2,9 +2,9 @@ import { AlterationStateKey, LogtoConfigs } from '@logto/schemas';
import { convertToIdentifiers } from '@logto/shared';
import { createMockPool, createMockQueryResult, sql } from 'slonik';
import type { QueryType } from '../test-utilities';
import { expectSqlAssert } from '../test-utilities';
import { updateDatabaseTimestamp, getCurrentDatabaseAlterationTimestamp } from './logto-config';
import type { QueryType } from '../test-utilities.js';
import { expectSqlAssert } from '../test-utilities.js';
import { updateDatabaseTimestamp, getCurrentDatabaseAlterationTimestamp } from './logto-config.js';
const mockQuery: jest.MockedFunction<QueryType> = jest.fn();

1
packages/create/package.json
View file

@ -3,6 +3,7 @@
"version": "1.0.0-beta.14",
"author": "Silverhand Inc. <contact@silverhand.io>",
"license": "MPL-2.0",
"type": "module",
"publishConfig": {
"access": "public"
},