fix: type import (#2715)

apps/electron/layers/preload/preload.d.ts

@@ -1,6 +0,0 @@
-/* eslint-disable @typescript-eslint/consistent-type-imports */
-
-declare interface Window {
-  apis: import('./src/affine-apis').PreloadHandlers;
-  events: import('./src/affine-apis').MainIPCEventMap;
-}

apps/electron/layers/preload/src/affine-apis.ts

@@ -1,26 +1,6 @@
 // NOTE: we will generate preload types from this file
 import { ipcRenderer } from 'electron';
 
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import type {
-  MainIPCEventMap,
-  MainIPCHandlerMap,
-} from '../../main/src/exposed';
-
-type WithoutFirstParameter<T> = T extends (_: any, ...args: infer P) => infer R
-  ? (...args: P) => R
-  : T;
-
-type HandlersMap<N extends keyof MainIPCHandlerMap> = {
-  [K in keyof MainIPCHandlerMap[N]]: WithoutFirstParameter<
-    MainIPCHandlerMap[N][K]
-  >;
-};
-
-export type PreloadHandlers = {
-  [N in keyof MainIPCHandlerMap]: HandlersMap<N>;
-};
-
 type MainExposedMeta = {
   handlers: [namespace: string, handlerNames: string[]][];
   events: [namespace: string, eventNames: string[]][];
@@ -35,7 +15,7 @@ const meta: MainExposedMeta = (() => {
 })();
 
 // main handlers that can be invoked from the renderer process
-const apis: PreloadHandlers = (() => {
+const apis: any = (() => {
   const { handlers: handlersMeta } = meta;
 
   const all = handlersMeta.map(([namespace, functionNames]) => {
@@ -55,7 +35,7 @@ const apis: PreloadHandlers = (() => {
 })();
 
 // main events that can be listened to from the renderer process
-const events: MainIPCEventMap = (() => {
+const events: any = (() => {
   const { events: eventsMeta } = meta;
 
   // NOTE: ui may try to listen to a lot of the same events, so we increase the limit...

apps/electron/tests/fixture.ts

@@ -1,6 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="../layers/preload/preload.d.ts" />
-
 /* eslint-disable no-empty-pattern */
 import crypto from 'node:crypto';
 import { join, resolve } from 'node:path';
@@ -45,6 +42,7 @@ export const test = base.extend<{
       });
     }
     const logFilePath = await page.evaluate(async () => {
+      // @ts-expect-error
       return window.apis?.debug.logFilePath();
     });
     // wat for blocksuite to be loaded

apps/electron/tests/workspace.spec.ts

@@ -27,6 +27,7 @@ test('move workspace db file', async ({ page, appInfo, workspace }) => {
 
   // move db file to tmp folder
   await page.evaluate(tmpPath => {
+    // @ts-expect-error
     window.apis?.dialog.setFakeDialogResult({
       filePath: tmpPath,
     });
@@ -61,6 +62,7 @@ test('export then add', async ({ page, appInfo, workspace }) => {
 
   // export db file to tmp folder
   await page.evaluate(tmpPath => {
+    // @ts-expect-error
     window.apis?.dialog.setFakeDialogResult({
       filePath: tmpPath,
     });
@@ -79,6 +81,7 @@ test('export then add', async ({ page, appInfo, workspace }) => {
   await page.getByTestId('add-or-new-workspace').click();
 
   await page.evaluate(tmpPath => {
+    // @ts-expect-error
     window.apis?.dialog.setFakeDialogResult({
       filePath: tmpPath,
     });

apps/web/src/atoms/index.ts

@@ -50,8 +50,10 @@ rootWorkspacesMetadataAtom.onMount = setAtom => {
   }, 0);
 
   if (environment.isDesktop) {
+    // @ts-expect-error
     window.apis?.workspace.list().then(workspaceIDs => {
       if (abortController.signal.aborted) return;
+      // @ts-expect-error
       const newMetadata = workspaceIDs.map(w => ({
         id: w[0],
         flavour: WorkspaceFlavour.LOCAL,
@@ -59,6 +61,7 @@ rootWorkspacesMetadataAtom.onMount = setAtom => {
       setAtom(metadata => {
         return [
           ...metadata,
+          // @ts-expect-error
           ...newMetadata.filter(m => !metadata.find(m2 => m2.id === m.id)),
         ];
       });

apps/web/src/components/affine/create-workspace-modal/index.tsx

@@ -122,6 +122,7 @@ const useDefaultDBLocation = () => {
   const [defaultDBLocation, setDefaultDBLocation] = useState('');
 
   useEffect(() => {
+    // @ts-expect-error
     window.apis?.db.getDefaultStorageLocation().then(dir => {
       setDefaultDBLocation(dir);
     });
@@ -147,6 +148,7 @@ const SetDBLocationContent = ({
     if (result?.filePath) {
       onConfirmLocation(result.filePath);
     } else if (result?.error) {
+      // @ts-expect-error
       toast(t[result.error]());
     }
   };
@@ -277,6 +279,7 @@ export const CreateWorkspaceModal = ({
           setStep('set-syncing-mode');
         } else if (result.error || result.canceled) {
           if (result.error) {
+            // @ts-expect-error
             toast(t[result.error]());
           }
           onClose();

apps/web/src/components/affine/workspace-setting-detail/panel/export/index.tsx

@@ -18,6 +18,7 @@ export const ExportPanel = () => {
           if (id) {
             const result = await window.apis?.dialog.saveDBFileAs(id);
             if (result?.error) {
+              // @ts-expect-error
               toast(t[result.error]());
             } else if (!result?.canceled) {
               toast(t['Export success']());

apps/web/src/components/affine/workspace-setting-detail/panel/general/index.tsx

@@ -27,9 +27,11 @@ const useShowOpenDBFile = (workspaceId: string) => {
   const [show, setShow] = useState(false);
   useEffect(() => {
     if (window.apis && window.events && environment.isDesktop) {
+      // @ts-expect-error
       window.apis.workspace.getMeta(workspaceId).then(meta => {
         setShow(!!meta.secondaryDBPath);
       });
+      // @ts-expect-error
       return window.events.workspace.onMetaChange(newMeta => {
         if (newMeta.workspaceId === workspaceId) {
           const meta = newMeta.meta;
@@ -73,6 +75,7 @@ export const GeneralPanel: React.FC<PanelProps> = ({
       if (!result?.error && !result?.canceled) {
         toast(t['Move folder success']());
       } else if (result?.error) {
+        // @ts-expect-error
         toast(t[result.error]());
       }
     } catch (err) {

packages/component/src/components/app-sidebar/app-updater-button/index.jotai.ts

@@ -35,22 +35,14 @@ function rpcToObservable<
   });
 }
 
-type InferTFromEvent<E> = E extends (
-  callback: (t: infer T) => void
-) => () => void
-  ? T
-  : never;
-
-type UpdateMeta = InferTFromEvent<typeof window.events.updater.onUpdateReady>;
-
 export const updateReadyAtom = atomWithObservable(() => {
-  return rpcToObservable(null as UpdateMeta | null, {
+  return rpcToObservable(null as any | null, {
     event: window.events?.updater.onUpdateReady,
   });
 });
 
 export const updateAvailableAtom = atomWithObservable(() => {
-  return rpcToObservable(null as UpdateMeta | null, {
+  return rpcToObservable(null as any | null, {
     event: window.events?.updater.onUpdateAvailable,
     onSubscribe: () => {
       window.apis?.updater.checkForUpdatesAndNotify();

packages/component/src/index.ts

@@ -1,6 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="../../../apps/electron/layers/preload/preload.d.ts" />
-
 export * from './components/list-skeleton';
 export * from './styles';
 export * from './ui/breadcrumbs';

packages/env/src/config.ts

@@ -1,12 +1,20 @@
 /// <reference types="@blocksuite/global" />
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="./global.d.ts" />
 import { assertEquals } from '@blocksuite/global/utils';
 import getConfig from 'next/config';
 import { z } from 'zod';
 
 import { UaHelper } from './ua-helper';
 
+declare global {
+  interface Window {
+    appInfo: {
+      electron: boolean;
+    };
+    apis: any;
+    events: any;
+  }
+}
+
 export const buildFlagsSchema = z.object({
   /**
    * todo: remove this build flag when filter feature is ready.

packages/env/src/global.d.ts

@@ -1,5 +0,0 @@
-interface Window {
-  appInfo: {
-    electron: bool;
-  };
-}

packages/env/tsconfig.json

@@ -1,10 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "include": ["./src"],
   "compilerOptions": {
-    "noEmit": false,
     "composite": true,
+    "noEmit": false,
     "outDir": "lib"
-  },
-  "include": ["./src", "env.d.ts", "./src/global.d.ts"],
-  "exclude": ["lib"]
+  }
 }

packages/graphql/tsconfig.json

@@ -1,10 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "include": ["./src"],
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "ESNext",
-    "rootDir": "./src",
-    "noEmit": true
-  },
-  "include": ["src"]
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  }
 }

packages/hooks/tsconfig.json

@@ -1,10 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "lib",
-    "composite": true,
-    "noEmit": false
-  },
   "include": ["./src"],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  },
   "references": [{ "path": "../env" }, { "path": "../y-indexeddb" }]
 }

packages/jotai/tsconfig.json

@@ -1,14 +1,10 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "module": "ESNext",
-    "target": "ESNext",
-    "sourceMap": true,
-    "noEmit": false,
-    "outDir": "lib",
-    "composite": true
-  },
   "include": ["./src"],
-  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  },
   "references": [{ "path": "../env" }]
 }

packages/plugin-infra/tsconfig.json

@@ -1,6 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "include": ["./src"],
+  "compilerOptions": {
+    "composite": true,
+    "noEmit": false,
+    "outDir": "lib"
+  },
   "references": [
     {
       "path": "../component"
@@ -8,10 +13,5 @@
     {
       "path": "../workspace"
     }
-  ],
-  "compilerOptions": {
-    "noEmit": false,
-    "composite": true,
-    "outDir": "lib"
-  }
+  ]
 }

packages/storybook/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
-  "exclude": ["lib"],
-  "include": ["src"],
+  "include": ["./src"],
   "compilerOptions": {
     "composite": true,
     "noEmit": false,

packages/workspace/src/local/crud.ts

@@ -102,9 +102,11 @@ export const CRUD: WorkspaceCRUD<WorkspaceFlavour.LOCAL> = {
 
     // workspaces in desktop
     if (window.apis && environment.isDesktop) {
+      // @ts-expect-error
       const desktopIds = (await window.apis.workspace.list()).map(([id]) => id);
       // the ids maybe a subset of the local storage
       const moreWorkspaces = desktopIds.filter(
+        // @ts-expect-error
         id => !allWorkspaceIDs.includes(id)
       );
       allWorkspaceIDs = [...allWorkspaceIDs, ...moreWorkspaces];

packages/workspace/src/providers/__tests__/sqlite-provider.spec.ts

@@ -39,6 +39,7 @@ vi.stubGlobal('window', {
   },
   events: {
     db: {
+      // @ts-expect-error
       onExternalUpdate: fn => {
         triggerDBUpdate = fn;
         return () => {
@@ -113,6 +114,7 @@ describe('SQLite download provider', () => {
 
     offlineYdoc.getText('text').insert(0, 'sqlite-world');
 
+    // @ts-expect-error
     triggerDBUpdate?.({
       workspaceId: id + '-another-id',
       update: Y.encodeStateAsUpdate(offlineYdoc),
@@ -121,6 +123,7 @@ describe('SQLite download provider', () => {
     // not yet updated (because the workspace id is different)
     expect(workspace.doc.getText('text').toString()).toBe('');
 
+    // @ts-expect-error
     triggerDBUpdate?.({
       workspaceId: id,
       update: Y.encodeStateAsUpdate(offlineYdoc),

packages/workspace/src/providers/index.ts

@@ -183,6 +183,7 @@ const createSQLiteProvider = (
   const connect = () => {
     logger.info('connecting sqlite provider', blockSuiteWorkspace.id);
     blockSuiteWorkspace.doc.on('update', handleUpdate);
+    // @ts-expect-error
     unsubscribe = events.db.onExternalUpdate(({ update, workspaceId }) => {
       if (workspaceId === blockSuiteWorkspace.id) {
         Y.applyUpdate(blockSuiteWorkspace.doc, update, sqliteOrigin);

packages/workspace/src/type.ts

@@ -1,17 +1,11 @@
-// eslint-disable-next-line @typescript-eslint/triple-slash-reference
-/// <reference path="../../../apps/electron/layers/preload/preload.d.ts" />
-
 import type { View } from '@affine/component/page-list/filter/shared-types';
 import type { EditorContainer } from '@blocksuite/editor';
 import type { Page } from '@blocksuite/store';
 import type { Workspace as BlockSuiteWorkspace } from '@blocksuite/store';
-import type { createStore } from 'jotai';
 import type { FC, PropsWithChildren } from 'react';
 
 import type { Workspace as RemoteWorkspace } from './affine/api';
 
-export type JotaiStore = ReturnType<typeof createStore>;
-
 export enum WorkspaceSubPath {
   ALL = 'all',
   SETTING = 'setting',

packages/workspace/tsconfig.json

@@ -1,12 +1,11 @@
 {
   "extends": "../../tsconfig.json",
+  "include": ["./src"],
   "compilerOptions": {
     "composite": true,
     "noEmit": false,
     "outDir": "lib"
   },
-  "include": ["./src", "./src/affine/api"],
-  "exclude": ["lib"],
   "references": [
     { "path": "../../tests/fixtures" },
     { "path": "../y-indexeddb" },