@xeplr/ui-factory 1.0.14 → 1.1.0

package/src/validateDocument.js

@@ -13,6 +13,7 @@
 import { CONTROLS, LABEL_VARIANTS, LIST_ACTIONS, STYLE_KEYS, SCREEN_STYLE_KEYS, LAYOUTS, MULTI_SEPARATOR, MAX_FILE_MB, STEP_LIMIT, acceptList } from './controls.js'
 import { DOCUMENT_KIND, DOCUMENT_VERSION } from './document.js'
 import { RESERVED_COLUMNS, MAX_IDENTIFIER } from './tableSchema.js'
+import { FIELD_PRESETS, INPUT_TYPES, presetFor } from './presets.js'
 
 const FIELD_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/
 const TABLE_NAME = /^[A-Za-z_][A-Za-z0-9_.$-]*$/
@@ -88,6 +89,9 @@ export function validateDocument(doc, controls = CONTROLS) {
       if (!nonEmptyString(props.label)) err(`${at}.props.label`, 'is required — the text shown above the field')
       if (props.required !== undefined && typeof props.required !== 'boolean') err(`${at}.props.required`, 'must be true or false')
       if (props.placeholder !== undefined && typeof props.placeholder !== 'string') err(`${at}.props.placeholder`, 'must be a string')
+      // Where the field came from (a ready-made field's key), or false: plain on purpose.
+      if (props.preset !== undefined && props.preset !== false && !presetFor(props.preset)) err(`${at}.props.preset`, `"${props.preset}" is not a ready-made field — one of: ${FIELD_PRESETS.map((p) => p.key).join(', ')}, or false`)
+      if (props.inputType !== undefined && !INPUT_TYPES.includes(props.inputType)) err(`${at}.props.inputType`, `must be one of: ${INPUT_TYPES.join(', ')}`)
       checkDefault(node, def, at, err)
       checkValidation(node, def, at, err)
     }
@@ -234,7 +238,7 @@ function checkValidation(node, def, at, err) {
     const val = v[key]
     if (key === 'minLength' || key === 'maxLength') {
       if (!(Number.isInteger(val) && val >= 0)) err(path, 'must be a whole number, 0 or more')
-    } else if (key === 'integer') {
+    } else if (key === 'integer' || key === 'notFuture') {
       if (typeof val !== 'boolean') err(path, 'must be true or false')
     } else if (key === 'pattern') {
       try { new RegExp(val) } catch (_) { err(path, `"${val}" is not a valid regular expression`) }

package/src/values.js

@@ -32,6 +32,13 @@ export function formSchema(doc, controls = CONTROLS) {
     const v = p.validation && { ...p.validation }
     if (v) {
       delete v.patternMessage
+      // "Not in the future" is today's date AT THE MOMENT OF CHECKING — the
+      // server builds this schema per save, so it never goes stale.
+      if (v.notFuture) {
+        const today = localDay()
+        if (!v.max || v.max > today) v.max = today
+      }
+      delete v.notFuture
       if (Object.keys(v).length) field.validation = v
     }
     return field
@@ -130,6 +137,7 @@ export function fieldError(node, value, loadedOptions) {
       const day = value.slice(0, 10)
       if (v.min && day < v.min) return `${label} must be on or after ${v.min}`
       if (v.max && day > v.max) return `${label} must be on or before ${v.max}`
+      if (v.notFuture && day > localDay()) return `${label} cannot be in the future`
       return null
     }
     case 'datetime': {
@@ -173,15 +181,20 @@ export function optionValue(options, raw) {
   return hit ? hit.id : raw
 }
 
+/** Today as YYYY-MM-DD, in the local timezone — the day a person means by "today". */
+function localDay() {
+  const d = new Date()
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
+}
+
 function safeRegExp(pattern) {
   try { return new RegExp(pattern) } catch (_) { return { test: () => true } }
 }
 
-// ── autosave ─────────────────────────────────────────────────────────────
-// There is no submit. A screen saves itself a moment after a change, as long
-// as what is entered is acceptable. This decides whether it can, and which
-// messages to SHOW: a field nobody has touched is not shouted at for being
-// empty — it only holds the save back.
+// ── can it save? ─────────────────────────────────────────────────────────
+// Save (a button, one AJAX call) goes out only when what is entered is
+// acceptable. This decides whether it can, and which messages to SHOW: a field
+// nobody has touched is not shouted at for being empty until Save is pressed.
 
 /**
  * @param touched   Set of field names the person has changed or left