codemirror type fix (#809)

add order data generatorcomment row generator code

Author: heswell

vuu-ui/package-lock.json

@@ -17,8 +17,7 @@
   "dependencies": {
     "@finos/vuu-data": "0.0.26",
     "@finos/vuu-data-types": "0.0.26",
-    "@finos/vuu-filters": "0.0.26",
-    "@finos/vuu-popups": "0.0.26",
+    "@finos/vuu-filter-parser": "0.0.26",
     "@finos/vuu-utils": "0.0.26"
   },
   "peerDependencies": {

vuu-ui/packages/vuu-data-react/package.json

@@ -13,10 +13,10 @@ import {
 import {
   ContextMenuItemDescriptor,
   DataSourceRow,
+  MenuBuilder,
 } from "@finos/vuu-data-types";
 import { GridAction } from "@finos/vuu-datagrid-types";
 import { getFilterPredicate } from "@finos/vuu-filter-parser";
-import { MenuBuilder } from "@finos/vuu-popups";
 import {
   ClientToServerMenuCellRPC,
   ClientToServerMenuRowRPC,

vuu-ui/packages/vuu-data-react/src/hooks/useVuuMenuActions.ts

@@ -51,3 +51,18 @@ export interface ContextMenuGroupItemDescriptor extends ContextMenuItemBase {
 export type ContextMenuItemDescriptor =
   | ContextMenuLeafItemDescriptor
   | ContextMenuGroupItemDescriptor;
+
+export type MenuBuilder<L = string, O = unknown> = (
+  location: L,
+  options: O
+) => ContextMenuItemDescriptor[];
+
+export type MenuActionHandler = (
+  type: string,
+  options: unknown
+) => boolean | undefined;
+
+export interface ContextMenuContextType {
+  menuBuilders: MenuBuilder[];
+  menuActionHandler: MenuActionHandler;
+}

vuu-ui/packages/vuu-data-types/index.d.ts

@@ -1,8 +1,7 @@
 /* eslint-disable no-sequences */
 import { DataSource } from "@finos/vuu-data";
-import { DataSourceFilter } from "@finos/vuu-data-types";
+import { DataSourceFilter, MenuActionHandler } from "@finos/vuu-data-types";
 import { KeyedColumnDescriptor } from "@finos/vuu-datagrid-types";
-import { MenuActionHandler } from "@finos/vuu-popups";
 import { removeColumnFromFilter, setAggregations } from "@finos/vuu-utils";
 import { AggregationType } from "../constants";
 import { GridModelDispatch } from "../grid-context";

vuu-ui/packages/vuu-datagrid/src/context-menu/useContextMenu.ts

@@ -1,21 +1,11 @@
+import type {
+  ContextMenuContextType,
+  MenuActionHandler,
+  MenuBuilder,
+} from "@finos/vuu-data-types";
 import { createContext, ReactNode, useCallback, useMemo } from "react";
-import { ContextMenuItemDescriptor } from "@finos/vuu-data-types";
 
-export type MenuActionHandler = (
-  type: string,
-  options: unknown
-) => boolean | undefined;
-export type MenuBuilder<L = string, O = unknown> = (
-  location: L,
-  options: O
-) => ContextMenuItemDescriptor[];
-
-export interface ContextMenuContext {
-  menuBuilders: MenuBuilder[];
-  menuActionHandler: MenuActionHandler;
-}
-
-export const ContextMenuContext = createContext<ContextMenuContext | null>(
+export const ContextMenuContext = createContext<ContextMenuContextType | null>(
   null
 );
 
@@ -27,7 +17,7 @@ export interface ContextMenuProviderProps {
 }
 
 interface ProviderProps extends ContextMenuProviderProps {
-  context: ContextMenuContext | null;
+  context: ContextMenuContextType | null;
 }
 
 const Provider = ({

vuu-ui/packages/vuu-popups/src/menu/context-menu-provider.tsx

@@ -7,13 +7,10 @@ import { isGroupMenuItemDescriptor } from "@finos/vuu-utils";
 import cx from "classnames";
 import { MouseEvent, useCallback, useContext } from "react";
 import { PopupService } from "../popup";
-import {
-  ContextMenuContext,
-  MenuActionHandler,
-  MenuBuilder,
-} from "./context-menu-provider";
+import { MenuActionHandler, MenuBuilder } from "@finos/vuu-data-types";
 import { ContextMenu, ContextMenuProps } from "./ContextMenu";
 import { MenuItem, MenuItemGroup } from "./MenuList";
+import { ContextMenuContext } from "./context-menu-provider";
 
 export type ContextMenuOptions = {
   [key: string]: unknown;

vuu-ui/packages/vuu-popups/src/menu/useContextMenu.tsx

@@ -17,7 +17,8 @@ const columnExpressionLanguage = LRLanguage.define({
         Operator: tag.operator,
       }),
     ],
-  }),
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }) as any,
 });
 
 export const columnExpressionLanguageSupport = () => {

vuu-ui/packages/vuu-table-extras/src/column-expression-input/column-language-parser/ColumnExpressionLanguage.ts

@@ -1,8 +1,7 @@
 import { DataSource } from "@finos/vuu-data";
-import { ContextMenuItemDescriptor } from "@finos/vuu-data-types";
+import { ContextMenuItemDescriptor, MenuBuilder } from "@finos/vuu-data-types";
 import { KeyedColumnDescriptor, PinLocation } from "@finos/vuu-datagrid-types";
 import { Filter } from "@finos/vuu-filter-types";
-import { MenuBuilder } from "@finos/vuu-popups";
 import { isNumericColumn } from "@finos/vuu-utils";
 
 export type ContextMenuLocation = "header" | "filter" | "grid";

vuu-ui/packages/vuu-table/src/context-menu/buildContextMenuDescriptors.ts

@@ -3,9 +3,8 @@ import { DataSource } from "@finos/vuu-data";
 import { KeyedColumnDescriptor } from "@finos/vuu-datagrid-types";
 import { Filter } from "@finos/vuu-filter-types";
 import { removeColumnFromFilter } from "@finos/vuu-utils";
-import { MenuActionHandler } from "@finos/vuu-popups";
 import { VuuFilter } from "@finos/vuu-protocol-types";
-import { DataSourceFilter } from "@finos/vuu-data-types";
+import { DataSourceFilter, MenuActionHandler } from "@finos/vuu-data-types";
 import { PersistentColumnAction } from "../useTableModel";
 import {
   addGroupColumn,