@raclettejs/core 0.1.19 → 0.1.21

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/interactionLink/routes/route.interactionLink.restore.ts

@@ -2,7 +2,8 @@ import type { Static } from "@sinclair/typebox"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
-import { ForbiddenError } from "@/utils/errors"
+
+const permissions = ["user.isAdmin"]
 
 const ParamsSchema = Type.Object({
   _id: Type.String(),
@@ -17,21 +18,17 @@ export default (fastify: PluginFastifyInstance) => {
     reply: FastifyReply,
   ) => {
     try {
-      if (req.user.isAdmin) {
-        const { _id } = req.params
+      const { _id } = req.params
 
-        const payload = await interactionLinkService.updateInteractionLink(
-          fastify,
-          req.requestParams,
-          _id,
-          { isDeleted: false },
-          req.user._id,
-        )
+      const payload = await interactionLinkService.updateInteractionLink(
+        fastify,
+        req.requestParams,
+        _id,
+        { isDeleted: false },
+        req.user._id,
+      )
 
-        return payload
-      } else {
-        throw new ForbiddenError("Only admins can restore this core datatype")
-      }
+      return payload
     } catch (error: any) {
       fastify.log.error(error.message)
       return reply.internalServerError(error.message)
@@ -40,7 +37,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataRestore",
       broadcastChannels: ["interactionLinkRestored"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/project/project.service.ts

@@ -87,6 +87,7 @@ export class ProjectService {
     options: QueryOptions = {},
   ): Promise<ProjectType[]> {
     try {
+      filter = { isDeleted: false, ...filter }
       // Start building the query
       let query = this.projectModel.find(filter)
 

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/project/routes/route.project.get.ts

@@ -3,6 +3,8 @@ import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -39,7 +41,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataRead",
     },

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/project/routes/route.project.getAll.ts

@@ -1,5 +1,7 @@
 import type { FastifyReply, FastifyRequest } from "fastify"
-import { PluginFastifyInstance } from "types"
+import type { PluginFastifyInstance } from "types"
+
+const permissions = ["user.isAdmin"]
 
 export default (fastify: PluginFastifyInstance) => {
   const projectService = fastify.custom.projectService
@@ -24,7 +26,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataRead",
     },

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/project/routes/route.project.hardDelete.ts

@@ -3,6 +3,8 @@ import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -35,7 +37,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataHardDeleted",
       broadcastChannels: ["projectHardDeleted"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/project/routes/route.project.patch.ts

@@ -5,6 +5,8 @@ import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 import { projectSchema } from "../project.schema"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -40,7 +42,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataUpdate",
       broadcastChannels: ["projectUpdated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/project/routes/route.project.post.ts

@@ -1,7 +1,9 @@
 import type { FastifyReply, FastifyRequest } from "fastify"
-import { PluginFastifyInstance } from "types"
+import type { PluginFastifyInstance } from "types"
 import { projectCreateSchema, type ProjectCreate } from "../project.schema"
 
+const permissions = ["user.isAdmin"]
+
 export default (fastify: PluginFastifyInstance) => {
   const projectService = fastify.custom.projectService
 
@@ -27,7 +29,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    // onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataCreate",
       broadcastChannels: ["projectCreated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/project/routes/route.project.remove.ts

@@ -3,6 +3,8 @@ import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -35,7 +37,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataUpdate",
       broadcastChannels: ["projectDeleted"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.get.ts

@@ -1,6 +1,7 @@
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type, type Static } from "@sinclair/typebox"
+import { ForbiddenError } from "@/utils/errors"
 
 const ParamsSchema = Type.Object({
   _id: Type.Optional(Type.String()),

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.getAll.ts

@@ -1,5 +1,6 @@
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
+import { ForbiddenError } from "@/utils/errors"
 
 export default (fastify: PluginFastifyInstance) => {
   const tagService = fastify.custom.tagService

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.hardDelete.ts

@@ -2,7 +2,8 @@ import type { Static } from "@sinclair/typebox"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
-import { ForbiddenError } from "@/utils/errors"
+
+const permissions = ["user.isAdmin"]
 
 const ParamsSchema = Type.Object({
   _id: Type.String(),
@@ -17,21 +18,15 @@ export default (fastify: PluginFastifyInstance) => {
     reply: FastifyReply,
   ) => {
     try {
-      if (req.user.isAdmin) {
-        const { _id } = req.params
+      const { _id } = req.params
 
-        const payloadWithTag = await tagService.hardDeleteTag(
-          fastify,
-          req.requestParams,
-          _id,
-        )
+      const payloadWithTag = await tagService.hardDeleteTag(
+        fastify,
+        req.requestParams,
+        _id,
+      )
 
-        return payloadWithTag
-      } else {
-        throw new ForbiddenError(
-          "Only admins can hard delete this core datatype",
-        )
-      }
+      return payloadWithTag
     } catch (error: any) {
       fastify.log.error(error.message)
       return reply.internalServerError(error.message)
@@ -40,7 +35,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataHardDeleted",
       broadcastChannels: ["tagHardDeleted"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.patch.ts

@@ -4,6 +4,8 @@ import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 import { tagUpdateSchema } from "../tag.schema"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -40,7 +42,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataUpdate",
       broadcastChannels: ["tagUpdated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.post.bulk.ts

@@ -3,6 +3,8 @@ import type { FastifyReply, FastifyRequest } from "fastify"
 import type { PluginFastifyInstance } from "types"
 import { tagCreateSchema } from "../tag.schema"
 
+const permissions = ["user.isAdmin"]
+
 export default (fastify: PluginFastifyInstance) => {
   const tagService = fastify.custom.tagService
 
@@ -40,7 +42,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataCreate",
       broadcastChannels: ["tagsCreated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.post.ts

@@ -4,6 +4,8 @@ import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 import { tagCreateSchema, type TagCreate } from "../tag.schema"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
   project: Type.String(),
@@ -38,7 +40,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataCreate",
       broadcastChannels: ["tagCreated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.remove.ts

@@ -3,6 +3,8 @@ import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -33,7 +35,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataUpdate",
       broadcastChannels: ["tagDeleted"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/routes/route.tag.restore.ts

@@ -2,7 +2,8 @@ import type { Static } from "@sinclair/typebox"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
-import { ForbiddenError } from "@/utils/errors"
+
+const permissions = ["user.isAdmin"]
 
 const ParamsSchema = Type.Object({
   _id: Type.String(),
@@ -17,21 +18,17 @@ export default (fastify: PluginFastifyInstance) => {
     reply: FastifyReply,
   ) => {
     try {
-      if (req.user.isAdmin) {
-        const { _id } = req.params
+      const { _id } = req.params
 
-        const payload = await tagService.updateTag(
-          fastify,
-          req.requestParams,
-          _id,
-          { isDeleted: false },
-          req.user._id,
-        )
+      const payload = await tagService.updateTag(
+        fastify,
+        req.requestParams,
+        _id,
+        { isDeleted: false },
+        req.user._id,
+      )
 
-        return payload
-      } else {
-        throw new ForbiddenError("Only admins can restore this core datatype")
-      }
+      return payload
     } catch (error: any) {
       fastify.log.error(error.message)
       return reply.internalServerError(error.message)
@@ -40,7 +37,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataRestore",
       broadcastChannels: ["tagRestored"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/tag/tag.service.ts

@@ -133,8 +133,7 @@ export class TagService {
     options: QueryOptions = {},
   ): Promise<TagType[]> {
     try {
-      if (filter.isDeleted !== true && filter.isDeleted !== "true")
-        filter.isDeleted = false
+      filter = { isDeleted: false, ...filter }
       // Start building the query
       let query = this.tagModel.find(filter)
 

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.get.ts

@@ -2,6 +2,7 @@ import type { Static } from "@sinclair/typebox"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
+import { ForbiddenError } from "@/utils/errors"
 
 const ParamsSchema = Type.Object({
   _id: Type.String(),

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.getAll.ts

@@ -2,6 +2,7 @@ import type { Static } from "@sinclair/typebox"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
+import { ForbiddenError } from "@/utils/errors"
 
 const QuerySchema = Type.Object({
   account: Type.Optional(Type.String()),

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.hardDelete.ts

@@ -2,7 +2,8 @@ import type { Static } from "@sinclair/typebox"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
-import { ForbiddenError } from "@/utils/errors"
+
+const permissions = ["user.isAdmin"]
 
 const ParamsSchema = Type.Object({
   _id: Type.String(),
@@ -17,21 +18,15 @@ export default (fastify: PluginFastifyInstance) => {
     reply: FastifyReply,
   ) => {
     try {
-      if (req.user.isAdmin) {
-        const { _id } = req.params
+      const { _id } = req.params
 
-        const payloadWithUser = await userService.hardDeleteUser(
-          fastify,
-          req.requestParams,
-          _id,
-        )
+      const payloadWithUser = await userService.hardDeleteUser(
+        fastify,
+        req.requestParams,
+        _id,
+      )
 
-        return payloadWithUser
-      } else {
-        throw new ForbiddenError(
-          "Only admins can hard delete this core datatype",
-        )
-      }
+      return payloadWithUser
     } catch (error: any) {
       fastify.log.error(error.message)
       return reply.internalServerError(error.message)
@@ -40,7 +35,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataHardDeleted",
       broadcastChannels: ["userHardDeleted"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.patch.ts

@@ -4,6 +4,8 @@ import type { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 import { userUpdateSchema } from "../user.schema"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -22,15 +24,11 @@ export default (fastify: PluginFastifyInstance) => {
     reply: FastifyReply,
   ) => {
     try {
-      let cleanBody = req.body
-      if (!req.user.isAdmin) {
-        delete cleanBody.tags
-      }
       const payloadWithUser = await userService.updateUser(
         fastify,
         req.requestParams,
         req.params._id,
-        cleanBody,
+        req.body,
       )
 
       return payloadWithUser
@@ -42,7 +40,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataUpdate",
       broadcastChannels: ["userUpdated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.patchLastProject.ts

@@ -1,7 +1,9 @@
 import type { FastifyReply, FastifyRequest } from "fastify"
-import { PluginFastifyInstance } from "types"
+import type { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 
+const permissions = ["user.isAdmin"]
+
 export default (fastify: PluginFastifyInstance) => {
   const userService = fastify.custom.userService
 
@@ -26,7 +28,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataUpdate",
       broadcastChannels: ["userUpdated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.post.ts

@@ -2,6 +2,8 @@ import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { userCreateSchema, type UserCreate } from "../user.schema"
 
+const permissions = ["user.isAdmin"]
+
 export default (fastify: PluginFastifyInstance) => {
   const userService = fastify.custom.userService
 
@@ -25,7 +27,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataCreate",
       broadcastChannels: ["userCreated"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.remove.ts

@@ -4,6 +4,8 @@ import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
 import { ForbiddenError } from "@/utils/errors"
 
+const permissions = ["user.isAdmin"]
+
 const ParamsSchema = Type.Object({
   _id: Type.String(),
 })
@@ -19,9 +21,6 @@ export default (fastify: PluginFastifyInstance) => {
     reply: FastifyReply,
   ) => {
     try {
-      if (!req.user.isAdmin) {
-        throw new ForbiddenError("Only Admins can use this feature")
-      }
       if (req.user._id === req.params._id) {
         throw new ForbiddenError("A user cannot remove itself")
       }
@@ -41,7 +40,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataDelete",
       broadcastChannels: ["userDeleted"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/user/routes/route.user.restore.ts

@@ -2,7 +2,8 @@ import type { Static } from "@sinclair/typebox"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import { PluginFastifyInstance } from "types"
 import { Type } from "@sinclair/typebox"
-import { ForbiddenError } from "@/utils/errors"
+
+const permissions = ["user.isAdmin"]
 
 const ParamsSchema = Type.Object({
   _id: Type.String(),
@@ -17,21 +18,17 @@ export default (fastify: PluginFastifyInstance) => {
     reply: FastifyReply,
   ) => {
     try {
-      if (req.user.isAdmin) {
-        const { _id } = req.params
+      const { _id } = req.params
 
-        const payload = await userService.updateUser(
-          fastify,
-          req.requestParams,
-          _id,
-          { isDeleted: false },
-          req.user._id,
-        )
+      const payload = await userService.updateUser(
+        fastify,
+        req.requestParams,
+        _id,
+        { isDeleted: false },
+        req.user._id,
+      )
 
-        return payload
-      } else {
-        throw new ForbiddenError("Only admins can restore this core datatype")
-      }
+      return payload
     } catch (error: any) {
       fastify.log.error(error.message)
       return reply.internalServerError(error.message)
@@ -40,7 +37,7 @@ export default (fastify: PluginFastifyInstance) => {
 
   return {
     handler,
-    onRequest: [fastify.authenticate],
+    onRequest: [fastify.authenticate, fastify.checkPermissions(permissions)],
     config: {
       type: "dataRestore",
       broadcastChannels: ["userRestored"],

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/workSession/events/index.ts

@@ -0,0 +1,45 @@
+import type { AnyWorkSession } from "../workSession.schema"
+import type { FrontendPayload } from "@c/payload/payloadTypes"
+import { PluginFastifyInstance } from "types"
+
+const registerEvents = (fastify: PluginFastifyInstance) => {
+  /**
+   * WorkSession created
+   */
+  const created = async (payload: FrontendPayload<AnyWorkSession>) => {
+    fastify.eventbus.emit("broadcastDataUpdated", payload)
+    fastify.eventbus.emit("broadcastWorkSessionCreated", payload)
+    fastify.log.info(
+      `[eventbus] workSession broadcast created ${payload.body.item._id}`,
+    )
+  }
+
+  /**
+   * WorkSession updated
+   */
+  const updated = async (payload: FrontendPayload<AnyWorkSession>) => {
+    fastify.eventbus.emit("broadcastDataUpdated", payload)
+    fastify.log.info(
+      `[eventbus] workSession broadcast updated ${payload.body.item._id}`,
+    )
+  }
+
+  /**
+   * WorkSession deleted
+   */
+  const deleted = async (payload: FrontendPayload<AnyWorkSession>) => {
+    fastify.eventbus.emit("broadcastWorkSessionDeleted", payload)
+    fastify.log.info(
+      `[eventbus] workSession broadcast deleted ${payload.body.item._id}`,
+    )
+  }
+
+  /**
+   * Register event handlers
+   */
+  fastify.eventbus.on("coreWorkSessionCreated", created)
+  fastify.eventbus.on("coreWorkSessionUpdated", updated)
+  fastify.eventbus.on("coreWorkSessionDeleted", deleted)
+}
+
+export default registerEvents

package/services/backend/src/corePlugins/raclette__core/backend/datatypes/workSession/helpers/crud.ts

@@ -0,0 +1,12 @@
+import type { PluginFastifyInstance } from "@raclettejs/core"
+
+export const registerCrud = (fastify: PluginFastifyInstance) => {
+  const workSessionService = fastify.custom.workSessionService
+
+  fastify.registerCrudHandlers("workSession", {
+    create: workSessionService.createWorkSession,
+    read: workSessionService.readWorkSession,
+    update: workSessionService.updateWorkSession,
+    delete: workSessionService.removeWorkSession,
+  })
+}