toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-11-22 08:13:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

style: enable rxjs/finnish (#6276)

Browse Source 
chore(infra): use finnish notation for observables

do rename
This commit is contained in:
EYHN 2024-03-24 17:04:51 +00:00
parent c6676fd074
commit 2b42a75e5a
No known key found for this signature in database
GPG Key ID: 46C9E26A75AB276C
104 changed files with 797 additions and 591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.eslintrc.js
View File

@ -98,6 +98,7 @@ const config = {
'i',
'unused-imports',
'unicorn',
'rxjs',
],
rules: {
'array-callback-return': 'error',
@ -202,6 +203,21 @@ const config = {
'sonarjs/no-collection-size-mischeck': 'error',
'sonarjs/no-useless-catch': 'error',
'sonarjs/no-identical-functions': 'error',
'rxjs/finnish': [
'error',
{
functions: false,
methods: false,
strict: true,
types: {
'^LiveData$': true,
// some yjs classes are Observables, but they don't need to be in Finnish notation
'^Doc$': false, // yjs Doc
'^Awareness$': false, // yjs Awareness
'^UndoManager$': false, // yjs UndoManager
},
},
],
},
overrides: [
{

1
package.json
View File

@ -82,6 +82,7 @@
"eslint-plugin-i": "^2.29.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-rxjs": "^5.0.3",
"eslint-plugin-simple-import-sort": "^12.0.0",
"eslint-plugin-sonarjs": "^0.24.0",
"eslint-plugin-unicorn": "^51.0.1",

4
packages/backend/server/src/fundamentals/metrics/metrics.ts
View File

@ -43,9 +43,9 @@ const metricCreators: MetricCreators = {
gauge(meter: Meter, name: string, opts?: MetricOptions) {
let value: any;
let attrs: Attributes | undefined;
const ob = meter.createObservableGauge(name, opts);
const ob$ = meter.createObservableGauge(name, opts);
ob.addCallback(result => {
ob$.addCallback(result => {
result.observe(value, attrs);
});

8
packages/common/infra/src/initialization/index.ts
View File

@ -113,8 +113,8 @@ export async function buildShowcaseWorkspace(
// perhaps put them into middleware?
{
// the "Write, Draw, Plan all at Once." page should be set to edgeless mode
const edgelessPage1 = pageRecordList.records.value.find(
p => p.title.value === 'Write, Draw, Plan all at Once.'
const edgelessPage1 = pageRecordList.records$.value.find(
p => p.title$.value === 'Write, Draw, Plan all at Once.'
);
if (edgelessPage1) {
@ -122,8 +122,8 @@ export async function buildShowcaseWorkspace(
}
// should jump to "Write, Draw, Plan all at Once." by default
const defaultPage = pageRecordList.records.value.find(p =>
p.title.value.startsWith('Write, Draw, Plan all at Once.')
const defaultPage = pageRecordList.records$.value.find(p =>
p.title$.value.startsWith('Write, Draw, Plan all at Once.')
);
if (defaultPage) {

176
packages/common/infra/src/livedata/__tests__/livedata.spec.ts
View File

@ -6,33 +6,33 @@ import { LiveData, PoisonedError } from '..';
describe('livedata', () => {
test('LiveData', async () => {
const livedata = new LiveData(0);
expect(livedata.value).toBe(0);
livedata.next(1);
expect(livedata.value).toBe(1);
const livedata$ = new LiveData(0);
expect(livedata$.value).toBe(0);
livedata$.next(1);
expect(livedata$.value).toBe(1);
let subscribed = 0;
livedata.subscribe(v => {
livedata$.subscribe(v => {
subscribed = v;
});
livedata.next(2);
expect(livedata.value).toBe(2);
livedata$.next(2);
expect(livedata$.value).toBe(2);
await vitest.waitFor(() => subscribed === 2);
});
test('from', async () => {
{
const livedata = LiveData.from(of(1, 2, 3, 4), 0);
expect(livedata.value).toBe(4);
const livedata$ = LiveData.from(of(1, 2, 3, 4), 0);
expect(livedata$.value).toBe(4);
}
{
let subscriber: Subscriber<number> = null!;
const observable = new Observable<number>(s => {
const observable$ = new Observable<number>(s => {
subscriber = s;
});
const livedata = LiveData.from(observable, 0);
const livedata$ = LiveData.from(observable$, 0);
let value = 0;
livedata.subscribe(v => {
livedata$.subscribe(v => {
value = v;
});
@ -46,16 +46,16 @@ describe('livedata', () => {
{
let observableSubscribed = false;
let observableClosed = false;
const observable = new Observable(subscriber => {
const observable$ = new Observable(subscriber => {
observableSubscribed = true;
subscriber.next(1);
return () => {
observableClosed = true;
};
});
const livedata = LiveData.from(observable, 0);
const livedata$ = LiveData.from(observable$, 0);
expect(observableSubscribed).toBe(false);
const subscription = livedata.subscribe(_ => {});
const subscription = livedata$.subscribe(_ => {});
expect(observableSubscribed).toBe(true);
expect(observableClosed).toBe(false);
subscription.unsubscribe();
@ -64,17 +64,17 @@ describe('livedata', () => {
{
let subscriber: Subscriber<number> = null!;
const observable = new Observable<number>(s => {
const observable$ = new Observable<number>(s => {
subscriber = s;
});
const livedata = LiveData.from(observable, 0);
const livedata$ = LiveData.from(observable$, 0);
let value1 = 0;
livedata.subscribe(v => {
livedata$.subscribe(v => {
value1 = v;
});
let value2 = 0;
livedata.subscribe(v => {
livedata$.subscribe(v => {
value2 = v;
});
@ -91,17 +91,17 @@ describe('livedata', () => {
{
let observableSubscribed = false;
let observableClosed = false;
const observable = new Observable(subscriber => {
const observable$ = new Observable(subscriber => {
observableSubscribed = true;
subscriber.next(1);
return () => {
observableClosed = true;
};
});
const livedata = LiveData.from(observable, 0);
const livedata$ = LiveData.from(observable$, 0);
expect(observableSubscribed).toBe(false);
const subscription1 = livedata.subscribe(_ => {});
const subscription2 = livedata.subscribe(_ => {});
const subscription1 = livedata$.subscribe(_ => {});
const subscription2 = livedata$.subscribe(_ => {});
expect(observableSubscribed).toBe(true);
expect(observableClosed).toBe(false);
subscription1.unsubscribe();
@ -112,31 +112,31 @@ describe('livedata', () => {
{
let observerCount = 0;
const observable = new Observable(_ => {
const observable$ = new Observable(_ => {
observerCount++;
});
const livedata = LiveData.from(observable, 0);
livedata.subscribe(_ => {});
livedata.subscribe(_ => {});
const livedata$ = LiveData.from(observable$, 0);
livedata$.subscribe(_ => {});
livedata$.subscribe(_ => {});
expect(observerCount).toBe(1);
}
{
let value = 0;
const observable = new Observable<number>(subscriber => {
const observable$ = new Observable<number>(subscriber => {
subscriber.next(value);
});
const livedata = LiveData.from(observable, 0);
expect(livedata.value).toBe(0);
const livedata$ = LiveData.from(observable$, 0);
expect(livedata$.value).toBe(0);
value = 1;
expect(livedata.value).toBe(1);
expect(livedata$.value).toBe(1);
}
});
test('poisoned', () => {
{
let subscriber: Subscriber<number> = null!;
const livedata = LiveData.from<number>(
const livedata$ = LiveData.from<number>(
new Observable(sub => {
subscriber = sub;
}),
@ -145,7 +145,7 @@ describe('livedata', () => {
let value: number = 0;
let error: any = null;
livedata.subscribe({
livedata$.subscribe({
next: v => {
value = v;
},
@ -161,11 +161,11 @@ describe('livedata', () => {
subscriber.error('error');
expect(error).toBeInstanceOf(PoisonedError);
expect(() => livedata.next(3)).toThrowError(PoisonedError);
expect(() => livedata.value).toThrowError(PoisonedError);
expect(() => livedata$.next(3)).toThrowError(PoisonedError);
expect(() => livedata$.value).toThrowError(PoisonedError);
let error2: any = null;
livedata.subscribe({
livedata$.subscribe({
error: e => {
error2 = e;
},
@ -176,29 +176,29 @@ describe('livedata', () => {
test('map', () => {
{
const livedata = new LiveData(0);
const mapped = livedata.map(v => v + 1);
expect(mapped.value).toBe(1);
livedata.next(1);
expect(mapped.value).toBe(2);
const livedata$ = new LiveData(0);
const mapped$ = livedata$.map(v => v + 1);
expect(mapped$.value).toBe(1);
livedata$.next(1);
expect(mapped$.value).toBe(2);
}
{
const livedata = new LiveData(0);
const mapped = livedata.map(v => v + 1);
const livedata$ = new LiveData(0);
const mapped$ = livedata$.map(v => v + 1);
let value = 0;
mapped.subscribe(v => {
mapped$.subscribe(v => {
value = v;
});
expect(value).toBe(1);
livedata.next(1);
livedata$.next(1);
expect(value).toBe(2);
}
{
let observableSubscribed = false;
let observableClosed = false;
const observable = new Observable<number>(subscriber => {
const observable$ = new Observable<number>(subscriber => {
observableSubscribed = true;
subscriber.next(1);
return () => {
@ -206,11 +206,11 @@ describe('livedata', () => {
};
});
const livedata = LiveData.from(observable, 0);
const mapped = livedata.map(v => v + 1);
const livedata$ = LiveData.from(observable$, 0);
const mapped$ = livedata$.map(v => v + 1);
expect(observableSubscribed).toBe(false);
const subscription = mapped.subscribe(_ => {});
const subscription = mapped$.subscribe(_ => {});
expect(observableSubscribed).toBe(true);
expect(observableClosed).toBe(false);
subscription.unsubscribe();
@ -219,9 +219,9 @@ describe('livedata', () => {
});
test('interop with rxjs', () => {
const ob = combineLatest([new LiveData(1)]);
const ob$ = combineLatest([new LiveData(1)]);
let value = 0;
ob.subscribe(v => {
ob$.subscribe(v => {
value = v[0];
});
expect(value).toBe(1);
@ -229,69 +229,69 @@ describe('livedata', () => {
test('flat', () => {
{
const wrapped = new LiveData(new LiveData(0));
const flatten = wrapped.flat();
expect(flatten.value).toBe(0);
const wrapped$ = new LiveData(new LiveData(0));
const flatten$ = wrapped$.flat();
expect(flatten$.value).toBe(0);
wrapped.next(new LiveData(1));
expect(flatten.value).toBe(1);
wrapped$.next(new LiveData(1));
expect(flatten$.value).toBe(1);
wrapped.next(LiveData.from(of(2, 3), 0));
expect(flatten.value).toBe(3);
wrapped$.next(LiveData.from(of(2, 3), 0));
expect(flatten$.value).toBe(3);
}
{
const wrapped = new LiveData(
const wrapped$ = new LiveData(
new LiveData([
new LiveData(new LiveData(1)),
new LiveData(new LiveData(2)),
])
);
const flatten = wrapped.flat();
expect(flatten.value).toStrictEqual([1, 2]);
const flatten$ = wrapped$.flat();
expect(flatten$.value).toStrictEqual([1, 2]);
}
{
const wrapped = new LiveData([new LiveData(0), new LiveData(1)]);
const flatten = wrapped.flat();
const wrapped$ = new LiveData([new LiveData(0), new LiveData(1)]);
const flatten$ = wrapped$.flat();
expect(flatten.value).toEqual([0, 1]);
expect(flatten$.value).toEqual([0, 1]);
const inner = new LiveData(2);
wrapped.next([inner, new LiveData(3)]);
expect(flatten.value).toEqual([2, 3]);
inner.next(4);
expect(flatten.value).toEqual([4, 3]);
const inner$ = new LiveData(2);
wrapped$.next([inner$, new LiveData(3)]);
expect(flatten$.value).toEqual([2, 3]);
inner$.next(4);
expect(flatten$.value).toEqual([4, 3]);
}
});
test('computed', () => {
{
const a = new LiveData(1);
const b = LiveData.computed(get => get(a) + 1);
expect(b.value).toBe(2);
const a$ = new LiveData(1);
const b$ = LiveData.computed(get => get(a$) + 1);
expect(b$.value).toBe(2);
}
{
const a = new LiveData('v1');
const v1 = new LiveData(100);
const v2 = new LiveData(200);
const a$ = new LiveData('v1');
const v1$ = new LiveData(100);
const v2$ = new LiveData(200);
const v = LiveData.computed(get => {
return get(a) === 'v1' ? get(v1) : get(v2);
const v$ = LiveData.computed(get => {
return get(a$) === 'v1' ? get(v1$) : get(v2$);
});
expect(v.value).toBe(100);
expect(v$.value).toBe(100);
a.next('v2');
expect(v.value).toBe(200);
a$.next('v2');
expect(v$.value).toBe(200);
}
{
let watched = false;
let count = 0;
let subscriber: Subscriber<number> = null!;
const a = LiveData.from<number>(
const a$ = LiveData.from<number>(
new Observable(sub => {
count++;
watched = true;
@ -303,16 +303,16 @@ describe('livedata', () => {
}),
0
);
const b = LiveData.computed(get => get(a) + 1);
const b$ = LiveData.computed(get => get(a$) + 1);
expect(watched).toBe(false);
expect(count).toBe(0);
const subscription = b.subscribe(_ => {});
const subscription = b$.subscribe(_ => {});
expect(watched).toBe(true);
expect(count).toBe(1);
subscriber.next(2);
expect(b.value).toBe(3);
expect(b$.value).toBe(3);
subscription.unsubscribe();
expect(watched).toBe(false);
@ -320,11 +320,11 @@ describe('livedata', () => {
}
{
let c = null! as LiveData<number>;
const b = LiveData.computed(get => get(c) + 1);
c = LiveData.computed(get => get(b) + 1);
let c$ = null! as LiveData<number>;
const b$ = LiveData.computed(get => get(c$) + 1);
c$ = LiveData.computed(get => get(b$) + 1);
expect(() => b.value).toThrowError(PoisonedError);
expect(() => b$.value).toThrowError(PoisonedError);
}
});
});

12
packages/common/infra/src/livedata/__tests__/react.spec.tsx
View File

@ -10,11 +10,11 @@ import { LiveData, useLiveData } from '..';
describe('livedata', () => {
test('react', () => {
const livedata = new LiveData(0);
const livedata$ = new LiveData(0);
const Component = () => {
const renderCount = useRef(0);
renderCount.current++;
const value = useLiveData(livedata);
const value = useLiveData(livedata$);
return (
<main>
{renderCount.current}:{value}
@ -23,7 +23,7 @@ describe('livedata', () => {
};
const { rerender } = render(<Component />);
expect(screen.getByRole('main').innerText).toBe('1:0');
livedata.next(1);
livedata$.next(1);
rerender(<Component />);
expect(screen.getByRole('main').innerText).toBe('3:1');
});
@ -31,7 +31,7 @@ describe('livedata', () => {
test('lifecycle', async () => {
let observableSubscribed = false;
let observableClosed = false;
const observable = new Observable<number>(subscriber => {
const observable$ = new Observable<number>(subscriber => {
observableSubscribed = true;
subscriber.next(1);
console.log(1);
@ -40,9 +40,9 @@ describe('livedata', () => {
};
});
const livedata = LiveData.from(observable, 0);
const livedata$ = LiveData.from(observable$, 0);
const Component1 = () => {
const value = useLiveData(livedata);
const value = useLiveData(livedata$);
return <main>{value}</main>;
};

126
packages/common/infra/src/livedata/index.ts
View File

@ -14,6 +14,7 @@ import {
skip,
type Subscription,
switchMap,
type TeardownLogic,
} from 'rxjs';
import { BehaviorSubject, Subject } from 'rxjs';
@ -78,20 +79,23 @@ const logger = new DebugLogger('livedata');
* @see {@link https://rxjs.dev/api/index/class/BehaviorSubject}
* @see {@link https://developer.android.com/topic/libraries/architecture/livedata}
*/
export class LiveData<T = unknown> implements InteropObservable<T> {
export class LiveData<T = unknown>
extends Observable<T>
implements InteropObservable<T>
{
static from<T>(
upstream:
upstream$:
| Observable<T>
| InteropObservable<T>
| ((stream: Observable<LiveDataOperation>) => Observable<T>),
initialValue: T
): LiveData<T> {
const data = new LiveData(
const data$ = new LiveData(
initialValue,
typeof upstream === 'function'
? upstream
: stream =>
stream.pipe(
typeof upstream$ === 'function'
? upstream$
: stream$ =>
stream$.pipe(
filter(
(op): op is Exclude<LiveDataOperation, 'set'> => op !== 'set'
),
@ -121,7 +125,7 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
distinctUntilChanged(),
switchMap(op => {
if (op === 'watch') {
return upstream;
return upstream$;
} else {
return EMPTY;
}
@ -129,7 +133,7 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
)
);
return data;
return data$;
}
private static GLOBAL_COMPUTED_RECURSIVE_COUNT = 0;
@ -155,11 +159,11 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
new Observable(subscribe => {
const execute = (next: () => void) => {
const subscriptions: Subscription[] = [];
const getfn = <L>(data: LiveData<L>) => {
const getfn = <L>(data$: LiveData<L>) => {
let value = null as L;
let first = true;
subscriptions.push(
data.subscribe({
data$.subscribe({
error(err) {
subscribe.error(err);
},
@ -212,8 +216,8 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
);
}
private readonly raw: BehaviorSubject<T>;
private readonly ops = new Subject<LiveDataOperation>();
private readonly raw$: BehaviorSubject<T>;
private readonly ops$ = new Subject<LiveDataOperation>();
private readonly upstreamSubscription: Subscription | undefined;
/**
@ -232,14 +236,15 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
| ((upstream: Observable<LiveDataOperation>) => Observable<T>)
| undefined = undefined
) {
this.raw = new BehaviorSubject(initialValue);
super();
this.raw$ = new BehaviorSubject(initialValue);
if (upstream) {
this.upstreamSubscription = upstream(this.ops).subscribe({
this.upstreamSubscription = upstream(this.ops$).subscribe({
next: v => {
this.raw.next(v);
this.raw$.next(v);
},
complete: () => {
if (!this.raw.closed) {
if (!this.raw$.closed) {
logger.error('livedata upstream unexpected complete');
}
},
@ -247,7 +252,7 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
logger.error('uncatched error in livedata', err);
this.isPoisoned = true;
this.poisonedError = new PoisonedError(err);
this.raw.error(this.poisonedError);
this.raw$.error(this.poisonedError);
},
});
}
@ -257,16 +262,16 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
if (this.isPoisoned) {
throw this.poisonedError;
}
this.ops.next('get');
return this.raw.value;
this.ops$.next('get');
return this.raw$.value;
}
setValue(v: T) {
if (this.isPoisoned) {
throw this.poisonedError;
}
this.raw.next(v);
this.ops.next('set');
this.raw$.next(v);
this.ops$.next('set');
}
get value(): T {
@ -284,66 +289,81 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
this.setValue(v);
}
subscribe(
observer?: Partial<Observer<T>> | ((value: T) => void) | undefined
override subscribe(
observerOrNext?: Partial<Observer<T>> | ((value: T) => void)
): Subscription;
override subscribe(
next?: ((value: T) => void) | null,
error?: ((error: any) => void) | null,
complete?: (() => void) | null
): Subscription;
override subscribe(
observerOrNext?: Partial<Observer<T>> | ((value: T) => void) | null,
error?: ((error: any) => void) | null,
complete?: (() => void) | null
): Subscription {
this.ops.next('watch');
const subscription = this.raw.subscribe(observer);
this.ops$.next('watch');
const subscription = this.raw$.subscribe(
observerOrNext as any,
error,
complete
);
subscription.add(() => {
this.ops.next('unwatch');
this.ops$.next('unwatch');
});
return subscription;
}
map<R>(mapper: (v: T) => R) {
const sub = LiveData.from(
map<R>(mapper: (v: T) => R): LiveData<R> {
const sub$ = LiveData.from(
new Observable<R>(subscriber =>
this.subscribe({
next: v => {
subscriber.next(mapper(v));
},
complete: () => {
sub.complete();
sub$.complete();
},
})
),
undefined as R // is safe
);
return sub;
return sub$;
}
// eslint-disable-next-line rxjs/finnish
asObservable(): Observable<T> {
return new Observable<T>(subscriber => {
return this.subscribe(subscriber);
});
}
pipe(): Observable<T>;
pipe<A>(op1: OperatorFunction<T, A>): Observable<A>;
pipe<A, B>(
override pipe(): Observable<T>;
override pipe<A>(op1: OperatorFunction<T, A>): Observable<A>;
override pipe<A, B>(
op1: OperatorFunction<T, A>,
op2: OperatorFunction<A, B>
): Observable<B>;
pipe<A, B, C>(
override pipe<A, B, C>(
op1: OperatorFunction<T, A>,
op2: OperatorFunction<A, B>,
op3: OperatorFunction<B, C>
): Observable<C>;
pipe<A, B, C, D>(
override pipe<A, B, C, D>(
op1: OperatorFunction<T, A>,
op2: OperatorFunction<A, B>,
op3: OperatorFunction<B, C>,
op4: OperatorFunction<C, D>
): Observable<D>;
pipe<A, B, C, D, E>(
override pipe<A, B, C, D, E>(
op1: OperatorFunction<T, A>,
op2: OperatorFunction<A, B>,
op3: OperatorFunction<B, C>,
op4: OperatorFunction<C, D>,
op5: OperatorFunction<D, E>
): Observable<E>;
pipe<A, B, C, D, E, F>(
override pipe<A, B, C, D, E, F>(
op1: OperatorFunction<T, A>,
op2: OperatorFunction<A, B>,
op3: OperatorFunction<B, C>,
@ -351,23 +371,23 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
op5: OperatorFunction<D, E>,
op6: OperatorFunction<E, F>
): Observable<F>;
pipe(...args: any[]) {
override pipe(...args: any[]) {
return new Observable(subscriber => {
this.ops.next('watch');
this.ops$.next('watch');
// eslint-disable-next-line prefer-spread
const subscription = this.raw.pipe
.apply(this.raw, args as any)
const subscription = this.raw$.pipe
.apply(this.raw$, args as any)
.subscribe(subscriber);
subscription.add(() => {
this.ops.next('unwatch');
this.ops$.next('unwatch');
});
return subscription;
});
}
complete() {
this.ops.complete();
this.raw.complete();
this.ops$.complete();
this.raw$.complete();
this.upstreamSubscription?.unsubscribe();
}
@ -411,12 +431,12 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
if (this.isPoisoned) {
throw this.poisonedError;
}
this.ops.next('watch');
const subscription = this.raw
this.ops$.next('watch');
const subscription = this.raw$
.pipe(distinctUntilChanged(), skip(1))
.subscribe(cb);
subscription.add(() => {
this.ops.next('unwatch');
this.ops$.next('unwatch');
});
return () => subscription.unsubscribe();
};
@ -425,13 +445,17 @@ export class LiveData<T = unknown> implements InteropObservable<T> {
if (this.isPoisoned) {
throw this.poisonedError;
}
this.ops.next('watch');
this.ops$.next('watch');
setImmediate(() => {
this.ops.next('unwatch');
this.ops$.next('unwatch');
});
return this.raw.value;
return this.raw$.value;
};
protected _subscribe(): TeardownLogic {
throw new Error('Method not implemented.');
}
[Symbol.observable || '@@observable']() {
return this;
}

6
packages/common/infra/src/livedata/react.ts
View File

@ -40,13 +40,13 @@ export function useLiveData<Input extends LiveData<any> | null | undefined>(
/**
* subscribe LiveData and return the value. If the value is nullish, will suspends until the value is not nullish.
*/
export function useEnsureLiveData<T>(liveData: LiveData<T>): NonNullable<T> {
const data = useLiveData(liveData);
export function useEnsureLiveData<T>(liveData$: LiveData<T>): NonNullable<T> {
const data = useLiveData(liveData$);
if (data === null || data === undefined) {
return use(
new Promise((resolve, reject) => {
const subscription = liveData.subscribe({
const subscription = liveData$.subscribe({
next(value) {
if (value === null || value === undefined) {
resolve(value);

2
packages/common/infra/src/page/manager.ts
View File

@ -16,7 +16,7 @@ export class PageManager {
) {}
open(pageId: string) {
const pageRecord = this.pageRecordList.record(pageId).value;
const pageRecord = this.pageRecordList.record$(pageId).value;
if (!pageRecord) {
throw new Error('Page record not found');
}

6
packages/common/infra/src/page/page.ts
View File

@ -14,9 +14,9 @@ export class Doc {
return this.record.id;
}
readonly mete = this.record.meta;
readonly mode = this.record.mode;
readonly title = this.record.title;
readonly mete$ = this.record.meta$;
readonly mode$ = this.record.mode$;
readonly title$ = this.record.title$;
setMode(mode: PageMode) {
this.record.setMode(mode);

8
packages/common/infra/src/page/record-list.ts
View File

@ -11,7 +11,7 @@ export class PageRecordList {
private readonly localState: WorkspaceLocalState
) {}
public readonly records = LiveData.from<PageRecord[]>(
public readonly records$ = LiveData.from<PageRecord[]>(
new Observable<string[]>(subscriber => {
const emit = () => {
subscriber.next(
@ -35,11 +35,11 @@ export class PageRecordList {
[]
);
public readonly isReady = this.workspace.engine.rootDocState.map(
public readonly isReady$ = this.workspace.engine.rootDocState$.map(
state => !state.syncing
);
public record(id: string) {
return this.records.map(record => record.find(record => record.id === id));
public record$(id: string) {
return this.records$.map(record => record.find(record => record.id === id));
}
}

10
packages/common/infra/src/page/record.ts
View File

@ -13,7 +13,7 @@ export class PageRecord {
private readonly localState: WorkspaceLocalState
) {}
meta = LiveData.from<DocMeta>(
meta$ = LiveData.from<DocMeta>(
new Observable(subscriber => {
const emit = () => {
const meta = this.workspace.docCollection.meta.docMetas.find(
@ -45,7 +45,7 @@ export class PageRecord {
this.workspace.docCollection.setDocMeta(this.id, meta);
}
mode: LiveData<PageMode> = LiveData.from(
mode$: LiveData<PageMode> = LiveData.from(
this.localState.watch<PageMode>(`page:${this.id}:mode`),
'page'
).map(mode => (mode === 'edgeless' ? 'edgeless' : 'page'));
@ -55,9 +55,9 @@ export class PageRecord {
}
toggleMode() {
this.setMode(this.mode.value === 'edgeless' ? 'page' : 'edgeless');
return this.mode.value;
this.setMode(this.mode$.value === 'edgeless' ? 'page' : 'edgeless');
return this.mode$.value;
}
title = this.meta.map(meta => meta.title);
title$ = this.meta$.map(meta => meta.title);
}

10
packages/common/infra/src/storage/memento.ts
View File

@ -40,12 +40,12 @@ export class MemoryMemento implements Memento {
private readonly data = new Map<string, LiveData<any>>();
private getLiveData(key: string): LiveData<any> {
let data = this.data.get(key);
if (!data) {
data = new LiveData<any>(null);
this.data.set(key, data);
let data$ = this.data.get(key);
if (!data$) {
data$ = new LiveData<any>(null);
this.data.set(key, data$);
}
return data;
return data$;
}
get<T>(key: string): T | null {

4
packages/common/infra/src/workspace/__tests__/workspace.spec.ts
View File

@ -14,13 +14,13 @@ describe('Workspace System', () => {
const provider = services.provider();
const workspaceManager = provider.get(WorkspaceManager);
const workspaceListService = provider.get(WorkspaceListService);
expect(workspaceListService.workspaceList.value.length).toBe(0);
expect(workspaceListService.workspaceList$.value.length).toBe(0);
const { workspace } = workspaceManager.open(
await workspaceManager.createWorkspace(WorkspaceFlavour.LOCAL)
);
expect(workspaceListService.workspaceList.value.length).toBe(1);
expect(workspaceListService.workspaceList$.value.length).toBe(1);
const page = workspace.docCollection.createDoc({
id: 'page0',

22
packages/common/infra/src/workspace/engine/doc/index.ts
View File

@ -32,10 +32,10 @@ export class DocEngine {
storage: DocStorageInner;
engineState = LiveData.computed(get => {
const localState = get(this.localPart.engineState);
engineState$ = LiveData.computed(get => {
const localState = get(this.localPart.engineState$);
if (this.remotePart) {
const remoteState = get(this.remotePart?.engineState);
const remoteState = get(this.remotePart?.engineState$);
return {
total: remoteState.total,
syncing: remoteState.syncing,
@ -53,12 +53,12 @@ export class DocEngine {
};
});
docState(docId: string) {
const localState = this.localPart.docState(docId);
const remoteState = this.remotePart?.docState(docId);
docState$(docId: string) {
const localState$ = this.localPart.docState$(docId);
const remoteState$ = this.remotePart?.docState$(docId);
return LiveData.computed(get => {
const local = get(localState);
const remote = remoteState ? get(remoteState) : null;
const local = get(localState$);
const remote = remoteState$ ? get(remoteState$) : null;
return {
ready: local.ready,
saving: local.syncing,
@ -134,7 +134,7 @@ export class DocEngine {
*/
waitForSaved() {
return new Promise<void>(resolve => {
this.engineState
this.engineState$
.pipe(map(state => state.saving === 0))
.subscribe(saved => {
if (saved) {
@ -150,7 +150,7 @@ export class DocEngine {
*/
waitForSynced() {
return new Promise<void>(resolve => {
this.engineState
this.engineState$
.pipe(map(state => state.syncing === 0 && state.saving === 0))
.subscribe(synced => {
if (synced) {
@ -175,7 +175,7 @@ export class DocEngine {
*/
waitForReady(docId: string) {
return new Promise<void>(resolve => {
this.docState(docId)
this.docState$(docId)
.pipe(map(state => state.ready))
.subscribe(ready => {
if (ready) {

22
packages/common/infra/src/workspace/engine/doc/local.ts
View File

@ -48,7 +48,7 @@ export interface LocalDocState {
*/
export class DocEngineLocalPart {
private readonly prioritySettings = new Map<string, number>();
private readonly statusUpdatedSubject = new Subject<string>();
private readonly statusUpdatedSubject$ = new Subject<string>();
private readonly status = {
docs: new Map<string, YDoc>(),
@ -59,7 +59,7 @@ export class DocEngineLocalPart {
currentJob: null as { docId: string; jobs: Job[] } | null,
};
engineState = LiveData.from<LocalEngineState>(
engineState$ = LiveData.from<LocalEngineState>(
new Observable(subscribe => {
const next = () => {
subscribe.next({
@ -68,14 +68,14 @@ export class DocEngineLocalPart {
});
};
next();
return this.statusUpdatedSubject.subscribe(() => {
return this.statusUpdatedSubject$.subscribe(() => {
next();
});
}),
{ syncing: 0, total: 0 }
);
docState(docId: string) {
docState$(docId: string) {
return LiveData.from<LocalDocState>(
new Observable(subscribe => {
const next = () => {
@ -87,7 +87,7 @@ export class DocEngineLocalPart {
});
};
next();
return this.statusUpdatedSubject.subscribe(updatedId => {
return this.statusUpdatedSubject$.subscribe(updatedId => {
if (updatedId === docId) next();
});
}),
@ -120,7 +120,7 @@ export class DocEngineLocalPart {
}
this.status.currentJob = { docId, jobs };
this.statusUpdatedSubject.next(docId);
this.statusUpdatedSubject$.next(docId);
const { apply, load, save } = groupBy(jobs, job => job.type) as {
[key in Job['type']]?: Job[];
@ -139,7 +139,7 @@ export class DocEngineLocalPart {
}
this.status.currentJob = null;
this.statusUpdatedSubject.next(docId);
this.statusUpdatedSubject$.next(docId);
}
} finally {
dispose();
@ -161,7 +161,7 @@ export class DocEngineLocalPart {
});
this.status.docs.set(doc.guid, doc);
this.statusUpdatedSubject.next(doc.guid);
this.statusUpdatedSubject$.next(doc.guid);
},
};
@ -186,7 +186,7 @@ export class DocEngineLocalPart {
doc.on('update', this.handleDocUpdate);
this.status.connectedDocs.add(job.docId);
this.statusUpdatedSubject.next(job.docId);
this.statusUpdatedSubject$.next(job.docId);
const docData = await this.storage.loadDocFromLocal(job.docId, signal);
@ -196,7 +196,7 @@ export class DocEngineLocalPart {
this.applyUpdate(job.docId, docData);
this.status.readyDocs.add(job.docId);
this.statusUpdatedSubject.next(job.docId);
this.statusUpdatedSubject$.next(job.docId);
},
save: async (
docId: string,
@ -292,7 +292,7 @@ export class DocEngineLocalPart {
const existingJobs = this.status.jobMap.get(job.docId) ?? [];
existingJobs.push(job);
this.status.jobMap.set(job.docId, existingJobs);
this.statusUpdatedSubject.next(job.docId);
this.statusUpdatedSubject$.next(job.docId);
}
setPriority(docId: string, priority: number) {

24
packages/common/infra/src/workspace/engine/doc/remote.ts
View File

@ -81,9 +81,9 @@ export class DocEngineRemotePart {
retrying: false,
errorMessage: null,
};
private readonly statusUpdatedSubject = new Subject<string | true>();
private readonly statusUpdatedSubject$ = new Subject<string | true>();
engineState = LiveData.from<RemoteEngineState>(
engineState$ = LiveData.from<RemoteEngineState>(
new Observable(subscribe => {
const next = () => {
if (!this.status.syncing) {
@ -103,7 +103,7 @@ export class DocEngineRemotePart {
});
};
next();
return this.statusUpdatedSubject.subscribe(() => {
return this.statusUpdatedSubject$.subscribe(() => {
next();
});
}),
@ -115,7 +115,7 @@ export class DocEngineRemotePart {
}
);
docState(docId: string) {
docState$(docId: string) {
return LiveData.from<RemoteDocState>(
new Observable(subscribe => {
const next = () => {
@ -126,7 +126,7 @@ export class DocEngineRemotePart {
});
};
next();
return this.statusUpdatedSubject.subscribe(updatedId => {
return this.statusUpdatedSubject$.subscribe(updatedId => {
if (updatedId === true || updatedId === docId) next();
});
}),
@ -152,7 +152,7 @@ export class DocEngineRemotePart {
}
this.status.connectedDocs.add(docId);
this.statusUpdatedSubject.next(docId);
this.statusUpdatedSubject$.next(docId);
},
push: async (
docId: string,
@ -321,7 +321,7 @@ export class DocEngineRemotePart {
addDoc: (docId: string) => {
if (!this.status.docs.has(docId)) {
this.status.docs.add(docId);
this.statusUpdatedSubject.next(docId);
this.statusUpdatedSubject$.next(docId);
this.schedule({
type: 'connect',
docId,
@ -359,7 +359,7 @@ export class DocEngineRemotePart {
logger.error('Remote sync error, retry in 5s', err);
this.status.errorMessage =
err instanceof Error ? err.message : `${err}`;
this.statusUpdatedSubject.next(true);
this.statusUpdatedSubject$.next(true);
} finally {
this.status = {
docs: this.status.docs,
@ -371,7 +371,7 @@ export class DocEngineRemotePart {
retrying: true,
errorMessage: this.status.errorMessage,
};
this.statusUpdatedSubject.next(true);
this.statusUpdatedSubject$.next(true);
}
await Promise.race([
new Promise<void>(resolve => {
@ -420,7 +420,7 @@ export class DocEngineRemotePart {
logger.info('Remote sync started');
this.status.syncing = true;
this.statusUpdatedSubject.next(true);
this.statusUpdatedSubject$.next(true);
this.server.onInterrupted(reason => {
abort.abort(reason);
@ -471,7 +471,7 @@ export class DocEngineRemotePart {
const jobs = this.status.jobMap.get(docId);
if (!jobs || jobs.length === 0) {
this.status.jobMap.delete(docId);
this.statusUpdatedSubject.next(docId);
this.statusUpdatedSubject$.next(docId);
break;
}
@ -535,7 +535,7 @@ export class DocEngineRemotePart {
const existingJobs = this.status.jobMap.get(job.docId) ?? [];
existingJobs.push(job);
this.status.jobMap.set(job.docId, existingJobs);
this.statusUpdatedSubject.next(job.docId);
this.statusUpdatedSubject$.next(job.docId);
}
setPriority(docId: string, priority: number) {

6
packages/common/infra/src/workspace/engine/index.ts
View File

@ -52,7 +52,7 @@ export class WorkspaceEngine {
}
canGracefulStop() {
return this.doc.engineState.value.saving === 0;
return this.doc.engineState$.value.saving === 0;
}
async waitForGracefulStop(abort?: AbortSignal) {
@ -67,9 +67,9 @@ export class WorkspaceEngine {
this.blob.stop();
}
docEngineState = this.doc.engineState;
docEngineState$ = this.doc.engineState$;
rootDocState = this.doc.docState(this.yDoc.guid);
rootDocState$ = this.doc.docState$(this.yDoc.guid);
waitForSynced() {
return this.doc.waitForSynced();

20
packages/common/infra/src/workspace/list/index.ts
View File

@ -86,18 +86,18 @@ export class WorkspaceListService {
WorkspaceInformation
>();
status = new LiveData<WorkspaceListStatus>({
status$ = new LiveData<WorkspaceListStatus>({
loading: true,
workspaceList: [],
});
setStatus(status: WorkspaceListStatus) {
this.status.next(status);
this.status$.next(status);
// update cache
writeWorkspaceListCache(this.cache, status.workspaceList);
}
workspaceList = this.status.map(x => x.workspaceList);
workspaceList$ = this.status$.map(x => x.workspaceList);
constructor(
private readonly providers: WorkspaceListProvider[],
@ -106,8 +106,8 @@ export class WorkspaceListService {
// initialize workspace list from cache
const cached = readWorkspaceListCache(cache);
const workspaceList = cached;
this.status.next({
...this.status.value,
this.status$.next({
...this.status$.value,
workspaceList,
});
@ -134,7 +134,7 @@ export class WorkspaceListService {
}
const metadata = await provider.create(initial);
// update workspace list
this.setStatus(this.addWorkspace(this.status.value, metadata));
this.setStatus(this.addWorkspace(this.status$.value, metadata));
return metadata;
}
@ -157,7 +157,7 @@ export class WorkspaceListService {
await provider.delete(workspaceMetadata.id);
// delete workspace from list
this.setStatus(this.deleteWorkspace(this.status.value, workspaceMetadata));
this.setStatus(this.deleteWorkspace(this.status$.value, workspaceMetadata));
}
/**
@ -201,7 +201,7 @@ export class WorkspaceListService {
added?: WorkspaceMetadata[];
deleted?: WorkspaceMetadata[];
}) {
let status = this.status.value;
let status = this.status$.value;
for (const added of changed.added ?? []) {
status = this.addWorkspace(status, added);
@ -239,7 +239,7 @@ export class WorkspaceListService {
})
.finally(() => {
this.setStatus({
...this.status.value,
...this.status$.value,
loading: false,
});
});
@ -250,7 +250,7 @@ export class WorkspaceListService {
this.providers.map(async provider => {
try {
const list = await provider.getList();
const oldList = this.workspaceList.value.filter(
const oldList = this.workspaceList$.value.filter(
w => w.flavour === provider.name
);
this.handleWorkspaceChange({

2
packages/frontend/core/src/components/affine/affine-error-boundary/error-basic/info-logger.tsx
View File

@ -14,7 +14,7 @@ export const DumpInfo = (_props: DumpInfoProps) => {
const location = useLocation();
const workspaceList = useService(WorkspaceListService);
const currentWorkspace = useLiveData(
useService(CurrentWorkspaceService).currentWorkspace
useService(CurrentWorkspaceService).currentWorkspace$
);
const path = location.pathname;
const query = useParams();

2
packages/frontend/core/src/components/affine/awareness/index.tsx
View File

@ -9,7 +9,7 @@ import { CurrentWorkspaceService } from '../../../modules/workspace/current-work
const SyncAwarenessInnerLoggedIn = () => {
const { user } = useSession();
const currentWorkspace = useLiveData(
useService(CurrentWorkspaceService).currentWorkspace
useService(CurrentWorkspaceService).currentWorkspace$
);
useEffect(() => {

2
packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx
View File

@ -479,7 +479,7 @@ const PageHistoryManager = ({
);
const page = useService(Doc);
const [mode, setMode] = useState<PageMode>(page.mode.value);
const [mode, setMode] = useState<PageMode>(page.mode$.value);
const title = useDocCollectionPageTitle(docCollection, pageId);

34
packages/frontend/core/src/components/affine/page-properties/tags-inline-editor.tsx
View File

@ -42,8 +42,8 @@ const InlineTagsList = ({
children,
}: PropsWithChildren<InlineTagsListProps>) => {
const tagService = useService(TagService);
const tags = useLiveData(tagService.tags);
const tagIds = useLiveData(tagService.tagIdsByPageId(pageId));
const tags = useLiveData(tagService.tags$);
const tagIds = useLiveData(tagService.tagIdsByPageId$(pageId));
return (
<div className={styles.inlineTagsContainer} data-testid="inline-tags-list">
@ -83,9 +83,9 @@ export const EditTagMenu = ({
const t = useAFFiNEI18N();
const legacyProperties = useService(WorkspaceLegacyProperties);
const tagService = useService(TagService);
const tag = useLiveData(tagService.tagByTagId(tagId));
const tagColor = useLiveData(tag?.color);
const tagValue = useLiveData(tag?.value);
const tag = useLiveData(tagService.tagByTagId$(tagId));
const tagColor = useLiveData(tag?.color$);
const tagValue = useLiveData(tag?.value$);
const navigate = useNavigateHelper();
const menuProps = useMemo(() => {
@ -135,11 +135,11 @@ export const EditTagMenu = ({
options.push('-');
options.push(
tagColors.map(([name, color]) => {
tagColors.map(([name, color], i) => {
return {
text: name,
icon: (
<div className={styles.tagColorIconWrapper}>
<div key={i} className={styles.tagColorIconWrapper}>
<div
className={styles.tagColorIcon}
style={{
@ -181,8 +181,8 @@ export const EditTagMenu = ({
export const TagsEditor = ({ pageId, readonly }: TagsEditorProps) => {
const t = useAFFiNEI18N();
const tagService = useService(TagService);
const tags = useLiveData(tagService.tags);
const tagIds = useLiveData(tagService.tagIdsByPageId(pageId));
const tags = useLiveData(tagService.tags$);
const tagIds = useLiveData(tagService.tagIdsByPageId$(pageId));
const [inputValue, setInputValue] = useState('');
const [open, setOpen] = useState(false);
const [selectedTagIds, setSelectedTagIds] = useState<string[]>([]);
@ -203,15 +203,11 @@ export const TagsEditor = ({ pageId, readonly }: TagsEditorProps) => {
[setOpen, setSelectedTagIds]
);
const exactMatch = useLiveData(tagService.tagByTagValue(inputValue));
const exactMatch = useLiveData(tagService.tagByTagValue$(inputValue));
const filteredLiveData = useMemo(() => {
if (inputValue) {
return tagService.filterTagsByName(inputValue);
}
return tagService.tags;
}, [inputValue, tagService]);
const filteredTags = useLiveData(filteredLiveData);
const filteredTags = useLiveData(
inputValue ? tagService.filterTagsByName$(inputValue) : tagService.tags$
);
const onInputChange = useCallback(
(e: React.ChangeEvent<HTMLInputElement>) => {
@ -295,7 +291,7 @@ export const TagsEditor = ({ pageId, readonly }: TagsEditorProps) => {
className={styles.tagSelectorItem}
data-testid="tag-selector-item"
data-tag-id={tag.id}
data-tag-value={tag.value}
data-tag-value={tag.value$}
onClick={() => {
onAddTag(tag.id);
}}
@ -351,7 +347,7 @@ export const TagsInlineEditor = ({
className,
}: TagsInlineEditorProps) => {
const tagService = useService(TagService);
const tagIds = useLiveData(tagService.tagIdsByPageId(pageId));
const tagIds = useLiveData(tagService.tagIdsByPageId$(pageId));
const empty = !tagIds || tagIds.length === 0;
return (
<Menu

2
packages/frontend/core/src/components/affine/setting-modal/setting-sidebar/index.tsx
View File

@ -195,7 +195,7 @@ export const WorkspaceList = ({
activeSubTab: WorkspaceSubTab;
}) => {
const workspaces = useLiveData(
useService(WorkspaceManager).list.workspaceList
useService(WorkspaceManager).list.workspaceList$
);
return (
<>

2
packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/index.tsx
View File

@ -34,7 +34,7 @@ export const DeleteLeaveWorkspace = ({
const setSettingModal = useSetAtom(openSettingModalAtom);
const workspaceManager = useService(WorkspaceManager);
const workspaceList = useLiveData(workspaceManager.list.workspaceList);
const workspaceList = useLiveData(workspaceManager.list.workspaceList$);
const currentWorkspace = useService(Workspace);
const pushNotification = useSetAtom(pushNotificationAtom);

2
packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/profile.tsx
View File

@ -31,7 +31,7 @@ export const ProfilePanel = ({ isOwner, workspace }: ProfilePanelProps) => {
const t = useAFFiNEI18N();
const pushNotification = useSetAtom(pushNotificationAtom);
const workspaceIsReady = useLiveData(workspace?.engine.rootDocState)?.ready;
const workspaceIsReady = useLiveData(workspace?.engine.rootDocState$)?.ready;
const [avatarBlob, setAvatarBlob] = useState<string | null>(null);
const [name, setName] = useState('');

2
packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-export.tsx
View File

@ -26,7 +26,7 @@ export const ShareExport = ({
urlType: 'workspace',
});
const exportHandler = useExportPage(currentPage);
const currentMode = useLiveData(page.mode);
const currentMode = useLiveData(page.mode$);
return (
<>

2
packages/frontend/core/src/components/affine/share-page-modal/share-menu/share-page.tsx
View File

@ -66,7 +66,7 @@ export const AffineSharePage = (props: ShareMenuProps) => {
disableShare,
} = useIsSharedPage(workspaceId, currentPage.id);
const currentPageMode = useLiveData(page.mode);
const currentPageMode = useLiveData(page.mode$);
const defaultMode = useMemo(() => {
if (isSharedPage) {

2
packages/frontend/core/src/components/blocksuite/block-suite-header/menu/index.tsx
View File

@ -55,7 +55,7 @@ export const PageHeaderMenuButton = ({
meta => meta.id === pageId
);
const page = useService(Doc);
const currentMode = useLiveData(page.mode);
const currentMode = useLiveData(page.mode$);
const { favorite, toggleFavorite } = useFavorite(pageId);

2
packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx
View File

@ -48,7 +48,7 @@ export const EditorModeSwitch = ({
const trash = pageMeta?.trash ?? false;
const page = useService(Doc);
const currentMode = useLiveData(page.mode);
const currentMode = useLiveData(page.mode$);
useEffect(() => {
if (trash || isPublic) {

4
packages/frontend/core/src/components/blocksuite/block-suite-page-list/utils.tsx
View File

@ -19,7 +19,7 @@ export const usePageHelper = (docCollection: DocCollection) => {
const isPreferredEdgeless = useCallback(
(pageId: string) =>
pageRecordList.record(pageId).value?.mode.value === 'edgeless',
pageRecordList.record$(pageId).value?.mode$.value === 'edgeless',
[pageRecordList]
);
@ -27,7 +27,7 @@ export const usePageHelper = (docCollection: DocCollection) => {
(mode?: 'page' | 'edgeless') => {
const page = createDoc();
initEmptyPage(page);
pageRecordList.record(page.id).value?.setMode(mode || 'page');
pageRecordList.record$(page.id).value?.setMode(mode || 'page');
openPage(docCollection.id, page.id);
return page;
},

2
packages/frontend/core/src/components/page-detail-editor.tsx
View File

@ -49,7 +49,7 @@ const PageDetailEditorMain = memo(function PageDetailEditorMain({
isPublic,
publishMode,
}: PageDetailEditorProps & { page: BlockSuiteDoc }) {
const currentMode = useLiveData(useService(Doc).mode);
const currentMode = useLiveData(useService(Doc).mode$);
const mode = useMemo(() => {
const shareMode = publishMode || currentMode;

18
packages/frontend/core/src/components/page-list/docs/page-list-header.tsx
View File

@ -94,8 +94,8 @@ export const TagPageListHeader = ({
tag: Tag;
workspaceId: string;
}) => {
const tagColor = useLiveData(tag.color);
const tagTitle = useLiveData(tag.value);
const tagColor = useLiveData(tag.color$);
const tagTitle = useLiveData(tag.value$);
const t = useAFFiNEI18N();
const { jumpToTags, jumpToCollection } = useNavigateHelper();
@ -183,13 +183,9 @@ export const SwitchTag = ({ onClick }: SwitchTagProps) => {
const t = useAFFiNEI18N();
const [inputValue, setInputValue] = useState('');
const tagService = useService(TagService);
const filteredLiveData = useMemo(() => {
if (inputValue) {
return tagService.filterTagsByName(inputValue);
}
return tagService.tags;
}, [inputValue, tagService]);
const filteredTags = useLiveData(filteredLiveData);
const filteredTags = useLiveData(
inputValue ? tagService.filterTagsByName$(inputValue) : tagService.tags$
);
const onInputChange = useCallback(
(e: React.ChangeEvent<HTMLInputElement>) => {
@ -238,8 +234,8 @@ export const SwitchTag = ({ onClick }: SwitchTagProps) => {
};
const TagLink = ({ tag, onClick }: { tag: Tag; onClick: () => void }) => {
const tagColor = useLiveData(tag.color);
const tagTitle = useLiveData(tag.value);
const tagColor = useLiveData(tag.color$);
const tagTitle = useLiveData(tag.value$);
return (
<Link
key={tag.id}

3
packages/frontend/core/src/components/page-list/docs/page-list-item.tsx
View File

@ -69,8 +69,7 @@ const PageSelectionCell = ({
export const PageTagsCell = ({ pageId }: Pick<PageListItemProps, 'pageId'>) => {
const tagsService = useService(TagService);
const tagsLiveData = tagsService.tagsByPageId(pageId);
const tags = useLiveData(tagsLiveData);
const tags = useLiveData(tagsService.tagsByPageId$(pageId));
return (
<div data-testid="page-list-item-tags" className={styles.tagsCell}>

18
packages/frontend/core/src/components/page-list/docs/page-tags.tsx
View File

@ -57,8 +57,8 @@ export const TagItem = ({
style,
maxWidth,
}: TagItemProps) => {
const value = useLiveData(tag?.value);
const color = useLiveData(tag?.color);
const value = useLiveData(tag?.value$);
const color = useLiveData(tag?.color$);
const handleRemove: MouseEventHandler = useCallback(
e => {
e.stopPropagation();
@ -112,13 +112,13 @@ const TagItemNormal = ({
return maxItems ? tags.slice(0, maxItems) : tags;
}, [maxItems, tags]);
const tagsOrderedLiveData = useMemo(() => {
return LiveData.computed(get =>
[...nTags].sort((a, b) => get(a.value).length - get(b.value).length)
);
}, [nTags]);
const tagsOrdered = useLiveData(tagsOrderedLiveData);
const tagsOrdered = useLiveData(
useMemo(() => {
return LiveData.computed(get =>
[...nTags].sort((a, b) => get(a.value$).length - get(b.value$).length)
);
}, [nTags])
);
return useMemo(
() =>

4
packages/frontend/core/src/components/page-list/page-group.tsx
View File

@ -275,11 +275,11 @@ function tagIdToTagOption(
const PageTitle = ({ id }: { id: string }) => {
const page = useLiveData(
useService(PageRecordList).records.map(record => {
useService(PageRecordList).records$.map(record => {
return record.find(p => p.id === id);
})
);
const title = useLiveData(page?.title);
const title = useLiveData(page?.title$);
const t = useAFFiNEI18N();
return title || t['Untitled']();
};

4
packages/frontend/core/src/components/page-list/tags/create-tag.tsx
View File

@ -33,8 +33,8 @@ export const CreateOrEditTag = ({
tagMeta?: TagMeta;
}) => {
const tagService = useService(TagService);
const tagOptions = useLiveData(tagService.tagMetas);
const tag = useLiveData(tagService.tagByTagId(tagMeta?.id));
const tagOptions = useLiveData(tagService.tagMetas$);
const tag = useLiveData(tagService.tagByTagId$(tagMeta?.id));
const t = useAFFiNEI18N();
const [menuOpen, setMenuOpen] = useState(false);

8
packages/frontend/core/src/components/pure/cmdk/data-hooks.tsx
View File

@ -107,8 +107,8 @@ export const pageToCommand = (
subTitle?: string,
blockId?: string
): CMDKCommand => {
const pageMode = workspace.services.get(PageRecordList).record(page.id).value
?.mode.value;
const pageMode = workspace.services.get(PageRecordList).record$(page.id).value
?.mode$.value;
const title = getPageTitle(page.id) || t['Untitled']();
const commandLabel = {
@ -320,7 +320,7 @@ export const collectionToCommand = (
export const useCollectionsCommands = () => {
// todo: considering collections for searching pages
const collectionService = useService(CollectionService);
const collections = useLiveData(collectionService.collections);
const collections = useLiveData(collectionService.collections$);
const query = useAtomValue(cmdkQueryAtom);
const navigationHelper = useNavigateHelper();
const t = useAFFiNEI18N();
@ -356,7 +356,7 @@ export const useCMDKCommandGroups = () => {
const collectionCommands = useCollectionsCommands();
const currentPage = useServiceOptional(Doc);
const currentPageMode = useLiveData(currentPage?.mode);
const currentPageMode = useLiveData(currentPage?.mode$);
const affineCommands = useMemo(() => {
return getAllCommand({
pageMode: currentPageMode,

2
packages/frontend/core/src/components/pure/help-island/index.tsx
View File

@ -30,7 +30,7 @@ const showList = environment.isDesktop ? DESKTOP_SHOW_LIST : DEFAULT_SHOW_LIST;
export const HelpIsland = () => {
const page = useServiceOptional(Doc);
const pageId = page?.id;
const mode = useLiveData(page?.mode);
const mode = useLiveData(page?.mode$);
const setOpenSettingModalAtom = useSetAtom(openSettingModalAtom);
const [spread, setShowSpread] = useState(false);
const t = useAFFiNEI18N();

2
packages/frontend/core/src/components/pure/trash-page-footer/index.tsx
View File

@ -19,7 +19,7 @@ import * as styles from './styles.css';
export const TrashPageFooter = ({ pageId }: { pageId: string }) => {
const workspace = useLiveData(
useService(CurrentWorkspaceService).currentWorkspace
useService(CurrentWorkspaceService).currentWorkspace$
);
assertExists(workspace);
const docCollection = workspace.docCollection;

4
packages/frontend/core/src/components/pure/workspace-slider-bar/collections/collections-list.tsx
View File

@ -89,7 +89,7 @@ const CollectionRenderer = ({
};
return filterPage(collection, pageData);
});
const location = useLiveData(useService(Workbench).location);
const location = useLiveData(useService(Workbench).location$);
const currentPath = location.pathname;
const path = `/collection/${collection.id}`;
@ -174,7 +174,7 @@ export const CollectionsList = ({
onCreate,
}: CollectionsListProps) => {
const metas = useBlockSuiteDocMeta(workspace);
const collections = useLiveData(useService(CollectionService).collections);
const collections = useLiveData(useService(CollectionService).collections$);
const t = useAFFiNEI18N();
if (collections.length === 0) {
return (

4
packages/frontend/core/src/components/pure/workspace-slider-bar/collections/page.tsx
View File

@ -36,8 +36,8 @@ export const Page = ({
const pageId = page.id;
const active = params.pageId === pageId;
const pageRecord = useLiveData(useService(PageRecordList).record(pageId));
const pageMode = useLiveData(pageRecord?.mode);
const pageRecord = useLiveData(useService(PageRecordList).record$(pageId));
const pageMode = useLiveData(pageRecord?.mode$);
const dragItemId = getDragItemId('collectionPage', pageId);
const icon = useMemo(() => {

4
packages/frontend/core/src/components/pure/workspace-slider-bar/components/reference-page.tsx
View File

@ -27,8 +27,8 @@ export const ReferencePage = ({
const params = useParams();
const active = params.pageId === pageId;
const pageRecord = useLiveData(useService(PageRecordList).record(pageId));
const pageMode = useLiveData(pageRecord?.mode);
const pageRecord = useLiveData(useService(PageRecordList).record$(pageId));
const pageMode = useLiveData(pageRecord?.mode$);
const icon = useMemo(() => {
return pageMode === 'edgeless' ? <EdgelessIcon /> : <PageIcon />;
}, [pageMode]);

4
packages/frontend/core/src/components/pure/workspace-slider-bar/favorite/favourite-page.tsx
View File

@ -29,8 +29,8 @@ export const FavouritePage = ({
const params = useParams();
const active = params.pageId === pageId;
const dragItemId = getDragItemId('favouritePage', pageId);
const pageRecord = useLiveData(useService(PageRecordList).record(pageId));
const pageMode = useLiveData(pageRecord?.mode);
const pageRecord = useLiveData(useService(PageRecordList).record$(pageId));
const pageMode = useLiveData(pageRecord?.mode$);
const icon = useMemo(() => {
return pageMode === 'edgeless' ? <EdgelessIcon /> : <PageIcon />;

2
packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/index.tsx
View File

@ -121,7 +121,7 @@ const UserWithWorkspaceListInner = ({
}, [onEventEnd, setOpenCreateWorkspaceModal]);
const workspaceManager = useService(WorkspaceManager);
const workspaces = useLiveData(workspaceManager.list.workspaceList);
const workspaces = useLiveData(workspaceManager.list.workspaceList$);
// revalidate workspace list when mounted
useEffect(() => {

4
packages/frontend/core/src/components/pure/workspace-slider-bar/user-with-workspace-list/workspace-list/index.tsx
View File

@ -105,7 +105,7 @@ export const AFFiNEWorkspaceList = ({
onEventEnd?: () => void;
}) => {
const workspaces = useLiveData(
useService(WorkspaceManager).list.workspaceList
useService(WorkspaceManager).list.workspaceList$
);
const setOpenCreateWorkspaceModal = useSetAtom(openCreateWorkspaceModalAtom);
@ -113,7 +113,7 @@ export const AFFiNEWorkspaceList = ({
const { jumpToSubPath } = useNavigateHelper();
const currentWorkspace = useLiveData(
useService(CurrentWorkspaceService).currentWorkspace
useService(CurrentWorkspaceService).currentWorkspace$
);
const setOpenSettingModalAtom = useSetAtom(openSettingModalAtom);

2
packages/frontend/core/src/components/root-app-sidebar/index.tsx
View File

@ -99,7 +99,7 @@ export const RootAppSidebar = ({
const { appSettings } = useAppSettingHelper();
const docCollection = currentWorkspace.docCollection;
const t = useAFFiNEI18N();
const currentPath = useLiveData(useService(Workbench).location).pathname;
const currentPath = useLiveData(useService(Workbench).location$).pathname;
const onClickNewPage = useAsyncCallback(async () => {
const page = createPage();

4
packages/frontend/core/src/hooks/affine/use-block-suite-meta-helper.ts
View File

@ -111,7 +111,7 @@ export function useBlockSuiteMetaHelper(docCollection: DocCollection) {
const duplicate = useAsyncCallback(
async (pageId: string, openPageAfterDuplication: boolean = true) => {
const currentPageMode = pageRecordList.record(pageId).value?.mode.value;
const currentPageMode = pageRecordList.record$(pageId).value?.mode$.value;
const currentPageMeta = getDocMeta(pageId);
const newPage = createDoc();
const currentPage = docCollection.getDoc(pageId);
@ -137,7 +137,7 @@ export function useBlockSuiteMetaHelper(docCollection: DocCollection) {
currentPageMeta.title.replace(lastDigitRegex, '') + `(${newNumber})`;
pageRecordList
.record(newPage.id)
.record$(newPage.id)
.value?.setMode(currentPageMode || 'page');
setDocTitle(newPage.id, newPageTitle);
openPageAfterDuplication && openPage(docCollection.id, newPage.id);

2
packages/frontend/core/src/hooks/affine/use-doc-engine-status.tsx
View File

@ -4,7 +4,7 @@ import { useMemo } from 'react';
export function useDocEngineStatus() {
const workspace = useService(Workspace);
const engineState = useLiveData(workspace.engine.docEngineState);
const engineState = useLiveData(workspace.engine.docEngineState$);
const progress =
(engineState.total - engineState.syncing) / engineState.total;

2
packages/frontend/core/src/hooks/affine/use-register-blocksuite-editor-commands.tsx
View File

@ -21,7 +21,7 @@ import { useTrashModalHelper } from './use-trash-modal-helper';
export function useRegisterBlocksuiteEditorCommands() {
const page = useService(Doc);
const pageId = page.id;
const mode = useLiveData(page.mode);
const mode = useLiveData(page.mode$);
const t = useAFFiNEI18N();
const workspace = useService(Workspace);
const docCollection = workspace.docCollection;

6
packages/frontend/core/src/layouts/workspace-layout.tsx
View File

@ -56,14 +56,14 @@ export const QuickSearch = () => {
);
const workbench = useService(Workbench);
const currentPath = useLiveData(workbench.location.map(l => l.pathname));
const currentPath = useLiveData(workbench.location$.map(l => l.pathname));
const pageRecordList = useService(PageRecordList);
const currentPathId = matchPath('/:pageId', currentPath)?.params.pageId;
// TODO: getting pageid from route is fragile, get current page from context
const currentPage = useLiveData(
currentPathId ? pageRecordList.record(currentPathId) : null
currentPathId ? pageRecordList.record$(currentPathId) : null
);
const pageMeta = useLiveData(currentPage?.meta);
const pageMeta = useLiveData(currentPage?.meta$);
return (
<CMDKQuickSearchModal

6
packages/frontend/core/src/modules/collection/service.ts
View File

@ -32,7 +32,7 @@ export class CollectionService {
return this.setting.get(COLLECTIONS_TRASH_KEY) as YArray<DeletedCollection>;
}
readonly collections = LiveData.from(
readonly collections$ = LiveData.from(
new Observable<Collection[]>(subscriber => {
subscriber.next(this.collectionsYArray?.toArray() ?? []);
const fn = () => {
@ -46,7 +46,7 @@ export class CollectionService {
[]
);
readonly collectionsTrash = LiveData.from(
readonly collectionsTrash$ = LiveData.from(
new Observable<DeletedCollection[]>(subscriber => {
subscriber.next(this.collectionsTrashYArray?.toArray() ?? []);
const fn = () => {
@ -148,7 +148,7 @@ export class CollectionService {
deletePagesFromCollections(ids: string[]) {
const idSet = new Set(ids);
this.doc.transact(() => {
this.collections.value.forEach(collection => {
this.collections$.value.forEach(collection => {
this.deletePagesFromCollection(collection, idSet);
});
});

2
packages/frontend/core/src/modules/infra-web/global-scope/index.tsx
View File

@ -16,7 +16,7 @@ export const GlobalScopeProvider: React.FC<
});
const workspaceProvider = useLiveData(
currentWorkspaceService.currentWorkspace
currentWorkspaceService.currentWorkspace$
)?.services;
return (

18
packages/frontend/core/src/modules/multi-tab-sidebar/entities/tabs/journal.tsx
View File

@ -57,8 +57,8 @@ const PageItem = ({
className,
...attrs
}: PageItemProps) => {
const title = useLiveData(pageRecord.title);
const mode = useLiveData(pageRecord.mode);
const title = useLiveData(pageRecord.title$);
const mode = useLiveData(pageRecord.mode$);
const workspace = useService(Workspace);
const { isJournal } = useJournalInfoHelper(
workspace.docCollection,
@ -171,7 +171,7 @@ const sortPagesByDate = (
return [...pages].sort((a, b) => {
return (
(order === 'asc' ? 1 : -1) *
dayjs(b.meta.value[field]).diff(dayjs(a.meta.value[field]))
dayjs(b.meta$.value[field]).diff(dayjs(a.meta$.value[field]))
);
});
};
@ -193,7 +193,7 @@ const JournalDailyCountBlock = ({ date }: JournalBlockProps) => {
const t = useAFFiNEI18N();
const [activeItem, setActiveItem] = useState<NavItemName>('createdToday');
const pageRecordList = useService(PageRecordList);
const pageRecords = useLiveData(pageRecordList.records);
const pageRecords = useLiveData(pageRecordList.records$);
const navigateHelper = useNavigateHelper();
@ -201,10 +201,10 @@ const JournalDailyCountBlock = ({ date }: JournalBlockProps) => {
(field: 'createDate' | 'updatedDate') => {
return sortPagesByDate(
pageRecords.filter(pageRecord => {
if (pageRecord.meta.value.trash) return false;
if (pageRecord.meta$.value.trash) return false;
return (
pageRecord.meta.value[field] &&
dayjs(pageRecord.meta.value[field]).isSame(date, 'day')
pageRecord.meta$.value[field] &&
dayjs(pageRecord.meta$.value[field]).isSame(date, 'day')
);
}),
field
@ -321,7 +321,7 @@ const ConflictList = ({
setTrashModal({
open: true,
pageIds: [pageRecord.id],
pageTitles: [pageRecord.meta.value.title],
pageTitles: [pageRecord.meta$.value.title],
});
},
[setTrashModal]
@ -363,7 +363,7 @@ const JournalConflictBlock = ({ date }: JournalBlockProps) => {
const pageRecordList = useService(PageRecordList);
const journalHelper = useJournalHelper(workspace.docCollection);
const docs = journalHelper.getJournalsByDate(date.format('YYYY-MM-DD'));
const pageRecords = useLiveData(pageRecordList.records).filter(v => {
const pageRecords = useLiveData(pageRecordList.records$).filter(v => {
return docs.some(doc => doc.id === v.id);
});

14
packages/frontend/core/src/modules/navigation/entities/navigator.ts
View File

@ -7,12 +7,12 @@ import type { Workbench } from '../../workbench';
export class Navigator {
constructor(private readonly workbench: Workbench) {}
private readonly history = this.workbench.activeView.map(
private readonly history$ = this.workbench.activeView$.map(
view => view.history
);
private readonly location = LiveData.from(
this.history.pipe(
private readonly location$ = LiveData.from(
this.history$.pipe(
switchMap(
history =>
new Observable<{ index: number; entries: Location[] }>(subscriber => {
@ -29,11 +29,11 @@ export class Navigator {
{ index: 0, entries: [] }
);
readonly backable = this.location.map(
readonly backable$ = this.location$.map(
({ index, entries }) => index > 0 && entries.length > 1
);
readonly forwardable = this.location.map(
readonly forwardable$ = this.location$.map(
({ index, entries }) => index < entries.length - 1
);
@ -41,7 +41,7 @@ export class Navigator {
if (!environment.isDesktop) {
window.history.back();
} else {
this.history.value.back();
this.history$.value.back();
}
}
@ -49,7 +49,7 @@ export class Navigator {
if (!environment.isDesktop) {
window.history.forward();
} else {
this.history.value.forward();
this.history$.value.forward();
}
}
}

4
packages/frontend/core/src/modules/navigation/view/navigation-buttons.tsx
View File

@ -33,8 +33,8 @@ export const NavigationButtons = () => {
const navigator = useService(Navigator);
const backable = useLiveData(navigator.backable);
const forwardable = useLiveData(navigator.forwardable);
const backable = useLiveData(navigator.backable$);
const forwardable = useLiveData(navigator.forwardable$);
const handleBack = useCallback(() => {
navigator.back();

18
packages/frontend/core/src/modules/right-sidebar/entities/right-sidebar.ts
View File

@ -7,22 +7,22 @@ const RIGHT_SIDEBAR_KEY = 'app:settings:rightsidebar';
export class RightSidebar {
constructor(private readonly globalState: GlobalState) {}
readonly isOpen = LiveData.from(
readonly isOpen$ = LiveData.from(
this.globalState.watch<boolean>(RIGHT_SIDEBAR_KEY),
false
).map(Boolean);
readonly views = new LiveData<RightSidebarView[]>([]);
readonly front = this.views.map(
readonly views$ = new LiveData<RightSidebarView[]>([]);
readonly front$ = this.views$.map(
stack => stack[0] as RightSidebarView | undefined
);
readonly hasViews = this.views.map(stack => stack.length > 0);
readonly hasViews$ = this.views$.map(stack => stack.length > 0);
open() {
this._set(true);
}
toggle() {
this._set(!this.isOpen.value);
this._set(!this.isOpen$.value);
}
close() {
@ -37,15 +37,15 @@ export class RightSidebar {
* @private use `RightSidebarViewIsland` instead
*/
_append(view: RightSidebarView) {
this.views.next([...this.views.value, view]);
this.views$.next([...this.views$.value, view]);
}
/**
* @private use `RightSidebarViewIsland` instead
*/
_moveToFront(view: RightSidebarView) {
if (this.views.value.includes(view)) {
this.views.next([view, ...this.views.value.filter(v => v !== view)]);
if (this.views$.value.includes(view)) {
this.views$.next([view, ...this.views$.value.filter(v => v !== view)]);
}
}
@ -53,6 +53,6 @@ export class RightSidebar {
* @private use `RightSidebarViewIsland` instead
*/
_remove(view: RightSidebarView) {
this.views.next(this.views.value.filter(v => v !== view));
this.views$.next(this.views$.value.filter(v => v !== view));
}
}

4
packages/frontend/core/src/modules/right-sidebar/view/container.tsx
View File

@ -19,8 +19,8 @@ export const RightSidebarContainer = () => {
const [resizing, setResizing] = useState(false);
const rightSidebar = useService(RightSidebar);
const frontView = useLiveData(rightSidebar.front);
const open = useLiveData(rightSidebar.isOpen) && frontView !== undefined;
const frontView = useLiveData(rightSidebar.front$);
const open = useLiveData(rightSidebar.isOpen$) && frontView !== undefined;
const [floating, setFloating] = useState(false);
const appSidebarOpened = useAtomValue(appSidebarOpenAtom);

32
packages/frontend/core/src/modules/tag/entities/tag.ts
View File

@ -10,24 +10,24 @@ export class Tag {
private readonly pageRecordList: PageRecordList
) {}
private readonly tagOption = this.properties.tagOptions$.map(
private readonly tagOption$ = this.properties.tagOptions$.map(
tags => tags.find(tag => tag.id === this.id) as TagSchema
);
value = this.tagOption.map(tag => tag?.value || '');
value$ = this.tagOption$.map(tag => tag?.value || '');
color = this.tagOption.map(tag => tag?.color || '');
color$ = this.tagOption$.map(tag => tag?.color || '');
createDate = this.tagOption.map(tag => tag?.createDate || Date.now());
createDate$ = this.tagOption$.map(tag => tag?.createDate || Date.now());
updateDate = this.tagOption.map(tag => tag?.updateDate || Date.now());
updateDate$ = this.tagOption$.map(tag => tag?.updateDate || Date.now());
rename(value: string) {
this.properties.updateTagOption(this.id, {
id: this.id,
value,
color: this.color.value,
createDate: this.createDate.value,
color: this.color$.value,
createDate: this.createDate$.value,
updateDate: Date.now(),
});
}
@ -35,37 +35,37 @@ export class Tag {
changeColor(color: string) {
this.properties.updateTagOption(this.id, {
id: this.id,
value: this.value.value,
value: this.value$.value,
color,
createDate: this.createDate.value,
createDate: this.createDate$.value,
updateDate: Date.now(),
});
}
tag(pageId: string) {
const pageRecord = this.pageRecordList.record(pageId).value;
const pageRecord = this.pageRecordList.record$(pageId).value;
if (!pageRecord) {
return;
}
pageRecord?.setMeta({
tags: [...pageRecord.meta.value.tags, this.id],
tags: [...pageRecord.meta$.value.tags, this.id],
});
}
untag(pageId: string) {
const pageRecord = this.pageRecordList.record(pageId).value;
const pageRecord = this.pageRecordList.record$(pageId).value;
if (!pageRecord) {
return;
}
pageRecord?.setMeta({
tags: pageRecord.meta.value.tags.filter(tagId => tagId !== this.id),
tags: pageRecord.meta$.value.tags.filter(tagId => tagId !== this.id),
});
}
readonly pageIds = LiveData.computed(get => {
const pages = get(this.pageRecordList.records);
readonly pageIds$ = LiveData.computed(get => {
const pages = get(this.pageRecordList.records$);
return pages
.filter(page => get(page.meta).tags.includes(this.id))
.filter(page => get(page.meta$).tags.includes(this.id))
.map(page => page.id);
});
}

42
packages/frontend/core/src/modules/tag/service/tag.ts
View File

@ -10,7 +10,7 @@ export class TagService {
private readonly pageRecordList: PageRecordList
) {}
readonly tags = this.properties.tagOptions$.map(tags =>
readonly tags$ = this.properties.tagOptions$.map(tags =>
tags.map(tag => new Tag(tag.id, this.properties, this.pageRecordList))
);
@ -34,33 +34,33 @@ export class TagService {
this.properties.removeTagOption(tagId);
}
tagsByPageId(pageId: string) {
tagsByPageId$(pageId: string) {
return LiveData.computed(get => {
const pageRecord = get(this.pageRecordList.record(pageId));
const pageRecord = get(this.pageRecordList.record$(pageId));
if (!pageRecord) return [];
const tagIds = get(pageRecord.meta).tags;
const tagIds = get(pageRecord.meta$).tags;
return get(this.tags).filter(tag => tagIds.includes(tag.id));
return get(this.tags$).filter(tag => tagIds.includes(tag.id));
});
}
tagIdsByPageId(pageId: string) {
return this.tagsByPageId(pageId).map(tags => tags.map(tag => tag.id));
tagIdsByPageId$(pageId: string) {
return this.tagsByPageId$(pageId).map(tags => tags.map(tag => tag.id));
}
tagByTagId(tagId?: string) {
return this.tags.map(tags => tags.find(tag => tag.id === tagId));
tagByTagId$(tagId?: string) {
return this.tags$.map(tags => tags.find(tag => tag.id === tagId));
}
tagMetas = LiveData.computed(get => {
return get(this.tags).map(tag => {
tagMetas$ = LiveData.computed(get => {
return get(this.tags$).map(tag => {
return {
id: tag.id,
title: get(tag.value),
color: get(tag.color),
pageCount: get(tag.pageIds).length,
createDate: get(tag.createDate),
updatedDate: get(tag.updateDate),
title: get(tag.value$),
color: get(tag.color$),
pageCount: get(tag.pageIds$).length,
createDate: get(tag.createDate$),
updatedDate: get(tag.updateDate$),
};
});
});
@ -71,15 +71,17 @@ export class TagService {
return trimmedValue.includes(trimmedQuery);
}
filterTagsByName(name: string) {
filterTagsByName$(name: string) {
return LiveData.computed(get => {
return get(this.tags).filter(tag => this.filterFn(get(tag.value), name));
return get(this.tags$).filter(tag =>
this.filterFn(get(tag.value$), name)
);
});
}
tagByTagValue(value: string) {
tagByTagValue$(value: string) {
return LiveData.computed(get => {
return get(this.tags).find(tag => this.filterFn(get(tag.value), value));
return get(this.tags$).find(tag => this.filterFn(get(tag.value$), value));
});
}
}

4
packages/frontend/core/src/modules/tag/view/delete-tag-modal.tsx
View File

@ -17,11 +17,11 @@ export const DeleteTagConfirmModal = ({
}) => {
const t = useAFFiNEI18N();
const tagService = useService(TagService);
const tags = useLiveData(tagService.tags);
const tags = useLiveData(tagService.tags$);
const selectedTags = useMemo(() => {
return tags.filter(tag => selectedTagIds.includes(tag.id));
}, [selectedTagIds, tags]);
const tagName = useLiveData(selectedTags[0]?.value || '');
const tagName = useLiveData(selectedTags[0]?.value$ || '');
const handleDelete = useCallback(() => {
selectedTagIds.forEach(tagId => {

8
packages/frontend/core/src/modules/workbench/entities/view.ts
View File

@ -21,7 +21,7 @@ export class View {
initialIndex: 0,
});
location = LiveData.from<Location>(
location$ = LiveData.from<Location>(
new Observable(subscriber => {
subscriber.next(this.history.location);
return this.history.listen(update => {
@ -31,7 +31,7 @@ export class View {
this.history.location
);
entries = LiveData.from<Location[]>(
entries$ = LiveData.from<Location[]>(
new Observable(subscriber => {
subscriber.next(this.history.entries);
return this.history.listen(() => {
@ -41,7 +41,7 @@ export class View {
this.history.entries
);
size = new LiveData(100);
size$ = new LiveData(100);
header = createIsland();
body = createIsland();
@ -59,6 +59,6 @@ export class View {
}
setSize(size?: number) {
this.size.next(size ?? 100);
this.size$.next(size ?? 100);
}
}

62
packages/frontend/core/src/modules/workbench/entities/workbench.ts
View File

@ -13,32 +13,32 @@ interface WorkbenchOpenOptions {
}
export class Workbench {
readonly views = new LiveData([new View()]);
readonly views$ = new LiveData([new View()]);
activeViewIndex = new LiveData(0);
activeView = LiveData.from(
combineLatest([this.views, this.activeViewIndex]).pipe(
activeViewIndex$ = new LiveData(0);
activeView$ = LiveData.from(
combineLatest([this.views$, this.activeViewIndex$]).pipe(
map(([views, index]) => views[index])
),
this.views.value[this.activeViewIndex.value]
this.views$.value[this.activeViewIndex$.value]
);
basename = new LiveData('/');
basename$ = new LiveData('/');
location = LiveData.from(
this.activeView.pipe(switchMap(view => view.location)),
this.views.value[this.activeViewIndex.value].history.location
location$ = LiveData.from(
this.activeView$.pipe(switchMap(view => view.location$)),
this.views$.value[this.activeViewIndex$.value].history.location
);
active(index: number) {
this.activeViewIndex.next(index);
this.activeViewIndex$.next(index);
}
createView(at: WorkbenchPosition = 'beside', defaultLocation: To) {
const view = new View(defaultLocation);
const newViews = [...this.views.value];
const newViews = [...this.views$.value];
newViews.splice(this.indexAt(at), 0, view);
this.views.next(newViews);
this.views$.next(newViews);
return newViews.indexOf(view);
}
@ -91,33 +91,33 @@ export class Workbench {
}
viewAt(positionIndex: WorkbenchPosition): View | undefined {
return this.views.value[this.indexAt(positionIndex)];
return this.views$.value[this.indexAt(positionIndex)];
}
close(view: View) {
if (this.views.value.length === 1) return;
const index = this.views.value.indexOf(view);
if (this.views$.value.length === 1) return;
const index = this.views$.value.indexOf(view);
if (index === -1) return;
const newViews = [...this.views.value];
const newViews = [...this.views$.value];
newViews.splice(index, 1);
const activeViewIndex = this.activeViewIndex.value;
const activeViewIndex = this.activeViewIndex$.value;
if (activeViewIndex !== 0 && activeViewIndex >= index) {
this.active(activeViewIndex - 1);
}
this.views.next(newViews);
this.views$.next(newViews);
}
closeOthers(view: View) {
view.size.next(100);
this.views.next([view]);
view.size$.next(100);
this.views$.next([view]);
this.active(0);
}
moveView(from: number, to: number) {
const views = [...this.views.value];
const views = [...this.views$.value];
const [removed] = views.splice(from, 1);
views.splice(to, 0, removed);
this.views.next(views);
this.views$.next(views);
this.active(to);
}
@ -128,18 +128,18 @@ export class Workbench {
* @returns
*/
resize(index: number, percent: number) {
const view = this.views.value[index];
const nextView = this.views.value[index + 1];
const view = this.views$.value[index];
const nextView = this.views$.value[index + 1];
if (!nextView) return;
const totalViewSize = this.views.value.reduce(
(sum, v) => sum + v.size.value,
const totalViewSize = this.views$.value.reduce(
(sum, v) => sum + v.size$.value,
0
);
const percentOfTotal = totalViewSize * percent;
const newSize = Number((view.size.value + percentOfTotal).toFixed(4));
const newSize = Number((view.size$.value + percentOfTotal).toFixed(4));
const newNextSize = Number(
(nextView.size.value - percentOfTotal).toFixed(4)
(nextView.size$.value - percentOfTotal).toFixed(4)
);
// TODO: better strategy to limit size
if (newSize / totalViewSize < 0.2 || newNextSize / totalViewSize < 0.2)
@ -150,16 +150,16 @@ export class Workbench {
private indexAt(positionIndex: WorkbenchPosition): number {
if (positionIndex === 'active') {
return this.activeViewIndex.value;
return this.activeViewIndex$.value;
}
if (positionIndex === 'beside') {
return this.activeViewIndex.value + 1;
return this.activeViewIndex$.value + 1;
}
if (positionIndex === 'head') {
return 0;
}
if (positionIndex === 'tail') {
return this.views.value.length;
return this.views$.value.length;
}
return positionIndex;
}

2
packages/frontend/core/src/modules/workbench/view/browser-adapter.ts
View File

@ -29,7 +29,7 @@ export function useBindWorkbenchToBrowserRouter(
const navigate = useNavigate();
const browserLocation = useLocation();
const view = useLiveData(workbench.activeView);
const view = useLiveData(workbench.activeView$);
useEffect(() => {
return view.history.listen(update => {

6
packages/frontend/core/src/modules/workbench/view/desktop-adapter.ts
View File

@ -31,9 +31,9 @@ export function useBindWorkbenchToDesktopRouter(
return;
}
if (
workbench.location.value.pathname === newLocation.pathname &&
workbench.location.value.search === newLocation.search &&
workbench.location.value.hash === newLocation.hash
workbench.location$.value.pathname === newLocation.pathname &&
workbench.location$.value.search === newLocation.search &&
workbench.location$.value.hash === newLocation.hash
) {
return;
}

4
packages/frontend/core/src/modules/workbench/view/route-container.tsx
View File

@ -48,8 +48,8 @@ export const RouteContainer = ({ route }: Props) => {
const viewPosition = useViewPosition();
const leftSidebarOpen = useAtomValue(appSidebarOpenAtom);
const rightSidebar = useService(RightSidebar);
const rightSidebarOpen = useLiveData(rightSidebar.isOpen);
const rightSidebarHasViews = useLiveData(rightSidebar.hasViews);
const rightSidebarOpen = useLiveData(rightSidebar.isOpen$);
const rightSidebarHasViews = useLiveData(rightSidebar.hasViews$);
const handleToggleRightSidebar = useCallback(() => {
rightSidebar.toggle();
}, [rightSidebar]);

8
packages/frontend/core/src/modules/workbench/view/split-view/panel.tsx
View File

@ -45,10 +45,10 @@ export const SplitViewPanel = memo(function SplitViewPanel({
}: SplitViewPanelProps) {
const [indicatorPressed, setIndicatorPressed] = useState(false);
const ref = useRef<HTMLDivElement>(null);
const size = useLiveData(view.size);
const size = useLiveData(view.size$);
const workbench = useService(Workbench);
const activeView = useLiveData(workbench.activeView);
const views = useLiveData(workbench.views);
const activeView = useLiveData(workbench.activeView$);
const views = useLiveData(workbench.views$);
const isLast = views[views.length - 1] === view;
const {
@ -116,7 +116,7 @@ export const SplitViewPanel = memo(function SplitViewPanel({
const SplitViewMenu = ({ view }: { view: View }) => {
const t = useAFFiNEI18N();
const workbench = useService(Workbench);
const views = useLiveData(workbench.views);
const views = useLiveData(workbench.views$);
const viewIndex = views.findIndex(v => v === view);

2
packages/frontend/core/src/modules/workbench/view/use-is-active-view.tsx
View File

@ -7,6 +7,6 @@ import { useView } from './use-view';
export function useIsActiveView() {
const workbench = useService(Workbench);
const currentView = useView();
const activeView = useLiveData(workbench.activeView);
const activeView = useLiveData(workbench.activeView$);
return currentView === activeView;
}

4
packages/frontend/core/src/modules/workbench/view/use-view-position.tsx
View File

@ -10,11 +10,11 @@ export const useViewPosition = () => {
const view = useView();
const [position, setPosition] = useState(() =>
calcPosition(view, workbench.views.value)
calcPosition(view, workbench.views$.value)
);
useEffect(() => {
const subscription = workbench.views.subscribe(views => {
const subscription = workbench.views$.subscribe(views => {
setPosition(calcPosition(view, views));
});
return () => {

2
packages/frontend/core/src/modules/workbench/view/view-root.tsx
View File

@ -33,7 +33,7 @@ const warpedRoutes = viewRoutes.map(({ path, lazy }) => {
export const ViewRoot = ({ view }: { view: View }) => {
const viewRouter = useMemo(() => createMemoryRouter(warpedRoutes), []);
const location = useLiveData(view.location);
const location = useLiveData(view.location$);
useEffect(() => {
viewRouter.navigate(location).catch(err => {

2
packages/frontend/core/src/modules/workbench/view/workbench-link.tsx
View File

@ -16,7 +16,7 @@ export const WorkbenchLink = ({
>) => {
const workbench = useService(Workbench);
const { appSettings } = useAppSettingHelper();
const basename = useLiveData(workbench.basename);
const basename = useLiveData(workbench.basename$);
const handleClick = useCallback(
(event: React.MouseEvent<HTMLAnchorElement>) => {
event.preventDefault();

6
packages/frontend/core/src/modules/workbench/view/workbench-root.tsx
View File

@ -21,7 +21,7 @@ export const WorkbenchRoot = () => {
// for debugging
(window as any).workbench = workbench;
const views = useLiveData(workbench.views);
const views = useLiveData(workbench.views$);
const location = useLocation();
const basename = location.pathname.match(/\/workspace\/[^/]+/g)?.[0] ?? '/';
@ -40,8 +40,8 @@ export const WorkbenchRoot = () => {
);
useEffect(() => {
workbench.basename.next(basename);
}, [basename, workbench.basename]);
workbench.basename$.next(basename);
}, [basename, workbench.basename$]);
return (
<SplitView

6
packages/frontend/core/src/modules/workspace/current-workspace.ts
View File

@ -5,20 +5,20 @@ import { LiveData } from '@toeverything/infra/livedata';
* service to manage current workspace
*/
export class CurrentWorkspaceService {
currentWorkspace = new LiveData<Workspace | null>(null);
currentWorkspace$ = new LiveData<Workspace | null>(null);
/**
* open workspace, current workspace will be set to the workspace
* @param workspace
*/
openWorkspace(workspace: Workspace) {
this.currentWorkspace.next(workspace);
this.currentWorkspace$.next(workspace);
}
/**
* close current workspace, current workspace will be null
*/
closeWorkspace() {
this.currentWorkspace.next(null);
this.currentWorkspace$.next(null);
}
}

2
packages/frontend/core/src/pages/index.tsx
View File

@ -27,7 +27,7 @@ export const Component = () => {
const [navigating, setNavigating] = useState(false);
const [creating, setCreating] = useState(false);
const list = useLiveData(useService(WorkspaceListService).workspaceList);
const list = useLiveData(useService(WorkspaceListService).workspaceList$);
const { openPage } = useNavigateHelper();

2
packages/frontend/core/src/pages/share/share-detail-page.tsx
View File

@ -186,7 +186,7 @@ export const Component = () => {
workspaceManager,
]);
const pageTitle = useLiveData(page?.title);
const pageTitle = useLiveData(page?.title$);
usePageDocumentTitle(pageTitle);
const loginStatus = useCurrentLoginStatus();

2
packages/frontend/core/src/pages/workspace/all-collection/index.tsx
View File

@ -26,7 +26,7 @@ export const AllCollection = () => {
const [hideHeaderCreateNew, setHideHeaderCreateNew] = useState(true);
const collectionService = useService(CollectionService);
const collections = useLiveData(collectionService.collections);
const collections = useLiveData(collectionService.collections$);
const config = useAllPageListConfig();
const collectionMetas = useMemo(() => {

4
packages/frontend/core/src/pages/workspace/all-tag/index.tsx
View File

@ -32,11 +32,11 @@ const EmptyTagListHeader = () => {
export const AllTag = () => {
const tagService = useService(TagService);
const tags = useLiveData(tagService.tags);
const tags = useLiveData(tagService.tags$);
const [open, setOpen] = useState(false);
const [selectedTagIds, setSelectedTagIds] = useState<string[]>([]);
const tagMetas: TagMeta[] = useLiveData(tagService.tagMetas);
const tagMetas: TagMeta[] = useLiveData(tagService.tagMetas$);
const handleCloseModal = useCallback(
(open: boolean) => {

6
packages/frontend/core/src/pages/workspace/collection/index.tsx
View File

@ -67,7 +67,7 @@ export const CollectionDetail = ({
export const Component = function CollectionPage() {
const collectionService = useService(CollectionService);
const collections = useLiveData(collectionService.collections);
const collections = useLiveData(collectionService.collections$);
const navigate = useNavigateHelper();
const params = useParams();
const workspace = useService(Workspace);
@ -76,7 +76,7 @@ export const Component = function CollectionPage() {
useEffect(() => {
if (!collection) {
navigate.jumpToSubPath(workspace.id, WorkspaceSubPath.ALL);
const collection = collectionService.collectionsTrash.value.find(
const collection = collectionService.collectionsTrash$.value.find(
v => v.collection.id === params.collectionId
);
let text = 'Collection does not exist';
@ -94,7 +94,7 @@ export const Component = function CollectionPage() {
}
}, [
collection,
collectionService.collectionsTrash.value,
collectionService.collectionsTrash$.value,
navigate,
params.collectionId,
pushNotification,

18
packages/frontend/core/src/pages/workspace/detail-page/detail-page.tsx
View File

@ -108,9 +108,9 @@ const DetailPageImpl = memo(function DetailPageImpl() {
const isInTrash = pageMeta?.trash;
const mode = useLiveData(page.mode);
const mode = useLiveData(page.mode$);
useRegisterBlocksuiteEditorCommands();
const title = useLiveData(page.title);
const title = useLiveData(page.title$);
usePageDocumentTitle(title);
const onLoad = useCallback(
@ -156,13 +156,13 @@ const DetailPageImpl = memo(function DetailPageImpl() {
const disposable = new DisposableGroup();
pageService.getEditorMode = (pageId: string) =>
pageRecordList.record(pageId).value?.mode.value ?? 'page';
pageRecordList.record$(pageId).value?.mode$.value ?? 'page';
pageService.getDocUpdatedAt = (pageId: string) => {
const linkedPage = pageRecordList.record(pageId).value;
const linkedPage = pageRecordList.record$(pageId).value;
if (!linkedPage) return new Date();
const updatedDate = linkedPage.meta.value.updatedDate;
const createDate = linkedPage.meta.value.createDate;
const updatedDate = linkedPage.meta$.value.updatedDate;
const createDate = linkedPage.meta$.value.createDate;
return updatedDate ? new Date(updatedDate) : new Date(createDate);
};
@ -278,9 +278,9 @@ export const DetailPage = ({ pageId }: { pageId: string }): ReactElement => {
const currentWorkspace = useService(Workspace);
const pageRecordList = useService(PageRecordList);
const pageListReady = useLiveData(pageRecordList.isReady);
const pageListReady = useLiveData(pageRecordList.isReady$);
const pageRecords = useLiveData(pageRecordList.records);
const pageRecords = useLiveData(pageRecordList.records$);
const pageRecord = useMemo(
() => pageRecords.find(page => page.id === pageId),
@ -310,7 +310,7 @@ export const DetailPage = ({ pageId }: { pageId: string }): ReactElement => {
};
}, [currentWorkspace, pageId]);
const jumpOnce = useLiveData(pageRecord?.meta.map(meta => meta.jumpOnce));
const jumpOnce = useLiveData(pageRecord?.meta$.map(meta => meta.jumpOnce));
useEffect(() => {
if (jumpOnce) {

4
packages/frontend/core/src/pages/workspace/index.tsx
View File

@ -39,7 +39,7 @@ export const Component = (): ReactElement => {
const params = useParams();
const { workspaceList, loading: listLoading } = useLiveData(
useService(WorkspaceListService).status
useService(WorkspaceListService).status$
);
const workspaceManager = useService(WorkspaceManager);
@ -71,7 +71,7 @@ export const Component = (): ReactElement => {
// avoid doing operation, before workspace is loaded
const isRootDocReady =
useLiveData(workspace?.engine.rootDocState)?.ready ?? false;
useLiveData(workspace?.engine.rootDocState$)?.ready ?? false;
// if listLoading is false, we can show 404 page, otherwise we should show loading page.
if (listLoading === false && meta === undefined) {

18
packages/frontend/core/src/pages/workspace/tag/index.tsx
View File

@ -8,7 +8,7 @@ import {
ViewBodyIsland,
ViewHeaderIsland,
} from '@affine/core/modules/workbench';
import { LiveData, useLiveData, useService } from '@toeverything/infra';
import { useLiveData, useService } from '@toeverything/infra';
import { Workspace } from '@toeverything/infra';
import { useMemo } from 'react';
import { useParams } from 'react-router-dom';
@ -23,21 +23,9 @@ export const TagDetail = ({ tagId }: { tagId?: string }) => {
const pageMetas = useBlockSuiteDocMeta(currentWorkspace.docCollection);
const tagService = useService(TagService);
const currentTagLiveData = tagService.tagByTagId(tagId);
const currentTag = useLiveData(currentTagLiveData);
const currentTag = useLiveData(tagService.tagByTagId$(tagId));
const pageIdsLiveData = useMemo(
() =>
LiveData.computed(get => {
const liveTag = get(currentTagLiveData);
if (liveTag?.pageIds) {
return get(liveTag.pageIds);
}
return [];
}),
[currentTagLiveData]
);
const pageIds = useLiveData(pageIdsLiveData);
const pageIds = useLiveData(currentTag?.pageIds$);
const filteredPageMetas = useMemo(() => {
const pageIdsSet = new Set(pageIds);

6
packages/frontend/core/src/providers/modal-provider.tsx
View File

@ -192,7 +192,7 @@ export const AuthModal = (): ReactElement => {
export function CurrentWorkspaceModals() {
const currentWorkspace = useLiveData(
useService(CurrentWorkspaceService).currentWorkspace
useService(CurrentWorkspaceService).currentWorkspace$
);
const [openDisableCloudAlertModal, setOpenDisableCloudAlertModal] = useAtom(
openDisableCloudAlertModalAtom
@ -227,10 +227,10 @@ export const SignOutConfirmModal = () => {
const { openPage } = useNavigateHelper();
const [open, setOpen] = useAtom(openSignOutModalAtom);
const currentWorkspace = useLiveData(
useService(CurrentWorkspaceService).currentWorkspace
useService(CurrentWorkspaceService).currentWorkspace$
);
const workspaces = useLiveData(
useService(WorkspaceManager).list.workspaceList
useService(WorkspaceManager).list.workspaceList$
);
const onConfirm = useAsyncCallback(async () => {

8
packages/frontend/core/src/utils/island.tsx
View File

@ -3,7 +3,7 @@ import { useEffect, useRef } from 'react';
import { createPortal } from 'react-dom';
export const createIsland = () => {
const targetLiveData = new LiveData<HTMLDivElement | null>(null);
const targetLiveData$ = new LiveData<HTMLDivElement | null>(null);
let mounted = false;
let provided = false;
return {
@ -14,16 +14,16 @@ export const createIsland = () => {
throw new Error('Island should not be mounted more than once');
}
mounted = true;
targetLiveData.next(target.current);
targetLiveData$.next(target.current);
return () => {
mounted = false;
targetLiveData.next(null);
targetLiveData$.next(null);
};
}, []);
return <div {...other} ref={target}></div>;
},
Provider: ({ children }: React.PropsWithChildren) => {
const target = useLiveData(targetLiveData);
const target = useLiveData(targetLiveData$);
useEffect(() => {
if (provided === true && process.env.NODE_ENV !== 'production') {
throw new Error('Island should not be provided more than once');

10
packages/frontend/electron/src/helper/db/ensure-db.ts
View File

@ -38,9 +38,9 @@ export const db$Map = new Map<string, Observable<WorkspaceSQLiteDB>>();
const beforeQuit$ = defer(() => fromEvent(process, 'beforeExit'));
// return a stream that emit a single event when the subject completes
function completed<T>(subject: Subject<T>) {
function completed<T>(subject$: Subject<T>) {
return new Observable(subscriber => {
const sub = subject.subscribe({
const sub = subject$.subscribe({
complete: () => {
subscriber.next();
subscriber.complete();
@ -50,7 +50,7 @@ function completed<T>(subject: Subject<T>) {
});
}
function getWorkspaceDB$(id: string) {
function getWorkspaceDB(id: string) {
if (!db$Map.has(id)) {
db$Map.set(
id,
@ -103,7 +103,7 @@ function getWorkspaceDB$(id: string) {
function startPollingSecondaryDB(db: WorkspaceSQLiteDB) {
return merge(
getWorkspaceMeta(db.workspaceId),
workspaceSubjects.meta.pipe(
workspaceSubjects.meta$.pipe(
map(({ meta }) => meta),
filter(meta => meta.id === db.workspaceId)
)
@ -141,5 +141,5 @@ function startPollingSecondaryDB(db: WorkspaceSQLiteDB) {
}
export function ensureSQLiteDB(id: string) {
return lastValueFrom(getWorkspaceDB$(id).pipe(take(1)));
return lastValueFrom(getWorkspaceDB(id).pipe(take(1)));
}

2
packages/frontend/electron/src/helper/db/index.ts
View File

@ -48,7 +48,7 @@ export const dbEvents = {
docId?: string;
}) => void
) => {
const sub = dbSubjects.externalUpdate.subscribe(fn);
const sub = dbSubjects.externalUpdate$.subscribe(fn);
return () => {
sub.unsubscribe();
};

2
packages/frontend/electron/src/helper/db/subjects.ts
View File

@ -1,7 +1,7 @@
import { Subject } from 'rxjs';
export const dbSubjects = {
externalUpdate: new Subject<{
externalUpdate$: new Subject<{
workspaceId: string;
update: Uint8Array;
docId?: string;

2
packages/frontend/electron/src/helper/db/workspace-db-adapter.ts
View File

@ -66,7 +66,7 @@ export class WorkspaceSQLiteDB extends BaseSQLiteAdapter {
if (origin === 'renderer') {
await this.addUpdateToSQLite(insertRows);
} else if (origin === 'external') {
dbSubjects.externalUpdate.next({
dbSubjects.externalUpdate$.next({
workspaceId: this.workspaceId,
update,
docId,

2
packages/frontend/electron/src/helper/workspace/handlers.ts
View File

@ -97,7 +97,7 @@ export async function storeWorkspaceMeta(
...meta,
};
await fs.writeJSON(metaPath, newMeta);
workspaceSubjects.meta.next({
workspaceSubjects.meta$.next({
workspaceId,
meta: newMeta,
});

2
packages/frontend/electron/src/helper/workspace/index.ts
View File

@ -10,7 +10,7 @@ export const workspaceEvents = {
onMetaChange: (
fn: (meta: { workspaceId: string; meta: WorkspaceMeta }) => void
) => {
const sub = workspaceSubjects.meta.subscribe(fn);
const sub = workspaceSubjects.meta$.subscribe(fn);
return () => {
sub.unsubscribe();
};

2
packages/frontend/electron/src/helper/workspace/subjects.ts
View File

@ -3,5 +3,5 @@ import { Subject } from 'rxjs';
import type { WorkspaceMeta } from '../type';
export const workspaceSubjects = {
meta: new Subject<{ workspaceId: string; meta: WorkspaceMeta }>(),
meta$: new Subject<{ workspaceId: string; meta: WorkspaceMeta }>(),
};

4
packages/frontend/electron/src/main/application-menu/create.ts
View File

@ -26,7 +26,7 @@ export function createApplicationMenu() {
label: `About ${app.getName()}`,
click: async () => {
await showMainWindow();
applicationMenuSubjects.openAboutPageInSettingModal.next();
applicationMenuSubjects.openAboutPageInSettingModal$.next();
},
},
{ type: 'separator' },
@ -52,7 +52,7 @@ export function createApplicationMenu() {
click: async () => {
await initAndShowMainWindow();
// fixme: if the window is just created, the new page action will not be triggered
applicationMenuSubjects.newPageAction.next();
applicationMenuSubjects.newPageAction$.next();
},
},
{ type: 'separator' },

4
packages/frontend/electron/src/main/application-menu/index.ts
View File

@ -12,14 +12,14 @@ export const applicationMenuEvents = {
* File -> New Doc
*/
onNewPageAction: (fn: () => void) => {
const sub = applicationMenuSubjects.newPageAction.subscribe(fn);
const sub = applicationMenuSubjects.newPageAction$.subscribe(fn);
return () => {
sub.unsubscribe();
};
},
openAboutPageInSettingModal: (fn: () => void) => {
const sub =
applicationMenuSubjects.openAboutPageInSettingModal.subscribe(fn);
applicationMenuSubjects.openAboutPageInSettingModal$.subscribe(fn);
return () => {
sub.unsubscribe();
};

4
packages/frontend/electron/src/main/application-menu/subject.ts
View File

@ -1,6 +1,6 @@
import { Subject } from 'rxjs';
export const applicationMenuSubjects = {
newPageAction: new Subject<void>(),
openAboutPageInSettingModal: new Subject<void>(),
newPageAction$: new Subject<void>(),
openAboutPageInSettingModal$: new Subject<void>(),
};

28
packages/frontend/electron/src/main/main-window.ts
View File

@ -104,7 +104,7 @@ async function createWindow(additionalArguments: string[]) {
logger.info('main window is ready to show');
if (browserWindow.isMaximized() || browserWindow.isFullScreen()) {
uiSubjects.onMaximized.next(true);
uiSubjects.onMaximized$.next(true);
}
handleWebContentsResize().catch(logger.error);
@ -141,20 +141,20 @@ async function createWindow(additionalArguments: string[]) {
browserWindow.setSize(size[0] + 1, size[1] + 1);
browserWindow.setSize(size[0], size[1]);
});
uiSubjects.onMaximized.next(false);
uiSubjects.onMaximized$.next(false);
});
browserWindow.on('maximize', () => {
uiSubjects.onMaximized.next(true);
uiSubjects.onMaximized$.next(true);
});
// full-screen == maximized in UI on windows
browserWindow.on('enter-full-screen', () => {
uiSubjects.onMaximized.next(true);
uiSubjects.onMaximized$.next(true);
});
browserWindow.on('unmaximize', () => {
uiSubjects.onMaximized.next(false);
uiSubjects.onMaximized$.next(false);
});
/**
@ -172,7 +172,7 @@ async function createWindow(additionalArguments: string[]) {
}
// singleton
let browserWindow$: Promise<BrowserWindow> | undefined;
let browserWindow: Promise<BrowserWindow> | undefined;
// a hidden window that prevents the app from quitting on MacOS
let hiddenMacWindow: BrowserWindow | undefined;
@ -181,11 +181,11 @@ let hiddenMacWindow: BrowserWindow | undefined;
* Init main BrowserWindow. Will create a new window if it's not created yet.
*/
export async function initAndShowMainWindow() {
if (!browserWindow$ || (await browserWindow$.then(w => w.isDestroyed()))) {
if (!browserWindow || (await browserWindow.then(w => w.isDestroyed()))) {
const additionalArguments = await getWindowAdditionalArguments();
browserWindow$ = createWindow(additionalArguments);
browserWindow = createWindow(additionalArguments);
}
const mainWindow = await browserWindow$;
const mainWindow = await browserWindow;
if (IS_DEV) {
// do not gain focus in dev mode
@ -209,8 +209,8 @@ export async function initAndShowMainWindow() {
}
export async function getMainWindow() {
if (!browserWindow$) return;
const window = await browserWindow$;
if (!browserWindow) return;
const window = await browserWindow;
if (window.isDestroyed()) return;
return window;
}
@ -251,7 +251,7 @@ export async function setCookie(
arg0: CookiesSetDetails | string,
arg1?: string
) {
const window = await browserWindow$;
const window = await browserWindow;
if (!window) {
// do nothing if window is not ready
return;
@ -271,7 +271,7 @@ export async function setCookie(
}
export async function removeCookie(url: string, name: string): Promise<void> {
const window = await browserWindow$;
const window = await browserWindow;
if (!window) {
// do nothing if window is not ready
return;
@ -280,7 +280,7 @@ export async function removeCookie(url: string, name: string): Promise<void> {
}
export async function getCookie(url?: string, name?: string) {
const window = await browserWindow$;
const window = await browserWindow;
if (!window) {
// do nothing if window is not ready
return;

14
packages/frontend/electron/src/main/onboarding.ts
View File

@ -96,23 +96,23 @@ async function createOnboardingWindow(additionalArguments: string[]) {
return browserWindow;
}
let onBoardingWindow$: Promise<BrowserWindow> | undefined;
let onBoardingWindow: Promise<BrowserWindow> | undefined;
export async function getOrCreateOnboardingWindow() {
const additionalArguments = await getWindowAdditionalArguments();
if (
!onBoardingWindow$ ||
(await onBoardingWindow$.then(w => w.isDestroyed()))
!onBoardingWindow ||
(await onBoardingWindow.then(w => w.isDestroyed()))
) {
onBoardingWindow$ = createOnboardingWindow(additionalArguments);
onBoardingWindow = createOnboardingWindow(additionalArguments);
}
return onBoardingWindow$;
return onBoardingWindow;
}
export async function getOnboardingWindow() {
if (!onBoardingWindow$) return;
const window = await onBoardingWindow$;
if (!onBoardingWindow) return;
const window = await onBoardingWindow;
if (window.isDestroyed()) return;
return window;
}

2
packages/frontend/electron/src/main/ui/events.ts
View File

@ -6,7 +6,7 @@ import { uiSubjects } from './subject';
*/
export const uiEvents = {
onMaximized: (fn: (maximized: boolean) => void) => {
const sub = uiSubjects.onMaximized.subscribe(fn);
const sub = uiSubjects.onMaximized$.subscribe(fn);
return () => {
sub.unsubscribe();
};

2
packages/frontend/electron/src/main/ui/subject.ts
View File

@ -1,5 +1,5 @@
import { Subject } from 'rxjs';
export const uiSubjects = {
onMaximized: new Subject<boolean>(),
onMaximized$: new Subject<boolean>(),
};

8
packages/frontend/electron/src/main/updater/electron-updater.ts
View File

@ -67,7 +67,7 @@ export const downloadUpdate = async () => {
return;
}
downloading = true;
updaterSubjects.downloadProgress.next(0);
updaterSubjects.downloadProgress$.next(0);
autoUpdater.downloadUpdate().catch(e => {
downloading = false;
logger.error('Failed to download update', e);
@ -115,7 +115,7 @@ export const registerUpdater = async () => {
console.error(err);
});
}
updaterSubjects.updateAvailable.next({
updaterSubjects.updateAvailable$.next({
version: info.version,
allowAutoUpdate,
});
@ -125,11 +125,11 @@ export const registerUpdater = async () => {
});
autoUpdater.on('download-progress', e => {
logger.info(`Download progress: ${e.percent}`);
updaterSubjects.downloadProgress.next(e.percent);
updaterSubjects.downloadProgress$.next(e.percent);
});
autoUpdater.on('update-downloaded', e => {
downloading = false;
updaterSubjects.updateReady.next({
updaterSubjects.updateReady$.next({
version: e.version,
allowAutoUpdate,
});

12
packages/frontend/electron/src/main/updater/event.ts
View File

@ -9,26 +9,26 @@ export interface UpdateMeta {
export const updaterSubjects = {
// means it is ready for restart and install the new version
updateAvailable: new Subject<UpdateMeta>(),
updateReady: new Subject<UpdateMeta>(),
downloadProgress: new BehaviorSubject<number>(0),
updateAvailable$: new Subject<UpdateMeta>(),
updateReady$: new Subject<UpdateMeta>(),
downloadProgress$: new BehaviorSubject<number>(0),
};
export const updaterEvents = {
onUpdateAvailable: (fn: (versionMeta: UpdateMeta) => void) => {
const sub = updaterSubjects.updateAvailable.subscribe(fn);
const sub = updaterSubjects.updateAvailable$.subscribe(fn);
return () => {
sub.unsubscribe();
};
},
onUpdateReady: (fn: (versionMeta: UpdateMeta) => void) => {
const sub = updaterSubjects.updateReady.subscribe(fn);
const sub = updaterSubjects.updateReady$.subscribe(fn);
return () => {
sub.unsubscribe();
};
},
onDownloadProgress: (fn: (progress: number) => void) => {
const sub = updaterSubjects.downloadProgress.subscribe(fn);
const sub = updaterSubjects.downloadProgress$.subscribe(fn);
return () => {
sub.unsubscribe();
};

9
packages/frontend/electron/src/main/windows-manager/windows.ts
View File

@ -1,9 +0,0 @@
import type { BrowserWindow } from 'electron';
import type { LaunchStage } from './types';
export const windows$: Record<LaunchStage, Promise<BrowserWindow> | undefined> =
{
main: undefined,
onboarding: undefined,
};

Some files were not shown because too many files have changed in this diff Show More