1+ import { fieldArrayPrimitive } from './triage/array-primitive' ;
12/* eslint-disable max-lines */
23/* eslint-disable class-methods-use-this */
34/* eslint-disable no-underscore-dangle */
@@ -19,12 +20,12 @@ import set from 'lodash-es/set';
1920import type { JSONSchema7 } from '@jsfe/types' ;
2021
2122// import { alternateField } from './triage/alternate.js';
22- import { arrayField } from './triage/array.js' ;
23- import { objectField } from './triage/object.js' ;
24- import { field } from './triage/field .js' ;
23+ import { fieldArray } from './triage/array.js' ;
24+ import { fieldObject } from './triage/object.js' ;
25+ import { fieldPrimitive } from './triage/primitive .js' ;
2526
2627import type {
27- OnDataChange ,
28+ DataChangeCallback ,
2829 FeatureFlags ,
2930 OnFormSubmit ,
3031 Path ,
@@ -41,7 +42,7 @@ export class Jsf extends LitElement {
4142
4243 public submitCallback : OnFormSubmit = ( ) => { } ;
4344
44- public onDataChange : OnDataChange = ( ) => { } ;
45+ public dataChangeCallback : DataChangeCallback = ( ) => { } ;
4546
4647 @property ( { type : Object } ) public widgets : Widgets = { } ;
4748
@@ -103,7 +104,7 @@ export class Jsf extends LitElement {
103104 // if (typeof propName !== 'undefined') schemaPathAugmented.push(propName);
104105 // schemaPathAugmented.push('properties');
105106
106- result = field (
107+ result = fieldPrimitive (
107108 currentNode ,
108109 dataLevel ,
109110 path ,
@@ -141,7 +142,7 @@ export class Jsf extends LitElement {
141142 schemaPathAugmented . push ( 'properties' ) ;
142143 // schemaPathAugmented.push(path);
143144
144- result = objectField (
145+ result = fieldObject (
145146 nodeParsed ,
146147 dataLevel ,
147148 path ,
@@ -153,6 +154,33 @@ export class Jsf extends LitElement {
153154 ) ;
154155 }
155156
157+ /* --- Arrays of primitives --- */
158+ if (
159+ currentNode . type === 'array' &&
160+ typeof currentNode . items === 'object' &&
161+ ! Array . isArray ( currentNode . items ) &&
162+ currentNode . items . enum &&
163+ currentNode . uniqueItems &&
164+ ( currentNode . items . type === 'string' ||
165+ currentNode . items . type === 'number' ||
166+ currentNode . items . type === 'integer' ||
167+ currentNode . items . type === 'boolean' )
168+ ) {
169+ const schemaPathAugmented = [ ...schemaPath ] ;
170+ result = fieldArrayPrimitive (
171+ currentNode ,
172+ dataLevel ,
173+ path ,
174+ uiState ,
175+ uiSchema ,
176+ required ,
177+ this . _handleChange . bind ( this ) ,
178+ // this._handleKeydown.bind(this),
179+ schemaPathAugmented ,
180+ this . widgets ,
181+ ) ;
182+ }
183+
156184 /* --- Arrays --- */
157185 if ( typeof currentNode . items === 'object' ) {
158186 /* --- Fixed Array --- */
@@ -169,14 +197,15 @@ export class Jsf extends LitElement {
169197 // if (typeof propName !== 'undefined') schemaPathAugmented.push(propName);
170198 // schemaPathAugmented.push('items');
171199
172- result = objectField (
200+ result = fieldObject (
173201 newNode ,
174202 dataLevel ,
175203 path ,
176204 uiState ,
177205 uiSchema ,
178206 this . _dig . bind ( this ) ,
179207 schemaPathAugmented ,
208+ this . widgets ,
180209 ) ;
181210
182211 /* --- Additionals Array items --- */
@@ -227,7 +256,7 @@ export class Jsf extends LitElement {
227256 // if (typeof propName !== 'undefined') schemaPathAugmented.push(propName);
228257 // schemaPathAugmented.push('items');
229258 dataLevel ||= [ ] ;
230- result = arrayField (
259+ result = fieldArray (
231260 node ,
232261 dataLevel ,
233262 path ,
@@ -259,17 +288,19 @@ export class Jsf extends LitElement {
259288 if ( Object . entries ( node ) . length === 0 ) {
260289 const error = `Empty schema` ;
261290 return (
262- this . widgets ?. callout ?.( { id : '' , message : error } ) ?? html `${ error }
291+ this . widgets ?. callout ?.( { id : '' , message : error } ) ??
292+ html `< p > ${ error } </ p > `
263293 ) ;
264294 }
265295
266296 if ( result ) return result ;
267297
268- const error = `Cannot dig this level:${ path . join ( '/' ) } ${ String (
298+ const error = `Cannot dig this level: ${ path . join ( '/' ) } - ( ${ String (
269299 currentNode . type ,
270- ) } `;
300+ ) } ) `;
271301 return (
272- this . widgets ?. callout ?.( { id : '' , message : error } ) ?? html `${ error }
302+ this . widgets ?. callout ?.( { id : '' , message : error } ) ??
303+ html `< p > ${ error } </ p > `
273304 ) ;
274305 } ;
275306
@@ -301,7 +332,7 @@ export class Jsf extends LitElement {
301332 // NOTE: May be debounced / throttled
302333 this . data = newData ;
303334
304- this . onDataChange ( newData , path , value , schemaPath ) ;
335+ this . dataChangeCallback ( newData , path , value , schemaPath ) ;
305336
306337 // TODO:
307338 // this.dispatchEvent(new CustomEvent('jsf-data', { detail: newData }));
0 commit comments