Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

Seanaye/chore/enable typescript strict (#5793)

Sean Aye6c4e3c9403db
diff --git a/apps/web/src/components/app/app-sidebar/sidebar.tsx b/apps/web/src/components/app/app-sidebar/sidebar.tsx
index 4c8e3fd948..f2f1160b62 100644
--- a/apps/web/src/components/app/app-sidebar/sidebar.tsx
+++ b/apps/web/src/components/app/app-sidebar/sidebar.tsx
@@ -127,7 +127,7 @@ interface SidebarItem {
href: string;
params?: Record<string, unknown>;
icon?: Component<
- JSX.SvgSVGAttributes<SVGSVGElement> | { triggerAnimation?: boolean }
+ JSX.SvgSVGAttributes<SVGSVGElement> & { triggerAnimation?: boolean }
>;
hotkey: ValidHotkey;
hotkeyToken: HotkeyToken;
diff --git a/apps/web/src/components/app/split-layout/SplitLayoutRoute.tsx b/apps/web/src/components/app/split-layout/SplitLayoutRoute.tsx
index 4a4edd20f7..63448b6e3c 100644
--- a/apps/web/src/components/app/split-layout/SplitLayoutRoute.tsx
+++ b/apps/web/src/components/app/split-layout/SplitLayoutRoute.tsx
@@ -3,13 +3,7 @@ import type { WithRequired } from '@core/util/withRequired';
import type { RouteDefinition, RouteSectionProps } from '@solidjs/router';
import { SplitLayoutContainer } from './SplitLayout';
-type LayoutPath = {
- params: {
- splits: string | undefined;
- };
-};
-
-function LayoutRoute(props: RouteSectionProps & LayoutPath) {
+function LayoutRoute(props: RouteSectionProps) {
return (
<SplitLayoutContainer
pairs={props.params.splits?.split('/') ?? []}
diff --git a/apps/web/src/components/app/split-layout/componentRegistry.tsx b/apps/web/src/components/app/split-layout/componentRegistry.tsx
index 7d8e6dba22..2ea3e5c2be 100644
--- a/apps/web/src/components/app/split-layout/componentRegistry.tsx
+++ b/apps/web/src/components/app/split-layout/componentRegistry.tsx
@@ -66,7 +66,9 @@ const withAuth = <P extends object>(Comp: Component<P>): Component<P> => {
};
};
-type ComponentFactory = (params?: Record<string, any>) => JSXElement;
+type ComponentParams = Record<string, unknown>;
+
+type ComponentFactory = (params: ComponentParams) => JSXElement;
type DocumentsComponentParams = {
initialFilters?: Query;
@@ -131,12 +133,12 @@ function RedirectSplit(props: { to: SplitContent }) {
export function resolveComponent(
name: string,
- params?: Record<string, any>
+ params?: ComponentParams
): ResolvedComponent {
const registration = REGISTRY.get(name);
if (!registration) throw new Error(`Component '${name}' not registered`);
return {
- element: () => registration.factory(params),
+ element: () => registration.factory(params ?? {}),
initialMeta: registration.initialMeta,
};
}
@@ -549,13 +551,20 @@ registerComponent('email-compose', (params) => {
usePageViewTracking('email-compose');
// mailto: links land here as `component/[email protected],[email protected]`.
const toParam = new URLSearchParams(window.location.search).get('to');
+ const paramsInitialTo = Array.isArray(params.initialTo)
+ ? params.initialTo.filter(
+ (value): value is string => typeof value === 'string'
+ )
+ : undefined;
const initialTo =
- params?.initialTo ??
+ paramsInitialTo ??
toParam
?.split(',')
.map((e) => e.trim())
.filter(Boolean);
- return <EmailCompose draftID={params?.draftID} initialTo={initialTo} />;
+ const draftID =
+ typeof params.draftID === 'string' ? params.draftID : undefined;
+ return <EmailCompose draftID={draftID} initialTo={initialTo} />;
});
registerComponent('task-compose', (params) => {
usePageViewTracking('task-compose');
diff --git a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
index 19955ed81f..fc7708aacb 100644
--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
@@ -15,7 +15,7 @@ import { TOKENS } from '@core/hotkey/tokens';
import { isMobile } from '@core/mobile/isMobile';
import { isNativeMobilePlatform } from '@core/mobile/isNativeMobilePlatform';
import { isTouchDevice } from '@core/mobile/isTouchDevice';
-import type { EntityDragEvent } from '@entity';
+import { type EntityDragEvent, isEntityDragEvent } from '@entity';
import { AnimatedSquareSidebarIcon } from '@icon/square-sidebar';
import SplitIcon from '@icon/wide-newSplit.svg';
import { ContextMenu } from '@kobalte/core/context-menu';
@@ -487,11 +487,12 @@ export function SplitHeader(props: {
);
});
- onDragEnd((event: EntityDragEvent) => {
- if (event.droppable?.id !== droppableId) return;
+ onDragEnd((event) => {
+ if (!isEntityDragEvent(event) || event.droppable?.id !== droppableId) {
+ return;
+ }
- const data = event.draggable?.data;
- if (!data || data.dragType !== 'entity') return;
+ const data = event.draggable.data;
const current = panel.handle.content();
const next = getEntitySplitContent(data);
diff --git a/apps/web/src/features/block-canvas/component/FileSelector.tsx b/apps/web/src/features/block-canvas/component/FileSelector.tsx
index 1c09cae5ff..e8c40f5bb4 100644
--- a/apps/web/src/features/block-canvas/component/FileSelector.tsx
+++ b/apps/web/src/features/block-canvas/component/FileSelector.tsx
@@ -28,7 +28,7 @@ function ItemOption(props: { file: FileItem; type: ItemType }) {
const toolManager = useToolManager();
const select = useSelect();
- const selectFile = (e: MouseEvent | TouchEvent) => {
+ const selectFile = (e: Event) => {
e.stopPropagation();
e.preventDefault();
select.abort();
diff --git a/apps/web/src/features/block-canvas/util/rectangle.ts b/apps/web/src/features/block-canvas/util/rectangle.ts
index 191480437c..190e35455f 100644
--- a/apps/web/src/features/block-canvas/util/rectangle.ts
+++ b/apps/web/src/features/block-canvas/util/rectangle.ts
@@ -144,9 +144,10 @@ const rectangleMethods = {
},
alignToTarget(
+ this: Rectangle,
target: Rectangle,
opts: { x?: 'left' | 'center' | 'right'; y: 'top' | 'center' | 'bottom' }
- ) {
+ ): Rectangle {
let x = this.x;
let y = this.y;
diff --git a/apps/web/src/features/block-email/util/recipientConversion.ts b/apps/web/src/features/block-email/util/recipientConversion.ts
index 1e414ca21e..2f3803a5b4 100644
--- a/apps/web/src/features/block-email/util/recipientConversion.ts
+++ b/apps/web/src/features/block-email/util/recipientConversion.ts
@@ -48,7 +48,7 @@ export const getReplyAllRecipients = (
// If last message was from user - reply to the to recipients (cc is handled separately below)
if (referenceMessage?.from?.email === userEmail) {
if (referenceMessage.to && referenceMessage.to.length > 0) {
- to = referenceMessage.to.map(recipientEntityMapper('contact'));
+ to = referenceMessage.to.map(convertContactInfoToEmailRecipient);
}
// Otherwise keep existing recipients
} else {
diff --git a/apps/web/src/features/block-md/component/MarkdownEditor.tsx b/apps/web/src/features/block-md/component/MarkdownEditor.tsx
index 4e77ece7e5..b26ab5d79d 100644
--- a/apps/web/src/features/block-md/component/MarkdownEditor.tsx
+++ b/apps/web/src/features/block-md/component/MarkdownEditor.tsx
@@ -159,7 +159,7 @@ import { useBlockDocumentName } from '@core/util/currentBlockDocumentName';
import { isSourceDSS, isSourceSyncService } from '@core/util/source';
import { bufToString } from '@core/util/string';
import { handleFileFolderDrop } from '@core/util/upload';
-import type { EntityDragEvent } from '@entity';
+import { type EntityDragEvent, isEntityDragEvent } from '@entity';
import type { LoroManager } from '@macro-inc/collaboration/collab/manager';
import {
$isInlineSearchNode,
@@ -429,17 +429,17 @@ export function MarkdownEditor(props: {
});
}, 60);
- onDragEnd((event: EntityDragEvent) => {
+ onDragEnd((event) => {
// dndDragMove is a trailing throttle, so a callback scheduled just before
// the drop would otherwise fire after it and could re-show the indicator.
dndDragMove.clear();
// Only soup entity drags insert mentions (not e.g. sidebar favorite drags).
- if (event.draggable?.data.dragType !== 'entity') return;
+ if (!isEntityDragEvent(event)) return;
dndDragEnd(event);
});
- onDragMove((event: EntityDragEvent) => {
- if (event.draggable?.data.dragType !== 'entity') return;
+ onDragMove((event) => {
+ if (!isEntityDragEvent(event)) return;
dndDragMove(event);
});
diff --git a/apps/web/src/features/block-pdf/PdfViewer/InternalPDFViewer.ts b/apps/web/src/features/block-pdf/PdfViewer/InternalPDFViewer.ts
index b9b9f6ceab..3a3bdd71cf 100644
--- a/apps/web/src/features/block-pdf/PdfViewer/InternalPDFViewer.ts
+++ b/apps/web/src/features/block-pdf/PdfViewer/InternalPDFViewer.ts
@@ -1125,12 +1125,21 @@ export class InternalPDFViewer {
this._boundEvents.scriptingready = this._handleScriptingReady;
for (const key in this._boundEvents) {
- const event = key as keyof TEvents;
- if (!this._boundEvents[event]) continue;
- this._eventBus.on(event, this._boundEvents[event]);
+ this.#bindEvent(key as keyof TEvents);
}
}
+ #bindEvent<TEvent extends keyof TEvents>(event: TEvent) {
+ const listener = this._boundEvents[event];
+ if (listener) this._eventBus.on(event, listener);
+ }
+
+ #unbindEvent<TEvent extends keyof TEvents>(event: TEvent) {
+ const listener = this._boundEvents[event];
+ if (listener) this._eventBus.off(event, listener);
+ this._boundEvents[event] = undefined;
+ }
+
#unbindEvents() {
if (this._openInNewTabButton) {
this._openInNewTabButton.onclick = null;
@@ -1145,10 +1154,7 @@ export class InternalPDFViewer {
this._container.removeEventListener('click', this._handleContainerClick);
for (const key in this._boundEvents) {
- const event = key as keyof TEvents;
- if (!this._boundEvents[event]) continue;
- this._eventBus.off(event, this._boundEvents[event]);
- this._boundEvents[event] = undefined;
+ this.#unbindEvent(key as keyof TEvents);
}
this._eventBus._listeners = [];
this._boundEvents = Object.create(null);
diff --git a/apps/web/src/features/block-pdf/PdfViewer/normalize.ts b/apps/web/src/features/block-pdf/PdfViewer/normalize.ts
index 01c67755c9..c5322038d1 100644
--- a/apps/web/src/features/block-pdf/PdfViewer/normalize.ts
+++ b/apps/web/src/features/block-pdf/PdfViewer/normalize.ts
@@ -30,6 +30,13 @@ const CHARACTERS_TO_NORMALIZE = {
'\u00BD': '1/2', // Vulgar fraction one half
'\u00BE': '3/4', // Vulgar fraction three quarters
};
+
+function isCharacterToNormalize(
+ value: string
+): value is keyof typeof CHARACTERS_TO_NORMALIZE {
+ return value in CHARACTERS_TO_NORMALIZE;
+}
+
// These diacritics aren't considered as combining diacritics
// when searching in a document:
// https://searchfox.org/mozilla-central/source/intl/unicharutil/util/is_combining_diacritic.py.
@@ -147,17 +154,20 @@ export function normalize(text: string) {
normalized = normalized.replace(
normalizationRegex,
(
- match: keyof typeof CHARACTERS_TO_NORMALIZE,
- p1: any,
- p2: any,
- p3: any,
- p4: any,
- p5: any,
- i: any
+ match: string,
+ p1: string | undefined,
+ p2: string | undefined,
+ p3: string | undefined,
+ p4: string | undefined,
+ p5: string | undefined,
+ i: number
) => {
i -= shiftOrigin;
if (p1) {
// Maybe fractions or quotations mark...
+ if (!isCharacterToNormalize(match)) {
+ throw new Error(`Unexpected normalization character: ${match}`);
+ }
const replacement = CHARACTERS_TO_NORMALIZE[match];
const jj = replacement.length;
for (let j = 1; j < jj; j++) {
@@ -235,7 +245,7 @@ export function normalize(text: string) {
shift -= newCharLen;
shiftOrigin += newCharLen;
}
- return p5;
+ return p5 ?? match;
}
);
diff --git a/apps/web/src/features/block-pdf/component/CustomCursor.tsx b/apps/web/src/features/block-pdf/component/CustomCursor.tsx
index 9199a8afeb..cdb2b1eaa8 100644
--- a/apps/web/src/features/block-pdf/component/CustomCursor.tsx
+++ b/apps/web/src/features/block-pdf/component/CustomCursor.tsx
@@ -1,11 +1,5 @@
import { placeableModeSignal } from '@block-pdf/signal/placeables';
-import {
- createEffect,
- createSignal,
- type JSX,
- onCleanup,
- Show,
-} from 'solid-js';
+import { createEffect, createSignal, onCleanup, Show } from 'solid-js';
import { PayloadMode, type PayloadType } from '../type/placeables';
const modeToCursor: Record<PayloadType, string> = {
@@ -30,8 +24,7 @@ export function CustomCursor(props: { containerRef?: HTMLDivElement }) {
const [pos, setPos] = createSignal({ x: 0, y: 0 });
const [mode] = placeableModeSignal;
- const mouseMoveHandler: JSX.EventHandler<Document, MouseEvent> = ({ x, y }) =>
- setPos({ x, y });
+ const mouseMoveHandler = ({ x, y }: MouseEvent) => setPos({ x, y });
createEffect(() => {
const container = containerRef();
diff --git a/apps/web/src/features/block-pdf/component/Document.tsx b/apps/web/src/features/block-pdf/component/Document.tsx
index 9ad7a45242..beb6c510e8 100644
--- a/apps/web/src/features/block-pdf/component/Document.tsx
+++ b/apps/web/src/features/block-pdf/component/Document.tsx
@@ -430,36 +430,34 @@ export function Document() {
}
};
- const zoomHandler: JSX.EventHandler<Document, KeyboardEvent> = createCallback(
- (e) => {
- if (IS_MAC ? !e.metaKey : !e.ctrlKey) return;
- const viewer = getRootViewer();
- if (!viewer) return;
-
- switch (e.key) {
- case '+':
- case '=':
- e.preventDefault();
- if (canZoomIn()) viewer.zoomIn();
- break;
- case '_':
- case '-':
- e.preventDefault();
- if (canZoomOut()) viewer.zoomOut();
- break;
- case 'PageUp':
- case 'ArrowLeft':
- e.preventDefault();
- viewer.previousPage();
- break;
- case 'PageDown':
- case 'ArrowRight':
- e.preventDefault();
- viewer.nextPage();
- break;
- }
+ const zoomHandler = createCallback((e: KeyboardEvent) => {
+ if (IS_MAC ? !e.metaKey : !e.ctrlKey) return;
+ const viewer = getRootViewer();
+ if (!viewer) return;
+
+ switch (e.key) {
+ case '+':
+ case '=':
+ e.preventDefault();
+ if (canZoomIn()) viewer.zoomIn();
+ break;
+ case '_':
+ case '-':
+ e.preventDefault();
+ if (canZoomOut()) viewer.zoomOut();
+ break;
+ case 'PageUp':
+ case 'ArrowLeft':
+ e.preventDefault();
+ viewer.previousPage();
+ break;
+ case 'PageDown':
+ case 'ArrowRight':
+ e.preventDefault();
+ viewer.nextPage();
+ break;
}
- );
+ });
onMount(() => {
if (isNestedBlock) return;
diff --git a/apps/web/src/features/block-pdf/component/PDFPopup.tsx b/apps/web/src/features/block-pdf/component/PDFPopup.tsx
index 566d33c292..3a0b38beb1 100644
--- a/apps/web/src/features/block-pdf/component/PDFPopup.tsx
+++ b/apps/web/src/features/block-pdf/component/PDFPopup.tsx
@@ -181,7 +181,7 @@ export function PDFPopup(props: PDFPopupProps) {
});
onMount(() => {
- const handler = (e: MouseEvent) => {
+ const handler = (e: Event) => {
e.stopPropagation();
};
diff --git a/apps/web/src/features/block-pdf/store/comments/commentLayout.ts b/apps/web/src/features/block-pdf/store/comments/commentLayout.ts
index 287e37158d..fbfd5294aa 100644
--- a/apps/web/src/features/block-pdf/store/comments/commentLayout.ts
+++ b/apps/web/src/features/block-pdf/store/comments/commentLayout.ts
@@ -27,11 +27,15 @@ type ThreadPositionsOnPage = Partial<Record<number, CommentLayout<Root>[]>>;
export const threadsOnPagePositionStore =
createBlockStore<ThreadPositionsOnPage>({});
+const isPdfRootLayout = (
+ comment: (typeof commentsStore.get)[number]
+): comment is PdfRootLayout => isRoot(comment) && 'layout' in comment;
+
const rootCommentsGroupedByPage = createBlockMemo(() => {
const comments = commentsStore.get;
const out: Record<number, PdfRootLayout[]> = {};
- comments.filter(isRoot).forEach((comment: PdfRootLayout) => {
+ comments.filter(isPdfRootLayout).forEach((comment) => {
const pageIndex = comment.layout.pageIndex;
if (!out[pageIndex]) out[pageIndex] = [];
out[pageIndex].push(comment);
diff --git a/apps/web/src/features/block-pdf/store/commentsResource.ts b/apps/web/src/features/block-pdf/store/commentsResource.ts
index ea6e2593d1..7ec47d40bd 100644
--- a/apps/web/src/features/block-pdf/store/commentsResource.ts
+++ b/apps/web/src/features/block-pdf/store/commentsResource.ts
@@ -347,9 +347,13 @@ export function useCreateFreeCommentResource() {
) => {
let anchor: CreateCommentRequestAnchor | undefined;
if (placeable) {
+ const [page] = placeable.pageRange;
+ if (page === undefined) {
+ throw new Error('Cannot create a PDF comment without a page');
+ }
anchor = {
uuid: placeable.internalId,
- page: placeable.pageRange.values().next().value,
+ page,
fileType: 'pdf',
anchorType: 'free-comment',
// position info
diff --git a/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx b/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx
index e1a1447a4f..202c814447 100644
--- a/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx
+++ b/apps/web/src/features/block-project/component/ProjectCreateMenu.tsx
@@ -166,8 +166,8 @@ function makeCreateBlock({
try {
const id = await createFn();
return id;
- } catch (e) {
- toast.failure(e.message);
+ } catch (cause) {
+ toast.failure(cause instanceof Error ? cause.message : String(cause));
return null;
}
};
diff --git a/apps/web/src/features/channel/Call/CallContext.tsx b/apps/web/src/features/channel/Call/CallContext.tsx
index a0253d2a97..8bd7e7dd7d 100644
--- a/apps/web/src/features/channel/Call/CallContext.tsx
+++ b/apps/web/src/features/channel/Call/CallContext.tsx
@@ -6,6 +6,7 @@ import { makePersisted } from '@solid-primitives/storage';
import type {
AudioCaptureOptions,
ConnectionState,
+ LocalAudioTrack,
LocalTrack,
RemoteParticipant,
Room,
@@ -200,9 +201,9 @@ function nativeAudioProcessingConstraints(
};
}
-function getLocalMicTrack(r: Room): LocalTrack | undefined {
+function getLocalMicTrack(r: Room): LocalAudioTrack | undefined {
return r.localParticipant.getTrackPublication(LK_TRACK_SOURCE.Microphone)
- ?.track as LocalTrack | undefined;
+ ?.track as LocalAudioTrack | undefined;
}
function isActiveCallConnectionState(state: ConnectionState): boolean {
diff --git a/apps/web/src/features/channel/Channel/create-entity-drop-zone.ts b/apps/web/src/features/channel/Channel/create-entity-drop-zone.ts
index f57d28699f..00c251f87f 100644
--- a/apps/web/src/features/channel/Channel/create-entity-drop-zone.ts
+++ b/apps/web/src/features/channel/Channel/create-entity-drop-zone.ts
@@ -1,4 +1,4 @@
-import type { EntityData, EntityDragEvent } from '@entity';
+import { type EntityData, isEntityDragEvent } from '@entity';
import { createDroppable, useDragDropContext } from '@thisbeyond/solid-dnd';
export type EntityDropCoordinates = {
@@ -46,9 +46,9 @@ export function createEntityDropZone(
droppable.isActiveDroppable ||
state?.active.droppable?.id === options.droppableId;
- onDragEnd((event: EntityDragEvent) => {
- const data = event.draggable?.data;
- if (!data || data.dragType !== 'entity') return;
+ onDragEnd((event) => {
+ if (!isEntityDragEvent(event)) return;
+ const data = event.draggable.data;
options.onDragEntityEnd?.();
if (!event.droppable) return;
@@ -58,13 +58,11 @@ export function createEntityDropZone(
options.onDropEntity(data, coordinates);
});
- onDragMove((event: EntityDragEvent) => {
- const data = event.draggable?.data;
- if (!data || data.dragType !== 'entity' || !isOverThisDropZone()) {
+ onDragMove((event) => {
+ if (!isEntityDragEvent(event) || !isOverThisDropZone()) {
options.onDragEntityEnd?.();
return;
}
-
const coordinates = currentCoordinates();
if (!coordinates) return;
options.onDragEntityMove?.(coordinates);
diff --git a/apps/web/src/features/channel/Message/Slot.tsx b/apps/web/src/features/channel/Message/Slot.tsx
index 50adcc2c45..f1fec392bf 100644
--- a/apps/web/src/features/channel/Message/Slot.tsx
+++ b/apps/web/src/features/channel/Message/Slot.tsx
@@ -1,13 +1,5 @@
import { cn } from '@ui';
-import {
- type ComponentProps,
- type JSX,
- splitProps,
- type ValidComponent,
-} from 'solid-js';
-import { Dynamic } from 'solid-js/web';
-
-type SlotElement = 'div' | 'span' | 'button';
+import { type ComponentProps, type JSX, splitProps } from 'solid-js';
export type MessageSlotPlacement =
| 'icon'
@@ -23,8 +15,7 @@ type CommonProps = {
style?: JSX.CSSProperties | string;
};
-type SlotProps<T extends ValidComponent = 'div'> = { as?: T } & CommonProps &
- Omit<ComponentProps<T>, keyof CommonProps | 'component'>;
+type SlotProps = CommonProps & Omit<ComponentProps<'div'>, keyof CommonProps>;
function placementStyle(
placement: MessageSlotPlacement
@@ -43,9 +34,8 @@ function placementStyle(
}
}
-export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
+export function Slot(props: SlotProps) {
const [local, rest] = splitProps(props, [
- 'as',
'class',
'children',
'placement',
@@ -53,8 +43,7 @@ export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
]);
return (
- <Dynamic
- component={local.as ?? ('div' as SlotElement)}
+ <div
class={cn('message-slot min-w-0', local.class)}
data-message-slot={local.placement}
style={{
@@ -64,6 +53,6 @@ export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
{...rest}
>
{local.children}
- </Dynamic>
+ </div>
);
}
diff --git a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
index 5cc22c0a58..d437ba65c5 100644
--- a/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
+++ b/apps/web/src/features/entity/bulk-edit/BulkRenameEntitiesView.tsx
@@ -78,14 +78,14 @@ export const BulkRenameEntitiesView = (props: {
let renameFn: (old?: string) => string = () => newValue;
switch (mode()) {
case 'prepend':
- renameFn = (old: string) => newValue + old;
+ renameFn = (old) => newValue + (old ?? '');
break;
case 'append':
- renameFn = (old: string) => old + newValue;
+ renameFn = (old) => (old ?? '') + newValue;
break;
case 'replace':
- renameFn = (old: string) =>
- old.replaceAll(replaceFind(), replaceWith());
+ renameFn = (old) =>
+ (old ?? '').replaceAll(replaceFind(), replaceWith());
break;
default:
}
diff --git a/apps/web/src/features/entity/core/Slot.tsx b/apps/web/src/features/entity/core/Slot.tsx
index 877d2f11e3..972d16e572 100644
--- a/apps/web/src/features/entity/core/Slot.tsx
+++ b/apps/web/src/features/entity/core/Slot.tsx
@@ -1,13 +1,5 @@
import { cn } from '@ui';
-import {
- type ComponentProps,
- type JSX,
- splitProps,
- type ValidComponent,
-} from 'solid-js';
-import { Dynamic } from 'solid-js/web';
-
-type SlotElement = 'div' | 'span' | 'button';
+import { type ComponentProps, type JSX, splitProps } from 'solid-js';
const placeGrid = (
area: string | [string, string] | undefined
@@ -29,12 +21,10 @@ type CommonProps = {
style?: JSX.CSSProperties | string;
};
-type SlotProps<T extends ValidComponent = 'div'> = { as?: T } & CommonProps &
- Omit<ComponentProps<T>, keyof CommonProps | 'component'>;
+type SlotProps = CommonProps & Omit<ComponentProps<'div'>, keyof CommonProps>;
-export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
+export function Slot(props: SlotProps) {
const [local, rest] = splitProps(props, [
- 'as',
'class',
'children',
'placement',
@@ -44,9 +34,8 @@ export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
const gridArea = () => placeGrid(local.placement);
return (
- <Dynamic
+ <div
class={cn('entity-slot', local.class)}
- component={local.as ?? ('div' as SlotElement)}
style={{
...gridArea(),
...(typeof local.style === 'object' ? local.style : {}),
@@ -54,6 +43,6 @@ export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
{...rest}
>
{local.children}
- </Dynamic>
+ </div>
);
}
diff --git a/apps/web/src/features/entity/types/drag.test.ts b/apps/web/src/features/entity/types/drag.test.ts
new file mode 100644
index 0000000000..cf0499f70c
--- /dev/null
+++ b/apps/web/src/features/entity/types/drag.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from 'vitest';
+import { isEntityDragData } from './drag';
+
+const validDragData = {
+ id: 'document-id',
+ name: 'Document',
+ ownerId: 'owner-id',
+ type: 'document',
+ dragType: 'entity',
+ operation: () => 'move',
+} as const;
+
+describe('isEntityDragData', () => {
+ it('accepts a complete entity drag payload', () => {
+ expect(isEntityDragData(validDragData)).toBe(true);
+ });
+
+ it.each(['id', 'name', 'ownerId', 'type', 'operation'] as const)(
+ 'rejects a payload without %s',
+ (field) => {
+ const { [field]: _, ...incomplete } = validDragData;
+ expect(isEntityDragData(incomplete)).toBe(false);
+ }
+ );
+
+ it.each([
+ ['id', 1],
+ ['name', null],
+ ['ownerId', false],
+ ['type', 'unsupported'],
+ ['operation', 'move'],
+ ['splitId', 1],
+ ] as const)('rejects an invalid %s', (field, value) => {
+ expect(isEntityDragData({ ...validDragData, [field]: value })).toBe(false);
+ });
+});
diff --git a/apps/web/src/features/entity/types/drag.ts b/apps/web/src/features/entity/types/drag.ts
index 01653cb706..a5ebce2574 100644
--- a/apps/web/src/features/entity/types/drag.ts
+++ b/apps/web/src/features/entity/types/drag.ts
@@ -15,3 +15,55 @@ export type EntityDragEvent = DragEvent & {
data: EntityDragData;
};
};
+
+const ENTITY_DRAG_TYPES = [
+ 'channel',
+ 'channel_message',
+ 'channel_thread',
+ 'chat',
+ 'document',
+ 'email',
+ 'project',
+ 'call',
+ 'crm_company',
+ 'crm_contact',
+ 'automation',
+ 'reminder',
+ 'calendar_event',
+ 'foreign',
+] as const satisfies readonly EntityData['type'][];
+
+function isEntityType(value: unknown): value is EntityData['type'] {
+ return (
+ typeof value === 'string' &&
+ ENTITY_DRAG_TYPES.some((entityType) => entityType === value)
+ );
+}
+
+/** Checks whether data carries the tagged entity payload produced by the soup. */
+export function isEntityDragData(data: unknown): data is EntityDragData {
+ if (typeof data !== 'object' || data === null) return false;
+
+ return (
+ 'dragType' in data &&
+ data.dragType === 'entity' &&
+ 'operation' in data &&
+ typeof data.operation === 'function' &&
+ 'id' in data &&
+ typeof data.id === 'string' &&
+ 'name' in data &&
+ typeof data.name === 'string' &&
+ 'ownerId' in data &&
+ typeof data.ownerId === 'string' &&
+ 'type' in data &&
+ isEntityType(data.type) &&
+ (!('splitId' in data) ||
+ data.splitId === undefined ||
+ typeof data.splitId === 'string')
+ );
+}
+
+/** Checks whether a drag event carries the entity payload produced by the soup. */
+export function isEntityDragEvent(event: DragEvent): event is EntityDragEvent {
+ return isEntityDragData(event.draggable?.data);
+}
diff --git a/apps/web/src/features/next-soup/create-sort-state.ts b/apps/web/src/features/next-soup/create-sort-state.ts
index 2de37e7aaf..837a233038 100644
--- a/apps/web/src/features/next-soup/create-sort-state.ts
+++ b/apps/web/src/features/next-soup/create-sort-state.ts
@@ -24,13 +24,16 @@ type SortState<T, TId extends string = string> = {
available: Record<TId, SortConfig<T>>;
};
+type SortItem<TConfigs> =
+ TConfigs[keyof TConfigs] extends SortConfig<infer T> ? T : never;
+
export const createSortState = <
- T,
- TConfigs extends Record<string, SortConfig<T>>,
+ TConfigs extends Record<string, SortConfig<never>>,
>(
- configs: TConfigs,
+ configs: TConfigs & Record<keyof TConfigs, SortConfig<SortItem<TConfigs>>>,
initialSortIds?: (keyof TConfigs & string)[]
-): SortState<T, keyof TConfigs & string> => {
+): SortState<SortItem<TConfigs>, keyof TConfigs & string> => {
+ type T = SortItem<TConfigs>;
type TId = keyof TConfigs & string;
type Entry = { id: TId; reversed: boolean };
@@ -98,6 +101,6 @@ export const createSortState = <
setAll,
flip,
clear,
- available: configs as Record<TId, SortConfig<T>>,
+ available: configs,
};
};
diff --git a/apps/web/src/features/next-soup/create-soup-state.ts b/apps/web/src/features/next-soup/create-soup-state.ts
index dbb6886e79..fc939a1b6d 100644
--- a/apps/web/src/features/next-soup/create-soup-state.ts
+++ b/apps/web/src/features/next-soup/create-soup-state.ts
@@ -3,6 +3,7 @@ import {
type FilterID,
SOUP_FILTERS,
} from '@app/features/next-soup/filters/configs/';
+import type { FilterContext } from '@app/features/next-soup/filters/configs/base';
import {
createPredicatesStore,
type PredicateConfig,
@@ -70,20 +71,18 @@ export type SortConfig<T> = {
fn: (a: T, b: T) => number;
};
-interface SoupContextOptions<TId extends string = FilterID> {
+interface SoupContextOptions {
initialData?: SoupEntity[];
initialPredicates?: {
- and?: TId[];
- or?: TId[];
+ and?: string[];
+ or?: string[];
};
- predicateConfigs?: PredicateConfig<SoupEntity, string>[];
+ predicateConfigs?: PredicateConfig<SoupEntity, string, FilterContext>[];
wrapNavigation?: boolean;
skipGroupHeaders?: boolean;
}
-export const createSoupState = <TId extends string = FilterID>(
- options: SoupContextOptions<TId> = {}
-) => {
+export const createSoupState = (options: SoupContextOptions = {}) => {
const {
wrapNavigation,
initialData,
@@ -96,7 +95,12 @@ export const createSoupState = <TId extends string = FilterID>(
getItemId: (i) => i.id,
});
- const predicates = createPredicatesStore({
+ const predicates = createPredicatesStore<
+ SoupEntity,
+ FilterContext,
+ PredicateConfig<SoupEntity, string, FilterContext>,
+ string
+ >({
configs: predicateConfigs ?? SOUP_FILTERS,
initial: initialPredicates,
});
diff --git a/apps/web/src/features/next-soup/filters/filter-store/predicates-store.ts b/apps/web/src/features/next-soup/filters/filter-store/predicates-store.ts
index 17ba490918..bc1ee38cb1 100644
--- a/apps/web/src/features/next-soup/filters/filter-store/predicates-store.ts
+++ b/apps/web/src/features/next-soup/filters/filter-store/predicates-store.ts
@@ -1,10 +1,17 @@
import { createMemo, createSignal } from 'solid-js';
-export type FilterPredicate<T> = (entity: T, ctx?: unknown) => boolean;
+export type FilterPredicate<T, TContext = unknown> = (
+ entity: T,
+ ctx: TContext
+) => boolean;
-export type PredicateConfig<T, TId extends string = string> = {
+export type PredicateConfig<
+ T,
+ TId extends string = string,
+ TContext = unknown,
+> = {
id: TId;
- predicate: FilterPredicate<T>;
+ predicate: FilterPredicate<T, TContext>;
query?: unknown;
};
@@ -26,7 +33,8 @@ type SetPredicatesCallback<TId extends string> = (
type PredicatesStoreOptions<
T,
- TConfig extends PredicateConfig<T>,
+ TContext,
+ TConfig extends PredicateConfig<T, string, TContext>,
TId extends string = TConfig['id'],
> = {
configs: readonly TConfig[];
@@ -38,9 +46,10 @@ type PredicatesStoreOptions<
export function createPredicatesStore<
T,
- TConfig extends PredicateConfig<T>,
+ TContext,
+ TConfig extends PredicateConfig<T, string, TContext>,
TId extends string = TConfig['id'],
->(options: PredicatesStoreOptions<T, TConfig, TId>) {
+>(options: PredicatesStoreOptions<T, TContext, TConfig, TId>) {
const { configs, initial = {} } = options;
const configMap = new Map<string, TConfig>(configs.map((c) => [c.id, c]));
@@ -107,7 +116,7 @@ export function createPredicatesStore<
setOrIds([]);
};
- const test = (entity: T, ctx?: unknown): boolean => {
+ const test = (entity: T, ctx: TContext): boolean => {
const andList = andIds();
const orList = orIds();
diff --git a/apps/web/src/features/property/core/Slot.tsx b/apps/web/src/features/property/core/Slot.tsx
index 6dff873b6c..b364fea280 100644
--- a/apps/web/src/features/property/core/Slot.tsx
+++ b/apps/web/src/features/property/core/Slot.tsx
@@ -1,13 +1,5 @@
import { cn } from '@ui';
-import {
- type ComponentProps,
- type JSX,
- splitProps,
- type ValidComponent,
-} from 'solid-js';
-import { Dynamic } from 'solid-js/web';
-
-type SlotElement = 'div' | 'span' | 'button';
+import { type ComponentProps, type JSX, splitProps } from 'solid-js';
const placeGrid = (
area: string | [string, string] | undefined
@@ -29,12 +21,10 @@ type CommonProps = {
style?: JSX.CSSProperties | string;
};
-type SlotProps<T extends ValidComponent = 'div'> = { as?: T } & CommonProps &
- Omit<ComponentProps<T>, keyof CommonProps | 'component'>;
+type SlotProps = CommonProps & Omit<ComponentProps<'div'>, keyof CommonProps>;
-export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
+export function Slot(props: SlotProps) {
const [local, rest] = splitProps(props, [
- 'as',
'class',
'children',
'placement',
@@ -44,9 +34,8 @@ export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
const gridArea = () => placeGrid(local.placement);
return (
- <Dynamic
+ <div
class={cn('property-slot', local.class)}
- component={local.as ?? ('div' as SlotElement)}
style={{
...gridArea(),
...(typeof local.style === 'object' ? local.style : {}),
@@ -54,6 +43,6 @@ export function Slot<T extends SlotElement = 'div'>(props: SlotProps<T>) {
{...rest}
>
{local.children}
- </Dynamic>
+ </div>
);
}
diff --git a/apps/web/src/lib/core/auth/channel.ts b/apps/web/src/lib/core/auth/channel.ts
index a3cd83f536..faa6536d20 100644
--- a/apps/web/src/lib/core/auth/channel.ts
+++ b/apps/web/src/lib/core/auth/channel.ts
@@ -2,7 +2,7 @@ import {
broadcastChannels,
setBroadcastChannels,
} from '@app/signal/broadcastChannels';
-import { errAsync, okAsync, ResultAsync } from 'neverthrow';
+import { err, ok, ResultAsync } from 'neverthrow';
const AUTH_CHANNEL = 'auth';
const LOGIN_SUCCESS = 'login-success';
@@ -49,7 +49,7 @@ function waitForAuthSuccessOrTimeout(
new Promise((resolve) => {
const timeoutId = setTimeout(() => {
resolve(
- errAsync({
+ err({
tag: 'TimeoutError',
message: 'Timeout waiting for auth success',
})
@@ -59,7 +59,7 @@ function waitForAuthSuccessOrTimeout(
channel.onmessage = (event) => {
if (event.data.type === LOGIN_SUCCESS) {
clearTimeout(timeoutId);
- resolve(okAsync(undefined));
+ resolve(ok(undefined));
}
};
})
diff --git a/apps/web/src/lib/core/comments/commentType.ts b/apps/web/src/lib/core/comments/commentType.ts
index d7466ede8e..d3b1dd0b34 100644
--- a/apps/web/src/lib/core/comments/commentType.ts
+++ b/apps/web/src/lib/core/comments/commentType.ts
@@ -45,7 +45,7 @@ export type Layout = {
export type CommentOperations = {
createComment: (
- info: CreateCommentRequest
+ info: CreateCommentRequest & { threadId: number }
) => Promise<CreateCommentResponse | null>;
deleteComment: (info: DeleteCommentInfo) => Promise<boolean> | undefined;
updateComment: (
diff --git a/apps/web/src/lib/core/component/AI/hook/useEntityDropAttachment.ts b/apps/web/src/lib/core/component/AI/hook/useEntityDropAttachment.ts
index 24b20f9bf6..3121acfa03 100644
--- a/apps/web/src/lib/core/component/AI/hook/useEntityDropAttachment.ts
+++ b/apps/web/src/lib/core/component/AI/hook/useEntityDropAttachment.ts
@@ -3,7 +3,7 @@ import type { Attachment, Attachments } from '@core/component/AI/types';
import type { ChatAttachmentMention } from '@core/component/AI/util/chatAttachmentMention';
import { toast } from '@core/component/Toast/Toast';
import { fileTypeToBlockName } from '@core/constant/allBlocks';
-import type { EntityDragData, EntityDragEvent } from '@entity';
+import { isEntityDragData, isEntityDragEvent } from '@entity';
import { createDroppable, useDragDropContext } from '@thisbeyond/solid-dnd';
import { type Accessor, createMemo } from 'solid-js';
@@ -35,8 +35,8 @@ export function useEntityDropAttachment(
const draggable = state?.active.draggable;
if (!draggable) return;
const dragData = draggable.data;
- if (!dragData || dragData.dragType !== 'entity') return;
- return dragData as EntityDragData;
+ if (!isEntityDragData(dragData)) return;
+ return dragData;
});
const isDraggingOver = createMemo(() => {
@@ -52,8 +52,8 @@ export function useEntityDropAttachment(
return SUPPORTED_CHAT_ATTACHMENT_BLOCKS.includes(blockName);
});
- onDragEnd((event: EntityDragEvent) => {
- if (!event.droppable) return;
+ onDragEnd((event) => {
+ if (!isEntityDragEvent(event) || !event.droppable) return;
if (event.droppable.id !== droppableId) return;
const data = event.draggable?.data;
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/MarkdownTextarea.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/MarkdownTextarea.tsx
index 3b0ec02d20..782e682aec 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/MarkdownTextarea.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/MarkdownTextarea.tsx
@@ -1,5 +1,6 @@
import type { PortalScope } from '@core/component/ScopedPortal';
import { isNativeMobilePlatform } from '@core/mobile/isNativeMobilePlatform';
+import type { ChannelWithParticipants } from '@core/user';
import type { EditorType } from '@macro-inc/lexical-core';
import type { HistoryItem } from '@queries/history/types';
import { onElementConnect } from '@solid-primitives/lifecycle';
@@ -78,6 +79,19 @@ import { NodeAccessoryRenderer } from './NodeAccessoryRenderer';
* @param onEscape - A callback function that is called when the user presses Escape in the textarea. If the function
* returns true Lexical's default behavior will be prevented.
*/
+function isHistoryItem(
+ item: HistoryItem | ChannelWithParticipants
+): item is HistoryItem {
+ if (!('ownerId' in item) || !('type' in item)) return false;
+ return (
+ typeof item.name === 'string' &&
+ typeof item.ownerId === 'string' &&
+ (item.type === 'document' ||
+ item.type === 'chat' ||
+ item.type === 'project')
+ );
+}
+
interface MarkdownTextareaProps {
editable: Accessor<boolean>;
onChange?: (value: string, editor?: LexicalEditor) => void;
@@ -370,7 +384,9 @@ export function MarkdownTextarea(props: MarkdownTextareaProps) {
menu={mentionsMenuOperations}
anchor={props.anchor}
onUserMention={props.onUserMention}
- onDocumentMention={props.onDocumentMention}
+ onDocumentMention={(item) => {
+ if (isHistoryItem(item)) props.onDocumentMention?.(item);
+ }}
useBlockBoundary={props.useBlockBoundary}
portalScope={props.portalScope}
/>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/StaticMarkdown.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/StaticMarkdown.tsx
index 18cf097a64..3b858d15ea 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/core/StaticMarkdown.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/core/StaticMarkdown.tsx
@@ -259,7 +259,7 @@ type StaticRenderOptions = {
lazy: boolean;
};
-type RenderableEntity<T extends LexicalNode = LexicalNode> = {
+type TypedRenderableEntity<T extends LexicalNode> = {
guard: (node: LexicalNode) => node is T;
render: (
props: NodeComponent<T>,
@@ -267,7 +267,26 @@ type RenderableEntity<T extends LexicalNode = LexicalNode> = {
) => JSX.Element;
};
-type RenderableElement<T extends ElementNode = ElementNode> = {
+type RenderableEntity = {
+ guard: (node: LexicalNode) => boolean;
+ render: (props: NodeComponent, options: StaticRenderOptions) => JSX.Element;
+};
+
+function eraseRenderableEntity<T extends LexicalNode>(
+ entity: TypedRenderableEntity<T>
+): RenderableEntity {
+ return {
+ guard: entity.guard,
+ render: (props, options) => {
+ if (!entity.guard(props.node)) {
+ throw new Error('Static entity renderer received an unsupported node');
+ }
+ return entity.render({ node: props.node, theme: props.theme }, options);
+ },
+ };
+}
+
+type TypedRenderableElement<T extends ElementNode> = {
guard: (node: LexicalNode) => node is T;
render: (
props: ElementNodeComponent<T>,
@@ -275,7 +294,36 @@ type RenderableElement<T extends ElementNode = ElementNode> = {
) => JSX.Element;
};
-const Text: RenderableEntity<TextNode> = {
+type RenderableElement = {
+ guard: (node: LexicalNode) => boolean;
+ render: (
+ props: ElementNodeComponent,
+ options: StaticRenderOptions
+ ) => JSX.Element;
+};
+
+function eraseRenderableElement<T extends ElementNode>(
+ element: TypedRenderableElement<T>
+): RenderableElement {
+ return {
+ guard: element.guard,
+ render: (props, options) => {
+ if (!element.guard(props.node)) {
+ throw new Error('Static element renderer received an unsupported node');
+ }
+ return element.render(
+ {
+ node: props.node,
+ children: props.children,
+ theme: props.theme,
+ },
+ options
+ );
+ },
+ };
+}
+
+const Text: TypedRenderableEntity<TextNode> = {
guard: (node: LexicalNode): node is TextNode => node.__type === 'text',
render: (props) => {
return (
@@ -286,13 +334,13 @@ const Text: RenderableEntity<TextNode> = {
},
};
-const LineBreak: RenderableEntity<LineBreakNode> = {
+const LineBreak: TypedRenderableEntity<LineBreakNode> = {
guard: (node: LexicalNode): node is LineBreakNode =>
node.__type === 'linebreak',
render: () => <br />,
};
-const UserMention: RenderableEntity<UserMentionNode> = {
+const UserMention: TypedRenderableEntity<UserMentionNode> = {
guard: (node: LexicalNode): node is UserMentionNode =>
node.__type === 'user-mention',
render: (props) => (
@@ -313,7 +361,7 @@ const MentionPlaceholder = () => (
</span>
);
-const DocumentMention: RenderableEntity<DocumentMentionNode> = {
+const DocumentMention: TypedRenderableEntity<DocumentMentionNode> = {
guard: (node: LexicalNode): node is DocumentMentionNode =>
node.__type === 'document-mention',
render: (props, options) => {
@@ -344,7 +392,7 @@ const DocumentMention: RenderableEntity<DocumentMentionNode> = {
},
};
-const ThemeMention: RenderableEntity<ThemeMentionNode> = {
+const ThemeMention: TypedRenderableEntity<ThemeMentionNode> = {
guard: (node: LexicalNode): node is ThemeMentionNode =>
node.__type === 'theme-mention',
render: (props) => (
@@ -358,7 +406,7 @@ const ThemeMention: RenderableEntity<ThemeMentionNode> = {
),
};
-const TagMention: RenderableEntity<TagMentionNode> = {
+const TagMention: TypedRenderableEntity<TagMentionNode> = {
guard: (node: LexicalNode): node is TagMentionNode =>
node.__type === 'tag-mention',
render: (props) => (
@@ -372,7 +420,7 @@ const TagMention: RenderableEntity<TagMentionNode> = {
),
};
-const Watermark: RenderableEntity<WatermarkNode> = {
+const Watermark: TypedRenderableEntity<WatermarkNode> = {
guard: (node: LexicalNode): node is WatermarkNode =>
node.__type === 'watermark',
render: (props) => (
@@ -386,7 +434,7 @@ const Watermark: RenderableEntity<WatermarkNode> = {
),
};
-const ContactMention: RenderableEntity<ContactMentionNode> = {
+const ContactMention: TypedRenderableEntity<ContactMentionNode> = {
guard: (node: LexicalNode): node is ContactMentionNode =>
node.__type === 'contact-mention',
render: (props) => (
@@ -400,7 +448,7 @@ const ContactMention: RenderableEntity<ContactMentionNode> = {
),
};
-const DateMention: RenderableEntity<DateMentionNode> = {
+const DateMention: TypedRenderableEntity<DateMentionNode> = {
guard: (node: LexicalNode): node is DateMentionNode =>
node.__type === 'date-mention',
render: (props) => (
@@ -414,7 +462,7 @@ const DateMention: RenderableEntity<DateMentionNode> = {
),
};
-const GroupMention: RenderableEntity<GroupMentionNode> = {
+const GroupMention: TypedRenderableEntity<GroupMentionNode> = {
guard: (node: LexicalNode): node is GroupMentionNode =>
node.__type === 'group-mention',
render: (props) => (
@@ -428,7 +476,7 @@ const GroupMention: RenderableEntity<GroupMentionNode> = {
),
};
-const Await: RenderableEntity<AwaitNode> = {
+const Await: TypedRenderableEntity<AwaitNode> = {
guard: (node: LexicalNode): node is AwaitNode => node.__type === 'await',
render: (props) => {
const componentProps = props.node.exportComponentProps();
@@ -446,7 +494,7 @@ const Await: RenderableEntity<AwaitNode> = {
},
};
-const MagicChip: RenderableEntity<MagicChipNode> = {
+const MagicChip: TypedRenderableEntity<MagicChipNode> = {
guard: (node: LexicalNode): node is MagicChipNode =>
node.__type === 'magic-chip',
render: (props) => (
@@ -460,7 +508,7 @@ const MagicChip: RenderableEntity<MagicChipNode> = {
),
};
-const Snapshot: RenderableEntity<SnapshotNode> = {
+const Snapshot: TypedRenderableEntity<SnapshotNode> = {
guard: (node: LexicalNode): node is SnapshotNode =>
node.__type === 'snapshot',
render: (props) => (
@@ -474,7 +522,7 @@ const Snapshot: RenderableEntity<SnapshotNode> = {
),
};
-const UnknownMention: RenderableEntity<UnknownMentionNode> = {
+const UnknownMention: TypedRenderableEntity<UnknownMentionNode> = {
guard: (node: LexicalNode): node is UnknownMentionNode =>
node.__type === 'unknown-mention',
render: (props) => (
@@ -488,23 +536,23 @@ const UnknownMention: RenderableEntity<UnknownMentionNode> = {
),
};
-const Image: RenderableEntity<ImageNode> = {
+const Image: TypedRenderableEntity<ImageNode> = {
guard: (node: LexicalNode): node is ImageNode => node.__type === 'image',
render: (props) => ImageDecorator(props.node.exportComponentProps()),
};
-const Video: RenderableEntity<VideoNode> = {
+const Video: TypedRenderableEntity<VideoNode> = {
guard: (node: LexicalNode): node is VideoNode => node.__type === 'video',
render: (props) => VideoDecorator(props.node.exportComponentProps()),
};
-const Paragraph: RenderableElement<ParagraphNode> = {
+const Paragraph: TypedRenderableElement<ParagraphNode> = {
guard: (node: LexicalNode): node is ParagraphNode =>
node.__type === 'paragraph',
render: (props) => <p class={props.theme.paragraph}>{props.children}</p>,
};
-const Heading: RenderableElement<HeadingNode> = {
+const Heading: TypedRenderableElement<HeadingNode> = {
guard: (node: LexicalNode): node is HeadingNode => node.__type === 'heading',
render: (props) => {
const tag = props.node.__tag as HeadingTag;
@@ -518,7 +566,7 @@ const Heading: RenderableElement<HeadingNode> = {
},
};
-const List: RenderableElement<ListNode> = {
+const List: TypedRenderableElement<ListNode> = {
guard: (node: LexicalNode): node is ListNode => node.__type === 'list',
render: (props) => {
const type = props.node.__listType;
@@ -551,7 +599,7 @@ const List: RenderableElement<ListNode> = {
},
};
-const ListItem: RenderableElement<ListItemNode> = {
+const ListItem: TypedRenderableElement<ListItemNode> = {
guard: (node: LexicalNode): node is ListItemNode =>
node.__type === 'listitem',
render: (props) => {
@@ -574,14 +622,14 @@ const ListItem: RenderableElement<ListItemNode> = {
},
};
-const Quote: RenderableElement<QuoteNode> = {
+const Quote: TypedRenderableElement<QuoteNode> = {
guard: (node: LexicalNode): node is QuoteNode => node.__type === 'quote',
render: (props) => (
<blockquote class={props.theme.quote}>{props.children}</blockquote>
),
};
-const Code: RenderableElement<CodeNode> = {
+const Code: TypedRenderableElement<CodeNode> = {
guard: (node: LexicalNode): node is CodeNode => node.__type === 'code',
render: (props) => {
let language = props.node.__language ?? DEFAULT_LANGUAGE;
@@ -657,13 +705,13 @@ function StaticCodeContainer(props: {
);
}
-const HorizontalRule: RenderableEntity<HorizontalRuleNode> = {
+const HorizontalRule: TypedRenderableEntity<HorizontalRuleNode> = {
guard: (node: LexicalNode): node is HorizontalRuleNode =>
node.__type === 'horizontalrule',
render: (props) => <div class={props.theme.hr} />,
};
-const Link: RenderableElement<LinkNode> = {
+const Link: TypedRenderableElement<LinkNode> = {
guard: (node: LexicalNode): node is LinkNode => node.__type === 'link',
render: (props) => (
<LinkWithPreview
@@ -676,12 +724,12 @@ const Link: RenderableElement<LinkNode> = {
),
};
-const Mark: RenderableElement<MarkNode> = {
+const Mark: TypedRenderableElement<MarkNode> = {
guard: (node: LexicalNode): node is MarkNode => node.__type === 'mark',
render: (props) => <span class={props.theme.mark}>{props.children}</span>,
};
-const SearchMatch: RenderableElement<SearchMatchNode> = {
+const SearchMatch: TypedRenderableElement<SearchMatchNode> = {
guard: (node: LexicalNode): node is SearchMatchNode =>
node.__type === 'search-match',
render: (props) => (
@@ -689,7 +737,7 @@ const SearchMatch: RenderableElement<SearchMatchNode> = {
),
};
-const Equation: RenderableEntity<EquationNode> = {
+const Equation: TypedRenderableEntity<EquationNode> = {
guard: (node: LexicalNode): node is EquationNode =>
node.__type === 'equation',
render: (props) => (
@@ -697,7 +745,7 @@ const Equation: RenderableEntity<EquationNode> = {
),
};
-const DocumentCard: RenderableEntity<DocumentCardNode> = {
+const DocumentCard: TypedRenderableEntity<DocumentCardNode> = {
guard: (node: LexicalNode): node is DocumentCardNode =>
node.__type === 'document-card',
render: (props) => {
@@ -721,7 +769,7 @@ const DocumentCard: RenderableEntity<DocumentCardNode> = {
},
};
-const Paste: RenderableEntity<PasteNode> = {
+const Paste: TypedRenderableEntity<PasteNode> = {
guard: (node: LexicalNode): node is PasteNode => node.__type === 'paste',
render: (props) =>
PasteNodeDecorator({
@@ -732,7 +780,7 @@ const Paste: RenderableEntity<PasteNode> = {
};
// Table rendering components for Lexical tables
-const Table: RenderableElement<TableNode> = {
+const Table: TypedRenderableElement<TableNode> = {
guard: (node: LexicalNode): node is TableNode => node.__type === 'table',
render: (props) => (
<div class={cn(props.theme?.static?.['table-container'])}>
@@ -746,7 +794,7 @@ const Table: RenderableElement<TableNode> = {
),
};
-const TableRow: RenderableElement<TableRowNode> = {
+const TableRow: TypedRenderableElement<TableRowNode> = {
guard: (node: LexicalNode): node is TableRowNode =>
node.__type === 'tablerow',
render: (props) => {
@@ -759,7 +807,7 @@ const TableRow: RenderableElement<TableRowNode> = {
},
};
-const TableCell: RenderableElement<TableCellNode> = {
+const TableCell: TypedRenderableElement<TableCellNode> = {
guard: (node: LexicalNode): node is TableCellNode =>
node.__type === 'tablecell',
render: (props) => {
@@ -776,7 +824,7 @@ const TableCell: RenderableElement<TableCellNode> = {
},
};
-const ClassedBlock: RenderableElement<ClassedBlockNode> = {
+const ClassedBlock: TypedRenderableElement<ClassedBlockNode> = {
guard: (node: LexicalNode): node is ClassedBlockNode =>
$isClassedBlockNode(node),
render: (props) => {
@@ -796,44 +844,44 @@ const ClassedBlock: RenderableElement<ClassedBlockNode> = {
};
// The entities that cannot have children.
-const InlineEntities: Array<RenderableEntity> = [
- Text,
- LineBreak,
- UserMention,
- DocumentMention,
- DocumentCard,
- ContactMention,
- DateMention,
- GroupMention,
- Await,
- MagicChip,
- Snapshot,
- Image,
- Video,
- HorizontalRule,
- Equation,
- ThemeMention,
- TagMention,
- UnknownMention,
- Watermark,
- Paste,
-] as const;
+const InlineEntities: RenderableEntity[] = [
+ eraseRenderableEntity(Text),
+ eraseRenderableEntity(LineBreak),
+ eraseRenderableEntity(UserMention),
+ eraseRenderableEntity(DocumentMention),
+ eraseRenderableEntity(DocumentCard),
+ eraseRenderableEntity(ContactMention),
+ eraseRenderableEntity(DateMention),
+ eraseRenderableEntity(GroupMention),
+ eraseRenderableEntity(Await),
+ eraseRenderableEntity(MagicChip),
+ eraseRenderableEntity(Snapshot),
+ eraseRenderableEntity(Image),
+ eraseRenderableEntity(Video),
+ eraseRenderableEntity(HorizontalRule),
+ eraseRenderableEntity(Equation),
+ eraseRenderableEntity(ThemeMention),
+ eraseRenderableEntity(TagMention),
+ eraseRenderableEntity(UnknownMention),
+ eraseRenderableEntity(Watermark),
+ eraseRenderableEntity(Paste),
+];
const Elements: RenderableElement[] = [
- Paragraph,
- Heading,
- List,
- ListItem,
- Quote,
- Code,
- Link,
- Mark,
- SearchMatch,
- Table,
- TableRow,
- TableCell,
- ClassedBlock,
-] as const;
+ eraseRenderableElement(Paragraph),
+ eraseRenderableElement(Heading),
+ eraseRenderableElement(List),
+ eraseRenderableElement(ListItem),
+ eraseRenderableElement(Quote),
+ eraseRenderableElement(Code),
+ eraseRenderableElement(Link),
+ eraseRenderableElement(Mark),
+ eraseRenderableElement(SearchMatch),
+ eraseRenderableElement(Table),
+ eraseRenderableElement(TableRow),
+ eraseRenderableElement(TableCell),
+ eraseRenderableElement(ClassedBlock),
+];
function Render(
props: (NodeComponent | ElementNodeComponent) & StaticRenderOptions
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
index 8660fe1d1d..ee870071c2 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/decorator/DocumentCard.tsx
@@ -42,7 +42,7 @@ import {
$getNodeByKey,
$setSelection,
} from 'lexical';
-import type { Component, JSX } from 'solid-js';
+import type { JSX } from 'solid-js';
import {
createEffect,
createMemo,
@@ -179,7 +179,7 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {
};
const [previewComponent, setPreviewComponent] = createSignal<
- Component | undefined
+ NonNullable<DocumentCardDecoratorProps['previewComponent']> | undefined
>(undefined);
const blockOwner = useBlockOwner();
@@ -453,10 +453,12 @@ function DocumentCardInner(props: DocumentCardDecoratorProps) {
<Show when={previewComponent()}>
<Show
when={isPreviewable()}
- fallback={<Dynamic component={previewComponent()} />}
+ fallback={
+ <Dynamic component={previewComponent()} {...props} />
+ }
>
<div class="relative grow overflow-y-scroll">
- <Dynamic component={previewComponent()} />
+ <Dynamic component={previewComponent()} {...props} />
</div>
</Show>
</Show>
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/actions/types.ts b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/actions/types.ts
index e5ca8809dc..c457568ad5 100644
--- a/apps/web/src/lib/core/component/LexicalMarkdown/plugins/actions/types.ts
+++ b/apps/web/src/lib/core/component/LexicalMarkdown/plugins/actions/types.ts
@@ -11,7 +11,7 @@ export type Action = {
id: string;
name: string;
keywords: string[];
- icon: Component<{ class: string }>;
+ icon: Component<{ class?: string }>;
category: string;
action: (editor: LexicalEditor, context?: ActionContext) => void;
shortcut?: string;
diff --git a/apps/web/src/lib/core/component/Resize/solver.ts b/apps/web/src/lib/core/component/Resize/solver.ts
index 0382404f88..70274521c9 100644
--- a/apps/web/src/lib/core/component/Resize/solver.ts
+++ b/apps/web/src/lib/core/component/Resize/solver.ts
@@ -26,7 +26,7 @@ type ResizeSolver = {
moveHandle: (index: number, delta: number) => void;
order: () => PanelId[];
hasPanel: (id: PanelId) => boolean;
- canFitPanel: (panel: PanelConfig) => boolean;
+ canFitPanel: (panel: Partial<PanelConfig>) => boolean;
swap: (firstId: PanelId, secondId: PanelId) => void;
hide: (id: PanelId) => void;
show: (id: PanelId) => void;
@@ -929,7 +929,7 @@ export function createResizeSolver(params: {
hasPanel: (id: PanelId) => {
return order().includes(id) && id in panelData;
},
- canFitPanel: (panel: PanelConfig) => {
+ canFitPanel: (panel: Partial<PanelConfig>) => {
const currentPanels = panelsInOrder();
const n = currentPanels.length;
const usable = getUsable(n + 1, params.size(), params.gutter());
diff --git a/apps/web/src/lib/core/directive/fileSelector.ts b/apps/web/src/lib/core/directive/fileSelector.ts
index 0471d42df0..3cbaeb6731 100644
--- a/apps/web/src/lib/core/directive/fileSelector.ts
+++ b/apps/web/src/lib/core/directive/fileSelector.ts
@@ -1,4 +1,4 @@
-import { type Accessor, type JSX, onCleanup } from 'solid-js';
+import { type Accessor, onCleanup } from 'solid-js';
interface FileSelectorProps {
onSelect: (files: File[]) => void;
@@ -38,11 +38,8 @@ export function fileSelector(
return false;
};
- const handleFileInputChange: JSX.ChangeEventHandlerUnion<
- HTMLInputElement,
- Event
- > = (e) => {
- const files = Array.from(e.target.files || []);
+ const handleFileInputChange = () => {
+ const files = Array.from(input.files || []);
const validFiles = files.filter(isFileTypeValid);
if (validFiles.length > 0) {
diff --git a/apps/web/src/lib/core/directive/folderSelector.ts b/apps/web/src/lib/core/directive/folderSelector.ts
index 367706a3ce..4aed4b2133 100644
--- a/apps/web/src/lib/core/directive/folderSelector.ts
+++ b/apps/web/src/lib/core/directive/folderSelector.ts
@@ -1,4 +1,4 @@
-import { type Accessor, type JSX, onCleanup } from 'solid-js';
+import { type Accessor, onCleanup } from 'solid-js';
interface FolderSelectorProps {
onSelect: (files: File[]) => void;
@@ -16,11 +16,8 @@ export function folderSelector(
element: HTMLElement,
accessor: Accessor<FolderSelectorProps | undefined>
) {
- const handleFolderInputChange: JSX.ChangeEventHandlerUnion<
- HTMLInputElement,
- Event
- > = (e) => {
- const files = Array.from(e.target.files || []).filter(
+ const handleFolderInputChange = () => {
+ const files = Array.from(input.files || []).filter(
(file) => !file.name.startsWith('.')
);
accessor()?.onSelect?.(files);
diff --git a/apps/web/src/lib/core/state/liveIndicators.ts b/apps/web/src/lib/core/state/liveIndicators.ts
index b1fc328212..d4c0e75e71 100644
--- a/apps/web/src/lib/core/state/liveIndicators.ts
+++ b/apps/web/src/lib/core/state/liveIndicators.ts
@@ -1,7 +1,7 @@
import { useBlockId } from '@core/block';
import { ENABLE_LIVE_INDICATORS } from '@core/constant/featureFlags';
import { createWebsocketEventEffect } from '@macro-inc/collaboration/websocket';
-import { ws } from '@service-connection/websocket';
+import { type FromWebsocketMessage, ws } from '@service-connection/websocket';
import { createStore, unwrap } from 'solid-js/store';
import { z } from 'zod';
@@ -9,11 +9,6 @@ type IndicatorStore = Record<string, string[]>;
const [indicatorStore, setIndicatorStore] = createStore<IndicatorStore>({});
-type IncomingTrackingUpdate = {
- type: 'user_tracking_change';
- data: string;
-};
-
const trackingUpdate = z.object({
entity_id: z.string(),
user_ids: z.array(z.string()),
@@ -23,7 +18,7 @@ const trackingUpdate = z.object({
createWebsocketEventEffect(
ws,
'user_tracking_change',
- (data: IncomingTrackingUpdate) => {
+ (data: FromWebsocketMessage) => {
if (!ENABLE_LIVE_INDICATORS) return;
const update = trackingUpdate.parse(JSON.parse(data.data));
setIndicatorStore(update.entity_id, update.user_ids);
diff --git a/apps/web/src/lib/core/util/click.ts b/apps/web/src/lib/core/util/click.ts
index 74580a888a..b65c309678 100644
--- a/apps/web/src/lib/core/util/click.ts
+++ b/apps/web/src/lib/core/util/click.ts
@@ -5,7 +5,7 @@
*
* @param cb - Callback to invoke on Enter key press.
*/
-export const onKeyDownClick = (cb?: (e?: Event) => void) => {
+export const onKeyDownClick = (cb?: (e: Event) => void) => {
return (e: KeyboardEvent) => {
const keyboardEvent = e as unknown as KeyboardEvent;
if (keyboardEvent.key === 'Enter') {
@@ -22,7 +22,7 @@ export const onKeyDownClick = (cb?: (e?: Event) => void) => {
*
* @param cb - Callback to invoke on Space key press.
*/
-export const onKeyUpClick = (cb?: (e?: Event) => void) => {
+export const onKeyUpClick = (cb?: (e: Event) => void) => {
return (e: KeyboardEvent) => {
const keyboardEvent = e as unknown as KeyboardEvent;
if (keyboardEvent.key === ' ') {
diff --git a/apps/web/src/lib/core/util/upload.ts b/apps/web/src/lib/core/util/upload.ts
index 26f0faf683..e45688bfd3 100644
--- a/apps/web/src/lib/core/util/upload.ts
+++ b/apps/web/src/lib/core/util/upload.ts
@@ -369,7 +369,11 @@ async function uploadToDSS(
try {
return dssUpload(file.file, options);
} catch (error) {
- throw new UploadError(file, 'dss', error);
+ throw new UploadError(
+ file,
+ 'dss',
+ error instanceof Error ? error : new Error(String(error))
+ );
}
}
@@ -387,7 +391,11 @@ async function uploadToStatic(
id,
};
} catch (error) {
- throw new UploadError(file, 'static', error);
+ throw new UploadError(
+ file,
+ 'static',
+ error instanceof Error ? error : new Error(String(error))
+ );
}
}
@@ -437,7 +445,7 @@ export async function uploadFile(
error:
error instanceof Error
? error
- : new UploadError(uploadSource, 'dss', error),
+ : new UploadError(uploadSource, 'dss', new Error(String(error))),
name,
};
}
diff --git a/apps/web/src/lib/core/util/url.test.ts b/apps/web/src/lib/core/util/url.test.ts
index 383ee2afc5..b523964a6a 100644
--- a/apps/web/src/lib/core/util/url.test.ts
+++ b/apps/web/src/lib/core/util/url.test.ts
@@ -1,8 +1,16 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+ afterEach,
+ beforeEach,
+ describe,
+ expect,
+ it,
+ type MockInstance,
+ vi,
+} from 'vitest';
import { openExternalUrl, registerExternalUrlInterceptor } from './url';
describe('openExternalUrl', () => {
- let openSpy: ReturnType<typeof vi.spyOn>;
+ let openSpy: MockInstance<typeof window.open>;
const disposers: Array<() => void> = [];
// Register + track the disposer so afterEach can tear it down; interceptors
diff --git a/apps/web/src/lib/core/util/useKeyPressed.ts b/apps/web/src/lib/core/util/useKeyPressed.ts
index 192bd34600..520ffe4854 100644
--- a/apps/web/src/lib/core/util/useKeyPressed.ts
+++ b/apps/web/src/lib/core/util/useKeyPressed.ts
@@ -1,7 +1,7 @@
import { debounce } from '@solid-primitives/scheduled';
import { createSignal, onCleanup, onMount } from 'solid-js';
-let listeners = new Set<(e?: KeyboardEvent) => void>();
+let listeners = new Set<(e: KeyboardEvent) => void>();
let isListening = false;
const startGlobalListener = () => {
diff --git a/apps/web/src/lib/filesystem/fileFilter.ts b/apps/web/src/lib/filesystem/fileFilter.ts
index 12b8831bb6..3213531369 100644
--- a/apps/web/src/lib/filesystem/fileFilter.ts
+++ b/apps/web/src/lib/filesystem/fileFilter.ts
@@ -1,6 +1,6 @@
import { blockAcceptedFileExtensionToMimeType } from "@core/constant/allBlocks";
-type OldSupportedExt = 'pdf' | 'docx';
+export type OldSupportedExt = 'pdf' | 'docx';
const oldSupportedFiles = {
pdf: "PDF",
diff --git a/apps/web/src/lib/filesystem/open.ts b/apps/web/src/lib/filesystem/open.ts
index 621bca8991..eb889cf826 100644
--- a/apps/web/src/lib/filesystem/open.ts
+++ b/apps/web/src/lib/filesystem/open.ts
@@ -4,6 +4,7 @@ import {
browserFileFilter,
FileFilter,
filterFromExt,
+ type OldSupportedExt,
} from './fileFilter';
import { readFileFromHandle } from './read';
@@ -56,7 +57,7 @@ export async function openFromDisk({
multiple = false,
readonly = false,
}: {
- exts: Array<string>;
+ exts: Array<OldSupportedExt>;
multiple: boolean;
readonly?: boolean;
}): Promise<Array<{ file: FileSystemFile }>> {
diff --git a/apps/web/src/lib/graphql-cache/exchange/optimistic.ts b/apps/web/src/lib/graphql-cache/exchange/optimistic.ts
index 241cea7292..df623fef62 100644
--- a/apps/web/src/lib/graphql-cache/exchange/optimistic.ts
+++ b/apps/web/src/lib/graphql-cache/exchange/optimistic.ts
@@ -16,6 +16,7 @@ import {
type OperationResultSource,
stringifyDocument,
} from '@urql/core';
+import type { DocumentNode } from 'graphql';
import type {
EmbeddedLinkPathSegment,
OptimisticLinkPatchWire,
@@ -102,7 +103,7 @@ export type OptimisticUpdate = OptimisticLinkPatchWire & {
};
export type QueryRevalidation = {
- document: TypedDocumentNode<unknown, AnyVariables>;
+ document: DocumentNode;
variables: AnyVariables;
};
diff --git a/apps/web/src/lib/graphql-cache/legacy-idb-cleanup.test.ts b/apps/web/src/lib/graphql-cache/legacy-idb-cleanup.test.ts
index f8d3cc1ffa..8d297ad47e 100644
--- a/apps/web/src/lib/graphql-cache/legacy-idb-cleanup.test.ts
+++ b/apps/web/src/lib/graphql-cache/legacy-idb-cleanup.test.ts
@@ -1,4 +1,4 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, type MockInstance, vi } from 'vitest';
import { deleteLegacyNormalizedCacheIdb } from './legacy-idb-cleanup';
type MutableDeleteRequest = Pick<
@@ -17,15 +17,20 @@ function deleteRequest(): MutableDeleteRequest {
function dispatch(
request: MutableDeleteRequest,
kind: 'blocked' | 'error' | 'success'
-): ReturnType<typeof vi.fn> {
- const preventDefault = vi.fn();
- const event = { type: kind, preventDefault } as unknown as Event;
- const handler =
- kind === 'blocked'
- ? request.onblocked
- : kind === 'error'
- ? request.onerror
- : request.onsuccess;
+): MockInstance<Event['preventDefault']> {
+ if (kind === 'blocked') {
+ const event: IDBVersionChangeEvent = Object.assign(new Event(kind), {
+ newVersion: null,
+ oldVersion: 0,
+ });
+ const preventDefault = vi.spyOn(event, 'preventDefault');
+ request.onblocked?.call(request as IDBOpenDBRequest, event);
+ return preventDefault;
+ }
+
+ const event = new Event(kind);
+ const preventDefault = vi.spyOn(event, 'preventDefault');
+ const handler = kind === 'error' ? request.onerror : request.onsuccess;
handler?.call(request as IDBOpenDBRequest, event);
return preventDefault;
}
diff --git a/apps/web/src/lib/graphql-cache/worker/browser-test/instrumented-cache.engine-worker.ts b/apps/web/src/lib/graphql-cache/worker/browser-test/instrumented-cache.engine-worker.ts
index 7d3de96f36..6430a0feb0 100644
--- a/apps/web/src/lib/graphql-cache/worker/browser-test/instrumented-cache.engine-worker.ts
+++ b/apps/web/src/lib/graphql-cache/worker/browser-test/instrumented-cache.engine-worker.ts
@@ -89,7 +89,6 @@ installCacheEngineWorker({
},
},
});
-const runtimeOnMessage = globalThis.onmessage;
for (const event of bufferedActivationEvents) {
- runtimeOnMessage?.call(globalThis, event);
+ globalThis.dispatchEvent(event);
}
diff --git a/apps/web/src/lib/queries/ai/createAIObject.ts b/apps/web/src/lib/queries/ai/createAIObject.ts
index 6918401552..87b1ed029d 100644
--- a/apps/web/src/lib/queries/ai/createAIObject.ts
+++ b/apps/web/src/lib/queries/ai/createAIObject.ts
@@ -214,8 +214,8 @@ function stringifyVariables(variables: unknown): string {
return typeof variables === 'string' ? variables : JSON.stringify(variables);
}
-function buildMessages<Variables>(
- options: CreateAIObjectOptions<z.ZodType, Variables>,
+function buildMessages<Schema extends z.ZodType, Variables, OnMutateResult>(
+ options: CreateAIObjectOptions<Schema, Variables, OnMutateResult>,
variables: Variables
): ChatMessage[] {
if (typeof options.messages === 'function') {
@@ -239,8 +239,12 @@ function buildMessages<Variables>(
return messages;
}
-async function generateAIObject<Schema extends z.ZodType, Variables>(
- options: CreateAIObjectOptions<Schema, Variables>,
+async function generateAIObject<
+ Schema extends z.ZodType,
+ Variables,
+ OnMutateResult,
+>(
+ options: CreateAIObjectOptions<Schema, Variables, OnMutateResult>,
variables: Variables
): Promise<z.infer<Schema>> {
const response = await dcsCompletion({
diff --git a/apps/web/src/lib/queries/channel/thread-replies.ts b/apps/web/src/lib/queries/channel/thread-replies.ts
index 077eb8de07..97e992e555 100644
--- a/apps/web/src/lib/queries/channel/thread-replies.ts
+++ b/apps/web/src/lib/queries/channel/thread-replies.ts
@@ -35,7 +35,7 @@ export function threadRepliesQueryOptions(
);
},
staleTime: Infinity,
- placeholderData: (prev: ApiThreadReply[]) => prev,
+ placeholderData: (prev: ApiThreadReply[] | undefined) => prev,
};
}
diff --git a/apps/web/src/lib/queries/history/history.ts b/apps/web/src/lib/queries/history/history.ts
index b4efcaf194..ef8943faa3 100644
--- a/apps/web/src/lib/queries/history/history.ts
+++ b/apps/web/src/lib/queries/history/history.ts
@@ -9,7 +9,6 @@ import { type ItemType, storageServiceClient } from '@service-storage/client';
import { getGraphqlSoupCacheHost } from '@service-storage/graphql-soup';
import {
type QueryClient,
- type QueryKey,
queryOptions,
type Updater,
useMutation,
@@ -76,18 +75,24 @@ export function setHistoryItemFileType(itemId: string, fileType: string) {
}));
}
+const fetchHistory = async (): Promise<HistoryQueryFnResult> => {
+ const result = await throwOnErr(
+ async () => await storageServiceClient.getUsersHistory()
+ );
+ return transformHistoryResponse(result);
+};
+
const historyQueryOptions = queryOptions({
queryKey: historyKeys.list.queryKey,
- queryFn: async (): Promise<HistoryQueryFnResult> => {
- const result = await throwOnErr(
- async () => await storageServiceClient.getUsersHistory()
- );
- return transformHistoryResponse(result);
- },
+ queryFn: fetchHistory,
staleTime: HISTORY_STALE_TIME,
gcTime: HISTORY_GC_TIME,
});
+type HistoryQueryKey =
+ | typeof historyKeys.list.queryKey
+ | typeof historyKeys.graphqlList.queryKey;
+
export function useHistoryQuery() {
const graphqlSoupFlag = useFeatureFlag(ENABLE_GRAPHQL_SOUP_FLAG, {
enabledOverride: ENABLE_GRAPHQL_SOUP_OVERRIDE,
@@ -98,27 +103,33 @@ export function useHistoryQuery() {
return cacheHost?.disabled ? undefined : cacheHost;
};
- return useQuery<HistoryQueryFnResult, Error, HistoryQueryFnResult, QueryKey>(
- () => {
- const cacheHost = graphqlCacheHost();
- if (cacheHost) {
- return {
- queryKey: historyKeys.graphqlList.queryKey,
- queryFn: () => readCachedGraphqlHistoryItems(cacheHost),
- placeholderData: (prev: HistoryQueryFnResult | undefined) => prev,
- staleTime: Infinity,
- refetchOnMount: 'always' as const,
- reconcile: 'id',
- };
- }
-
+ return useQuery<
+ HistoryQueryFnResult,
+ Error,
+ HistoryQueryFnResult,
+ HistoryQueryKey
+ >(() => {
+ const cacheHost = graphqlCacheHost();
+ if (cacheHost) {
return {
- ...historyQueryOptions,
+ queryKey: historyKeys.graphqlList.queryKey,
+ queryFn: () => readCachedGraphqlHistoryItems(cacheHost),
placeholderData: (prev: HistoryQueryFnResult | undefined) => prev,
+ staleTime: Infinity,
+ refetchOnMount: 'always' as const,
reconcile: 'id',
};
}
- );
+
+ return {
+ queryKey: historyKeys.list.queryKey,
+ queryFn: fetchHistory,
+ staleTime: HISTORY_STALE_TIME,
+ gcTime: HISTORY_GC_TIME,
+ placeholderData: (prev: HistoryQueryFnResult | undefined) => prev,
+ reconcile: 'id',
+ };
+ });
}
export async function prefetchHistory() {
diff --git a/apps/web/src/lib/queries/notification/user-notifications.ts b/apps/web/src/lib/queries/notification/user-notifications.ts
index dd68ece36b..53faf5458d 100644
--- a/apps/web/src/lib/queries/notification/user-notifications.ts
+++ b/apps/web/src/lib/queries/notification/user-notifications.ts
@@ -651,8 +651,9 @@ function createNotificationsMutation(
function notificationsMutationErrorFn(
_: Error,
_params: NotificationsMutationParams,
- context: NotificationsMutationContext
+ context: NotificationsMutationContext | undefined
) {
+ if (!context) return;
for (const [queryKey, data] of context.previousData) {
queryClient.setQueryData(
queryKey as readonly unknown[],
diff --git a/apps/web/src/lib/service-clients/service-auth/client.ts b/apps/web/src/lib/service-clients/service-auth/client.ts
index f7ab177dd8..ea3e4e0966 100644
--- a/apps/web/src/lib/service-clients/service-auth/client.ts
+++ b/apps/web/src/lib/service-clients/service-auth/client.ts
@@ -131,7 +131,9 @@ async function getAccessToken(): Promise<string | null> {
return null;
}
} catch (error) {
- Telemetry.error('Error refreshing access token', { error });
+ Telemetry.error('Error refreshing access token', {
+ error: error instanceof Error ? error.message : String(error),
+ });
return null;
} finally {
// Clear the ongoing refresh promise so future calls can start a new refresh
diff --git a/apps/web/src/lib/service-clients/service-storage/client.ts b/apps/web/src/lib/service-clients/service-storage/client.ts
index eee016856c..f4e319473c 100644
--- a/apps/web/src/lib/service-clients/service-storage/client.ts
+++ b/apps/web/src/lib/service-clients/service-storage/client.ts
@@ -162,8 +162,13 @@ import type { UserViewsResponse } from './generated/schemas/userViewsResponse';
import type { View } from './generated/schemas/view';
import type { ViewsResponse } from './generated/schemas/viewsResponse';
import { saveDocumentHandlerResponse } from './generated/zod';
+import type { ItemType } from './itemType';
+
+export type { ItemType } from './itemType';
+
import type {
GetDocumentPermissionsTokenResponse,
+ ProcessingResultType,
StorageServiceClient,
ValidateDocumentPermissionsTokenResponse,
} from './service';
@@ -228,19 +233,6 @@ type Success = {
};
type SuccessResponse = { data: Success };
-export type ItemType =
- | CloudStorageItemType
- | 'channel'
- | 'email'
- | 'channel_message'
- | 'channel_thread'
- | 'call'
- | 'automation'
- | 'calendar_event'
- | 'foreign'
- | 'crm_company'
- | 'crm_contact';
-
export const DEFAULT_ITEM_TYPE: ItemType = 'document';
export type { ApiAttachmentChannelReference } from './generated/schemas/apiAttachmentChannelReference';
@@ -397,7 +389,6 @@ export function isCloudStorageItem(
return Object.values(CloudStorageItemTypeMap).includes(item as any);
}
-type ProcessingResultType = 'PREPROCESS' | 'SPLIT_TEXTS';
export type ProcessingResultResponseType<T extends ProcessingResultType> =
T extends 'PREPROCESS'
? ICoParse
diff --git a/apps/web/src/lib/service-clients/service-storage/itemType.ts b/apps/web/src/lib/service-clients/service-storage/itemType.ts
new file mode 100644
index 0000000000..4d6bad6819
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-storage/itemType.ts
@@ -0,0 +1,32 @@
+import type { CloudStorageItemType } from './generated/schemas/cloudStorageItemType';
+
+/** Item type accepted by user history endpoints. */
+export type ItemType =
+ | CloudStorageItemType
+ | 'channel'
+ | 'email'
+ | 'channel_message'
+ | 'channel_thread'
+ | 'call'
+ | 'automation'
+ | 'calendar_event'
+ | 'foreign'
+ | 'crm_company'
+ | 'crm_contact';
+
+/** Item types accepted by user history endpoints. */
+export const ITEM_TYPES = [
+ 'document',
+ 'chat',
+ 'project',
+ 'channel',
+ 'email',
+ 'channel_message',
+ 'channel_thread',
+ 'call',
+ 'automation',
+ 'calendar_event',
+ 'foreign',
+ 'crm_company',
+ 'crm_contact',
+] as const satisfies readonly ItemType[];
diff --git a/apps/web/src/lib/service-clients/service-storage/service.ts b/apps/web/src/lib/service-clients/service-storage/service.ts
index 6ca7c1c982..7273403d1f 100644
--- a/apps/web/src/lib/service-clients/service-storage/service.ts
+++ b/apps/web/src/lib/service-clients/service-storage/service.ts
@@ -1,5 +1,6 @@
import {
PdfCoParseSchema as CoParseSchema,
+ PdfModificationDataOnServerSchema,
PdfSegmentSchema as TSegmentSchema,
} from '@coparse/document-processing-types';
import {
@@ -12,6 +13,7 @@ import {
} from '@core/service';
import { z } from 'zod';
import * as schemas from './generated/zod';
+import { ITEM_TYPES } from './itemType';
const _ChatMessageSchema = z.object({
content: z.string().describe('Content of the message'),
@@ -21,6 +23,11 @@ const _ChatMessageSchema = z.object({
const _ChatResponseSchema = z.object({});
+const ProcessingResultTypeSchema = z.enum(['PREPROCESS', 'SPLIT_TEXTS']);
+
+/** Available document processing result variants. */
+export type ProcessingResultType = z.infer<typeof ProcessingResultTypeSchema>;
+
const DocxDocumentPartLocation = z.object({
sha: z.string(),
url: z.string(),
@@ -336,7 +343,7 @@ export const StorageService = new Svc('Document++ Storage Service API')
description: schemas.upsertHistoryHandlerResponse.description!,
args: {
itemId: schemas.upsertHistoryHandlerParams.shape.item_id,
- itemType: schemas.upsertHistoryHandlerParams.shape.item_type,
+ itemType: z.enum(ITEM_TYPES),
},
result: schemas.upsertHistoryHandlerResponse.shape.data.shape,
modifies: true,
@@ -347,7 +354,7 @@ export const StorageService = new Svc('Document++ Storage Service API')
description: schemas.deleteHistoryHandlerResponse.description!,
args: {
itemId: schemas.deleteHistoryHandlerParams.shape.item_id,
- itemType: schemas.deleteHistoryHandlerParams.shape.item_type,
+ itemType: z.enum(ITEM_TYPES),
},
result: schemas.deleteHistoryHandlerResponse.shape.data.shape,
modifies: true,
@@ -484,6 +491,7 @@ export const StorageService = new Svc('Document++ Storage Service API')
description: schemas.getDocumentProcessingResultParams.description!,
args: {
documentId: schemas.getDocumentProcessingResultParams.shape.document_id,
+ type: ProcessingResultTypeSchema,
},
result: {
preprocess: CoParseSchema.optional(),
@@ -496,6 +504,7 @@ export const StorageService = new Svc('Document++ Storage Service API')
args: {
documentId: schemas.jobProcessingResultHandlerParams.shape.document_id,
jobId: schemas.jobProcessingResultHandlerParams.shape.job_id,
+ type: ProcessingResultTypeSchema,
},
result: {
preprocess: CoParseSchema.optional(),
@@ -514,7 +523,8 @@ export const StorageService = new Svc('Document++ Storage Service API')
description: schemas.saveDocumentHandlerResponse.description!,
args: {
documentId: schemas.saveDocumentHandlerParams.shape.document_id,
- ...schemas.saveDocumentHandlerBody.shape,
+ modificationData: PdfModificationDataOnServerSchema,
+ sha: z.string(),
},
result:
schemas.saveDocumentHandlerResponse.shape.data.shape.documentMetadata
diff --git a/apps/web/src/lib/service-clients/service-storage/util/getDocxFile.ts b/apps/web/src/lib/service-clients/service-storage/util/getDocxFile.ts
index 0cf58a15fc..4b9cbc7b88 100644
--- a/apps/web/src/lib/service-clients/service-storage/util/getDocxFile.ts
+++ b/apps/web/src/lib/service-clients/service-storage/util/getDocxFile.ts
@@ -18,6 +18,10 @@ export type DocxExpandedPart = DocxBaseExpandedPart<ArrayBuffer>;
export type DocxExpandedPartList = Omit<DocxExpandedPart, 'content'>[];
+function errorMessage(error: unknown): string {
+ return error instanceof Error ? error.message : String(error);
+}
+
export type GetDocxFileResponse = FlattenObject<{
parts: Array<{ sha: string; url: string }>;
metadata: WithRequired<DocumentMetadata, 'documentBom'>;
@@ -36,7 +40,7 @@ export async function getDocxExpandedParts(
return err([
{
code: 'OPFS_ERROR',
- message: `Failed to get OPFS document store: ${error.message}`,
+ message: `Failed to get OPFS document store: ${errorMessage(error)}`,
},
]);
}
@@ -49,7 +53,7 @@ export async function getDocxExpandedParts(
return err([
{
code: 'OPFS_ERROR',
- message: `Failed to get OPFS document handle for ${documentId}: ${error.message}`,
+ message: `Failed to get OPFS document handle for ${documentId}: ${errorMessage(error)}`,
},
]);
}
@@ -70,7 +74,7 @@ export async function getDocxExpandedParts(
return err([
{
code: 'OPFS_ERROR',
- message: `Failed to list OPFS parts for ${documentId}: ${error.message}`,
+ message: `Failed to list OPFS parts for ${documentId}: ${errorMessage(error)}`,
},
]);
}
@@ -96,7 +100,9 @@ export async function getDocxExpandedParts(
}
return { sha: p.sha, path: p.path, content: buffer };
} catch (error) {
- console.warn(`Failed to get part ${p.path}: ${error.message}`);
+ console.warn(
+ `Failed to get part ${p.path}: ${errorMessage(error)}`
+ );
return null;
}
})
diff --git a/apps/web/src/lib/service-clients/service-stripe/client.ts b/apps/web/src/lib/service-clients/service-stripe/client.ts
index 51778d6154..053e653339 100644
--- a/apps/web/src/lib/service-clients/service-stripe/client.ts
+++ b/apps/web/src/lib/service-clients/service-stripe/client.ts
@@ -25,9 +25,9 @@ function getGaClientId(): Promise<string | undefined> {
const timeout = setTimeout(() => resolve(undefined), 500);
- gtag('get', 'G-52HPEL3FTV', 'client_id', (clientId: string) => {
+ gtag('get', 'G-52HPEL3FTV', 'client_id', (clientId) => {
clearTimeout(timeout);
- resolve(clientId);
+ resolve(typeof clientId === 'string' ? clientId : undefined);
});
});
}
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index e6b034dd15..2306e05c99 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -9,8 +9,7 @@
"./src/features/block-code/scripts/**/*"
],
"compilerOptions": {
- "noImplicitAny": true,
- "strictNullChecks": true,
+ "strict": true,
"noUnusedLocals": false,
"noUnusedParameters": false,
"noFallthroughCasesInSwitch": true,