@ghentcdh/json-forms-core 0.6.6 → 0.6.7

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("zod"),F=require("lodash-es");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"}),P=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}},T=(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}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(),q=()=>o.z.string().or(o.z.array(o.z.string())).transform(e=>F.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:q().optional().default([])}),k=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}),A=["contains","equals"],E=e=>{const[t,r,s]=e.split(":"),i=A.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})},$=(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})},B=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},D=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=A;exports.PositiveRequestNumber=u;exports.RequestSchema=S;exports.RequestSchemaWithOffset=k;exports.ResponseRequestSchema=R;exports.ResponseSchema=K;exports.Size=z;exports.SortDirEnum=O;exports.StringOrArray=q;exports.TableBuilder=b;exports.TextCellBuilder=m;exports.buildFilter=B;exports.buildSort=$;exports.buildSortKey=g;exports.createSchema=P;exports.extractFilters=D;exports.findColumnDef=T;exports.findProperty=v;
+"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;

package/index.js

@@ -1,13 +1,12 @@
 import { toJSONSchema as E, z as o } from "zod";
-import { isArray as O } from "lodash-es";
-var j = /* @__PURE__ */ ((e) => (e.xs = "xs", e.sm = "sm", e.lg = "lg", e.xl = "xl", e))(j || {});
-const b = (e) => E(e, {
+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"
-}), $ = (e) => {
+}), K = (e) => {
   if (!e.schema)
     throw new Error("no schema provided");
-  const t = e.schema, s = e.dtoSchema, r = b(s), n = b(t.partial());
+  const t = e.schema, s = e.dtoSchema, r = f(s), n = f(t.partial());
   return {
     dtoSchema: s,
     responseSchema: e.responseSchema ?? s,
@@ -29,13 +28,13 @@ const b = (e) => E(e, {
       searchUri: e.searchUri ?? `${e.uri}?filter=`
     }
   };
-}, k = (e, t) => {
+}, j = (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 };
-}, T = (e, t) => {
-  const { id: s, property: r } = k(e, t);
+}, P = (e, t) => {
+  const { id: s, property: r } = j(e, t);
   return { ...e, id: s, label: s, ...r };
 };
 class p {
@@ -235,6 +234,12 @@ class c extends p {
       }
     }, this;
   }
+  customLabel(t) {
+    return this.options = {
+      ...this.options,
+      label: t
+    }, this;
+  }
   build() {
     return {
       type: this.type,
@@ -280,41 +285,41 @@ class g extends d {
     };
   }
 }
-const u = () => o.coerce.number().int().positive().nonnegative(), q = () => o.string().or(o.array(o.string())).transform((e) => O(e) ? e : [e]), z = o.enum(["asc", "desc"]), x = o.object({
+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),
   // TODO add sorting and so
   sort: o.string().optional().default("id"),
-  sortDir: z.optional().default("asc"),
+  sortDir: q.optional().default("asc"),
   // Filter is of the format key:value:operator (e.g. name:john:eq) operator is optional
-  filter: q().optional().default([])
-}), N = x.transform((e) => {
+  filter: k().optional().default([])
+}), $ = x.transform((e) => {
   const { page: t, pageSize: s, sort: r } = e;
   return {
     ...e,
     sort: r || "id",
     offset: (t - 1) * s
   };
-}), F = x.extend({
+}), z = x.extend({
   count: u(),
   totalPages: u()
-}), V = o.object({
+}), T = o.object({
   data: o.array(o.unknown()),
-  request: F
-}), R = ["contains", "equals"], C = (e) => {
-  const [t, s, r] = e.split(":"), n = R.includes(r) ? r : "contains";
+  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) => {
   if (e.length === 1)
     return { key: e[0], filterObj: t };
   const s = e.pop();
   return v(e, { [s]: t });
-}, W = (e, t) => A(e.split("."), t), A = (e, t) => {
+}, L = (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 });
-}, D = (e) => {
+}, N = (e) => {
   const t = {};
   return e?.forEach((s) => {
     const { key: r, value: n, operator: l } = C(s);
@@ -323,10 +328,10 @@ const u = () => o.coerce.number().int().positive().nonnegative(), q = () => o.st
       [l || "contains"]: n.toLowerCase()
     };
     h === "contains" && (m.mode = "insensitive");
-    const f = v(r.split("."), m);
-    t[f.key] = f.filterObj;
+    const b = v(r.split("."), m);
+    t[b.key] = b.filterObj;
   }), t;
-}, H = (e) => {
+}, V = (e) => {
   const t = [];
   return e.forEach((s) => {
     const { key: r, value: n, operator: l } = C(s);
@@ -341,22 +346,22 @@ export {
   i as ControlType,
   g as GroupBuilder,
   a as LayoutBuilder,
-  R as Operator,
+  F as Operator,
   u as PositiveRequestNumber,
   x as RequestSchema,
-  N as RequestSchemaWithOffset,
-  F as ResponseRequestSchema,
-  V as ResponseSchema,
-  j as Size,
-  z as SortDirEnum,
-  q as StringOrArray,
+  $ as RequestSchemaWithOffset,
+  z as ResponseRequestSchema,
+  T as ResponseSchema,
+  O as Size,
+  q as SortDirEnum,
+  k as StringOrArray,
   S as TableBuilder,
   y as TextCellBuilder,
-  D as buildFilter,
-  W as buildSort,
+  N as buildFilter,
+  L as buildSort,
   A as buildSortKey,
-  $ as createSchema,
-  H as extractFilters,
-  T as findColumnDef,
-  k as findProperty
+  K as createSchema,
+  V as extractFilters,
+  P as findColumnDef,
+  j as findProperty
 };

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

@@ -63,5 +63,6 @@ export declare class ControlBuilder<TYPE, KEY = keyof TYPE> extends Builder<Cont
     textArea(options?: Omit<TextAreaOptions, 'format'>): this;
     autocomplete(options: Omit<AutocompleteOptions, 'format'>): this;
     width(width: 'xs' | 'sm' | 'md' | 'lg' | 'xl'): this;
+    customLabel(label: string): this;
     build(): ControlTypes;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghentcdh/json-forms-core",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "type": "module",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -14,13 +14,11 @@
   "peerDependencies": {
     "@anatine/zod-openapi": "^2.2.0",
     "@jsonforms/core": "^3.4.0",
-    "lodash-es": "^4.17.0",
     "zod": "^3.24.0"
   },
   "devDependencies": {
     "@anatine/zod-openapi": "2.2.8",
     "@jsonforms/core": "3.7.0",
-    "lodash-es": "4.17.23",
     "zod": "4.3.6"
   },
   "repository": {