@buildcanada/charts 0.1.1 → 0.2.2

package/src/grapher/scatterCharts/ScatterPlotChartState.ts

@@ -4,7 +4,7 @@ import {
     CoreColumn,
     defaultIfErrorValue,
     isNotErrorValue,
-    OwidTable,
+    ChartsTable,
 } from "../../core-table/index.js"
 import { ChartState } from "../chart/ChartInterface"
 import { ColorScale, ColorScaleManager } from "../color/ColorScale"
@@ -36,7 +36,7 @@ import {
     lowerCaseFirstLetterUnlessAbbreviation,
 } from "../../utils/index.js"
 import { ColorScaleConfig } from "../color/ColorScaleConfig"
-import { OWID_NO_DATA_GRAY } from "../color/ColorConstants"
+import { NO_DATA_GRAY } from "../color/ColorConstants"
 import { AxisConfig } from "../axis/AxisConfig"
 import { BASE_FONT_SIZE } from "../core/GrapherConstants"
 import { SelectionArray } from "../selection/SelectionArray"
@@ -49,7 +49,7 @@ export class ScatterPlotChartState implements ChartState, ColorScaleManager {
 
     colorScale: ColorScale
     defaultBaseColorScheme = ColorSchemeName.continents
-    defaultNoDataColor = OWID_NO_DATA_GRAY
+    defaultNoDataColor = NO_DATA_GRAY
 
     constructor({ manager }: { manager: ScatterPlotManager }) {
         this.manager = manager
@@ -57,11 +57,11 @@ export class ScatterPlotChartState implements ChartState, ColorScaleManager {
         makeObservable(this)
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed get transformedTableFromGrapher(): OwidTable {
+    @computed get transformedTableFromGrapher(): ChartsTable {
         return (
             this.manager.transformedTable ??
             this.transformTable(this.inputTable)
@@ -69,7 +69,7 @@ export class ScatterPlotChartState implements ChartState, ColorScaleManager {
     }
 
     // TODO chunk this up into multiple computeds for better performance?
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         let table = this.transformedTableFromGrapher
         // We don't want to apply this transform when relative mode is also enabled, it has a
         // slightly different endpoints logic that drops initial zeroes to avoid DivideByZero error.
@@ -85,7 +85,7 @@ export class ScatterPlotChartState implements ChartState, ColorScaleManager {
         return table
     }
 
-    transformTable(table: OwidTable): OwidTable {
+    transformTable(table: ChartsTable): ChartsTable {
         // Drop all entities that have no data in either the X or Y column.
         // For some charts, this can drop more than 50% of rows, so we do it first.
         // If there's no data at all for an entity, then tolerance can also not "recover" any data, so this is safe to do.
@@ -153,7 +153,7 @@ export class ScatterPlotChartState implements ChartState, ColorScaleManager {
         return table
     }
 
-    transformTableForDisplay(table: OwidTable): OwidTable {
+    transformTableForDisplay(table: ChartsTable): ChartsTable {
         // Drop any rows which have non-number values for X or Y.
         table = table
             .columnFilter(

package/src/grapher/scatterCharts/ScatterSizeLegend.tsx

@@ -6,7 +6,7 @@ import { TextWrap, Halo } from "../../components/index.js"
 import {
     Color,
     makeIdForHumanConsumption,
-    OwidVariableRoundingMode,
+    VariableRoundingMode,
 } from "../../utils/index.js"
 import {
     BASE_FONT_SIZE,
@@ -184,7 +184,7 @@ export class ScatterSizeLegend {
                                 value,
                                 {
                                     roundingMode:
-                                        OwidVariableRoundingMode.decimalPlaces,
+                                        VariableRoundingMode.decimalPlaces,
                                 }
                             )}
                             cx={cx}

package/src/grapher/scatterCharts/ScatterUtils.ts

@@ -18,7 +18,7 @@ import {
 } from "./ScatterPlotChartConstants"
 import { BASE_FONT_SIZE } from "../core/GrapherConstants.js"
 import { ScatterPlotChartState } from "./ScatterPlotChartState"
-import { OwidTable } from "../../core-table/index.js"
+import { ChartsTable } from "../../core-table/index.js"
 
 export const labelPriority = (label: ScatterLabel): number => {
     let priority = label.fontSize
@@ -257,7 +257,7 @@ export function toSizeRange(
 }
 
 export function computeSizeDomain(
-    table: OwidTable,
+    table: ChartsTable,
     slug: ColumnSlug
 ): ValueRange {
     const sizeValues = table.get(slug).values.filter(_.isNumber)

package/src/grapher/schema/grapher-schema.009.yaml

@@ -1,28 +1,28 @@
 $schema: "http://json-schema.org/draft-07/schema#"
 # if you update the required keys, make sure that the mergeGrapherConfigs and
 # diffGrapherConfigs functions both reflect this change
-$id: "https://files.ourworldindata.org/schemas/grapher-schema.009.json"
+$id: "https://buildcanada.github.io/schemas/grapher-schema.009.json"
 required:
     - $schema
     - dimensions
 type: object
 description: |
-    Our World In Data grapher configuration. Most of the fields can be left empty and will be
+    Grapher configuration. Most of the fields can be left empty and will be
     filled with reasonable default values.
 properties:
     $schema:
         type: string
         description: Url of the concrete schema version to use to validate this document
         format: uri
-        default: "https://files.ourworldindata.org/schemas/grapher-schema.009.json"
+        default: "https://buildcanada.github.io/schemas/grapher-schema.009.json"
         # We restrict the $schema field to a single value since we expect all
         # configs in our database to be valid against the latest schema.
         # If we ever need to validate configs against multiple schema versions,
         # we can remove this constraint.
-        const: "https://files.ourworldindata.org/schemas/grapher-schema.009.json"
+        const: "https://buildcanada.github.io/schemas/grapher-schema.009.json"
     id:
         type: integer
-        description: Internal DB id. Useful internally for OWID but not required if just using grapher directly.
+        description: Internal DB id. Useful internally but not required if just using grapher directly.
         minimum: 0
     map:
         type: object
@@ -260,11 +260,11 @@ properties:
     logo:
         type: string
         description: Which logo to show on the upper right side
-        default: owid
+        default: legacy
         enum:
-            - owid
-            - core+owid
-            - gv+owid
+            - legacy
+            - core+legacy
+            - gv+legacy
     entityType:
         type: string
         default: country or region
@@ -658,20 +658,20 @@ $defs:
             - Viridis
             - continents
             - stackedAreaDefault
-            - owid-distinct
+            - distinct
             - SingleColorDenim
             - SingleColorTeal
             - SingleColorPurple
             - SingleColorDustyCoral
             - SingleColorDarkCopper
-            - OwidCategoricalA
-            - OwidCategoricalB
-            - OwidCategoricalC
-            - OwidCategoricalD
-            - OwidCategoricalE
-            - OwidEnergy
-            - OwidEnergyLines
-            - OwidDistinctLines
+            - CategoricalA
+            - CategoricalB
+            - CategoricalC
+            - CategoricalD
+            - CategoricalE
+            - Energy
+            - EnergyLines
+            - DistinctLines
             - BinaryMapPaletteA
             - BinaryMapPaletteB
             - BinaryMapPaletteC

package/src/grapher/schema/migrations/migrations.ts

@@ -17,7 +17,7 @@ import {
 } from "./helpers"
 import { GRAPHER_CHART_TYPES } from "../../../types/index.js"
 
-// see https://github.com/owid/owid-grapher/commit/26f2a0d1790c71bdda7e12f284ca552945d2f6ef
+// see # legacy commit 26f2a0d1790c71bdda7e12f284ca552945d2f6ef
 const migrateFrom001To002 = (
     config: AnyConfigWithValidSchema
 ): AnyConfigWithValidSchema => {
@@ -26,7 +26,7 @@ const migrateFrom001To002 = (
     return config
 }
 
-// see https://github.com/owid/owid-grapher/commit/4525ad81fb7064709ffab83677a8b0354b324dfb
+// see # legacy commit 4525ad81fb7064709ffab83677a8b0354b324dfb
 const migrateFrom002To003 = (
     config: AnyConfigWithValidSchema
 ): AnyConfigWithValidSchema => {
@@ -43,7 +43,7 @@ const migrateFrom002To003 = (
     return config
 }
 
-// see https://github.com/owid/owid-grapher/commit/1776721253cf61d7f1e24ebadeaf7a7ca2f43ced
+// see # legacy commit 1776721253cf61d7f1e24ebadeaf7a7ca2f43ced
 const migrateFrom003To004 = (
     config: AnyConfigWithValidSchema
 ): AnyConfigWithValidSchema => {
@@ -52,7 +52,7 @@ const migrateFrom003To004 = (
     return config
 }
 
-// see https://github.com/owid/owid-grapher/commit/1d67de3174764a413bc5055fbdf34efb2b49e079
+// see # legacy commit 1d67de3174764a413bc5055fbdf34efb2b49e079
 const migrateFrom004To005 = (
     config: AnyConfigWithValidSchema
 ): AnyConfigWithValidSchema => {

package/src/grapher/selection/MapSelectionArray.ts

@@ -73,7 +73,7 @@ export class MapSelectionArray extends SelectionArray {
     @computed get selectedRegions(): (Continent | Aggregate | IncomeGroup)[] {
         return this.selectedEntitiesWithRegionInfo.filter(
             (region): region is Continent | Aggregate | IncomeGroup =>
-                checkHasMembers(region) && region.code !== "OWID_WRL"
+                checkHasMembers(region) && region.code !== "WRL"
         )
     }
 

package/src/grapher/selection/readme.md

@@ -13,4 +13,4 @@ If something happens so the user has new choices, you can expand #2.
 
 Except for Scatters, only selected entities will appear in charts. In Scatters "selected entities" really are "highlighted entities". It may be nice to separate those concepts.
 
-SeriesSelection. It may be better to rename OwidTable to TimeSeriesTable, and remove the concept of `entityName` and replace with `seriesName`. Then we could have a nice simple concept "SeriesSelection". Similarly, we could ditch "EntityCode" and maybe have "SeriesNickname", which would be a shorter URL friendly way to specify seriesSelection. It would then be nice to rename the `country=` url param to something like `series=`
+SeriesSelection. It may be better to rename ChartsTable to TimeSeriesTable, and remove the concept of `entityName` and replace with `seriesName`. Then we could have a nice simple concept "SeriesSelection". Similarly, we could ditch "EntityCode" and maybe have "SeriesNickname", which would be a shorter URL friendly way to specify seriesSelection. It would then be nice to rename the `country=` url param to something like `series=`

package/src/grapher/slopeCharts/SlopeChartConstants.ts

@@ -1,5 +1,5 @@
 import { PartialBy, PointVector } from "../../utils/index.js"
-import { EntityName, OwidVariableRow } from "../../types/index.js"
+import { EntityName, VariableRow } from "../../types/index.js"
 import { ChartSeries } from "../chart/ChartInterface"
 import { CoreColumn } from "../../core-table/index.js"
 import { ChartManager } from "../chart/ChartManager"
@@ -15,8 +15,8 @@ export interface SlopeChartSeries extends ChartSeries {
     column: CoreColumn
     entityName: EntityName
     displayName: string
-    start: Pick<OwidVariableRow<number>, "value" | "originalTime">
-    end: Pick<OwidVariableRow<number>, "value" | "originalTime">
+    start: Pick<VariableRow<number>, "value" | "originalTime">
+    end: Pick<VariableRow<number>, "value" | "originalTime">
     annotation?: string
     focus: InteractionState
 }

package/src/grapher/slopeCharts/SlopeChartState.ts

@@ -5,7 +5,7 @@ import {
     RawSlopeChartSeries,
     SlopeChartSeries,
 } from "./SlopeChartConstants"
-import { OwidTable, CoreColumn } from "../../core-table/index.js"
+import { ChartsTable, CoreColumn } from "../../core-table/index.js"
 import { SelectionArray } from "../selection/SelectionArray"
 import { FocusArray } from "../focus/FocusArray"
 import {
@@ -44,25 +44,25 @@ import { VerticalAxis } from "../axis/Axis"
 export class SlopeChartState implements ChartState {
     manager: SlopeChartManager
 
-    defaultBaseColorScheme = ColorSchemeName.OwidDistinctLines
+    defaultBaseColorScheme = ColorSchemeName.DistinctLines
 
     constructor({ manager }: { manager: SlopeChartManager }) {
         this.manager = manager
         makeObservable(this)
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed get transformedTableFromGrapher(): OwidTable {
+    @computed get transformedTableFromGrapher(): ChartsTable {
         return (
             this.manager.transformedTable ??
             this.transformTable(this.inputTable)
         )
     }
 
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         let table = this.transformedTableFromGrapher
         // The % growth transform cannot be applied in transformTable() because it will filter out
         // any rows before startTime and change the timeline bounds.
@@ -76,7 +76,7 @@ export class SlopeChartState implements ChartState {
         return table
     }
 
-    transformTable(table: OwidTable) {
+    transformTable(table: ChartsTable) {
         table = table.filterByEntityNames(
             this.selectionArray.selectedEntityNames
         )
@@ -94,7 +94,7 @@ export class SlopeChartState implements ChartState {
         return table
     }
 
-    transformTableForSelection(table: OwidTable): OwidTable {
+    transformTableForSelection(table: ChartsTable): ChartsTable {
         table = table.replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
 
         this.yColumnSlugs.forEach((slug) => {
@@ -234,9 +234,9 @@ export class SlopeChartState implements ChartState {
             hasMultipleEntitiesSelected,
         })
 
-        const owidRowByTime = column.owidRowByEntityNameAndTime.get(entityName)
-        const start = owidRowByTime?.get(startTime)
-        const end = owidRowByTime?.get(endTime)
+        const dataRowByTime = column.dataRowByEntityNameAndTime.get(entityName)
+        const start = dataRowByTime?.get(startTime)
+        const end = dataRowByTime?.get(endTime)
 
         const colorKey = getColorKey({
             entityName,

package/src/grapher/stackedCharts/AbstractStackedChartState.ts

@@ -17,7 +17,7 @@ import {
     StackedSeries,
 } from "./StackedConstants.js"
 import {
-    OwidTable,
+    ChartsTable,
     CoreColumn,
     isNotErrorValueOrEmptyCell,
 } from "../../core-table/index.js"
@@ -57,18 +57,18 @@ export abstract class AbstractStackedChartState implements ChartState {
         makeObservable(this)
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         return (
             this.manager.transformedTable ??
             this.transformTable(this.inputTable)
         )
     }
 
-    transformTable(table: OwidTable): OwidTable {
+    transformTable(table: ChartsTable): ChartsTable {
         table = table.filterByEntityNames(
             this.selectionArray.selectedEntityNames
         )
@@ -103,7 +103,7 @@ export abstract class AbstractStackedChartState implements ChartState {
         return table
     }
 
-    transformTableForSelection(table: OwidTable): OwidTable {
+    transformTableForSelection(table: ChartsTable): ChartsTable {
         // if entities with partial data are not plotted,
         // make sure they don't show up in the entity selector
         if (this.missingDataStrategy !== MissingDataStrategy.show) {
@@ -151,7 +151,7 @@ export abstract class AbstractStackedChartState implements ChartState {
                 return {
                     isProjection: column.isProjection,
                     seriesName: column.displayName,
-                    rows: column.owidRows,
+                    rows: column.dataRows,
                     focus: this.focusArray.state(column.displayName),
                 }
             })
@@ -162,14 +162,14 @@ export abstract class AbstractStackedChartState implements ChartState {
     get entitiesAsSeries(): readonly StackedRawSeries<number>[] {
         if (!this.yColumns.length) return []
 
-        const { isProjection, owidRowsByEntityName } = this.yColumns[0]
+        const { isProjection, dataRowsByEntityName } = this.yColumns[0]
         return this.selectionArray.selectedEntityNames
             .map((entityName) => {
                 return {
                     isProjection,
                     seriesName: entityName,
                     shortEntityName: getShortNameForEntity(entityName),
-                    rows: owidRowsByEntityName.get(entityName) || [],
+                    rows: dataRowsByEntityName.get(entityName) || [],
                     focus: this.focusArray.state(entityName),
                 }
             })

package/src/grapher/stackedCharts/MarimekkoChart.tsx

@@ -30,7 +30,7 @@ import {
     VerticalAlign,
     ColorScaleConfigInterface,
 } from "../../types/index.js"
-import { OwidTable, CoreColumn } from "../../core-table/index.js"
+import { ChartsTable, CoreColumn } from "../../core-table/index.js"
 import { getShortNameForEntity } from "../chart/ChartUtils"
 import {
     LEGEND_STYLE_FOR_STACKED_CHARTS,
@@ -111,7 +111,7 @@ export class MarimekkoChart
         return this.chartState.manager
     }
 
-    @computed private get inputTable(): OwidTable {
+    @computed private get inputTable(): ChartsTable {
         return this.chartState.inputTable
     }
 
@@ -144,7 +144,7 @@ export class MarimekkoChart
         return times ? R.last(times) : undefined
     }
     @computed private get tableAtLatestTimelineTimepoint():
-        | OwidTable
+        | ChartsTable
         | undefined {
         if (this.latestTime)
             return this.manager.tableAfterAuthorTimelineAndActiveChartTransform?.filterByTargetTimes(
@@ -714,7 +714,7 @@ export class MarimekkoChart
         // we want this for the last year to pick all labels there - sortedItems
         // changes with the time point the user selects
         const ySizeMap: Map<string, number> = new Map(
-            yColumnsAtLastTimePoint[0].owidRows.map((row) => [
+            yColumnsAtLastTimePoint[0].dataRows.map((row) => [
                 row.entityName,
                 row.value,
             ])
@@ -728,7 +728,7 @@ export class MarimekkoChart
             : yColumnsAtLastTimePoint[0]
 
         let labelCandidates: LabelCandidate[] =
-            labelCandidateSource.owidRows.map((row) =>
+            labelCandidateSource.dataRows.map((row) =>
                 MarimekkoChart.labelCandidateFromItem(
                     {
                         entityName: row.entityName,

package/src/grapher/stackedCharts/MarimekkoChartConstants.ts

@@ -8,7 +8,7 @@ import {
     EntityName,
     ColumnSlug,
 } from "../../utils/index.js"
-import { OwidTable } from "../../core-table/index.js"
+import { ChartsTable } from "../../core-table/index.js"
 import { StackedPoint } from "./StackedConstants"
 import { DualAxis } from "../axis/Axis"
 import { InteractionState } from "../interaction/InteractionState.js"
@@ -17,7 +17,7 @@ export interface MarimekkoChartManager extends ChartManager {
     endTime?: Time
     matchingEntitiesOnly?: boolean
     xOverrideTime?: number
-    tableAfterAuthorTimelineAndActiveChartTransform?: OwidTable
+    tableAfterAuthorTimelineAndActiveChartTransform?: ChartsTable
     sortConfig?: SortConfig
     hideNoDataArea?: boolean
 }

package/src/grapher/stackedCharts/MarimekkoChartState.ts

@@ -12,7 +12,7 @@ import {
     SimpleChartSeries,
     SimplePoint,
 } from "./MarimekkoChartConstants"
-import { CoreColumn, OwidTable } from "../../core-table/index.js"
+import { CoreColumn, ChartsTable } from "../../core-table/index.js"
 import {
     autoDetectYColumnSlugs,
     getShortNameForEntity,
@@ -24,13 +24,13 @@ import {
     ColorSchemeName,
     EntityName,
     ColorScaleConfigInterface,
-    OwidVariableRow,
+    VariableRow,
     SortConfig,
     SortBy,
     SortOrder,
     ScaleType,
 } from "../../types/index.js"
-import { OWID_NO_DATA_GRAY } from "../color/ColorConstants"
+import { NO_DATA_GRAY } from "../color/ColorConstants"
 import { StackedPoint, StackedSeries } from "./StackedConstants"
 import { ColorScheme } from "../color/ColorScheme"
 import { ColorSchemes } from "../color/ColorSchemes"
@@ -45,7 +45,7 @@ export class MarimekkoChartState implements ChartState, ColorScaleManager {
 
     colorScale: ColorScale
     defaultBaseColorScheme = ColorSchemeName.continents
-    defaultNoDataColor = OWID_NO_DATA_GRAY
+    defaultNoDataColor = NO_DATA_GRAY
 
     constructor({ manager }: { manager: MarimekkoChartManager }) {
         this.manager = manager
@@ -53,16 +53,16 @@ export class MarimekkoChartState implements ChartState, ColorScaleManager {
         makeObservable(this)
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         const { inputTable } = this
         return this.manager.transformedTable ?? this.transformTable(inputTable)
     }
 
-    transformTable(table: OwidTable): OwidTable {
+    transformTable(table: ChartsTable): ChartsTable {
         const { yColumnSlugs, manager, colorColumnSlug, xColumnSlug } = this
         if (!this.yColumnSlugs.length) return table
 
@@ -179,7 +179,7 @@ export class MarimekkoChartState implements ChartState, ColorScaleManager {
             (this.manager.baseColorScheme
                 ? ColorSchemes.get(this.manager.baseColorScheme)
                 : undefined) ??
-            ColorSchemes.get(ColorSchemeName["owid-distinct"])
+            ColorSchemes.get(ColorSchemeName["distinct"])
         )
     }
 
@@ -198,7 +198,7 @@ export class MarimekkoChartState implements ChartState, ColorScaleManager {
                         color:
                             col.def.color ??
                             colorScheme.getColors(yColumns.length)[i],
-                        points: col.owidRows.map((row) => ({
+                        points: col.dataRows.map((row) => ({
                             time: row.originalTime,
                             position: row.entityName,
                             value: row.value,
@@ -238,7 +238,7 @@ export class MarimekkoChartState implements ChartState, ColorScaleManager {
 
     @computed get xSeries(): SimpleChartSeries | undefined {
         const createStackedXPoints = (
-            rows: OwidVariableRow<any>[]
+            rows: VariableRow<any>[]
         ): SimplePoint[] => {
             const points: SimplePoint[] = []
             for (const row of rows) {
@@ -254,7 +254,7 @@ export class MarimekkoChartState implements ChartState, ColorScaleManager {
         const column = this.xColumn
         return {
             seriesName: column.displayName,
-            points: createStackedXPoints(column.owidRows),
+            points: createStackedXPoints(column.dataRows),
         }
     }
 
@@ -262,7 +262,7 @@ export class MarimekkoChartState implements ChartState, ColorScaleManager {
         const { colorColumn, colorScale, uniqueEntityNames } = this
         const hasColorColumn = !colorColumn.isMissing
         const colorRowsByEntity = hasColorColumn
-            ? colorColumn.owidRowsByEntityName
+            ? colorColumn.dataRowsByEntityName
             : undefined
         const domainColorMap = new Map<string, EntityColorData>()
         if (uniqueEntityNames !== undefined) {

package/src/grapher/stackedCharts/StackedBarChartState.ts

@@ -30,7 +30,7 @@ export class StackedBarChartState
 
     @computed
     get unstackedSeriesWithMissingValuesAsZeroes(): StackedSeries<number>[] {
-        // TODO: remove once monthly data is supported (https://github.com/owid/owid-grapher/issues/2007)
+        // TODO: remove once monthly data is supported (# legacy issue 2007)
         const enforceUniformSpacing = !(
             this.transformedTable.timeColumn instanceof ColumnTypeMap.Day
         )

package/src/grapher/stackedCharts/StackedConstants.ts

@@ -1,7 +1,7 @@
 import {
     Color,
     EntityName,
-    OwidVariableRow,
+    VariableRow,
     SeriesName,
 } from "../../types/index.js"
 import { ChartSeries } from "../chart/ChartInterface"
@@ -80,7 +80,7 @@ export interface StackedRawSeries<
 > {
     seriesName: SeriesName
     isProjection?: boolean
-    rows: OwidVariableRow<PositionType>[]
+    rows: VariableRow<PositionType>[]
     focus: InteractionState
     shortEntityName?: string
 }