feat: Tabular validation improvements

arrow/table/load.ts

@@ -1,5 +1,5 @@
 import type { Resource } from "@dpkit/core"
-import { loadResourceSchema } from "@dpkit/core"
+import { resolveSchema } from "@dpkit/core"
 import { prefetchFiles } from "@dpkit/file"
 import type { LoadTableOptions } from "@dpkit/table"
 import { inferSchemaFromTable, normalizeTable } from "@dpkit/table"
@@ -21,7 +21,7 @@ export async function loadArrowTable(
   }
 
   if (!options?.denormalized) {
-    let schema = await loadResourceSchema(resource.schema)
+    let schema = await resolveSchema(resource.schema)
     if (!schema) schema = await inferSchemaFromTable(table, options)
     table = await normalizeTable(table, schema)
   }

browser/components/Report/Error/Cell.tsx

@@ -4,21 +4,27 @@ import { useTranslation } from "react-i18next"
 
 export function CellTypeError(props: { error: errorTypes.CellTypeError }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
+      </Code>{" "}
+      {t("is not")}
+      <Code fz="lg" fw="bold">
+        {[error.fieldType, error.fieldFormat].filter(Boolean).join("/")}
       </Code>{" "}
-      {t("has a wrong type")}
+      {"type"}
     </Text>
   )
 }
@@ -27,15 +33,17 @@ export function CellRequiredError(props: {
   error: errorTypes.CellRequiredError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("A required cell in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
       </Code>{" "}
       {t("is missing")}
     </Text>
@@ -46,21 +54,27 @@ export function CellMinimumError(props: {
   error: errorTypes.CellMinimumError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
+      </Code>{" "}
+      {t("is less than")}
+      <Code fz="lg" fw="bold">
+        {error.minimum}
       </Code>{" "}
-      {t("is less than minimum")}
+      {t("minimum")}
     </Text>
   )
 }
@@ -69,21 +83,27 @@ export function CellMaximumError(props: {
   error: errorTypes.CellMaximumError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
       </Code>{" "}
-      {t("is more than maximum")}
+      {t("is more than")}
+      <Code fz="lg" fw="bold">
+        {error.maximum}
+      </Code>{" "}
+      {t("maximum")}
     </Text>
   )
 }
@@ -92,21 +112,27 @@ export function CellExclusiveMinimumError(props: {
   error: errorTypes.CellExclusiveMinimumError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
       </Code>{" "}
-      {t("is less or equal to exclusive minimum")}
+      {t("is less or equal to")}
+      <Code fz="lg" fw="bold">
+        {error.minimum}
+      </Code>{" "}
+      {t("exclusive minimum")}
     </Text>
   )
 }
@@ -115,21 +141,27 @@ export function CellExclusiveMaximumError(props: {
   error: errorTypes.CellExclusiveMaximumError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
       </Code>{" "}
-      {t("is more or equal to exclusive maximum")}
+      {t("is less or equal to")}
+      <Code fz="lg" fw="bold">
+        {error.maximum}
+      </Code>{" "}
+      {t("exclusive maximum")}
     </Text>
   )
 }
@@ -138,21 +170,27 @@ export function CellMinLengthError(props: {
   error: errorTypes.CellMinLengthError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Length of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
+      </Code>{" "}
+      {t("is less than")}
+      <Code fz="lg" fw="bold">
+        {error.minLength}
       </Code>{" "}
-      {t("is less than minimum")}
+      {t("minimum")}
     </Text>
   )
 }
@@ -161,21 +199,26 @@ export function CellMaxLengthError(props: {
   error: errorTypes.CellMaxLengthError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Length of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
+      </Code>{" "}
+      <Code fz="lg" fw="bold">
+        {error.maxLength}
       </Code>{" "}
-      {t("is more than maximum")}
+      {t("maximum")}
     </Text>
   )
 }
@@ -184,40 +227,48 @@ export function CellPatternError(props: {
   error: errorTypes.CellPatternError
 }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
+      </Code>{" "}
+      {t("does not match the")}
+      <Code fz="lg" fw="bold">
+        {error.pattern}
       </Code>{" "}
-      {t("does not match the pattern")}
+      {t("pattern")}
     </Text>
   )
 }
 
 export function CellUniqueError(props: { error: errorTypes.CellUniqueError }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
       </Code>{" "}
       {t("is not unique")}
     </Text>
@@ -226,21 +277,27 @@ export function CellUniqueError(props: { error: errorTypes.CellUniqueError }) {
 
 export function CellEnumError(props: { error: errorTypes.CellEnumError }) {
   const { t } = useTranslation()
+  const { error } = props
+
   return (
     <Text>
       {t("Value of the cell")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.cell}
+        {error.cell}
       </Code>{" "}
       {t("in field")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.fieldName}
+        {error.fieldName}
       </Code>{" "}
       {t("of row")}{" "}
       <Code fz="lg" fw="bold">
-        {props.error.rowNumber}
+        {error.rowNumber}
+      </Code>{" "}
+      {t("is not in the allowed")}
+      <Code fz="lg" fw="bold">
+        {error.enum.join(", ")}
       </Code>{" "}
-      {t("is not in allowed values")}
+      {t("values")}
     </Text>
   )
 }

browser/locales/de.json

@@ -34,13 +34,27 @@
   "has a wrong type": "hat einen falschen Typ",
   "A required cell in field": "Eine erforderliche Zelle im Feld",
   "is missing": "fehlt",
+  "is not": "ist nicht",
+  "is not of the": "ist nicht vom",
+  "is less than": "ist kleiner als",
+  "minimum": "Minimum",
+  "is more than": "ist größer als",
+  "maximum": "Maximum",
+  "is less or equal to": "ist kleiner oder gleich",
+  "exclusive minimum": "exklusives Minimum",
+  "is more or equal to": "ist größer oder gleich",
+  "exclusive maximum": "exklusives Maximum",
   "is less than minimum": "ist kleiner als das Minimum",
   "is more than maximum": "ist größer als das Maximum",
   "is less or equal to exclusive minimum": "ist kleiner oder gleich dem exklusiven Minimum",
   "is more or equal to exclusive maximum": "ist größer oder gleich dem exklusiven Maximum",
   "Length of the cell": "Länge der Zelle",
+  "does not match the": "stimmt nicht überein mit",
+  "pattern": "Muster",
   "does not match the pattern": "stimmt nicht mit dem Muster überein",
   "is not unique": "ist nicht eindeutig",
+  "is not in the allowed": "ist nicht in den erlaubten",
+  "values": "Werten",
   "is not in allowed values": "ist nicht in den erlaubten Werten",
   "Field name is expected to be": "Feldname soll sein",
   "but it is actually": "aber es ist tatsächlich",