fix: trim strings in data import fix: validation for choices field

Author: eveffer

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@inspatial/cloud",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "license": "Apache-2.0",
   "exports": {
     ".": "./mod.ts",

src/data-import/csv-utils.ts

@@ -83,7 +83,12 @@ function sanitizeValue(str: string) {
   // Step 1: Remove single double quotes
   let cleanedStr = str.replace(/(?<!")"(?!")/g, "");
   // Step 2: Replace double double quotes with single quotes
-  cleanedStr = cleanedStr.replace(/""/g, '"');
+  cleanedStr = cleanedStr.replace(/""/g, '"').trim();
+
+  // If the string is empty, return null
+  if (cleanedStr === "") {
+    return null;
+  }
 
   // Step 3: Check if the string is a JSON object and parse it
   if (/^\{.*\}$/.test(cleanedStr)) {

src/orm/build/make-fields.ts

@@ -57,13 +57,20 @@ export function makeFields<ForType extends keyof ForTypeMap>(
           to: value,
         });
         const isValid = fieldType.validate(value, fieldDef);
-        if (!isValid) {
-          raiseORMException(
-            `${value} is not a valid value for field ${field.key} in ${forType} ${instance._name}`,
-          );
+        if (isValid === true) {
+          instance._data.set(field.key, value);
+          return;
         }
-
-        instance._data.set(field.key, value);
+        let message = "";
+        if (typeof isValid === "string") {
+          message = `: ${isValid}`;
+        }
+        message =
+          `${value} is not a valid value for field ${field.key} in ${forType} ${instance._name}${message}`;
+        raiseORMException(
+          message,
+          "InvalidValue",
+        );
       },
     });
   }

src/orm/field/fields/choices-field.ts

@@ -10,9 +10,27 @@ export default new ORMFieldConfig("ChoicesField", {
   dbLoad(value, _fieldDef) {
     return value;
   },
-  validate(_value, _fieldDef) {
+  validate(value, fieldDef) {
+    const choiceKeys = new Set(fieldDef.choices.map((c) => c.key));
+    if (value === null || value === undefined) {
+      return true;
+    }
+    if (typeof value !== "string") {
+      return false;
+    }
+    if (!choiceKeys.has(value)) {
+      return `Value "${value}" is not a valid choice. Valid choices are: ${
+        Array.from(choiceKeys).join(", ")
+      }`;
+    }
     return true;
   },
+  normalize(value, _fieldDef) {
+    if (typeof value === "string") {
+      return value.trim();
+    }
+    return value;
+  },
   dbSave(value, _fieldDef) {
     return value;
   },

src/orm/field/orm-field.ts

@@ -28,7 +28,7 @@ export class ORMFieldConfig<T extends InFieldType = InFieldType> {
      * before saving it to the database.
      */
 
-    validate: (value: any, fieldDef: InFieldMap[T]) => boolean;
+    validate: (value: any, fieldDef: InFieldMap[T]) => boolean | string;
 
     /**
      * A normalizer function that will be used to convert the field