@structured-field/widget-editor 1.2.1 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@structured-field/widget-editor",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "A lightweight JSON Schema form builder with support for relation fields (ForeignKey, QuerySet) and autocomplete search.",
   "type": "module",
   "main": "dist/structured-widget-editor.js",
@@ -27,6 +27,8 @@
   "scripts": {
     "build": "rollup -c && node scripts/bundle-iife.mjs",
     "dev": "rollup -c -w",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "test:serve": "vite --open"
   },
   "keywords": [

package/src/SchemaForm.vue

@@ -13,7 +13,7 @@
 
 <script>
 import SchemaEditor from './editors/SchemaEditor.vue';
-import { deepClone } from './utils';
+import { deepClone, isChoiceOneOf } from './utils';
 import { applyConditionals, hasConditionals } from './conditionals';
 
 export default {
@@ -89,29 +89,36 @@ export default {
         const hasNull = schema.anyOf.some(s => s.type === 'null');
         if (hasNull && nonNull.length === 1) {
           const resolved = this.resolveSchema(nonNull[0]);
-          return {
-            ...resolved,
-            _nullable: true,
-            title: schema.title || resolved.title,
-            default: 'default' in schema ? schema.default : null,
-          };
+          // Carry ALL sibling keys through the nullable collapse: pydantic
+          // emits json_schema_extra (placeholder, minLength/maxLength,
+          // minimum/maximum, format, choice oneOf, ...) as SIBLINGS of
+          // anyOf on Optional fields. Outer keys override the inner branch.
+          const { anyOf, oneOf, ...rest } = schema;
+          const out = { ...resolved, ...rest, _nullable: true };
+          if (!('default' in schema)) out.default = null;
+          if (isChoiceOneOf(oneOf)) out.oneOf = oneOf;
+          return out;
         }
         if (nonNull.length >= 1) return this.resolveSchema(nonNull[0]);
       }
 
       if (schema.oneOf && schema.discriminator) return schema;
 
+      // A oneOf of {const, title} value options is a choice list (select),
+      // not alternative sub-schemas: keep it intact for SelectEditor instead
+      // of collapsing to the first member (which routed to HiddenEditor and
+      // overwrote stored values on mount).
+      if (isChoiceOneOf(schema.oneOf)) return schema;
+
       if (schema.oneOf) {
         const nonNull = schema.oneOf.filter(s => s.type !== 'null');
         const hasNull = schema.oneOf.some(s => s.type === 'null');
         if (hasNull && nonNull.length === 1) {
           const resolved = this.resolveSchema(nonNull[0]);
-          return {
-            ...resolved,
-            _nullable: true,
-            title: schema.title || resolved.title,
-            default: 'default' in schema ? schema.default : null,
-          };
+          const { anyOf, oneOf, ...rest } = schema;
+          const out = { ...resolved, ...rest, _nullable: true };
+          if (!('default' in schema)) out.default = null;
+          return out;
         }
         if (nonNull.length >= 1) return this.resolveSchema(nonNull[0]);
       }

package/src/editors/BooleanEditor.vue

@@ -1,14 +1,18 @@
 <template>
   <div class="sf-field sf-field-boolean" :class="{ errors: fieldErrors.length }">
-    <label class="sf-checkbox-label">
-      <input
-        type="checkbox"
-        class="sf-checkbox"
-        :checked="!!modelValue"
-        @change="$emit('update:modelValue', $event.target.checked)"
-      />
-      {{ title }}
-    </label>
+    <div class="sf-boolean-row">
+      <label class="sf-checkbox-label">
+        <input
+          type="checkbox"
+          class="sf-checkbox"
+          :checked="!!modelValue"
+          @change="$emit('update:modelValue', $event.target.checked)"
+        />
+        {{ title }}
+        <span v-if="isNullable && isNullValue" class="sf-null-badge">null</span>
+      </label>
+      <button v-if="isNullable && !isNullValue" type="button" class="sf-null-clear-btn" title="Set to null" @click="$emit('update:modelValue', null)">&#x2715;</button>
+    </div>
     <ul v-if="fieldErrors.length" class="errorlist">
       <li v-for="(err, i) in fieldErrors" :key="i">{{ err }}</li>
     </ul>
@@ -29,6 +33,12 @@ export default {
     title() {
       return this.schema.title || this.humanize(this.path[this.path.length - 1]) || '';
     },
+    isNullable() {
+      return !!this.schema._nullable;
+    },
+    isNullValue() {
+      return this.modelValue === null || this.modelValue === undefined;
+    },
     fieldErrors() {
       if (!this.form || !this.form.getErrorsForPath) return [];
       return this.form.getErrorsForPath(this.path);

package/src/editors/DateEditor.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="sf-field" :class="{ errors: fieldErrors.length }">
+    <span class="sf-label" :class="{ required: isRequired }">
+      {{ title }}
+      <span v-if="isNullable && isNullValue" class="sf-null-badge">null</span>
+    </span>
+    <div :class="isNullable ? 'sf-input-row' : null">
+      <input
+        :type="inputType"
+        class="sf-input"
+        :value="displayValue"
+        :placeholder="isNullValue ? 'null' : (schema.placeholder || '')"
+        :min="schema.minimum || schema.formatMinimum || null"
+        :max="schema.maximum || schema.formatMaximum || null"
+        @input="onInput"
+      />
+      <button v-if="isNullable && !isNullValue" type="button" class="sf-null-clear-btn" title="Set to null" @click="$emit('update:modelValue', null)">&#x2715;</button>
+    </div>
+    <ul v-if="fieldErrors.length" class="errorlist">
+      <li v-for="(err, i) in fieldErrors" :key="i">{{ err }}</li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DateEditor',
+  props: {
+    schema: { type: Object, required: true },
+    modelValue: { default: '' },
+    path: { type: Array, default: () => [] },
+    form: { type: Object, default: null },
+  },
+  emits: ['update:modelValue'],
+  computed: {
+    isDateTime() {
+      return this.schema.format === 'date-time';
+    },
+    inputType() {
+      return this.isDateTime ? 'datetime-local' : 'date';
+    },
+    displayValue() {
+      if (this.isNullValue) return '';
+      const v = String(this.modelValue);
+      if (this.isDateTime) {
+        // Accept ISO 8601 strings like "2026-04-09T10:30:00[.sss][Z|+00:00]"
+        // datetime-local expects "YYYY-MM-DDTHH:mm" (or with seconds).
+        const match = v.match(/^(\d{4}-\d{2}-\d{2})[T ](\d{2}:\d{2})(?::(\d{2}(?:\.\d+)?))?/);
+        if (match) {
+          return match[3] ? `${match[1]}T${match[2]}:${match[3]}` : `${match[1]}T${match[2]}`;
+        }
+        return v;
+      }
+      // date: expect "YYYY-MM-DD"
+      return v.slice(0, 10);
+    },
+    title() {
+      return this.schema.title || this.humanize(this.path[this.path.length - 1]) || '';
+    },
+    isRequired() {
+      if (this.path.length < 2 || !this.form) return false;
+      const parentPath = this.path.slice(0, -1);
+      const fieldName = this.path[this.path.length - 1];
+      const parentSchema = this.form.getSchemaAtPath(parentPath);
+      return parentSchema && Array.isArray(parentSchema.required) && parentSchema.required.includes(fieldName);
+    },
+    isNullable() {
+      return !!this.schema._nullable;
+    },
+    isNullValue() {
+      return this.modelValue === null || this.modelValue === undefined;
+    },
+    fieldErrors() {
+      if (!this.form || !this.form.getErrorsForPath) return [];
+      return this.form.getErrorsForPath(this.path);
+    },
+  },
+  methods: {
+    onInput(e) {
+      const val = e.target.value;
+      if (val === '') {
+        this.$emit('update:modelValue', this.isNullable ? null : '');
+        return;
+      }
+      // Emit ISO-compatible string. Pydantic accepts both "YYYY-MM-DD"
+      // and "YYYY-MM-DDTHH:mm[:ss]" for date / datetime fields.
+      this.$emit('update:modelValue', val);
+    },
+    humanize(str) {
+      if (!str) return '';
+      return str.replace(/_/g, ' ').replace(/([a-z])([A-Z])/g, '$1 $2').replace(/^./, s => s.toUpperCase());
+    },
+  },
+};
+</script>

package/src/editors/JsonEditor.vue

@@ -0,0 +1,173 @@
+<template>
+  <div class="sf-field sf-field-json" :class="{ errors: fieldErrors.length }">
+    <span class="sf-label" :class="{ required: isRequired }">{{ title }}</span>
+    <div class="sf-json-editor" :class="{ 'sf-json-error': hasErrors }">
+      <div class="sf-json-toolbar">
+        <span v-if="loadError" class="sf-json-error-msg">{{ loadError }}</span>
+        <button v-if="ready" type="button" class="sf-btn sf-btn-sm sf-json-format-btn" @click="format">
+          Format
+        </button>
+      </div>
+      <div ref="aceContainer" class="sf-json-ace-container" />
+      <textarea
+        v-if="!ready"
+        class="sf-input sf-textarea sf-json-textarea-fallback"
+        :value="rawValue"
+        spellcheck="false"
+        @input="onFallbackInput"
+      />
+    </div>
+    <ul v-if="fieldErrors.length" class="errorlist">
+      <li v-for="(err, i) in fieldErrors" :key="i">{{ err }}</li>
+    </ul>
+  </div>
+</template>
+
+<script>
+const ACE_CDN = 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.37.5/ace.min.js';
+
+function loadAce() {
+  if (window.ace) return Promise.resolve(window.ace);
+  return new Promise((resolve, reject) => {
+    const existing = document.querySelector(`script[src="${ACE_CDN}"]`);
+    if (existing) {
+      existing.addEventListener('load', () => resolve(window.ace));
+      existing.addEventListener('error', reject);
+      return;
+    }
+    const s = document.createElement('script');
+    s.src = ACE_CDN;
+    s.async = true;
+    s.onload = () => resolve(window.ace);
+    s.onerror = () => reject(new Error('Failed to load Ace Editor'));
+    document.head.appendChild(s);
+  });
+}
+
+export default {
+  name: 'JsonEditor',
+  props: {
+    schema: { type: Object, required: true },
+    modelValue: { default: null },
+    path: { type: Array, default: () => [] },
+    form: { type: Object, default: null },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      rawValue: this.modelValue != null ? JSON.stringify(this.modelValue, null, 2) : '{}',
+      ready: false,
+      hasErrors: false,
+      loadError: null,
+      _editor: null,
+      _silent: false,
+    };
+  },
+  computed: {
+    title() {
+      return this.schema.title || this.humanize(this.path[this.path.length - 1]) || '';
+    },
+    isRequired() {
+      if (this.path.length < 2 || !this.form) return false;
+      const parentPath = this.path.slice(0, -1);
+      const fieldName = this.path[this.path.length - 1];
+      const parentSchema = this.form.getSchemaAtPath(parentPath);
+      return parentSchema && Array.isArray(parentSchema.required) && parentSchema.required.includes(fieldName);
+    },
+    fieldErrors() {
+      if (!this.form || !this.form.getErrorsForPath) return [];
+      return this.form.getErrorsForPath(this.path);
+    },
+  },
+  watch: {
+    modelValue(val) {
+      if (this._silent) return;
+      const external = val != null ? JSON.stringify(val, null, 2) : '{}';
+      try {
+        if (JSON.stringify(JSON.parse(this.rawValue)) !== JSON.stringify(val)) {
+          this.rawValue = external;
+          if (this._editor) {
+            this._silent = true;
+            this._editor.setValue(external, -1);
+            this._silent = false;
+          }
+        }
+      } catch { /* rawValue is invalid, leave it */ }
+    },
+  },
+  async mounted() {
+    try {
+      const ace = await loadAce();
+      const container = this.$refs.aceContainer;
+      if (!container) return;
+
+      const editor = ace.edit(container);
+      editor.setTheme(this._isDark() ? 'ace/theme/one_dark' : 'ace/theme/chrome');
+      editor.session.setMode('ace/mode/json');
+      editor.session.setTabSize(2);
+      editor.session.setUseSoftTabs(true);
+      editor.setShowPrintMargin(false);
+      editor.setOption('minLines', 5);
+      editor.setOption('maxLines', 20);
+      editor.setValue(this.rawValue, -1);
+      editor.$blockScrolling = Infinity;
+
+      editor.session.on('change', () => {
+        if (this._silent) return;
+        const text = editor.getValue();
+        this.rawValue = text;
+        try {
+          const parsed = JSON.parse(text);
+          this.hasErrors = false;
+          this._silent = true;
+          this.$emit('update:modelValue', parsed);
+          this._silent = false;
+        } catch {
+          this.hasErrors = true;
+        }
+      });
+
+      // Reflect annotation (lint) errors on hasErrors
+      editor.session.on('changeAnnotation', () => {
+        const annotations = editor.session.getAnnotations();
+        this.hasErrors = annotations.some(a => a.type === 'error');
+      });
+
+      this._editor = editor;
+      this.ready = true;
+    } catch (err) {
+      this.loadError = `Editor unavailable: ${err.message}`;
+    }
+  },
+  beforeUnmount() {
+    if (this._editor) {
+      this._editor.destroy();
+      this._editor = null;
+    }
+  },
+  methods: {
+    humanize(str) {
+      if (!str) return '';
+      return str.replace(/_/g, ' ').replace(/([a-z])([A-Z])/g, '$1 $2').replace(/^./, s => s.toUpperCase());
+    },
+    _isDark() {
+      return document.documentElement.dataset.colorScheme === 'dark' ||
+        window.matchMedia?.('(prefers-color-scheme: dark)').matches;
+    },
+    format() {
+      if (!this._editor) return;
+      try {
+        const formatted = JSON.stringify(JSON.parse(this._editor.getValue()), null, 2);
+        this._silent = true;
+        this._editor.setValue(formatted, -1);
+        this._silent = false;
+        this.rawValue = formatted;
+      } catch { /* invalid JSON */ }
+    },
+    onFallbackInput(e) {
+      this.rawValue = e.target.value;
+      try { this.$emit('update:modelValue', JSON.parse(this.rawValue)); } catch { /* ignore */ }
+    },
+  },
+};
+</script>

package/src/editors/NullableEditor.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="sf-nullable" :class="{ errors: fieldErrors.length }">
     <div class="sf-nullable-header">
-      <label class="sf-label" :class="{ required: isRequired }">{{ title }}</label>
+      <span class="sf-label" :class="{ required: isRequired }">{{ title }}</span>
       <button type="button" :class="toggleClass" @click="toggle">
         <template v-if="isNull">
           <SfIcon name="plus" /> Add

package/src/editors/NumberEditor.vue

@@ -1,15 +1,22 @@
 <template>
   <div class="sf-field" :class="{ errors: fieldErrors.length }">
-    <label class="sf-label" :class="{ required: isRequired }">{{ title }}</label>
-    <input
-      type="number"
-      class="sf-input"
-      :step="schema.type === 'integer' ? '1' : 'any'"
-      :min="schema.minimum != null ? String(schema.minimum) : undefined"
-      :max="schema.maximum != null ? String(schema.maximum) : undefined"
-      :value="modelValue != null ? modelValue : ''"
-      @input="onInput"
-    />
+    <span class="sf-label" :class="{ required: isRequired }">
+      {{ title }}
+      <span v-if="isNullable && isNullValue" class="sf-null-badge">null</span>
+    </span>
+    <div :class="isNullable ? 'sf-input-row' : null">
+      <input
+        type="number"
+        class="sf-input"
+        :step="schema.type === 'integer' ? '1' : 'any'"
+        :min="schema.minimum != null ? String(schema.minimum) : undefined"
+        :max="schema.maximum != null ? String(schema.maximum) : undefined"
+        :value="isNullValue ? '' : modelValue"
+        :placeholder="isNullValue ? 'null' : undefined"
+        @input="onInput"
+      />
+      <button v-if="isNullable && !isNullValue" type="button" class="sf-null-clear-btn" title="Set to null" @click="$emit('update:modelValue', null)">&#x2715;</button>
+    </div>
     <ul v-if="fieldErrors.length" class="errorlist">
       <li v-for="(err, i) in fieldErrors" :key="i">{{ err }}</li>
     </ul>
@@ -37,6 +44,12 @@ export default {
       const parentSchema = this.form.getSchemaAtPath(parentPath);
       return parentSchema && Array.isArray(parentSchema.required) && parentSchema.required.includes(fieldName);
     },
+    isNullable() {
+      return !!this.schema._nullable;
+    },
+    isNullValue() {
+      return this.modelValue === null || this.modelValue === undefined;
+    },
     fieldErrors() {
       if (!this.form || !this.form.getErrorsForPath) return [];
       return this.form.getErrorsForPath(this.path);

package/src/editors/ObjectEditor.vue

@@ -56,6 +56,9 @@ export default {
   data() {
     return {
       collapsed: false,
+      // Values pruned when a conditional rule deactivated their field,
+      // kept so toggling the controller back restores what the user typed.
+      prunedStash: {},
     };
   },
   computed: {
@@ -103,10 +106,21 @@ export default {
       const allowed = new Set(Object.keys(effective.properties || {}));
       let changed = false;
       const out = {};
+      // restore stashed values for fields a rule just re-activated
+      for (const k of allowed) {
+        if (!(k in value) && k in this.prunedStash) {
+          out[k] = this.prunedStash[k];
+          delete this.prunedStash[k];
+          changed = true;
+        }
+      }
       for (const k of Object.keys(value)) {
         if (allowed.has(k)) {
           out[k] = value[k];
         } else {
+          // pruned from the emitted value (documented behavior), but kept
+          // locally so a controller toggle round-trip is not destructive
+          this.prunedStash[k] = value[k];
           changed = true;
         }
       }

package/src/editors/RelationEditor.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="sf-field sf-relation" :class="{ errors: fieldErrors.length }" ref="root">
-    <label class="sf-label" :class="{ required: isRequired }">{{ title }}</label>
+    <span class="sf-label" :class="{ required: isRequired }">{{ title }}</span>
     <div class="sf-relation-wrapper">
       <!-- Selected items -->
       <div v-if="selected.length" class="sf-relation-selected">

package/src/editors/SchemaEditor.vue

@@ -25,6 +25,7 @@
 import StringEditor from './StringEditor.vue';
 import NumberEditor from './NumberEditor.vue';
 import BooleanEditor from './BooleanEditor.vue';
+import DateEditor from './DateEditor.vue';
 import SelectEditor from './SelectEditor.vue';
 import HiddenEditor from './HiddenEditor.vue';
 import ObjectEditor from './ObjectEditor.vue';
@@ -32,7 +33,9 @@ import ArrayEditor from './ArrayEditor.vue';
 import NullableEditor from './NullableEditor.vue';
 import UnionEditor from './UnionEditor.vue';
 import RelationEditor from './RelationEditor.vue';
+import JsonEditor from './JsonEditor.vue';
 import WebComponentWrapper from './WebComponentWrapper.vue';
+import { isChoiceOneOf } from '../utils';
 
 const MAX_DEPTH = 12;
 
@@ -42,6 +45,7 @@ export default {
     StringEditor,
     NumberEditor,
     BooleanEditor,
+    DateEditor,
     SelectEditor,
     HiddenEditor,
     ObjectEditor,
@@ -49,6 +53,7 @@ export default {
     NullableEditor,
     UnionEditor,
     RelationEditor,
+    JsonEditor,
     WebComponentWrapper,
   },
   inject: {
@@ -90,14 +95,19 @@ export default {
 
       if (schema.type === 'relation') return 'RelationEditor';
       if (schema.oneOf && schema.discriminator) return 'UnionEditor';
+      // Choice-list oneOf ({const, title} options) renders as a select —
+      // must be checked before the 'const' HiddenEditor routing.
+      if (isChoiceOneOf(schema.oneOf)) return 'SelectEditor';
       if ('const' in schema) return 'HiddenEditor';
       if (schema.enum && schema.enum.length === 1 && schema.type === 'string') return 'HiddenEditor';
-      if (schema._nullable) return 'NullableEditor';
+      if (schema._nullable && (schema.type === 'object' || schema.type === 'array')) return 'NullableEditor';
       if (schema.type === 'object' && schema.properties) return 'ObjectEditor';
+      if (schema.type === 'object') return 'JsonEditor';
       if (schema.type === 'array') return 'ArrayEditor';
       if (schema.enum) return 'SelectEditor';
       if (schema.type === 'boolean') return 'BooleanEditor';
       if (schema.type === 'number' || schema.type === 'integer') return 'NumberEditor';
+      if (schema.type === 'string' && (schema.format === 'date' || schema.format === 'date-time')) return 'DateEditor';
 
       return 'StringEditor';
     },

package/src/editors/SelectEditor.vue

@@ -1,15 +1,22 @@
 <template>
   <div class="sf-field" :class="{ errors: fieldErrors.length }">
-    <label class="sf-label" :class="{ required: isRequired }">{{ title }}</label>
-    <select
-      class="sf-input sf-select"
-      :value="modelValue != null ? String(modelValue) : ''"
-      @change="$emit('update:modelValue', $event.target.value)"
-    >
-      <option v-for="opt in (schema.enum || [])" :key="opt" :value="String(opt)">
-        {{ opt }}
-      </option>
-    </select>
+    <span class="sf-label" :class="{ required: isRequired }">
+      {{ title }}
+      <span v-if="isNullable && isNullValue" class="sf-null-badge">null</span>
+    </span>
+    <div :class="isNullable ? 'sf-input-row' : null">
+      <select
+        class="sf-input sf-select"
+        :value="selectedIndex === -1 ? '' : String(selectedIndex)"
+        @change="onChange($event.target.value)"
+      >
+        <option v-if="selectedIndex === -1" value="" disabled selected>{{ isNullValue ? 'null' : '' }}</option>
+        <option v-for="(opt, i) in options" :key="i" :value="String(i)">
+          {{ opt.label }}
+        </option>
+      </select>
+      <button v-if="isNullable && !isNullValue" type="button" class="sf-null-clear-btn" title="Set to null" @click="$emit('update:modelValue', null)">&#x2715;</button>
+    </div>
     <ul v-if="fieldErrors.length" class="errorlist">
       <li v-for="(err, i) in fieldErrors" :key="i">{{ err }}</li>
     </ul>
@@ -17,6 +24,8 @@
 </template>
 
 <script>
+import { isChoiceOneOf } from '../utils';
+
 export default {
   name: 'SelectEditor',
   props: {
@@ -27,6 +36,20 @@ export default {
   },
   emits: ['update:modelValue'],
   computed: {
+    options() {
+      // Two source shapes: a choice-list oneOf ({const, title} pairs, e.g.
+      // metaobjects' select kind — labels preserved) or a plain enum.
+      if (isChoiceOneOf(this.schema.oneOf)) {
+        return this.schema.oneOf.map((o) => ({
+          value: o.const,
+          label: o.title != null ? o.title : String(o.const),
+        }));
+      }
+      return (this.schema.enum || []).map((v) => ({ value: v, label: String(v) }));
+    },
+    selectedIndex() {
+      return this.options.findIndex((o) => o.value === this.modelValue);
+    },
     title() {
       return this.schema.title || this.humanize(this.path[this.path.length - 1]) || '';
     },
@@ -37,12 +60,25 @@ export default {
       const parentSchema = this.form.getSchemaAtPath(parentPath);
       return parentSchema && Array.isArray(parentSchema.required) && parentSchema.required.includes(fieldName);
     },
+    isNullable() {
+      return !!this.schema._nullable;
+    },
+    isNullValue() {
+      return this.modelValue === null || this.modelValue === undefined;
+    },
     fieldErrors() {
       if (!this.form || !this.form.getErrorsForPath) return [];
       return this.form.getErrorsForPath(this.path);
     },
   },
   methods: {
+    onChange(indexStr) {
+      const opt = this.options[Number(indexStr)];
+      // Emit the ORIGINAL option value (options are addressed by index in
+      // the DOM), so integer/boolean enums keep their native type instead
+      // of being stringified by the <select> element.
+      if (opt !== undefined) this.$emit('update:modelValue', opt.value);
+    },
     humanize(str) {
       if (!str) return '';
       return str.replace(/_/g, ' ').replace(/([a-z])([A-Z])/g, '$1 $2').replace(/^./, s => s.toUpperCase());