Merge branch 'canary' into stable

packages/common/infra/package.json

@@ -54,10 +54,12 @@
     "dev": "vite build --watch"
   },
   "dependencies": {
+    "@affine/debug": "workspace:*",
+    "@affine/env": "workspace:*",
     "@affine/sdk": "workspace:*",
-    "@blocksuite/blocks": "0.0.0-20231124123613-7c06e95d-nightly",
-    "@blocksuite/global": "0.0.0-20231124123613-7c06e95d-nightly",
-    "@blocksuite/store": "0.0.0-20231124123613-7c06e95d-nightly",
+    "@blocksuite/blocks": "0.11.0-nightly-202312070955-2b5bb47",
+    "@blocksuite/global": "0.11.0-nightly-202312070955-2b5bb47",
+    "@blocksuite/store": "0.11.0-nightly-202312070955-2b5bb47",
     "jotai": "^2.5.1",
     "jotai-effect": "^0.2.3",
     "tinykeys": "^2.1.0",
@@ -66,22 +68,22 @@
   "devDependencies": {
     "@affine-test/fixtures": "workspace:*",
     "@affine/templates": "workspace:*",
-    "@blocksuite/editor": "0.0.0-20231124123613-7c06e95d-nightly",
-    "@blocksuite/lit": "0.0.0-20231124123613-7c06e95d-nightly",
+    "@blocksuite/lit": "0.11.0-nightly-202312070955-2b5bb47",
+    "@blocksuite/presets": "0.11.0-nightly-202312070955-2b5bb47",
     "@testing-library/react": "^14.0.0",
     "async-call-rpc": "^6.3.1",
     "electron": "link:../../frontend/electron/node_modules/electron",
     "nanoid": "^5.0.3",
     "react": "^18.2.0",
     "rxjs": "^7.8.1",
-    "vite": "^4.4.11",
+    "vite": "^5.0.6",
     "vite-plugin-dts": "3.6.0",
     "vitest": "0.34.6",
     "yjs": "^13.6.10"
   },
   "peerDependencies": {
     "@affine/templates": "*",
-    "@blocksuite/editor": "*",
+    "@blocksuite/presets": "*",
     "async-call-rpc": "*",
     "electron": "*",
     "react": "*",
@@ -91,7 +93,7 @@
     "@affine/templates": {
       "optional": true
     },
-    "@blocksuite/editor": {
+    "@blocksuite/presets": {
       "optional": true
     },
     "async-call-rpc": {

packages/common/infra/src/atom/index.ts

@@ -0,0 +1,8 @@
+import { atom } from 'jotai';
+
+export const loadedPluginNameAtom = atom<string[]>([]);
+
+export * from './layout';
+export * from './root-store';
+export * from './settings';
+export * from './workspace';

packages/common/infra/src/atom/layout.ts

@@ -1,34 +1,5 @@
 import type { ExpectedLayout } from '@affine/sdk/entry';
-import { assertExists } from '@blocksuite/global/utils';
-import type { Workspace } from '@blocksuite/store';
-import { atom, createStore } from 'jotai/vanilla';
-
-import { getBlockSuiteWorkspaceAtom } from './__internal__/workspace';
-
-// global store
-let rootStore = createStore();
-
-export function getCurrentStore() {
-  return rootStore;
-}
-
-/**
- * @internal do not use this function unless you know what you are doing
- */
-export function _setCurrentStore(store: ReturnType<typeof createStore>) {
-  rootStore = store;
-}
-
-export const loadedPluginNameAtom = atom<string[]>([]);
-
-export const currentWorkspaceIdAtom = atom<string | null>(null);
-export const currentPageIdAtom = atom<string | null>(null);
-export const currentWorkspaceAtom = atom<Promise<Workspace>>(async get => {
-  const workspaceId = get(currentWorkspaceIdAtom);
-  assertExists(workspaceId);
-  const [currentWorkspaceAtom] = getBlockSuiteWorkspaceAtom(workspaceId);
-  return get(currentWorkspaceAtom);
-});
+import { atom } from 'jotai';
 
 const contentLayoutBaseAtom = atom<ExpectedLayout>('editor');
 

packages/common/infra/src/atom/root-store.ts

@@ -0,0 +1,15 @@
+import { createStore } from 'jotai';
+
+// global store
+let rootStore = createStore();
+
+export function getCurrentStore() {
+  return rootStore;
+}
+
+/**
+ * @internal do not use this function unless you know what you are doing
+ */
+export function _setCurrentStore(store: ReturnType<typeof createStore>) {
+  rootStore = store;
+}

packages/common/infra/src/atom/settings.ts

@@ -0,0 +1,101 @@
+import { setupGlobal } from '@affine/env/global';
+import { atom } from 'jotai';
+import { atomWithStorage } from 'jotai/utils';
+import { atomEffect } from 'jotai-effect';
+
+setupGlobal();
+
+export type DateFormats =
+  | 'MM/dd/YYYY'
+  | 'dd/MM/YYYY'
+  | 'YYYY-MM-dd'
+  | 'YYYY.MM.dd'
+  | 'YYYY/MM/dd'
+  | 'dd-MMM-YYYY'
+  | 'dd MMMM YYYY';
+
+export type AppSetting = {
+  clientBorder: boolean;
+  fullWidthLayout: boolean;
+  windowFrameStyle: 'frameless' | 'NativeTitleBar';
+  fontStyle: FontFamily;
+  dateFormat: DateFormats;
+  startWeekOnMonday: boolean;
+  enableBlurBackground: boolean;
+  enableNoisyBackground: boolean;
+  autoCheckUpdate: boolean;
+  autoDownloadUpdate: boolean;
+};
+export const windowFrameStyleOptions: AppSetting['windowFrameStyle'][] = [
+  'frameless',
+  'NativeTitleBar',
+];
+
+export const dateFormatOptions: DateFormats[] = [
+  'MM/dd/YYYY',
+  'dd/MM/YYYY',
+  'YYYY-MM-dd',
+  'YYYY.MM.dd',
+  'YYYY/MM/dd',
+  'dd-MMM-YYYY',
+  'dd MMMM YYYY',
+];
+
+export type FontFamily = 'Sans' | 'Serif' | 'Mono';
+
+export const fontStyleOptions = [
+  { key: 'Sans', value: 'var(--affine-font-sans-family)' },
+  { key: 'Serif', value: 'var(--affine-font-serif-family)' },
+  { key: 'Mono', value: 'var(--affine-font-mono-family)' },
+] satisfies {
+  key: FontFamily;
+  value: string;
+}[];
+
+const appSettingBaseAtom = atomWithStorage<AppSetting>('affine-settings', {
+  clientBorder: environment.isDesktop && !environment.isWindows,
+  fullWidthLayout: false,
+  windowFrameStyle: 'frameless',
+  fontStyle: 'Sans',
+  dateFormat: dateFormatOptions[0],
+  startWeekOnMonday: false,
+  enableBlurBackground: true,
+  enableNoisyBackground: true,
+  autoCheckUpdate: true,
+  autoDownloadUpdate: true,
+});
+
+type SetStateAction<Value> = Value | ((prev: Value) => Value);
+
+const appSettingEffect = atomEffect(get => {
+  const settings = get(appSettingBaseAtom);
+  // some values in settings should be synced into electron side
+  if (environment.isDesktop) {
+    console.log('set config', settings);
+    window.apis?.updater
+      .setConfig({
+        autoCheckUpdate: settings.autoCheckUpdate,
+        autoDownloadUpdate: settings.autoDownloadUpdate,
+      })
+      .catch(err => {
+        console.error(err);
+      });
+  }
+});
+
+export const appSettingAtom = atom<
+  AppSetting,
+  [SetStateAction<Partial<AppSetting>>],
+  void
+>(
+  get => {
+    get(appSettingEffect);
+    return get(appSettingBaseAtom);
+  },
+  (_get, set, apply) => {
+    set(appSettingBaseAtom, prev => {
+      const next = typeof apply === 'function' ? apply(prev) : apply;
+      return { ...prev, ...next };
+    });
+  }
+);

packages/common/infra/src/atom/workspace.ts

@@ -0,0 +1,14 @@
+import { assertExists } from '@blocksuite/global/utils';
+import type { Workspace } from '@blocksuite/store';
+import { atom } from 'jotai';
+
+import { getBlockSuiteWorkspaceAtom } from '../__internal__/workspace';
+
+export const currentWorkspaceIdAtom = atom<string | null>(null);
+export const currentPageIdAtom = atom<string | null>(null);
+export const currentWorkspaceAtom = atom<Promise<Workspace>>(async get => {
+  const workspaceId = get(currentWorkspaceIdAtom);
+  assertExists(workspaceId);
+  const [currentWorkspaceAtom] = getBlockSuiteWorkspaceAtom(workspaceId);
+  return get(currentWorkspaceAtom);
+});

packages/common/infra/src/command/registry.ts

@@ -1,3 +1,4 @@
+import { DebugLogger } from '@affine/debug';
 // @ts-expect-error upstream type is wrong
 import { tinykeys } from 'tinykeys';
 
@@ -7,12 +8,14 @@ import {
   createAffineCommand,
 } from './command';
 
+const commandLogger = new DebugLogger('command:registry');
+
 export const AffineCommandRegistry = new (class {
   readonly commands: Map<string, AffineCommand> = new Map();
 
   register(options: AffineCommandOptions) {
     if (this.commands.has(options.id)) {
-      console.warn(`Command ${options.id} already registered.`);
+      commandLogger.warn(`Command ${options.id} already registered.`);
       return () => {};
     }
     const command = createAffineCommand(options);
@@ -38,17 +41,17 @@ export const AffineCommandRegistry = new (class {
       });
     }
 
-    console.debug(`Registered command ${command.id}`);
+    commandLogger.debug(`Registered command ${command.id}`);
     return () => {
       unsubKb?.();
       this.commands.delete(command.id);
-      console.debug(`Unregistered command ${command.id}`);
+      commandLogger.debug(`Unregistered command ${command.id}`);
     };
   }
 
   get(id: string): AffineCommand | undefined {
     if (!this.commands.has(id)) {
-      console.warn(`Command ${id} not registered.`);
+      commandLogger.warn(`Command ${id} not registered.`);
       return undefined;
     }
     return this.commands.get(id);

packages/common/infra/src/type.ts

@@ -201,7 +201,7 @@ export type UpdaterHandlers = {
   downloadUpdate: () => Promise<void>;
   getConfig: () => Promise<UpdaterConfig>;
   setConfig: (newConfig: Partial<UpdaterConfig>) => Promise<void>;
-  checkForUpdatesAndNotify: () => Promise<{ version: string } | null>;
+  checkForUpdates: () => Promise<{ version: string } | null>;
 };
 
 export type WorkspaceHandlers = {

packages/common/infra/tsconfig.json

@@ -11,6 +11,12 @@
     {
       "path": "../sdk"
     },
+    {
+      "path": "../env"
+    },
+    {
+      "path": "../debug"
+    },
     {
       "path": "./tsconfig.node.json"
     }

packages/common/infra/vite.config.ts

@@ -13,7 +13,7 @@ export default defineConfig({
       entry: {
         blocksuite: resolve(root, 'src/blocksuite/index.ts'),
         index: resolve(root, 'src/index.ts'),
-        atom: resolve(root, 'src/atom.ts'),
+        atom: resolve(root, 'src/atom/index.ts'),
         command: resolve(root, 'src/command/index.ts'),
         type: resolve(root, 'src/type.ts'),
         'core/event-emitter': resolve(root, 'src/core/event-emitter.ts'),