@structured-field/widget-editor 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@structured-field/widget-editor",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "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",

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/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/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

@@ -32,6 +32,7 @@ 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';
 
 const MAX_DEPTH = 12;
@@ -49,6 +50,7 @@ export default {
     NullableEditor,
     UnionEditor,
     RelationEditor,
+    JsonEditor,
     WebComponentWrapper,
   },
   inject: {
@@ -92,8 +94,9 @@ export default {
       if (schema.oneOf && schema.discriminator) return 'UnionEditor';
       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';

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="isNullValue ? '' : (modelValue != null ? String(modelValue) : '')"
+        @change="$emit('update:modelValue', $event.target.value)"
+      >
+        <option v-if="isNullable && isNullValue" value="" disabled selected>null</option>
+        <option v-for="opt in (schema.enum || [])" :key="opt" :value="String(opt)">
+          {{ opt }}
+        </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>
@@ -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/StringEditor.vue

@@ -1,22 +1,28 @@
 <template>
   <div class="sf-field" :class="{ errors: fieldErrors.length }">
-    <label class="sf-label" :class="{ required: isRequired }">{{ title }}</label>
-    <textarea
-      v-if="isLong"
-      class="sf-input sf-textarea"
-      rows="3"
-      :value="modelValue"
-      :placeholder="schema.placeholder || ''"
-      @input="$emit('update:modelValue', $event.target.value)"
-    />
-    <input
-      v-else
-      type="text"
-      class="sf-input"
-      :value="modelValue != null ? String(modelValue) : ''"
-      :placeholder="schema.placeholder || ''"
-      @input="$emit('update:modelValue', $event.target.value)"
-    />
+    <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">
+      <textarea
+        v-if="isLong"
+        class="sf-input sf-textarea"
+        rows="3"
+        :value="isNullValue ? '' : modelValue"
+        :placeholder="isNullValue ? 'null' : (schema.placeholder || '')"
+        @input="$emit('update:modelValue', $event.target.value)"
+      />
+      <input
+        v-else
+        type="text"
+        class="sf-input"
+        :value="isNullValue ? '' : (modelValue != null ? String(modelValue) : '')"
+        :placeholder="isNullValue ? 'null' : (schema.placeholder || '')"
+        @input="$emit('update:modelValue', $event.target.value)"
+      />
+      <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>
@@ -47,6 +53,12 @@ export default {
     isLong() {
       return this.schema.maxLength > 255 || this.schema.format === 'textarea';
     },
+    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/UnionEditor.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="sf-union">
     <div class="sf-field">
-      <label class="sf-label">{{ title }}</label>
+      <span class="sf-label">{{ title }}</span>
       <select class="sf-input sf-select" :value="currentType" @change="onTypeChange">
         <option v-for="key in typeKeys" :key="key" :value="key">{{ humanize(key) }}</option>
       </select>

package/src/scss/components/editors.scss

@@ -206,6 +206,63 @@
     }
   }
 
+  // --- Inline nullable controls ---
+  .sf-null-badge {
+    display: inline-block;
+    font-size: 0.65rem;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--body-quiet-color, #888);
+    background: var(--darkened-bg, #f0f0f0);
+    border: 1px solid var(--border-color, #ccc);
+    border-radius: 3px;
+    padding: 1px 5px;
+    vertical-align: middle;
+    margin-left: 4px;
+  }
+
+  .sf-input-row {
+    display: flex;
+    align-items: stretch;
+    gap: 4px;
+
+    .sf-input {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+
+  .sf-boolean-row {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+  }
+
+  .sf-null-clear-btn {
+    flex-shrink: 0;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 26px;
+    height: 26px;
+    padding: 0;
+    border: 1px solid var(--border-color, #ccc);
+    border-radius: 4px;
+    background: transparent;
+    cursor: pointer;
+    color: var(--body-quiet-color, #888);
+    font-size: 0.75rem;
+    line-height: 1;
+    align-self: center;
+
+    &:hover {
+      background: var(--error-bg, #fff2f2);
+      border-color: var(--error-fg, #ba2121);
+      color: var(--error-fg, #ba2121);
+    }
+  }
+
   // --- Nullable editor ---
   .sf-nullable {
     margin-bottom: 12px;
@@ -234,6 +291,63 @@
     }
   }
 
+  // --- JSON editor ---
+  .sf-field-json {
+    .sf-json-editor {
+      position: relative;
+      border: 1px solid var(--border-color, #ccc);
+      border-radius: 4px;
+      overflow: hidden;
+
+      &.sf-json-error {
+        border-color: var(--error-fg, #ba2121);
+      }
+    }
+
+    .sf-json-toolbar {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      gap: 8px;
+      padding: 4px 6px;
+      background: var(--darkened-bg, #f8f8f8);
+      border-bottom: 1px solid var(--border-color, #ccc);
+    }
+
+    .sf-json-error-msg {
+      font-size: 0.72rem;
+      color: var(--error-fg, #ba2121);
+      flex: 1;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .sf-json-format-btn {
+      flex-shrink: 0;
+    }
+
+    .sf-json-ace-container {
+      width: 100%;
+      font-size: 0.8rem;
+      // Ace sets its own height via maxLines/minLines
+      .ace_editor {
+        font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace !important;
+        font-size: 0.8rem !important;
+      }
+    }
+
+    .sf-json-textarea-fallback {
+      width: 100%;
+      min-height: 120px;
+      font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace;
+      font-size: 0.8rem;
+      border: none;
+      border-radius: 0;
+      resize: vertical;
+    }
+  }
+
   // --- Union editor ---
   .sf-union {
     margin-bottom: 12px;