Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-13 12:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(editor): cleanup ts-expect-error (#9369)

Browse Source
This commit is contained in:
Saul-Mirone
2024-12-27 05:14:23 +00:00
parent 908e3efd12
commit 2b27d62b0e
35 changed files with 84 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
blocksuite/framework/block-std/src/gfx/model/surface/decorators/common.ts
View File

@@ -13,9 +13,9 @@ export function setObjectPropMeta(
prop: string | symbol,
val: unknown
) {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
target[symbol] = target[symbol] ?? {};
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
target[symbol][prop] = val;
}
@@ -32,11 +32,11 @@ export function getObjectPropMeta(
prop?: string | symbol
) {
if (prop) {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
return target[symbol]?.[prop] ?? null;
}
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
return target[symbol] ?? {};
}

2
blocksuite/framework/block-std/src/gfx/model/surface/decorators/derive.ts
View File

@@ -56,7 +56,7 @@ export function updateDerivedProps(
const decoratorState = getDecoratorState(receiver.surface);
decoratorState.deriving = true;
keys(derivedProps).forEach(key => {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
receiver[key] = derivedProps[key];
});
decoratorState.deriving = false;

6
blocksuite/framework/block-std/src/gfx/model/surface/decorators/observer.ts
View File

@@ -62,10 +62,10 @@ export function startObserve(
) {
const proto = Object.getPrototypeOf(receiver);
const observeFn = getObserveMeta(proto, prop as string)!;
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
const observerDisposable = receiver[observerDisposableSymbol] ?? {};
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
receiver[observerDisposableSymbol] = observerDisposable;
if (observerDisposable[prop]) {
@@ -114,7 +114,7 @@ export function initializeObservers(
});
receiver['_disposable'].add(() => {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
Object.values(receiver[observerDisposableSymbol] ?? {}).forEach(dispose =>
(dispose as () => void)()
);

2
blocksuite/framework/block-std/src/gfx/model/surface/element-model.ts
View File

@@ -277,7 +277,7 @@ export abstract class GfxPrimitiveElementModel<
const value = this._stashed.get(prop);
this._stashed.delete(prop);
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
delete this[prop];
if (getFieldPropsSet(this).has(prop as string)) {

6
blocksuite/framework/block-std/src/gfx/model/surface/local-element-model.ts
View File

@@ -126,14 +126,14 @@ export abstract class GfxLocalElementModel implements GfxCompatibleInterface {
this._local.delete('deserializedXYWH');
}
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
const oldValue = target[prop as string];
if (oldValue === value) {
return true;
}
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
target[prop as string] = value;
if (!this._props.has(prop)) {
@@ -158,7 +158,7 @@ export abstract class GfxLocalElementModel implements GfxCompatibleInterface {
},
});
// eslint-disable-next-line no-constructor-return
// oxlint-disable-next-line no-constructor-return
return p;
}

16
blocksuite/framework/block-std/src/gfx/model/surface/surface-model.ts
View File

@@ -142,7 +142,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
Object.keys(rest).forEach(key => {
if (props[key] !== undefined) {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
elementModel.model[key] = props[key];
}
});
@@ -177,7 +177,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
state.skipField = options.skipFieldInit ?? false;
let mounted = false;
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
Ctor['_decoratorState'] = state;
const elementModel = new Ctor({
@@ -188,7 +188,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
onChange: payload => mounted && options.onChange({ id, ...payload }),
}) as GfxPrimitiveElementModel;
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
delete Ctor['_decoratorState'];
state.creating = false;
state.skipField = false;
@@ -364,7 +364,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
{
const group = this.getGroup(payload.id);
if (group) {
// eslint-disable-next-line unicorn/prefer-dom-node-remove
// oxlint-disable-next-line unicorn/prefer-dom-node-remove
group.removeChild(payload.model as GfxModel);
}
}
@@ -385,7 +385,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
throw new Error(`Invalid element type: ${type}`);
}
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
return (ctor.propsToY ?? GfxPrimitiveElementModel.propsToY)(props);
}
@@ -449,7 +449,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
const id = nanoid();
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
props.id = id;
const elementModel = this._createElementFromProps(props, {
@@ -502,7 +502,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
});
}
// eslint-disable-next-line unicorn/prefer-dom-node-remove
// oxlint-disable-next-line unicorn/prefer-dom-node-remove
group?.removeChild(element as GfxModel);
this.elements.getValue()!.delete(id);
@@ -612,7 +612,7 @@ export class SurfaceBlockModel extends BlockModel<SurfaceBlockProps> {
props as Record<string, unknown>
) as T;
Object.entries(props).forEach(([key, value]) => {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
elementModel[key] = value;
});
});

6
blocksuite/framework/block-std/src/gfx/tool/tool-controller.ts
View File

@@ -129,7 +129,7 @@ export class ToolController extends GfxExtension {
});
get currentTool$() {
// eslint-disable-next-line @typescript-eslint/no-this-alias
// oxlint-disable-next-line typescript/no-this-alias
const self = this;
return {
@@ -143,7 +143,7 @@ export class ToolController extends GfxExtension {
}
get currentToolOption$() {
// eslint-disable-next-line @typescript-eslint/no-this-alias
// oxlint-disable-next-line typescript/no-this-alias
const self = this;
return {
@@ -475,7 +475,7 @@ export class ToolController extends GfxExtension {
};
this.std.provider.getAll(ToolIdentifier).forEach(tool => {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
tool['eventTarget'] = eventTarget;
this._register(tool);
});

2
blocksuite/framework/block-std/src/view/element/gfx-block-component.ts
View File

@@ -133,7 +133,7 @@ export function toGfxBlockComponent<
WidgetName extends string,
B extends typeof BlockComponent<Model, Service, WidgetName>,
>(CustomBlock: B) {
// @ts-expect-error FIXME: ts error
// @ts-expect-error ignore
return class extends CustomBlock {
[GfxElementSymbol] = true;