betterstart-cli 0.0.28 → 0.0.30

package/dist/assets/adapters/next/templates/init/lib/lifecycle-hooks/register.ts

@@ -8,5 +8,7 @@
 //   console.log('Post created', { userId: user.id, entityId, data })
 // })
 import { registerAuditHooks } from '@admin/actions/audit/register'
+import { registerWebhookHooks } from '@admin/actions/webhooks/register'
 
 registerAuditHooks()
+registerWebhookHooks()

package/dist/assets/adapters/next/templates/init/lib/lifecycle-hooks/runner.ts

@@ -42,6 +42,8 @@ function getAdminActionFromLifecycleEvent(
   if (event === 'afterDelete') return 'delete'
   if (event === 'afterPublish') return 'publish'
   if (event === 'afterUnpublish') return 'unpublish'
+  if (event === 'afterRestore') return 'restore'
+  if (event === 'afterReorder') return 'reorder'
   return null
 }
 
@@ -76,7 +78,7 @@ function toAdminEventContext(
   if (!action) return null
 
   return {
-    category: context.schemaType === 'form' ? 'form' : 'entity',
+    category: context.auditCategory ?? (context.schemaType === 'form' ? 'form' : 'entity'),
     action,
     targetType: context.entityType,
     targetId: context.entityId ?? null,

package/dist/assets/adapters/next/templates/init/lib/lifecycle-hooks/types.ts

@@ -16,6 +16,10 @@ export type LifecycleHookEvent =
   | 'afterPublish'
   | 'beforeUnpublish'
   | 'afterUnpublish'
+  | 'beforeRestore'
+  | 'afterRestore'
+  | 'beforeReorder'
+  | 'afterReorder'
 
 export type BeforeLifecycleHookEvent = Extract<LifecycleHookEvent, `before${string}`>
 export type AfterLifecycleHookEvent = Extract<LifecycleHookEvent, `after${string}`>
@@ -23,7 +27,8 @@ export type AfterLifecycleHookEvent = Extract<LifecycleHookEvent, `after${string
 export interface LifecycleHookContext {
   user: User | null
   entityType: string
-  schemaType?: 'entity' | 'form' | undefined
+  schemaType?: 'entity' | 'form' | 'single' | undefined
+  auditCategory?: AuditLogCategory | undefined
   timestamp: string
   entityId?: string | undefined
   input?: Record<string, unknown> | undefined

package/dist/assets/adapters/next/templates/init/pages/auth-gate-rsc.tsx

@@ -8,7 +8,7 @@ export async function AuthGateRsc({ children }: { children: React.ReactNode }) {
   return (
     <SidebarProvider className="min-h-svh">
       <AdminSidebar />
-      <div className="relative flex min-w-0 flex-1 flex-col [--admin-shell-content-left:0px] md:[--admin-shell-content-left:var(--sidebar-width)] md:peer-data-[state=collapsed]:[--admin-shell-content-left:var(--sidebar-width-icon)]">
+      <div className="relative flex min-w-0 flex-1 flex-col [--admin-shell-content-left:0px] md:[--admin-shell-content-left:var(--sidebar-width)] md:peer-data-[state=collapsed]:[--admin-shell-content-left:var(--sidebar-width-icon)] pb-14">
         {children}
       </div>
     </SidebarProvider>

package/dist/assets/adapters/next/templates/init/pages/media/media-page-content.tsx

@@ -237,7 +237,7 @@ export function MediaPageContent() {
               selectedIds={selected}
               isSelectMode={isSelectMode}
               onItemClick={handleItemClick}
-              className="lg:grid-cols-10 pb-12 pt-px px-px"
+              className="lg:grid-cols-12 pb-12 pt-px px-px"
             />
             {total > DEFAULT_MEDIA_PAGE_SIZE ? (
               <MediaGridPagination

package/dist/assets/adapters/next/templates/init/pages/media/media-page-skeleton.tsx

@@ -1,7 +1,7 @@
 export function MediaPageSkeleton() {
   return (
     <div className="flex items-center justify-center h-48">
-      <div className="text-muted-foreground">Loading Media...</div>
+      <div className="text-muted-foreground">Loading Media…</div>
     </div>
   )
 }

package/dist/assets/adapters/next/templates/init/pages/settings/audit-log/audit-log-columns.tsx

@@ -0,0 +1,150 @@
+'use client'
+
+import type { AuditLogEntry, AuditLogSortField } from '@admin/actions/audit'
+import { SortIndicator } from '@admin/components/shared/sort-indicator'
+import { Badge } from '@admin/components/ui/badge'
+import { Button } from '@admin/components/ui/button'
+import type { ColumnDef } from '@tanstack/react-table'
+
+export const AUDIT_LOG_SORT_FIELDS = [
+  'createdAt',
+  'event',
+  'target',
+  'actor',
+  'sourceType'
+] as const satisfies AuditLogSortField[]
+
+function formatDateTime(value: string): string {
+  const date = new Date(value)
+  if (Number.isNaN(date.getTime())) return value
+
+  return new Intl.DateTimeFormat('en-US', {
+    month: 'short',
+    day: '2-digit',
+    year: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit'
+  }).format(date)
+}
+
+function formatEventLabel(auditLog: AuditLogEntry): string {
+  return `${auditLog.category}.${auditLog.action}`
+}
+
+function SortableAuditLogHeader({
+  column,
+  label
+}: {
+  column: {
+    getIsSorted: () => false | 'asc' | 'desc'
+    toggleSorting: (desc?: boolean) => void
+  }
+  label: string
+}) {
+  const sortDirection = column.getIsSorted()
+  const sortLabel =
+    sortDirection === 'asc'
+      ? 'sorted ascending'
+      : sortDirection === 'desc'
+        ? 'sorted descending'
+        : 'not sorted'
+
+  return (
+    <Button
+      variant="ghost"
+      onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+      className="w-full min-w-0 justify-start overflow-hidden px-0! border-none rounded-none bg-transparent! scale-100! group"
+      aria-label={`Sort by ${label}, ${sortLabel}`}
+      aria-sort={
+        sortDirection === 'asc' ? 'ascending' : sortDirection === 'desc' ? 'descending' : 'none'
+      }
+    >
+      <span className="truncate">{label}</span>
+      <SortIndicator direction={sortDirection} />
+    </Button>
+  )
+}
+
+export function createAuditLogColumns(): ColumnDef<AuditLogEntry>[] {
+  return [
+    {
+      id: 'event',
+      size: 160,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Event" />,
+      cell: ({ row }) => <Badge variant="secondary">{formatEventLabel(row.original)}</Badge>
+    },
+    {
+      id: 'target',
+      size: 240,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Target" />,
+      cell: ({ row }) => (
+        <div className="flex min-w-0 flex-col">
+          <span className="truncate font-medium">
+            {row.original.targetLabel ?? row.original.targetId ?? 'Unknown'}
+          </span>
+          <span className="truncate text-xs text-muted-foreground">{row.original.targetType}</span>
+        </div>
+      )
+    },
+    {
+      id: 'actor',
+      size: 220,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Actor" />,
+      cell: ({ row }) => (
+        <div className="flex min-w-0 flex-col">
+          <span className="truncate">
+            {row.original.actorEmail ?? row.original.actorName ?? 'Unknown'}
+          </span>
+          <span className="truncate text-xs text-muted-foreground">
+            {row.original.actorRole ?? 'No role'}
+          </span>
+        </div>
+      )
+    },
+    {
+      accessorKey: 'createdAt',
+      id: 'createdAt',
+      size: 180,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Time" />,
+      cell: ({ row }) => (
+        <span className="whitespace-nowrap text-muted-foreground">
+          {formatDateTime(row.original.createdAt)}
+        </span>
+      )
+    },
+    {
+      accessorKey: 'sourceType',
+      id: 'sourceType',
+      size: 180,
+      header: ({ column }) => <SortableAuditLogHeader column={column} label="Source" />,
+      cell: ({ row }) => (
+        <div className="text-muted-foreground">
+          <div className="truncate">{row.original.sourceType}</div>
+          <div className="truncate text-xs">{row.original.ipAddress ?? 'No IP'}</div>
+        </div>
+      )
+    },
+    {
+      accessorKey: 'changedFields',
+      id: 'changedFields',
+      size: 180,
+      enableSorting: false,
+      header: 'Fields',
+      cell: ({ row }) =>
+        row.original.changedFields.length > 0 ? (
+          <div className="flex flex-wrap gap-1">
+            {row.original.changedFields.slice(0, 3).map((field) => (
+              <Badge key={field} variant="outline">
+                {field}
+              </Badge>
+            ))}
+            {row.original.changedFields.length > 3 ? (
+              <Badge variant="outline">+{row.original.changedFields.length - 3}</Badge>
+            ) : null}
+          </div>
+        ) : (
+          <span className="text-muted-foreground">None</span>
+        )
+    }
+  ]
+}

package/dist/assets/adapters/next/templates/init/pages/settings/audit-log/audit-log-page-content.tsx

@@ -0,0 +1,137 @@
+'use client'
+
+import type { AuditLogEntry } from '@admin/actions/audit'
+import { AUDIT_LOG_ACTIONS, AUDIT_LOG_CATEGORIES } from '@admin/actions/audit'
+import { EntityFiltersBar } from '@admin/components/shared/entity-filters-bar'
+import { PageHeader } from '@admin/components/shared/page-header'
+import { useIsFetching } from '@tanstack/react-query'
+import { parseAsInteger, parseAsString, useQueryState, useQueryStates } from 'nuqs'
+import * as React from 'react'
+import { createAuditLogColumns } from './audit-log-columns'
+import { AuditLogDetailDrawer } from './audit-log-detail-drawer'
+import { AuditLogTable } from './audit-log-table'
+
+const filterParsers = {
+  category: parseAsString.withDefault(''),
+  action: parseAsString.withDefault(''),
+  createdAtFrom: parseAsString.withDefault(''),
+  createdAtTo: parseAsString.withDefault('')
+} as const
+
+function formatFilterLabel(value: string): string {
+  return value
+    .split('_')
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join(' ')
+}
+
+const categorySelectOptions = AUDIT_LOG_CATEGORIES.map((value) => ({
+  label: formatFilterLabel(value),
+  value
+}))
+const actionSelectOptions = AUDIT_LOG_ACTIONS.map((value) => ({
+  label: formatFilterLabel(value),
+  value
+}))
+
+export function AuditLogPageContent() {
+  const isSearchFetching = useIsFetching({ queryKey: ['audit-log'] }) > 0
+  const [search, setSearch] = useQueryState('q', parseAsString.withDefault(''))
+  const [, setPageIndex] = useQueryState('page', parseAsInteger.withDefault(0))
+  const [filterValues, setFilters] = useQueryStates(filterParsers)
+  const category = filterValues.category
+  const action = filterValues.action
+  const createdAtFrom = filterValues.createdAtFrom
+  const createdAtTo = filterValues.createdAtTo
+
+  const [selectedAuditLog, setSelectedAuditLog] = React.useState<AuditLogEntry | null>(null)
+  const columns = React.useMemo(() => createAuditLogColumns(), [])
+
+  const activeFilterCount = [search, category, action, createdAtFrom || createdAtTo].filter(
+    Boolean
+  ).length
+
+  function handleSearch(value: string | null) {
+    React.startTransition(() => {
+      void setPageIndex(0)
+      void setSearch(value)
+    })
+  }
+
+  function handleClearAll() {
+    React.startTransition(() => {
+      void setPageIndex(0)
+      void setSearch(null)
+      void setFilters({
+        category: null,
+        action: null,
+        createdAtFrom: null,
+        createdAtTo: null
+      })
+    })
+  }
+
+  const filters = [
+    {
+      key: 'category',
+      label: 'Category',
+      type: 'select' as const,
+      value: category,
+      options: categorySelectOptions
+    },
+    {
+      key: 'action',
+      label: 'Action',
+      type: 'select' as const,
+      value: action,
+      options: actionSelectOptions
+    },
+    {
+      key: 'createdAt',
+      label: 'Created',
+      type: 'date-range' as const,
+      from: createdAtFrom,
+      to: createdAtTo
+    }
+  ]
+
+  return (
+    <React.Fragment>
+      <PageHeader title="Audit Log" />
+
+      <EntityFiltersBar
+        filters={filters}
+        activeFilterCount={activeFilterCount}
+        onFilterChange={(updates) => {
+          React.startTransition(() => {
+            void setPageIndex(0)
+            void setFilters(updates)
+          })
+        }}
+        onClearAll={handleClearAll}
+        search={search}
+        searchPlaceholder="Search audit logs..."
+        isPending={isSearchFetching}
+        onSearch={handleSearch}
+      />
+      <main className="space-y-4 px-4 pb-4 flex-1">
+        <AuditLogTable
+          columns={columns}
+          search={search}
+          category={category}
+          action={action}
+          createdAtFrom={createdAtFrom}
+          createdAtTo={createdAtTo}
+          onRowClick={setSelectedAuditLog}
+        />
+      </main>
+      <AuditLogDetailDrawer
+        auditLog={selectedAuditLog}
+        open={!!selectedAuditLog}
+        onOpenChange={(open) => {
+          if (!open) setSelectedAuditLog(null)
+        }}
+      />
+    </React.Fragment>
+  )
+}

package/dist/assets/adapters/next/templates/init/pages/{audit-log → settings/audit-log}/audit-log-page-skeleton.tsx

@@ -1,7 +1,7 @@
 export function AuditLogPageSkeleton() {
   return (
     <div className="flex items-center justify-center h-48">
-      <div className="text-muted-foreground">Loading Audit Logs...</div>
+      <div className="text-muted-foreground">Loading Audit Logs…</div>
     </div>
   )
 }

package/dist/assets/adapters/next/templates/init/pages/settings/audit-log/audit-log-table.tsx

@@ -0,0 +1,295 @@
+'use client'
+
+import type { AuditLogEntry, AuditLogQuery, AuditLogSortField } from '@admin/actions/audit'
+import {
+  DataGrid,
+  DataGridBody,
+  DataGridCell,
+  DataGridHead,
+  DataGridHeader,
+  DataGridRow
+} from '@admin/components/shared/data-table/data-grid'
+import { DataTablePagination } from '@admin/components/shared/data-table/data-table-pagination'
+import { useAuditLogs } from '@admin/hooks/use-audit-log'
+import { useTableUtils } from '@admin/hooks/use-table-utils'
+import { cn } from '@admin/utils/shared/cn'
+import { type ColumnDef, flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table'
+import { GripVertical } from 'lucide-react'
+import { parseAsInteger, parseAsString, useQueryStates } from 'nuqs'
+import * as React from 'react'
+import { AUDIT_LOG_SORT_FIELDS } from './audit-log-columns'
+
+interface AuditLogTableProps<TValue> extends React.HTMLAttributes<HTMLDivElement> {
+  columns: ColumnDef<AuditLogEntry, TValue>[]
+  search?: string
+  category?: string
+  action?: string
+  createdAtFrom?: string
+  createdAtTo?: string
+  onRowClick: (auditLog: AuditLogEntry) => void
+}
+
+type AuditLogSortDirection = NonNullable<AuditLogQuery['dir']>
+
+function isAuditLogSortField(value: string): value is AuditLogSortField {
+  return (AUDIT_LOG_SORT_FIELDS as readonly string[]).includes(value)
+}
+
+function isAuditLogSortDirection(value: string): value is AuditLogSortDirection {
+  return value === 'asc' || value === 'desc'
+}
+
+export function AuditLogTable<TValue>({
+  columns,
+  search,
+  category,
+  action,
+  createdAtFrom,
+  createdAtTo,
+  onRowClick,
+  className
+}: AuditLogTableProps<TValue>) {
+  const defaultPageSize = 20
+  const [{ page: pageIndex, size: pageSize, sort: sortField, dir: sortDir }, setTableQuery] =
+    useQueryStates({
+      page: parseAsInteger.withDefault(0),
+      size: parseAsInteger.withDefault(defaultPageSize),
+      sort: parseAsString.withDefault(''),
+      dir: parseAsString.withDefault('')
+    })
+
+  const safePageIndex = Number.isFinite(pageIndex) && pageIndex > 0 ? pageIndex : 0
+  const safePageSize =
+    pageSize === -1 || (Number.isFinite(pageSize) && pageSize > 0) ? pageSize : defaultPageSize
+  const safeSortField = isAuditLogSortField(sortField) ? sortField : undefined
+  const safeSortDir = safeSortField
+    ? isAuditLogSortDirection(sortDir)
+      ? sortDir
+      : 'asc'
+    : undefined
+  const query = React.useMemo<AuditLogQuery>(
+    () => ({
+      search: search || undefined,
+      category: category ? (category as AuditLogQuery['category']) : undefined,
+      action: action ? (action as AuditLogQuery['action']) : undefined,
+      createdAtFrom: createdAtFrom || undefined,
+      createdAtTo: createdAtTo || undefined,
+      page: safePageIndex,
+      pageSize: safePageSize,
+      sort: safeSortField,
+      dir: safeSortDir
+    }),
+    [
+      action,
+      category,
+      createdAtFrom,
+      createdAtTo,
+      safePageIndex,
+      safePageSize,
+      safeSortDir,
+      safeSortField,
+      search
+    ]
+  )
+  const { data, error, isPending } = useAuditLogs(query)
+  const auditLogs = data?.auditLogs ?? []
+  const totalRows = data?.total ?? 0
+  const effectivePageSize = safePageSize === -1 ? totalRows : safePageSize
+  const pageCount = effectivePageSize > 0 ? Math.ceil(totalRows / effectivePageSize) : 1
+  const shouldShowPagination = totalRows > defaultPageSize
+
+  const {
+    columnSizing,
+    handleColumnSizingChange,
+    handlePaginationChange,
+    handleSortingChange,
+    hoveredColumnId,
+    registerTable,
+    resetColumnSizingToContainer,
+    setHoveredColumnId,
+    sorting,
+    tableContainerRef
+  } = useTableUtils<AuditLogEntry>({
+    data: auditLogs,
+    pageIndex: safePageIndex,
+    pageSize: effectivePageSize,
+    setPageIndex: (nextPageIndex) => setTableQuery({ page: nextPageIndex }),
+    setSortingParams: ({
+      pageIndex: nextPageIndex,
+      sortDir: nextSortDir,
+      sortField: nextSortField
+    }) =>
+      setTableQuery({
+        page: nextPageIndex,
+        sort: nextSortField,
+        dir: nextSortDir
+      }),
+    sortField: safeSortField,
+    sortDir: safeSortDir
+  })
+
+  const table = useReactTable({
+    data: auditLogs,
+    columns,
+    columnResizeMode: 'onChange',
+    defaultColumn: {
+      minSize: 48,
+      size: 220
+    },
+    getCoreRowModel: getCoreRowModel(),
+    manualPagination: true,
+    manualSorting: true,
+    pageCount,
+    rowCount: totalRows,
+    onColumnSizingChange: handleColumnSizingChange,
+    onPaginationChange: handlePaginationChange,
+    onSortingChange: handleSortingChange,
+    state: {
+      sorting,
+      columnSizing,
+      pagination: {
+        pageIndex: safePageIndex,
+        pageSize: effectivePageSize
+      }
+    }
+  })
+  registerTable(table)
+  const gridTemplateColumns = table
+    .getVisibleLeafColumns()
+    .map((column) => `${column.getSize()}px`)
+    .join(' ')
+
+  return (
+    <div className={cn('flex flex-col gap-6 pt-px pb-2 h-full', className)}>
+      <DataGrid
+        containerClassName="min-h-0 flex-1"
+        containerRef={tableContainerRef}
+        gridTemplateColumns={gridTemplateColumns}
+        style={{ width: table.getTotalSize() }}
+      >
+        <DataGridHeader>
+          {table.getHeaderGroups().map((headerGroup) => (
+            <DataGridRow key={headerGroup.id}>
+              {headerGroup.headers.map((header, headerIndex) => {
+                const resizeLabel =
+                  typeof header.column.columnDef.header === 'string'
+                    ? header.column.columnDef.header
+                    : header.column.id
+                const nextHeader = headerGroup.headers[headerIndex + 1]
+                const canResizeColumn =
+                  header.column.getCanResize() && nextHeader?.column.getCanResize() === true
+                return (
+                  <DataGridHead
+                    key={header.id}
+                    className="group/resize-header relative overflow-hidden"
+                    data-column-id={header.column.id}
+                    onMouseEnter={() => setHoveredColumnId(header.column.id)}
+                    onMouseLeave={() =>
+                      setHoveredColumnId((current) =>
+                        current === header.column.id ? null : current
+                      )
+                    }
+                  >
+                    {header.isPlaceholder
+                      ? null
+                      : flexRender(header.column.columnDef.header, header.getContext())}
+                    {canResizeColumn ? (
+                      <button
+                        type="button"
+                        aria-label={`Resize ${resizeLabel} column`}
+                        className="group/resize-handle absolute right-0 top-0 z-10 flex h-full w-5 cursor-col-resize touch-none select-none items-center justify-center text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:text-foreground focus-visible:opacity-100 focus-visible:outline-none group-focus-within/resize-header:opacity-100 data-[column-hovered=true]:opacity-100 data-[resizing=true]:opacity-100"
+                        data-resize-handle
+                        data-column-hovered={
+                          hoveredColumnId === header.column.id ? 'true' : 'false'
+                        }
+                        data-resizing={header.column.getIsResizing() ? 'true' : 'false'}
+                        onDoubleClick={resetColumnSizingToContainer}
+                        onMouseDown={header.getResizeHandler()}
+                        onTouchStart={header.getResizeHandler()}
+                      >
+                        <GripVertical
+                          aria-hidden="true"
+                          className={cn('size-3.5', {
+                            'text-ring': header.column.getIsResizing()
+                          })}
+                        />
+                      </button>
+                    ) : null}
+                  </DataGridHead>
+                )
+              })}
+            </DataGridRow>
+          ))}
+        </DataGridHeader>
+        <DataGridBody>
+          {isPending ? (
+            <DataGridRow>
+              <DataGridCell
+                className="flex h-24 items-center justify-center text-center"
+                style={{ gridColumn: '1 / -1' }}
+              >
+                <div className="text-muted-foreground">Loading Audit Logs…</div>
+              </DataGridCell>
+            </DataGridRow>
+          ) : error ? (
+            <DataGridRow>
+              <DataGridCell
+                className="flex h-24 items-center justify-center text-center"
+                style={{ gridColumn: '1 / -1' }}
+              >
+                <div className="text-destructive">Error loading Audit Logs: {error.message}</div>
+              </DataGridCell>
+            </DataGridRow>
+          ) : table.getRowModel().rows.length ? (
+            table.getRowModel().rows.map((row) => (
+              <DataGridRow
+                key={row.id}
+                className="cursor-pointer hover:bg-muted/50"
+                onClick={(event) => {
+                  const target = event.target as HTMLElement
+                  if (!event.currentTarget.contains(target)) return
+                  if (target.closest('button, a, input, [role="checkbox"]')) return
+                  onRowClick(row.original)
+                }}
+              >
+                {row.getVisibleCells().map((cell) => (
+                  <DataGridCell
+                    key={cell.id}
+                    data-column-id={cell.column.id}
+                    onMouseEnter={() => setHoveredColumnId(cell.column.id)}
+                    onMouseLeave={() =>
+                      setHoveredColumnId((current) => (current === cell.column.id ? null : current))
+                    }
+                  >
+                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                  </DataGridCell>
+                ))}
+              </DataGridRow>
+            ))
+          ) : (
+            <DataGridRow>
+              <DataGridCell
+                className="flex h-24 items-center justify-center text-center"
+                style={{ gridColumn: '1 / -1' }}
+              >
+                No Audit Logs found.
+              </DataGridCell>
+            </DataGridRow>
+          )}
+        </DataGridBody>
+      </DataGrid>
+
+      {shouldShowPagination ? (
+        <DataTablePagination
+          table={table}
+          paginationMode="controlled"
+          pageSize={safePageSize}
+          pageIndex={safePageIndex}
+          pageCount={pageCount}
+          setPageIndex={(nextPageIndex) => setTableQuery({ page: nextPageIndex })}
+          setPageSize={(nextPageSize) => setTableQuery({ page: 0, size: nextPageSize })}
+        />
+      ) : null}
+    </div>
+  )
+}