@ghentcdh/json-forms-core 0.6.8 → 0.7.0

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("zod");var z=(e=>(e.xs="xs",e.sm="sm",e.lg="lg",e.xl="xl",e))(z||{});const j=e=>{const t=e.anyOf;if(!Array.isArray(t)||t.length!==2)return;const s=t.find(o=>o.type!=="null"),r=t.some(o=>o.type==="null");s&&r&&(delete e.anyOf,Object.assign(e,s))},C=e=>{const t=i.toJSONSchema(e,{unrepresentable:"any",target:"draft-07"});t.additionalProperties=!0;const s=t.properties;if(s)for(const r of Object.keys(s))j(s[r]);return t},P=e=>{if(!e.schema)throw new Error("no schema provided");const t=e.schema,s=e.dtoSchema,r=C(s),o=C(t.partial());return{dtoSchema:s,responseSchema:e.responseSchema??s,schema:{form:{uiSchema:e.uiSchema,schema:r,modalSize:e.modalSize??"sm"},table:e.tableSchema?{uiSchema:e.tableSchema,schema:o}:void 0,filter:e.filterSchema?{uiSchema:e.filterSchema,schema:o}:void 0,uri:e.uri,searchUri:e.searchUri??`${e.uri}?filter=`}}},L=(e,t)=>{if(!e.scope)return{id:null,property:null};const s=e.scope?.substring(13),r=t?.properties?.[s]??{};return{id:s,property:r}},k=(e,t)=>{const{id:s,property:r}=L(e,t);return{...e,id:s,label:s,...r}};class p{constructor(t){this.type=t}}class m extends p{constructor(){super(...arguments),this.elements=[]}addControl(t){return this.elements.push(t),this}addControls(...t){return this.elements.push(...t),this}buildElements(){return this.elements.map(t=>t.build())}}const h={HorizontalLayout:"HorizontalLayout",VerticalLayout:"VerticalLayout",CollapseLayout:"CollapseLayout"};class a extends m{constructor(t,s={}){super(t),this.options=s}static horizontal(){return new a(h.HorizontalLayout)}static collapse(){return new a(h.CollapseLayout)}static vertical(){return new a(h.VerticalLayout)}titleKey(t){return this.addOptions({titleKey:t})}title(t){return this.addOptions({title:t})}addOptions(t){return this.options={...this.options,...t},this}build(){return{type:this.type,elements:this.buildElements(),options:this.options}}}class f extends p{constructor(t,s="TextCell"){super(s),this.scope=t}static properties(t){return new f(`#/properties/${t}`)}key(t){return this.options={format:"keyValue",key:t},this}setSortId(t){return this.options={...this.options??{format:"TextCell"},sortId:t},this}build(){return{type:this.type,scope:this.scope,options:this.options}}}class y{constructor(){this.builder=a.horizontal()}static init(){return new y}addControl(t){return this.builder.addControls(t),this}addControls(...t){return this.builder.addControls(...t),this}build(){return this.builder.build()}}const n={number:"number",string:"string",integer:"Integer",autocomplete:"autocomplete",textArea:"textArea",markdown:"markdown",array:"array",custom:"custom"};class l extends p{constructor(t,s="Control"){super(s),this.scope=t,this.options={format:"Control",styles:{control:{wrapper:"w-full"}}}}static asObject(t){return new l(`#/properties/${t}`,"Object")}static properties(t){return new l(`#/properties/${t}`)}static asCustom(t,s){const r=new l(`#/properties/${t}`);return r.options={format:n.custom,type:s},r}detail(t,s){return this._detail=t,this.options={...this.options??{},format:n.array,elementLabelProp:s},this}addAction(t){const s=this.options?.actions??[];return s.push(t),this.options={...this.options??{},actions:s},this}detailFixed(t,s={}){return this._detail=t,this.options={...this.options??{},hideActions:!0,format:n.array,layout:s.layout??"column",elementLabelProp:s.label},this}labelKey(t){return this.options={...this.options??{},labelKey:t},this}readonly(){return this.options={format:n.string,readonly:!0},this}markdown(){return this.options={format:n.markdown},this}textArea(t){return this.options={format:n.textArea,...t??{}},this}autocomplete(t){return this.options={format:n.autocomplete,dataField:"data",...t},this}width(t){const s={xs:"w-12",sm:"w-24",md:"w-36",lg:"w-48",xl:"w-64",full:"w-full"};return this.addOptions({styles:{...this.options?.styles,control:{wrapper:` ${s[t]??s.sm}`}}})}customLabel(t){return this.addOptions({label:t})}placeHolder(t){return this.addOptions({placeholder:t})}hideLabel(){return this.addOptions({hideLabel:!0})}addOptions(t){return this.options={...this.options,...t},this}build(){return{type:this.type,scope:this.scope,options:{...this.options,detail:this._detail?this._detail?.build():void 0}}}}class b extends m{constructor(t){super(t),this.label=t,this.rule={effect:"SHOW",condition:{}}}static label(t){return new b(t)}build(){return{type:"Category",label:this.label,rule:this.rule,elements:this.buildElements()}}}class S extends m{constructor(t){super(t),this.label=t}static label(t){return new S(t)}build(){return{type:"Group",label:this.label,elements:this.buildElements()}}}const u=()=>i.z.coerce.number().int().positive().nonnegative(),v=()=>i.z.string().or(i.z.array(i.z.string())).transform(e=>Array.isArray(e)?e:[e]),A=i.z.enum(["asc","desc"]),g=i.z.object({page:u().optional().default(1),pageSize:u().optional().default(20),sort:i.z.string().optional().default("id"),sortDir:A.optional().default("asc"),filter:v().optional().default([])}),F=g.transform(e=>{const{page:t,pageSize:s,sort:r}=e;return{...e,sort:r||"id",offset:(t-1)*s}}),R=g.extend({count:u(),totalPages:u()}),K=i.z.object({data:i.z.array(i.z.unknown()),request:R}),q=["contains","equals"],E=e=>{const[t,s,r]=e.split(":"),o=q.includes(r)?r:"contains";return{key:t,value:s,operator:o}},T=(e,t)=>{if(e.length===1)return{key:e[0],filterObj:t};const s=e.pop();return T(e,{[s]:t})},N=(e,t)=>w(e.split("."),t),w=(e,t)=>{if(e.length===1)return{[e[0]]:t};const s=e.pop();return w(e,{[s]:t})},$=e=>{const t={};return e?.forEach(s=>{const{key:r,value:o,operator:c}=E(s);if(!r)return;const d=c||"contains",O={[c||"contains"]:o.toLowerCase()};d==="contains"&&(O.mode="insensitive");const x=T(r.split("."),O);t[x.key]=x.filterObj}),t},H=e=>{const t=[];return e.forEach(s=>{const{key:r,value:o,operator:c}=E(s);if(!r)return;const d=r;t.push({label:d,key:r,value:o,operator:c})}),t};exports.CategoryBuilder=b;exports.ControlBuilder=l;exports.ControlType=n;exports.GroupBuilder=S;exports.LayoutBuilder=a;exports.LayoutTypes=h;exports.Operator=q;exports.PositiveRequestNumber=u;exports.RequestSchema=g;exports.RequestSchemaWithOffset=F;exports.ResponseRequestSchema=R;exports.ResponseSchema=K;exports.Size=z;exports.SortDirEnum=A;exports.StringOrArray=v;exports.TableBuilder=y;exports.TextCellBuilder=f;exports.buildFilter=$;exports.buildSort=N;exports.buildSortKey=w;exports.createSchema=P;exports.extractFilters=H;exports.findColumnDef=k;exports.findProperty=L;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("zod");var z=(e=>(e.xs="xs",e.sm="sm",e.lg="lg",e.xl="xl",e))(z||{});const j=e=>{const t=e.anyOf;if(!Array.isArray(t)||t.length!==2)return;const r=t.find(o=>o.type!=="null"),s=t.some(o=>o.type==="null");r&&s&&(delete e.anyOf,Object.assign(e,r))},w=e=>{const t=n.toJSONSchema(e,{unrepresentable:"any",target:"draft-07"});t.additionalProperties=!0;const r=t.properties;if(r)for(const s of Object.keys(r))j(r[s]);return t},P=e=>{if(!e.schema)throw new Error("no schema provided");const t=e.schema,r=e.dtoSchema,s=w(r),o=w(t.partial());return{dtoSchema:r,responseSchema:e.responseSchema??r,schema:{form:{uiSchema:e.uiSchema,schema:s,modalSize:e.modalSize??"sm"},table:e.tableSchema?{uiSchema:e.tableSchema,schema:o}:void 0,filter:e.filterSchema?{uiSchema:e.filterSchema,schema:o}:void 0,uri:e.uri,searchUri:e.searchUri??`${e.uri}?filter=`}}},L=(e,t)=>{if(!e.scope)return{id:null,property:null};const r=e.scope?.substring(13),s=t?.properties?.[r]??{};return{id:r,property:s}},k=(e,t)=>{const{id:r,property:s}=L(e,t);return{...e,id:r,label:r,...s}};class p{constructor(t){this.type=t}}class m extends p{constructor(){super(...arguments),this.elements=[]}addControl(t){return this.elements.push(t),this}addControls(...t){return this.elements.push(...t),this}buildElements(){return this.elements.map(t=>t.build())}}const l={HorizontalLayout:"HorizontalLayout",VerticalLayout:"VerticalLayout",CollapseLayout:"CollapseLayout",GridLayout:"GridLayout"};class a extends m{constructor(t,r={}){super(t),this.options=r}static horizontal(){return new a(l.HorizontalLayout)}static collapse(){return new a(l.CollapseLayout)}static vertical(){return new a(l.VerticalLayout)}static grid(){return new a(l.GridLayout)}titleKey(t){return this.addOptions({titleKey:t})}title(t){return this.addOptions({title:t})}addOptions(t){return this.options={...this.options,...t},this}build(){return{type:this.type,elements:this.buildElements(),options:this.options}}}class y extends p{constructor(t,r="TextCell"){super(r),this.scope=t}static properties(t){return new y(`#/properties/${t}`)}key(t){return this.options={format:"keyValue",key:t},this}setSortId(t){return this.options={...this.options??{format:"TextCell"},sortId:t},this}build(){return{type:this.type,scope:this.scope,options:this.options}}}class b{constructor(){this.builder=a.horizontal()}static init(){return new b}addControl(t){return this.builder.addControls(t),this}addControls(...t){return this.builder.addControls(...t),this}build(){return this.builder.build()}}const i={number:"number",string:"string",integer:"Integer",autocomplete:"autocomplete",textArea:"textArea",markdown:"markdown",array:"array",custom:"custom",select:"select",mutliSelect:"mutliSelect",boolean:"boolean"};class u extends p{constructor(t,r="Control"){super(r),this.scope=t,this.options={format:"Control",styles:{}}}static asObject(t){return new u(`#/properties/${t}`,"Object")}static properties(t){return new u(`#/properties/${t}`)}static asCustom(t,r){const s=new u(`#/properties/${t}`);return s.addOptions({format:i.custom,type:r}),s}detail(t,r){return this._detail=t,this.addOptions({format:i.array,elementLabelProp:r}),this}addAction(t){const r=this.options?.actions??[];return r.push(t),this.addOptions({actions:r})}detailFixed(t,r={}){return this._detail=t,this.addOptions({hideActions:!0,format:i.array,layout:r.layout??"column",elementLabelProp:r.label})}labelKey(t){return this.addOptions({labelKey:t})}readonly(){return this.addOptions({format:i.string,readonly:!0})}markdown(t){return this.addOptions({format:i.markdown,...t??{}})}textArea(t){return this.addOptions({format:i.textArea,...t??{}})}autocomplete(t){return this.addOptions({format:i.autocomplete,dataField:"data",...t??{}})}control(t,r){return this.addOptions({format:t,...r})}select(t){return this.addOptions({format:i.select,...t})}mutliSelect(t){return this.addOptions({format:i.mutliSelect,...t})}width(t){return this.addOptions({styles:{...this.options?.styles,width:t,control:{wrapper:`input-${t}`}}})}customLabel(t){return this.addOptions({label:t})}placeHolder(t){return this.addOptions({placeholder:t})}hideLabel(){return this.addOptions({hideLabel:!0})}addOptions(t){return this.options={...this.options,...t},this}build(){return{type:this.type,scope:this.scope,options:{...this.options,detail:this._detail?this._detail?.build():void 0}}}}class f extends m{constructor(t){super(t),this.label=t,this.rule={effect:"SHOW",condition:{}}}static label(t){return new f(t)}build(){return{type:"Category",label:this.label,rule:this.rule,elements:this.buildElements()}}}class S extends m{constructor(t){super(t),this.label=t}static label(t){return new S(t)}build(){return{type:"Group",label:this.label,elements:this.buildElements()}}}const c=()=>n.z.coerce.number().int().positive().nonnegative(),v=()=>n.z.string().or(n.z.array(n.z.string())).transform(e=>Array.isArray(e)?e:[e]),A=n.z.enum(["asc","desc"]),O=n.z.object({page:c().optional().default(1),pageSize:c().optional().default(20),sort:n.z.string().optional().default("id"),sortDir:A.optional().default("asc"),filter:v().optional().default([])}),F=O.transform(e=>{const{page:t,pageSize:r,sort:s}=e;return{...e,sort:s||"id",offset:(t-1)*r}}),R=O.extend({count:c(),totalPages:c()}),K=n.z.object({data:n.z.array(n.z.unknown()),request:R}),q=["contains","equals"],E=e=>{const[t,r,s]=e.split(":"),o=q.includes(s)?s:"contains";return{key:t,value:r,operator:o}},T=(e,t)=>{if(e.length===1)return{key:e[0],filterObj:t};const r=e.pop();return T(e,{[r]:t})},N=(e,t)=>g(e.split("."),t),g=(e,t)=>{if(e.length===1)return{[e[0]]:t};const r=e.pop();return g(e,{[r]:t})},$=e=>{const t={};return e?.forEach(r=>{const{key:s,value:o,operator:d}=E(r);if(!s)return;const h=d||"contains",x={[d||"contains"]:o.toLowerCase()};h==="contains"&&(x.mode="insensitive");const C=T(s.split("."),x);t[C.key]=C.filterObj}),t},G=e=>{const t=[];return e.forEach(r=>{const{key:s,value:o,operator:d}=E(r);if(!s)return;const h=s;t.push({label:h,key:s,value:o,operator:d})}),t};exports.CategoryBuilder=f;exports.ControlBuilder=u;exports.ControlType=i;exports.GroupBuilder=S;exports.LayoutBuilder=a;exports.LayoutTypes=l;exports.Operator=q;exports.PositiveRequestNumber=c;exports.RequestSchema=O;exports.RequestSchemaWithOffset=F;exports.ResponseRequestSchema=R;exports.ResponseSchema=K;exports.Size=z;exports.SortDirEnum=A;exports.StringOrArray=v;exports.TableBuilder=b;exports.TextCellBuilder=y;exports.buildFilter=$;exports.buildSort=N;exports.buildSortKey=g;exports.createSchema=P;exports.extractFilters=G;exports.findColumnDef=k;exports.findProperty=L;

package/index.js

@@ -3,34 +3,34 @@ var E = /* @__PURE__ */ ((e) => (e.xs = "xs", e.sm = "sm", e.lg = "lg", e.xl = "
 const j = (e) => {
   const t = e.anyOf;
   if (!Array.isArray(t) || t.length !== 2) return;
-  const s = t.find(
+  const r = t.find(
     (o) => o.type !== "null"
-  ), r = t.some(
+  ), s = t.some(
     (o) => o.type === "null"
   );
-  s && r && (delete e.anyOf, Object.assign(e, s));
+  r && s && (delete e.anyOf, Object.assign(e, r));
 }, y = (e) => {
   const t = v(e, {
     unrepresentable: "any",
     target: "draft-07"
   });
   t.additionalProperties = !0;
-  const s = t.properties;
-  if (s)
-    for (const r of Object.keys(s))
-      j(s[r]);
+  const r = t.properties;
+  if (r)
+    for (const s of Object.keys(r))
+      j(r[s]);
   return t;
 }, R = (e) => {
   if (!e.schema)
     throw new Error("no schema provided");
-  const t = e.schema, s = e.dtoSchema, r = y(s), o = y(t.partial());
+  const t = e.schema, r = e.dtoSchema, s = y(r), o = y(t.partial());
   return {
-    dtoSchema: s,
-    responseSchema: e.responseSchema ?? s,
+    dtoSchema: r,
+    responseSchema: e.responseSchema ?? r,
     schema: {
       form: {
         uiSchema: e.uiSchema,
-        schema: r,
+        schema: s,
         modalSize: e.modalSize ?? "sm"
       },
       table: e.tableSchema ? {
@@ -48,18 +48,18 @@ const j = (e) => {
 }, k = (e, t) => {
   if (!e.scope)
     return { id: null, property: null };
-  const s = e.scope?.substring(13), r = t?.properties?.[s] ?? {};
-  return { id: s, property: r };
+  const r = e.scope?.substring(13), s = t?.properties?.[r] ?? {};
+  return { id: r, property: s };
 }, $ = (e, t) => {
-  const { id: s, property: r } = k(e, t);
-  return { ...e, id: s, label: s, ...r };
+  const { id: r, property: s } = k(e, t);
+  return { ...e, id: r, label: r, ...s };
 };
-class d {
+class p {
   constructor(t) {
     this.type = t;
   }
 }
-class m extends d {
+class m extends p {
   constructor() {
     super(...arguments), this.elements = [];
   }
@@ -73,23 +73,27 @@ class m extends d {
     return this.elements.map((t) => t.build());
   }
 }
-const p = {
+const u = {
   HorizontalLayout: "HorizontalLayout",
   VerticalLayout: "VerticalLayout",
-  CollapseLayout: "CollapseLayout"
+  CollapseLayout: "CollapseLayout",
+  GridLayout: "GridLayout"
 };
 class a extends m {
-  constructor(t, s = {}) {
-    super(t), this.options = s;
+  constructor(t, r = {}) {
+    super(t), this.options = r;
   }
   static horizontal() {
-    return new a(p.HorizontalLayout);
+    return new a(u.HorizontalLayout);
   }
   static collapse() {
-    return new a(p.CollapseLayout);
+    return new a(u.CollapseLayout);
   }
   static vertical() {
-    return new a(p.VerticalLayout);
+    return new a(u.VerticalLayout);
+  }
+  static grid() {
+    return new a(u.GridLayout);
   }
   titleKey(t) {
     return this.addOptions({ titleKey: t });
@@ -111,12 +115,12 @@ class a extends m {
     };
   }
 }
-class S extends d {
-  constructor(t, s = "TextCell") {
-    super(s), this.scope = t;
+class O extends p {
+  constructor(t, r = "TextCell") {
+    super(r), this.scope = t;
   }
   static properties(t) {
-    return new S(`#/properties/${t}`);
+    return new O(`#/properties/${t}`);
   }
   key(t) {
     return this.options = {
@@ -138,12 +142,12 @@ class S extends d {
     };
   }
 }
-class g {
+class S {
   constructor() {
     this.builder = a.horizontal();
   }
   static init() {
-    return new g();
+    return new S();
   }
   addControl(t) {
     return this.builder.addControls(t), this;
@@ -163,102 +167,107 @@ const i = {
   textArea: "textArea",
   markdown: "markdown",
   array: "array",
-  custom: "custom"
+  custom: "custom",
+  select: "select",
+  mutliSelect: "mutliSelect",
+  boolean: "boolean"
 };
-class u extends d {
-  constructor(t, s = "Control") {
-    super(s), this.scope = t, this.options = {
+class c extends p {
+  constructor(t, r = "Control") {
+    super(r), this.scope = t, this.options = {
       format: "Control",
-      styles: {
-        control: {
-          wrapper: "w-full"
-        }
-      }
+      styles: {}
     };
   }
   static asObject(t) {
-    return new u(
+    return new c(
       `#/properties/${t}`,
       "Object"
     );
   }
   static properties(t) {
-    return new u(`#/properties/${t}`);
+    return new c(`#/properties/${t}`);
   }
-  static asCustom(t, s) {
-    const r = new u(
+  static asCustom(t, r) {
+    const s = new c(
       `#/properties/${t}`
     );
-    return r.options = {
+    return s.addOptions({
       format: i.custom,
-      type: s
-    }, r;
+      type: r
+    }), s;
   }
-  detail(t, s) {
-    return this._detail = t, this.options = {
-      ...this.options ?? {},
+  detail(t, r) {
+    return this._detail = t, this.addOptions({
       format: i.array,
-      elementLabelProp: s
-    }, this;
+      elementLabelProp: r
+    }), this;
   }
   addAction(t) {
-    const s = this.options?.actions ?? [];
-    return s.push(t), this.options = {
-      ...this.options ?? {},
-      actions: s
-    }, this;
+    const r = this.options?.actions ?? [];
+    return r.push(t), this.addOptions({ actions: r });
   }
-  detailFixed(t, s = {}) {
-    return this._detail = t, this.options = {
-      ...this.options ?? {},
+  detailFixed(t, r = {}) {
+    return this._detail = t, this.addOptions({
       hideActions: !0,
       format: i.array,
-      layout: s.layout ?? "column",
-      elementLabelProp: s.label
-    }, this;
+      layout: r.layout ?? "column",
+      elementLabelProp: r.label
+    });
   }
   labelKey(t) {
-    return this.options = {
-      ...this.options ?? {},
-      labelKey: t
-    }, this;
+    return this.addOptions({ labelKey: t });
   }
   readonly() {
-    return this.options = {
+    return this.addOptions({
       format: i.string,
       readonly: !0
-    }, this;
+    });
   }
-  markdown() {
-    return this.options = { format: i.markdown }, this;
+  markdown(t) {
+    return this.addOptions({
+      format: i.markdown,
+      ...t ?? {}
+    });
   }
   textArea(t) {
-    return this.options = {
+    return this.addOptions({
       format: i.textArea,
       ...t ?? {}
-    }, this;
+    });
   }
   autocomplete(t) {
-    return this.options = {
+    return this.addOptions({
       format: i.autocomplete,
       dataField: "data",
+      ...t ?? {}
+    });
+  }
+  control(t, r) {
+    return this.addOptions({
+      format: t,
+      ...r
+    });
+  }
+  select(t) {
+    return this.addOptions({
+      format: i.select,
       ...t
-    }, this;
+    });
+  }
+  mutliSelect(t) {
+    return this.addOptions({
+      format: i.mutliSelect,
+      ...t
+    });
   }
   width(t) {
-    const s = {
-      xs: "w-12",
-      sm: "w-24",
-      md: "w-36",
-      lg: "w-48",
-      xl: "w-64",
-      full: "w-full"
-    };
     return this.addOptions({
       styles: {
         ...this.options?.styles,
+        width: t,
         control: {
-          wrapper: ` ${s[t] ?? s.sm}`
+          wrapper: `input-${t}`
         }
       }
     });
@@ -289,7 +298,7 @@ class u extends d {
     };
   }
 }
-class w extends m {
+class g extends m {
   constructor(t) {
     super(t), this.label = t, this.rule = {
       effect: "SHOW",
@@ -297,7 +306,7 @@ class w extends m {
     };
   }
   static label(t) {
-    return new w(t);
+    return new g(t);
   }
   build() {
     return {
@@ -308,12 +317,12 @@ class w extends m {
     };
   }
 }
-class x extends m {
+class w extends m {
   constructor(t) {
     super(t), this.label = t;
   }
   static label(t) {
-    return new x(t);
+    return new w(t);
   }
   build() {
     return {
@@ -323,84 +332,84 @@ class x extends m {
     };
   }
 }
-const c = () => n.coerce.number().int().positive().nonnegative(), z = () => n.string().or(n.array(n.string())).transform((e) => Array.isArray(e) ? e : [e]), q = n.enum(["asc", "desc"]), O = n.object({
-  page: c().optional().default(1),
-  pageSize: c().optional().default(20),
+const d = () => n.coerce.number().int().positive().nonnegative(), z = () => n.string().or(n.array(n.string())).transform((e) => Array.isArray(e) ? e : [e]), q = n.enum(["asc", "desc"]), x = n.object({
+  page: d().optional().default(1),
+  pageSize: d().optional().default(20),
   // TODO add sorting and so
   sort: n.string().optional().default("id"),
   sortDir: q.optional().default("asc"),
   // Filter is of the format key:value:operator (e.g. name:john:eq) operator is optional
   filter: z().optional().default([])
-}), H = O.transform((e) => {
-  const { page: t, pageSize: s, sort: r } = e;
+}), H = x.transform((e) => {
+  const { page: t, pageSize: r, sort: s } = e;
   return {
     ...e,
-    sort: r || "id",
-    offset: (t - 1) * s
+    sort: s || "id",
+    offset: (t - 1) * r
   };
-}), F = O.extend({
-  count: c(),
-  totalPages: c()
+}), F = x.extend({
+  count: d(),
+  totalPages: d()
 }), N = n.object({
   data: n.array(n.unknown()),
   request: F
 }), K = ["contains", "equals"], C = (e) => {
-  const [t, s, r] = e.split(":"), o = K.includes(r) ? r : "contains";
-  return { key: t, value: s, operator: o };
+  const [t, r, s] = e.split(":"), o = K.includes(s) ? s : "contains";
+  return { key: t, value: r, operator: o };
 }, L = (e, t) => {
   if (e.length === 1)
     return { key: e[0], filterObj: t };
-  const s = e.pop();
-  return L(e, { [s]: t });
+  const r = e.pop();
+  return L(e, { [r]: t });
 }, T = (e, t) => A(e.split("."), t), A = (e, t) => {
   if (e.length === 1)
     return { [e[0]]: t };
-  const s = e.pop();
-  return A(e, { [s]: t });
+  const r = e.pop();
+  return A(e, { [r]: t });
 }, V = (e) => {
   const t = {};
-  return e?.forEach((s) => {
-    const { key: r, value: o, operator: l } = C(s);
-    if (!r) return;
+  return e?.forEach((r) => {
+    const { key: s, value: o, operator: l } = C(r);
+    if (!s) return;
     const h = l || "contains", f = {
       [l || "contains"]: o.toLowerCase()
     };
     h === "contains" && (f.mode = "insensitive");
-    const b = L(r.split("."), f);
+    const b = L(s.split("."), f);
     t[b.key] = b.filterObj;
   }), t;
-}, W = (e) => {
+}, G = (e) => {
   const t = [];
-  return e.forEach((s) => {
-    const { key: r, value: o, operator: l } = C(s);
-    if (!r) return;
-    const h = r;
-    t.push({ label: h, key: r, value: o, operator: l });
+  return e.forEach((r) => {
+    const { key: s, value: o, operator: l } = C(r);
+    if (!s) return;
+    const h = s;
+    t.push({ label: h, key: s, value: o, operator: l });
   }), t;
 };
 export {
-  w as CategoryBuilder,
-  u as ControlBuilder,
+  g as CategoryBuilder,
+  c as ControlBuilder,
   i as ControlType,
-  x as GroupBuilder,
+  w as GroupBuilder,
   a as LayoutBuilder,
-  p as LayoutTypes,
+  u as LayoutTypes,
   K as Operator,
-  c as PositiveRequestNumber,
-  O as RequestSchema,
+  d as PositiveRequestNumber,
+  x as RequestSchema,
   H as RequestSchemaWithOffset,
   F as ResponseRequestSchema,
   N as ResponseSchema,
   E as Size,
   q as SortDirEnum,
   z as StringOrArray,
-  g as TableBuilder,
-  S as TextCellBuilder,
+  S as TableBuilder,
+  O as TextCellBuilder,
   V as buildFilter,
   T as buildSort,
   A as buildSortKey,
   R as createSchema,
-  W as extractFilters,
+  G as extractFilters,
   $ as findColumnDef,
   k as findProperty
 };

package/lib/create-schema.d.ts

@@ -1,5 +1,4 @@
-import { JsonSchema } from '@jsonforms/core';
-import { Layout } from '@jsonforms/core/src/models/uischema';
+import { JsonSchema, Layout } from '@jsonforms/core';
 import { ZodObject } from 'zod';
 export declare enum Size {
     xs = "xs",

package/lib/layout/control.builder.d.ts

@@ -9,23 +9,37 @@ export declare const ControlType: {
     readonly markdown: "markdown";
     readonly array: "array";
     readonly custom: "custom";
+    readonly select: "select";
+    readonly mutliSelect: "mutliSelect";
+    readonly boolean: "boolean";
 };
 export interface TextAreaOptions extends ControlOption {
     format: 'textArea';
 }
+export interface MarkdownOptions extends ControlOption {
+    format: 'markdown';
+    minHeight: string;
+}
 export interface DetailOptions extends ControlOption {
     format: 'array';
     layout: 'row' | 'column';
 }
-export interface AutocompleteOptions extends ControlOption {
+export interface SelectOptions extends ControlOption {
+    format: 'select' | 'multiselect';
+    options: Array<any>;
+    labelKey?: string;
+    valueKey?: string;
+}
+export interface AutocompleteOptions extends Omit<SelectOptions, 'format'> {
+    format: 'autocomplete';
+    freeText?: boolean;
+    enableCreate?: boolean;
+}
+export interface AutocompleteRemoteOptions extends Omit<AutocompleteOptions, 'format' | 'options'> {
     format: 'autocomplete';
     uri: string;
     dataField?: string;
     skipAuth?: boolean;
-    field: {
-        id: string;
-        label: string;
-    };
 }
 export type ArrayActionType = 'edit';
 export type ArrayAction = {
@@ -39,7 +53,7 @@ export interface ControlOption {
     styles?: Partial<any>;
     elements?: any;
     elementLabelProp?: string;
-    labelKey?: string;
+    customLabel?: string;
     actions?: ArrayAction[];
     placeholder?: string;
     hideLabel?: boolean;
@@ -66,9 +80,12 @@ export declare class ControlBuilder<TYPE, KEY = keyof TYPE> extends Builder<Cont
     }): this;
     labelKey(labelKey: string): this;
     readonly(): ControlBuilder<TYPE>;
-    markdown(): ControlBuilder<TYPE>;
+    markdown(options?: Omit<MarkdownOptions, 'format'>): ControlBuilder<TYPE>;
     textArea(options?: Omit<TextAreaOptions, 'format'>): this;
-    autocomplete(options: Omit<AutocompleteOptions, 'format'>): this;
+    autocomplete(options: Omit<AutocompleteOptions, 'format'> | Omit<AutocompleteRemoteOptions, 'format'>): this;
+    control(format: string, options?: Partial<ControlOption>): this;
+    select(options: Omit<SelectOptions, 'format'>): this;
+    mutliSelect(options: Omit<SelectOptions, 'format'>): this;
     width(width: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'full'): this;
     customLabel(label: string): this;
     placeHolder(placeholder: string): this;

package/lib/layout/layout.builder.d.ts

@@ -8,6 +8,7 @@ export declare const LayoutTypes: {
     readonly HorizontalLayout: "HorizontalLayout";
     readonly VerticalLayout: "VerticalLayout";
     readonly CollapseLayout: "CollapseLayout";
+    readonly GridLayout: "GridLayout";
 };
 type _LayoutTypes = (typeof LayoutTypes)[keyof typeof LayoutTypes];
 export type LayoutType = {
@@ -20,6 +21,7 @@ export declare class LayoutBuilder<TYPE> extends BuilderWithElements<LayoutType,
     static horizontal<TYPE>(): LayoutBuilder<TYPE>;
     static collapse<TYPE>(): LayoutBuilder<TYPE>;
     static vertical<TYPE>(): LayoutBuilder<TYPE>;
+    static grid<TYPE>(): LayoutBuilder<TYPE>;
     titleKey(titleKey: string): this;
     title(title: string): this;
     private addOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghentcdh/json-forms-core",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "type": "module",
   "main": "./index.js",
   "types": "./index.d.ts",