update types to handle possible wrapping

.eslintrc.json

@@ -35,6 +35,12 @@
         "@typescript-eslint/no-unsafe-return": "off",
         "@typescript-eslint/no-unsafe-member-access": "off"
       }
+    },
+    {
+      "files": ["__generated__/**/*"],
+      "rules": {
+        "@typescript-eslint/no-unused-vars": "off"
+      }
     }
   ]
 }

package.json

@@ -19,7 +19,8 @@
     "build": "rm -rf ./dist && tsc",
     "lint": "eslint .",
     "format": "prettier --write .",
-    "checkTs": "tsc --noEmit"
+    "checkTs": "tsc --noEmit",
+    "codegen:dev": "pnpm build && ./baserow.js -d > out.txt"
   },
   "keywords": [],
   "author": "",

src/codegen.ts

@@ -60,8 +60,8 @@ export default async function main({
       .filter((t) => !!t);
 
     const modelImports = isDev
-      ? `import { BaserowSdk, Row } from '${__dirname}/index.js'`
-      : "import { BaserowSdk, Row } from 'baserow-sdk'";
+      ? `import { BaserowSdk, Row, FieldValue } from '${__dirname}/index.js'`
+      : "import { BaserowSdk, Row, FieldValue } from 'baserow-sdk'";
     const typeDef = `export type ${tableName}RowType = ${makeType(fields)}
 
 ${modelImports}

src/codegen/getRawType.spec.ts

@@ -0,0 +1,9 @@
+import { describe, it, expect } from "vitest";
+import { getRawType } from "./getRawType";
+import f from "../test/fixtures/fieldDefinition";
+
+describe("getRawType", () => {
+  it("runs", () => {
+    expect(getRawType(f({ type: "text" }))).toBe("string");
+  });
+});

src/codegen/makeFieldType.ts → src/codegen/getRawType.ts

@@ -1,15 +1,15 @@
 import { FieldDefinition } from "../index.js";
 import { mapPrimitive } from "./mapPrimitive.js";
 
-export function makeFieldType(field: FieldDefinition): string {
+export function getRawType(field: FieldDefinition): string {
   if (field.type === "link_row") {
     return '{ "id": number, "value": string }[]';
   }
 
   if (["rollup", "formula", "lookup"].includes(field.type)) {
     switch (field.formula_type) {
       case "array":
-        return `(${mapPrimitive(field.array_formula_type)})[]`;
+        return `FieldValue<${mapPrimitive(field.array_formula_type)}>[]`;
       default:
         return mapPrimitive(field.formula_type);
     }

src/codegen/makeGetter.ts

@@ -1,6 +1,6 @@
 import { Table } from "../codegen.js";
 import { FieldDefinition, ListFieldsResponse } from "../index.js";
-import { makeFieldType } from "./makeFieldType.js";
+import { getRawType } from "./getRawType.js";
 import { toCamelCase } from "./toCamelCase.js";
 
 function getForeignTable(
@@ -42,11 +42,11 @@ function getReturnType(field: FieldDefinition, tables: Table[]): string {
     return "number";
   }
 
-  return makeFieldType(field);
+  return getRawType(field);
 }
 
 function getBody(field: FieldDefinition, tables: Table[]): string {
-  const rawType = makeFieldType(field);
+  const rawType = getRawType(field);
   const query = `this.getField<${rawType}>("${field.name}")`;
 
   if (field.type === "number" || field.formula_type === "number") {

src/codegen/makeSetter.ts

@@ -1,13 +1,13 @@
 import { FieldDefinition } from "../index.js";
-import { makeFieldType } from "./makeFieldType.js";
+import { getRawType } from "./getRawType.js";
 import { toCamelCase } from "./toCamelCase.js";
 
 function getInputType(field: FieldDefinition): string {
   if (field.type === "link_row") {
     return "number[]";
   }
 
-  return makeFieldType(field);
+  return getRawType(field);
 }
 
 export function makeSetter(field: FieldDefinition): string {

src/codegen/makeType.spec.ts

@@ -75,7 +75,7 @@ describe("makeType", () => {
           array_formula_type: "text",
         }),
       ]),
-    ).toContain("(string)[]");
+    ).toContain("FieldValue<string>[]");
   });
 
   it("handles formula type array number", () => {
@@ -87,7 +87,7 @@ describe("makeType", () => {
           array_formula_type: "number",
         }),
       ]),
-    ).toContain("(number | string)[]");
+    ).toContain("FieldValue<number | string>[]");
   });
 
   it("handles formula type array boolean", () => {
@@ -99,7 +99,7 @@ describe("makeType", () => {
           array_formula_type: "boolean",
         }),
       ]),
-    ).toContain("(boolean)[]");
+    ).toContain("FieldValue<boolean>[]");
   });
 
   it("quotes field names", () => {
@@ -187,7 +187,7 @@ describe("makeType", () => {
           array_formula_type: "text",
         }),
       ]),
-    ).toContain("(string)[]");
+    ).toContain("FieldValue<string>[]");
   });
 
   it("handles rollup type array number", () => {
@@ -199,7 +199,7 @@ describe("makeType", () => {
           array_formula_type: "number",
         }),
       ]),
-    ).toContain("(number | string)[]");
+    ).toContain("FieldValue<number | string>[]");
   });
 
   it("handles link row", () => {
@@ -221,7 +221,7 @@ describe("makeType", () => {
           array_formula_type: "number",
         }),
       ]),
-    ).toContain("(number | string)[]");
+    ).toContain("FieldValue<number | string>[]");
   });
 
   it("handles rollup type date", () => {

src/codegen/makeType.ts

@@ -1,5 +1,5 @@
 import { ListFieldsResponse } from "../index.js";
-import { makeFieldType } from "./makeFieldType.js";
+import { getRawType } from "./getRawType.js";
 
 export default function makeType(fields: ListFieldsResponse): string {
   let typeDef = `{\n`;
@@ -8,7 +8,7 @@ export default function makeType(fields: ListFieldsResponse): string {
   typeDef += '  "order": string;\n';
 
   fields.forEach((field) => {
-    typeDef += `  "${field.name}": ${makeFieldType(field)};\n`;
+    typeDef += `  "${field.name}": ${getRawType(field)};\n`;
   });
 
   typeDef += `}`;

src/index.ts

@@ -2,6 +2,7 @@ import c from "./client.js";
 
 export * from "./row.js";
 export * from "./factory.js";
+export * from "./types.js";
 
 export type AddRowOptions = {
   user_field_names?: boolean;

src/types.ts

@@ -0,0 +1,4 @@
+export type FieldValue<T> =
+  | T
+  | { id: number; value: T }
+  | { ids: Record<string, number>; value: T };