@buildcanada/charts 0.1.1 → 0.2.0

package/src/core-table/CoreTableUtils.ts

@@ -12,10 +12,10 @@ import {
     ColumnTypeNames,
     CoreColumnDef,
     ErrorValue,
-    OwidEntityCodeColumnDef,
-    OwidEntityIdColumnDef,
-    OwidEntityNameColumnDef,
-    OwidTableSlugs,
+    EntityCodeColumnDef,
+    EntityIdColumnDef,
+    EntityNameColumnDef,
+    ChartsTableSlugs,
 } from "../types/index.js"
 import { ErrorValueTypes, DroppedForTesting } from "./ErrorValues.js"
 
@@ -135,9 +135,9 @@ export const guessColumnDefFromSlugAndRow = (
             name: "Year",
         }
 
-    if (slug === OwidTableSlugs.entityName) return OwidEntityNameColumnDef
-    if (slug === OwidTableSlugs.entityCode) return OwidEntityCodeColumnDef
-    if (slug === OwidTableSlugs.entityId) return OwidEntityIdColumnDef
+    if (slug === ChartsTableSlugs.entityName) return EntityNameColumnDef
+    if (slug === ChartsTableSlugs.entityCode) return EntityCodeColumnDef
+    if (slug === ChartsTableSlugs.entityId) return EntityIdColumnDef
 
     if (slug === "date")
         return {

package/src/core-table/{OwidTableSynthesizers.ts → TableSynthesizers.ts}

@@ -3,28 +3,28 @@ import {
     sampleFrom,
     getRandomNumberGenerator,
     countries,
-    OwidVariableDisplayConfigInterface,
+    VariableDisplayConfigInterface,
     ColumnSlug,
 } from "../utils/index.js"
 import {
     TimeRange,
     ColumnTypeNames,
-    OwidColumnDef,
-    OwidTableSlugs,
+    ColumnDef,
+    ChartsTableSlugs,
 } from "../types/index.js"
-import { OwidTable } from "./OwidTable.js"
+import { ChartsTable } from "./ChartsTable.js"
 
 interface SynthOptions {
     entityCount: number
     entityNames: string[]
     timeRange: TimeRange
-    columnDefs: OwidColumnDef[]
+    columnDefs: ColumnDef[]
 }
 
-const SynthesizeOwidTable = (
+const SynthesizeChartsTable = (
     options?: Partial<SynthOptions>,
     seed = Date.now()
-): OwidTable => {
+): ChartsTable => {
     const finalOptions: SynthOptions = {
         entityNames: [],
         entityCount: 2,
@@ -35,10 +35,10 @@ const SynthesizeOwidTable = (
     const { entityCount, columnDefs, timeRange, entityNames } = finalOptions
     const colSlugs = (
         [
-            OwidTableSlugs.entityName,
-            OwidTableSlugs.entityCode,
-            OwidTableSlugs.entityId,
-            OwidTableSlugs.year,
+            ChartsTableSlugs.entityName,
+            ChartsTableSlugs.entityCode,
+            ChartsTableSlugs.entityId,
+            ChartsTableSlugs.year,
         ] as ColumnSlug[]
     ).concat(columnDefs.map((col) => col.slug!))
 
@@ -67,7 +67,7 @@ const SynthesizeOwidTable = (
             .join("\n")
     })
 
-    return new OwidTable(
+    return new ChartsTable(
         `${colSlugs.join(",")}\n${rows.join("\n")}`,
         columnDefs
     )
@@ -76,8 +76,8 @@ const SynthesizeOwidTable = (
 export const SynthesizeNonCountryTable = (
     options?: Partial<SynthOptions>,
     seed = Date.now()
-): OwidTable =>
-    SynthesizeOwidTable(
+): ChartsTable =>
+    SynthesizeChartsTable(
         {
             entityNames: ["Fire", "Earthquake", "Tornado"],
             columnDefs: [
@@ -110,9 +110,9 @@ export enum SampleColumnSlugs {
 export const SynthesizeGDPTable = (
     options?: Partial<SynthOptions>,
     seed = Date.now(),
-    display?: OwidVariableDisplayConfigInterface
-): OwidTable =>
-    SynthesizeOwidTable(
+    display?: VariableDisplayConfigInterface
+): ChartsTable =>
+    SynthesizeChartsTable(
         {
             columnDefs: [
                 {
@@ -173,8 +173,8 @@ const SynthSource = (
 export const SynthesizeFruitTable = (
     options?: Partial<SynthOptions>,
     seed = Date.now()
-): OwidTable =>
-    SynthesizeOwidTable(
+): ChartsTable =>
+    SynthesizeChartsTable(
         {
             columnDefs: [
                 {
@@ -209,7 +209,7 @@ export const SynthesizeFruitTableWithNonPositives = (
     options?: Partial<SynthOptions>,
     howManyNonPositives = 20,
     seed = Date.now()
-): OwidTable => {
+): ChartsTable => {
     const rand = getRandomNumberGenerator(-1000, 0)
     return SynthesizeFruitTable(options, seed).replaceRandomCells(
         howManyNonPositives,
@@ -225,7 +225,7 @@ export const SynthesizeFruitTableWithStringValues = (
     options?: Partial<SynthOptions>,
     howMany = 20,
     seed = Date.now()
-): OwidTable => {
+): ChartsTable => {
     return SynthesizeFruitTable(options, seed).replaceRandomCells(
         howMany,
         [SampleColumnSlugs.Fruit, SampleColumnSlugs.Vegetables],
@@ -237,9 +237,9 @@ export const SynthesizeFruitTableWithStringValues = (
 export const SynthesizeProjectedPopulationTable = (
     options?: Partial<SynthOptions>,
     seed = Date.now(),
-    display?: OwidVariableDisplayConfigInterface
-): OwidTable =>
-    SynthesizeOwidTable(
+    display?: VariableDisplayConfigInterface
+): ChartsTable =>
+    SynthesizeChartsTable(
         {
             columnDefs: [
                 {

package/src/core-table/{OwidTableUtil.ts → TableUtil.ts}

@@ -2,15 +2,15 @@ import {
     ColumnSlug,
     ColumnTypeNames,
     CoreColumnDef,
-    OwidColumnDef,
-    OwidTableSlugs,
+    ColumnDef,
+    ChartsTableSlugs,
 } from "../types/index.js"
 import { CoreTable } from "./CoreTable.js"
 
 export function timeColumnSlugFromColumnDef(
-    def: OwidColumnDef
-): OwidTableSlugs.day | OwidTableSlugs.year {
-    return def.isDailyMeasurement ? OwidTableSlugs.day : OwidTableSlugs.year
+    def: ColumnDef
+): ChartsTableSlugs.day | ChartsTableSlugs.year {
+    return def.isDailyMeasurement ? ChartsTableSlugs.day : ChartsTableSlugs.year
 }
 
 export function makeOriginalTimeSlugFromColumnSlug(slug: ColumnSlug): string {

package/src/core-table/index.ts

@@ -7,7 +7,7 @@ export {
     SynthesizeFruitTableWithNonPositives,
     SynthesizeFruitTableWithStringValues,
     SynthesizeProjectedPopulationTable,
-} from "./OwidTableSynthesizers.js"
+} from "./TableSynthesizers.js"
 
 export {
     type CoreColumn,
@@ -17,7 +17,7 @@ export {
     TimeColumn,
 } from "./CoreTableColumns.js"
 
-export { OwidTable, BlankOwidTable } from "./OwidTable.js"
+export { ChartsTable, BlankChartsTable } from "./ChartsTable.js"
 
 export {
     DroppedForTesting,
@@ -71,7 +71,7 @@ export {
     makeOriginalValueSlugFromColumnSlug,
     getOriginalTimeColumnSlug,
     toPercentageColumnDef,
-} from "./OwidTableUtil.js"
+} from "./TableUtil.js"
 
 export {
     insertMissingValuePlaceholders,

package/src/explorer/ColumnGrammar.ts

@@ -114,7 +114,7 @@ export const ColumnGrammar: Grammar<ColumnCellDef> = {
         ...StringCellDef,
         keyword: "dataPublishedBy",
         description:
-            "For academic papers this should be a complete reference. For institutional projects, detail the project or report. For data we have modified extensively, list OWID as the publishers and provide the name of the person in charge of the calculation.",
+            "For academic papers this should be a complete reference. For institutional projects, detail the project or report. For data modified extensively, list the organization as the publishers and provide the name of the person in charge of the calculation.",
     },
     dataPublisherSource: {
         ...StringCellDef,

package/src/explorer/Explorer.sample.ts

@@ -2,13 +2,13 @@ import { DimensionProperty } from "../utils/index.js"
 import { GRAPHER_TAB_CONFIG_OPTIONS } from "../types/index.js"
 import {
     GrapherProgrammaticInterface,
-    legacyToOwidTableAndDimensionsWithMandatorySlug,
+    legacyToChartsTableAndDimensionsWithMandatorySlug,
 } from "../grapher/index.js"
 import { Explorer, ExplorerProps } from "./Explorer.js"
 
 const SampleExplorerOfGraphersProgram = `explorerTitle	CO₂ Data Explorer
 isPublished	false
-explorerSubtitle	Download the complete <i>Our World in Data</i> <a href="https://github.com/owid/co2-data">CO₂ and GHG Emissions Dataset</a>.
+explorerSubtitle	Download the complete CO₂ and GHG Emissions Dataset.
 subNavId	co2
 time	earliest..latest
 selection	China	United States	India	United Kingdom	World
@@ -46,7 +46,7 @@ graphers
 	4244	Nitrous oxide	Production-based		Per capita	false`
 
 // Generate realistic CO2 per capita emissions data (tonnes per person)
-// Based on approximate real-world trends from OWID CO2 data
+// Based on approximate real-world trends from CO2 data
 function generateCO2PerCapitaData() {
     const startYear = 1990
     const endYear = 2024
@@ -93,7 +93,7 @@ function generateCO2PerCapitaData() {
         {
             id: 5,
             name: "World",
-            code: "OWID_WRL",
+            code: "WRL",
             // Global average rose from ~4 to ~4.7 tonnes
             baseValue: 4.0,
             trend: (year: number) =>
@@ -140,7 +140,7 @@ function generateCO2PerCapitaData() {
 export const SampleExplorerOfGraphers = (props?: Partial<ExplorerProps>) => {
     const title = "CO₂ emissions per capita"
     const co2Data = generateCO2PerCapitaData()
-    const owidDataset = new Map([[142609, co2Data]])
+    const dataset = new Map([[142609, co2Data]])
     const dimensions = [
         {
             variableId: 142609,
@@ -153,8 +153,8 @@ export const SampleExplorerOfGraphers = (props?: Partial<ExplorerProps>) => {
         dimensions,
         tab: GRAPHER_TAB_CONFIG_OPTIONS.chart,
     }
-    first.table = legacyToOwidTableAndDimensionsWithMandatorySlug(
-        owidDataset,
+    first.table = legacyToChartsTableAndDimensionsWithMandatorySlug(
+        dataset,
         dimensions,
         {}
     )

package/src/explorer/Explorer.scss

@@ -51,7 +51,7 @@ html.IsInIframe #ExplorerContainer {
     }
     .ExplorerDownloadLink {
         font-size: 13px;
-        @include owid-link-60;
+        @include link-60;
     }
 }
 

package/src/explorer/Explorer.tsx

@@ -6,7 +6,7 @@ import {
     ArchiveContext,
     ColumnTypeNames,
     CoreColumnDef,
-    OwidColumnDef,
+    ColumnDef,
     SortOrder,
     TableSlug,
     GrapherInterface,
@@ -15,8 +15,8 @@ import {
     GRAPHER_TAB_QUERY_PARAMS,
 } from "../types/index.js"
 import {
-    OwidTable,
-    BlankOwidTable,
+    ChartsTable,
+    BlankChartsTable,
     extractPotentialDataSlugsFromTransform,
 } from "../core-table/index.js"
 import {
@@ -82,7 +82,7 @@ export interface ExplorerProps extends SerializedGridProgram {
     grapherConfigs?: GrapherInterface[]
     partialGrapherConfigs?: GrapherInterface[]
     queryStr?: string
-    isEmbeddedInAnOwidPage?: boolean
+    isEmbeddedInPage?: boolean
     isInStandalonePage?: boolean
     isPreview?: boolean
     canonicalUrl?: string
@@ -204,7 +204,7 @@ export class Explorer
     analytics = new GrapherAnalytics()
     grapherState: GrapherState
     isOnArchivalPage: boolean
-    inputTableTransformer = (table: OwidTable) => table
+    inputTableTransformer = (table: ChartsTable) => table
 
     constructor(props: ExplorerProps) {
         super(props)
@@ -240,7 +240,7 @@ export class Explorer
             bounds: props.bounds,
             enableKeyboardShortcuts: this.props.isInStandalonePage,
             manager: this,
-            isEmbeddedInAnOwidPage: this.props.isEmbeddedInAnOwidPage,
+            isEmbeddedInPage: this.props.isEmbeddedInPage,
             adminBaseUrl: this.adminBaseUrl,
             canHideExternalControlsInEmbed: true,
             archiveContext: props.archiveContext,
@@ -272,7 +272,7 @@ export class Explorer
             ...explorerConstants,
             grapherConfigs,
             partialGrapherConfigs,
-            isEmbeddedInAnOwidPage: false,
+            isEmbeddedInPage: false,
             isInStandalonePage: true,
             archiveContext,
         }
@@ -535,7 +535,7 @@ export class Explorer
         )
     }
 
-    @action.bound private setGrapherTable(table: OwidTable) {
+    @action.bound private setGrapherTable(table: ChartsTable) {
         this.grapherState.inputTable = this.inputTableTransformer(table)
     }
 
@@ -548,7 +548,7 @@ export class Explorer
         return !this.isNarrow
     }
 
-    private futureGrapherTable = new PromiseSwitcher<OwidTable>({
+    private futureGrapherTable = new PromiseSwitcher<ChartsTable>({
         onResolve: (table) => this.setGrapherTable(table),
         onReject: (error) => this.grapher?.setError(error),
     })
@@ -570,12 +570,12 @@ export class Explorer
 
     @computed private get columnDefsWithoutTableSlugByIdOrSlug(): Record<
         number | string,
-        OwidColumnDef
+        ColumnDef
     > {
         const { columnDefsWithoutTableSlug } = this.explorerProgram
         return _.keyBy(
             columnDefsWithoutTableSlug,
-            (def: OwidColumnDef) => def.owidVariableId ?? def.slug
+            (def: ColumnDef) => def.variableId ?? def.slug
         )
     }
 
@@ -606,7 +606,7 @@ export class Explorer
         const baseVariableIdsAndColumnSlugs =
             this.getBaseColumnsForColumnWithTransform(slug)
         const slugsInColumnBlock: string[] = columnDefsWithoutTableSlug
-            .filter((def) => !def.owidVariableId)
+            .filter((def) => !def.variableId)
             .map((def) => def.slug)
         return baseVariableIdsAndColumnSlugs.filter(
             (variableIdOrColumnSlug) =>
@@ -645,7 +645,7 @@ export class Explorer
 
         grapherState.setAuthoredVersion(config)
         grapherState.reset()
-        grapherState.inputTable = BlankOwidTable()
+        grapherState.inputTable = BlankChartsTable()
         grapherState.updateFromObject(config)
         if (!config.table) {
             const loadFn =
@@ -657,7 +657,7 @@ export class Explorer
                 archiveContext: this.props.archiveContext,
                 noCache: this.props.isPreview,
                 loadMetadataOnly: this.props.loadMetadataOnly,
-            }).then((owidTable) => (owidTable ? owidTable : BlankOwidTable()))
+            }).then((dataTable) => (dataTable ? dataTable : BlankChartsTable()))
             // We use the PromiseSwitcher here to make sure that only the last
             // of several user triggered load operations in quick succession
             // will actually set the table.
@@ -788,7 +788,7 @@ export class Explorer
         config.dimensions = dimensions
         if (ySlugs && yVariableIds) config.ySlugs = ySlugs + " " + yVariableIds
 
-        this.inputTableTransformer = (table: OwidTable) => {
+        this.inputTableTransformer = (table: ChartsTable) => {
             // add transformed (and intermediate) columns to the grapher table
             if (uniqueSlugsInGrapherRow.length) {
                 const allColumnSlugs = _.uniq(
@@ -811,7 +811,7 @@ export class Explorer
             }
 
             // update column definitions with manually provided properties
-            table = table.updateDefs((def: OwidColumnDef) => {
+            table = table.updateDefs((def: ColumnDef) => {
                 const manuallyProvidedDef =
                     this.columnDefsWithoutTableSlugByIdOrSlug[def.slug] ?? {}
                 const mergedDef = { ...def, ...manuallyProvidedDef }
@@ -836,7 +836,7 @@ export class Explorer
         if (dimensions.length === 0) {
             // If dimensions are empty, explicitly set the table to an empty table
             // so we don't end up confusingly showing stale data from a previous chart
-            grapherState.inputTable = BlankOwidTable()
+            grapherState.inputTable = BlankChartsTable()
         } else {
             const loadFn =
                 this.props.loadInputTableForConfig ?? fetchInputTableForConfig
@@ -847,7 +847,7 @@ export class Explorer
                 dataApiUrl: this.props.dataApiUrl,
                 noCache: this.props.isPreview,
                 loadMetadataOnly: this.props.loadMetadataOnly,
-            }).then((owidTable) => (owidTable ? owidTable : BlankOwidTable()))
+            }).then((dataTable) => (dataTable ? dataTable : BlankChartsTable()))
             // We use the PromiseSwitcher here to make sure that only the last
             // of several user triggered load operations in quick succession
             // will actually set the table.
@@ -880,7 +880,7 @@ export class Explorer
         this.grapher?.clearErrors()
         // Set a table immediately. A BlankTable shows a loading animation.
         this.setGrapherTable(
-            BlankOwidTable(tableSlug, `Loading table '${tableSlug}'`)
+            BlankChartsTable(tableSlug, `Loading table '${tableSlug}'`)
         )
         // We use the PromiseSwitcher here to make sure that only the last
         // of several user triggered load operations in quick succession
@@ -1007,7 +1007,7 @@ export class Explorer
     }
 
     @computed private get showExplorerControls() {
-        if (!this.props.isEmbeddedInAnOwidPage && !this.isInIFrame) return true
+        if (!this.props.isEmbeddedInPage && !this.isInIFrame) return true
         // Only allow hiding controls on embedded pages
         return !(
             this.explorerProgram.hideControls ||
@@ -1120,7 +1120,7 @@ export class Explorer
                     Explorer: true,
                     "mobile-explorer": this.isNarrow,
                     HideControls: !showExplorerControls,
-                    "is-embed": this.props.isEmbeddedInAnOwidPage,
+                    "is-embed": this.props.isEmbeddedInPage,
                 })}
             >
                 {showHeaderElement && this.renderHeaderElement()}
@@ -1169,10 +1169,10 @@ export class Explorer
         this.initialQueryParams.pickerMetric
     entityPickerSort: SortOrder | undefined = this.initialQueryParams.pickerSort
 
-    entityPickerTable: OwidTable | undefined = undefined
+    entityPickerTable: ChartsTable | undefined = undefined
     entityPickerTableIsLoading: boolean = false
 
-    private futureEntityPickerTable = new PromiseSwitcher<OwidTable>({
+    private futureEntityPickerTable = new PromiseSwitcher<ChartsTable>({
         onResolve: (table) => {
             this.entityPickerTable = table
             this.entityPickerTableIsLoading = false

package/src/explorer/ExplorerConstants.ts

@@ -74,8 +74,8 @@ export const GetAllExplorersRoute = "allExplorers.json"
 
 export const GetAllExplorersTagsRoute = "allExplorersTags.json"
 
-export const EXPLORERS_ROUTE_FOLDER = "explorers" // Url path: http://owid.org/{explorers}
-export const EXPLORERS_GIT_CMS_FOLDER = "explorers" // Disk path: /home/owid/git-content/{explorers}
+export const EXPLORERS_ROUTE_FOLDER = "explorers" // Url path: /{explorers}
+export const EXPLORERS_GIT_CMS_FOLDER = "explorers" // Disk path: git-content/{explorers}
 export const EXPLORERS_PREVIEW_ROUTE = `${EXPLORERS_ROUTE_FOLDER}/preview`
 
 export interface ExplorersRouteResponse {

package/src/explorer/ExplorerGrammar.ts

@@ -27,8 +27,8 @@ export const ExplorerGrammar: Grammar = {
         ...UrlCellDef,
         keyword: "table",
         valuePlaceholder: "",
-        regex: new RegExp(`(${UrlCellDef.regex?.source ?? ""}|^[\\w -()]+$)`), // URL or OWID dataset name
-        description: "A link to a CSV or TSV or the name of an OWID dataset.",
+        regex: new RegExp(`(${UrlCellDef.regex?.source ?? ""}|^[\\w -()]+$)`), // URL or dataset name
+        description: "A link to a CSV or TSV or the name of a dataset.",
         positionalCellDefs: [
             {
                 ...SlugDeclarationCellDef,
@@ -85,7 +85,7 @@ export const ExplorerGrammar: Grammar = {
         keyword: "googleSheet",
         valuePlaceholder: "https://docs.google.com/spreadsheets/d/1qeX...",
         description:
-            "Create a Google Sheet, share it with the OWID Group, then put the link here.",
+            "Create a Google Sheet, share it with your team, then put the link here.",
     },
     downloadDataLink: {
         ...UrlCellDef,

package/src/explorer/ExplorerProgram.ts

@@ -4,7 +4,7 @@ import {
     CoreMatrix,
     ColumnTypeNames,
     CoreTableInputOption,
-    OwidColumnDef,
+    ColumnDef,
     TableSlug,
     SubNavId,
     FacetAxisDomain,
@@ -14,7 +14,7 @@ import {
 } from "../types/index.js"
 import {
     CoreTable,
-    OwidTable,
+    ChartsTable,
     isNotErrorValue,
 } from "../core-table/index.js"
 import {
@@ -49,7 +49,7 @@ export const EXPLORER_FILE_SUFFIX = ".explorer.tsv"
 
 export interface TableDef {
     url?: string
-    columnDefinitions?: OwidColumnDef[]
+    columnDefinitions?: ColumnDef[]
     inlineData?: string[][]
     slug?: TableSlug
 }
@@ -291,8 +291,8 @@ export class ExplorerProgram extends GridProgram {
         return ""
     }
 
-    get columnDefsByTableSlug(): Map<TableSlug | undefined, OwidColumnDef[]> {
-        const columnDefs = new Map<TableSlug | undefined, OwidColumnDef[]>()
+    get columnDefsByTableSlug(): Map<TableSlug | undefined, ColumnDef[]> {
+        const columnDefs = new Map<TableSlug | undefined, ColumnDef[]>()
         const colDefsRows = this.getAllRowsMatchingWords(
             ExplorerGrammar.columns.keyword
         )
@@ -311,7 +311,7 @@ export class ExplorerProgram extends GridProgram {
         return columnDefs
     }
 
-    get columnDefsWithoutTableSlug(): OwidColumnDef[] {
+    get columnDefsWithoutTableSlug(): ColumnDef[] {
         return this.columnDefsByTableSlug.get(undefined) ?? []
     }
 
@@ -447,14 +447,14 @@ export class ExplorerProgram extends GridProgram {
         }
     )
 
-    async constructTable(tableSlug?: TableSlug): Promise<OwidTable> {
+    async constructTable(tableSlug?: TableSlug): Promise<ChartsTable> {
         const tableDef = this.getTableDef(tableSlug)
         if (!tableDef) {
             throw new Error(`Table definitions not found for '${tableSlug}'`)
         }
 
         if (tableDef.inlineData) {
-            return new OwidTable(
+            return new ChartsTable(
                 tableDef.inlineData,
                 tableDef.columnDefinitions,
                 {
@@ -466,7 +466,7 @@ export class ExplorerProgram extends GridProgram {
             const input = await ExplorerProgram.tableDataLoader.get(
                 tableDef.url
             )
-            return new OwidTable(input, tableDef.columnDefinitions, {
+            return new ChartsTable(input, tableDef.columnDefinitions, {
                 tableDescription: `Loaded from ${tableDef.url}`,
             })
         }
@@ -485,12 +485,15 @@ export class ExplorerProgram extends GridProgram {
         const inlineData = this.getBlock(tableDefRow)
         let url = inlineData ? undefined : this.lines[tableDefRow][1]
 
+        // If URL doesn't contain protocol, it's treated as a dataset slug
+        // Note: This legacy feature requires a full URL to be configured
         if (url && !url.includes("://")) {
-            const owidDatasetSlug = encodeURIComponent(url)
-            url = `https://raw.githubusercontent.com/owid/owid-datasets/master/datasets/${owidDatasetSlug}/${owidDatasetSlug}.csv`
+            console.warn(
+                `Dataset slug "${url}" provided without full URL. Please provide a complete URL.`
+            )
         }
 
-        const columnDefinitions: OwidColumnDef[] | undefined =
+        const columnDefinitions: ColumnDef[] | undefined =
             this.columnDefsByTableSlug.get(tableSlug)
 
         return {
@@ -523,14 +526,14 @@ export const trimAndParseObject = (config: any, grammar: Grammar) => {
     return trimmedRow
 }
 
-const parseColumnDefs = (block: string[][]): OwidColumnDef[] => {
+const parseColumnDefs = (block: string[][]): ColumnDef[] => {
     /**
      * A column def line can have:
      * - a column named `variableId`, which contains a variable id
      * - a column named `slug`, which is the referenced column in its data file
      *
      * We want to filter out any rows that contain neither of those, and we also
-     * want to rename `variableId` to `owidVariableId`.
+     * want to rename `variableId` to `variableId`.
      */
     const columnsTable = new CoreTable(block)
         .appendColumnsIfNew([
@@ -541,16 +544,16 @@ const parseColumnDefs = (block: string[][]): OwidColumnDef[] => {
                 name: "variableId",
             },
         ])
-        .renameColumn("variableId", "owidVariableId")
-        // Filter out rows that neither have a slug nor an owidVariableId
+        .renameColumn("variableId", "variableId")
+        // Filter out rows that neither have a slug nor an variableId
         .rowFilter(
-            (row) => !!(row.slug || typeof row.owidVariableId === "number"),
+            (row) => !!(row.slug || typeof row.variableId === "number"),
             "Keep only column defs with a slug or variable id"
         )
     return columnsTable.rows.map((row) => {
         // ignore slug if a variable id is given
         const hasValidVariableId =
-            row.owidVariableId && isNotErrorValue(row.owidVariableId)
+            row.variableId && isNotErrorValue(row.variableId)
         if (hasValidVariableId && row.slug) delete row.slug
 
         for (const field in row) {

package/src/explorer/ExplorerUtils.ts

@@ -43,7 +43,7 @@ export async function buildExplorerProps(
     }
     const props: ExplorerProps = {
         ...deserializeJSONFromHTML(html, EMBEDDED_EXPLORER_DELIMITER),
-        isEmbeddedInAnOwidPage: true,
+        isEmbeddedInPage: true,
         adminBaseUrl: explorerConstants.adminBaseUrl,
         bakedBaseUrl: explorerConstants.bakedBaseUrl,
         bakedGrapherUrl: explorerConstants.bakedGrapherUrl,

package/src/explorer/gridLang/readme.md

@@ -6,7 +6,7 @@ GridLang is a library for building 2-dimensional domain specific languages desig
 
 Unlike traditional computer languages that parse tokens in-order, tokens in GridLanguages are parsed in a lazy, non-linear manner, based upon there position in a 2-d matrix.
 
-Our "Explorer"—a DSL for building OWID explorers and Graphers—is a GridLang.
+Our "Explorer"—a DSL for building data explorers and Graphers—is a GridLang.
 
 GridLangs are also intrinsically "patchable"—a great way for perserving user state.
 

package/src/grapher/axis/Axis.ts

@@ -13,7 +13,7 @@ import {
     TickFormattingOptions,
     Tickmark,
     ValueRange,
-    OwidVariableRoundingMode,
+    VariableRoundingMode,
 } from "../../utils/index.js"
 import { ComparisonLineConfig } from "../../types/index.js"
 import { AxisConfig, AxisManager } from "./AxisConfig"
@@ -434,7 +434,7 @@ abstract class AbstractAxis {
     private getTickFormattingOptions(): TickFormattingOptions {
         const options: TickFormattingOptions = {
             ...this.config.tickFormattingOptions,
-            roundingMode: OwidVariableRoundingMode.decimalPlaces,
+            roundingMode: VariableRoundingMode.decimalPlaces,
         }
 
         // The chart's tick formatting function is used by default to format axis ticks. This means
@@ -485,7 +485,7 @@ abstract class AbstractAxis {
             // the value at the middle of the range.
             // We instead want to customize what happens - sometimes we want to place the point
             // at the start of the range instead.
-            // see https://github.com/owid/owid-grapher/pull/1367#issuecomment-1090845181.
+            // see # legacy PR 1367#issuecomment-1090845181.
             //
             // -@marcelgerber, 2022-04-12
             switch (this.config.singleValueAxisPointAlign) {