@buildcanada/charts 0.1.0 → 0.2.0

package/src/types/gdocTypes/Gdoc.ts

@@ -1,6 +1,6 @@
 /**
  * Stub types for Google Docs integration.
- * These are simplified versions of the full OWID gdocTypes.
+ * These are simplified versions of the full gdocTypes.
  * Most Google Docs CMS functionality is not needed for the standalone charts library,
  * but the types are required for compilation.
  */
@@ -9,9 +9,9 @@ import { QueryParams } from "../domainTypes/Various.js"
 import { ArchivedPageVersion } from "../domainTypes/Archive.js"
 
 /**
- * Document types in the OWID CMS.
+ * Document types in the CMS.
  */
-export enum OwidGdocType {
+export enum GdocType {
     Article = "article",
     TopicPage = "topic-page",
     LinearTopicPage = "linear-topic-page",
@@ -69,10 +69,10 @@ export interface UserCountryInformation {
 /**
  * Base interface for Gdoc content.
  */
-export interface OwidGdocBaseInterface {
+export interface GdocBaseInterface {
     id: string
     slug: string
-    content: OwidGdocContent
+    content: GdocContent
     published: boolean
     createdAt: Date
     publishedAt: Date | null
@@ -100,30 +100,30 @@ export interface OwidGdocBaseInterface {
 /**
  * Gdoc content type.
  */
-export interface OwidGdocContent {
-    type: OwidGdocType
+export interface GdocContent {
+    type: GdocType
     title?: string
-    body?: OwidEnrichedGdocBlock[]
+    body?: EnrichedGdocBlock[]
     [key: string]: unknown
 }
 
 /**
  * Generic Gdoc interface.
  */
-export type OwidGdoc =
-    | OwidGdocPostInterface
-    | OwidGdocDataInsightInterface
-    | OwidGdocAuthorInterface
-    | OwidGdocAboutInterface
-    | OwidGdocHomepageInterface
+export type Gdoc =
+    | GdocPostInterface
+    | GdocDataInsightInterface
+    | GdocAuthorInterface
+    | GdocAboutInterface
+    | GdocHomepageInterface
 
 /**
  * JSON representation of a Gdoc.
  */
-export interface OwidGdocJSON {
+export interface GdocJSON {
     id: string
     slug: string
-    content: OwidGdocContent
+    content: GdocContent
     published: boolean
     createdAt: string
     publishedAt: string | null
@@ -134,61 +134,61 @@ export interface OwidGdocJSON {
 /**
  * Post (article/topic page) interface.
  */
-export interface OwidGdocPostInterface extends OwidGdocBaseInterface {
-    content: OwidGdocPostContent
+export interface GdocPostInterface extends GdocBaseInterface {
+    content: GdocPostContent
 }
 
-export interface OwidGdocPostContent extends OwidGdocContent {
+export interface GdocPostContent extends GdocContent {
     type:
-        | OwidGdocType.Article
-        | OwidGdocType.TopicPage
-        | OwidGdocType.LinearTopicPage
-        | OwidGdocType.Fragment
-        | OwidGdocType.AboutPage
+        | GdocType.Article
+        | GdocType.TopicPage
+        | GdocType.LinearTopicPage
+        | GdocType.Fragment
+        | GdocType.AboutPage
 }
 
 /**
  * Data insight interface.
  */
-export interface OwidGdocDataInsightInterface extends OwidGdocBaseInterface {
-    content: OwidGdocDataInsightContent
+export interface GdocDataInsightInterface extends GdocBaseInterface {
+    content: GdocDataInsightContent
 }
 
-export interface OwidGdocDataInsightContent extends OwidGdocContent {
-    type: OwidGdocType.DataInsight
+export interface GdocDataInsightContent extends GdocContent {
+    type: GdocType.DataInsight
 }
 
 /**
  * Author interface.
  */
-export interface OwidGdocAuthorInterface extends OwidGdocBaseInterface {
-    content: OwidGdocAuthorContent
+export interface GdocAuthorInterface extends GdocBaseInterface {
+    content: GdocAuthorContent
 }
 
-export interface OwidGdocAuthorContent extends OwidGdocContent {
-    type: OwidGdocType.Author
+export interface GdocAuthorContent extends GdocContent {
+    type: GdocType.Author
 }
 
 /**
  * About page interface.
  */
-export interface OwidGdocAboutInterface extends OwidGdocBaseInterface {
-    content: OwidGdocAboutContent
+export interface GdocAboutInterface extends GdocBaseInterface {
+    content: GdocAboutContent
 }
 
-export interface OwidGdocAboutContent extends OwidGdocContent {
-    type: OwidGdocType.AboutPage
+export interface GdocAboutContent extends GdocContent {
+    type: GdocType.AboutPage
 }
 
 /**
  * Homepage interface.
  */
-export interface OwidGdocHomepageInterface extends OwidGdocBaseInterface {
-    content: OwidGdocHomepageContent
+export interface GdocHomepageInterface extends GdocBaseInterface {
+    content: GdocHomepageContent
 }
 
-export interface OwidGdocHomepageContent extends OwidGdocContent {
-    type: OwidGdocType.Homepage
+export interface GdocHomepageContent extends GdocContent {
+    type: GdocType.Homepage
 }
 
 // =====================================================
@@ -198,7 +198,7 @@ export interface OwidGdocHomepageContent extends OwidGdocContent {
 /**
  * Base interface for enriched Gdoc blocks.
  */
-export interface OwidEnrichedGdocBlock {
+export interface EnrichedGdocBlock {
     type: string
     parseErrors?: unknown[]
     [key: string]: unknown
@@ -216,7 +216,7 @@ export interface Span {
 /**
  * Key insights slide block.
  */
-export interface EnrichedBlockKeyInsightsSlide extends OwidEnrichedGdocBlock {
+export interface EnrichedBlockKeyInsightsSlide extends EnrichedGdocBlock {
     type: "key-insights-slide"
     title?: string
     [key: string]: unknown

package/src/types/grapherTypes/GrapherTypes.ts

@@ -1,10 +1,10 @@
 import {
-    OwidChartDimensionInterface,
-    OwidVariableRoundingMode,
-} from "../OwidVariableDisplayConfigInterface.js"
+    ChartDimensionInterface,
+    VariableRoundingMode,
+} from "../VariableDisplayConfigInterface.js"
 import { ColumnSlugs, EntityName } from "../domainTypes/CoreTableTypes.js"
 import { AxisAlign, Position } from "../domainTypes/Layout.js"
-import { Integer, OwidVariableId } from "../domainTypes/Various.js"
+import { Integer, VariableId } from "../domainTypes/Various.js"
 import { DetailDictionary } from "../gdocTypes/Gdoc.js"
 import {
     GRAPHER_CHART_TYPES,
@@ -13,7 +13,7 @@ import {
     GRAPHER_TAB_CONFIG_OPTIONS,
     GRAPHER_TAB_QUERY_PARAMS,
 } from "./GrapherConstants.js"
-import { OwidVariableDataMetadataDimensions } from "../OwidVariable.js"
+import { VariableDataMetadataDimensions } from "../Variable.js"
 import { ArchiveContext } from "../domainTypes/Archive.js"
 import {
     BinningStrategyIncludingManual,
@@ -233,7 +233,7 @@ export interface Tickmark {
     solid?: boolean // mostly for labelling domain start (e.g. 0)
 }
 export interface TickFormattingOptions {
-    roundingMode?: OwidVariableRoundingMode
+    roundingMode?: VariableRoundingMode
     numDecimalPlaces?: number
     numSignificantFigures?: number
     unit?: string
@@ -339,9 +339,9 @@ export type ComparisonLineConfig =
     | CustomComparisonLineConfig
 
 export enum LogoOption {
-    owid = "owid",
-    "core+owid" = "core+owid",
-    "gv+owid" = "gv+owid",
+    legacy = "legacy",
+    "core+legacy" = "core+legacy",
+    "gv+legacy" = "gv+legacy",
     buildcanada = "buildcanada",
     "buildcanada-wide" = "buildcanada-wide",
     canadaspends = "canadaspends",
@@ -441,20 +441,20 @@ export enum ColorSchemeName {
     Viridis = "Viridis",
     continents = "continents",
     stackedAreaDefault = "stackedAreaDefault",
-    "owid-distinct" = "owid-distinct",
+    "distinct" = "distinct",
     SingleColorDenim = "SingleColorDenim",
     SingleColorTeal = "SingleColorTeal",
     SingleColorPurple = "SingleColorPurple",
     SingleColorDustyCoral = "SingleColorDustyCoral",
     SingleColorDarkCopper = "SingleColorDarkCopper",
-    OwidCategoricalA = "OwidCategoricalA",
-    OwidCategoricalB = "OwidCategoricalB",
-    OwidCategoricalC = "OwidCategoricalC",
-    OwidCategoricalD = "OwidCategoricalD",
-    OwidCategoricalE = "OwidCategoricalE",
-    OwidEnergy = "OwidEnergy",
-    OwidEnergyLines = "OwidEnergyLines",
-    OwidDistinctLines = "OwidDistinctLines",
+    CategoricalA = "CategoricalA",
+    CategoricalB = "CategoricalB",
+    CategoricalC = "CategoricalC",
+    CategoricalD = "CategoricalD",
+    CategoricalE = "CategoricalE",
+    Energy = "Energy",
+    EnergyLines = "EnergyLines",
+    DistinctLines = "DistinctLines",
     BinaryMapPaletteA = "BinaryMapPaletteA",
     BinaryMapPaletteB = "BinaryMapPaletteB",
     BinaryMapPaletteC = "BinaryMapPaletteC",
@@ -520,7 +520,7 @@ export interface GrapherInterface extends SortConfig {
     maxTime?: TimeBound | TimeBoundValueStr
     timelineMinTime?: Time | TimeBoundValueStr
     timelineMaxTime?: Time | TimeBoundValueStr
-    dimensions?: OwidChartDimensionInterface[]
+    dimensions?: ChartDimensionInterface[]
     addCountryMode?: EntitySelectionMode
     comparisonLines?: ComparisonLineConfig[]
     stackMode?: StackMode
@@ -736,8 +736,8 @@ export enum GrapherWindowType {
 }
 
 export type AdditionalGrapherDataFetchFn = (
-    varId: OwidVariableId,
+    varId: VariableId,
     loadMetadataOnly?: boolean
-) => Promise<OwidVariableDataMetadataDimensions>
+) => Promise<VariableDataMetadataDimensions>
 
 export type GrapherTrendArrowDirection = "up" | "right" | "down"

package/src/types/index.ts

@@ -14,7 +14,7 @@ export {
     JsonError,
     type JsonString,
     type SerializedGridProgram,
-    type OwidVariableId,
+    type VariableId,
     type QueryParams,
 } from "./domainTypes/Various.js"
 
@@ -41,18 +41,18 @@ export {
     type CoreTableInputOption,
     type CoreQuery,
     type CoreMatrix,
-    OwidTableSlugs,
+    ChartsTableSlugs,
     type EntityName,
     type EntityCode,
     type EntityId,
     type Entity,
-    type OwidColumnDef,
-    OwidEntityNameColumnDef,
-    OwidEntityIdColumnDef,
-    OwidEntityCodeColumnDef,
-    StandardOwidColumnDefs,
-    type OwidRow,
-    type OwidVariableRow,
+    type ColumnDef,
+    EntityNameColumnDef,
+    EntityIdColumnDef,
+    EntityCodeColumnDef,
+    StandardColumnDefs,
+    type Row,
+    type VariableRow,
     ColumnTypeNames,
     type ColumnColorScale,
     type CoreColumnDef,
@@ -158,36 +158,36 @@ export {
 
 // Variable types
 export {
-    type OwidVariableWithSource,
-    type OwidVariableWithSourceAndDimension,
-    type OwidVariableWithSourceAndDimensionWithoutId,
-    type OwidVariableMixedData,
-    type OwidVariableWithDataAndSource,
-    type OwidVariableDimension,
-    type OwidVariableDimensions,
-    type OwidVariableDataMetadataDimensions,
-    type MultipleOwidVariableDataDimensionsMap,
-    type OwidVariableDimensionValuePartial,
-    type OwidVariableDimensionValueFull,
-    type OwidVariablePresentation,
-    type OwidEntityKey,
-    type OwidLicense,
-    type OwidProcessingLevel,
+    type VariableWithSource,
+    type VariableWithSourceAndDimension,
+    type VariableWithSourceAndDimensionWithoutId,
+    type VariableMixedData,
+    type VariableWithDataAndSource,
+    type VariableDimension,
+    type VariableDimensions,
+    type VariableDataMetadataDimensions,
+    type MultipleVariableDataDimensionsMap,
+    type VariableDimensionValuePartial,
+    type VariableDimensionValueFull,
+    type VariablePresentation,
+    type EntityKey,
+    type License,
+    type ProcessingLevel,
     type IndicatorTitleWithFragments,
     joinTitleFragments,
-    type OwidVariableType,
-} from "./OwidVariable.js"
+    type VariableType,
+} from "./Variable.js"
 
-export type { OwidSource } from "./OwidSource.js"
-export type { OwidOrigin } from "./OwidOrigin.js"
+export type { Source } from "./Source.js"
+export type { Origin } from "./Origin.js"
 
 export {
-    type OwidVariableDisplayConfigInterface,
-    type OwidVariableDataTableConfigInterface,
-    OwidVariableRoundingMode,
-    type OwidChartDimensionInterface,
-    type OwidChartDimensionInterfaceWithMandatorySlug,
-} from "./OwidVariableDisplayConfigInterface.js"
+    type VariableDisplayConfigInterface,
+    type VariableDataTableConfigInterface,
+    VariableRoundingMode,
+    type ChartDimensionInterface,
+    type ChartDimensionInterfaceWithMandatorySlug,
+} from "./VariableDisplayConfigInterface.js"
 
 export { type Nominal, wrap, unwrap } from "./NominalType.js"
 
@@ -202,26 +202,26 @@ export {
 
 // Gdoc types (stubs for type compatibility)
 export {
-    OwidGdocType,
+    GdocType,
     type NarrativeChartInfo,
     type DetailDictionary,
     type EnrichedDetail,
     type UserCountryInformation,
-    type OwidGdocBaseInterface,
-    type OwidGdocContent,
-    type OwidGdoc,
-    type OwidGdocJSON,
-    type OwidGdocPostInterface,
-    type OwidGdocPostContent,
-    type OwidGdocDataInsightInterface,
-    type OwidGdocDataInsightContent,
-    type OwidGdocAuthorInterface,
-    type OwidGdocAuthorContent,
-    type OwidGdocAboutInterface,
-    type OwidGdocAboutContent,
-    type OwidGdocHomepageInterface,
-    type OwidGdocHomepageContent,
-    type OwidEnrichedGdocBlock,
+    type GdocBaseInterface,
+    type GdocContent,
+    type Gdoc,
+    type GdocJSON,
+    type GdocPostInterface,
+    type GdocPostContent,
+    type GdocDataInsightInterface,
+    type GdocDataInsightContent,
+    type GdocAuthorInterface,
+    type GdocAuthorContent,
+    type GdocAboutInterface,
+    type GdocAboutContent,
+    type GdocHomepageInterface,
+    type GdocHomepageContent,
+    type EnrichedGdocBlock,
     type Span,
     type EnrichedBlockKeyInsightsSlide,
     type EnrichedTopicPageIntroRelatedTopic,
@@ -300,7 +300,7 @@ export interface TagGraphNode {
 
 export const TagGraphRootName = "tag-graph-root" as const
 
-export type TagGraphRoot = TagGraphNode & {
+export interface TagGraphRoot {
     children: TagGraphNode[]
     id: number
     isTopic: false

package/src/utils/MultiDimDataPageConfig.ts

@@ -1,6 +1,6 @@
 /**
  * Stub for MultiDimDataPageConfig.
- * Multi-dimensional data page configurations are specific to OWID's data pages.
+ * Multi-dimensional data page configurations are specific to data pages.
  */
 
 export interface MultiDimDataPageConfigRaw {

package/src/utils/Util.ts

@@ -17,17 +17,17 @@ import {
     VerticalAlign,
     type GridParameters,
     HorizontalAlign,
-    type OwidEnrichedGdocBlock,
+    type EnrichedGdocBlock,
     type EnrichedBlockKeyInsightsSlide,
     type EnrichedTopicPageIntroRelatedTopic,
     type EnrichedTopicPageIntroDownloadButton,
     type EnrichedHybridLink,
-    type OwidGdocPostInterface,
-    type OwidGdocDataInsightInterface,
-    type OwidGdocAuthorInterface,
-    type OwidGdoc,
-    OwidGdocType,
-    type OwidGdocJSON,
+    type GdocPostInterface,
+    type GdocDataInsightInterface,
+    type GdocAuthorInterface,
+    type Gdoc,
+    GdocType,
+    type GdocJSON,
     type Span,
     UserCountryInformation,
     Time,
@@ -40,8 +40,8 @@ import {
     GRAPHER_CHART_TYPES,
     DbPlainTag,
     AssetMap,
-    OwidGdocAboutInterface,
-    OwidGdocHomepageInterface,
+    GdocAboutInterface,
+    GdocHomepageInterface,
     PrimitiveType,
     GrapherTrendArrowDirection,
     TocHeadingWithTitleSupertitle,
@@ -533,10 +533,16 @@ export async function fetchWithTimeout(
     })
 }
 
+// Country detection service URL - can be configured for custom deployments
+// This service should return JSON with a "country" object containing "code" and "name"
+const COUNTRY_DETECTION_URL =
+    (typeof process !== "undefined" && process.env?.COUNTRY_DETECTION_URL) ||
+    "https://detect-country.example.com"
+
 const _getUserCountryInformation = async (): Promise<
     UserCountryInformation | undefined
 > =>
-    await fetchWithRetry("https://detect-country.owid.io")
+    await fetchWithRetry(COUNTRY_DETECTION_URL)
         .then((res) => res.json())
         .then((res) => res.country)
         .catch(() => undefined)
@@ -1251,7 +1257,7 @@ export const formatDate = (date: Date): string => {
  * write a custom JSON parser to handle that automatically for all keys. At this
  * stage, the manual approach is probably simpler.
  */
-export const getOwidGdocFromJSON = (json: OwidGdocJSON): OwidGdoc => {
+export const getGdocFromJSON = (json: GdocJSON): Gdoc => {
     return {
         ...json,
         createdAt: new Date(json.createdAt),
@@ -1263,7 +1269,7 @@ export const getOwidGdocFromJSON = (json: OwidGdocJSON): OwidGdoc => {
 // We want to infer the return type from the existing types instead of having to
 // manually specify it.
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/explicit-module-boundary-types
-export function extractGdocPageData(gdoc: OwidGdoc) {
+export function extractGdocPageData(gdoc: Gdoc) {
     // Generic properties every gdoc has
     const gdocProps = R.pick(gdoc, [
         "id",
@@ -1327,10 +1333,10 @@ export function extractGdocPageData(gdoc: OwidGdoc) {
         .otherwise(() => commonProps)
 }
 
-export type OwidGdocPageProps = ReturnType<typeof extractGdocPageData>
+export type GdocPageProps = ReturnType<typeof extractGdocPageData>
 
-export type OwidGdocPageData = Omit<
-    OwidGdocPageProps,
+export type GdocPageData = Omit<
+    GdocPageProps,
     "createdAt" | "publishedAt" | "updatedAt"
 > & {
     createdAt: string
@@ -1338,11 +1344,11 @@ export type OwidGdocPageData = Omit<
     updatedAt: string | null
 }
 
-export function deserializeOwidGdocPageData(
-    json: OwidGdocPageData
-): OwidGdocPageProps {
+export function deserializeGdocPageData(
+    json: GdocPageData
+): GdocPageProps {
     // NOTE: We have to do manual type casting around the content.type property
-    // because it can be undefined in OwidGdocPostContent. That makes sense
+    // because it can be undefined in GdocPostContent. That makes sense
     // during the gdoc creation, where we do manual validation for various
     // properties. But at some point we should only pass around a valid gdoc
     // where content.type can't be undefined anymore. So we should likely create
@@ -1353,7 +1359,7 @@ export function deserializeOwidGdocPageData(
         createdAt: new Date(json.createdAt),
         publishedAt: json.publishedAt ? new Date(json.publishedAt) : null,
         updatedAt: json.updatedAt ? new Date(json.updatedAt) : null,
-    } as OwidGdocPageProps
+    } as GdocPageProps
 }
 
 // Checking whether we have clipboard write access is surprisingly complicated.
@@ -1516,7 +1522,7 @@ export function bind<This, Args extends any[], Return>(
 // It's more than just the EnrichedBlocks and Spans, because some EnrichedBlocks have nested children
 // that contain URLs/filenames
 export type NodeWithUrl =
-    | OwidEnrichedGdocBlock
+    | EnrichedGdocBlock
     | Span
     | EnrichedHybridLink
     | EnrichedTopicPageIntroRelatedTopic
@@ -1593,13 +1599,13 @@ export function traverseEnrichedSpan(
         .exhaustive()
 }
 
-// If your node is a OwidEnrichedGdocBlock, the callback will apply to it
+// If your node is a EnrichedGdocBlock, the callback will apply to it
 // If your node has children that are Spans, the spanCallback will apply to them
-// If your node has children that aren't OwidEnrichedGdocBlocks or Spans
+// If your node has children that aren't EnrichedGdocBlocks or Spans
 // you'll have to handle those children yourself in your callback
 export function traverseEnrichedBlock(
-    node: OwidEnrichedGdocBlock,
-    callback: (x: OwidEnrichedGdocBlock) => void,
+    node: EnrichedGdocBlock,
+    callback: (x: EnrichedGdocBlock) => void,
     spanCallback?: (x: Span) => void
 ): void {
     match(node)
@@ -1860,7 +1866,7 @@ export function spansToUnformattedPlainText(spans: Span[]): string {
 }
 
 export function generateToc(
-    body: OwidEnrichedGdocBlock[] | undefined,
+    body: EnrichedGdocBlock[] | undefined,
     isTocForLinearTopicPage: boolean = false
 ): TocHeadingWithTitleSupertitle[] {
     if (!body) return []
@@ -1930,10 +1936,10 @@ export function generateToc(
     return toc
 }
 
-export function checkIsOwidGdocType(
+export function checkIsGdocType(
     gdocType: unknown
-): gdocType is OwidGdocType {
-    return Object.values(OwidGdocType).includes(gdocType as any)
+): gdocType is GdocType {
+    return Object.values(GdocType).includes(gdocType as any)
 }
 
 export function isArrayOfNumbers(arr: unknown[]): arr is number[] {
@@ -1977,16 +1983,16 @@ export function extractDetailsFromSyntax(str: string): string[] {
 
 /**
  * If you're using this type guard, make sure you're okay with Fragments
- * See https://github.com/owid/owid-grapher/issues/3426
+ * See # legacy issue 3426
  */
-export function checkIsGdocPost(x: unknown): x is OwidGdocPostInterface {
-    const type = _.get(x, "content.type") as OwidGdocType | undefined
+export function checkIsGdocPost(x: unknown): x is GdocPostInterface {
+    const type = _.get(x, "content.type") as GdocType | undefined
     return [
-        OwidGdocType.Article,
-        OwidGdocType.TopicPage,
-        OwidGdocType.LinearTopicPage,
-        OwidGdocType.Fragment,
-        OwidGdocType.AboutPage,
+        GdocType.Article,
+        GdocType.TopicPage,
+        GdocType.LinearTopicPage,
+        GdocType.Fragment,
+        GdocType.AboutPage,
     ].includes(type as any)
 }
 
@@ -1994,40 +2000,40 @@ export function checkIsGdocPost(x: unknown): x is OwidGdocPostInterface {
  * Fragments were developed before we had a robust gdoc type system in place
  * Use this function when you want to be sure you're dealing with published editorial content
  * and not just content that has the right shape
- * See https://github.com/owid/owid-grapher/issues/3426
+ * See # legacy issue 3426
  */
 export function checkIsGdocPostExcludingFragments(
     x: unknown
-): x is OwidGdocPostInterface {
-    const type = _.get(x, "content.type") as OwidGdocType | undefined
+): x is GdocPostInterface {
+    const type = _.get(x, "content.type") as GdocType | undefined
     return [
-        OwidGdocType.Article,
-        OwidGdocType.TopicPage,
-        OwidGdocType.LinearTopicPage,
-        OwidGdocType.AboutPage,
+        GdocType.Article,
+        GdocType.TopicPage,
+        GdocType.LinearTopicPage,
+        GdocType.AboutPage,
     ].includes(type as any)
 }
 
 export function checkIsDataInsight(
-    gdoc: OwidGdoc
-): gdoc is OwidGdocDataInsightInterface {
-    return gdoc.content.type === OwidGdocType.DataInsight
+    gdoc: Gdoc
+): gdoc is GdocDataInsightInterface {
+    return gdoc.content.type === GdocType.DataInsight
 }
 
 export function checkIsAboutPage(
-    gdoc: OwidGdoc
-): gdoc is OwidGdocAboutInterface {
-    return gdoc.content.type === OwidGdocType.AboutPage
+    gdoc: Gdoc
+): gdoc is GdocAboutInterface {
+    return gdoc.content.type === GdocType.AboutPage
 }
 
-export function checkIsAuthor(gdoc: OwidGdoc): gdoc is OwidGdocAuthorInterface {
-    return gdoc.content.type === OwidGdocType.Author
+export function checkIsAuthor(gdoc: Gdoc): gdoc is GdocAuthorInterface {
+    return gdoc.content.type === GdocType.Author
 }
 
 export function checkIsHomepage(
-    gdoc: OwidGdoc
-): gdoc is OwidGdocHomepageInterface {
-    return gdoc.content.type === OwidGdocType.Homepage
+    gdoc: Gdoc
+): gdoc is GdocHomepageInterface {
+    return gdoc.content.type === GdocType.Homepage
 }
 
 /**