@ghentcdh/json-forms-core 0.6.7 → 0.6.9

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("zod");var z=(e=>(e.xs="xs",e.sm="sm",e.lg="lg",e.xl="xl",e))(z||{});const C=e=>o.toJSONSchema(e,{unrepresentable:"any",target:"draft-07"}),F=e=>{if(!e.schema)throw new Error("no schema provided");const t=e.schema,r=e.dtoSchema,s=C(r),i=C(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:i}:void 0,filter:e.filterSchema?{uiSchema:e.filterSchema,schema:i}:void 0,uri:e.uri,searchUri:e.searchUri??`${e.uri}?filter=`}}},v=(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}},P=(e,t)=>{const{id:r,property:s}=v(e,t);return{...e,id:r,label:r,...s}};class p{constructor(t){this.type=t}}class d 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())}}class a extends d{constructor(t,r={}){super(t),this.options=r}static horizontal(){return new a("HorizontalLayout")}static stepper(t=!1){return new a("Categorization",{variant:"stepper",showNavButtons:!t})}static table(){return new a("table")}static vertical(){return new a("VerticalLayout")}build(){return{type:this.type,elements:this.buildElements(),options:this.options}}}class m extends p{constructor(t,r="TextCell"){super(r),this.scope=t}static properties(t){return new m(`#/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.table()}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 n={number:"number",string:"string",integer:"Integer",autocomplete:"autocomplete",textArea:"textArea",markdown:"markdown",fixedArray:"fixedArray",array:"array",custom:"custom"};class l extends p{constructor(t,r="Control"){super(r),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,r){const s=new l(`#/properties/${t}`);return s.options={format:n.custom,type:r},s}detail(t,r){return this._detail=t,this.options={...this.options??{},format:n.array,elementLabelProp:r},this}addAction(t){const r=this.options?.actions??[];return r.push(t),this.options={...this.options??{},actions:r},this}detailFixed(t,r){return this._detail=t,this.options={...this.options??{},format:n.fixedArray,elementLabelProp:r},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 r={xs:"w-12",sm:"w-24",md:"w-36",lg:"w-48",xl:"w-64"};return this.options={...this.options,styles:{...this.options?.styles,control:{wrapper:r[t]??r.sm}}},this}customLabel(t){return this.options={...this.options,label:t},this}build(){return{type:this.type,scope:this.scope,options:{...this.options,detail:this._detail?this._detail?.build():void 0}}}}class f extends d{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 y extends d{constructor(t){super(t),this.label=t}static label(t){return new y(t)}build(){return{type:"Group",label:this.label,elements:this.buildElements()}}}const u=()=>o.z.coerce.number().int().positive().nonnegative(),A=()=>o.z.string().or(o.z.array(o.z.string())).transform(e=>Array.isArray(e)?e:[e]),O=o.z.enum(["asc","desc"]),S=o.z.object({page:u().optional().default(1),pageSize:u().optional().default(20),sort:o.z.string().optional().default("id"),sortDir:O.optional().default("asc"),filter:A().optional().default([])}),T=S.transform(e=>{const{page:t,pageSize:r,sort:s}=e;return{...e,sort:s||"id",offset:(t-1)*r}}),R=S.extend({count:u(),totalPages:u()}),k=o.z.object({data:o.z.array(o.z.unknown()),request:R}),q=["contains","equals"],E=e=>{const[t,r,s]=e.split(":"),i=q.includes(s)?s:"contains";return{key:t,value:r,operator:i}},j=(e,t)=>{if(e.length===1)return{key:e[0],filterObj:t};const r=e.pop();return j(e,{[r]:t})},K=(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:i,operator:c}=E(r);if(!s)return;const h=c||"contains",w={[c||"contains"]:i.toLowerCase()};h==="contains"&&(w.mode="insensitive");const x=j(s.split("."),w);t[x.key]=x.filterObj}),t},B=e=>{const t=[];return e.forEach(r=>{const{key:s,value:i,operator:c}=E(r);if(!s)return;const h=s;t.push({label:h,key:s,value:i,operator:c})}),t};exports.CategoryBuilder=f;exports.ControlBuilder=l;exports.ControlType=n;exports.GroupBuilder=y;exports.LayoutBuilder=a;exports.Operator=q;exports.PositiveRequestNumber=u;exports.RequestSchema=S;exports.RequestSchemaWithOffset=T;exports.ResponseRequestSchema=R;exports.ResponseSchema=k;exports.Size=z;exports.SortDirEnum=O;exports.StringOrArray=A;exports.TableBuilder=b;exports.TextCellBuilder=m;exports.buildFilter=$;exports.buildSort=K;exports.buildSortKey=g;exports.createSchema=F;exports.extractFilters=B;exports.findColumnDef=P;exports.findProperty=v;
+"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 d={HorizontalLayout:"HorizontalLayout",VerticalLayout:"VerticalLayout",CollapseLayout:"CollapseLayout"};class a extends m{constructor(t,r={}){super(t),this.options=r}static horizontal(){return new a(d.HorizontalLayout)}static collapse(){return new a(d.CollapseLayout)}static vertical(){return new a(d.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 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 f{constructor(){this.builder=a.horizontal()}static init(){return new f}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"};class l extends p{constructor(t,r="Control"){super(r),this.scope=t,this.options={format:"Control",styles:{}}}static asObject(t){return new l(`#/properties/${t}`,"Object")}static properties(t){return new l(`#/properties/${t}`)}static asCustom(t,r){const s=new l(`#/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??{}})}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 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=()=>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:u().optional().default(1),pageSize:u().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:u(),totalPages:u()}),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:c}=E(r);if(!s)return;const h=c||"contains",x={[c||"contains"]:o.toLowerCase()};h==="contains"&&(x.mode="insensitive");const C=T(s.split("."),x);t[C.key]=C.filterObj}),t},H=e=>{const t=[];return e.forEach(r=>{const{key:s,value:o,operator:c}=E(r);if(!s)return;const h=s;t.push({label:h,key:s,value:o,operator:c})}),t};exports.CategoryBuilder=b;exports.ControlBuilder=l;exports.ControlType=i;exports.GroupBuilder=S;exports.LayoutBuilder=a;exports.LayoutTypes=d;exports.Operator=q;exports.PositiveRequestNumber=u;exports.RequestSchema=O;exports.RequestSchemaWithOffset=F;exports.ResponseRequestSchema=R;exports.ResponseSchema=K;exports.Size=z;exports.SortDirEnum=A;exports.StringOrArray=v;exports.TableBuilder=f;exports.TextCellBuilder=y;exports.buildFilter=$;exports.buildSort=N;exports.buildSortKey=g;exports.createSchema=P;exports.extractFilters=H;exports.findColumnDef=k;exports.findProperty=L;

package/index.d.ts

@@ -1,4 +1,4 @@
-export * from './lib/schema.model';
+export * from './lib/create-schema';
 export * from './lib/table/utils';
 export * from './lib/table/builder';
 export * from './lib/layout/layout.builder';

package/index.js

@@ -1,12 +1,29 @@
-import { toJSONSchema as E, z as o } from "zod";
-var O = /* @__PURE__ */ ((e) => (e.xs = "xs", e.sm = "sm", e.lg = "lg", e.xl = "xl", e))(O || {});
-const f = (e) => E(e, {
-  unrepresentable: "any",
-  target: "draft-07"
-}), K = (e) => {
+import { toJSONSchema as v, z as n } from "zod";
+var E = /* @__PURE__ */ ((e) => (e.xs = "xs", e.sm = "sm", e.lg = "lg", e.xl = "xl", e))(E || {});
+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));
+}, 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]);
+  return t;
+}, R = (e) => {
   if (!e.schema)
     throw new Error("no schema provided");
-  const t = e.schema, s = e.dtoSchema, r = f(s), n = f(t.partial());
+  const t = e.schema, s = e.dtoSchema, r = y(s), o = y(t.partial());
   return {
     dtoSchema: s,
     responseSchema: e.responseSchema ?? s,
@@ -18,23 +35,23 @@ const f = (e) => E(e, {
       },
       table: e.tableSchema ? {
         uiSchema: e.tableSchema,
-        schema: n
+        schema: o
       } : void 0,
       filter: e.filterSchema ? {
         uiSchema: e.filterSchema,
-        schema: n
+        schema: o
       } : void 0,
       uri: e.uri,
       searchUri: e.searchUri ?? `${e.uri}?filter=`
     }
   };
-}, j = (e, t) => {
+}, 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 };
-}, P = (e, t) => {
-  const { id: s, property: r } = j(e, t);
+}, $ = (e, t) => {
+  const { id: s, property: r } = k(e, t);
   return { ...e, id: s, label: s, ...r };
 };
 class p {
@@ -42,7 +59,7 @@ class p {
     this.type = t;
   }
 }
-class d extends p {
+class m extends p {
   constructor() {
     super(...arguments), this.elements = [];
   }
@@ -56,24 +73,35 @@ class d extends p {
     return this.elements.map((t) => t.build());
   }
 }
-class a extends d {
+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("HorizontalLayout");
-  }
-  static stepper(t = !1) {
-    return new a("Categorization", {
-      variant: "stepper",
-      showNavButtons: !t
-    });
+    return new a(h.HorizontalLayout);
   }
-  static table() {
-    return new a("table");
+  static collapse() {
+    return new a(h.CollapseLayout);
   }
   static vertical() {
-    return new a("VerticalLayout");
+    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 {
@@ -83,12 +111,12 @@ class a extends d {
     };
   }
 }
-class y extends p {
+class S extends p {
   constructor(t, s = "TextCell") {
     super(s), this.scope = t;
   }
   static properties(t) {
-    return new y(`#/properties/${t}`);
+    return new S(`#/properties/${t}`);
   }
   key(t) {
     return this.options = {
@@ -110,12 +138,12 @@ class y extends p {
     };
   }
 }
-class S {
+class O {
   constructor() {
-    this.builder = a.table();
+    this.builder = a.horizontal();
   }
   static init() {
-    return new S();
+    return new O();
   }
   addControl(t) {
     return this.builder.addControls(t), this;
@@ -134,110 +162,118 @@ const i = {
   autocomplete: "autocomplete",
   textArea: "textArea",
   markdown: "markdown",
-  fixedArray: "fixedArray",
   array: "array",
-  custom: "custom"
+  custom: "custom",
+  select: "select",
+  mutliSelect: "mutliSelect"
 };
-class c extends p {
+class u extends p {
   constructor(t, s = "Control") {
     super(s), this.scope = t, this.options = {
       format: "Control",
-      styles: {
-        control: {
-          wrapper: "w-full"
-        }
-      }
+      styles: {}
     };
   }
   static asObject(t) {
-    return new c(
+    return new u(
       `#/properties/${t}`,
       "Object"
     );
   }
   static properties(t) {
-    return new c(`#/properties/${t}`);
+    return new u(`#/properties/${t}`);
   }
   static asCustom(t, s) {
-    const r = new c(
+    const r = new u(
       `#/properties/${t}`
     );
-    return r.options = {
+    return r.addOptions({
       format: i.custom,
       type: s
-    }, r;
+    }), r;
   }
   detail(t, s) {
-    return this._detail = t, this.options = {
-      ...this.options ?? {},
+    return this._detail = t, this.addOptions({
       format: i.array,
       elementLabelProp: s
-    }, this;
+    }), this;
   }
   addAction(t) {
     const s = this.options?.actions ?? [];
-    return s.push(t), this.options = {
-      ...this.options ?? {},
-      actions: s
-    }, this;
+    return s.push(t), this.addOptions({ actions: s });
   }
-  detailFixed(t, s) {
-    return this._detail = t, this.options = {
-      ...this.options ?? {},
-      format: i.fixedArray,
-      elementLabelProp: s
-    }, this;
+  detailFixed(t, s = {}) {
+    return this._detail = t, this.addOptions({
+      hideActions: !0,
+      format: i.array,
+      layout: s.layout ?? "column",
+      elementLabelProp: s.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 ?? {}
+    });
+  }
+  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"
-    };
-    return this.options = {
-      ...this.options,
+    return this.addOptions({
       styles: {
         ...this.options?.styles,
+        width: t,
         control: {
-          wrapper: s[t] ?? s.sm
+          wrapper: `input-${t}`
         }
       }
-    }, this;
+    });
   }
   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,
-      label: t
+      ...t
     }, this;
   }
   build() {
@@ -251,7 +287,7 @@ class c extends p {
     };
   }
 }
-class w extends d {
+class g extends m {
   constructor(t) {
     super(t), this.label = t, this.rule = {
       effect: "SHOW",
@@ -259,7 +295,7 @@ class w extends d {
     };
   }
   static label(t) {
-    return new w(t);
+    return new g(t);
   }
   build() {
     return {
@@ -270,12 +306,12 @@ class w extends d {
     };
   }
 }
-class g extends d {
+class x extends m {
   constructor(t) {
     super(t), this.label = t;
   }
   static label(t) {
-    return new g(t);
+    return new x(t);
   }
   build() {
     return {
@@ -285,83 +321,84 @@ class g extends d {
     };
   }
 }
-const u = () => o.coerce.number().int().positive().nonnegative(), k = () => o.string().or(o.array(o.string())).transform((e) => Array.isArray(e) ? e : [e]), q = o.enum(["asc", "desc"]), x = o.object({
-  page: u().optional().default(1),
-  pageSize: u().optional().default(20),
+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"]), w = n.object({
+  page: c().optional().default(1),
+  pageSize: c().optional().default(20),
   // TODO add sorting and so
-  sort: o.string().optional().default("id"),
+  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: k().optional().default([])
-}), $ = x.transform((e) => {
+  filter: z().optional().default([])
+}), H = w.transform((e) => {
   const { page: t, pageSize: s, sort: r } = e;
   return {
     ...e,
     sort: r || "id",
     offset: (t - 1) * s
   };
-}), z = x.extend({
-  count: u(),
-  totalPages: u()
-}), T = o.object({
-  data: o.array(o.unknown()),
-  request: z
-}), F = ["contains", "equals"], C = (e) => {
-  const [t, s, r] = e.split(":"), n = F.includes(r) ? r : "contains";
-  return { key: t, value: s, operator: n };
-}, v = (e, t) => {
+}), F = w.extend({
+  count: c(),
+  totalPages: c()
+}), 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 };
+}, L = (e, t) => {
   if (e.length === 1)
     return { key: e[0], filterObj: t };
   const s = e.pop();
-  return v(e, { [s]: t });
-}, L = (e, t) => A(e.split("."), t), A = (e, t) => {
+  return L(e, { [s]: 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 });
-}, N = (e) => {
+}, V = (e) => {
   const t = {};
   return e?.forEach((s) => {
-    const { key: r, value: n, operator: l } = C(s);
+    const { key: r, value: o, operator: l } = C(s);
     if (!r) return;
-    const h = l || "contains", m = {
-      [l || "contains"]: n.toLowerCase()
+    const d = l || "contains", f = {
+      [l || "contains"]: o.toLowerCase()
     };
-    h === "contains" && (m.mode = "insensitive");
-    const b = v(r.split("."), m);
+    d === "contains" && (f.mode = "insensitive");
+    const b = L(r.split("."), f);
     t[b.key] = b.filterObj;
   }), t;
-}, V = (e) => {
+}, W = (e) => {
   const t = [];
   return e.forEach((s) => {
-    const { key: r, value: n, operator: l } = C(s);
+    const { key: r, value: o, operator: l } = C(s);
     if (!r) return;
-    const h = r;
-    t.push({ label: h, key: r, value: n, operator: l });
+    const d = r;
+    t.push({ label: d, key: r, value: o, operator: l });
   }), t;
 };
 export {
-  w as CategoryBuilder,
-  c as ControlBuilder,
+  g as CategoryBuilder,
+  u as ControlBuilder,
   i as ControlType,
-  g as GroupBuilder,
+  x as GroupBuilder,
   a as LayoutBuilder,
-  F as Operator,
-  u as PositiveRequestNumber,
-  x as RequestSchema,
-  $ as RequestSchemaWithOffset,
-  z as ResponseRequestSchema,
-  T as ResponseSchema,
-  O as Size,
+  h as LayoutTypes,
+  K as Operator,
+  c as PositiveRequestNumber,
+  w as RequestSchema,
+  H as RequestSchemaWithOffset,
+  F as ResponseRequestSchema,
+  N as ResponseSchema,
+  E as Size,
   q as SortDirEnum,
-  k as StringOrArray,
-  S as TableBuilder,
-  y as TextCellBuilder,
-  N as buildFilter,
-  L as buildSort,
+  z as StringOrArray,
+  O as TableBuilder,
+  S as TextCellBuilder,
+  V as buildFilter,
+  T as buildSort,
   A as buildSortKey,
-  K as createSchema,
-  V as extractFilters,
-  P as findColumnDef,
-  j as findProperty
+  R as createSchema,
+  W as extractFilters,
+  $ as findColumnDef,
+  k as findProperty
 };

package/lib/{schema.model.d.ts → create-schema.d.ts}

@@ -7,9 +7,11 @@ export declare enum Size {
     lg = "lg",
     xl = "xl"
 }
+export type SizeType = keyof typeof Size;
 export type JsonFormsLayout = {
     uiSchema: Layout;
-    modalSize?: Size;
+    schema: JsonSchema;
+    modalSize?: SizeType;
 };
 export type FormSchemaModel = {
     form: JsonFormsLayout;
@@ -27,7 +29,7 @@ export declare const createSchema: (props: {
     responseSchema?: ZodObject<any>;
     uri: string;
     searchUri?: string;
-    modalSize?: Size;
+    modalSize?: SizeType;
 }) => {
     dtoSchema: ZodObject<any, import('zod/v4/core').$strip>;
     responseSchema: ZodObject<any, import('zod/v4/core').$strip>;

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

@@ -7,24 +7,36 @@ export declare const ControlType: {
     readonly autocomplete: "autocomplete";
     readonly textArea: "textArea";
     readonly markdown: "markdown";
-    readonly fixedArray: "fixedArray";
     readonly array: "array";
     readonly custom: "custom";
+    readonly select: "select";
+    readonly mutliSelect: "mutliSelect";
 };
 export interface TextAreaOptions extends ControlOption {
     format: 'textArea';
 }
+export interface MarkdownOptions extends ControlOption {
+    format: 'markdown';
+    minHeight: string;
+}
 export interface DetailOptions extends ControlOption {
-    format: 'fixedArray';
+    format: 'array';
+    layout: 'row' | 'column';
+}
+export interface SelectOptions extends ControlOption {
+    format: 'select' | 'multiselect';
+    options: Array<any>;
+    labelKey?: string;
+    valueKey?: string;
 }
-export interface AutocompleteOptions extends ControlOption {
+export interface AutocompleteOptions extends Omit<SelectOptions, 'format'> {
+    format: 'autocomplete';
+}
+export interface AutocompleteRemoteOptions extends Omit<SelectOptions, 'format' | 'options'> {
     format: 'autocomplete';
     uri: string;
     dataField?: string;
-    field: {
-        id: string;
-        label: string;
-    };
+    skipAuth?: boolean;
 }
 export type ArrayActionType = 'edit';
 export type ArrayAction = {
@@ -38,8 +50,11 @@ export interface ControlOption {
     styles?: Partial<any>;
     elements?: any;
     elementLabelProp?: string;
-    labelKey?: string;
+    customLabel?: string;
     actions?: ArrayAction[];
+    placeholder?: string;
+    hideLabel?: boolean;
+    hideActions?: boolean;
 }
 export type ControlTypes = {
     type: 'Control' | 'Object' | 'TextCell';
@@ -56,13 +71,21 @@ export declare class ControlBuilder<TYPE, KEY = keyof TYPE> extends Builder<Cont
     static asCustom<TYPE>(property: keyof TYPE, type: string): ControlBuilder<TYPE>;
     detail<TYPE>(layoutBuilder: LayoutBuilder<TYPE>, label?: string): this;
     addAction(action: ArrayAction): this;
-    detailFixed<TYPE>(layoutBuilder: LayoutBuilder<TYPE>, label?: string): this;
+    detailFixed<TYPE>(layoutBuilder: LayoutBuilder<TYPE>, options?: {
+        label?: string;
+        layout?: 'row' | 'column';
+    }): 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;
-    width(width: 'xs' | 'sm' | 'md' | 'lg' | 'xl'): this;
+    autocomplete(options: Omit<AutocompleteOptions | AutocompleteRemoteOptions, 'format'>): 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;
+    hideLabel(): this;
+    private addOptions;
     build(): ControlTypes;
 }

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

@@ -4,16 +4,25 @@ import { ControlBuilder, ControlTypes } from './control.builder';
 import { GroupBuilder } from './group.builder';
 import { TextCellBuilder } from '../table/builder';
 export type ElementBuilder<TYPE> = ControlBuilder<TYPE> | LayoutBuilder<TYPE> | CategoryBuilder<TYPE> | GroupBuilder<TYPE> | TextCellBuilder<TYPE>;
+export declare const LayoutTypes: {
+    readonly HorizontalLayout: "HorizontalLayout";
+    readonly VerticalLayout: "VerticalLayout";
+    readonly CollapseLayout: "CollapseLayout";
+};
+type _LayoutTypes = (typeof LayoutTypes)[keyof typeof LayoutTypes];
 export type LayoutType = {
-    type: 'HorizontalLayout' | 'VerticalLayout';
+    type: 'LayoutTypes';
     elements: Array<ControlTypes | LayoutType>;
 };
 export declare class LayoutBuilder<TYPE> extends BuilderWithElements<LayoutType, TYPE> {
     private options;
-    protected constructor(type: 'HorizontalLayout' | 'VerticalLayout' | 'Categorization' | 'table', options?: {});
+    protected constructor(type: _LayoutTypes, options?: {});
     static horizontal<TYPE>(): LayoutBuilder<TYPE>;
-    static stepper(hideNavButtons?: boolean): LayoutBuilder<unknown>;
-    static table(): LayoutBuilder<unknown>;
+    static collapse<TYPE>(): LayoutBuilder<TYPE>;
     static vertical<TYPE>(): LayoutBuilder<TYPE>;
+    titleKey(titleKey: string): this;
+    title(title: string): this;
+    private addOptions;
     build(): LayoutType;
 }
+export {};

package/package.json

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