Merge pull request #2774 from owid/prettier-3

owid · Oct 16, 2023 · b8025f3 · b8025f3
2 parents aa99a02 + 980eb9a
commit b8025f3
Show file tree

Hide file tree

Showing 47 changed files with 160 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -85,11 +85,8 @@ The following is an excerpt explaining the origin of this repo and what the alte
 > Using our own system has very important advantages:
 >
 > -   **Integration with our global development database**: Our database of global development metrics is integrated into our visualization tool so that when we add and update empirical data the visualizations are all updated. (In contrast to this, a pre-existing tool would make the exploration of a database impossible and would require the preparation of each dataset separately for each visualisation.)
->
 > -   **Flexibility**: We can use automation to change our entire system all at once. For example, if we decide we want to use a different source referencing style, we could easily update this across hundreds of charts. This makes it possible to scale our publication and to sustainably improve our work without starting from scratch at each round.
->
 > -   **Risk mitigation**: We hope(!) that Our World in Data is a long-term project and we want the visualizations we produce to continue to be useful and available years from now. An external web service may be shut down or change for reasons we cannot control. We have had this experience in the past and learned our lesson from it.
->
 > -   **Keeping everything up-to-date**: Because we want to be a useful resource for some time we make sure that we have a technology in place that allows us to keep all of our work up-to-date without starting from scratch each time. We have our global development database directly integrated in the Grapher and as soon as new data becomes available (for example from a UN agency) we can run a script that pulls in that data and updates all the visualizations that present that data.
 
 ---

diff --git a/adminSiteClient/Forms.tsx b/adminSiteClient/Forms.tsx
@@ -740,7 +740,7 @@ export class BindString extends React.Component<{
 @observer
 export class BindAutoString<
     T extends { [field: string]: any },
-    K extends Extract<keyof T, string>
+    K extends Extract<keyof T, string>,
 > extends React.Component<{
     field: K
     store: T
@@ -843,7 +843,7 @@ class FloatField extends React.Component<FloatFieldProps> {
 @observer
 export class BindFloat<
     T extends { [field: string]: any },
-    K extends Extract<keyof T, string>
+    K extends Extract<keyof T, string>,
 > extends React.Component<{
     field: K
     store: T
@@ -874,7 +874,7 @@ export class BindFloat<
 @observer
 export class BindAutoFloat<
     T extends { [field: string]: any },
-    K extends Extract<keyof T, string>
+    K extends Extract<keyof T, string>,
 > extends React.Component<{
     field: K
     store: T

diff --git a/adminSiteClient/admin.scss b/adminSiteClient/admin.scss
@@ -837,7 +837,9 @@ main:not(.ChartEditorPage):not(.GdocsEditPage) {
 
 // to override the default annoying blue border from bootstrap on file upload
 .custom-file-input:focus ~ .custom-file-control {
-    box-shadow: 0 0 0 0.075rem #fff, 0 0 0 0.2rem #fff;
+    box-shadow:
+        0 0 0 0.075rem #fff,
+        0 0 0 0.2rem #fff;
 }
 
 .TagsIndexPage {
@@ -1174,7 +1176,9 @@ main:not(.ChartEditorPage):not(.GdocsEditPage) {
         padding: 1.2em;
         border-radius: 0.4em;
         margin: 0.4em 0;
-        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+        box-shadow:
+            0 1px 3px rgba(0, 0, 0, 0.12),
+            0 1px 2px rgba(0, 0, 0, 0.24);
     }
     .import-form {
         input {
@@ -1210,7 +1214,9 @@ main:not(.ChartEditorPage):not(.GdocsEditPage) {
         border-radius: 0.4rem;
         opacity: 0.87;
         color: #fff;
-        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+        box-shadow:
+            0 1px 3px rgba(0, 0, 0, 0.12),
+            0 1px 2px rgba(0, 0, 0, 0.24);
     }
 
     .message.bg-warning {
@@ -1224,7 +1230,9 @@ main:not(.ChartEditorPage):not(.GdocsEditPage) {
         padding: 1.2em;
         border-radius: 0.4em;
         margin: 0.4em 0;
-        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+        box-shadow:
+            0 1px 3px rgba(0, 0, 0, 0.12),
+            0 1px 2px rgba(0, 0, 0, 0.24);
     }
 }
 
@@ -1272,7 +1280,8 @@ main:not(.ChartEditorPage):not(.GdocsEditPage) {
         position: sticky;
         top: 0;
         z-index: 2;
-        box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 3px,
+        box-shadow:
+            rgba(0, 0, 0, 0.12) 0px 1px 3px,
             rgba(0, 0, 0, 0.24) 0px 1px 2px;
         background: #fff;
         &.draft {

diff --git a/adminSiteClient/styles/react-tag-autocomplete.scss b/adminSiteClient/styles/react-tag-autocomplete.scss
@@ -134,7 +134,8 @@
     background: #ffffff;
     border: 1px solid #afb8c1;
     border-radius: 6px;
-    box-shadow: rgba(0, 0, 0, 0.1) 0 10px 15px -4px,
+    box-shadow:
+        rgba(0, 0, 0, 0.1) 0 10px 15px -4px,
         rgba(0, 0, 0, 0.05) 0 4px 6px -2px;
 }
 

diff --git a/adminSiteServer/IndexPage.tsx b/adminSiteServer/IndexPage.tsx
@@ -17,8 +17,8 @@ export const IndexPage = (props: {
         window.admin = new Admin({ username: "${
             props.username
         }", isSuperuser: ${props.isSuperuser.toString()}, settings: ${JSON.stringify(
-        { ENV, GITHUB_USERNAME, DATA_API_FOR_ADMIN_UI }
-    )}})
+            { ENV, GITHUB_USERNAME, DATA_API_FOR_ADMIN_UI }
+        )}})
         admin.start(document.querySelector("#app"), '${props.gitCmsBranchName}')
 `
 

diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -1728,9 +1728,8 @@ apiRouter.get(
 
         await Chart.assignTagsForCharts(charts)
 
-        const grapherConfig = await getMergedGrapherConfigForVariable(
-            variableId
-        )
+        const grapherConfig =
+            await getMergedGrapherConfigForVariable(variableId)
         if (
             grapherConfig &&
             (!grapherConfig.dimensions || grapherConfig.dimensions.length === 0)

diff --git a/baker/GrapherBaker.tsx b/baker/GrapherBaker.tsx
@@ -223,9 +223,8 @@ export async function renderDataPageV2({
     pageGrapher?: GrapherInterface
     publishedExplorersBySlug?: Record<string, ExplorerProgram>
 }) {
-    const grapherConfigForVariable = await getMergedGrapherConfigForVariable(
-        variableId
-    )
+    const grapherConfigForVariable =
+        await getMergedGrapherConfigForVariable(variableId)
     const grapher = mergePartialGrapherConfigs(
         grapherConfigForVariable,
         pageGrapher

diff --git a/baker/formatWordpressPost.tsx b/baker/formatWordpressPost.tsx
@@ -173,9 +173,8 @@ export const formatWordpressPost = async (
         }
     })
 
-    const dataValuesConfigurationsMap = await extractDataValuesConfiguration(
-        html
-    )
+    const dataValuesConfigurationsMap =
+        await extractDataValuesConfiguration(html)
     const dataValues = new Map<string, DataValueProps>()
     for (const [
         dataValueConfigurationString,

diff --git a/baker/formatting.tsx b/baker/formatting.tsx
@@ -86,7 +86,7 @@ export const parseKeyValueArgs = (text: string): KeyValueProps => {
             const [, name, value] = option.match(optionRegex) as [
                 any,
                 string,
-                string
+                string,
             ]
             let parsedValue
             if (value === "" || value === "true") parsedValue = true

diff --git a/db/model/Gdoc/rawToEnriched.ts b/db/model/Gdoc/rawToEnriched.ts
@@ -1295,11 +1295,12 @@ export function parseFaqs(
             id: faq.id,
             content: enrichedText,
             parseErrors: compact([
-                ...enrichedText.flatMap((block) =>
-                    block?.parseErrors.map((parseError) => ({
-                        ...parseError,
-                        message: `Block parse error in faq with id "${faq.id}": ${parseError.message}`,
-                    }))
+                ...enrichedText.flatMap(
+                    (block) =>
+                        block?.parseErrors.map((parseError) => ({
+                            ...parseError,
+                            message: `Block parse error in faq with id "${faq.id}": ${parseError.message}`,
+                        }))
                 ),
             ]),
         }

diff --git a/devTools/regionsUpdater/update.ts b/devTools/regionsUpdater/update.ts
@@ -47,7 +47,7 @@ interface Entity {
     members?: string[]
 }
 
-function prettifiedJson(obj: any) {
+function prettifiedJson(obj: any): Promise<string> {
     // make sure the json we emit is diff-able even after running prettier on the repo
     return prettier.format(JSON.stringify(obj), {
         parser: "json",
@@ -70,7 +70,7 @@ function csvToJson(val: string, col: string) {
     }
 }
 
-function prettifiedTopology(geoJson: FeatureCollection) {
+function prettifiedTopology(geoJson: FeatureCollection): Promise<string> {
     // make sure the MapTopology.ts file will be diff-able even after running prettier on the repo
     let topoData = topology({ world: geoJson }),
         arcs = _.remove(topoData.arcs),
@@ -95,9 +95,11 @@ function prettifiedTopology(geoJson: FeatureCollection) {
             tabWidth: 4,
             semi: false,
         })
-        .replace(
-            /^(    arcs:\s*\[)\]/m,
-            `\n    // prettier-ignore\n$1\n      ${arcJson}\n    ]`
+        .then((formatted) =>
+            formatted.replace(
+                /^(    arcs:\s*\[)\]/m,
+                `\n    // prettier-ignore\n$1\n      ${arcJson}\n    ]`
+            )
         )
 }
 
@@ -258,13 +260,13 @@ async function main() {
     })
 
     // generate new MapTopology.ts file and compare to old version
-    let newTopology = prettifiedTopology(owidGeoJson)
+    let newTopology = await prettifiedTopology(owidGeoJson)
     if (await didChange(GRAPHER_TOPOLOGY_PATH, newTopology)) {
         await writeFile(GRAPHER_TOPOLOGY_PATH, newTopology)
     }
 
     // generate new regions.json file and compare to old version
-    let regionsJson = prettifiedJson(entities)
+    let regionsJson = await prettifiedJson(entities)
     if (await didChange(GRAPHER_REGIONS_PATH, regionsJson)) {
         await writeFile(GRAPHER_REGIONS_PATH, regionsJson)
         let diff = execFileSync("git", [

diff --git a/devTools/svgTester/diff-generator.ts b/devTools/svgTester/diff-generator.ts
@@ -78,11 +78,11 @@ async function main(parsedArgs: parseArgs.ParsedArgs) {
                         <div class="chart-id">${id}</div>
                         <div class="side-by-side">
                             <img src="${referenceDir}/${
-                            referenceCsv.get(id)!.svgFilename
-                        }"/>
+                                referenceCsv.get(id)!.svgFilename
+                            }"/>
                             <img src="${outDir}/${
-                            referenceCsv.get(id)!.svgFilename
-                        }"/>
+                                referenceCsv.get(id)!.svgFilename
+                            }"/>
                         </div>
                     </div>
                     `)

diff --git a/devTools/svgTester/diff-template.html b/devTools/svgTester/diff-template.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
     <head>
         <title>SVG Comparison page</title>

diff --git a/devTools/svgTester/utils.ts b/devTools/svgTester/utils.ts
@@ -352,9 +352,8 @@ export async function loadGrapherConfigAndData(
         return { data, metadata }
     })
 
-    const data: OwidVariableDataMetadataDimensions[] = await Promise.all(
-        loadDataPromises
-    )
+    const data: OwidVariableDataMetadataDimensions[] =
+        await Promise.all(loadDataPromises)
 
     const variableData = new Map(data.map((d) => [d.metadata.id, d]))
 

diff --git a/devTools/svgTester/verify-graphs.ts b/devTools/svgTester/verify-graphs.ts
@@ -29,9 +29,8 @@ async function main(parsedArgs: parseArgs.ParsedArgs) {
             rawGrapherIds,
             inDir
         )
-        const csvContentMap = await utils.getReferenceCsvContentMap(
-            referenceDir
-        )
+        const csvContentMap =
+            await utils.getReferenceCsvContentMap(referenceDir)
 
         const verifyJobs = directoriesToProcess.map((dir) => ({
             dir,

diff --git a/explorerAdminClient/ExplorerCommands.ts b/explorerAdminClient/ExplorerCommands.ts
@@ -76,7 +76,7 @@ export class SelectAllHitsCommand extends HotCommand {
                         number,
                         number,
                         number,
-                        number
+                        number,
                     ]
             )
         )

diff --git a/package.json b/package.json
@@ -170,7 +170,7 @@
         "p-map": "^4.0.0",
         "papaparse": "^5.3.1",
         "parsimmon": "^1.18.1",
-        "prettier": "^2.8.7",
+        "prettier": "^3.0.3",
         "progress": "^2.0.3",
         "prompts": "^2.4.0",
         "prop-types": "^15.7.2",
@@ -228,7 +228,6 @@
         "@types/jest": "^29.5.5",
         "@types/js-yaml": "^4.0.5",
         "@types/opener": "^1.4.0",
-        "@types/prettier": "^2.7.3",
         "@types/topojson-server": "^3.0.1",
         "@typescript-eslint/eslint-plugin": "^6.0.0",
         "@typescript-eslint/parser": "^6.0.0",
@@ -255,6 +254,7 @@
         "react-codemirror2@^7.2.1": "patch:react-codemirror2@npm%3A7.2.1#./.yarn/patches/react-codemirror2-npm-7.2.1-dcadbb9383.patch"
     },
     "prettier": {
+        "trailingComma": "es5",
         "semi": false
     },
     "browserslist": [

diff --git a/packages/@ourworldindata/core-table/src/CoreTable.ts b/packages/@ourworldindata/core-table/src/CoreTable.ts
@@ -81,7 +81,7 @@ interface AdvancedOptions {
 // narrow interface for the input rows. This is helpful for OwidTable.
 export class CoreTable<
     ROW_TYPE extends CoreRow = CoreRow,
-    COL_DEF_TYPE extends CoreColumnDef = CoreColumnDef
+    COL_DEF_TYPE extends CoreColumnDef = CoreColumnDef,
 > {
     private _columns: Map<ColumnSlug, CoreColumn> = new Map()
     protected parent?: this

diff --git a/packages/@ourworldindata/core-table/src/CoreTableColumns.ts b/packages/@ourworldindata/core-table/src/CoreTableColumns.ts
@@ -544,7 +544,7 @@ class BooleanColumn extends AbstractCoreColumn<boolean> {
 }
 
 abstract class AbstractColumnWithNumberFormatting<
-    T extends PrimitiveType
+    T extends PrimitiveType,
 > extends AbstractCoreColumn<T> {
     jsType = JsTypes.number
 

diff --git a/packages/@ourworldindata/core-table/src/CoreTableUtils.ts b/packages/@ourworldindata/core-table/src/CoreTableUtils.ts
@@ -338,7 +338,7 @@ export function toleranceInterpolation(
 export function interpolateRowValuesWithTolerance<
     ValueSlug extends ColumnSlug,
     TimeSlug extends ColumnSlug,
-    Row extends { [key in TimeSlug]?: Time } & { [key in ValueSlug]?: any }
+    Row extends { [key in TimeSlug]?: Time } & { [key in ValueSlug]?: any },
 >(
     rowsSortedByTimeAsc: Row[],
     valueSlug: ValueSlug,

diff --git a/packages/@ourworldindata/grapher/src/color/ColorUtils.ts b/packages/@ourworldindata/grapher/src/color/ColorUtils.ts
@@ -40,7 +40,7 @@ export function getLeastUsedColor(
     )
     const mostUnusedColor = minBy(colorCounts, ([, count]) => count) as [
         string,
-        number
+        number,
     ]
     return mostUnusedColor[0]
 }

diff --git a/packages/@ourworldindata/grapher/src/controls/CommandPalette.scss b/packages/@ourworldindata/grapher/src/controls/CommandPalette.scss
@@ -10,7 +10,8 @@ $linkColor: #0645ad;
     opacity: 0.95;
     padding: 14px;
     border-radius: 2px;
-    box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 2px 0px,
+    box-shadow:
+        rgba(0, 0, 0, 0.1) 0px 0px 2px 0px,
         rgba(0, 0, 0, 0.25) 0px 2px 2px 0px;
 
     .paletteTitle {

diff --git a/packages/@ourworldindata/grapher/src/controls/entityPicker/EntityPicker.scss b/packages/@ourworldindata/grapher/src/controls/entityPicker/EntityPicker.scss
@@ -1,6 +1,7 @@
 $chart-border-radius: 2px;
 // Match chart styles
-$chart-box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 2px 0px,
+$chart-box-shadow:
+    rgba(0, 0, 0, 0.1) 0px 0px 2px 0px,
     rgba(0, 0, 0, 0.25) 0px 2px 2px 0px;
 $zindex-dropdown: 100;
 

diff --git a/packages/@ourworldindata/grapher/src/controls/globalEntitySelector/GlobalEntitySelector.scss b/packages/@ourworldindata/grapher/src/controls/globalEntitySelector/GlobalEntitySelector.scss
@@ -13,7 +13,9 @@
     padding: 0.65em;
     border-radius: 8px;
     background-color: #fff;
-    box-shadow: 0 15px 40px rgba(0, 0, 0, 0.1), 0 8px 15px rgba(0, 0, 0, 0.08),
+    box-shadow:
+        0 15px 40px rgba(0, 0, 0, 0.1),
+        0 8px 15px rgba(0, 0, 0, 0.08),
         0 1px 3px 1px rgba(0, 0, 0, 0.08);
 
     display: flex;

diff --git a/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts b/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts
@@ -417,7 +417,7 @@ const fullJoinTables = (
     // not exist in the first table
     const firstTableDuplicateForIndices: [
         OwidTable | undefined,
-        string[] | undefined
+        string[] | undefined,
     ] = [tables[0], sharedColumnNames]
     const defsToAddPerTable = [firstTableDuplicateForIndices]
         .concat(zip(tables, columnsToAddPerTable))

diff --git a/packages/@ourworldindata/grapher/src/core/grapher.scss b/packages/@ourworldindata/grapher/src/core/grapher.scss
@@ -26,7 +26,8 @@ $blue-90: #1d3d63;
 $controls-color: #0073e6;
 $gray-10: #f7f7f7;
 $gray-10: #fafbfd;
-$light-shadow: rgba(0, 0, 0, 0.1) 0px 0px 0px 1px,
+$light-shadow:
+    rgba(0, 0, 0, 0.1) 0px 0px 0px 1px,
     rgba(0, 0, 0, 0.08) 0px 2px 2px;
 $oxford-blue: #002147;
 $text-color: #1d3d63;
-Original file line number
+Diff line change
@@ Expand Up @@
                 const [, name, value] = option.match(optionRegex) as [
                     any,
                     string,
-                    string
+                    string,
                 ]
                 let parsedValue
                 if (value === "" || value === "true") parsedValue = true
@@ Expand Down @@