@nixxie-cms/core 1.0.3 → 1.1.0

package/src/fields/types/relationship/views/useFilter.tsx

@@ -1,109 +1,109 @@
-import { useMemo } from 'react'
-import { useNixxie } from '../../../../admin-ui/context'
-
-import type { ListMeta } from '../../../../types'
-
-function isInt(x: string) {
-  return Number.isInteger(Number(x))
-}
-
-function isBigInt(x: string) {
-  try {
-    BigInt(x)
-    return true
-  } catch {
-    return true
-  }
-}
-
-// TODO: this is unfortunate, remove in breaking change?
-function isUuid(x: unknown) {
-  if (typeof x !== 'string') return
-  if (x.length !== 36) return
-  return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(x)
-}
-
-export function useSearchFilter(value: string, list: ListMeta, searchFields: string[]) {
-  const { lists } = useNixxie()
-  return useMemo(() => {
-    const trimmedSearch = value.trim()
-    if (!trimmedSearch.length) return []
-
-    const conditions: Record<string, any>[] = []
-    const idField = list.fields.id.fieldMeta as { type: string; kind: string }
-
-    if (idField.type === 'String') {
-      // TODO: remove in breaking change?
-      if (idField.kind === 'uuid') {
-        if (isUuid(value)) {
-          conditions.push({ id: { equals: trimmedSearch } })
-        }
-      } else {
-        conditions.push({ id: { equals: trimmedSearch } })
-      }
-    } else if (idField.type === 'Int' && isInt(trimmedSearch)) {
-      conditions.push({ id: { equals: Number(trimmedSearch) } })
-    } else if (idField.type === 'BigInt' && isBigInt(trimmedSearch)) {
-      conditions.push({ id: { equals: trimmedSearch } })
-    }
-
-    for (const fieldKey of searchFields) {
-      const field = list.fields[fieldKey]
-
-      // @ts-expect-error TODO: fix fieldMeta type for relationship fields
-      if (field.fieldMeta?.refSearchFields) {
-        const {
-          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
-          refListKey,
-          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
-          refSearchFields,
-          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
-          many = false,
-        } = field.fieldMeta
-        const refList = lists[refListKey]
-
-        for (const refFieldKey of refSearchFields) {
-          const refField = refList.fields[refFieldKey]
-          if (!refField.search) continue // WARNING: we dont support depth > 2
-          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
-          if (refField.fieldMeta?.refSearchFields) continue // WARNING: we dont support depth > 2
-
-          if (many) {
-            conditions.push({
-              [fieldKey]: {
-                some: {
-                  [refFieldKey]: {
-                    contains: trimmedSearch,
-                    mode: refField.search === 'insensitive' ? 'insensitive' : undefined,
-                  },
-                },
-              },
-            })
-
-            continue
-          }
-
-          conditions.push({
-            [fieldKey]: {
-              [refFieldKey]: {
-                contains: trimmedSearch,
-                mode: refField.search === 'insensitive' ? 'insensitive' : undefined,
-              },
-            },
-          })
-        }
-
-        continue
-      }
-
-      conditions.push({
-        [field.key]: {
-          contains: trimmedSearch,
-          mode: field.search === 'insensitive' ? 'insensitive' : undefined,
-        },
-      })
-    }
-
-    return conditions
-  }, [value, list, searchFields])
-}
+import { useMemo } from 'react'
+import { useNixxie } from '../../../../admin-ui/context'
+
+import type { CollectionMeta } from '../../../../types'
+
+function isInt(x: string) {
+  return Number.isInteger(Number(x))
+}
+
+function isBigInt(x: string) {
+  try {
+    BigInt(x)
+    return true
+  } catch {
+    return true
+  }
+}
+
+// TODO: this is unfortunate, remove in breaking change?
+function isUuid(x: unknown) {
+  if (typeof x !== 'string') return
+  if (x.length !== 36) return
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(x)
+}
+
+export function useSearchFilter(value: string, list: CollectionMeta, searchFields: string[]) {
+  const { lists } = useNixxie()
+  return useMemo(() => {
+    const trimmedSearch = value.trim()
+    if (!trimmedSearch.length) return []
+
+    const conditions: Record<string, any>[] = []
+    const idField = list.fields.id.fieldMeta as { type: string; kind: string }
+
+    if (idField.type === 'String') {
+      // TODO: remove in breaking change?
+      if (idField.kind === 'uuid') {
+        if (isUuid(value)) {
+          conditions.push({ id: { equals: trimmedSearch } })
+        }
+      } else {
+        conditions.push({ id: { equals: trimmedSearch } })
+      }
+    } else if (idField.type === 'Int' && isInt(trimmedSearch)) {
+      conditions.push({ id: { equals: Number(trimmedSearch) } })
+    } else if (idField.type === 'BigInt' && isBigInt(trimmedSearch)) {
+      conditions.push({ id: { equals: trimmedSearch } })
+    }
+
+    for (const fieldKey of searchFields) {
+      const field = list.fields[fieldKey]
+
+      // @ts-expect-error TODO: fix fieldMeta type for relationship fields
+      if (field.fieldMeta?.refSearchFields) {
+        const {
+          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
+          refListKey,
+          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
+          refSearchFields,
+          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
+          many = false,
+        } = field.fieldMeta
+        const refList = lists[refListKey]
+
+        for (const refFieldKey of refSearchFields) {
+          const refField = refList.fields[refFieldKey]
+          if (!refField.search) continue // WARNING: we dont support depth > 2
+          // @ts-expect-error TODO: fix fieldMeta type for relationship fields
+          if (refField.fieldMeta?.refSearchFields) continue // WARNING: we dont support depth > 2
+
+          if (many) {
+            conditions.push({
+              [fieldKey]: {
+                some: {
+                  [refFieldKey]: {
+                    contains: trimmedSearch,
+                    mode: refField.search === 'insensitive' ? 'insensitive' : undefined,
+                  },
+                },
+              },
+            })
+
+            continue
+          }
+
+          conditions.push({
+            [fieldKey]: {
+              [refFieldKey]: {
+                contains: trimmedSearch,
+                mode: refField.search === 'insensitive' ? 'insensitive' : undefined,
+              },
+            },
+          })
+        }
+
+        continue
+      }
+
+      conditions.push({
+        [field.key]: {
+          contains: trimmedSearch,
+          mode: field.search === 'insensitive' ? 'insensitive' : undefined,
+        },
+      })
+    }
+
+    return conditions
+  }, [value, list, searchFields])
+}

package/src/fields/types/select/index.ts

@@ -2,7 +2,7 @@ import { g } from '../../..'
 import { humanize } from '../../../lib/utils'
 import type { SimpleFieldTypeInfo } from '../../../types'
 import {
-  type BaseListTypeInfo,
+  type BaseCollectionTypeInfo,
   type CommonFieldConfig,
   type FieldTypeFunc,
   fieldType,
@@ -12,8 +12,8 @@ import { filters } from '../../filters'
 import { defaultIsRequired, makeValidateHook } from '../../non-null-graphql'
 import type { controller } from './views'
 
-export type SelectFieldConfig<ListTypeInfo extends BaseListTypeInfo> = CommonFieldConfig<
-  ListTypeInfo,
+export type SelectFieldConfig<CollectionTypeInfo extends BaseCollectionTypeInfo> = CommonFieldConfig<
+  CollectionTypeInfo,
   SimpleFieldTypeInfo<'String' | 'Int'>
 > &
   (
@@ -57,9 +57,9 @@ export type SelectFieldConfig<ListTypeInfo extends BaseListTypeInfo> = CommonFie
 const MAX_INT = 2147483647
 const MIN_INT = -2147483648
 
-export function select<ListTypeInfo extends BaseListTypeInfo>(
-  config: SelectFieldConfig<ListTypeInfo>
-): FieldTypeFunc<ListTypeInfo> {
+export function select<CollectionTypeInfo extends BaseCollectionTypeInfo>(
+  config: SelectFieldConfig<CollectionTypeInfo>
+): FieldTypeFunc<CollectionTypeInfo> {
   const { isIndexed, ui: { displayMode = 'select', ...ui } = {}, defaultValue, validation } = config
 
   return meta => {

package/src/fields/types/text/index.ts

@@ -1,6 +1,6 @@
 import type { SimpleFieldTypeInfo } from '../../../types'
 import {
-  type BaseListTypeInfo,
+  type BaseCollectionTypeInfo,
   type CommonFieldConfig,
   type FieldTypeFunc,
   fieldType,
@@ -10,8 +10,8 @@ import { g } from '../../..'
 import { makeValidateHook, defaultIsRequired } from '../../non-null-graphql'
 import { filters } from '../../filters'
 
-export type TextFieldConfig<ListTypeInfo extends BaseListTypeInfo> = CommonFieldConfig<
-  ListTypeInfo,
+export type TextFieldConfig<CollectionTypeInfo extends BaseCollectionTypeInfo> = CommonFieldConfig<
+  CollectionTypeInfo,
   SimpleFieldTypeInfo<'String'>
 > & {
   isIndexed?: boolean | 'unique'
@@ -66,9 +66,9 @@ export type TextFieldMeta = {
   defaultValue: string | null
 }
 
-export function text<ListTypeInfo extends BaseListTypeInfo>(
-  config: TextFieldConfig<ListTypeInfo> = {}
-): FieldTypeFunc<ListTypeInfo> {
+export function text<CollectionTypeInfo extends BaseCollectionTypeInfo>(
+  config: TextFieldConfig<CollectionTypeInfo> = {}
+): FieldTypeFunc<CollectionTypeInfo> {
   const { defaultValue: defaultValue_, isIndexed, validation = {} } = config
 
   config.db ??= {}

package/src/fields/types/timestamp/index.ts

@@ -1,6 +1,6 @@
 import type { SimpleFieldTypeInfo } from '../../../types'
 import {
-  type BaseListTypeInfo,
+  type BaseCollectionTypeInfo,
   type FieldTypeFunc,
   type CommonFieldConfig,
   fieldType,
@@ -11,27 +11,28 @@ import { filters } from '../../filters'
 import { makeValidateHook, defaultIsRequired } from '../../non-null-graphql'
 import { type TimestampFieldMeta } from './views'
 
-export type TimestampFieldConfig<ListTypeInfo extends BaseListTypeInfo> = CommonFieldConfig<
-  ListTypeInfo,
-  SimpleFieldTypeInfo<'DateTime' | 'String'> // TODO: make more exact
-> & {
-  isIndexed?: boolean | 'unique'
-  validation?: {
-    isRequired?: boolean
-  }
-  defaultValue?: string | { kind: 'now' }
-  db?: {
-    // this is @updatedAt in Prisma
-    updatedAt?: boolean
-    isNullable?: boolean
-    map?: string
-    extendPrismaSchema?: (field: string) => string
+export type TimestampFieldConfig<CollectionTypeInfo extends BaseCollectionTypeInfo> =
+  CommonFieldConfig<
+    CollectionTypeInfo,
+    SimpleFieldTypeInfo<'DateTime' | 'String'> // TODO: make more exact
+  > & {
+    isIndexed?: boolean | 'unique'
+    validation?: {
+      isRequired?: boolean
+    }
+    defaultValue?: string | { kind: 'now' }
+    db?: {
+      // this is @updatedAt in Prisma
+      updatedAt?: boolean
+      isNullable?: boolean
+      map?: string
+      extendPrismaSchema?: (field: string) => string
+    }
   }
-}
 
-export function timestamp<ListTypeInfo extends BaseListTypeInfo>(
-  config: TimestampFieldConfig<ListTypeInfo> = {}
-): FieldTypeFunc<ListTypeInfo> {
+export function timestamp<CollectionTypeInfo extends BaseCollectionTypeInfo>(
+  config: TimestampFieldConfig<CollectionTypeInfo> = {}
+): FieldTypeFunc<CollectionTypeInfo> {
   const { isIndexed, defaultValue, validation } = config
 
   return meta => {
@@ -40,7 +41,8 @@ export function timestamp<ListTypeInfo extends BaseListTypeInfo>(
         g.DateTime.parseValue(defaultValue)
       } catch (err) {
         throw new Error(
-          `${meta.listKey}.${meta.fieldKey}.defaultValue is required to be an ISO8601 date-time string such as ${new Date().toISOString()}`
+          `${meta.listKey}.${meta.fieldKey}.defaultValue is required to be an ISO8601 date-time string such as ${new Date().toISOString()}`,
+          { cause: err }
         )
       }
     }

package/src/fields/types/virtual/index.ts

@@ -1,11 +1,11 @@
 import { getNamedType, isLeafType } from 'graphql'
 import {
   type BaseItem,
-  type BaseListTypeInfo,
+  type BaseCollectionTypeInfo,
   type CommonFieldConfig,
   type FieldTypeFunc,
   type NixxieContext,
-  type ListGraphQLTypes,
+  type CollectionGraphQLTypes,
   fieldType,
 } from '../../../types'
 import { g } from '../../..'
@@ -36,20 +36,20 @@ type FieldTypeInfo = {
   }
 }
 
-export type VirtualFieldConfig<ListTypeInfo extends BaseListTypeInfo> = CommonFieldConfig<
-  ListTypeInfo,
+export type VirtualFieldConfig<CollectionTypeInfo extends BaseCollectionTypeInfo> = CommonFieldConfig<
+  CollectionTypeInfo,
   FieldTypeInfo
 > & {
   field:
-    | VirtualFieldGraphQLField<ListTypeInfo['item'], NixxieContext<ListTypeInfo['all']>>
+    | VirtualFieldGraphQLField<CollectionTypeInfo['item'], NixxieContext<CollectionTypeInfo['all']>>
     | ((lists: {
-        [Key in keyof ListTypeInfo['all']['lists']]: ListGraphQLTypes<
-          ListTypeInfo['all']['lists'][Key]
+        [Key in keyof CollectionTypeInfo['all']['lists']]: CollectionGraphQLTypes<
+          CollectionTypeInfo['all']['lists'][Key]
         >
-      }) => VirtualFieldGraphQLField<ListTypeInfo['item'], NixxieContext<ListTypeInfo['all']>>)
+      }) => VirtualFieldGraphQLField<CollectionTypeInfo['item'], NixxieContext<CollectionTypeInfo['all']>>)
   unreferencedConcreteInterfaceImplementations?: readonly GObjectType<
     any,
-    NixxieContext<ListTypeInfo['all']>
+    NixxieContext<CollectionTypeInfo['all']>
   >[]
   ui?: {
     /**
@@ -67,10 +67,10 @@ export type VirtualFieldConfig<ListTypeInfo extends BaseListTypeInfo> = CommonFi
   }
 }
 
-export function virtual<ListTypeInfo extends BaseListTypeInfo>({
+export function virtual<CollectionTypeInfo extends BaseCollectionTypeInfo>({
   field,
   ...config
-}: VirtualFieldConfig<ListTypeInfo>): FieldTypeFunc<ListTypeInfo> {
+}: VirtualFieldConfig<CollectionTypeInfo>): FieldTypeFunc<CollectionTypeInfo> {
   return meta => {
     const usableField = typeof field === 'function' ? field(meta.lists) : field
     const namedType = getNamedType(usableField.type)