A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
Make `FieldTypes` a `Map` to preserve column order (#9279)
Trevor Manzd0757063310c
diff --git a/frontend/src/components/data-table/__tests__/chart-spec-model.test.ts b/frontend/src/components/data-table/__tests__/chart-spec-model.test.tsindex 2d3271d79d..6f795b175a 100644--- a/frontend/src/components/data-table/__tests__/chart-spec-model.test.ts+++ b/frontend/src/components/data-table/__tests__/chart-spec-model.test.ts@@ -22,14 +22,14 @@ vi.mock("@/core/runtime/config", () => ({describe("ColumnChartSpecModel", () => {const mockData = "http://example.com/data.json";- const mockFieldTypes: FieldTypes = {- date: "date",- number: "number",- integer: "integer",- boolean: "boolean",- string: "string",- datetime: "datetime",- };+ const mockFieldTypes: FieldTypes = new Map([+ ["date", "date"],+ ["number", "number"],+ ["integer", "integer"],+ ["boolean", "boolean"],+ ["string", "string"],+ ["datetime", "datetime"],+ ]);const mockStats: Record<ColumnName, Partial<ColumnHeaderStats>> = {date: { min: "2023-01-01", max: "2023-12-31" },number: { min: 0, max: 100 },@@ -120,9 +120,9 @@ describe("ColumnChartSpecModel", () => {});it("should handle special characters in column names", () => {- const specialFieldTypes: FieldTypes = {- "column.with[special:chars]": "time",- };+ const specialFieldTypes: FieldTypes = new Map([+ ["column.with[special:chars]", "time"],+ ]);const specialStats: Record<ColumnName, Partial<ColumnHeaderStats>> = {"column.with[special:chars]": { min: "2023-01-01", max: "2023-12-31" },};@@ -267,10 +267,10 @@ describe("ColumnChartSpecModel", () => {});describe("snapshot with legacy data spec", () => {- const fieldTypes: FieldTypes = {+ const fieldTypes: FieldTypes = new Map([...mockFieldTypes,- a: "number",- };+ ["a", "number"],+ ]);it("url data", () => {const model = new ColumnChartSpecModel(diff --git a/frontend/src/components/data-table/__tests__/types.test.ts b/frontend/src/components/data-table/__tests__/types.test.tsindex 48b6fb306f..2e7d7d9213 100644--- a/frontend/src/components/data-table/__tests__/types.test.ts+++ b/frontend/src/components/data-table/__tests__/types.test.ts@@ -1,6 +1,39 @@/* Copyright 2026 Marimo. All rights reserved. */import { describe, expect, it } from "vitest";-import { extractTimezone } from "../types";+import {+ extractTimezone,+ type FieldTypesWithExternalType,+ toFieldTypes,+} from "../types";++describe("toFieldTypes", () => {+ // Regression: https://github.com/marimo-team/marimo/issues/9269.+ // When `FieldTypes` was a plain `Record<string, DataType>`, column+ // names that look like non-negative integers (e.g. "2000", "2010")+ // were hoisted to the front in numeric order by ECMAScript's+ // `OrdinaryOwnPropertyKeys` algorithm. `Map` preserves insertion+ // order for all keys.+ it("preserves insertion order for digit-string column names", () => {+ const input: FieldTypesWithExternalType = [+ ["here", ["string", ""]],+ ["is", ["string", ""]],+ ["a", ["string", ""]],+ ["2010", ["number", ""]],+ ["column", ["string", ""]],+ ["2000", ["number", ""]],+ ["set", ["string", ""]],+ ];+ expect([...toFieldTypes(input).keys()]).toEqual([+ "here",+ "is",+ "a",+ "2010",+ "column",+ "2000",+ "set",+ ]);+ });+});describe("extractTimezone", () => {it("should return undefined when dtype is undefined", () => {diff --git a/frontend/src/components/data-table/column-summary/chart-spec-model.tsx b/frontend/src/components/data-table/column-summary/chart-spec-model.tsxindex f9f8ad0847..aad1d7cfc7 100644--- a/frontend/src/components/data-table/column-summary/chart-spec-model.tsx+++ b/frontend/src/components/data-table/column-summary/chart-spec-model.tsx@@ -41,7 +41,7 @@ export class ColumnChartSpecModel<T> {public static readonly EMPTY = new ColumnChartSpecModel([],- {},+ new Map(),{},{},{},@@ -97,7 +97,7 @@ export class ColumnChartSpecModel<T> {public getHeaderSummary(column: string) {return {stats: this.columnStats.get(column),- type: this.fieldTypes[column],+ type: this.fieldTypes.get(column),spec: this.opts.includeCharts ? this.getVegaSpec(column) : undefined,};}@@ -141,7 +141,10 @@ export class ColumnChartSpecModel<T> {}const base = this.createBase(data);- const type = this.fieldTypes[column];+ const type = this.fieldTypes.get(column);+ if (type === undefined) {+ return null;+ }// https://github.com/vega/altair/blob/32990a597af7c09586904f40b3f5e6787f752fa5/doc/user_guide/encodings/index.rst#escaping-special-characters-in-column-names// escape periods in column namesdiff --git a/frontend/src/components/data-table/column-summary/column-summary.tsx b/frontend/src/components/data-table/column-summary/column-summary.tsxindex 35b158ca24..bdb8f03689 100644--- a/frontend/src/components/data-table/column-summary/column-summary.tsx+++ b/frontend/src/components/data-table/column-summary/column-summary.tsx@@ -75,7 +75,7 @@ export const TableColumnSummary = <TData, TValue>({};const renderStats = () => {- if (!stats) {+ if (!stats || type === undefined) {return null;}diff --git a/frontend/src/components/data-table/types.ts b/frontend/src/components/data-table/types.tsindex 15b5e3e784..6e55f97482 100644--- a/frontend/src/components/data-table/types.ts+++ b/frontend/src/components/data-table/types.ts@@ -2,7 +2,6 @@import type { RowData } from "@tanstack/react-table";import type { DataType } from "@/core/kernel/messages";-import { Objects } from "@/utils/objects";declare module "@tanstack/react-table" {interface TableMeta<TData extends RowData> {@@ -56,16 +55,19 @@ export type FieldTypesWithExternalType = [columnName: string,[dataType: DataType, externalType: string],][];-export type FieldTypes = Record<string, DataType>;+// Ordered map of column name -> data type.+//+// `Map` (not `Record`) because JS objects reorder integer-string keys+// to the front in numeric order per `OrdinaryOwnPropertyKeys`; a+// DataFrame with a `"2010"` column alongside `"here"` would otherwise+// lose its column order on iteration (#9269). `Map` preserves insertion+// order for all keys.+export type FieldTypes = Map<string, DataType>;export function toFieldTypes(fieldTypes: FieldTypesWithExternalType,): FieldTypes {- return Objects.collect(- fieldTypes,- ([columnName]) => columnName,- ([, [type]]) => type,- );+ return new Map(fieldTypes.map(([columnName, [type]]) => [columnName, type]));}interface BinValue {diff --git a/frontend/src/plugins/impl/DataEditorPlugin.tsx b/frontend/src/plugins/impl/DataEditorPlugin.tsxindex ce988de16d..6eb8aef0df 100644--- a/frontend/src/plugins/impl/DataEditorPlugin.tsx+++ b/frontend/src/plugins/impl/DataEditorPlugin.tsx@@ -83,19 +83,23 @@ interface Props extends Omit<const LoadingDataEditor = (props: Props) => {const [data, setData] = useState<unknown[]>([]);- const [columnFields, setColumnFields] = useState<FieldTypes>({});+ const [columnFields, setColumnFields] = useState<FieldTypes>(new Map());// Load the dataconst { error } = useAsyncData(async () => {const withoutExternalTypes = toFieldTypes(props.fieldTypes ?? []);// If we already have the data, return it- // Otherwise, load the data from the URL+ // Otherwise, load the data from the URL. Vega's CSV parser takes a+ // plain `Record`; column order doesn't matter for parsing.const localData = Array.isArray(props.data)? props.data: await vegaLoadData(props.data,- { type: "csv", parse: getVegaFieldTypes(withoutExternalTypes) },+ {+ type: "csv",+ parse: getVegaFieldTypes(Object.fromEntries(withoutExternalTypes)),+ },{ handleBigIntAndNumberLike: true },);diff --git a/frontend/src/plugins/impl/data-editor/__tests__/data-utils.test.ts b/frontend/src/plugins/impl/data-editor/__tests__/data-utils.test.tsindex adcd43afb1..3db9bba147 100644--- a/frontend/src/plugins/impl/data-editor/__tests__/data-utils.test.ts+++ b/frontend/src/plugins/impl/data-editor/__tests__/data-utils.test.ts@@ -2,6 +2,7 @@import { describe, expect, it } from "vitest";import type { FieldTypes } from "@/components/data-table/types";+import type { DataType } from "@/core/kernel/messages";import {insertColumn,modifyColumnFields,@@ -9,6 +10,11 @@ import {renameColumn,} from "../data-utils";+// Fixtures are written as object literals for readability; `FieldTypes`+// is a `Map` (#9269).+const asFieldTypes = (obj: Record<string, DataType>): FieldTypes =>+ new Map(Object.entries(obj));+describe("removeColumn", () => {const testData = [{ int: 1, string: "a", bool: "True", datetime: "2025-07-12 00:07:13" },@@ -481,12 +487,12 @@ describe("renameColumn", () => {});describe("modifyColumnFields", () => {- const testFieldTypes: FieldTypes = {+ const testFieldTypes: FieldTypes = asFieldTypes({int: "integer",string: "string",bool: "boolean",datetime: "datetime",- };+ });it("should insert a new column at index 0", () => {const result = modifyColumnFields({@@ -496,16 +502,15 @@ describe("modifyColumnFields", () => {newColumnName: "newColumn",});- const expected = {- newColumn: "string",- int: "integer",- string: "string",- bool: "boolean",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "newColumn" => "string",+ "int" => "integer",+ "string" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});it("should insert a new column at index 1", () => {@@ -516,16 +521,15 @@ describe("modifyColumnFields", () => {newColumnName: "newColumn",});- const expected = {- int: "integer",- newColumn: "string",- string: "string",- bool: "boolean",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "newColumn" => "string",+ "string" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});it("should insert a new column at index 2", () => {@@ -536,16 +540,15 @@ describe("modifyColumnFields", () => {newColumnName: "newColumn",});- const expected = {- int: "integer",- string: "string",- newColumn: "string",- bool: "boolean",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "string" => "string",+ "newColumn" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});it("should insert a new column at the end", () => {@@ -557,16 +560,15 @@ describe("modifyColumnFields", () => {dataType: "datetime",});- const expected = {- int: "integer",- string: "string",- bool: "boolean",- datetime: "datetime",- newColumn: "datetime", // Set to the same type as the data type- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "string" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ "newColumn" => "datetime",+ }+ `);});it("should insert a new column beyond the array length", () => {@@ -577,16 +579,15 @@ describe("modifyColumnFields", () => {newColumnName: "newColumn",});- const expected = {- int: "integer",- string: "string",- bool: "boolean",- datetime: "datetime",- newColumn: "string",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "string" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ "newColumn" => "string",+ }+ `);});it("should remove column at index 0", () => {@@ -596,14 +597,13 @@ describe("modifyColumnFields", () => {type: "remove",});- const expected = {- string: "string",- bool: "boolean",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "string" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});it("should remove column at index 1", () => {@@ -613,14 +613,13 @@ describe("modifyColumnFields", () => {type: "remove",});- const expected = {- int: "integer",- bool: "boolean",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});it("should remove column at index 2", () => {@@ -630,14 +629,13 @@ describe("modifyColumnFields", () => {type: "remove",});- const expected = {- int: "integer",- string: "string",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "string" => "string",+ "datetime" => "datetime",+ }+ `);});it("should remove column at index 3", () => {@@ -647,14 +645,13 @@ describe("modifyColumnFields", () => {type: "remove",});- const expected = {- int: "integer",- string: "string",- bool: "boolean",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "string" => "string",+ "bool" => "boolean",+ }+ `);});it("should handle removing non-existent column index", () => {@@ -685,15 +682,14 @@ describe("modifyColumnFields", () => {newColumnName: "number",});- const expected = {- number: "string", // Defaults to string type for renamed columns- string: "string",- bool: "boolean",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "number" => "string",+ "string" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});it("should rename column at index 1", () => {@@ -704,15 +700,14 @@ describe("modifyColumnFields", () => {newColumnName: "text",});- const expected = {- int: "integer",- text: "string", // Defaults to string type for renamed columns- bool: "boolean",- datetime: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "text" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});it("should rename column at index 3", () => {@@ -724,15 +719,14 @@ describe("modifyColumnFields", () => {newColumnName: "timestamp",});- const expected = {- int: "integer",- string: "string",- bool: "boolean",- timestamp: "datetime",- };-- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "int" => "integer",+ "string" => "string",+ "bool" => "boolean",+ "timestamp" => "datetime",+ }+ `);});it("should handle renaming non-existent column index", () => {@@ -758,7 +752,7 @@ describe("modifyColumnFields", () => {});it("should preserve original field types structure", () => {- const originalFieldTypes = { ...testFieldTypes };+ const originalFieldTypes = new Map(testFieldTypes);modifyColumnFields({columnFields: testFieldTypes,columnIdx: 1,@@ -769,7 +763,7 @@ describe("modifyColumnFields", () => {});it("should handle empty field types object", () => {- const emptyFieldTypes: FieldTypes = {};+ const emptyFieldTypes: FieldTypes = new Map();// Insertconst insertResult = modifyColumnFields({@@ -778,7 +772,11 @@ describe("modifyColumnFields", () => {type: "insert",newColumnName: "newColumn",});- expect(insertResult).toEqual({ newColumn: "string" });+ expect(insertResult).toMatchInlineSnapshot(`+ Map {+ "newColumn" => "string",+ }+ `);// Removeconst removeResult = modifyColumnFields({@@ -786,16 +784,16 @@ describe("modifyColumnFields", () => {columnIdx: 0,type: "remove",});- expect(removeResult).toEqual({});+ expect(removeResult).toMatchInlineSnapshot(`Map {}`);});it("should handle field types with special characters in column names", () => {- const specialFieldTypes: FieldTypes = {+ const specialFieldTypes: FieldTypes = asFieldTypes({"column-with-dash": "integer",column_with_underscore: "string","column.with.dot": "boolean","column with space": "datetime",- };+ });// Insertconst insertResult = modifyColumnFields({@@ -804,15 +802,15 @@ describe("modifyColumnFields", () => {type: "insert",newColumnName: "new-column",});- const insertExpected = {- "column-with-dash": "integer",- "new-column": "string",- column_with_underscore: "string",- "column.with.dot": "boolean",- "column with space": "datetime",- };- expect(Object.keys(insertResult)).toEqual(Object.keys(insertExpected));- expect(insertResult).toEqual(insertExpected);+ expect(insertResult).toMatchInlineSnapshot(`+ Map {+ "column-with-dash" => "integer",+ "new-column" => "string",+ "column_with_underscore" => "string",+ "column.with.dot" => "boolean",+ "column with space" => "datetime",+ }+ `);// Removeconst removeResult = modifyColumnFields({@@ -820,13 +818,13 @@ describe("modifyColumnFields", () => {columnIdx: 1,type: "remove",});- const removeExpected = {- "column-with-dash": "integer",- "column.with.dot": "boolean",- "column with space": "datetime",- };- expect(Object.keys(removeResult)).toEqual(Object.keys(removeExpected));- expect(removeResult).toEqual(removeExpected);+ expect(removeResult).toMatchInlineSnapshot(`+ Map {+ "column-with-dash" => "integer",+ "column.with.dot" => "boolean",+ "column with space" => "datetime",+ }+ `);// Renameconst renameResult = modifyColumnFields({@@ -835,14 +833,14 @@ describe("modifyColumnFields", () => {type: "rename",newColumnName: "renamed-column",});- const renameExpected = {- "column-with-dash": "integer",- "renamed-column": "string",- "column.with.dot": "boolean",- "column with space": "datetime",- };- expect(Object.keys(renameResult)).toEqual(Object.keys(renameExpected));- expect(renameResult).toEqual(renameExpected);+ expect(renameResult).toMatchInlineSnapshot(`+ Map {+ "column-with-dash" => "integer",+ "renamed-column" => "string",+ "column.with.dot" => "boolean",+ "column with space" => "datetime",+ }+ `);});it("should handle multiple operations in sequence", () => {@@ -864,13 +862,13 @@ describe("modifyColumnFields", () => {newColumnName: "renamed",});- const expected = {- renamed: "string",- newColumn: "string",- bool: "boolean",- datetime: "datetime",- };- expect(Object.keys(result)).toEqual(Object.keys(expected));- expect(result).toEqual(expected);+ expect(result).toMatchInlineSnapshot(`+ Map {+ "renamed" => "string",+ "newColumn" => "string",+ "bool" => "boolean",+ "datetime" => "datetime",+ }+ `);});});diff --git a/frontend/src/plugins/impl/data-editor/data-utils.ts b/frontend/src/plugins/impl/data-editor/data-utils.tsindex 6b4473a4c4..8a8b3201a9 100644--- a/frontend/src/plugins/impl/data-editor/data-utils.ts+++ b/frontend/src/plugins/impl/data-editor/data-utils.ts@@ -79,24 +79,25 @@ export function modifyColumnFields(opts: {return columnFields;}- const entries = Object.entries(columnFields);- const newEntries = [+ const entries = [...columnFields.entries()];+ const newEntries: Array<[string, DataType]> = [...entries.slice(0, columnIdx),[newColumnName, dataType || "string"],...entries.slice(columnIdx),];- return Object.fromEntries(newEntries);+ return new Map(newEntries);}case "remove": {- if (columnIdx < 0 || columnIdx >= Object.keys(columnFields).length) {+ if (columnIdx < 0 || columnIdx >= columnFields.size) {return columnFields;}- const entries = Object.entries(columnFields);+ const entries = [...columnFields.entries()];const columnName = entries[columnIdx]?.[0];if (columnName) {- const { [columnName]: _, ...rest } = columnFields;- return rest;+ const next = new Map(columnFields);+ next.delete(columnName);+ return next;}return columnFields;}@@ -106,18 +107,18 @@ export function modifyColumnFields(opts: {return columnFields;}- if (columnIdx < 0 || columnIdx >= Object.keys(columnFields).length) {+ if (columnIdx < 0 || columnIdx >= columnFields.size) {return columnFields;}// Rename at the right index- const entries = Object.entries(columnFields);- const newEntries = [+ const entries = [...columnFields.entries()];+ const newEntries: Array<[string, DataType]> = [...entries.slice(0, columnIdx),[newColumnName, dataType || "string"],...entries.slice(columnIdx + 1),];- return Object.fromEntries(newEntries);+ return new Map(newEntries);}}}diff --git a/frontend/src/plugins/impl/data-editor/glide-data-editor.tsx b/frontend/src/plugins/impl/data-editor/glide-data-editor.tsxindex 2e9c28af3e..46060e4664 100644--- a/frontend/src/plugins/impl/data-editor/glide-data-editor.tsx+++ b/frontend/src/plugins/impl/data-editor/glide-data-editor.tsx@@ -102,7 +102,7 @@ export const GlideDataEditor = <T,>({const columns: ModifiedGridColumn[] = useMemo(() => {const columns: ModifiedGridColumn[] = [];- for (const [columnName, fieldType] of Object.entries(columnFields)) {+ for (const [columnName, fieldType] of columnFields) {const editable =editableColumns === "all" || editableColumns.includes(columnName);@@ -311,7 +311,7 @@ export const GlideDataEditor = <T,>({const [col, _row] = cell;const key = columns[col].title;- const columnType = columnFields[key];+ const columnType = columnFields.get(key);// Verify the new value is of the correct typeswitch (columnType) {case "number":@@ -445,7 +445,7 @@ export const GlideDataEditor = <T,>({const oldColumnName = columns[menu.col].title;// Validate the new column name- if (columnFields[newName]) {+ if (columnFields.has(newName)) {toastColumnExists(newName);return;}@@ -498,7 +498,7 @@ export const GlideDataEditor = <T,>({const clampedColumnIdx = Math.max(0, Math.min(columnIdx, columns.length));// Validate the new column name- if (columnFields[columnName]) {+ if (columnFields.has(columnName)) {toastColumnExists(columnName);return;}