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
30 changes: 15 additions & 15 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,31 @@
],
"rules": {
"no-console": "off",
"import/no-cycle": "warn",
"typescript/consistent-type-exports": "warn",
"typescript/consistent-type-imports": "warn",
"import/no-cycle": "error",
"typescript/no-unused-vars": [
"error",
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_"
}
],
"typescript/consistent-type-exports": "error",
"typescript/consistent-type-imports": "error",
"typescript/no-explicit-any": "off",
"typescript/triple-slash-reference": "off"
},
"overrides": [
{
"files": [
"apps/vbi_cli/**/*.ts",
"apps/vbi_provider/**/*.ts",
"packages/vbi-agent/**/*.ts",
"packages/vbi-react/**/*.{ts,tsx}",
"packages/vseed/**/*.{ts,tsx}"
],
"files": ["apps/vbi_be/**/*.{ts,tsx}"],
"rules": {
"typescript/consistent-type-exports": "error",
"typescript/consistent-type-imports": "error"
"typescript/consistent-type-exports": "off",
"typescript/consistent-type-imports": "off"
}
},
{
"files": ["packages/vbi-react/**/*.{ts,tsx}", "packages/vseed/**/*.{ts,tsx}"],
"files": ["packages/vbi/**/*.{ts,tsx}", "packages/vquery/**/*.{ts,tsx}"],
"rules": {
"no-console": "error",
"typescript/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }]
"import/no-cycle": "error"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion apps/vbi_fe/src/components/Collaborators.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Avatar, Tooltip } from 'antd'
import { useEffect, useState } from 'react'
import { HocuspocusProvider } from '@hocuspocus/provider'
import type { HocuspocusProvider } from '@hocuspocus/provider'
import { funnel } from 'remeda'
import { CollaboratorCursorOverlay } from './CollaboratorCursorOverlay'
import {
Expand Down
2 changes: 1 addition & 1 deletion apps/website/components/guide/Dataset20k.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { memo } from 'react'
import { VSeed } from '@visactor/vseed'
import type { VSeed } from '@visactor/vseed'
import { VChartRender } from '@components/render/Chart'

export const Dataset20K = memo(() => {
Expand Down
9 changes: 6 additions & 3 deletions apps/website/components/guide/PagePlayer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { useRef, useEffect, useState, memo } from 'react'
import VChart, { ISpec } from '@visactor/vchart'
import { ListTable, ListTableConstructorOptions, PivotTableConstructorOptions, PivotTable } from '@visactor/vtable'
import { registerAll, VSeed, Builder, isTable, isPivotTable } from '@visactor/vseed'
import type { ISpec } from '@visactor/vchart'
import VChart from '@visactor/vchart'
import type { ListTableConstructorOptions, PivotTableConstructorOptions } from '@visactor/vtable'
import { ListTable, PivotTable } from '@visactor/vtable'
import type { VSeed } from '@visactor/vseed'
import { registerAll, Builder, isTable, isPivotTable } from '@visactor/vseed'
registerAll()

const PagePlayer = memo(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/website/components/guide/raceChart/raceBar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { VSeed } from '@visactor/vseed'
import { VSeedRender } from '@components'
import type { VSeed } from '@visactor/vseed'
import { VSeedRender } from '../../vseed/VSeedRender'
import { memo } from 'react'

export const RaceBar = memo(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/website/components/guide/raceChart/raceColumn.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { VSeed } from '@visactor/vseed'
import { VSeedRender } from '@components'
import type { VSeed } from '@visactor/vseed'
import { VSeedRender } from '../../vseed/VSeedRender'
import { memo } from 'react'

export const RaceColumn = memo(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/website/components/guide/raceChart/raceDonut.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { VSeed } from '@visactor/vseed'
import { VSeedRender } from '@components'
import type { VSeed } from '@visactor/vseed'
import { VSeedRender } from '../../vseed/VSeedRender'
import { memo } from 'react'

export const RaceDonut = memo(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/website/components/guide/raceChart/raceLine.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { VSeed } from '@visactor/vseed'
import { VSeedRender } from '@components'
import type { VSeed } from '@visactor/vseed'
import { VSeedRender } from '../../vseed/VSeedRender'
import { memo } from 'react'

export const RaceLine = memo(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/website/components/guide/raceChart/racePie.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { VSeed } from '@visactor/vseed'
import { VSeedRender } from '@components'
import type { VSeed } from '@visactor/vseed'
import { VSeedRender } from '../../vseed/VSeedRender'
import { memo } from 'react'

export const RacePie = memo(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/website/components/guide/raceChart/raceScatter.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { VSeedRender } from '@components'
import { VSeed } from '@visactor/vseed'
import { VSeedRender } from '../../vseed/VSeedRender'
import type { VSeed } from '@visactor/vseed'

export const RaceScatter = () => {
const vseed: VSeed = {
Expand Down
8 changes: 0 additions & 8 deletions apps/website/components/practices/PracticePreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ import type { ComponentType } from 'react'
const SUPPORTED_PRACTICE_LOCALES = ['zh-CN', 'en-US', 'ja-JP', 'de-DE', 'id-ID', 'fr-FR', 'ko-KR', 'vi-VN'] as const

type PracticeLocale = (typeof SUPPORTED_PRACTICE_LOCALES)[number]
type PracticeTheme = 'light' | 'dark'

type PracticeAppProps = {
hideLocale?: boolean
hideTheme?: boolean
locale?: PracticeLocale
theme?: PracticeTheme
}

type PracticePreviewProps = {
App: ComponentType<any>
Expand Down
6 changes: 4 additions & 2 deletions apps/website/components/render/Chart.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { useDark } from '@rspress/core/runtime'

import { useRef, useEffect, memo } from 'react'
import VChart, { ISpec } from '@visactor/vchart'
import { registerAll, VSeed, Builder } from '@visactor/vseed'
import type { ISpec } from '@visactor/vchart'
import VChart from '@visactor/vchart'
import type { VSeed } from '@visactor/vseed'
import { registerAll, Builder } from '@visactor/vseed'
registerAll()

export const VChartRender = memo((props: { vseed: VSeed }) => {
Expand Down
6 changes: 4 additions & 2 deletions apps/website/components/render/PivotChart.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { useRef, useEffect, memo } from 'react'
import VChart from '@visactor/vchart'
import { register, PivotChart as VTablePivotChart, PivotChartConstructorOptions } from '@visactor/vtable'
import { registerAll, VSeed, Builder, ColorIdEncoding, DATUM_HIDE_KEY } from '@visactor/vseed'
import type { PivotChartConstructorOptions } from '@visactor/vtable'
import { register, PivotChart as VTablePivotChart } from '@visactor/vtable'
import type { VSeed } from '@visactor/vseed'
import { registerAll, Builder, ColorIdEncoding, DATUM_HIDE_KEY } from '@visactor/vseed'
import { useDark } from '@rspress/core/runtime'

register.chartModule('vchart', VChart)
Expand Down
6 changes: 4 additions & 2 deletions apps/website/components/render/PivotTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useRef, useEffect, memo } from 'react'
import { PivotTable as VTablePivotTable, PivotTableConstructorOptions } from '@visactor/vtable'
import { registerAll, VSeed, Builder, ColorIdEncoding } from '@visactor/vseed'
import type { PivotTableConstructorOptions } from '@visactor/vtable'
import { PivotTable as VTablePivotTable } from '@visactor/vtable'
import type { VSeed } from '@visactor/vseed'
import { registerAll, Builder, ColorIdEncoding } from '@visactor/vseed'
import { useDark } from '@rspress/core/runtime'

registerAll()
Expand Down
6 changes: 4 additions & 2 deletions apps/website/components/render/Table.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useRef, useEffect, memo } from 'react'
import { ListTable as VTableListTable, ListTableConstructorOptions } from '@visactor/vtable'
import { registerAll, VSeed, Builder, ColorIdEncoding } from '@visactor/vseed'
import type { ListTableConstructorOptions } from '@visactor/vtable'
import { ListTable as VTableListTable } from '@visactor/vtable'
import type { VSeed } from '@visactor/vseed'
import { registerAll, Builder, ColorIdEncoding } from '@visactor/vseed'
import { useDark } from '@rspress/core/runtime'

registerAll()
Expand Down
12 changes: 5 additions & 7 deletions apps/website/components/render/VSeedRender.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import { useRef, useEffect } from 'react'
import { useDark } from '@rspress/core/runtime'
import VChart, { ISpec } from '@visactor/vchart'
import {
ListTable,
PivotTable,
PivotChart,
register,
import type { ISpec } from '@visactor/vchart'
import VChart from '@visactor/vchart'
import type {
ListTableConstructorOptions,
PivotTableConstructorOptions,
PivotChartConstructorOptions,
} from '@visactor/vtable'
import { ListTable, PivotTable, PivotChart, register } from '@visactor/vtable'
import type { VSeed } from '@visactor/vseed'
import {
registerAll,
VSeed,
Builder,
isPivotChart,
isVChart,
Expand Down
4 changes: 2 additions & 2 deletions apps/website/components/vquery/VQueryResultRender.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { VQueryDSL, DatasetColumn } from '@visactor/vquery'
import { useEffect, useState, useRef } from 'react'
import { VSeedRender } from '@components'
import { VSeed } from '@visactor/vseed'
import { VSeedRender } from '../vseed/VSeedRender'
import type { VSeed } from '@visactor/vseed'
import { useDark } from '@rspress/core/runtime'

interface VQueryConfig {
Expand Down
12 changes: 5 additions & 7 deletions apps/website/components/vseed/VSeedRender.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import { useRef, useEffect, useState } from 'react'
import { useDark } from '@rspress/core/runtime'
import VChart, { ISpec } from '@visactor/vchart'
import {
ListTable,
PivotTable,
PivotChart,
register,
import type { ISpec } from '@visactor/vchart'
import VChart from '@visactor/vchart'
import type {
ListTableConstructorOptions,
PivotTableConstructorOptions,
PivotChartConstructorOptions,
} from '@visactor/vtable'
import { ListTable, PivotTable, PivotChart, register } from '@visactor/vtable'
import type { VSeed } from '@visactor/vseed'
import {
registerAll,
VSeed,
Builder,
isPivotChart,
isVChart,
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"build": "rslib build",
"dev": "rslib build --watch --no-clean",
"format": "oxfmt .",
"lint": "oxlint .",
"lint": "oxlint --fix .",
"test": "rstest",
"test:update": "rstest --update",
"test:coverage": "rstest --coverage && node scripts/build-coverage-badge.mjs && open coverage/index.html",
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/chart-builder/builder.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'

import { resolveVBIChartBuilderAdapters } from 'src/chart-builder/adapters/vquery-vseed'
import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from 'src/chart-builder/adapters/vquery-vseed'
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/chart-builder/connector.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { VBIConnector, VBIConnectorId } from 'src/types/connector/connector'
import type { VBIConnector, VBIConnectorId } from 'src/types/connector/connector'

export const connectorMap: Map<VBIConnectorId, VBIConnector | (() => Promise<VBIConnector>)> = new Map()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChartTypeEnum } from '@visactor/vseed'
import { ObserveCallback } from 'src/types'
import * as Y from 'yjs'
import type { ObserveCallback } from 'src/types'
import type * as Y from 'yjs'
import {
getRecommendedDimensionEncodingsForChartType,
getSupportedDimensionEncodingsForChartType,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { VBIDimension, VBISort } from 'src/types'

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { VBIHavingFilter, VBIHavingAggregate } from 'src/types'

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ObserveCallback } from 'src/types'
import * as Y from 'yjs'
import type { ObserveCallback } from 'src/types'
import type * as Y from 'yjs'

/**
* @description 数据量限制构建器,用于设置和获取当前 limit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ObserveCallback } from 'src/types'
import * as Y from 'yjs'
import type { ObserveCallback } from 'src/types'
import type * as Y from 'yjs'

/**
* @description 语言构建器,用于设置和获取当前语言
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { VBIMeasure, VBIMeasureFormat, VBISort } from 'src/types'

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ObserveCallback } from 'src/types'
import * as Y from 'yjs'
import type { ObserveCallback } from 'src/types'
import type * as Y from 'yjs'

/**
* @description 主题构建器,用于设置和获取当前主题
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { VBIWhereDatePredicate, VBIWhereFilter } from 'src/types'

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/chart-builder/modules/build.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { VBIChartDSL } from 'src/types'

export const buildVBIChartDSL = (dsl: Y.Map<any>): VBIChartDSL => {
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/chart-builder/modules/get-schema.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import { getConnector } from '../connector'

export const getBuilderSchema = async (dsl: Y.Map<any>) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/dashboard-builder/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { createEmptyDashboardLayout } from 'src/vbi/create-empty-dashboard'
import { getOrCreateDashboardWidgets } from 'src/vbi/from/dashboard-widget-y-map'
import type { VBIResourceRegistry } from 'src/vbi/resources'
import { ensureResourceUUID, getResourceUUID } from 'src/vbi/resource-uuid'
import * as Y from 'yjs'
import type * as Y from 'yjs'
import { DashboardChartCollectionBuilder, DashboardInsightCollectionBuilder, UndoManager } from './features'
import { applyUpdateToDoc, buildVBIDashboardDSL, encodeDocStateAsUpdate, isEmptyVBIDashboardDSL } from './modules'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from 'src/chart-builder/adapters/vquery-vseed/types'
import type { VBIChartBuilder } from 'src/chart-builder/builder'
import type { VBIDashboardBreakpoint, VBIDashboardItemLayout, VBIDashboardWidget } from 'src/types'
import * as Y from 'yjs'
import type * as Y from 'yjs'

type ResourceReference = string | { getUUID: () => string }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { DefaultVBIQueryDSL, DefaultVBISeedDSL } from 'src/chart-builder/adapters/vquery-vseed/types'
import type { VBIInsightBuilder } from 'src/insight-builder/builder'
import type { VBIDashboardBreakpoint, VBIDashboardItemLayout, VBIDashboardWidget } from 'src/types'
Expand All @@ -17,7 +17,7 @@ export interface DashboardInsightBuilderOptions {
getBuilder?: (insightId: string) => VBIInsightBuilder | undefined
}

export class DashboardInsightBuilder<TQueryDSL = DefaultVBIQueryDSL, TSeedDSL = DefaultVBISeedDSL> {
export class DashboardInsightBuilder<_TQueryDSL = DefaultVBIQueryDSL, _TSeedDSL = DefaultVBISeedDSL> {
private _layouts: DashboardWidgetLayouts = {}

constructor(
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/dashboard-builder/modules/build.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { VBIDashboardDSL } from 'src/types'
import { zVBIDashboardDSL } from 'src/types/dashboardDSL/dashboard'
import * as Y from 'yjs'
import type * as Y from 'yjs'

export const buildVBIDashboardDSL = (dsl: Y.Map<any>): VBIDashboardDSL => {
return zVBIDashboardDSL.parse(dsl.toJSON())
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/insight-builder/builder.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { VBIInsightBuilderInterface, VBIInsightDSL } from 'src/types'
import { UndoManager } from 'src/chart-builder/features'
import { applyUpdateToDoc, buildVBIInsightDSL, encodeDocStateAsUpdate, isEmptyVBIInsightDSL } from './modules'
Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/insight-builder/modules/build.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'
import type { VBIInsightDSL } from 'src/types'
import { zVBIInsightDSL } from 'src/types/insightDSL/insight'

Expand Down
2 changes: 1 addition & 1 deletion packages/vbi/src/insight-builder/modules/is-empty.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Y from 'yjs'
import type * as Y from 'yjs'

export const isEmptyVBIInsightDSL = (dsl: Y.Map<any>): boolean => {
return (dsl.get('content') ?? '') === ''
Expand Down
Loading
Loading