refactor: fix build errors

packages/console/src/components/AuditLogTable/index.tsx

@@ -1,5 +1,5 @@
 import { LogResult } from '@logto/schemas';
-import type { LogDto } from '@logto/schemas/lib/types/log-legacy.js';
+import type { LogDto } from '@logto/schemas/lib/types/log-legacy';
 import { conditional, conditionalString } from '@silverhand/essentials';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';

packages/console/src/pages/AuditLogDetails/index.tsx

@@ -1,5 +1,5 @@
 import type { User } from '@logto/schemas';
-import type { LogDto } from '@logto/schemas/lib/types/log-legacy.js';
+import type { LogDto } from '@logto/schemas/lib/types/log-legacy';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { useLocation, useParams } from 'react-router-dom';

packages/core/src/include.d/import-meta.d.ts

@@ -0,0 +1,10 @@
+interface ImportMeta {
+  jest: typeof jest & {
+    // Almost same as `jest.mock()`, but factory is required
+    unstable_mockModule: <T = unknown>(
+      moduleName: string,
+      factory: () => T,
+      options?: jest.MockOptions
+    ) => typeof jest;
+  };
+}

packages/core/src/libraries/sign-in-experience/index.ts

@@ -1,7 +1,9 @@
 import { builtInLanguages } from '@logto/phrases-ui';
 import type { Branding, LanguageInfo, SignInExperience } from '@logto/schemas';
-import { SignInMode, ConnectorType, BrandingStyle } from '@logto/schemas';
 import {
+  SignInMode,
+  ConnectorType,
+  BrandingStyle,
   adminConsoleApplicationId,
   adminConsoleSignInExperience,
   demoAppApplicationId,

packages/core/src/middleware/koa-auth.ts

@@ -1,7 +1,6 @@
 import type { IncomingHttpHeaders } from 'http';
 
-import { UserRole } from '@logto/schemas';
-import { managementResource } from '@logto/schemas';
+import { UserRole, managementResource } from '@logto/schemas';
 import type { Optional } from '@silverhand/essentials';
 import { conditional } from '@silverhand/essentials';
 import { jwtVerify } from 'jose';

packages/core/src/oidc/adapter.ts

@@ -1,6 +1,5 @@
 import type { CreateApplication, OidcClientMetadata } from '@logto/schemas';
-import { ApplicationType } from '@logto/schemas';
-import { adminConsoleApplicationId, demoAppApplicationId } from '@logto/schemas';
+import { ApplicationType, adminConsoleApplicationId, demoAppApplicationId } from '@logto/schemas';
 import { tryThat } from '@logto/shared';
 import { deduplicate } from '@silverhand/essentials';
 import { addSeconds } from 'date-fns';

packages/core/src/routes/application.test.ts

@@ -29,10 +29,11 @@ const { findApplicationById } = mockEsm('#src/queries/application.js', () => ({
   ),
 }));
 
-mockEsm('@logto/core-kit', () => ({
+// Cannot use `mockEsm()` here, pending investigation.
+jest.unstable_mockModule('@logto/core-kit', () => ({
   // eslint-disable-next-line unicorn/consistent-function-scoping
-  buildIdGenerator: jest.fn(() => () => 'randomId'),
-  generateStandardId: jest.fn(() => 'randomId'),
+  buildIdGenerator: () => () => 'randomId',
+  generateStandardId: () => 'randomId',
 }));
 
 const { createRequester } = await import('#src/utils/test-utils.js');

packages/core/src/routes/phrase.test.ts

@@ -3,10 +3,9 @@ import type { SignInExperience } from '@logto/schemas';
 import { adminConsoleApplicationId, adminConsoleSignInExperience } from '@logto/schemas';
 import { mockEsm, mockEsmWithActual, pickDefault } from '@logto/shared/esm';
 
-import { createMockProvider } from '#src/test-utils/oidc-provider.js';
-
 import { zhCnTag } from '#src/__mocks__/custom-phrase.js';
 import { mockSignInExperience } from '#src/__mocks__/index.js';
+import { createMockProvider } from '#src/test-utils/oidc-provider.js';
 
 const { jest } = import.meta;
 

packages/core/src/routes/resource.test.ts

@@ -21,7 +21,8 @@ mockEsm('#src/queries/resource.js', () => ({
   deleteResourceById: jest.fn(),
 }));
 
-mockEsm('@logto/shared', () => ({
+// Cannot use `mockEsm()` here, pending investigation.
+jest.unstable_mockModule('@logto/core-kit', () => ({
   // eslint-disable-next-line unicorn/consistent-function-scoping
   buildIdGenerator: () => () => 'randomId',
 }));

packages/core/src/routes/session/index.test.ts

@@ -2,12 +2,11 @@ import type { User } from '@logto/schemas';
 import { adminConsoleApplicationId } from '@logto/schemas';
 import { Provider } from 'oidc-provider';
 
+import { mockUser } from '#src/__mocks__/index.js';
 import { createRequester } from '#src/utils/test-utils.js';
 
 import sessionRoutes from './index.js';
 
-import { mockUser } from '#src/__mocks__/index.js';
-
 const findUserById = jest.fn(async (): Promise<User> => mockUser);
 const updateUserById = jest.fn(async (..._args: unknown[]) => ({ id: 'id' }));
 

packages/core/src/routes/session/index.ts

@@ -1,8 +1,7 @@
 import path from 'path';
 
 import type { LogtoErrorCode } from '@logto/phrases';
-import { UserRole } from '@logto/schemas';
-import { adminConsoleApplicationId } from '@logto/schemas';
+import { UserRole, adminConsoleApplicationId } from '@logto/schemas';
 import { conditional } from '@silverhand/essentials';
 import type { Provider } from 'oidc-provider';
 import { object, string } from 'zod';

packages/core/src/routes/session/middleware/koa-guard-session-action.ts

@@ -1,5 +1,4 @@
-import { SignInMode } from '@logto/schemas';
-import { adminConsoleApplicationId } from '@logto/schemas';
+import { SignInMode, adminConsoleApplicationId } from '@logto/schemas';
 import type { MiddlewareType } from 'koa';
 import type { Provider } from 'oidc-provider';
 import { errors } from 'oidc-provider';

packages/core/src/routes/session/password.test.ts

@@ -1,14 +1,12 @@
 import type { User } from '@logto/schemas';
-import { UserRole, SignInIdentifier } from '@logto/schemas';
-import { adminConsoleApplicationId } from '@logto/schemas';
+import { UserRole, SignInIdentifier, adminConsoleApplicationId } from '@logto/schemas';
 import { Provider } from 'oidc-provider';
 
+import { mockSignInExperience, mockUser } from '#src/__mocks__/index.js';
 import { createRequester } from '#src/utils/test-utils.js';
 
 import passwordRoutes, { registerRoute, signInRoute } from './password.js';
 
-import { mockSignInExperience, mockUser } from '#src/__mocks__/index.js';
-
 const insertUser = jest.fn(async (..._args: unknown[]) => mockUser);
 const hasUser = jest.fn(async (username: string) => username === 'username1');
 const findUserById = jest.fn(async (): Promise<User> => mockUser);

packages/core/src/routes/session/password.ts

@@ -1,6 +1,5 @@
 import { passwordRegEx, usernameRegEx } from '@logto/core-kit';
-import { SignInIdentifier, UserRole } from '@logto/schemas';
-import { adminConsoleApplicationId } from '@logto/schemas';
+import { SignInIdentifier, UserRole, adminConsoleApplicationId } from '@logto/schemas';
 import type { Provider } from 'oidc-provider';
 import { object, string } from 'zod';
 

packages/core/src/routes/well-known.test.ts

@@ -1,10 +1,10 @@
-import { SignInMode } from '@logto/schemas';
-import { adminConsoleApplicationId, adminConsoleSignInExperience } from '@logto/schemas';
+import {
+  SignInMode,
+  adminConsoleApplicationId,
+  adminConsoleSignInExperience,
+} from '@logto/schemas';
 import { mockEsm, mockEsmWithActual, pickDefault } from '@logto/shared/esm';
 
-import { createMockProvider } from '#src/test-utils/oidc-provider.js';
-import { createRequester } from '#src/utils/test-utils.js';
-
 import {
   mockAliyunDmConnector,
   mockAliyunSmsConnector,
@@ -15,6 +15,8 @@ import {
   mockWechatConnector,
   mockWechatNativeConnector,
 } from '#src/__mocks__/index.js';
+import { createMockProvider } from '#src/test-utils/oidc-provider.js';
+import { createRequester } from '#src/utils/test-utils.js';
 
 const { jest } = import.meta;
 await mockEsmWithActual('i18next', () => ({

packages/integration-tests/src/tests/api/application.test.ts

@@ -1,5 +1,4 @@
-import { ApplicationType } from '@logto/schemas';
-import { demoAppApplicationId } from '@logto/schemas';
+import { ApplicationType, demoAppApplicationId } from '@logto/schemas';
 import { HTTPError } from 'got';
 
 import {

packages/integration-tests/src/tests/api/session.test.ts

@@ -1,5 +1,4 @@
-import { SignInIdentifier } from '@logto/schemas';
-import { adminConsoleApplicationId } from '@logto/schemas';
+import { SignInIdentifier, adminConsoleApplicationId } from '@logto/schemas';
 import { assert } from '@silverhand/essentials';
 
 import {

packages/schemas/alterations/1.0.0_beta.10-1-logto-config.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.10-1663923211-machine-to-machine-app.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.10-1664265197-custom-phrases.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.11-1664347703-rename-language-key-to-tag.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.11-1664356000-add-created-at-column-to-users.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.11-1664462389-correct-user-created-at-column-by-user-logs.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.14-1665300135-sign-in-sign-up.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 enum SignInMethodState {
   Primary = 'primary',

packages/schemas/alterations/1.0.0_beta.14-1667283640-remove-forgot-password.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.14-1667292082-remove-sign-in-method.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.14-1667374974-user-suspend.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/1.0.0_beta.14-1667900481-add-passcode-type-continue.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/next-1668666590-support-multiple-connector-instances.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/next-1668666600-remove-connector-enabled.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/next-1669091623-roles-and-scopes.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/next-1669702299-sign-up.ts

@@ -2,7 +2,7 @@ import { isSameArray } from '@silverhand/essentials';
 import type { DatabaseTransactionConnection } from 'slonik';
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 enum DeprecatedSignUpIdentifier {
   Email = 'email',

packages/schemas/alterations/next-1671039448-add-user-name-index.ts

@@ -1,6 +1,6 @@
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 const alteration: AlterationScript = {
   up: async (pool) => {

packages/schemas/alterations/next-1671080370-terms-of-use.ts

@@ -1,7 +1,7 @@
 import type { DatabaseTransactionConnection } from 'slonik';
 import { sql } from 'slonik';
 
-import type { AlterationScript } from '../lib/src/types/alteration.js';
+import type { AlterationScript } from '../src/types/alteration.js';
 
 type DeprecatedTermsOfUse = {
   enabled: boolean;

packages/schemas/package.json

@@ -10,11 +10,11 @@
     "alterations-js",
     "tables"
   ],
-  "main": "./lib/src/index.js",
+  "main": "./lib/index.js",
   "exports": {
-    ".": "./lib/src/index.js",
-    "./lib/*": "./lib/src/*",
-    "./models": "./lib/src-models/index.js",
+    ".": "./lib/index.js",
+    "./lib/*": "./lib/*",
+    "./models": "./lib/models/index.js",
     "./package.json": "./package.json"
   },
   "publishConfig": {
@@ -82,8 +82,6 @@
     "@logto/language-kit": "workspace:*",
     "@logto/phrases": "workspace:*",
     "@logto/phrases-ui": "workspace:*",
-    "@withtyped/server": "^0.3.0",
-    "nanoid": "^4.0.0",
     "zod": "^3.20.2"
   }
 }

packages/schemas/tsconfig.json

@@ -8,7 +8,6 @@
   },
   "include": [
     "src",
-    "src-models",
     "alterations"
   ]
 }

packages/toolkit/core-kit/package.json

@@ -39,7 +39,7 @@
     "node": "^16.13.0 || ^18.12.0"
   },
   "dependencies": {
-    "@logto/language-kit": "^1.0.0-beta.29",
+    "@logto/language-kit": "workspace:*",
     "color": "^4.2.3",
     "nanoid": "^4.0.0"
   },

pnpm-lock.yaml

@@ -23,6 +23,7 @@ importers:
 
   packages/cli:
     specifiers:
+      '@logto/core-kit': workspace:*
       '@logto/schemas': workspace:*
       '@logto/shared': workspace:*
       '@silverhand/eslint-config': 1.3.0
@@ -62,6 +63,7 @@ importers:
       yargs: ^17.6.0
       zod: ^3.20.2
     dependencies:
+      '@logto/core-kit': link:../toolkit/core-kit
       '@logto/schemas': link:../schemas
       '@logto/shared': link:../shared
       '@silverhand/essentials': 1.3.0
@@ -682,7 +684,7 @@ importers:
   packages/toolkit/core-kit:
     specifiers:
       '@jest/types': ^29.0.3
-      '@logto/language-kit': ^1.0.0-beta.29
+      '@logto/language-kit': workspace:*
       '@rollup/plugin-typescript': ^10.0.1
       '@silverhand/eslint-config': 1.3.0
       '@silverhand/eslint-config-react': 1.3.0