@payloadcms/ui 3.0.0-canary.4704e79 → 3.0.0-canary.483db21

package/dist/elements/WhereBuilder/reduceFieldMap.js

@@ -1,38 +1,102 @@
 'use client';
+import { getTranslation } from '@payloadcms/translations';
+import { createNestedClientFieldPath } from '../../forms/Form/createNestedFieldPath.js';
+import { combineLabel } from '../FieldSelect/index.js';
 import fieldTypes from './field-types.js';
-export const reduceFieldMap = (fieldMap, i18n)=>fieldMap.reduce((reduced, field)=>{
+/**
+ * Reduces a field map to a flat array of fields with labels and values.
+ * Used in the WhereBuilder component to render the fields in the dropdown.
+ */ export const reduceFieldMap = ({ fieldMap, i18n, labelPrefix, pathPrefix })=>{
+    return fieldMap.reduce((reduced, field)=>{
+        if (field.disableListFilter) return reduced;
+        if (field.type === 'tabs' && 'tabs' in field.fieldComponentProps) {
+            const tabs = field.fieldComponentProps.tabs;
+            tabs.forEach((tab)=>{
+                if (typeof tab.label !== 'boolean') {
+                    const localizedTabLabel = getTranslation(tab.label, i18n);
+                    const labelWithPrefix = labelPrefix ? labelPrefix + ' > ' + localizedTabLabel : localizedTabLabel;
+                    // Make sure we handle nested tabs
+                    const tabPathPrefix = tab.name ? pathPrefix ? pathPrefix + '.' + tab.name : tab.name : pathPrefix;
+                    if (typeof localizedTabLabel === 'string') {
+                        reduced.push(...reduceFieldMap({
+                            fieldMap: tab.fieldMap,
+                            i18n,
+                            labelPrefix: labelWithPrefix,
+                            pathPrefix: tabPathPrefix
+                        }));
+                    }
+                }
+            });
+            return reduced;
+        }
+        // Rows cant have labels, so we need to handle them differently
+        if (field.type === 'row' && 'fieldMap' in field.fieldComponentProps) {
+            reduced.push(...reduceFieldMap({
+                fieldMap: field.fieldComponentProps.fieldMap,
+                i18n,
+                labelPrefix,
+                pathPrefix
+            }));
+            return reduced;
+        }
+        if (field.type === 'collapsible' && 'fieldMap' in field.fieldComponentProps) {
+            const localizedTabLabel = getTranslation(field.fieldComponentProps.label || '', i18n);
+            const labelWithPrefix = labelPrefix ? labelPrefix + ' > ' + localizedTabLabel : localizedTabLabel;
+            reduced.push(...reduceFieldMap({
+                fieldMap: field.fieldComponentProps.fieldMap,
+                i18n,
+                labelPrefix: labelWithPrefix,
+                pathPrefix
+            }));
+            return reduced;
+        }
+        if (field.type === 'group' && 'fieldMap' in field.fieldComponentProps) {
+            const translatedLabel = getTranslation(field.fieldComponentProps.label || '', i18n);
+            const labelWithPrefix = labelPrefix ? translatedLabel ? labelPrefix + ' > ' + translatedLabel : labelPrefix : translatedLabel;
+            // Make sure we handle deeply nested groups
+            const pathWithPrefix = field.name ? pathPrefix ? pathPrefix + '.' + field.name : field.name : pathPrefix;
+            reduced.push(...reduceFieldMap({
+                fieldMap: field.fieldComponentProps.fieldMap,
+                i18n,
+                labelPrefix: labelWithPrefix,
+                pathPrefix: pathWithPrefix
+            }));
+            return reduced;
+        }
         if (typeof fieldTypes[field.type] === 'object') {
             const operatorKeys = new Set();
             const operators = fieldTypes[field.type].operators.reduce((acc, operator)=>{
                 if (!operatorKeys.has(operator.value)) {
                     operatorKeys.add(operator.value);
-                    return [
-                        ...acc,
-                        {
-                            ...operator,
-                            label: i18n.t(`operators:${operator.label}`)
-                        }
-                    ];
+                    const operatorKey = `operators:${operator.label}`;
+                    acc.push({
+                        ...operator,
+                        label: i18n.t(operatorKey)
+                    });
                 }
                 return acc;
             }, []);
+            const localizedLabel = getTranslation(field.fieldComponentProps.label || '', i18n);
+            const formattedLabel = labelPrefix ? combineLabel({
+                field,
+                prefix: labelPrefix
+            }) : localizedLabel;
+            const formattedValue = pathPrefix ? createNestedClientFieldPath(pathPrefix, field) : field.name;
             const formattedField = {
-                label: field.Label,
-                value: field.name,
+                label: formattedLabel,
+                value: formattedValue,
                 ...fieldTypes[field.type],
                 operators,
                 props: {
                     ...field,
-                    ...field?.cellProps || {}
+                    ...field?.cellComponentProps || {}
                 }
             };
-            if (field.admin?.disableListFilter) return reduced;
-            return [
-                ...reduced,
-                formattedField
-            ];
+            reduced.push(formattedField);
+            return reduced;
         }
         return reduced;
     }, []);
+};
 
 //# sourceMappingURL=reduceFieldMap.js.map

package/dist/elements/WhereBuilder/reduceFieldMap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/reduceFieldMap.tsx"],"sourcesContent":["'use client'\nimport type { Column } from '../Table/index.js'\n\nimport fieldTypes from './field-types.js'\n\nexport const reduceFieldMap = (fieldMap: Column[], i18n) =>\n  fieldMap.reduce((reduced, field) => {\n    if (typeof fieldTypes[field.type] === 'object') {\n      const operatorKeys = new Set()\n\n      const operators = fieldTypes[field.type].operators.reduce((acc, operator) => {\n        if (!operatorKeys.has(operator.value)) {\n          operatorKeys.add(operator.value)\n          return [\n            ...acc,\n            {\n              ...operator,\n              label: i18n.t(`operators:${operator.label}`),\n            },\n          ]\n        }\n        return acc\n      }, [])\n\n      const formattedField = {\n        label: field.Label,\n        value: field.name,\n        ...fieldTypes[field.type],\n        operators,\n        props: {\n          ...field,\n          ...(field?.cellProps || {}),\n        },\n      }\n\n      if (field.admin?.disableListFilter) return reduced\n\n      return [...reduced, formattedField]\n    }\n\n    return reduced\n  }, [])\n"],"names":["fieldTypes","reduceFieldMap","fieldMap","i18n","reduce","reduced","field","type","operatorKeys","Set","operators","acc","operator","has","value","add","label","t","formattedField","Label","name","props","cellProps","admin","disableListFilter"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;AAGA,OAAOA,gBAAgB,mBAAkB;AAEzC,OAAO,MAAMC,iBAAiB,CAACC,UAAoBC,OACjDD,SAASE,MAAM,CAAC,CAACC,SAASC;QACxB,IAAI,OAAON,UAAU,CAACM,MAAMC,IAAI,CAAC,KAAK,UAAU;YAC9C,MAAMC,eAAe,IAAIC;YAEzB,MAAMC,YAAYV,UAAU,CAACM,MAAMC,IAAI,CAAC,CAACG,SAAS,CAACN,MAAM,CAAC,CAACO,KAAKC;gBAC9D,IAAI,CAACJ,aAAaK,GAAG,CAACD,SAASE,KAAK,GAAG;oBACrCN,aAAaO,GAAG,CAACH,SAASE,KAAK;oBAC/B,OAAO;2BACFH;wBACH;4BACE,GAAGC,QAAQ;4BACXI,OAAOb,KAAKc,CAAC,CAAC,CAAC,UAAU,EAAEL,SAASI,KAAK,CAAC,CAAC;wBAC7C;qBACD;gBACH;gBACA,OAAOL;YACT,GAAG,EAAE;YAEL,MAAMO,iBAAiB;gBACrBF,OAAOV,MAAMa,KAAK;gBAClBL,OAAOR,MAAMc,IAAI;gBACjB,GAAGpB,UAAU,CAACM,MAAMC,IAAI,CAAC;gBACzBG;gBACAW,OAAO;oBACL,GAAGf,KAAK;oBACR,GAAIA,OAAOgB,aAAa,CAAC,CAAC;gBAC5B;YACF;YAEA,IAAIhB,MAAMiB,KAAK,EAAEC,mBAAmB,OAAOnB;YAE3C,OAAO;mBAAIA;gBAASa;aAAe;QACrC;QAEA,OAAOb;IACT,GAAG,EAAE,EAAC"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/reduceFieldMap.tsx"],"sourcesContent":["'use client'\nimport type { ClientTranslationKeys, I18nClient } from '@payloadcms/translations'\nimport type { FieldMap } from 'payload'\n\nimport { getTranslation } from '@payloadcms/translations'\n\nimport { createNestedClientFieldPath } from '../../forms/Form/createNestedFieldPath.js'\nimport { combineLabel } from '../FieldSelect/index.js'\nimport fieldTypes from './field-types.js'\n\nexport type ReduceFieldMapArgs = {\n  fieldMap: FieldMap\n  i18n: I18nClient\n  labelPrefix?: string\n  pathPrefix?: string\n}\n\n/**\n * Reduces a field map to a flat array of fields with labels and values.\n * Used in the WhereBuilder component to render the fields in the dropdown.\n */\nexport const reduceFieldMap = ({ fieldMap, i18n, labelPrefix, pathPrefix }: ReduceFieldMapArgs) => {\n  return fieldMap.reduce((reduced, field) => {\n    if (field.disableListFilter) return reduced\n\n    if (field.type === 'tabs' && 'tabs' in field.fieldComponentProps) {\n      const tabs = field.fieldComponentProps.tabs\n\n      tabs.forEach((tab) => {\n        if (typeof tab.label !== 'boolean') {\n          const localizedTabLabel = getTranslation(tab.label, i18n)\n\n          const labelWithPrefix = labelPrefix\n            ? labelPrefix + ' > ' + localizedTabLabel\n            : localizedTabLabel\n\n          // Make sure we handle nested tabs\n          const tabPathPrefix = tab.name\n            ? pathPrefix\n              ? pathPrefix + '.' + tab.name\n              : tab.name\n            : pathPrefix\n\n          if (typeof localizedTabLabel === 'string') {\n            reduced.push(\n              ...reduceFieldMap({\n                fieldMap: tab.fieldMap,\n                i18n,\n                labelPrefix: labelWithPrefix,\n                pathPrefix: tabPathPrefix,\n              }),\n            )\n          }\n        }\n      })\n      return reduced\n    }\n\n    // Rows cant have labels, so we need to handle them differently\n    if (field.type === 'row' && 'fieldMap' in field.fieldComponentProps) {\n      reduced.push(\n        ...reduceFieldMap({\n          fieldMap: field.fieldComponentProps.fieldMap,\n          i18n,\n          labelPrefix,\n          pathPrefix,\n        }),\n      )\n      return reduced\n    }\n\n    if (field.type === 'collapsible' && 'fieldMap' in field.fieldComponentProps) {\n      const localizedTabLabel = getTranslation(field.fieldComponentProps.label || '', i18n)\n\n      const labelWithPrefix = labelPrefix\n        ? labelPrefix + ' > ' + localizedTabLabel\n        : localizedTabLabel\n\n      reduced.push(\n        ...reduceFieldMap({\n          fieldMap: field.fieldComponentProps.fieldMap,\n          i18n,\n          labelPrefix: labelWithPrefix,\n          pathPrefix,\n        }),\n      )\n      return reduced\n    }\n\n    if (field.type === 'group' && 'fieldMap' in field.fieldComponentProps) {\n      const translatedLabel = getTranslation(field.fieldComponentProps.label || '', i18n)\n\n      const labelWithPrefix = labelPrefix\n        ? translatedLabel\n          ? labelPrefix + ' > ' + translatedLabel\n          : labelPrefix\n        : translatedLabel\n\n      // Make sure we handle deeply nested groups\n      const pathWithPrefix = field.name\n        ? pathPrefix\n          ? pathPrefix + '.' + field.name\n          : field.name\n        : pathPrefix\n\n      reduced.push(\n        ...reduceFieldMap({\n          fieldMap: field.fieldComponentProps.fieldMap,\n          i18n,\n          labelPrefix: labelWithPrefix,\n          pathPrefix: pathWithPrefix,\n        }),\n      )\n      return reduced\n    }\n\n    if (typeof fieldTypes[field.type] === 'object') {\n      const operatorKeys = new Set()\n      const operators = fieldTypes[field.type].operators.reduce((acc, operator) => {\n        if (!operatorKeys.has(operator.value)) {\n          operatorKeys.add(operator.value)\n          const operatorKey = `operators:${operator.label}` as ClientTranslationKeys\n          acc.push({\n            ...operator,\n            label: i18n.t(operatorKey),\n          })\n        }\n        return acc\n      }, [])\n\n      const localizedLabel = getTranslation(field.fieldComponentProps.label || '', i18n)\n\n      const formattedLabel = labelPrefix\n        ? combineLabel({\n            field,\n            prefix: labelPrefix,\n          })\n        : localizedLabel\n\n      const formattedValue = pathPrefix\n        ? createNestedClientFieldPath(pathPrefix, field)\n        : field.name\n\n      const formattedField = {\n        label: formattedLabel,\n        value: formattedValue,\n        ...fieldTypes[field.type],\n        operators,\n        props: {\n          ...field,\n          ...(field?.cellComponentProps || {}),\n        },\n      }\n\n      reduced.push(formattedField)\n      return reduced\n    }\n\n    return reduced\n  }, [])\n}\n"],"names":["getTranslation","createNestedClientFieldPath","combineLabel","fieldTypes","reduceFieldMap","fieldMap","i18n","labelPrefix","pathPrefix","reduce","reduced","field","disableListFilter","type","fieldComponentProps","tabs","forEach","tab","label","localizedTabLabel","labelWithPrefix","tabPathPrefix","name","push","translatedLabel","pathWithPrefix","operatorKeys","Set","operators","acc","operator","has","value","add","operatorKey","t","localizedLabel","formattedLabel","prefix","formattedValue","formattedField","props","cellComponentProps"],"mappings":"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"}

package/dist/elements/WhereBuilder/transformWhereQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/transformWhereQuery.ts"],"sourcesContent":["import type { Where } from 'payload'\n\n/**\n * Something like [or][0][and][0][text][equals]=example%20post will work and pass through the validateWhereQuery check.\n * However, something like [text][equals]=example%20post will not work and will fail the validateWhereQuery check,\n * even though it is a valid Where query. This needs to be transformed here.\n */\nexport const transformWhereQuery = (whereQuery): Where => {\n  if (!whereQuery) {\n    return {}\n  }\n  // Check if 'whereQuery' has 'or' field but no 'and'. This is the case for \"correct\" queries\n  if (whereQuery.or && !whereQuery.and) {\n    return {\n      or: whereQuery.or.map((query) => {\n        // ...but if the or query does not have an and, we need to add it\n        if (!query.and) {\n          return {\n            and: [query],\n          }\n        }\n        return query\n      }),\n    }\n  }\n\n  // Check if 'whereQuery' has 'and' field but no 'or'.\n  if (whereQuery.and && !whereQuery.or) {\n    return {\n      or: [\n        {\n          and: whereQuery.and,\n        },\n      ],\n    }\n  }\n\n  // Check if 'whereQuery' has neither 'or' nor 'and'.\n  if (!whereQuery.or && !whereQuery.and) {\n    return {\n      or: [\n        {\n          and: [whereQuery], // top-level siblings are considered 'and'\n        },\n      ],\n    }\n  }\n\n  // If 'whereQuery' has 'or' and 'and', just return it as it is.\n  return whereQuery\n}\n"],"names":["transformWhereQuery","whereQuery","or","and","map","query"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA;;;;CAIC,GACD,OAAO,MAAMA,sBAAsB,CAACC;IAClC,IAAI,CAACA,YAAY;QACf,OAAO,CAAC;IACV;IACA,4FAA4F;IAC5F,IAAIA,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACpC,OAAO;YACLD,IAAID,WAAWC,EAAE,CAACE,GAAG,CAAC,CAACC;gBACrB,iEAAiE;gBACjE,IAAI,CAACA,MAAMF,GAAG,EAAE;oBACd,OAAO;wBACLA,KAAK;4BAACE;yBAAM;oBACd;gBACF;gBACA,OAAOA;YACT;QACF;IACF;IAEA,qDAAqD;IACrD,IAAIJ,WAAWE,GAAG,IAAI,CAACF,WAAWC,EAAE,EAAE;QACpC,OAAO;YACLA,IAAI;gBACF;oBACEC,KAAKF,WAAWE,GAAG;gBACrB;aACD;QACH;IACF;IAEA,oDAAoD;IACpD,IAAI,CAACF,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACrC,OAAO;YACLD,IAAI;gBACF;oBACEC,KAAK;wBAACF;qBAAW;gBACnB;aACD;QACH;IACF;IAEA,+DAA+D;IAC/D,OAAOA;AACT,EAAC"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/transformWhereQuery.ts"],"sourcesContent":["import type { Where } from 'payload'\n\n/**\n * Something like [or][0][and][0][text][equals]=example%20post will work and pass through the validateWhereQuery check.\n * However, something like [text][equals]=example%20post will not work and will fail the validateWhereQuery check,\n * even though it is a valid Where query. This needs to be transformed here.\n */\nexport const transformWhereQuery = (whereQuery): Where => {\n  if (!whereQuery) {\n    return {}\n  }\n  // Check if 'whereQuery' has 'or' field but no 'and'. This is the case for \"correct\" queries\n  if (whereQuery.or && !whereQuery.and) {\n    return {\n      or: whereQuery.or.map((query) => {\n        // ...but if the or query does not have an and, we need to add it\n        if (!query.and) {\n          return {\n            and: [query],\n          }\n        }\n        return query\n      }),\n    }\n  }\n\n  // Check if 'whereQuery' has 'and' field but no 'or'.\n  if (whereQuery.and && !whereQuery.or) {\n    return {\n      or: [\n        {\n          and: whereQuery.and,\n        },\n      ],\n    }\n  }\n\n  // Check if 'whereQuery' has neither 'or' nor 'and'.\n  if (!whereQuery.or && !whereQuery.and) {\n    return {\n      or: [\n        {\n          and: [whereQuery], // top-level siblings are considered 'and'\n        },\n      ],\n    }\n  }\n\n  // If 'whereQuery' has 'or' and 'and', just return it as it is.\n  return whereQuery\n}\n"],"names":["transformWhereQuery","whereQuery","or","and","map","query"],"mappings":"AAEA;;;;CAIC,GACD,OAAO,MAAMA,sBAAsB,CAACC;IAClC,IAAI,CAACA,YAAY;QACf,OAAO,CAAC;IACV;IACA,4FAA4F;IAC5F,IAAIA,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACpC,OAAO;YACLD,IAAID,WAAWC,EAAE,CAACE,GAAG,CAAC,CAACC;gBACrB,iEAAiE;gBACjE,IAAI,CAACA,MAAMF,GAAG,EAAE;oBACd,OAAO;wBACLA,KAAK;4BAACE;yBAAM;oBACd;gBACF;gBACA,OAAOA;YACT;QACF;IACF;IAEA,qDAAqD;IACrD,IAAIJ,WAAWE,GAAG,IAAI,CAACF,WAAWC,EAAE,EAAE;QACpC,OAAO;YACLA,IAAI;gBACF;oBACEC,KAAKF,WAAWE,GAAG;gBACrB;aACD;QACH;IACF;IAEA,oDAAoD;IACpD,IAAI,CAACF,WAAWC,EAAE,IAAI,CAACD,WAAWE,GAAG,EAAE;QACrC,OAAO;YACLD,IAAI;gBACF;oBACEC,KAAK;wBAACF;qBAAW;gBACnB;aACD;QACH;IACF;IAEA,+DAA+D;IAC/D,OAAOA;AACT,EAAC"}

package/dist/elements/WhereBuilder/types.d.ts

@@ -1,7 +1,8 @@
-import type { Field, Operator, SanitizedCollectionConfig, Where } from 'payload';
+import type { Field, FieldMap, Operator, SanitizedCollectionConfig, Where } from 'payload';
 export type WhereBuilderProps = {
     collectionPluralLabel: SanitizedCollectionConfig['labels']['plural'];
     collectionSlug: SanitizedCollectionConfig['slug'];
+    fieldMap?: FieldMap;
 };
 export type FieldCondition = {
     component?: string;

package/dist/elements/WhereBuilder/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEhF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,qBAAqB,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAA;IACpE,cAAc,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE;QACT,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;IACH,KAAK,EAAE,KAAK,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAA;AAEnC,MAAM,MAAM,GAAG,GAAG;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,IAAI,EAAE,KAAK,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,MAAM,CAAA;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,KAAK,EAAE,CAAA;CACZ,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,yBAAyB,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE1F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,qBAAqB,EAAE,yBAAyB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAA;IACpE,cAAc,EAAE,yBAAyB,CAAC,MAAM,CAAC,CAAA;IACjD,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE;QACT,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,QAAQ,CAAA;KAChB,EAAE,CAAA;IACH,KAAK,EAAE,KAAK,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAA;AAEnC,MAAM,MAAM,GAAG,GAAG;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,IAAI,EAAE,KAAK,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;CACf,CAAA;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,GAAG,GAAG,MAAM,GAAG,MAAM,CAAA;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,KAAK,EAAE,CAAA;CACZ,CAAA"}

package/dist/elements/WhereBuilder/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/types.ts"],"sourcesContent":["import type { Field, Operator, SanitizedCollectionConfig, Where } from 'payload'\n\nexport type WhereBuilderProps = {\n  collectionPluralLabel: SanitizedCollectionConfig['labels']['plural']\n  collectionSlug: SanitizedCollectionConfig['slug']\n}\n\nexport type FieldCondition = {\n  component?: string\n  label: string\n  operators: {\n    label: string\n    value: Operator\n  }[]\n  props: Field\n  value: string\n}\n\nexport type Relation = 'and' | 'or'\n\nexport type ADD = {\n  andIndex?: number\n  field: string\n  orIndex?: number\n  relation?: Relation\n  type: 'add'\n}\n\nexport type REMOVE = {\n  andIndex: number\n  orIndex: number\n  type: 'remove'\n}\n\nexport type UPDATE = {\n  andIndex: number\n  field?: string\n  operator?: string\n  orIndex: number\n  type: 'update'\n  value?: unknown\n}\n\nexport type Action = ADD | REMOVE | UPDATE\n\nexport type State = {\n  or: Where[]\n}\n"],"names":[],"rangeMappings":"","mappings":"AA6CA,WAEC"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/types.ts"],"sourcesContent":["import type { Field, FieldMap, Operator, SanitizedCollectionConfig, Where } from 'payload'\n\nexport type WhereBuilderProps = {\n  collectionPluralLabel: SanitizedCollectionConfig['labels']['plural']\n  collectionSlug: SanitizedCollectionConfig['slug']\n  fieldMap?: FieldMap\n}\n\nexport type FieldCondition = {\n  component?: string\n  label: string\n  operators: {\n    label: string\n    value: Operator\n  }[]\n  props: Field\n  value: string\n}\n\nexport type Relation = 'and' | 'or'\n\nexport type ADD = {\n  andIndex?: number\n  field: string\n  orIndex?: number\n  relation?: Relation\n  type: 'add'\n}\n\nexport type REMOVE = {\n  andIndex: number\n  orIndex: number\n  type: 'remove'\n}\n\nexport type UPDATE = {\n  andIndex: number\n  field?: string\n  operator?: string\n  orIndex: number\n  type: 'update'\n  value?: unknown\n}\n\nexport type Action = ADD | REMOVE | UPDATE\n\nexport type State = {\n  or: Where[]\n}\n"],"names":[],"mappings":"AA8CA,WAEC"}

package/dist/elements/WhereBuilder/validateWhereQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateWhereQuery.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/validateWhereQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,KAAK,EAAE,MAAM,SAAS,CAAA;AAI9C,QAAA,MAAM,kBAAkB,0CAsCvB,CAAA;AAED,eAAe,kBAAkB,CAAA"}
+{"version":3,"file":"validateWhereQuery.d.ts","sourceRoot":"","sources":["../../../src/elements/WhereBuilder/validateWhereQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,KAAK,EAAE,MAAM,SAAS,CAAA;AAI9C,QAAA,MAAM,kBAAkB,uBAAiB,UAAU,IAAI,KAsCtD,CAAA;AAED,eAAe,kBAAkB,CAAA"}

package/dist/elements/WhereBuilder/validateWhereQuery.js

@@ -14,7 +14,6 @@ const validateWhereQuery = (whereQuery)=>{
                     if (andKeys.length === 0) {
                         return false;
                     }
-                    // eslint-disable-next-line no-restricted-syntax
                     for (const key of andKeys){
                         const operator = Object.keys(andQuery[key])[0];
                         // Check if the key is a valid Operator.

package/dist/elements/WhereBuilder/validateWhereQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WhereBuilder/validateWhereQuery.ts"],"sourcesContent":["import type { Operator, Where } from 'payload'\n\nimport { validOperators } from 'payload/shared'\n\nconst validateWhereQuery = (whereQuery): whereQuery is Where => {\n  if (\n    whereQuery?.or?.length > 0 &&\n    whereQuery?.or?.[0]?.and &&\n    whereQuery?.or?.[0]?.and?.length > 0\n  ) {\n    // At this point we know that the whereQuery has 'or' and 'and' fields,\n    // now let's check the structure and content of these fields.\n\n    const isValid = whereQuery.or.every((orQuery) => {\n      if (orQuery.and && Array.isArray(orQuery.and)) {\n        return orQuery.and.every((andQuery) => {\n          if (typeof andQuery !== 'object') {\n            return false\n          }\n          const andKeys = Object.keys(andQuery)\n          // If there are no keys, it's not a valid WhereField.\n          if (andKeys.length === 0) {\n            return false\n          }\n          // eslint-disable-next-line no-restricted-syntax\n          for (const key of andKeys) {\n            const operator = Object.keys(andQuery[key])[0]\n            // Check if the key is a valid Operator.\n            if (!operator || !validOperators.includes(operator as Operator)) {\n              return false\n            }\n          }\n          return true\n        })\n      }\n      return false\n    })\n\n    return isValid\n  }\n\n  return false\n}\n\nexport default validateWhereQuery\n"],"names":["validOperators","validateWhereQuery","whereQuery","or","length","and","isValid","every","orQuery","Array","isArray","andQuery","andKeys","Object","keys","key","operator","includes"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,cAAc,QAAQ,iBAAgB;AAE/C,MAAMC,qBAAqB,CAACC;IAC1B,IACEA,YAAYC,IAAIC,SAAS,KACzBF,YAAYC,IAAI,CAAC,EAAE,EAAEE,OACrBH,YAAYC,IAAI,CAAC,EAAE,EAAEE,KAAKD,SAAS,GACnC;QACA,uEAAuE;QACvE,6DAA6D;QAE7D,MAAME,UAAUJ,WAAWC,EAAE,CAACI,KAAK,CAAC,CAACC;YACnC,IAAIA,QAAQH,GAAG,IAAII,MAAMC,OAAO,CAACF,QAAQH,GAAG,GAAG;gBAC7C,OAAOG,QAAQH,GAAG,CAACE,KAAK,CAAC,CAACI;oBACxB,IAAI,OAAOA,aAAa,UAAU;wBAChC,OAAO;oBACT;oBACA,MAAMC,UAAUC,OAAOC,IAAI,CAACH;oBAC5B,qDAAqD;oBACrD,IAAIC,QAAQR,MAAM,KAAK,GAAG;wBACxB,OAAO;oBACT;oBACA,gDAAgD;oBAChD,KAAK,MAAMW,OAAOH,QAAS;wBACzB,MAAMI,WAAWH,OAAOC,IAAI,CAACH,QAAQ,CAACI,IAAI,CAAC,CAAC,EAAE;wBAC9C,wCAAwC;wBACxC,IAAI,CAACC,YAAY,CAAChB,eAAeiB,QAAQ,CAACD,WAAuB;4BAC/D,OAAO;wBACT;oBACF;oBACA,OAAO;gBACT;YACF;YACA,OAAO;QACT;QAEA,OAAOV;IACT;IAEA,OAAO;AACT;AAEA,eAAeL,mBAAkB"}
+{"version":3,"sources":["../../../src/elements/WhereBuilder/validateWhereQuery.ts"],"sourcesContent":["import type { Operator, Where } from 'payload'\n\nimport { validOperators } from 'payload/shared'\n\nconst validateWhereQuery = (whereQuery): whereQuery is Where => {\n  if (\n    whereQuery?.or?.length > 0 &&\n    whereQuery?.or?.[0]?.and &&\n    whereQuery?.or?.[0]?.and?.length > 0\n  ) {\n    // At this point we know that the whereQuery has 'or' and 'and' fields,\n    // now let's check the structure and content of these fields.\n\n    const isValid = whereQuery.or.every((orQuery) => {\n      if (orQuery.and && Array.isArray(orQuery.and)) {\n        return orQuery.and.every((andQuery) => {\n          if (typeof andQuery !== 'object') {\n            return false\n          }\n          const andKeys = Object.keys(andQuery)\n          // If there are no keys, it's not a valid WhereField.\n          if (andKeys.length === 0) {\n            return false\n          }\n\n          for (const key of andKeys) {\n            const operator = Object.keys(andQuery[key])[0]\n            // Check if the key is a valid Operator.\n            if (!operator || !validOperators.includes(operator as Operator)) {\n              return false\n            }\n          }\n          return true\n        })\n      }\n      return false\n    })\n\n    return isValid\n  }\n\n  return false\n}\n\nexport default validateWhereQuery\n"],"names":["validOperators","validateWhereQuery","whereQuery","or","length","and","isValid","every","orQuery","Array","isArray","andQuery","andKeys","Object","keys","key","operator","includes"],"mappings":"AAEA,SAASA,cAAc,QAAQ,iBAAgB;AAE/C,MAAMC,qBAAqB,CAACC;IAC1B,IACEA,YAAYC,IAAIC,SAAS,KACzBF,YAAYC,IAAI,CAAC,EAAE,EAAEE,OACrBH,YAAYC,IAAI,CAAC,EAAE,EAAEE,KAAKD,SAAS,GACnC;QACA,uEAAuE;QACvE,6DAA6D;QAE7D,MAAME,UAAUJ,WAAWC,EAAE,CAACI,KAAK,CAAC,CAACC;YACnC,IAAIA,QAAQH,GAAG,IAAII,MAAMC,OAAO,CAACF,QAAQH,GAAG,GAAG;gBAC7C,OAAOG,QAAQH,GAAG,CAACE,KAAK,CAAC,CAACI;oBACxB,IAAI,OAAOA,aAAa,UAAU;wBAChC,OAAO;oBACT;oBACA,MAAMC,UAAUC,OAAOC,IAAI,CAACH;oBAC5B,qDAAqD;oBACrD,IAAIC,QAAQR,MAAM,KAAK,GAAG;wBACxB,OAAO;oBACT;oBAEA,KAAK,MAAMW,OAAOH,QAAS;wBACzB,MAAMI,WAAWH,OAAOC,IAAI,CAACH,QAAQ,CAACI,IAAI,CAAC,CAAC,EAAE;wBAC9C,wCAAwC;wBACxC,IAAI,CAACC,YAAY,CAAChB,eAAeiB,QAAQ,CAACD,WAAuB;4BAC/D,OAAO;wBACT;oBACF;oBACA,OAAO;gBACT;YACF;YACA,OAAO;QACT;QAEA,OAAOV;IACT;IAEA,OAAO;AACT;AAEA,eAAeL,mBAAkB"}

package/dist/elements/WindowInfo/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WindowInfo/index.tsx"],"sourcesContent":["import { WindowInfoProvider, useWindowInfo } from '@faceless-ui/window-info'\nexport { WindowInfoProvider, useWindowInfo }\n"],"names":["WindowInfoProvider","useWindowInfo"],"rangeMappings":";","mappings":"AAAA,SAASA,kBAAkB,EAAEC,aAAa,QAAQ,2BAA0B;AAC5E,SAASD,kBAAkB,EAAEC,aAAa,GAAE"}
+{"version":3,"sources":["../../../src/elements/WindowInfo/index.tsx"],"sourcesContent":["import { WindowInfoProvider, useWindowInfo } from '@faceless-ui/window-info'\nexport { WindowInfoProvider, useWindowInfo }\n"],"names":["WindowInfoProvider","useWindowInfo"],"mappings":"AAAA,SAASA,kBAAkB,EAAEC,aAAa,QAAQ,2BAA0B;AAC5E,SAASD,kBAAkB,EAAEC,aAAa,GAAE"}

package/dist/elements/WithServerSideProps/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/WithServerSideProps/index.tsx"],"sourcesContent":["import type { WithServerSidePropsComponent } from 'payload'\n\nimport { isReactServerComponentOrFunction } from 'payload/shared'\nimport React from 'react'\n\nexport const WithServerSideProps: WithServerSidePropsComponent = ({\n  Component,\n  serverOnlyProps,\n  ...rest\n}) => {\n  if (Component) {\n    const WithServerSideProps: React.FC = (passedProps) => {\n      const propsWithServerOnlyProps = {\n        ...passedProps,\n        ...(isReactServerComponentOrFunction(Component) ? serverOnlyProps ?? {} : {}),\n      }\n\n      return <Component {...propsWithServerOnlyProps} />\n    }\n\n    return <WithServerSideProps {...rest} />\n  }\n\n  return null\n}\n"],"names":["isReactServerComponentOrFunction","React","WithServerSideProps","Component","serverOnlyProps","rest","passedProps","propsWithServerOnlyProps"],"rangeMappings":";;;;;;;;;;;;;;;;;;;","mappings":";AAEA,SAASA,gCAAgC,QAAQ,iBAAgB;AACjE,OAAOC,WAAW,QAAO;AAEzB,OAAO,MAAMC,sBAAoD,CAAC,EAChEC,SAAS,EACTC,eAAe,EACf,GAAGC,MACJ;IACC,IAAIF,WAAW;QACb,MAAMD,sBAAgC,CAACI;YACrC,MAAMC,2BAA2B;gBAC/B,GAAGD,WAAW;gBACd,GAAIN,iCAAiCG,aAAaC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC9E;YAEA,qBAAO,KAACD;gBAAW,GAAGI,wBAAwB;;QAChD;QAEA,qBAAO,KAACL;YAAqB,GAAGG,IAAI;;IACtC;IAEA,OAAO;AACT,EAAC"}
+{"version":3,"sources":["../../../src/elements/WithServerSideProps/index.tsx"],"sourcesContent":["import type { WithServerSidePropsComponent } from 'payload'\n\nimport { isReactServerComponentOrFunction } from 'payload/shared'\nimport React from 'react'\n\nexport const WithServerSideProps: WithServerSidePropsComponent = ({\n  Component,\n  serverOnlyProps,\n  ...rest\n}) => {\n  if (Component) {\n    const WithServerSideProps: React.FC = (passedProps) => {\n      const propsWithServerOnlyProps = {\n        ...passedProps,\n        ...(isReactServerComponentOrFunction(Component) ? serverOnlyProps ?? {} : {}),\n      }\n\n      return <Component {...propsWithServerOnlyProps} />\n    }\n\n    return <WithServerSideProps {...rest} />\n  }\n\n  return null\n}\n"],"names":["isReactServerComponentOrFunction","React","WithServerSideProps","Component","serverOnlyProps","rest","passedProps","propsWithServerOnlyProps"],"mappings":";AAEA,SAASA,gCAAgC,QAAQ,iBAAgB;AACjE,OAAOC,WAAW,QAAO;AAEzB,OAAO,MAAMC,sBAAoD,CAAC,EAChEC,SAAS,EACTC,eAAe,EACf,GAAGC,MACJ;IACC,IAAIF,WAAW;QACb,MAAMD,sBAAgC,CAACI;YACrC,MAAMC,2BAA2B;gBAC/B,GAAGD,WAAW;gBACd,GAAIN,iCAAiCG,aAAaC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAC9E;YAEA,qBAAO,KAACD;gBAAW,GAAGI,wBAAwB;;QAChD;QAEA,qBAAO,KAACL;YAAqB,GAAGG,IAAI;;IACtC;IAEA,OAAO;AACT,EAAC"}

package/dist/elements/withMergedProps/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { deepMerge, isReactServerComponentOrFunction, serverProps } from 'payload/shared';
+import { isReactServerComponentOrFunction, serverProps } from 'payload/shared';
 import React from 'react';
 /**
  * Creates a higher-order component (HOC) that merges predefined properties (`toMergeIntoProps`)
@@ -28,7 +28,7 @@ import React from 'react';
     }
     // A wrapper around the args.Component to inject the args.toMergeArgs as props, which are merged with the passed props
     const MergedPropsComponent = (passedProps)=>{
-        const mergedProps = deepMerge(passedProps, toMergeIntoProps);
+        const mergedProps = simpleMergeProps(passedProps, toMergeIntoProps);
         if (sanitizeServerOnlyProps) {
             serverProps.forEach((prop)=>{
                 delete mergedProps[prop];
@@ -40,5 +40,11 @@ import React from 'react';
     };
     return MergedPropsComponent;
 }
+function simpleMergeProps(props, toMerge) {
+    return {
+        ...props,
+        ...toMerge
+    };
+}
 
 //# sourceMappingURL=index.js.map

package/dist/elements/withMergedProps/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/withMergedProps/index.tsx"],"sourcesContent":["import { deepMerge, isReactServerComponentOrFunction, serverProps } from 'payload/shared'\nimport React from 'react'\n\n/**\n * Creates a higher-order component (HOC) that merges predefined properties (`toMergeIntoProps`)\n * with any properties passed to the resulting component.\n *\n * Use this when you want to pre-specify some props for a component, while also allowing users to\n * pass in their own props. The HOC ensures the passed props and predefined props are combined before\n * rendering the original component.\n *\n * @example\n * const PredefinedComponent = getMergedPropsComponent({\n *   Component: OriginalComponent,\n *   toMergeIntoProps: { someExtraValue: 5 }\n * });\n * // Using <PredefinedComponent customProp=\"value\" /> will result in\n * // <OriginalComponent customProp=\"value\" someExtraValue={5} />\n *\n * @returns A higher-order component with combined properties.\n *\n * @param Component - The original component to wrap.\n * @param sanitizeServerOnlyProps - If true, server-only props will be removed from the merged props. @default true if the component is not a server component, false otherwise.\n * @param toMergeIntoProps - The properties to merge into the passed props.\n */\nexport function withMergedProps<ToMergeIntoProps, CompleteReturnProps>({\n  Component,\n  sanitizeServerOnlyProps,\n  toMergeIntoProps,\n}: {\n  Component: React.FC<CompleteReturnProps>\n  sanitizeServerOnlyProps?: boolean\n  toMergeIntoProps: ToMergeIntoProps\n}): React.FC<CompleteReturnProps> {\n  if (sanitizeServerOnlyProps === undefined) {\n    sanitizeServerOnlyProps = !isReactServerComponentOrFunction(Component)\n  }\n  // A wrapper around the args.Component to inject the args.toMergeArgs as props, which are merged with the passed props\n  const MergedPropsComponent: React.FC<CompleteReturnProps> = (passedProps) => {\n    const mergedProps = deepMerge(passedProps, toMergeIntoProps)\n\n    if (sanitizeServerOnlyProps) {\n      serverProps.forEach((prop) => {\n        delete mergedProps[prop]\n      })\n    }\n\n    return <Component {...mergedProps} />\n  }\n\n  return MergedPropsComponent\n}\n"],"names":["deepMerge","isReactServerComponentOrFunction","serverProps","React","withMergedProps","Component","sanitizeServerOnlyProps","toMergeIntoProps","undefined","MergedPropsComponent","passedProps","mergedProps","forEach","prop"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";AAAA,SAASA,SAAS,EAAEC,gCAAgC,EAAEC,WAAW,QAAQ,iBAAgB;AACzF,OAAOC,WAAW,QAAO;AAEzB;;;;;;;;;;;;;;;;;;;;;CAqBC,GACD,OAAO,SAASC,gBAAuD,EACrEC,SAAS,EACTC,uBAAuB,EACvBC,gBAAgB,EAKjB;IACC,IAAID,4BAA4BE,WAAW;QACzCF,0BAA0B,CAACL,iCAAiCI;IAC9D;IACA,sHAAsH;IACtH,MAAMI,uBAAsD,CAACC;QAC3D,MAAMC,cAAcX,UAAUU,aAAaH;QAE3C,IAAID,yBAAyB;YAC3BJ,YAAYU,OAAO,CAAC,CAACC;gBACnB,OAAOF,WAAW,CAACE,KAAK;YAC1B;QACF;QAEA,qBAAO,KAACR;YAAW,GAAGM,WAAW;;IACnC;IAEA,OAAOF;AACT"}
+{"version":3,"sources":["../../../src/elements/withMergedProps/index.tsx"],"sourcesContent":["import { isReactServerComponentOrFunction, serverProps } from 'payload/shared'\nimport React from 'react'\n\n/**\n * Creates a higher-order component (HOC) that merges predefined properties (`toMergeIntoProps`)\n * with any properties passed to the resulting component.\n *\n * Use this when you want to pre-specify some props for a component, while also allowing users to\n * pass in their own props. The HOC ensures the passed props and predefined props are combined before\n * rendering the original component.\n *\n * @example\n * const PredefinedComponent = getMergedPropsComponent({\n *   Component: OriginalComponent,\n *   toMergeIntoProps: { someExtraValue: 5 }\n * });\n * // Using <PredefinedComponent customProp=\"value\" /> will result in\n * // <OriginalComponent customProp=\"value\" someExtraValue={5} />\n *\n * @returns A higher-order component with combined properties.\n *\n * @param Component - The original component to wrap.\n * @param sanitizeServerOnlyProps - If true, server-only props will be removed from the merged props. @default true if the component is not a server component, false otherwise.\n * @param toMergeIntoProps - The properties to merge into the passed props.\n */\nexport function withMergedProps<ToMergeIntoProps, CompleteReturnProps>({\n  Component,\n  sanitizeServerOnlyProps,\n  toMergeIntoProps,\n}: {\n  Component: React.FC<CompleteReturnProps>\n  sanitizeServerOnlyProps?: boolean\n  toMergeIntoProps: ToMergeIntoProps\n}): React.FC<CompleteReturnProps> {\n  if (sanitizeServerOnlyProps === undefined) {\n    sanitizeServerOnlyProps = !isReactServerComponentOrFunction(Component)\n  }\n  // A wrapper around the args.Component to inject the args.toMergeArgs as props, which are merged with the passed props\n  const MergedPropsComponent: React.FC<CompleteReturnProps> = (passedProps) => {\n    const mergedProps = simpleMergeProps(passedProps, toMergeIntoProps) as CompleteReturnProps\n\n    if (sanitizeServerOnlyProps) {\n      serverProps.forEach((prop) => {\n        delete mergedProps[prop]\n      })\n    }\n\n    return <Component {...mergedProps} />\n  }\n\n  return MergedPropsComponent\n}\n\nfunction simpleMergeProps(props, toMerge) {\n  return { ...props, ...toMerge }\n}\n"],"names":["isReactServerComponentOrFunction","serverProps","React","withMergedProps","Component","sanitizeServerOnlyProps","toMergeIntoProps","undefined","MergedPropsComponent","passedProps","mergedProps","simpleMergeProps","forEach","prop","props","toMerge"],"mappings":";AAAA,SAASA,gCAAgC,EAAEC,WAAW,QAAQ,iBAAgB;AAC9E,OAAOC,WAAW,QAAO;AAEzB;;;;;;;;;;;;;;;;;;;;;CAqBC,GACD,OAAO,SAASC,gBAAuD,EACrEC,SAAS,EACTC,uBAAuB,EACvBC,gBAAgB,EAKjB;IACC,IAAID,4BAA4BE,WAAW;QACzCF,0BAA0B,CAACL,iCAAiCI;IAC9D;IACA,sHAAsH;IACtH,MAAMI,uBAAsD,CAACC;QAC3D,MAAMC,cAAcC,iBAAiBF,aAAaH;QAElD,IAAID,yBAAyB;YAC3BJ,YAAYW,OAAO,CAAC,CAACC;gBACnB,OAAOH,WAAW,CAACG,KAAK;YAC1B;QACF;QAEA,qBAAO,KAACT;YAAW,GAAGM,WAAW;;IACnC;IAEA,OAAOF;AACT;AAEA,SAASG,iBAAiBG,KAAK,EAAEC,OAAO;IACtC,OAAO;QAAE,GAAGD,KAAK;QAAE,GAAGC,OAAO;IAAC;AAChC"}

package/dist/exports/client/{CodeEditor-UTZFZWZG.js → CodeEditor-UPOVAXRP.js}

@@ -20,5 +20,5 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       monaco.config({ paths: { vs: '...' } })
 
     For more please check the link https://github.com/suren-atoyan/monaco-loader#config
-  `},ye=ve(ut)(we),lt={config:at},Oe=lt;var st=function(){for(var t=arguments.length,r=new Array(t),n=0;n<t;n++)r[n]=arguments[n];return function(o){return r.reduceRight(function(i,a){return a(i)},o)}},je=st;function Me(e,t){return Object.keys(t).forEach(function(r){t[r]instanceof Object&&e[r]&&Object.assign(t[r],Me(e[r],t[r]))}),ee(ee({},e),t)}var Pe=Me;var ft={type:"cancelation",msg:"operation is manually canceled"};function dt(e){var t=!1,r=new Promise(function(n,o){e.then(function(i){return t?o(ft):n(i)}),e.catch(o)});return r.cancel=function(){return t=!0},r}var F=dt;var pt=ge.create({config:he,isInitialized:!1,resolve:null,reject:null,monaco:null}),Se=de(pt,2),V=Se[0],$=Se[1];function mt(e){var t=Oe.config(e),r=t.monaco,n=fe(t,["monaco"]);$(function(o){return{config:Pe(o.config,n),monaco:r}})}function gt(){var e=V(function(t){var r=t.monaco,n=t.isInitialized,o=t.resolve;return{monaco:r,isInitialized:n,resolve:o}});if(!e.isInitialized){if($({isInitialized:!0}),e.monaco)return e.resolve(e.monaco),F(te);if(window.monaco&&window.monaco.editor)return Ee(window.monaco),e.resolve(window.monaco),F(te);je(ht,bt)(yt)}return F(te)}function ht(e){return document.body.appendChild(e)}function vt(e){var t=document.createElement("script");return e&&(t.src=e),t}function bt(e){var t=V(function(n){var o=n.config,i=n.reject;return{config:o,reject:i}}),r=vt("".concat(t.config.paths.vs,"/loader.js"));return r.onload=function(){return e()},r.onerror=t.reject,r}function yt(){var e=V(function(r){var n=r.config,o=r.resolve,i=r.reject;return{config:n,resolve:o,reject:i}}),t=window.require;t.config(e.config),t(["vs/editor/editor.main"],function(r){Ee(r),e.resolve(r)},function(r){e.reject(r)})}function Ee(e){V().monaco||$({monaco:e})}function wt(){return V(function(e){var t=e.monaco;return t})}var te=new Promise(function(e,t){return $({resolve:e,reject:t})}),Ot={config:mt,init:gt,__getMonacoInstance:wt},P=Ot;import{memo as jt}from"react";import Mt,{useState as Ie,useRef as I,useCallback as Te,useEffect as Ce}from"react";import{memo as Pt}from"react";import re from"react";import Et from"react";import{useEffect as Dt}from"react";import{useEffect as Wt,useRef as Nt}from"react";import{useState as Nr}from"react";import{memo as Ht}from"react";import _t,{useState as Le,useEffect as H,useRef as O,useCallback as kt}from"react";import{useEffect as Bt,useRef as Kt}from"react";var St={wrapper:{display:"flex",position:"relative",textAlign:"initial"},fullWidth:{width:"100%"},hide:{display:"none"}},ne=St,It={container:{display:"flex",height:"100%",width:"100%",justifyContent:"center",alignItems:"center"}},Tt=It;function Ct({children:e}){return Et.createElement("div",{style:Tt.container},e)}var Lt=Ct,xt=Lt;function At({width:e,height:t,isEditorReady:r,loading:n,_ref:o,className:i,wrapperProps:a}){return re.createElement("section",{style:{...ne.wrapper,width:e,height:t},...a},!r&&re.createElement(xt,null,n),re.createElement("div",{ref:o,style:{...ne.fullWidth,...!r&&ne.hide},className:i}))}var Rt=At,xe=Pt(Rt);function Vt(e){Dt(e,[])}var Ae=Vt;function zt(e,t,r=!0){let n=Nt(!0);Wt(n.current||!r?()=>{n.current=!1}:e,t)}var y=zt;function W(){}function T(e,t,r,n){return Ut(e,n)||qt(e,t,r,n)}function Ut(e,t){return e.editor.getModel(Re(e,t))}function qt(e,t,r,n){return e.editor.createModel(t,r,n?Re(e,n):void 0)}function Re(e,t){return e.Uri.parse(t)}function Ft({original:e,modified:t,language:r,originalLanguage:n,modifiedLanguage:o,originalModelPath:i,modifiedModelPath:a,keepCurrentOriginalModel:s=!1,keepCurrentModifiedModel:f=!1,theme:v="light",loading:S="Loading...",options:w={},height:k="100%",width:B="100%",className:K,wrapperProps:G={},beforeMount:Y=W,onMount:J=W}){let[b,C]=Ie(!1),[L,d]=Ie(!0),p=I(null),l=I(null),x=I(null),g=I(J),c=I(Y),E=I(!1);Ae(()=>{let u=P.init();return u.then(m=>(l.current=m)&&d(!1)).catch(m=>m?.type!=="cancelation"&&console.error("Monaco initialization: error:",m)),()=>p.current?A():u.cancel()}),y(()=>{let u=p.current.getModifiedEditor();u.getOption(l.current.editor.EditorOption.readOnly)?u.setValue(t||""):t!==u.getValue()&&(u.executeEdits("",[{range:u.getModel().getFullModelRange(),text:t||"",forceMoveMarkers:!0}]),u.pushUndoStop())},[t],b),y(()=>{p.current?.getModel()?.original.setValue(e||"")},[e],b),y(()=>{let{original:u,modified:m}=p.current.getModel();l.current.editor.setModelLanguage(u,n||r||"text"),l.current.editor.setModelLanguage(m,o||r||"text")},[r,n,o],b),y(()=>{l.current?.editor.setTheme(v)},[v],b),y(()=>{p.current?.updateOptions(w)},[w],b);let N=Te(()=>{if(!l.current)return;c.current(l.current);let u=T(l.current,e||"",n||r||"text",i||""),m=T(l.current,t||"",o||r||"text",a||"");p.current?.setModel({original:u,modified:m})},[r,t,o,e,n,i,a]),z=Te(()=>{!E.current&&x.current&&(p.current=l.current.editor.createDiffEditor(x.current,{automaticLayout:!0,...w}),N(),l.current?.editor.setTheme(v),C(!0),E.current=!0)},[w,v,N]);Ce(()=>{b&&g.current(p.current,l.current)},[b]),Ce(()=>{!L&&!b&&z()},[L,b,z]),y(()=>{if(p.current&&l.current){let u=p.current.getOriginalEditor(),m=T(l.current,e||"",n||r||"text",i||"");m!==u.getModel()&&u.setModel(m)}},[i],b),y(()=>{if(p.current&&l.current){let u=p.current.getModifiedEditor(),m=T(l.current,t||"",o||r||"text",a||"");m!==u.getModel()&&u.setModel(m)}},[a],b);function A(){let u=p.current?.getModel();s||u?.original?.dispose(),f||u?.modified?.dispose(),p.current?.dispose()}return Mt.createElement(xe,{width:B,height:k,isEditorReady:b,loading:S,_ref:x,className:K,wrapperProps:G})}var $t=Ft,Vr=jt($t);function Gt(e){let t=Kt();return Bt(()=>{t.current=e},[e]),t.current}var Yt=Gt,_=new Map;function Jt({defaultValue:e,defaultLanguage:t,defaultPath:r,value:n,language:o,path:i,theme:a="light",line:s,loading:f="Loading...",options:v={},overrideServices:S={},saveViewState:w=!0,keepCurrentModel:k=!1,width:B="100%",height:K="100%",className:G,wrapperProps:Y={},beforeMount:J=W,onMount:b=W,onChange:C,onValidate:L=W}){let[d,p]=Le(!1),[l,x]=Le(!0),g=O(null),c=O(null),E=O(null),N=O(b),z=O(J),A=O(),u=O(n),m=Yt(i),ie=O(!1),Q=O(!1);Ae(()=>{let h=P.init();return h.then(j=>(g.current=j)&&x(!1)).catch(j=>j?.type!=="cancelation"&&console.error("Monaco initialization: error:",j)),()=>c.current?Ve():h.cancel()}),y(()=>{let h=T(g.current,e||n||"",t||o||"",i||r||"");h!==c.current?.getModel()&&(w&&_.set(m,c.current?.saveViewState()),c.current?.setModel(h),w&&c.current?.restoreViewState(_.get(i)))},[i],d),y(()=>{c.current?.updateOptions(v)},[v],d),y(()=>{!c.current||n===void 0||(c.current.getOption(g.current.editor.EditorOption.readOnly)?c.current.setValue(n):n!==c.current.getValue()&&(Q.current=!0,c.current.executeEdits("",[{range:c.current.getModel().getFullModelRange(),text:n,forceMoveMarkers:!0}]),c.current.pushUndoStop(),Q.current=!1))},[n],d),y(()=>{let h=c.current?.getModel();h&&o&&g.current?.editor.setModelLanguage(h,o)},[o],d),y(()=>{s!==void 0&&c.current?.revealLine(s)},[s],d),y(()=>{g.current?.editor.setTheme(a)},[a],d);let ae=kt(()=>{if(!(!E.current||!g.current)&&!ie.current){z.current(g.current);let h=i||r,j=T(g.current,n||e||"",t||o||"",h||"");c.current=g.current?.editor.create(E.current,{model:j,automaticLayout:!0,...v},S),w&&c.current.restoreViewState(_.get(h)),g.current.editor.setTheme(a),p(!0),ie.current=!0}},[e,t,r,n,o,i,v,S,w,a]);H(()=>{d&&N.current(c.current,g.current)},[d]),H(()=>{!l&&!d&&ae()},[l,d,ae]),u.current=n,H(()=>{d&&C&&(A.current?.dispose(),A.current=c.current?.onDidChangeModelContent(h=>{Q.current||C(c.current.getValue(),h)}))},[d,C]),H(()=>{if(d){let h=g.current.editor.onDidChangeMarkers(j=>{let X=c.current.getModel()?.uri;if(X&&j.find(Z=>Z.path===X.path)){let Z=g.current.editor.getModelMarkers({resource:X});L?.(Z)}});return()=>{h?.dispose()}}return()=>{}},[d,L]);function Ve(){A.current?.dispose(),k?w&&_.set(i,c.current.saveViewState()):c.current.getModel()?.dispose(),c.current.dispose()}return _t.createElement(xe,{width:B,height:K,isEditorReady:d,loading:f,_ref:E,className:G,wrapperProps:Y})}var Qt=Jt,Xt=Ht(Qt),oe=Xt;import De from"react";var Zt=oe.default||oe,er="code-editor",tr=e=>{let{className:t,height:r,options:n,readOnly:o,...i}=e,{theme:a}=ue(),s=[er,t,i?.defaultLanguage?`language--${i.defaultLanguage}`:""].filter(Boolean).join(" ");return De.createElement(Zt,{className:s,height:r,loading:De.createElement(ce,{height:r}),options:{detectIndentation:!0,minimap:{enabled:!1},readOnly:!!o,scrollBeyondLastLine:!1,tabSize:2,wordWrap:"on",...n},theme:a==="dark"?"vs-dark":"vs",...i})},Gr=tr;export{Gr as default};
-//# sourceMappingURL=CodeEditor-UTZFZWZG.js.map
+  `},ye=ve(ut)(we),lt={config:at},Oe=lt;var st=function(){for(var t=arguments.length,r=new Array(t),n=0;n<t;n++)r[n]=arguments[n];return function(o){return r.reduceRight(function(i,a){return a(i)},o)}},je=st;function Me(e,t){return Object.keys(t).forEach(function(r){t[r]instanceof Object&&e[r]&&Object.assign(t[r],Me(e[r],t[r]))}),ee(ee({},e),t)}var Pe=Me;var ft={type:"cancelation",msg:"operation is manually canceled"};function dt(e){var t=!1,r=new Promise(function(n,o){e.then(function(i){return t?o(ft):n(i)}),e.catch(o)});return r.cancel=function(){return t=!0},r}var F=dt;var pt=ge.create({config:he,isInitialized:!1,resolve:null,reject:null,monaco:null}),Se=de(pt,2),V=Se[0],$=Se[1];function mt(e){var t=Oe.config(e),r=t.monaco,n=fe(t,["monaco"]);$(function(o){return{config:Pe(o.config,n),monaco:r}})}function gt(){var e=V(function(t){var r=t.monaco,n=t.isInitialized,o=t.resolve;return{monaco:r,isInitialized:n,resolve:o}});if(!e.isInitialized){if($({isInitialized:!0}),e.monaco)return e.resolve(e.monaco),F(te);if(window.monaco&&window.monaco.editor)return Ee(window.monaco),e.resolve(window.monaco),F(te);je(ht,bt)(yt)}return F(te)}function ht(e){return document.body.appendChild(e)}function vt(e){var t=document.createElement("script");return e&&(t.src=e),t}function bt(e){var t=V(function(n){var o=n.config,i=n.reject;return{config:o,reject:i}}),r=vt("".concat(t.config.paths.vs,"/loader.js"));return r.onload=function(){return e()},r.onerror=t.reject,r}function yt(){var e=V(function(r){var n=r.config,o=r.resolve,i=r.reject;return{config:n,resolve:o,reject:i}}),t=window.require;t.config(e.config),t(["vs/editor/editor.main"],function(r){Ee(r),e.resolve(r)},function(r){e.reject(r)})}function Ee(e){V().monaco||$({monaco:e})}function wt(){return V(function(e){var t=e.monaco;return t})}var te=new Promise(function(e,t){return $({resolve:e,reject:t})}),Ot={config:mt,init:gt,__getMonacoInstance:wt},P=Ot;import{memo as jt}from"react";import Mt,{useState as Ie,useRef as I,useCallback as Te,useEffect as Ce}from"react";import{memo as Pt}from"react";import re from"react";import Et from"react";import{useEffect as Dt}from"react";import{useEffect as Wt,useRef as Nt}from"react";import{useState as Nr}from"react";import{memo as Ht}from"react";import _t,{useState as Le,useEffect as H,useRef as O,useCallback as kt}from"react";import{useEffect as Bt,useRef as Kt}from"react";var St={wrapper:{display:"flex",position:"relative",textAlign:"initial"},fullWidth:{width:"100%"},hide:{display:"none"}},ne=St,It={container:{display:"flex",height:"100%",width:"100%",justifyContent:"center",alignItems:"center"}},Tt=It;function Ct({children:e}){return Et.createElement("div",{style:Tt.container},e)}var Lt=Ct,xt=Lt;function At({width:e,height:t,isEditorReady:r,loading:n,_ref:o,className:i,wrapperProps:a}){return re.createElement("section",{style:{...ne.wrapper,width:e,height:t},...a},!r&&re.createElement(xt,null,n),re.createElement("div",{ref:o,style:{...ne.fullWidth,...!r&&ne.hide},className:i}))}var Rt=At,xe=Pt(Rt);function Vt(e){Dt(e,[])}var Ae=Vt;function zt(e,t,r=!0){let n=Nt(!0);Wt(n.current||!r?()=>{n.current=!1}:e,t)}var y=zt;function W(){}function T(e,t,r,n){return Ut(e,n)||qt(e,t,r,n)}function Ut(e,t){return e.editor.getModel(Re(e,t))}function qt(e,t,r,n){return e.editor.createModel(t,r,n?Re(e,n):void 0)}function Re(e,t){return e.Uri.parse(t)}function Ft({original:e,modified:t,language:r,originalLanguage:n,modifiedLanguage:o,originalModelPath:i,modifiedModelPath:a,keepCurrentOriginalModel:s=!1,keepCurrentModifiedModel:f=!1,theme:v="light",loading:S="Loading...",options:w={},height:k="100%",width:B="100%",className:K,wrapperProps:G={},beforeMount:Y=W,onMount:J=W}){let[b,C]=Ie(!1),[L,d]=Ie(!0),p=I(null),l=I(null),x=I(null),g=I(J),c=I(Y),E=I(!1);Ae(()=>{let u=P.init();return u.then(m=>(l.current=m)&&d(!1)).catch(m=>m?.type!=="cancelation"&&console.error("Monaco initialization: error:",m)),()=>p.current?A():u.cancel()}),y(()=>{let u=p.current.getModifiedEditor();u.getOption(l.current.editor.EditorOption.readOnly)?u.setValue(t||""):t!==u.getValue()&&(u.executeEdits("",[{range:u.getModel().getFullModelRange(),text:t||"",forceMoveMarkers:!0}]),u.pushUndoStop())},[t],b),y(()=>{p.current?.getModel()?.original.setValue(e||"")},[e],b),y(()=>{let{original:u,modified:m}=p.current.getModel();l.current.editor.setModelLanguage(u,n||r||"text"),l.current.editor.setModelLanguage(m,o||r||"text")},[r,n,o],b),y(()=>{l.current?.editor.setTheme(v)},[v],b),y(()=>{p.current?.updateOptions(w)},[w],b);let N=Te(()=>{if(!l.current)return;c.current(l.current);let u=T(l.current,e||"",n||r||"text",i||""),m=T(l.current,t||"",o||r||"text",a||"");p.current?.setModel({original:u,modified:m})},[r,t,o,e,n,i,a]),z=Te(()=>{!E.current&&x.current&&(p.current=l.current.editor.createDiffEditor(x.current,{automaticLayout:!0,...w}),N(),l.current?.editor.setTheme(v),C(!0),E.current=!0)},[w,v,N]);Ce(()=>{b&&g.current(p.current,l.current)},[b]),Ce(()=>{!L&&!b&&z()},[L,b,z]),y(()=>{if(p.current&&l.current){let u=p.current.getOriginalEditor(),m=T(l.current,e||"",n||r||"text",i||"");m!==u.getModel()&&u.setModel(m)}},[i],b),y(()=>{if(p.current&&l.current){let u=p.current.getModifiedEditor(),m=T(l.current,t||"",o||r||"text",a||"");m!==u.getModel()&&u.setModel(m)}},[a],b);function A(){let u=p.current?.getModel();s||u?.original?.dispose(),f||u?.modified?.dispose(),p.current?.dispose()}return Mt.createElement(xe,{width:B,height:k,isEditorReady:b,loading:S,_ref:x,className:K,wrapperProps:G})}var $t=Ft,Vr=jt($t);function Gt(e){let t=Kt();return Bt(()=>{t.current=e},[e]),t.current}var Yt=Gt,_=new Map;function Jt({defaultValue:e,defaultLanguage:t,defaultPath:r,value:n,language:o,path:i,theme:a="light",line:s,loading:f="Loading...",options:v={},overrideServices:S={},saveViewState:w=!0,keepCurrentModel:k=!1,width:B="100%",height:K="100%",className:G,wrapperProps:Y={},beforeMount:J=W,onMount:b=W,onChange:C,onValidate:L=W}){let[d,p]=Le(!1),[l,x]=Le(!0),g=O(null),c=O(null),E=O(null),N=O(b),z=O(J),A=O(),u=O(n),m=Yt(i),ie=O(!1),Q=O(!1);Ae(()=>{let h=P.init();return h.then(j=>(g.current=j)&&x(!1)).catch(j=>j?.type!=="cancelation"&&console.error("Monaco initialization: error:",j)),()=>c.current?Ve():h.cancel()}),y(()=>{let h=T(g.current,e||n||"",t||o||"",i||r||"");h!==c.current?.getModel()&&(w&&_.set(m,c.current?.saveViewState()),c.current?.setModel(h),w&&c.current?.restoreViewState(_.get(i)))},[i],d),y(()=>{c.current?.updateOptions(v)},[v],d),y(()=>{!c.current||n===void 0||(c.current.getOption(g.current.editor.EditorOption.readOnly)?c.current.setValue(n):n!==c.current.getValue()&&(Q.current=!0,c.current.executeEdits("",[{range:c.current.getModel().getFullModelRange(),text:n,forceMoveMarkers:!0}]),c.current.pushUndoStop(),Q.current=!1))},[n],d),y(()=>{let h=c.current?.getModel();h&&o&&g.current?.editor.setModelLanguage(h,o)},[o],d),y(()=>{s!==void 0&&c.current?.revealLine(s)},[s],d),y(()=>{g.current?.editor.setTheme(a)},[a],d);let ae=kt(()=>{if(!(!E.current||!g.current)&&!ie.current){z.current(g.current);let h=i||r,j=T(g.current,n||e||"",t||o||"",h||"");c.current=g.current?.editor.create(E.current,{model:j,automaticLayout:!0,...v},S),w&&c.current.restoreViewState(_.get(h)),g.current.editor.setTheme(a),p(!0),ie.current=!0}},[e,t,r,n,o,i,v,S,w,a]);H(()=>{d&&N.current(c.current,g.current)},[d]),H(()=>{!l&&!d&&ae()},[l,d,ae]),u.current=n,H(()=>{d&&C&&(A.current?.dispose(),A.current=c.current?.onDidChangeModelContent(h=>{Q.current||C(c.current.getValue(),h)}))},[d,C]),H(()=>{if(d){let h=g.current.editor.onDidChangeMarkers(j=>{let X=c.current.getModel()?.uri;if(X&&j.find(Z=>Z.path===X.path)){let Z=g.current.editor.getModelMarkers({resource:X});L?.(Z)}});return()=>{h?.dispose()}}return()=>{}},[d,L]);function Ve(){A.current?.dispose(),k?w&&_.set(i,c.current.saveViewState()):c.current.getModel()?.dispose(),c.current.dispose()}return _t.createElement(xe,{width:B,height:K,isEditorReady:d,loading:f,_ref:E,className:G,wrapperProps:Y})}var Qt=Jt,Xt=Ht(Qt),oe=Xt;import De from"react";var Zt=oe.default||oe,er="code-editor",tr=e=>{let{className:t,height:r,options:n,readOnly:o,...i}=e,{theme:a}=ue(),s=[er,t,i?.defaultLanguage?`language--${i.defaultLanguage}`:"",o&&"read-only"].filter(Boolean).join(" ");return De.createElement(Zt,{className:s,height:r,loading:De.createElement(ce,{height:r}),options:{detectIndentation:!0,minimap:{enabled:!1},readOnly:!!o,scrollBeyondLastLine:!1,tabSize:2,wordWrap:"on",...n},theme:a==="dark"?"vs-dark":"vs",...i})},Gr=tr;export{Gr as default};
+//# sourceMappingURL=CodeEditor-UPOVAXRP.js.map