Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
"access": "public"
},
"devDependencies": {
"@types/lodash": "4.17.24",
"@types/lodash-es": "4.17.12",
"@webgpu/types": "0.1.71"
},
"dependencies": {
"@alleninstitute/vis-geometry": "workspace:*",
"lodash": "4.18.1",
"lodash-es": "4.18.1",
"regl": "2.1.1",
"uuid": "14.0.1",
"webgpu-utils": "2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/abstract/async-frame.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import partial from 'lodash/partial';
import { partial } from 'lodash-es';
import type REGL from 'regl';
import type { AsyncDataCache } from '../dataset-cache';
import type { ReglCacheEntry, Renderer } from './types';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/render-queue.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import partial from 'lodash/partial';
import { partial } from 'lodash-es';
import type { AsyncDataCache } from './dataset-cache';

/**
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/rendering/webgpu/filter/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ import type {
vKeys,
ITable,
} from './types';
import * as lo from 'lodash';
const { mapValues } = lo;
import { mapValues } from 'lodash-es';

const entries = <T extends {}>(r: T): ReadonlyArray<[string, T[keyof T]]> => Object.entries(r);

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/shared-priority-cache/shared-cache.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type Store, type Cacheable, type FetchResult, AsyncPriorityCache } from './priority-cache';
import { mergeAndAdd, prioritizeCacheKeys, priorityDelta } from './utils';
import uniqueId from 'lodash/uniqueId';
import { uniqueId } from 'lodash-es';

// goal: we want clients of the cache to experience a type-safe interface -
// they expect that the things coming out of the cache are the type they expect (what they put in it)
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/shared-priority-cache/test-utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Cacheable, Store } from './priority-cache';
import { uniqueId } from 'lodash';
import { uniqueId } from 'lodash-es';

export class PayloadFactory {
resources: Record<string, 'created' | 'destroyed'>;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/test/render-cache.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { partial, uniqueId } from 'lodash';
import { partial, uniqueId } from 'lodash-es';
import { beforeEach, describe, expect, it } from 'vitest';
import { AsyncDataCache } from '../dataset-cache';
type Columns = 'color' | 'position';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/test/render-queue.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import delay from 'lodash/delay';
import { delay } from 'lodash-es';
import { beforeEach, describe, expect, it } from 'vitest';
import { AsyncDataCache } from '../dataset-cache';
import { type NormalStatus, beginLongRunningFrame } from '../render-queue';
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/test/test-utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { delay } from 'lodash';
import { delay } from 'lodash-es';

export const fakeFetch = <FakeTask>(data: FakeTask, signal?: AbortSignal): Promise<FakeTask> =>
new Promise((resolve, reject) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"module": "es6",
"target": "es2024",
"lib": ["es2024", "DOM"],
"types": ["@webgpu/types", "lodash"]
"types": ["@webgpu/types", "lodash-es"]
},
"include": ["./src/index.ts"]
}
4 changes: 2 additions & 2 deletions packages/scatterbrain/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@alleninstitute/vis-core": "workspace:*",
"@alleninstitute/vis-geometry": "workspace:*",
"lodash": "4.18.1",
"lodash-es": "4.18.1",
"regl": "2.1.0",
"ts-pattern": "5.9.0",
"zod": "4.4.3"
Expand All @@ -62,6 +62,6 @@
"access": "public"
},
"devDependencies": {
"@types/lodash": "4.17.24"
"@types/lodash-es": "4.17.12"
}
}
2 changes: 1 addition & 1 deletion packages/scatterbrain/src/cache-client.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Cacheable, SharedPriorityCache } from '@alleninstitute/vis-core';
import reduce from 'lodash/reduce';
import { reduce } from 'lodash-es';
import type { WebGLSafeBasicType } from './typed-array';
import type { ColumnRequest, Item } from './types';

Expand Down
2 changes: 1 addition & 1 deletion packages/scatterbrain/src/dataset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
visitBFSMaybe,
} from '@alleninstitute/vis-geometry';
import type { PointAttribute, ScatterbrainDataset, SlideviewScatterbrainDataset, TreeNode, volumeBound } from './types';
import reduce from 'lodash/reduce';
import { reduce } from 'lodash-es';
import * as z from 'zod';

type Dataset = ScatterbrainDataset | SlideviewScatterbrainDataset;
Expand Down
3 changes: 1 addition & 2 deletions packages/scatterbrain/src/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { SharedPriorityCache } from '@alleninstitute/vis-core';
import { Box2D, type box2D, type vec4 } from '@alleninstitute/vis-geometry';
import keys from 'lodash/keys';
import reduce from 'lodash/reduce';
import { keys, reduce } from 'lodash-es';
import type REGL from 'regl';
import { buildScatterbrainCacheClient } from './cache-client';
import { getVisibleItems, type NodeWithBounds } from './dataset';
Expand Down
3 changes: 1 addition & 2 deletions packages/scatterbrain/src/shader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import type REGL from 'regl';
import type { ScatterbrainDataset, SlideviewScatterbrainDataset } from './types';
import type { Cacheable, CachedVertexBuffer } from '@alleninstitute/vis-core';
import { Box2D, type box2D, type Interval, type vec2, type vec4 } from '@alleninstitute/vis-geometry';
import * as lodash from 'lodash';
const { keys, mapValues, reduce } = lodash;
import { keys, mapValues, reduce } from 'lodash-es';

// the set of columns and what to do with them can vary
// there might be 3 categorical columns and 2 range columns
Expand Down
57 changes: 27 additions & 30 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@
"@astrojs/mdx": "4.3.13",
"@astrojs/react": "4.4.2",
"@astrojs/starlight": "0.37.6",
"@types/lodash": "4.17.23",
"@types/lodash-es": "4.17.12",
"@types/react": "19.2.13",
"@types/react-dom": "19.2.3",
"astro": "5.17.1",
"file-saver": "2.0.5",
"json5": "2.2.3",
"kiwi-schema": "0.5.0",
"lodash": "4.17.23",
"lodash-es": "4.18.1",
"react": "19.2.4",
"react-dom": "19.2.4",
"regl": "2.1.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Decoder, OmeZarrMetadata, OmeZarrShapedDataset, ZarrRequest } from '@alleninstitute/vis-omezarr';
import uniqueId from 'lodash/uniqueId';
import { uniqueId } from 'lodash-es';
import type { ZarrSliceRequest } from './types';

type PromisifiedMessage = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box2D, type box2D } from '@alleninstitute/vis-geometry';
import { type AsyncDataCache, beginLongRunningFrame } from '@alleninstitute/vis-core';
import flatten from 'lodash/flatten';
import { flatten } from 'lodash-es';
import type REGL from 'regl';
import type { Camera } from '../common/camera';
import type { ColumnData } from '../common/loaders/scatterplot/scatterbrain-loader';
Expand Down
2 changes: 1 addition & 1 deletion site/src/examples/data-renderers/versa-renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
sizeInUnits,
} from '@alleninstitute/vis-omezarr';
import { logger } from '@alleninstitute/vis-core';
import omit from 'lodash/omit';
import { omit } from 'lodash-es';
import type REGL from 'regl';
import type { Framebuffer2D } from 'regl';
import type { Camera } from '../common/camera';
Expand Down
Loading