@marimo-team/islands 0.23.2-dev62 → 0.23.2-dev65

package/dist/{glide-data-editor-CVtY_KYw.js → glide-data-editor-DXti2axL.js}

@@ -10596,7 +10596,9 @@ let __tla = (async () => {
     switch (i) {
       case "insert": {
         if (!o) return Logger.error("newName is required for insert"), t;
-        let e2 = Object.entries(t), i2 = [
+        let e2 = [
+          ...t.entries()
+        ], i2 = [
           ...e2.slice(0, r),
           [
             o,
@@ -10604,21 +10606,25 @@ let __tla = (async () => {
           ],
           ...e2.slice(r)
         ];
-        return Object.fromEntries(i2);
+        return new Map(i2);
       }
       case "remove": {
-        if (r < 0 || r >= Object.keys(t).length) return t;
-        let e2 = (_a = Object.entries(t)[r]) == null ? void 0 : _a[0];
+        if (r < 0 || r >= t.size) return t;
+        let e2 = (_a = [
+          ...t.entries()
+        ][r]) == null ? void 0 : _a[0];
         if (e2) {
-          let { [e2]: n, ...r2 } = t;
-          return r2;
+          let n = new Map(t);
+          return n.delete(e2), n;
         }
         return t;
       }
       case "rename": {
         if (!o) return Logger.error("newName is required for rename"), t;
-        if (r < 0 || r >= Object.keys(t).length) return t;
-        let e2 = Object.entries(t), i2 = [
+        if (r < 0 || r >= t.size) return t;
+        let e2 = [
+          ...t.entries()
+        ], i2 = [
           ...e2.slice(0, r),
           [
             o,
@@ -10626,7 +10632,7 @@ let __tla = (async () => {
           ],
           ...e2.slice(r + 1)
         ];
-        return Object.fromEntries(i2);
+        return new Map(i2);
       }
     }
   }
@@ -10642,7 +10648,7 @@ let __tla = (async () => {
     let [H, U] = (0, import_react.useState)(Wr), Gr = useNonce(), W = (0, import_react.useRef)(false), G;
     if (t[2] !== o || t[3] !== H || t[4] !== f || t[5] !== k) {
       G = [];
-      for (let [e2, t2] of Object.entries(o)) {
+      for (let [e2, t2] of o) {
         let n2 = f === "all" || f.includes(e2);
         G.push({
           id: e2,
@@ -10765,8 +10771,8 @@ let __tla = (async () => {
     }, t[24] = Qr) : Qr = t[24];
     let $r = Qr, ei;
     t[25] !== o || t[26] !== K ? (ei = (e2, t2, n2) => {
-      let [r] = e2, i = o[K[r].title];
-      bb134: switch (i) {
+      let [r] = e2, i = K[r].title, a2 = o.get(i);
+      bb134: switch (a2) {
         case "number":
         case "integer":
           if (Number.isNaN(Number(t2.data))) return false;
@@ -10854,7 +10860,7 @@ let __tla = (async () => {
     t[48] !== o || t[49] !== K || t[50] !== N || t[51] !== x || t[52] !== u || t[53] !== a ? (pi = (e2) => {
       if (N) {
         let t2 = K[N.col].title;
-        if (o[e2]) {
+        if (o.has(e2)) {
           fi(e2);
           return;
         }
@@ -10881,7 +10887,7 @@ let __tla = (async () => {
       let { direction: t2, columnName: n2, dataType: r } = e2;
       if (N) {
         let e3 = N.col + (t2 === "left" ? 0 : 1), i = Math.max(0, Math.min(e3, K.length));
-        if (o[n2]) {
+        if (o.has(n2)) {
           fi(n2);
           return;
         }

package/dist/main.js

@@ -26,7 +26,7 @@ import { An as FileText, B as safeExtractSetUIElementMessageBuffers, C as Accord
 import { __tla as __tla_1 } from "./chunk-5FQGJX7Z-CO1e63h_.js";
 import { o as useSize, s as Root$3, u as createLucideIcon } from "./dist-ESg7xyoD.js";
 import { A as SquareFunction, C as DEFAULT_COLOR_SCHEME, D as SCALE_TYPE_DESCRIPTIONS, E as EMPTY_VALUE$1, O as TIME_UNIT_DESCRIPTIONS, S as DEFAULT_AGGREGATION, T as DEFAULT_TIME_UNIT, _ as AGGREGATION_TYPE_DESCRIPTIONS, a as AGGREGATION_FNS$1, b as COLOR_SCHEMES, c as COLOR_BY_FIELDS, d as NONE_VALUE, f as SELECTABLE_DATA_TYPES, g as TIME_UNITS, h as STRING_AGGREGATION_FNS, i as convertDataTypeToSelectable, j as ChartColumn, k as escapeFieldName, l as COMBINED_TIME_UNITS, m as SORT_TYPES, n as createSpecWithoutData, o as BIN_AGGREGATION, p as SINGLE_TIME_UNITS, r as isFieldSet, s as CHART_TYPES, t as augmentSpecWithData, u as ChartType, v as AGGREGATION_TYPE_ICON, w as DEFAULT_MAX_BINS_FACET, x as COUNT_FIELD, y as CHART_TYPE_ICON } from "./spec-BKWq0wn2.js";
-import { $ as CommandItem, A as TableHeader, B as usePrevious$1, C as Toggle, Ct as Download, D as TableBody, Dt as ChevronsDownUp, E as Table, Et as ChevronsLeft, F as renderCellValue, G as SELECT_COLUMN_ID, H as loadTableAndRawData, I as ColumnChartContext, J as getMimeValues, K as TOO_MANY_ROWS, L as ColumnChartSpecModel, M as NAMELESS_COLUMN_PREFIX, N as generateColumns, O as TableCell, Ot as ChevronLeft, P as inferFieldTypes, Q as CommandInput, R as DelayMount, S as slotsController, St as Ellipsis, T as Provider$1, Tt as ChevronsRight, U as loadTableData, V as getPageIndexForRow, W as INDEX_COLUMN_NAME, X as Command, Y as filtersToFilterGroup, Z as CommandEmpty, _ as contextAwarePanelOpen, _t as isStaticNotebook, a as DataTable, at as TabsList, b as isCellAwareAtom, bt as Funnel, c as downloadBlob, ct as ChartInfoState, d as Filenames, dt as useOverflowDetection, et as CommandList, f as prettifyRowColumnCount, ft as RenderTextWithLinks, g as PANEL_TYPES, gt as getStaticVirtualFiles, h as ContextAwarePanelItem, ht as EmotionCacheProvider, i as OutputRenderer, it as TabsContent, j as TableRow, k as TableHead, kt as ArrowDownWideNarrow, l as downloadByURL, lt as ChartLoadingState, m as useInternalStateWithSync, mt as HtmlOutput, n as JsonOutput, nt as Maps, o as InstallPackageButton, ot as TabsTrigger, p as prettifyRowCount, pt as Kbd, q as toFieldTypes, r as OutputArea, rt as Tabs, s as ADD_PRINTING_CLASS, st as ChartErrorState, t as Slide, tt as CommandSeparator, u as downloadHTMLAsImage, ut as LazyVegaEmbed, v as contextAwarePanelOwner, vt as TextWrap, w as Fill, wt as ChevronsUpDown, x as SlotNames, y as contextAwarePanelType, yt as GripHorizontal, z as useIntersectionObserver, __tla as __tla_2 } from "./slide-BiyYep36.js";
+import { $ as CommandItem, A as TableHeader, B as usePrevious$1, C as Toggle, Ct as Download, D as TableBody, Dt as ChevronsDownUp, E as Table, Et as ChevronsLeft, F as renderCellValue, G as SELECT_COLUMN_ID, H as loadTableAndRawData, I as ColumnChartContext, J as getMimeValues, K as TOO_MANY_ROWS, L as ColumnChartSpecModel, M as NAMELESS_COLUMN_PREFIX, N as generateColumns, O as TableCell, Ot as ChevronLeft, P as inferFieldTypes, Q as CommandInput, R as DelayMount, S as slotsController, St as Ellipsis, T as Provider$1, Tt as ChevronsRight, U as loadTableData, V as getPageIndexForRow, W as INDEX_COLUMN_NAME, X as Command, Y as filtersToFilterGroup, Z as CommandEmpty, _ as contextAwarePanelOpen, _t as isStaticNotebook, a as DataTable, at as TabsList, b as isCellAwareAtom, bt as Funnel, c as downloadBlob, ct as ChartInfoState, d as Filenames, dt as useOverflowDetection, et as CommandList, f as prettifyRowColumnCount, ft as RenderTextWithLinks, g as PANEL_TYPES, gt as getStaticVirtualFiles, h as ContextAwarePanelItem, ht as EmotionCacheProvider, i as OutputRenderer, it as TabsContent, j as TableRow, k as TableHead, kt as ArrowDownWideNarrow, l as downloadByURL, lt as ChartLoadingState, m as useInternalStateWithSync, mt as HtmlOutput, n as JsonOutput, nt as Maps, o as InstallPackageButton, ot as TabsTrigger, p as prettifyRowCount, pt as Kbd, q as toFieldTypes, r as OutputArea, rt as Tabs, s as ADD_PRINTING_CLASS, st as ChartErrorState, t as Slide, tt as CommandSeparator, u as downloadHTMLAsImage, ut as LazyVegaEmbed, v as contextAwarePanelOwner, vt as TextWrap, w as Fill, wt as ChevronsUpDown, x as SlotNames, y as contextAwarePanelType, yt as GripHorizontal, z as useIntersectionObserver, __tla as __tla_2 } from "./slide-Du4Jfizg.js";
 import { c as Calendar, i as createReducerAndAtoms, n as useOnUnmount, o as ToggleLeft, r as Badge, t as useOnMount } from "./useLifecycle-smVfjLNI.js";
 import { n as $fb18d541ea1ad717$export$ad991b66133851cf, r as $5a387cc49350e6db$export$722debc0e56fea39, t as $896ba0a80a8f4d36$export$85fd5fdf27bacc79 } from "./useDateFormatter-B3mCQMP3.js";
 import { t as Check } from "./check-CFM2mVDr.js";
@@ -14012,7 +14012,7 @@ Defaulting to \`null\`.`;
     "time",
     "unknown"
   ];
-  var import_compiler_runtime$88 = require_compiler_runtime(), LazyDataEditor = import_react.lazy(() => import("./glide-data-editor-CVtY_KYw.js").then(async (m) => {
+  var import_compiler_runtime$88 = require_compiler_runtime(), LazyDataEditor = import_react.lazy(() => import("./glide-data-editor-DXti2axL.js").then(async (m) => {
     await m.__tla;
     return m;
   }));
@@ -14060,12 +14060,12 @@ Defaulting to \`null\`.`;
     let r = (0, import_compiler_runtime$88.c)(31), c;
     r[0] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (c = [], r[0] = c) : c = r[0];
     let [l, u] = (0, import_react.useState)(c), d;
-    r[1] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (d = {}, r[1] = d) : d = r[1];
+    r[1] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (d = /* @__PURE__ */ new Map(), r[1] = d) : d = r[1];
     let [f, p] = (0, import_react.useState)(d), m, h;
     r[2] !== e.data || r[3] !== e.fieldTypes ? (m = async () => {
       let r2 = toFieldTypes(e.fieldTypes ?? []), c2 = Array.isArray(e.data) ? e.data : await vegaLoadData(e.data, {
         type: "csv",
-        parse: getVegaFieldTypes(r2)
+        parse: getVegaFieldTypes(Object.fromEntries(r2))
       }, {
         handleBigIntAndNumberLike: true
       });
@@ -44992,7 +44992,7 @@ ${c}
   function asCellId(e) {
     return typeof e == "string" ? e : null;
   }
-  var import_compiler_runtime$10 = require_compiler_runtime(), LazySlidesComponent = import_react.lazy(() => import("./reveal-component-CA7oaSt2.js"));
+  var import_compiler_runtime$10 = require_compiler_runtime(), LazySlidesComponent = import_react.lazy(() => import("./reveal-component-CATTJBrD.js"));
   const SlidesLayoutRenderer = (e) => {
     var _a3;
     let r = (0, import_compiler_runtime$10.c)(20), { cells: c, mode: l } = e, u = l === "read", d = useAtomValue(numColumnsAtom) > 1, [f, p] = (0, import_react.useState)(null), m = (0, import_react.useRef)(null), h, g;
@@ -45525,7 +45525,7 @@ ${c}
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.2-dev62"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.2-dev65"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var VIRTUAL_FILE_REGEX = /\/@file\/([^\s"&'/]+)\.([\dA-Za-z]+)/g, VirtualFileTracker = class e {
     constructor() {

package/dist/{reveal-component-CA7oaSt2.js → reveal-component-CATTJBrD.js}

@@ -8,7 +8,7 @@ import { t as require_react } from "./react-DA-nE2FX.js";
 import { t as require_compiler_runtime } from "./compiler-runtime-CEbnTgxf.js";
 import "./html-to-image-BdsDysfl.js";
 import "./chunk-5FQGJX7Z-CO1e63h_.js";
-import { t as Slide, xt as Expand } from "./slide-BiyYep36.js";
+import { t as Slide, xt as Expand } from "./slide-Du4Jfizg.js";
 import "./input-Drx1pguW.js";
 import "./toDate-yqOcZ_tY.js";
 import "./react-dom-BWRJ_g_k.js";

package/dist/{slide-BiyYep36.js → slide-Du4Jfizg.js}

@@ -15548,7 +15548,10 @@ Database schema: ${n}`), (_a3 = t2.aiFix) == null ? void 0 : _a3.setAiCompletion
     if (Array.isArray(e) && e.every(isMimeValue)) return e.map((e2) => e2);
   };
   toFieldTypes = function(e) {
-    return Objects.collect(e, ([e2]) => e2, ([, [e2]]) => e2);
+    return new Map(e.map(([e2, [t]]) => [
+      e2,
+      t
+    ]));
   };
   SELECT_COLUMN_ID = "__select__";
   INDEX_COLUMN_NAME = "_marimo_row_id";
@@ -16818,7 +16821,7 @@ Database schema: ${n}`), (_a3 = t2.aiFix) == null ? void 0 : _a3.setAiCompletion
     getHeaderSummary(e) {
       return {
         stats: this.columnStats.get(e),
-        type: this.fieldTypes[e],
+        type: this.fieldTypes.get(e),
         spec: this.opts.includeCharts ? this.getVegaSpec(e) : void 0
       };
     }
@@ -16850,7 +16853,8 @@ Database schema: ${n}`), (_a3 = t2.aiFix) == null ? void 0 : _a3.setAiCompletion
         values: t,
         name: "bin_values"
       });
-      let s = this.createBase(a), c = this.fieldTypes[e];
+      let s = this.createBase(a), c = this.fieldTypes.get(e);
+      if (c === void 0) return null;
       switch (e = e.replaceAll(".", "\\."), e = e.replaceAll("[", "\\[").replaceAll("]", "\\]"), e = e.replaceAll(":", "\\:"), c) {
         case "date":
         case "datetime":
@@ -17427,7 +17431,7 @@ Database schema: ${n}`), (_a3 = t2.aiFix) == null ? void 0 : _a3.setAiCompletion
           return logNever(c), null;
       }
     }
-  }, __publicField(_a, "EMPTY", new _a([], {}, {}, {}, {}, {
+  }, __publicField(_a, "EMPTY", new _a([], /* @__PURE__ */ new Map(), {}, {}, {}, {
     includeCharts: false
   })), _a);
   import_compiler_runtime$20 = require_compiler_runtime();
@@ -17484,7 +17488,7 @@ Database schema: ${n}`), (_a3 = t2.aiFix) == null ? void 0 : _a3.setAiCompletion
       }), t[15] = i, t[16] = v);
       let y = v;
       s = "flex flex-col items-center text-xs text-muted-foreground align-end", c = _, d = (() => {
-        if (!h) return null;
+        if (!h || f2 === void 0) return null;
         switch (f2) {
           case "date":
           case "datetime":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.23.2-dev62",
+  "version": "0.23.2-dev65",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/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(

package/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", () => {

package/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 names

package/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;
     }
 

package/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 {

package/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 data
   const { 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 },
         );
 

package/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();
 
     // Insert
     const insertResult = modifyColumnFields({
@@ -778,7 +772,11 @@ describe("modifyColumnFields", () => {
       type: "insert",
       newColumnName: "newColumn",
     });
-    expect(insertResult).toEqual({ newColumn: "string" });
+    expect(insertResult).toMatchInlineSnapshot(`
+      Map {
+        "newColumn" => "string",
+      }
+    `);
 
     // Remove
     const 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",
-    };
+    });
 
     // Insert
     const 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",
+      }
+    `);
 
     // Remove
     const 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",
+      }
+    `);
 
     // Rename
     const 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",
+      }
+    `);
   });
 });

package/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);
     }
   }
 }

package/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 type
       switch (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;
       }