move date generators to test data package (#938)

finos · Oct 27, 2023 · 211fbf9 · 211fbf9
1 parent 3cd0826
commit 211fbf9
Show file tree

Hide file tree

Showing 38 changed files with 34 additions and 87 deletions.
diff --git a/...ase/src/examples/utils/UpdateGenerator.ts → ...ages/vuu-data-test/src/UpdateGenerator.ts b/...ase/src/examples/utils/UpdateGenerator.ts → ...ages/vuu-data-test/src/UpdateGenerator.ts
diff --git a/...enerators/basket-definitions-generator.ts → ...enerators/basket-definitions-generator.ts b/...enerators/basket-definitions-generator.ts → ...enerators/basket-definitions-generator.ts
@@ -5,7 +5,7 @@ import {
   BasketDefinitionsReferenceData,
 } from "../reference-data";
 import { BaseUpdateGenerator } from "../UpdateGenerator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
 
 export const RowGenerator: RowGeneratorFactory =

diff --git a/...ata-generators/basket-design-generator.ts → ...ata-generators/basket-design-generator.ts b/...ata-generators/basket-design-generator.ts → ...ata-generators/basket-design-generator.ts
@@ -1,6 +1,6 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import {
   BasketDesignReferenceData,
   BasketDesignColumnMap,

diff --git a/...utils/data-generators/basket-generator.ts → ...t/src/data-generators/basket-generator.ts b/...utils/data-generators/basket-generator.ts → ...t/src/data-generators/basket-generator.ts
@@ -1,6 +1,6 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
 import { BasketColumnMap, BasketReferenceData } from "../reference-data";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
 
 export const RowGenerator: RowGeneratorFactory =

diff --git a/...ata-generators/basket-orders-generator.ts → ...ata-generators/basket-orders-generator.ts b/...ata-generators/basket-orders-generator.ts → ...ata-generators/basket-orders-generator.ts
@@ -1,6 +1,6 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import {
   BasketOrdersReferenceData,
   BasketOrdersColumnMap,

diff --git a/.../data-generators/child-order-generator.ts → .../data-generators/child-order-generator.ts b/.../data-generators/child-order-generator.ts → .../data-generators/child-order-generator.ts
@@ -1,7 +1,6 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
-import { ExtendedColumnConfig } from "../useTableConfig";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import { currencies, locations, suffixes } from "./generatedData";
 
 function random(min: number, max: number) {
@@ -75,10 +74,7 @@ export const RowGenerator: RowGeneratorFactory = () => (index: number) => {
   ];
 };
 
-export const ColumnGenerator: ColumnGeneratorFn = (
-  columns = [],
-  columnConfig: ExtendedColumnConfig = {}
-) => {
+export const ColumnGenerator: ColumnGeneratorFn = (columns = []) => {
   const schema = getSchema("childOrders");
   const schemaColumns: ColumnDescriptor[] = schema.columns;
   if (typeof columns === "number") {

diff --git a/...ls/data-generators/generate-data-utils.ts → ...rc/data-generators/generate-data-utils.ts b/...ls/data-generators/generate-data-utils.ts → ...rc/data-generators/generate-data-utils.ts
diff --git a/...es/utils/data-generators/generatedData.ts → ...test/src/data-generators/generatedData.ts b/...es/utils/data-generators/generatedData.ts → ...test/src/data-generators/generatedData.ts
diff --git a/...c/examples/utils/data-generators/index.ts → ...uu-data-test/src/data-generators/index.ts b/...c/examples/utils/data-generators/index.ts → ...uu-data-test/src/data-generators/index.ts
diff --git a/...s/data-generators/instrument-generator.ts → ...c/data-generators/instrument-generator.ts b/...s/data-generators/instrument-generator.ts → ...c/data-generators/instrument-generator.ts
@@ -1,12 +1,13 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import {
   InstrumentReferenceData,
   InstrumentColumnMap,
 } from "../reference-data";
 import { getCalculatedColumnType, isCalculatedColumn } from "@finos/vuu-utils";
-import { ExtendedColumnConfig } from "../useTableConfig";
+
+export type ExtendedColumnConfig = { [key: string]: Partial<ColumnDescriptor> };
 
 export const RowGenerator: RowGeneratorFactory =
   (columnNames?: string[]) => (index: number) => {

diff --git a/...generators/instrument-prices-generator.ts → ...generators/instrument-prices-generator.ts b/...generators/instrument-prices-generator.ts → ...generators/instrument-prices-generator.ts
@@ -5,7 +5,7 @@ import {
   InstrumentPricesReferenceData,
 } from "../reference-data";
 import { BaseUpdateGenerator } from "../UpdateGenerator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
 
 const instrumentPriceSchema = getSchema("instrumentPrices");

diff --git a/.../utils/data-generators/order-generator.ts → ...st/src/data-generators/order-generator.ts b/.../utils/data-generators/order-generator.ts → ...st/src/data-generators/order-generator.ts
@@ -1,7 +1,8 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
-import { ExtendedColumnConfig } from "../useTableConfig";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
+
+export type ExtendedColumnConfig = { [key: string]: Partial<ColumnDescriptor> };
 
 function random(min: number, max: number) {
   min = Math.ceil(min);

diff --git a/...data-generators/parent-order-generator.ts → ...data-generators/parent-order-generator.ts b/...data-generators/parent-order-generator.ts → ...data-generators/parent-order-generator.ts
@@ -1,7 +1,6 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
-import { ExtendedColumnConfig } from "../useTableConfig";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
-import { getSchema } from "@finos/vuu-data-test";
+import { getSchema } from "../tableSchemas";
 import { currencies, locations, suffixes } from "./generatedData";
 
 function random(min: number, max: number) {
@@ -67,11 +66,7 @@ export const RowGenerator: RowGeneratorFactory = () => (index: number) => {
   ];
 };
 
-export const ColumnGenerator: ColumnGeneratorFn = (
-  columns = [],
-  columnConfig: ExtendedColumnConfig = {}
-) => {
-  console.log({ columnConfig });
+export const ColumnGenerator: ColumnGeneratorFn = (columns = []) => {
   const schema = getSchema("parentOrders");
   const schemaColumns: ColumnDescriptor[] = schema.columns;
   if (typeof columns === "number") {

diff --git a/...utils/data-generators/prices-generator.ts → ...t/src/data-generators/prices-generator.ts b/...utils/data-generators/prices-generator.ts → ...t/src/data-generators/prices-generator.ts
@@ -1,10 +1,9 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
 import { buildColumnMap } from "@finos/vuu-utils";
 import { PriceReferenceData } from "../reference-data";
-import { ExtendedColumnConfig } from "../useTableConfig";
 import { ColumnGeneratorFn, RowGeneratorFactory } from "./vuu-row-generator";
 import { BaseUpdateGenerator } from "../UpdateGenerator";
-import { getAllSchemas } from "@finos/vuu-data-test";
+import { getAllSchemas } from "../tableSchemas";
 
 export const RowGenerator: RowGeneratorFactory = () => (index: number) => {
   if (index >= PriceReferenceData.length) {
@@ -21,11 +20,7 @@ const tickingColumns = [bid, bidSize, ask, askSize];
 export const createUpdateGenerator = () =>
   new BaseUpdateGenerator(tickingColumns);
 
-export const ColumnGenerator: ColumnGeneratorFn = (
-  columns = [],
-  columnConfig: ExtendedColumnConfig = {}
-) => {
-  console.log({ columnConfig });
+export const ColumnGenerator: ColumnGeneratorFn = (columns = []) => {
   const schemaColumns: ColumnDescriptor[] = pricesSchema.columns;
   if (typeof columns === "number") {
     throw Error("PricesColumnGenerator must be passed columns (strings)");

diff --git a/...tils/data-generators/vuu-row-generator.ts → .../src/data-generators/vuu-row-generator.ts b/...tils/data-generators/vuu-row-generator.ts → .../src/data-generators/vuu-row-generator.ts
@@ -1,9 +1,10 @@
 import { ColumnDescriptor } from "@finos/vuu-datagrid-types";
 import { VuuRowDataItemType, VuuTable } from "@finos/vuu-protocol-types";
-import { RowAtIndexFunc } from "../ArrayProxy";
 import * as dataGenerators from ".";
 import { UpdateGenerator } from "../rowUpdates";
 
+type RowAtIndexFunc<T = unknown> = (index: number) => T | undefined;
+
 export const VuuColumnGenerator = (columnCount: number): string[] =>
   ["Row No"].concat(
     Array(columnCount)

diff --git a/vuu-ui/packages/vuu-data-test/src/index.ts b/vuu-ui/packages/vuu-data-test/src/index.ts
@@ -1 +1,2 @@
 export * from "./tableSchemas";
+export * from "./data-generators/vuu-row-generator";
diff --git a/...tils/reference-data/basket-definitions.ts → .../src/reference-data/basket-definitions.ts b/...tils/reference-data/basket-definitions.ts → .../src/reference-data/basket-definitions.ts
diff --git a/...les/utils/reference-data/basket-design.ts → ...-test/src/reference-data/basket-design.ts b/...les/utils/reference-data/basket-design.ts → ...-test/src/reference-data/basket-design.ts
diff --git a/...les/utils/reference-data/basket-orders.ts → ...-test/src/reference-data/basket-orders.ts b/...les/utils/reference-data/basket-orders.ts → ...-test/src/reference-data/basket-orders.ts
diff --git a/...c/examples/utils/reference-data/basket.ts → ...uu-data-test/src/reference-data/basket.ts b/...c/examples/utils/reference-data/basket.ts → ...uu-data-test/src/reference-data/basket.ts
diff --git a/...amples/utils/reference-data/currencies.ts → ...ata-test/src/reference-data/currencies.ts b/...amples/utils/reference-data/currencies.ts → ...ata-test/src/reference-data/currencies.ts
diff --git a/...rc/examples/utils/reference-data/index.ts → ...vuu-data-test/src/reference-data/index.ts b/...rc/examples/utils/reference-data/index.ts → ...vuu-data-test/src/reference-data/index.ts
diff --git a/...utils/reference-data/instrument-prices.ts → ...t/src/reference-data/instrument-prices.ts b/...utils/reference-data/instrument-prices.ts → ...t/src/reference-data/instrument-prices.ts
diff --git a/...mples/utils/reference-data/instruments.ts → ...ta-test/src/reference-data/instruments.ts b/...mples/utils/reference-data/instruments.ts → ...ta-test/src/reference-data/instruments.ts
diff --git a/...xamples/utils/reference-data/locations.ts → ...data-test/src/reference-data/locations.ts b/...xamples/utils/reference-data/locations.ts → ...data-test/src/reference-data/locations.ts
diff --git a/...examples/utils/reference-data/lotsizes.ts → ...-data-test/src/reference-data/lotsizes.ts b/...examples/utils/reference-data/lotsizes.ts → ...-data-test/src/reference-data/lotsizes.ts
diff --git a/...s/utils/reference-data/priceStrategies.ts → ...est/src/reference-data/priceStrategies.ts b/...s/utils/reference-data/priceStrategies.ts → ...est/src/reference-data/priceStrategies.ts
diff --git a/...c/examples/utils/reference-data/prices.ts → ...uu-data-test/src/reference-data/prices.ts b/...c/examples/utils/reference-data/prices.ts → ...uu-data-test/src/reference-data/prices.ts
diff --git a/...rc/examples/utils/reference-data/utils.ts → ...vuu-data-test/src/reference-data/utils.ts b/...rc/examples/utils/reference-data/utils.ts → ...vuu-data-test/src/reference-data/utils.ts
diff --git a/...showcase/src/examples/utils/rowUpdates.ts → .../packages/vuu-data-test/src/rowUpdates.ts b/...showcase/src/examples/utils/rowUpdates.ts → .../packages/vuu-data-test/src/rowUpdates.ts
diff --git a/vuu-ui/packages/vuu-data-test/tsconfig.json b/vuu-ui/packages/vuu-data-test/tsconfig.json
@@ -0,0 +1,6 @@
+{
+"extends": "../../tsconfig.json",
+"compilerOptions":{
+    "composite": true
+},
+}
diff --git a/vuu-ui/scripts/publish.mjs b/vuu-ui/scripts/publish.mjs
@@ -6,6 +6,7 @@ const packages = [
   "vuu-codemirror",
   "vuu-data",
   "vuu-data-react",
+  "vuu-data-test",
   "vuu-data-ag-grid",
   "vuu-data-test",
   "vuu-data-types",

diff --git a/vuu-ui/showcase/src/examples/utils/TickingArrayDataSource.ts b/vuu-ui/showcase/src/examples/utils/TickingArrayDataSource.ts
@@ -6,7 +6,10 @@ import {
 } from "@finos/vuu-data";
 import { VuuRange } from "@finos/vuu-protocol-types";
 import { DataSourceRow } from "@finos/vuu-data-types";
-import { RowUpdates, UpdateGenerator } from "./rowUpdates";
+import {
+  RowUpdates,
+  UpdateGenerator,
+} from "@finos/vuu-data-test/src/rowUpdates";
 
 export interface TickingArrayDataSourceConstructorProps
   extends ArrayDataSourceConstructorProps {

diff --git a/vuu-ui/showcase/src/examples/utils/createArrayDataSource.ts b/vuu-ui/showcase/src/examples/utils/createArrayDataSource.ts
@@ -1,8 +1,5 @@
 import { TickingArrayDataSource } from "./TickingArrayDataSource";
-import {
-  getColumnAndRowGenerator,
-  populateArray,
-} from "./data-generators/vuu-row-generator";
+import { getColumnAndRowGenerator, populateArray } from "@finos/vuu-data-test";
 import { VuuTable } from "@finos/vuu-protocol-types";
 
 export const createArrayDataSource = ({

diff --git a/vuu-ui/showcase/src/examples/utils/index.ts b/vuu-ui/showcase/src/examples/utils/index.ts
@@ -4,4 +4,3 @@ export * from "./ErrorDisplay";
 export * from "./useAutoLoginToVuuServer";
 export * from "./useTableConfig";
 export * from "./useTestDataSource";
-export * from "./data-generators/vuu-row-generator";
diff --git a/vuu-ui/showcase/src/examples/utils/useColumns.ts b/vuu-ui/showcase/src/examples/utils/useColumns.ts
diff --git a/vuu-ui/showcase/src/examples/utils/useTableConfig.ts b/vuu-ui/showcase/src/examples/utils/useTableConfig.ts
@@ -10,10 +10,7 @@ import { useMemo } from "react";
 import { ArrayProxy } from "./ArrayProxy";
 import { makeSuggestions } from "./makeSuggestions";
 import { TickingArrayDataSource } from "./TickingArrayDataSource";
-import {
-  getColumnAndRowGenerator,
-  populateArray,
-} from "./data-generators/vuu-row-generator";
+import { getColumnAndRowGenerator, populateArray } from "@finos/vuu-data-test";
 
 const NO_CONFIG = {} as const;
 const NO_COLUMNS: number[] = [];

diff --git a/vuu-ui/tsconfig.json b/vuu-ui/tsconfig.json
@@ -26,7 +26,7 @@
     "sample-apps/*/index.ts",
     "sample-apps/*/src",
     "global.d.ts"
-  ],
+, "packages/vuu-data-test/src/UpdateGenerator.ts"  ],
   "exclude": ["**/*.cy.*", "**/*.test.*"],
   "references": [
     {"path" : "packages/vuu-codemirror"},
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from "./tableSchemas";
		export * from "./data-generators/vuu-row-generator";