@infinite-table/infinite-react 0.2.3 → 0.2.4

package/index.d.ts

@@ -348,8 +348,7 @@ declare module "components/DataSource/types" {
     export interface DataSourceMappedState<T> {
         aggregationReducers?: DataSourceProps<T>['aggregationReducers'];
         livePagination: DataSourceProps<T>['livePagination'];
-        fullLazyLoad: DataSourceProps<T>['fullLazyLoad'];
-        lazyLoadBatchSize: DataSourceProps<T>['lazyLoadBatchSize'];
+        lazyLoad: DataSourceProps<T>['lazyLoad'];
         onDataParamsChange: DataSourceProps<T>['onDataParamsChange'];
         data: DataSourceProps<T>['data'];
         primaryKey: DataSourceProps<T>['primaryKey'];
@@ -418,8 +417,9 @@ declare module "components/DataSource/types" {
         primaryKey: keyof T;
         fields?: (keyof T)[];
         data: DataSourceData<T>;
-        fullLazyLoad?: boolean;
-        lazyLoadBatchSize?: number;
+        lazyLoad?: boolean | {
+            batchSize?: number;
+        };
         loading?: boolean;
         defaultLoading?: boolean;
         onLoadingChange?: (loading: boolean) => void;
@@ -457,6 +457,7 @@ declare module "components/DataSource/types" {
         multiSort: boolean;
         controlledSort: boolean;
         livePaginationCursor?: DataSourceLivePaginationCursorValue;
+        lazyLoadBatchSize?: number;
     }
     export type DataSourceComponentActions<T> = ComponentStateActions<DataSourceState<T>>;
     export interface DataSourceContextValue<T> {
@@ -533,10 +534,13 @@ declare module "components/DataSource/state/getInitialState" {
         sortInfo: 1 | ((value: import("components/DataSource").DataSourceSortInfo<T> | undefined) => import("components/DataSource").DataSourceSingleSortInfo<T>[] | null);
         groupBy: 1 | ((value: import("components/DataSource").DataSourcePropGroupBy<T> | undefined) => import("components/DataSource").DataSourcePropGroupBy<T>);
         pivotBy: 1 | ((value: import("components/DataSource").DataSourcePropPivotBy<T> | undefined) => import("components/DataSource").DataSourcePropPivotBy<T> | undefined);
-        lazyLoadBatchSize: 1 | ((value: number | undefined) => number | undefined);
         aggregationReducers: 1 | ((value: import("components/DataSource").DataSourcePropAggregationReducers<T> | undefined) => import("components/DataSource").DataSourcePropAggregationReducers<T> | undefined);
         livePagination: 1 | ((value: boolean | undefined) => boolean | undefined);
-        fullLazyLoad: 1 | ((value: boolean | undefined) => boolean | undefined);
+        lazyLoad: 1 | ((value: boolean | {
+            batchSize?: number | undefined;
+        } | undefined) => boolean | {
+            batchSize?: number | undefined;
+        } | undefined);
         onDataParamsChange: 1 | ((value: ((dataParamsChange: DataSourceDataParams<T>) => void) | undefined) => ((dataParamsChange: DataSourceDataParams<T>) => void) | undefined);
         primaryKey: 1 | ((value: keyof T) => keyof T);
         groupRowsState: 1 | ((value: GroupRowsState<any> | undefined) => GroupRowsState<any>);
@@ -550,6 +554,7 @@ declare module "components/DataSource/state/getInitialState" {
     export function onPropChange<T>(params: {
         name: keyof T;
         newValue: any;
+        oldValue: any;
     }, props: DataSourceProps<T>, actions: DataSourceComponentActions<T>): void;
     export function getInterceptActions<T>(): ComponentInterceptedActions<DataSourceState<T>>;
 }

package/index.esm.js

@@ -3025,7 +3025,7 @@ function buildDataSourceDataParams(componentState, overrides) {
     dataSourceParams.livePaginationCursor = componentState.livePaginationCursor;
     dataSourceParams.cursorId = componentState.cursorId;
   }
-  if (componentState.fullLazyLoad) {
+  if (componentState.lazyLoad) {
     if (componentState.lazyLoadBatchSize != null && componentState.lazyLoadBatchSize > 0) {
       dataSourceParams.lazyLoadBatchSize = componentState.lazyLoadBatchSize;
       dataSourceParams.lazyLoadStartIndex = 0;
@@ -3050,9 +3050,9 @@ function buildDataSourceDataParams(componentState, overrides) {
 }
 function loadData(data, componentState, actions, overrides) {
   const dataParams = buildDataSourceDataParams(componentState, overrides);
-  if (componentState.fullLazyLoad && dataParams.groupKeys) {
+  if (componentState.lazyLoad) {
     const lazyGroupData = componentState.originalLazyGroupData;
-    const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys];
+    const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys || []];
     const existingGroupRowInfo = lazyGroupData.get(key);
     if (existingGroupRowInfo && existingGroupRowInfo.cache) {
       const items = existingGroupRowInfo.items;
@@ -3073,7 +3073,7 @@ function loadData(data, componentState, actions, overrides) {
     data = data(dataParams);
   }
   const dataIsPromise = typeof data === "object" && typeof data.then === "function";
-  if (dataIsPromise && !componentState.fullLazyLoad) {
+  if (dataIsPromise && !componentState.lazyLoad) {
     actions.loading = true;
   }
   return Promise.resolve(data).then((dataParam) => {
@@ -3089,9 +3089,9 @@ function loadData(data, componentState, actions, overrides) {
       if (remoteData.mappings) {
         actions.pivotMappings = remoteData.mappings;
       }
-      if (componentState.fullLazyLoad && dataParams.groupKeys) {
+      if (componentState.lazyLoad) {
         const lazyGroupData = componentState.originalLazyGroupData;
-        const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys];
+        const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys || []];
         const newGroupRowInfo = {
           cache: !!remoteData.cache,
           totalCount: (_a = remoteData.totalCount) != null ? _a : dataArray.length,
@@ -3121,6 +3121,10 @@ function loadData(data, componentState, actions, overrides) {
         }
         skipAssign = true;
         actions.originalLazyGroupDataChangeDetect = getChangeDetect();
+        if (!dataParams.groupKeys || !dataParams.groupKeys.length) {
+          const topLevelItems = lazyGroupData.get([LAZY_ROOT_KEY_FOR_GROUPS]);
+          actions.originalDataArray = [...topLevelItems.items];
+        }
       }
     } else {
       dataArray = dataParam;
@@ -3128,7 +3132,7 @@ function loadData(data, componentState, actions, overrides) {
     if (!skipAssign) {
       actions.originalDataArray = dataArray;
     }
-    if (dataIsPromise && !componentState.fullLazyLoad) {
+    if (dataIsPromise && !componentState.lazyLoad) {
       actions.loading = false;
     }
   });
@@ -3286,27 +3290,27 @@ function lazyLoadRange(options, cache) {
     const cacheKeys = theGroupKeys.length ? theGroupKeys : rootGroupKeys;
     const indexInGroup = rowInfo.indexInGroup;
     if (!rowLoaded) {
-      let fnCalls = perGroupFnCalls.get(cacheKeys);
+      let cachedFnCalls = perGroupFnCalls.get(cacheKeys);
       const batchStartIndexInGroup = Math.floor(indexInGroup / lazyLoadBatchSize) * lazyLoadBatchSize;
       const offset = rowInfo.indexInGroup - batchStartIndexInGroup;
       const absoluteIndexOfBatchStart = dataArray[rowInfo.indexInAll - offset].indexInAll;
       const batchStartRowLoaded = isRowLoaded(absoluteIndexOfBatchStart);
       const batchStartRowId = dataArray[absoluteIndexOfBatchStart].id;
-      if (batchStartRowLoaded || (fnCalls == null ? void 0 : fnCalls[batchStartRowId])) {
+      if (batchStartRowLoaded || (cachedFnCalls == null ? void 0 : cachedFnCalls[batchStartRowId])) {
         continue;
       }
-      const shouldSetFnCalls = !fnCalls;
-      fnCalls = fnCalls || {};
+      const shouldSetFnCalls = !cachedFnCalls;
+      cachedFnCalls = cachedFnCalls || {};
       const currentFnCall = {
         lazyLoadStartIndex: batchStartIndexInGroup,
         lazyLoadBatchSize,
         groupKeys: theGroupKeys
       };
-      if (!fnCalls[batchStartRowId]) {
-        fnCalls[batchStartRowId] = currentFnCall;
+      if (!cachedFnCalls[batchStartRowId]) {
+        cachedFnCalls[batchStartRowId] = currentFnCall;
       }
       if (shouldSetFnCalls) {
-        perGroupFnCalls.set(cacheKeys, fnCalls);
+        perGroupFnCalls.set(cacheKeys, cachedFnCalls);
       }
     }
   }
@@ -3563,12 +3567,11 @@ function getCompareObjectForDataParams(dataParams) {
 var forwardProps3 = (setupState) => {
   return {
     onDataParamsChange: (fn) => fn ? discardCallsWithEqualArg(fn, 100, getCompareObjectForDataParams) : void 0,
-    fullLazyLoad: 1,
+    lazyLoad: (lazyLoad) => !!lazyLoad,
     data: 1,
     pivotBy: 1,
     primaryKey: 1,
     livePagination: 1,
-    lazyLoadBatchSize: (lazyLoadBatchSize) => lazyLoadBatchSize != null ? lazyLoadBatchSize : -1,
     aggregationReducers: 1,
     collapseGroupRowsOnDataFunctionChange: (collapseGroupRowsOnDataFunctionChange) => collapseGroupRowsOnDataFunctionChange != null ? collapseGroupRowsOnDataFunctionChange : true,
     loading: (loading) => loading != null ? loading : false,
@@ -3595,7 +3598,8 @@ function mapPropsToState2(params) {
   const controlledSort = isControlledValue(props.sortInfo);
   const result = {
     controlledSort,
-    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo)
+    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo),
+    lazyLoadBatchSize: typeof props.lazyLoad === "object" ? props.lazyLoad.batchSize : void 0
   };
   if (props.livePagination) {
     const dataArrayChanged = !oldState || oldState.originalDataArray !== state.originalDataArray;
@@ -3608,7 +3612,7 @@ var debugFullLazyLoad = dbg("DataSource:fullLazyLoad");
 function onPropChange(params, props, actions) {
   const { name, newValue } = params;
   if (name === "data" && typeof newValue === "function" && !props.groupRowsState) {
-    if (props.fullLazyLoad) {
+    if (props.lazyLoad) {
       debugFullLazyLoad(`"data" function prop has changed`);
     }
     if (props.collapseGroupRowsOnDataFunctionChange !== false) {
@@ -3875,17 +3879,29 @@ function concludeReducer(params) {
   var _a;
   const { state, previousState } = params;
   const sortInfo = state.sortInfo;
-  const shouldSort = !!(sortInfo == null ? void 0 : sortInfo.length) && !state.controlledSort;
-  const originalDataArrayChanged = haveDepsChanged(previousState, state, [
+  let shouldSort = !!(sortInfo == null ? void 0 : sortInfo.length) && !state.controlledSort;
+  if (state.lazyLoad || state.livePagination) {
+    shouldSort = false;
+  }
+  let originalDataArrayChanged = haveDepsChanged(previousState, state, [
     "originalDataArray"
   ]);
+  const dataSourceChange = previousState && state.data !== previousState.data;
+  let lazyLoadGroupDataChange = state.lazyLoad && previousState && (previousState.groupBy !== state.groupBy || previousState.sortInfo !== state.sortInfo);
+  if (dataSourceChange) {
+    lazyLoadGroupDataChange = true;
+  }
+  if (lazyLoadGroupDataChange) {
+    state.originalLazyGroupData = new DeepMap();
+    originalDataArrayChanged = true;
+  }
   const sortInfoChanged = haveDepsChanged(previousState, state, ["sortInfo"]);
   const sortDepsChanged = originalDataArrayChanged || sortInfoChanged;
   const shouldSortAgain = shouldSort && (sortDepsChanged || !state.lastSortDataArray);
   const groupBy = state.groupBy;
   const pivotBy = state.pivotBy;
   const shouldGroup = groupBy.length || pivotBy;
-  const groupsDepsChanged = haveDepsChanged(previousState, state, [
+  const groupsDepsChanged = originalDataArrayChanged || haveDepsChanged(previousState, state, [
     "generateGroupRows",
     "originalDataArray",
     "originalLazyGroupData",
@@ -3918,7 +3934,7 @@ function concludeReducer(params) {
   };
   if (shouldGroup) {
     if (shouldGroupAgain) {
-      const groupResult = state.fullLazyLoad ? lazyGroup({
+      const groupResult = state.lazyLoad ? lazyGroup({
         groupBy,
         pivot: pivotBy,
         mappings: state.pivotMappings,
@@ -4027,7 +4043,7 @@ function useToggleGroupRow() {
     const newState = new GroupRowsState(state.groupRowsState);
     newState.toggleGroupRow(groupKeys);
     dataSourceActions.groupRowsState = newState;
-    if (state.fullLazyLoad && newState.isGroupRowExpanded(groupKeys)) {
+    if (state.lazyLoad && newState.isGroupRowExpanded(groupKeys)) {
       loadData(state.data, state, dataSourceActions, {
         groupKeys
       });
@@ -7723,7 +7739,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo12(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.3"
+      version: "0.2.4"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;

package/index.js

@@ -3011,7 +3011,7 @@ function buildDataSourceDataParams(componentState, overrides) {
     dataSourceParams.livePaginationCursor = componentState.livePaginationCursor;
     dataSourceParams.cursorId = componentState.cursorId;
   }
-  if (componentState.fullLazyLoad) {
+  if (componentState.lazyLoad) {
     if (componentState.lazyLoadBatchSize != null && componentState.lazyLoadBatchSize > 0) {
       dataSourceParams.lazyLoadBatchSize = componentState.lazyLoadBatchSize;
       dataSourceParams.lazyLoadStartIndex = 0;
@@ -3036,9 +3036,9 @@ function buildDataSourceDataParams(componentState, overrides) {
 }
 function loadData(data, componentState, actions, overrides) {
   const dataParams = buildDataSourceDataParams(componentState, overrides);
-  if (componentState.fullLazyLoad && dataParams.groupKeys) {
+  if (componentState.lazyLoad) {
     const lazyGroupData = componentState.originalLazyGroupData;
-    const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys];
+    const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys || []];
     const existingGroupRowInfo = lazyGroupData.get(key);
     if (existingGroupRowInfo && existingGroupRowInfo.cache) {
       const items = existingGroupRowInfo.items;
@@ -3059,7 +3059,7 @@ function loadData(data, componentState, actions, overrides) {
     data = data(dataParams);
   }
   const dataIsPromise = typeof data === "object" && typeof data.then === "function";
-  if (dataIsPromise && !componentState.fullLazyLoad) {
+  if (dataIsPromise && !componentState.lazyLoad) {
     actions.loading = true;
   }
   return Promise.resolve(data).then((dataParam) => {
@@ -3075,9 +3075,9 @@ function loadData(data, componentState, actions, overrides) {
       if (remoteData.mappings) {
         actions.pivotMappings = remoteData.mappings;
       }
-      if (componentState.fullLazyLoad && dataParams.groupKeys) {
+      if (componentState.lazyLoad) {
         const lazyGroupData = componentState.originalLazyGroupData;
-        const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys];
+        const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys || []];
         const newGroupRowInfo = {
           cache: !!remoteData.cache,
           totalCount: (_a = remoteData.totalCount) != null ? _a : dataArray.length,
@@ -3107,6 +3107,10 @@ function loadData(data, componentState, actions, overrides) {
         }
         skipAssign = true;
         actions.originalLazyGroupDataChangeDetect = getChangeDetect();
+        if (!dataParams.groupKeys || !dataParams.groupKeys.length) {
+          const topLevelItems = lazyGroupData.get([LAZY_ROOT_KEY_FOR_GROUPS]);
+          actions.originalDataArray = [...topLevelItems.items];
+        }
       }
     } else {
       dataArray = dataParam;
@@ -3114,7 +3118,7 @@ function loadData(data, componentState, actions, overrides) {
     if (!skipAssign) {
       actions.originalDataArray = dataArray;
     }
-    if (dataIsPromise && !componentState.fullLazyLoad) {
+    if (dataIsPromise && !componentState.lazyLoad) {
       actions.loading = false;
     }
   });
@@ -3272,27 +3276,27 @@ function lazyLoadRange(options, cache) {
     const cacheKeys = theGroupKeys.length ? theGroupKeys : rootGroupKeys;
     const indexInGroup = rowInfo.indexInGroup;
     if (!rowLoaded) {
-      let fnCalls = perGroupFnCalls.get(cacheKeys);
+      let cachedFnCalls = perGroupFnCalls.get(cacheKeys);
       const batchStartIndexInGroup = Math.floor(indexInGroup / lazyLoadBatchSize) * lazyLoadBatchSize;
       const offset = rowInfo.indexInGroup - batchStartIndexInGroup;
       const absoluteIndexOfBatchStart = dataArray[rowInfo.indexInAll - offset].indexInAll;
       const batchStartRowLoaded = isRowLoaded(absoluteIndexOfBatchStart);
       const batchStartRowId = dataArray[absoluteIndexOfBatchStart].id;
-      if (batchStartRowLoaded || (fnCalls == null ? void 0 : fnCalls[batchStartRowId])) {
+      if (batchStartRowLoaded || (cachedFnCalls == null ? void 0 : cachedFnCalls[batchStartRowId])) {
         continue;
       }
-      const shouldSetFnCalls = !fnCalls;
-      fnCalls = fnCalls || {};
+      const shouldSetFnCalls = !cachedFnCalls;
+      cachedFnCalls = cachedFnCalls || {};
       const currentFnCall = {
         lazyLoadStartIndex: batchStartIndexInGroup,
         lazyLoadBatchSize,
         groupKeys: theGroupKeys
       };
-      if (!fnCalls[batchStartRowId]) {
-        fnCalls[batchStartRowId] = currentFnCall;
+      if (!cachedFnCalls[batchStartRowId]) {
+        cachedFnCalls[batchStartRowId] = currentFnCall;
       }
       if (shouldSetFnCalls) {
-        perGroupFnCalls.set(cacheKeys, fnCalls);
+        perGroupFnCalls.set(cacheKeys, cachedFnCalls);
       }
     }
   }
@@ -3549,12 +3553,11 @@ function getCompareObjectForDataParams(dataParams) {
 var forwardProps3 = (setupState) => {
   return {
     onDataParamsChange: (fn) => fn ? discardCallsWithEqualArg(fn, 100, getCompareObjectForDataParams) : void 0,
-    fullLazyLoad: 1,
+    lazyLoad: (lazyLoad) => !!lazyLoad,
     data: 1,
     pivotBy: 1,
     primaryKey: 1,
     livePagination: 1,
-    lazyLoadBatchSize: (lazyLoadBatchSize) => lazyLoadBatchSize != null ? lazyLoadBatchSize : -1,
     aggregationReducers: 1,
     collapseGroupRowsOnDataFunctionChange: (collapseGroupRowsOnDataFunctionChange) => collapseGroupRowsOnDataFunctionChange != null ? collapseGroupRowsOnDataFunctionChange : true,
     loading: (loading) => loading != null ? loading : false,
@@ -3581,7 +3584,8 @@ function mapPropsToState2(params) {
   const controlledSort = isControlledValue(props.sortInfo);
   const result = {
     controlledSort,
-    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo)
+    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo),
+    lazyLoadBatchSize: typeof props.lazyLoad === "object" ? props.lazyLoad.batchSize : void 0
   };
   if (props.livePagination) {
     const dataArrayChanged = !oldState || oldState.originalDataArray !== state.originalDataArray;
@@ -3594,7 +3598,7 @@ var debugFullLazyLoad = dbg("DataSource:fullLazyLoad");
 function onPropChange(params, props, actions) {
   const { name, newValue } = params;
   if (name === "data" && typeof newValue === "function" && !props.groupRowsState) {
-    if (props.fullLazyLoad) {
+    if (props.lazyLoad) {
       debugFullLazyLoad(`"data" function prop has changed`);
     }
     if (props.collapseGroupRowsOnDataFunctionChange !== false) {
@@ -3861,17 +3865,29 @@ function concludeReducer(params) {
   var _a;
   const { state, previousState } = params;
   const sortInfo = state.sortInfo;
-  const shouldSort = !!(sortInfo == null ? void 0 : sortInfo.length) && !state.controlledSort;
-  const originalDataArrayChanged = haveDepsChanged(previousState, state, [
+  let shouldSort = !!(sortInfo == null ? void 0 : sortInfo.length) && !state.controlledSort;
+  if (state.lazyLoad || state.livePagination) {
+    shouldSort = false;
+  }
+  let originalDataArrayChanged = haveDepsChanged(previousState, state, [
     "originalDataArray"
   ]);
+  const dataSourceChange = previousState && state.data !== previousState.data;
+  let lazyLoadGroupDataChange = state.lazyLoad && previousState && (previousState.groupBy !== state.groupBy || previousState.sortInfo !== state.sortInfo);
+  if (dataSourceChange) {
+    lazyLoadGroupDataChange = true;
+  }
+  if (lazyLoadGroupDataChange) {
+    state.originalLazyGroupData = new DeepMap();
+    originalDataArrayChanged = true;
+  }
   const sortInfoChanged = haveDepsChanged(previousState, state, ["sortInfo"]);
   const sortDepsChanged = originalDataArrayChanged || sortInfoChanged;
   const shouldSortAgain = shouldSort && (sortDepsChanged || !state.lastSortDataArray);
   const groupBy = state.groupBy;
   const pivotBy = state.pivotBy;
   const shouldGroup = groupBy.length || pivotBy;
-  const groupsDepsChanged = haveDepsChanged(previousState, state, [
+  const groupsDepsChanged = originalDataArrayChanged || haveDepsChanged(previousState, state, [
     "generateGroupRows",
     "originalDataArray",
     "originalLazyGroupData",
@@ -3904,7 +3920,7 @@ function concludeReducer(params) {
   };
   if (shouldGroup) {
     if (shouldGroupAgain) {
-      const groupResult = state.fullLazyLoad ? lazyGroup({
+      const groupResult = state.lazyLoad ? lazyGroup({
         groupBy,
         pivot: pivotBy,
         mappings: state.pivotMappings,
@@ -4013,7 +4029,7 @@ function useToggleGroupRow() {
     const newState = new GroupRowsState(state.groupRowsState);
     newState.toggleGroupRow(groupKeys);
     dataSourceActions.groupRowsState = newState;
-    if (state.fullLazyLoad && newState.isGroupRowExpanded(groupKeys)) {
+    if (state.lazyLoad && newState.isGroupRowExpanded(groupKeys)) {
       loadData(state.data, state, dataSourceActions, {
         groupKeys
       });
@@ -7630,7 +7646,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react43.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.3"
+      version: "0.2.4"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infinite-table/infinite-react",
   "description": "Infinite Table for React",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "main": "index.js",
   "module": "index.esm.js",
   "typings": "index.d.ts",
@@ -14,5 +14,5 @@
   },
   "license": "Commercial & Open Source",
   "//": "will be updated at build time",
-  "publishedAt": 1644358278775
+  "publishedAt": 1644430025786
 }