@tachybase/client 1.6.20 → 1.6.22

package/lib/filter-provider/utils.js

@@ -34,8 +34,8 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     mergeFilter: ()=>mergeFilter,
-    FILTER_OPERATORS_WITH_ARRAY_VALUES: ()=>FILTER_OPERATORS_WITH_ARRAY_VALUES,
-    normalizeDateBetweenValue: ()=>normalizeDateBetweenValue,
+    FILTER_OPERATORS_WITH_ARRAY_VALUES: ()=>dateValueUtils_js_namespaceObject.FILTER_OPERATORS_WITH_ARRAY_VALUES,
+    normalizeDateBetweenValue: ()=>dateValueUtils_js_namespaceObject.normalizeDateBetweenValue,
     transformToFilter: ()=>transformToFilter,
     isSameCollection: ()=>isSameCollection,
     getSupportFieldsByForeignKey: ()=>getSupportFieldsByForeignKey,
@@ -44,21 +44,20 @@ __webpack_require__.d(__webpack_exports__, {
     isAssocField: ()=>isAssocField,
     useAssociatedFields: ()=>useAssociatedFields,
     isInFilterFormBlock: ()=>isInFilterFormBlock,
-    shouldUseDefaultDateBoundary: ()=>shouldUseDefaultDateBoundary,
+    shouldUseDefaultDateBoundary: ()=>dateValueUtils_js_namespaceObject.shouldUseDefaultDateBoundary,
     useFilterAPI: ()=>useFilterAPI,
     useSupportedBlocks: ()=>useSupportedBlocks
 });
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
 const client_namespaceObject = require("@tego/client");
-const external_dayjs_namespaceObject = require("dayjs");
-var external_dayjs_default = /*#__PURE__*/ __webpack_require__.n(external_dayjs_namespaceObject);
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const index_js_namespaceObject = require("../block-provider/hooks/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../collection-manager/index.js");
 const external_schema_component_index_js_namespaceObject = require("../schema-component/index.js");
 const util_js_namespaceObject = require("../schema-component/antd/date-picker/util.js");
+const dateValueUtils_js_namespaceObject = require("../schema-component/antd/filter/dateValueUtils.js");
 const SchemaSettingOptions_js_namespaceObject = require("../schema-component/antd/form-item/SchemaSettingOptions.js");
 const external_FilterProvider_js_namespaceObject = require("./FilterProvider.js");
 const external_incomingFilterFromSources_js_namespaceObject = require("./incomingFilterFromSources.js");
@@ -80,17 +79,6 @@ const mergeFilter = function(filters) {
         [op]: items
     };
 };
-const FILTER_OPERATORS_WITH_ARRAY_VALUES = new Set([
-    '$match',
-    '$notMatch',
-    '$anyOf',
-    '$noneOf',
-    '$childIn',
-    '$childNotIn',
-    '$dateBetween',
-    '$in',
-    '$notIn'
-]);
 const getSupportFieldsByAssociation = (inheritCollectionsChain, block)=>{
     var _block_associatedFields;
     return null == (_block_associatedFields = block.associatedFields) ? void 0 : _block_associatedFields.filter((field)=>null == inheritCollectionsChain ? void 0 : inheritCollectionsChain.some((collectionName)=>collectionName === field.target));
@@ -153,50 +141,6 @@ const getDatePickerShowTime = (fieldSchema)=>{
     var _fieldSchema_xcomponentprops;
     return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
 };
-const isDateOnlyString = (value)=>'string' == typeof value && /^\d{4}-\d{2}-\d{2}$/.test(value);
-const hasExplicitTime = (value)=>'string' == typeof value && /[T\s]\d{2}:\d{2}/.test(value);
-const normalizeLocalDateBoundaryInput = (value)=>{
-    if ('string' != typeof value) return value;
-    return value.replace(/Z$/, '').replace(/[+-]\d\d:\d\d$/, '');
-};
-const normalizeDateBetweenBoundary = function(value, boundary) {
-    let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
-    const m = external_dayjs_default()(value);
-    if (!m.isValid()) return value;
-    if (isDateOnlyString(value)) return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
-    if ('date' === options.valueMode) {
-        if ('metadata' === options.valueSource || 'retained-local-date-boundary' === options.valueSource) return m.toISOString();
-        const localBoundary = external_dayjs_default()(normalizeLocalDateBoundaryInput(value));
-        return ('start' === boundary ? localBoundary.startOf('day') : localBoundary.endOf('day')).toISOString();
-    }
-    if (hasExplicitTime(value)) return m.toISOString();
-    if (!options.useDefaultDateBoundary) return m.toISOString();
-    return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
-};
-const shouldApplyDefaultDateBoundary = function(start, end, value) {
-    let options = arguments.length > 3 && void 0 !== arguments[3] ? arguments[3] : {};
-    if ('datetime' === options.valueMode) return false;
-    if ('date' === options.valueMode) return true;
-    if (!options.useDefaultDateBoundary) return false;
-    if (isDateOnlyString(start) || isDateOnlyString(end)) return true;
-    return options.preferDateBoundaryFallback && 'date' === options.valueMode && (0, util_js_namespaceObject.isDatePickerDefaultRangeBoundaryValue)(start, 'start') && (0, util_js_namespaceObject.isDatePickerDefaultRangeBoundaryValue)(end, 'end');
-};
-const normalizeDateBetweenValue = function(value) {
-    let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
-    const normalized = value.filter(Boolean);
-    if (0 === normalized.length) return null;
-    const start = normalized[0];
-    const end = 1 === normalized.length ? normalized[0] : normalized[normalized.length - 1];
-    const boundaryOptions = {
-        ...options,
-        useDefaultDateBoundary: shouldApplyDefaultDateBoundary(start, end, value, options)
-    };
-    return [
-        normalizeDateBetweenBoundary(start, 'start', boundaryOptions),
-        normalizeDateBetweenBoundary(end, 'end', boundaryOptions)
-    ];
-};
-const shouldUseDefaultDateBoundary = (fieldSchema)=>'DatePicker.RangePicker' === getDatePickerComponent(fieldSchema);
 const transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = (0, SchemaSettingOptions_js_namespaceObject.findFilterOperators)(fieldSchema);
     values = (0, client_namespaceObject.flatten)(values, {
@@ -204,7 +148,7 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
             let { value, path } = param;
             const collectionField = getCollectionJoinField("".concat(collectionName, ".").concat(path));
             const operator = resolveFilterOperator(fieldSchema, path, operators, getOperatorList, collectionField);
-            if (FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator)) return true;
+            if (dateValueUtils_js_namespaceObject.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator)) return true;
             if (null == collectionField ? void 0 : collectionField.target) {
                 if (Array.isArray(value)) return true;
                 const targetKey = collectionField.targetKey || 'id';
@@ -239,13 +183,13 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
             } else if ('$dateBetween' === operator) {
                 if (Array.isArray(value)) {
                     const datePickerComponent = getDatePickerComponent(currentFieldSchema);
-                    const useDefaultDateBoundary = shouldUseDefaultDateBoundary(currentFieldSchema);
+                    const useDefaultDateBoundary = (0, dateValueUtils_js_namespaceObject.shouldUseDefaultDateBoundary)(currentFieldSchema);
                     const valueInfo = (0, util_js_namespaceObject.resolveDatePickerRangeValueInfo)(value, {
                         component: datePickerComponent,
                         showTime: getDatePickerShowTime(currentFieldSchema),
                         preferDateBoundaryFallback: useDefaultDateBoundary
                     });
-                    value = normalizeDateBetweenValue(value, {
+                    value = (0, dateValueUtils_js_namespaceObject.normalizeDateBetweenValue)(value, {
                         useDefaultDateBoundary,
                         valueMode: valueInfo.mode,
                         valueSource: valueInfo.source,