@go-avro/avro-js 0.0.37 → 0.0.39

package/dist/client/hooks/events.js

@@ -1,24 +1,24 @@
-import { useInfiniteQuery, useQuery, useMutation } from '@tanstack/react-query';
-import { AvroQueryClient } from '../../client/QueryClient';
-import { _Event, Job, LineItemStatus } from '../../types/api';
+import { useInfiniteQuery, useQuery, useMutation } from "@tanstack/react-query";
+import { AvroQueryClient } from "../../client/QueryClient";
+import { _Event, Job, LineItemStatus } from "../../types/api";
 /** Predicate that matches all 'jobs' queries (list and individual, but NOT 'infinite'). */
-const isJobsQuery = (q) => q.queryKey[0] === 'jobs';
+const isJobsQuery = (q) => q.queryKey[0] === "jobs";
 /** Predicate that matches all 'events' queries (list and individual). */
-const isEventsQuery = (q) => q.queryKey[0] === 'events';
+const isEventsQuery = (q) => q.queryKey[0] === "events";
 AvroQueryClient.prototype.useGetEvents = function (body) {
     const queryClient = this.getQueryClient();
     const result = useInfiniteQuery({
         queryKey: [
-            'events',
+            "events",
             this.companyId,
             body.amt ?? 50,
             body.known_ids ?? [],
             body.unknown_ids ?? [],
-            body.query ?? '',
+            body.query ?? "",
             body.unbilled ?? true,
             body.billed ?? true,
             body.paid ?? true,
-            body.jobId ?? '',
+            body.jobId ?? "",
             body.enabled ?? true,
         ],
         initialPageParam: 0,
@@ -27,13 +27,17 @@ AvroQueryClient.prototype.useGetEvents = function (body) {
                 return undefined;
             return allPages.flat().length; // next offset
         },
-        queryFn: ({ pageParam = 0 }) => this.fetchEvents({ ...body, job_id: body.jobId, offset: pageParam }).then((events) => events.map((event) => new _Event(event))),
+        queryFn: ({ pageParam = 0 }) => this.fetchEvents({
+            ...body,
+            job_id: body.jobId,
+            offset: pageParam,
+        }).then((events) => events.map((event) => new _Event(event))),
         enabled: body.enabled ?? true,
     });
     if (result.data) {
         result.data.pages.forEach((data_page) => {
             data_page.forEach((event) => {
-                queryClient.setQueryData(['events', event.id], event);
+                queryClient.setQueryData(["events", event.id], event);
             });
         });
     }
@@ -41,7 +45,7 @@ AvroQueryClient.prototype.useGetEvents = function (body) {
 };
 AvroQueryClient.prototype.useGetEvent = function (eventId) {
     return useQuery({
-        queryKey: ['events', eventId],
+        queryKey: ["events", eventId],
         queryFn: () => this.get({ path: `/event/${eventId}` }).then((event) => new _Event(event)),
         enabled: Boolean(eventId),
     });
@@ -53,12 +57,15 @@ AvroQueryClient.prototype.useCreateEvent = function () {
             return this.post({
                 path: `/company/${this.companyId}/event`,
                 data: JSON.stringify(eventData),
-                headers: { "Content-Type": "application/json" }
+                headers: { "Content-Type": "application/json" },
             });
         },
         onMutate: async ({ eventData }) => {
-            await queryClient.cancelQueries({ queryKey: ['events'] });
-            const previousJob = queryClient.getQueryData(['jobs', eventData.job_id]);
+            await queryClient.cancelQueries({ queryKey: ["events"] });
+            const previousJob = queryClient.getQueryData([
+                "jobs",
+                eventData.job_id,
+            ]);
             const optimisticEvent = new _Event({
                 ...eventData,
                 id: Math.random().toString(36).substring(2, 11),
@@ -68,20 +75,24 @@ AvroQueryClient.prototype.useCreateEvent = function () {
                 const updatedJob = new Job({
                     ...previousJob,
                     current_event: optimisticEvent,
-                    last_completed_event: (optimisticEvent.time_ended ?? -1) > -1 ? optimisticEvent : previousJob.last_completed_event,
+                    last_completed_event: (optimisticEvent.time_ended ?? -1) > -1
+                        ? optimisticEvent
+                        : previousJob.last_completed_event,
                     tasks: previousJob.tasks.map((task) => {
                         if (eventData.tasks?.includes(task.id ?? "")) {
                             return {
                                 ...task,
                                 current_event: optimisticEvent,
-                                last_completed_event: (optimisticEvent.time_ended ?? -1) > -1 ? optimisticEvent : task.last_completed_event,
+                                last_completed_event: (optimisticEvent.time_ended ?? -1) > -1
+                                    ? optimisticEvent
+                                    : task.last_completed_event,
                             };
                         }
                         return task;
                     }),
                 });
                 // Update individual job cache AND every active jobs list/query
-                queryClient.setQueriesData({ predicate: isJobsQuery, type: 'active' }, (old) => {
+                queryClient.setQueriesData({ predicate: isJobsQuery, type: "active" }, (old) => {
                     if (!old)
                         return old;
                     if (Array.isArray(old))
@@ -92,7 +103,7 @@ AvroQueryClient.prototype.useCreateEvent = function () {
                 });
             }
             // Add optimistic event to all active events queries
-            queryClient.setQueriesData({ predicate: isEventsQuery, type: 'active' }, (oldData) => {
+            queryClient.setQueriesData({ predicate: isEventsQuery, type: "active" }, (oldData) => {
                 if (!oldData)
                     return oldData;
                 if (oldData.pages) {
@@ -112,10 +123,27 @@ AvroQueryClient.prototype.useCreateEvent = function () {
             });
             return { previousJob };
         },
+        onSuccess: async (result, { eventData }) => {
+            const item = await this._syncEntity(queryClient, {
+                action: "create",
+                entityKey: "events",
+                id: result.id,
+                fetchPath: `/event/${result.id}`,
+            });
+            if (eventData.job_id) {
+                await this._syncEntity(queryClient, {
+                    action: "update",
+                    entityKey: "jobs",
+                    id: eventData.job_id,
+                    fetchPath: `/job/${eventData.job_id}`,
+                    construct: (d) => new Job(d),
+                });
+            }
+        },
         onError: (err, variables, context) => {
             // Restore individual job; invalidate lists to refetch clean state
             if (context?.previousJob) {
-                queryClient.setQueryData(['jobs', context.previousJob.id], context.previousJob);
+                queryClient.setQueryData(["jobs", context.previousJob.id], context.previousJob);
             }
             queryClient.invalidateQueries({ predicate: isJobsQuery });
             queryClient.invalidateQueries({ predicate: isEventsQuery });
@@ -125,22 +153,28 @@ AvroQueryClient.prototype.useCreateEvent = function () {
 AvroQueryClient.prototype.useUpdateEvent = function () {
     const queryClient = this.getQueryClient();
     return useMutation({
-        mutationFn: ({ eventId, updates }) => {
+        mutationFn: ({ eventId, updates, }) => {
             return this.put({
                 path: `/event/${eventId}`,
                 data: JSON.stringify(updates),
-                headers: { "Content-Type": "application/json" }
+                headers: { "Content-Type": "application/json" },
             });
         },
         onMutate: async ({ eventId, updates }) => {
-            await queryClient.cancelQueries({ queryKey: ['events', eventId] });
-            await queryClient.cancelQueries({ queryKey: ['events'] });
+            await queryClient.cancelQueries({ queryKey: ["events", eventId] });
+            await queryClient.cancelQueries({ queryKey: ["events"] });
             // Try individual cache first; fall back to scanning all active events queries
-            let previousEvent = queryClient.getQueryData(['events', eventId]);
+            let previousEvent = queryClient.getQueryData([
+                "events",
+                eventId,
+            ]);
             if (!previousEvent) {
-                const allEventsData = queryClient.getQueriesData({ predicate: isEventsQuery });
+                const allEventsData = queryClient.getQueriesData({
+                    predicate: isEventsQuery,
+                });
                 outer: for (const [, data] of allEventsData) {
-                    const pages = data?.pages ?? (Array.isArray(data) ? [data] : undefined);
+                    const pages = data?.pages ??
+                        (Array.isArray(data) ? [data] : undefined);
                     if (pages) {
                         for (const page of pages) {
                             const found = page.find((e) => e.id === eventId);
@@ -152,27 +186,46 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
                     }
                 }
             }
-            const previousJob = queryClient.getQueryData(['jobs', previousEvent?.job_id]);
+            const previousJob = queryClient.getQueryData([
+                "jobs",
+                previousEvent?.job_id,
+            ]);
             if (previousJob) {
                 const isEnding = (updates.time_ended ?? -1) > -1;
-                const mergedEvent = previousEvent ? new _Event({ ...previousEvent, ...updates }) : null;
+                const mergedEvent = previousEvent
+                    ? new _Event({ ...previousEvent, ...updates })
+                    : null;
                 const updatedJob = new Job({
                     ...previousJob,
-                    current_event: isEnding ? null : (mergedEvent ?? previousJob.current_event),
-                    last_completed_event: isEnding && mergedEvent ? mergedEvent : previousJob.last_completed_event,
+                    current_event: isEnding
+                        ? null
+                        : (mergedEvent ?? previousJob.current_event),
+                    last_completed_event: isEnding && mergedEvent
+                        ? mergedEvent
+                        : previousJob.last_completed_event,
                     tasks: previousJob.tasks.map((task) => {
                         if (updates.tasks?.includes(task.id ?? "")) {
                             return {
                                 ...task,
-                                current_event: isEnding ? null : (previousEvent ? { ...previousEvent, ...updates } : task.current_event),
-                                last_completed_event: isEnding ? (previousEvent ? { ...previousEvent, ...updates } : task.last_completed_event) : task.last_completed_event,
-                                overdue_time: isEnding ? -(task.frequency ?? 0) - (task.delay ?? 0) : task.overdue_time,
+                                current_event: isEnding
+                                    ? null
+                                    : previousEvent
+                                        ? { ...previousEvent, ...updates }
+                                        : task.current_event,
+                                last_completed_event: isEnding
+                                    ? previousEvent
+                                        ? { ...previousEvent, ...updates }
+                                        : task.last_completed_event
+                                    : task.last_completed_event,
+                                overdue_time: isEnding
+                                    ? -(task.frequency ?? 0) - (task.delay ?? 0)
+                                    : task.overdue_time,
                             };
                         }
                         return task;
                     }),
                 });
-                queryClient.setQueriesData({ predicate: isJobsQuery, type: 'active' }, (old) => {
+                queryClient.setQueriesData({ predicate: isJobsQuery, type: "active" }, (old) => {
                     if (!old)
                         return old;
                     if (Array.isArray(old))
@@ -182,8 +235,8 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
                     return old;
                 });
             }
-            queryClient.setQueryData(['events', eventId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
-            queryClient.setQueriesData({ queryKey: ['events'] }, (oldData) => {
+            queryClient.setQueryData(["events", eventId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
+            queryClient.setQueriesData({ queryKey: ["events"] }, (oldData) => {
                 if (!oldData)
                     return oldData;
                 if (oldData.pages) {
@@ -197,13 +250,30 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
             });
             return { previousEvent, previousJob };
         },
+        onSuccess: async (_result, { eventId }) => {
+            const item = await this._syncEntity(queryClient, {
+                action: "update",
+                entityKey: "events",
+                id: eventId,
+                fetchPath: `/event/${eventId}`,
+            });
+            if (item?.job_id) {
+                await this._syncEntity(queryClient, {
+                    action: "update",
+                    entityKey: "jobs",
+                    id: item.job_id,
+                    fetchPath: `/job/${item.job_id}`,
+                    construct: (d) => new Job(d),
+                });
+            }
+        },
         onError: (_err, variables, context) => {
             const { eventId } = variables;
             if (context?.previousEvent) {
-                queryClient.setQueryData(['events', eventId], context.previousEvent);
+                queryClient.setQueryData(["events", eventId], context.previousEvent);
             }
             if (context?.previousJob) {
-                queryClient.setQueryData(['jobs', context.previousJob.id], context.previousJob);
+                queryClient.setQueryData(["jobs", context.previousJob.id], context.previousJob);
             }
             queryClient.invalidateQueries({ predicate: isJobsQuery });
             queryClient.invalidateQueries({ predicate: isEventsQuery });
@@ -214,57 +284,80 @@ AvroQueryClient.prototype.useUpdateEvents = function () {
     const queryClient = this.getQueryClient();
     return useMutation({
         mutationFn: async ({ events, action, }) => {
-            const eventIds = events.map(event => event.id);
+            const eventIds = events.map((event) => event.id);
             return this.put({
                 path: `/company/${this.companyId}/events`,
                 data: JSON.stringify({
                     events: eventIds,
                     billed: true,
-                    status: action === "billed" ? LineItemStatus.EXTERNALLY_BILLED : LineItemStatus.EXTERNALLY_PAID,
+                    status: action === "billed"
+                        ? LineItemStatus.EXTERNALLY_BILLED
+                        : LineItemStatus.EXTERNALLY_PAID,
                 }),
-                headers: { "Content-Type": "application/json" }
+                headers: { "Content-Type": "application/json" },
             });
         },
         onMutate: async ({ events, action }) => {
-            await queryClient.cancelQueries({ queryKey: ['events'] });
-            await queryClient.cancelQueries({ queryKey: ['events'] });
-            const previousEvents = queryClient.getQueryData(['events']);
-            const previousEventObjs = events.map(event => queryClient.getQueryData(['events', event.id]));
-            const eventIds = events.map(event => event.id);
+            await queryClient.cancelQueries({ queryKey: ["events"] });
+            await queryClient.cancelQueries({ queryKey: ["events"] });
+            const previousEvents = queryClient.getQueryData(["events"]);
+            const previousEventObjs = events.map((event) => queryClient.getQueryData(["events", event.id]));
+            const eventIds = events.map((event) => event.id);
             // Optimistically update individual event cache
             eventIds.forEach((eventId, idx) => {
-                queryClient.setQueryData(['events', eventId], (oldData) => {
+                queryClient.setQueryData(["events", eventId], (oldData) => {
                     return oldData
-                        ? { ...oldData, billed: true, status: action === "billed" ? LineItemStatus.EXTERNALLY_BILLED : LineItemStatus.EXTERNALLY_PAID }
+                        ? {
+                            ...oldData,
+                            billed: true,
+                            status: action === "billed"
+                                ? LineItemStatus.EXTERNALLY_BILLED
+                                : LineItemStatus.EXTERNALLY_PAID,
+                        }
                         : oldData;
                 });
             });
             // Optimistically update events list cache
-            queryClient.setQueriesData({ queryKey: ['events'] }, (oldData) => {
+            queryClient.setQueriesData({ queryKey: ["events"] }, (oldData) => {
                 if (!oldData)
                     return oldData;
                 if (oldData.pages) {
                     const updatedPages = oldData.pages.map((page) => page.map((event) => eventIds.includes(event.id)
-                        ? { ...event, billed: true, status: action === "billed" ? LineItemStatus.EXTERNALLY_BILLED : LineItemStatus.EXTERNALLY_PAID }
+                        ? {
+                            ...event,
+                            billed: true,
+                            status: action === "billed"
+                                ? LineItemStatus.EXTERNALLY_BILLED
+                                : LineItemStatus.EXTERNALLY_PAID,
+                        }
                         : event));
                     return { ...oldData, pages: updatedPages };
                 }
                 if (Array.isArray(oldData)) {
                     return oldData.map((event) => eventIds.includes(event.id)
-                        ? { ...event, billed: true, status: action === "billed" ? LineItemStatus.EXTERNALLY_BILLED : LineItemStatus.EXTERNALLY_PAID }
+                        ? {
+                            ...event,
+                            billed: true,
+                            status: action === "billed"
+                                ? LineItemStatus.EXTERNALLY_BILLED
+                                : LineItemStatus.EXTERNALLY_PAID,
+                        }
                         : event);
                 }
                 return oldData;
             });
             return { previousEvents, previousEventObjs };
         },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ["events"] });
+        },
         onError: (err, variables, context) => {
             if (context?.previousEvents) {
-                queryClient.setQueryData(['events'], context.previousEvents);
+                queryClient.setQueryData(["events"], context.previousEvents);
             }
             if (context?.previousEventObjs) {
                 context.previousEventObjs.forEach((eventObj) => {
-                    queryClient.setQueryData(['events', eventObj.id], eventObj);
+                    queryClient.setQueryData(["events", eventObj.id], eventObj);
                 });
             }
         },
@@ -273,19 +366,19 @@ AvroQueryClient.prototype.useUpdateEvents = function () {
 AvroQueryClient.prototype.useDeleteEvent = function () {
     const queryClient = this.getQueryClient();
     return useMutation({
-        mutationFn: async ({ eventId, }) => {
+        mutationFn: async ({ eventId }) => {
             return this.delete({
                 path: `/event/${eventId}`,
-                headers: { "Content-Type": "application/json" }
+                headers: { "Content-Type": "application/json" },
             });
         },
         onMutate: async ({ eventId }) => {
-            await queryClient.cancelQueries({ queryKey: ['events'] });
-            await queryClient.cancelQueries({ queryKey: ['events', eventId] });
-            const previousEvents = queryClient.getQueryData(['events']);
-            const previousEvent = queryClient.getQueryData(['events', eventId]);
-            queryClient.setQueryData(['events', eventId], undefined);
-            queryClient.setQueriesData({ queryKey: ['events'] }, (oldData) => {
+            await queryClient.cancelQueries({ queryKey: ["events"] });
+            await queryClient.cancelQueries({ queryKey: ["events", eventId] });
+            const previousEvents = queryClient.getQueryData(["events"]);
+            const previousEvent = queryClient.getQueryData(["events", eventId]);
+            queryClient.setQueryData(["events", eventId], undefined);
+            queryClient.setQueriesData({ queryKey: ["events"] }, (oldData) => {
                 if (!oldData)
                     return oldData;
                 if (oldData.pages) {
@@ -299,13 +392,31 @@ AvroQueryClient.prototype.useDeleteEvent = function () {
             });
             return { previousEvents, previousEvent };
         },
+        onSuccess: async (_result, { eventId }, context) => {
+            await this._syncEntity(queryClient, {
+                action: "delete",
+                entityKey: "events",
+                id: eventId,
+            });
+            const jobId = context
+                ?.previousEvent?.job_id;
+            if (jobId) {
+                await this._syncEntity(queryClient, {
+                    action: "update",
+                    entityKey: "jobs",
+                    id: jobId,
+                    fetchPath: `/job/${jobId}`,
+                    construct: (d) => new Job(d),
+                });
+            }
+        },
         onError: (_err, variables, context) => {
             const { eventId } = variables;
             if (context?.previousEvents) {
-                queryClient.setQueryData(['events'], context.previousEvents);
+                queryClient.setQueryData(["events"], context.previousEvents);
             }
             if (context?.previousEvent) {
-                queryClient.setQueryData(['events', eventId], context.previousEvent);
+                queryClient.setQueryData(["events", eventId], context.previousEvent);
             }
         },
     });

package/dist/client/hooks/groups.js

@@ -2,7 +2,13 @@ import { useMutation, useQuery } from "@tanstack/react-query";
 import { AvroQueryClient } from "../../client/QueryClient";
 AvroQueryClient.prototype.useGetGroups = function (body, total, onProgress) {
     return useQuery({
-        queryKey: ['groups', this.companyId, body.amt ?? 50, body.query ?? "", total ?? "all"],
+        queryKey: [
+            "groups",
+            this.companyId,
+            body.amt ?? 50,
+            body.query ?? "",
+            total ?? "all",
+        ],
         queryFn: async () => {
             if (typeof total !== "number") {
                 return this.fetchGroups({ ...body, offset: 0 });
@@ -33,32 +39,35 @@ AvroQueryClient.prototype.useCreateGroup = function () {
             return this.post({
                 path: `/company/${this.companyId}/group`,
                 data: JSON.stringify(groupData),
-                headers: { "Content-Type": "application/json" }
+                headers: { "Content-Type": "application/json" },
             });
         },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ["groups"] });
+        },
     });
 };
 AvroQueryClient.prototype.useUpdateGroup = function () {
     const queryClient = this.getQueryClient();
     return useMutation({
-        mutationFn: async ({ groupId, groupData }) => {
+        mutationFn: async ({ groupId, groupData, }) => {
             return this.put({
                 path: `/group/${groupId}`,
                 data: JSON.stringify(groupData),
-                headers: { "Content-Type": "application/json" }
+                headers: { "Content-Type": "application/json" },
             });
         },
         onMutate: async ({ groupId, groupData }) => {
-            await queryClient.cancelQueries({ queryKey: ['groups'] });
-            await queryClient.cancelQueries({ queryKey: ['groups', groupId] });
-            const previousGroups = queryClient.getQueryData(['groups']);
-            const previousGroup = queryClient.getQueryData(['groups', groupId]);
-            queryClient.setQueryData(['groups', groupId], (oldData) => {
+            await queryClient.cancelQueries({ queryKey: ["groups"] });
+            await queryClient.cancelQueries({ queryKey: ["groups", groupId] });
+            const previousGroups = queryClient.getQueryData(["groups"]);
+            const previousGroup = queryClient.getQueryData(["groups", groupId]);
+            queryClient.setQueryData(["groups", groupId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return { ...oldData, ...groupData };
             });
-            queryClient.setQueriesData({ queryKey: ['groups'] }, (oldData) => {
+            queryClient.setQueriesData({ queryKey: ["groups"] }, (oldData) => {
                 if (!oldData)
                     return oldData;
                 if (oldData.pages) {
@@ -72,13 +81,16 @@ AvroQueryClient.prototype.useUpdateGroup = function () {
             });
             return { previousGroups, previousGroup };
         },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ["groups"] });
+        },
         onError: (_err, variables, context) => {
             const { groupId } = variables;
             if (context?.previousGroups) {
-                queryClient.setQueryData(['groups'], context.previousGroups);
+                queryClient.setQueryData(["groups"], context.previousGroups);
             }
             if (context?.previousGroup) {
-                queryClient.setQueryData(['groups', groupId], context.previousGroup);
+                queryClient.setQueryData(["groups", groupId], context.previousGroup);
             }
         },
     });
@@ -86,18 +98,18 @@ AvroQueryClient.prototype.useUpdateGroup = function () {
 AvroQueryClient.prototype.useDeleteGroup = function () {
     const queryClient = this.getQueryClient();
     return useMutation({
-        mutationFn: async ({ groupId, }) => {
+        mutationFn: async ({ groupId }) => {
             return this.delete({
-                path: `/group/${groupId}`
+                path: `/group/${groupId}`,
             });
         },
         onMutate: async ({ groupId }) => {
-            await queryClient.cancelQueries({ queryKey: ['groups'] });
-            await queryClient.cancelQueries({ queryKey: ['groups', groupId] });
-            const previousGroups = queryClient.getQueryData(['groups']);
-            const previousGroup = queryClient.getQueryData(['groups', groupId]);
-            queryClient.setQueryData(['groups', groupId], undefined);
-            queryClient.setQueriesData({ queryKey: ['groups'] }, (oldData) => {
+            await queryClient.cancelQueries({ queryKey: ["groups"] });
+            await queryClient.cancelQueries({ queryKey: ["groups", groupId] });
+            const previousGroups = queryClient.getQueryData(["groups"]);
+            const previousGroup = queryClient.getQueryData(["groups", groupId]);
+            queryClient.setQueryData(["groups", groupId], undefined);
+            queryClient.setQueriesData({ queryKey: ["groups"] }, (oldData) => {
                 if (!oldData)
                     return oldData;
                 if (oldData.pages) {
@@ -111,13 +123,16 @@ AvroQueryClient.prototype.useDeleteGroup = function () {
             });
             return { previousGroups, previousGroup };
         },
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: ["groups"] });
+        },
         onError: (_err, variables, context) => {
             const { groupId } = variables;
             if (context?.previousGroups) {
-                queryClient.setQueryData(['groups'], context.previousGroups);
+                queryClient.setQueryData(["groups"], context.previousGroups);
             }
             if (context?.previousGroup) {
-                queryClient.setQueryData(['groups', groupId], context.previousGroup);
+                queryClient.setQueryData(["groups", groupId], context.previousGroup);
             }
         },
     });