@orbcharts/core 3.0.3 → 3.0.5

package/dist/src/series/seriesObservables.d.ts

@@ -1,26 +1,37 @@
 import { Observable } from 'rxjs';
 import { ComputedDatumSeries, ComputedDataTypeMap, DataFormatterTypeMap, ContainerPosition, Layout } from '../../lib/core-types';
 
+export declare const datumLabelsObservable: ({ computedData$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"series">>;
+}) => Observable<string[]>;
 export declare const separateSeriesObservable: ({ fullDataFormatter$ }: {
     fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
 }) => Observable<boolean>;
+export declare const separateLabelObservable: ({ fullDataFormatter$ }: {
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
+}) => Observable<boolean>;
+export declare const sumSeriesObservable: ({ fullDataFormatter$ }: {
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
+}) => Observable<boolean>;
 export declare const seriesLabelsObservable: ({ computedData$ }: {
     computedData$: Observable<ComputedDataTypeMap<"series">>;
 }) => Observable<string[]>;
 export declare const seriesVisibleComputedDataObservable: ({ computedData$ }: {
     computedData$: Observable<ComputedDataTypeMap<"series">>;
 }) => Observable<ComputedDatumSeries[][]>;
-export declare const seriesComputedSortedDataObservable: ({ computedData$, fullDataFormatter$ }: {
+export declare const seriesComputedSortedDataObservable: ({ computedData$, separateSeries$, separateLabel$, sumSeries$, datumLabels$ }: {
     computedData$: Observable<ComputedDataTypeMap<"series">>;
-    fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
+    separateSeries$: Observable<boolean>;
+    separateLabel$: Observable<boolean>;
+    sumSeries$: Observable<boolean>;
+    datumLabels$: Observable<string[]>;
 }) => Observable<ComputedDatumSeries[][]>;
-export declare const seriesContainerPositionObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
-    computedData$: Observable<ComputedDataTypeMap<"series">>;
+export declare const seriesContainerPositionObservable: ({ computedSortedData$, fullDataFormatter$, layout$ }: {
+    computedSortedData$: Observable<ComputedDatumSeries[][]>;
     fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
     layout$: Observable<Layout>;
 }) => Observable<ContainerPosition[]>;
-export declare const seriesContainerPositionMapObservable: ({ seriesContainerPosition$, seriesLabels$, separateSeries$ }: {
+export declare const datumContainerPositionMapObservable: ({ seriesContainerPosition$, computedSortedData$ }: {
     seriesContainerPosition$: Observable<ContainerPosition[]>;
-    seriesLabels$: Observable<string[]>;
-    separateSeries$: Observable<boolean>;
+    computedSortedData$: Observable<ComputedDatumSeries[][]>;
 }) => Observable<Map<string, ContainerPosition>>;

package/dist/src/utils/errorMessage.d.ts

@@ -1,8 +1,5 @@
 export declare function createMessagePrefix(status: 'warning' | 'error'): string;
-export declare function createOrbChartsErrorMessage(e: {
-    message: string;
-    stack: string;
-}): string;
+export declare function createOrbChartsErrorMessage(e: Error): string;
 export declare function createUnexpectedErrorMessage({ from, systemMessage }: {
     from: string;
     systemMessage: string;

package/lib/core-types.ts

@@ -1,7 +1,7 @@
-
-
-export * from '@orbcharts/core-types'
-
-// test
-// export * from '../../orbcharts-core-types/src'
-
+
+
+export * from '@orbcharts/core-types'
+
+// test
+// export * from '../../orbcharts-core-types/src'
+

package/package.json

@@ -1,46 +1,46 @@
-{
-  "name": "@orbcharts/core",
-  "version": "3.0.3",
-  "description": "Core codes for OrbCharts",
-  "author": "Blue Planet Inc.",
-  "license": "Apache-2.0",
-  "keywords": [
-    "d3",
-    "rxjs",
-    "typescript",
-    "svg",
-    "visualization",
-    "infographic",
-    "graph",
-    "chart"
-  ],
-  "private": false,
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "files": [
-    "*"
-  ],
-  "main": "./dist/orbcharts-core.umd.js",
-  "module": "./dist/orbcharts-core.es.js",
-  "types": "./dist/src/index.d.ts",
-  "unpkg": "./dist/orbcharts-core.umd.js",
-  "jsdelivr": "./dist/orbcharts-core.umd.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "vite build --mode production"
-  },
-  "devDependencies": {
-    "@types/d3": "^7.4.0",
-    "ts-loader": "^9.4.2",
-    "typescript": "^5.0.4",
-    "vite": "^5.3.5",
-    "vite-plugin-dts": "^3.7.3"
-  },
-  "dependencies": {
-    "@orbcharts/core-types": "^3.0.2",
-    "d3": "^7.8.5",
-    "rxjs": "^7.8.1"
-  }
-}
+{
+  "name": "@orbcharts/core",
+  "version": "3.0.5",
+  "description": "Core codes for OrbCharts",
+  "author": "Blue Planet Inc.",
+  "license": "Apache-2.0",
+  "keywords": [
+    "d3",
+    "rxjs",
+    "typescript",
+    "svg",
+    "visualization",
+    "infographic",
+    "graph",
+    "chart"
+  ],
+  "private": false,
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "files": [
+    "*"
+  ],
+  "main": "./dist/orbcharts-core.umd.js",
+  "module": "./dist/orbcharts-core.es.js",
+  "types": "./dist/src/index.d.ts",
+  "unpkg": "./dist/orbcharts-core.umd.js",
+  "jsdelivr": "./dist/orbcharts-core.umd.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "vite build --mode production"
+  },
+  "devDependencies": {
+    "@types/d3": "^7.4.0",
+    "ts-loader": "^9.4.2",
+    "typescript": "^5.0.4",
+    "vite": "^5.3.5",
+    "vite-plugin-dts": "^3.7.3"
+  },
+  "dependencies": {
+    "@orbcharts/core-types": "^3.0.3",
+    "d3": "^7.8.5",
+    "rxjs": "^7.8.1"
+  }
+}

package/src/AbstractChart.ts

@@ -1,57 +1,57 @@
-import * as d3 from 'd3'
-import {
-  Subject } from 'rxjs'
-import type {
-  ComputedDataFn,
-  DataValidator,
-  ChartEntity,
-  ChartType,
-  ChartParamsPartial,
-  ContextObserverCallback,
-  ChartOptionsPartial,
-  DataTypeMap,
-  DataFormatterTypeMap,
-  DataFormatterPartialTypeMap,
-  DataFormatterValidator,
-  EventTypeMap,
-  PluginEntity } from '../lib/core-types'
-import { createBaseChart } from './base/createBaseChart'
-import { createOrbChartsErrorMessage } from './utils/errorMessage'
-
-export abstract class AbstractChart<T extends ChartType> implements ChartEntity<T> {
-  selection: d3.Selection<SVGGElement, unknown, HTMLElement, unknown>
-  destroy: () => void
-  data$: Subject<DataTypeMap<T>> = new Subject()
-  dataFormatter$: Subject<DataFormatterPartialTypeMap<T>> = new Subject()
-  plugins$: Subject<PluginEntity<T, any, any>[]> = new Subject()
-  chartParams$: Subject<ChartParamsPartial> = new Subject()
-  event$: Subject<EventTypeMap<T>> = new Subject()
-
-  constructor (
-    { defaultDataFormatter, dataFormatterValidator, computedDataFn, dataValidator, contextObserverCallback }: {
-      defaultDataFormatter: DataFormatterTypeMap<T>
-      dataFormatterValidator: DataFormatterValidator<T>
-      computedDataFn: ComputedDataFn<T>
-      dataValidator: DataValidator<T>
-      contextObserverCallback: ContextObserverCallback<T>
-    },
-    element: HTMLElement | Element,
-    options?: ChartOptionsPartial<T>
-  ) {
-    try {
-      const baseChart = createBaseChart({ defaultDataFormatter, dataFormatterValidator, computedDataFn, dataValidator, contextObserverCallback })
-      const chartEntity = baseChart(element, options)
-
-      this.selection = chartEntity.selection
-      this.destroy = chartEntity.destroy
-      this.data$ = chartEntity.data$
-      this.dataFormatter$ = chartEntity.dataFormatter$
-      this.plugins$ = chartEntity.plugins$
-      this.chartParams$ = chartEntity.chartParams$
-      this.event$ = chartEntity.event$
-    } catch (e) {
-      console.error(createOrbChartsErrorMessage(e))
-    }
-  }
-  
-}
+import * as d3 from 'd3'
+import {
+  Subject } from 'rxjs'
+import type {
+  ComputedDataFn,
+  DataValidator,
+  ChartEntity,
+  ChartType,
+  ChartParamsPartial,
+  ContextObserverCallback,
+  ChartOptionsPartial,
+  DataTypeMap,
+  DataFormatterTypeMap,
+  DataFormatterPartialTypeMap,
+  DataFormatterValidator,
+  EventTypeMap,
+  PluginEntity } from '../lib/core-types'
+import { createBaseChart } from './base/createBaseChart'
+import { createOrbChartsErrorMessage } from './utils/errorMessage'
+
+export abstract class AbstractChart<T extends ChartType> implements ChartEntity<T> {
+  selection: d3.Selection<SVGGElement, unknown, HTMLElement, unknown>
+  destroy: () => void
+  data$: Subject<DataTypeMap<T>> = new Subject()
+  dataFormatter$: Subject<DataFormatterPartialTypeMap<T>> = new Subject()
+  plugins$: Subject<PluginEntity<T, any, any>[]> = new Subject()
+  chartParams$: Subject<ChartParamsPartial> = new Subject()
+  event$: Subject<EventTypeMap<T>> = new Subject()
+
+  constructor (
+    { defaultDataFormatter, dataFormatterValidator, computedDataFn, dataValidator, contextObserverCallback }: {
+      defaultDataFormatter: DataFormatterTypeMap<T>
+      dataFormatterValidator: DataFormatterValidator<T>
+      computedDataFn: ComputedDataFn<T>
+      dataValidator: DataValidator<T>
+      contextObserverCallback: ContextObserverCallback<T>
+    },
+    element: HTMLElement | Element,
+    options?: ChartOptionsPartial<T>
+  ) {
+    try {
+      const baseChart = createBaseChart({ defaultDataFormatter, dataFormatterValidator, computedDataFn, dataValidator, contextObserverCallback })
+      const chartEntity = baseChart(element, options)
+
+      this.selection = chartEntity.selection
+      this.destroy = chartEntity.destroy
+      this.data$ = chartEntity.data$
+      this.dataFormatter$ = chartEntity.dataFormatter$
+      this.plugins$ = chartEntity.plugins$
+      this.chartParams$ = chartEntity.chartParams$
+      this.event$ = chartEntity.event$
+    } catch (e) {
+      console.error(createOrbChartsErrorMessage(e))
+    }
+  }
+  
+}

package/src/GridChart.ts

@@ -1,25 +1,25 @@
-import type {
-  ChartEntity,
-  ChartOptionsPartial } from '../lib/core-types'
-import { DEFAULT_DATA_FORMATTER_GRID } from './defaults'
-import { dataFormatterValidator } from './grid/dataFormatterValidator'
-import { computedDataFn } from './grid/computedDataFn'
-import { dataValidator } from './grid/dataValidator'
-import { contextObserverCallback } from './grid/contextObserverCallback'
-import { AbstractChart } from './AbstractChart'
-
-export class GridChart extends AbstractChart<'grid'> implements ChartEntity<'grid'> {
-  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'grid'>) {
-    super(
-      {
-        defaultDataFormatter: DEFAULT_DATA_FORMATTER_GRID,
-        dataFormatterValidator,
-        computedDataFn,
-        dataValidator,
-        contextObserverCallback
-      },
-      element,
-      options
-    )
-  }
+import type {
+  ChartEntity,
+  ChartOptionsPartial } from '../lib/core-types'
+import { DEFAULT_DATA_FORMATTER_GRID } from './defaults'
+import { dataFormatterValidator } from './grid/dataFormatterValidator'
+import { computedDataFn } from './grid/computedDataFn'
+import { dataValidator } from './grid/dataValidator'
+import { contextObserverCallback } from './grid/contextObserverCallback'
+import { AbstractChart } from './AbstractChart'
+
+export class GridChart extends AbstractChart<'grid'> implements ChartEntity<'grid'> {
+  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'grid'>) {
+    super(
+      {
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_GRID,
+        dataFormatterValidator,
+        computedDataFn,
+        dataValidator,
+        contextObserverCallback
+      },
+      element,
+      options
+    )
+  }
 }

package/src/MultiGridChart.ts

@@ -1,25 +1,25 @@
-import type {
-  ChartEntity,
-  ChartOptionsPartial } from '../lib/core-types'
-import { DEFAULT_DATA_FORMATTER_MULTI_GRID } from './defaults'
-import { dataFormatterValidator } from './multiGrid/dataFormatterValidator'
-import { computedDataFn } from './multiGrid/computedDataFn'
-import { dataValidator } from './multiGrid/dataValidator'
-import { contextObserverCallback } from './multiGrid/contextObserverCallback'
-import { AbstractChart } from './AbstractChart'
-
-export class MultiGridChart extends AbstractChart<'multiGrid'> implements ChartEntity<'multiGrid'> {
-  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'multiGrid'>) {
-    super(
-      {
-        defaultDataFormatter: DEFAULT_DATA_FORMATTER_MULTI_GRID,
-        dataFormatterValidator,
-        computedDataFn,
-        dataValidator,
-        contextObserverCallback
-      },
-      element,
-      options
-    )
-  }
+import type {
+  ChartEntity,
+  ChartOptionsPartial } from '../lib/core-types'
+import { DEFAULT_DATA_FORMATTER_MULTI_GRID } from './defaults'
+import { dataFormatterValidator } from './multiGrid/dataFormatterValidator'
+import { computedDataFn } from './multiGrid/computedDataFn'
+import { dataValidator } from './multiGrid/dataValidator'
+import { contextObserverCallback } from './multiGrid/contextObserverCallback'
+import { AbstractChart } from './AbstractChart'
+
+export class MultiGridChart extends AbstractChart<'multiGrid'> implements ChartEntity<'multiGrid'> {
+  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'multiGrid'>) {
+    super(
+      {
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_MULTI_GRID,
+        dataFormatterValidator,
+        computedDataFn,
+        dataValidator,
+        contextObserverCallback
+      },
+      element,
+      options
+    )
+  }
 }

package/src/MultiValueChart.ts

@@ -1,25 +1,25 @@
-import type {
-  ChartEntity,
-  ChartOptionsPartial } from '../lib/core-types'
-import { DEFAULT_DATA_FORMATTER_MULTI_VALUE } from './defaults'
-import { dataFormatterValidator } from './multiValue/dataFormatterValidator'
-import { computedDataFn } from './multiValue/computedDataFn'
-import { dataValidator } from './multiValue/dataValidator'
-import { contextObserverCallback } from './multiValue/contextObserverCallback'
-import { AbstractChart } from './AbstractChart'
-
-export class MultiValueChart extends AbstractChart<'multiValue'> implements ChartEntity<'multiValue'> {
-  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'multiValue'>) {
-    super(
-      {
-        defaultDataFormatter: DEFAULT_DATA_FORMATTER_MULTI_VALUE,
-        dataFormatterValidator,
-        computedDataFn,
-        dataValidator,
-        contextObserverCallback
-      },
-      element,
-      options
-    )
-  }
+import type {
+  ChartEntity,
+  ChartOptionsPartial } from '../lib/core-types'
+import { DEFAULT_DATA_FORMATTER_MULTI_VALUE } from './defaults'
+import { dataFormatterValidator } from './multiValue/dataFormatterValidator'
+import { computedDataFn } from './multiValue/computedDataFn'
+import { dataValidator } from './multiValue/dataValidator'
+import { contextObserverCallback } from './multiValue/contextObserverCallback'
+import { AbstractChart } from './AbstractChart'
+
+export class MultiValueChart extends AbstractChart<'multiValue'> implements ChartEntity<'multiValue'> {
+  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'multiValue'>) {
+    super(
+      {
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_MULTI_VALUE,
+        dataFormatterValidator,
+        computedDataFn,
+        dataValidator,
+        contextObserverCallback
+      },
+      element,
+      options
+    )
+  }
 }

package/src/RelationshipChart.ts

@@ -1,25 +1,25 @@
-import type {
-  ChartEntity,
-  ChartOptionsPartial } from '../lib/core-types'
-import { DEFAULT_DATA_FORMATTER_RELATIONSHIP} from './defaults'
-import { dataFormatterValidator } from './relationship/dataFormatterValidator'
-import { computedDataFn } from './relationship/computedDataFn'
-import { dataValidator } from './relationship/dataValidator'
-import { contextObserverCallback } from './relationship/contextObserverCallback'
-import { AbstractChart } from './AbstractChart'
-
-export class RelationshipChart extends AbstractChart<'relationship'> implements ChartEntity<'relationship'> {
-  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'relationship'>) {
-    super(
-      {
-        defaultDataFormatter: DEFAULT_DATA_FORMATTER_RELATIONSHIP,
-        dataFormatterValidator,
-        computedDataFn,
-        dataValidator,
-        contextObserverCallback
-      },
-      element,
-      options
-    )
-  }
+import type {
+  ChartEntity,
+  ChartOptionsPartial } from '../lib/core-types'
+import { DEFAULT_DATA_FORMATTER_RELATIONSHIP} from './defaults'
+import { dataFormatterValidator } from './relationship/dataFormatterValidator'
+import { computedDataFn } from './relationship/computedDataFn'
+import { dataValidator } from './relationship/dataValidator'
+import { contextObserverCallback } from './relationship/contextObserverCallback'
+import { AbstractChart } from './AbstractChart'
+
+export class RelationshipChart extends AbstractChart<'relationship'> implements ChartEntity<'relationship'> {
+  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'relationship'>) {
+    super(
+      {
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_RELATIONSHIP,
+        dataFormatterValidator,
+        computedDataFn,
+        dataValidator,
+        contextObserverCallback
+      },
+      element,
+      options
+    )
+  }
 }

package/src/SeriesChart.ts

@@ -1,25 +1,25 @@
-import type {
-  ChartEntity,
-  ChartOptionsPartial } from '../lib/core-types'
-import { DEFAULT_DATA_FORMATTER_SERIES } from './defaults'
-import { dataFormatterValidator } from './series/dataFormatterValidator'
-import { computedDataFn } from './series/computedDataFn'
-import { dataValidator } from './series/dataValidator'
-import { contextObserverCallback } from './series/contextObserverCallback'
-import { AbstractChart } from './AbstractChart'
-
-export class SeriesChart extends AbstractChart<'series'> implements ChartEntity<'series'> {
-  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'series'>) {
-    super(
-      {
-        defaultDataFormatter: DEFAULT_DATA_FORMATTER_SERIES,
-        dataFormatterValidator,
-        computedDataFn,
-        dataValidator,
-        contextObserverCallback
-      },
-      element,
-      options
-    )
-  }
+import type {
+  ChartEntity,
+  ChartOptionsPartial } from '../lib/core-types'
+import { DEFAULT_DATA_FORMATTER_SERIES } from './defaults'
+import { dataFormatterValidator } from './series/dataFormatterValidator'
+import { computedDataFn } from './series/computedDataFn'
+import { dataValidator } from './series/dataValidator'
+import { contextObserverCallback } from './series/contextObserverCallback'
+import { AbstractChart } from './AbstractChart'
+
+export class SeriesChart extends AbstractChart<'series'> implements ChartEntity<'series'> {
+  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'series'>) {
+    super(
+      {
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_SERIES,
+        dataFormatterValidator,
+        computedDataFn,
+        dataValidator,
+        contextObserverCallback
+      },
+      element,
+      options
+    )
+  }
 }

package/src/TreeChart.ts

@@ -1,25 +1,25 @@
-import type {
-  ChartEntity,
-  ChartOptionsPartial } from '../lib/core-types'
-import { DEFAULT_DATA_FORMATTER_TREE } from './defaults'
-import { dataFormatterValidator } from './tree/dataFormatterValidator'
-import { computedDataFn } from './tree/computedDataFn'
-import { dataValidator } from './tree/dataValidator'
-import { contextObserverCallback } from './tree/contextObserverCallback'
-import { AbstractChart } from './AbstractChart'
-
-export class TreeChart extends AbstractChart<'tree'> implements ChartEntity<'tree'> {
-  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'tree'>) {
-    super(
-      {
-        defaultDataFormatter: DEFAULT_DATA_FORMATTER_TREE,
-        dataFormatterValidator,
-        computedDataFn,
-        dataValidator,
-        contextObserverCallback
-      },
-      element,
-      options
-    )
-  }
+import type {
+  ChartEntity,
+  ChartOptionsPartial } from '../lib/core-types'
+import { DEFAULT_DATA_FORMATTER_TREE } from './defaults'
+import { dataFormatterValidator } from './tree/dataFormatterValidator'
+import { computedDataFn } from './tree/computedDataFn'
+import { dataValidator } from './tree/dataValidator'
+import { contextObserverCallback } from './tree/contextObserverCallback'
+import { AbstractChart } from './AbstractChart'
+
+export class TreeChart extends AbstractChart<'tree'> implements ChartEntity<'tree'> {
+  constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'tree'>) {
+    super(
+      {
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_TREE,
+        dataFormatterValidator,
+        computedDataFn,
+        dataValidator,
+        contextObserverCallback
+      },
+      element,
+      options
+    )
+  }
 }