@owlmeans/state 0.1.18-rc.8 → 0.1.18

package/src/resource.ts

@@ -1,336 +1,454 @@
-import { appendContextual } from '@owlmeans/context'
-import { MisshapedRecord, RecordExists, UnknownRecordError, UnsupportedArgumentError } from '@owlmeans/resource'
-import { prepareListOptions } from '@owlmeans/resource'
-import type { ListCriteria, LifecycleOptions, ListResult, ResourceRecord } from '@owlmeans/resource'
-import type { StateListener, StateModel, StateResource, StateResourceAppend, StateSubscriptionOption } from './types.js'
-import { DEFAULT_ALIAS, DEFAULT_ID } from './consts'
-import { StateListenerError } from './errors.js'
+import { appendContextual, type BasicConfig as Config, type BasicContext as Context } from '@owlmeans/context'
+import { RecordExists, recordQueryHelper, UnknownRecordError, UnsupportedArgumentError, type Criteria, type FirstOptions, type ListOptions, type ResourceRecord, type SubscribeOptions, type Ttl, type Unsubscribe, type WriteOptions } from '@owlmeans/resource'
+import { StateConfigError } from './errors.js'
 import { createStateModel } from './utils/model.js'
-import { filterRecords, sortRecords } from './utils/criteria.js'
-import type { BasicContext as Context, BasicConfig as Config } from '@owlmeans/context'
+import type {
+  StateConfig, StateEvent, StateModel, StateResource, StateResourceAppend
+} from './types.js'
+import { CHANGES, SOLE, STATE } from './consts.local.js'
+import type { QueryWatch, Subscription } from './types.local.js'
+
+/** Milliseconds until a subscription expires: a number is seconds from now, a Date the instant. */
+const expiresIn = (ttl: Ttl): number =>
+  ttl instanceof Date ? ttl.getTime() - Date.now() : ttl * 1000
+
+export const createStateResource = <T extends ResourceRecord>(
+  alias: string = STATE, cfg?: StateConfig<T>
+): StateResource<T> => {
+  const config: StateConfig<T> = { ...cfg }
+  const idField = (config.id ?? 'id') as keyof T & string
+  const single = config.single === true
+
+  const store = new Map<string, T>()
+
+  /** One registry per kind of subscriber: a key, a query, and the change stream. */
+  const watchers = new Map<string, Set<(model: StateModel<T>) => void>>()
+  const queries = new Set<QueryWatch<T>>()
+  const subscribers = new Set<Subscription<T>>()
 
-export const createStateResource = <R extends ResourceRecord>(alias: string = DEFAULT_ALIAS): StateResource<R> => {
-  const location = `state-resource:${alias}`
+  /**
+   * The model handed out for a key, kept until the record behind it is replaced. React compares
+   * snapshots by reference, so rebuilding a model on every unrelated write would re-render every
+   * screen bound to the store.
+   */
+  const models = new Map<string, { from: T | undefined, model: StateModel<T> }>()
 
-  const store: { [id: string]: R } = {}
-  const recordToListener = new Map<string, Set<StateListener<R>>>()
-  const listenerToRecord = new Map<StateListener<R>, string[]>()
-  const globalListeners: StateListener<R>[] = []
-  const systemToListeners: Record<string, StateListener<R>> = {}
+  const records = (): T[] => [...store.values()]
 
   /**
-   * Live query subscriptions.
+   * The key a record is filed under.
    *
-   * An id subscription is answered from a key; a query has to be re-evaluated against the whole
-   * store whenever anything changes, because a write can add a record to a set it was not in.
-   * Kept in two registries for the same reason the id side is: a React subscriber arrives with a
-   * `_systemId` and must dedup across re-renders, while a plain listener must not silently
-   * subscribe twice.
+   * @throws {StateConfigError} `NoId` — nothing here mints ids, so a record without one is
+   * misfiled rather than new.
    */
-  interface QuerySubscription {
-    query: ListCriteria
-    listener: StateListener<R>
-    systemId?: string
+  const keyOf = (record: Partial<T>): string => {
+    if (single) {
+      return SOLE
+    }
+    const id = record[idField] as unknown
+    if (typeof id !== 'string' || id === '') {
+      throw new StateConfigError(StateConfigError.NoId)
+    }
+
+    return id
   }
-  const listenerToQuery = new Map<StateListener<R>, QuerySubscription>()
-  const systemToQueries: Record<string, QuerySubscription> = {}
 
-  type StoreKey = keyof typeof store
+  /**
+   * The key an id addresses.
+   *
+   * @throws {StateConfigError} `NonSingle` — an absent id on a resource that holds many records.
+   */
+  const keyFor = (id: string | undefined): string => {
+    if (id == null) {
+      if (!single) {
+        throw new StateConfigError(StateConfigError.NonSingle)
+      }
+
+      return SOLE
+    }
 
-  const _notifyGlobalListeners = (records: R[]) => {
-    globalListeners.forEach(listener => listener(
-      records.map(record => createStateModel(record, resource))
-    ))
+    return single ? SOLE : id
   }
 
-  const _usubscribe = (params: StateSubscriptionOption<R>) => () => {
-    listenerToQuery.delete(params.listener)
-    Object.entries(systemToQueries).some(([key, subscription]) => {
-      if (subscription.listener === params.listener) {
-        delete systemToQueries[key]
-        return true
-      }
+  /** The key a record already in the store is filed under — its id is known to be there. */
+  const storedKey = (record: T): string =>
+    single ? SOLE : record[idField] as unknown as string
 
-      return false
-    })
+  /**
+   * A read by id. On a single resource the one record answers only to its own id, so asking for
+   * a different one is a miss rather than the sole record under a wrong name.
+   */
+  const read = (id: string): T | null => {
+    const record = store.get(keyFor(id))
+    if (record == null) {
+      return null
+    }
+    const own = record[idField] as unknown
+    if (single && own != null && own !== id) {
+      return null
+    }
+
+    return record
+  }
+
+  const first = (idOrWhere: string | Criteria<T>, opts?: FirstOptions<T>): T | null =>
+    typeof idOrWhere === 'string' ? read(idOrWhere) : recordQueryHelper.firstMatch(records(), idOrWhere, opts)
+
+  /** The store keeps no expiring records, so a ttl would be silently dropped. */
+  const refuseTtl = (opts?: WriteOptions): void => {
+    if (opts?.ttl != null) {
+      throw new UnsupportedArgumentError('ttl')
+    }
+  }
+
+  const modelFor = (key: string): StateModel<T> => {
+    const record = store.get(key)
+    const cached = models.get(key)
+    if (cached != null && cached.from === record) {
+      return cached.model
+    }
+
+    const id = (record?.[idField] as unknown as string | undefined) ?? (key === SOLE ? undefined : key)
+    const model = createStateModel<T>({
+      id,
+      record,
+      default: config.default,
+      write: async value => {
+        const next = { ...value } as T
+        if (!single) {
+          (next as Record<string, unknown>)[idField] = key
+        }
 
-    const ids = listenerToRecord.get(params.listener)
-    listenerToRecord.delete(params.listener)
-    ids?.forEach(id => {
-      const listeners = recordToListener.get(id)
-      if (listeners != null) {
-        listeners.delete(params.listener)
-        if (listeners.size === 0) {
-          recordToListener.delete(id)
+        return write(key, next)
+      },
+      drop: async () => {
+        const removed = store.get(key)
+        if (removed == null) {
+          return
         }
+        store.delete(key)
+        notify('remove', [[key, removed]])
       }
     })
-    Object.entries(systemToListeners).some(([key, listener]) => {
-      if (listener === params.listener) {
-        delete systemToListeners[key]
-        return true
-      }
+    models.set(key, { from: record, model })
 
-      return false
-    })
+    return model
   }
 
-  const _queryModels = (query: ListCriteria): StateModel<R>[] =>
-    filterRecords(Object.values(store) as R[], query).map(record => createStateModel(record, resource))
-
   /**
-   * Re-run every live query and hand each subscriber its current answer.
+   * The model for "nothing is addressed yet" — one instance, reused.
    *
-   * Deliberately unconditional: deciding whether a write could have changed a given query's
-   * result is the same work as re-running it, and getting that wrong leaves a list stale with
-   * nothing to indicate it.
+   * It must be the SAME reference every time: a React subscriber compares snapshots by identity,
+   * and a freshly built model would read as a change on every render and loop. Writing through it
+   * is refused rather than silently dropped, because a caller that writes without an id has lost
+   * track of which record it meant.
    */
-  const _notifyQueryListeners = () => {
-    for (const subscription of [...listenerToQuery.values(), ...Object.values(systemToQueries)]) {
-      subscription.listener(_queryModels(subscription.query), subscription.systemId)
+  let blank: StateModel<T> | undefined
+  const emptyModel = (): StateModel<T> => blank ??= createStateModel<T>({
+    id: undefined,
+    record: undefined,
+    default: config.default,
+    write: async () => { throw new StateConfigError(StateConfigError.NoId) },
+    drop: async () => { throw new StateConfigError(StateConfigError.NoId) }
+  })
+
+  const queryModels = (watch: QueryWatch<T>): StateModel<T>[] =>
+    recordQueryHelper.sortRecords(recordQueryHelper.filterRecords(records(), watch.where), watch.opts?.sort)
+      .map(record => modelFor(storedKey(record)))
+
+  const same = (left: StateModel<T>[], right: StateModel<T>[]): boolean =>
+    left.length === right.length && left.every((model, index) => model === right[index])
+
+  /** Deliver on one channel. Returns what the handlers gave back, for a caller that awaits. */
+  const deliver = (event: StateEvent<T>, channel: string): Array<void | Promise<void>> => {
+    const delivered: Array<void | Promise<void>> = []
+    for (const subscription of [...subscribers]) {
+      if (subscription.channel !== channel) {
+        continue
+      }
+      if (subscription.once) {
+        subscribers.delete(subscription)
+        if (subscription.timer != null) {
+          clearTimeout(subscription.timer)
+        }
+      }
+      delivered.push(subscription.handler(event))
     }
+
+    return delivered
   }
 
-  const _notifyListeners = (record: R) => {
-    for (const listener of recordToListener.get(record.id!) ?? []) {
-      listener([createStateModel(record, resource)])
+  /**
+   * Tell everyone what changed. Key watchers hear only about their own record; every live query
+   * is re-evaluated, because a write can move a record into a set it was not in and deciding
+   * whether it did is the same work as re-running the query.
+   */
+  const notify = (type: StateEvent<T>['type'], changed: Array<[string, T]>): void => {
+    if (changed.length < 1) {
+      return
+    }
+    for (const [key] of changed) {
+      const listeners = watchers.get(key)
+      if (listeners == null) {
+        continue
+      }
+      const model = modelFor(key)
+      for (const listener of [...listeners]) {
+        listener(model)
+      }
     }
-    for (const key of Object.keys(systemToListeners)) {
-      const [, ...idsProto] = key.split(':')
-      const ids = idsProto.join(':').split(',')
-      if (ids.includes(record.id!)) {
-        systemToListeners[key](ids.map(id => createStateModel(store[id], resource)), key)
+    for (const watch of [...queries]) {
+      const current = queryModels(watch)
+      if (same(watch.last, current)) {
+        continue
+      }
+      watch.last = current
+      watch.listener(current)
+    }
+    deliver({ type, records: changed.map(([, record]) => record) }, CHANGES)
+    /**
+     * A key nobody watches and nothing is stored under has no model worth keeping — otherwise the
+     * cache grows with every record the store ever held. A watched key keeps its entry, so an
+     * empty model stays the same object and a screen bound to a deleted record does not re-render
+     * on every unrelated write.
+     */
+    for (const [key] of changed) {
+      if (!store.has(key) && !watchers.has(key)) {
+        models.delete(key)
       }
     }
   }
 
-  const resource: StateResource<R> = appendContextual<StateResource<R>>(alias, {
-    get: async (id, field, opts) => {
-      const record = await resource.load(id, field, opts)
-      if (record == null) {
-        throw new UnknownRecordError(id)
-      }
+  const write = (key: string, record: Partial<T>): T => {
+    const value = { ...record } as T
+    store.set(key, value)
+    notify('set', [[key, value]])
 
-      return record as any
-    },
+    return value
+  }
 
-    load: async (id, field, opts) => {
-      if (field != null) {
-        throw new UnsupportedArgumentError(`${location}:get:filed`)
-      }
-      if (opts != null) {
-        throw new UnsupportedArgumentError(`${location}:get:opts`)
-      }
-      const record = store[id] as R | undefined
+  const resource: StateResource<T> = appendContextual<StateResource<T>>(alias, {
+    config,
 
+    get: async (idOrWhere: string | Criteria<T>, opts?: FirstOptions<T>): Promise<T> => {
+      const record = first(idOrWhere, opts)
       if (record == null) {
-        return null
+        throw new UnknownRecordError(typeof idOrWhere === 'string' ? idOrWhere : 'criteria')
       }
 
-      return record as any
+      return record
     },
 
-    /**
-     * The `Resource` list contract, criteria and pager included.
-     *
-     * The default page size is 0 — meaning UNPAGED — rather than the ten a server resource
-     * defaults to. Every existing caller of a state resource writes `list()` and expects the
-     * whole store back; silently returning the first ten would be a truncation nothing reports.
-     * Pagination happens when a pager is actually asked for.
-     */
-    list: async (criteria, opts) => {
-      const options = prepareListOptions(0, criteria, opts)
-      const matched = sortRecords(
-        filterRecords(Object.values(store) as R[], options.criteria),
-        options.pager?.sort
-      )
-
-      const size = options.pager?.size ?? 0
-      const page = options.pager?.page ?? 0
-      const items = size > 0 ? matched.slice(page * size, page * size + size) : matched
-
-      const result: ListResult<R> = {
-        items,
-        pager: { ...options.pager, total: matched.length }
+    load: async (idOrWhere: string | Criteria<T>, opts?: FirstOptions<T>): Promise<T | null> =>
+      first(idOrWhere, opts),
+
+    /** Unpaged unless a size is asked for: a screen reading the store expects all of it. */
+    list: async (where?: Criteria<T>, opts?: ListOptions<T>) => {
+      if (opts?.page != null && opts.size == null) {
+        throw new UnsupportedArgumentError('page-without-size')
       }
 
-      return result as any
+      return recordQueryHelper.applyQuery(records(), where, opts)
     },
 
-    all: async () => Object.values(store) as any,
-
-    match: async criteria => filterRecords(Object.values(store) as R[], criteria) as any,
+    count: async (where?: Criteria<T>) => recordQueryHelper.filterRecords(records(), where).length,
 
-    save: async (record, opts) => {
-      const id = record.id ?? DEFAULT_ID
-      if (store[id] != null) {
-        return resource.update(record, opts)
+    create: async (record: Partial<T>, opts?: WriteOptions) => {
+      refuseTtl(opts)
+      const key = keyOf(record)
+      if (store.has(key)) {
+        throw new RecordExists(key === SOLE ? alias : key)
       }
 
-      return resource.create(record, opts as LifecycleOptions)
+      return write(key, record)
     },
 
-    create: async (record, opts) => {
-      if (!("id" in record) || record.id == null) {
-        record.id = DEFAULT_ID
+    /** Replaces the stored record rather than merging into it, as the contract says. */
+    update: async (record: Partial<T>, opts?: WriteOptions) => {
+      refuseTtl(opts)
+      const key = keyOf(record)
+      if (!store.has(key)) {
+        throw new UnknownRecordError(key === SOLE ? alias : key)
       }
-      if (store[record.id as StoreKey] != null) {
-        throw new RecordExists(record.id)
-      }
-      if (opts != null) {
-        throw new UnsupportedArgumentError(`${location}:create:opts`)
-      }
-      store[record.id as StoreKey] = record as unknown as R
-
-      _notifyListeners(store[record.id as StoreKey])
-      _notifyGlobalListeners([store[record.id as StoreKey]])
-      _notifyQueryListeners()
 
-      return record as any
+      return write(key, record)
     },
 
-    update: async (record, opts) => {
-      if (opts != null) {
-        throw new UnsupportedArgumentError(`${location}:update:opts`)
-      }
-      if (!("id" in record) || record.id == null) {
-        record.id = DEFAULT_ID
-      }
-      const reference = store[record.id as StoreKey]
-      if (reference == null) {
-        throw new UnknownRecordError(record.id)
-      }
-      Object.assign(reference, record)
-
-      _notifyListeners(reference)
-      _notifyGlobalListeners([reference])
-      _notifyQueryListeners()
+    save: async (record: Partial<T>, opts?: WriteOptions) => {
+      refuseTtl(opts)
 
-      return reference as any
+      return write(keyOf(record), record)
     },
 
-    delete: async (id, opts) => {
-      const _id = typeof id === 'string' ? id : id.id
-      if (_id == null) {
-        throw new UnsupportedArgumentError('id')
-      }
-      const record: R | null = store[_id as StoreKey] as R
+    delete: async (id: string) => {
+      const record = read(id)
       if (record == null) {
         return null
       }
-      if (opts != null) {
-        throw new UnsupportedArgumentError(`${location}:delete:opts`)
+      const key = keyFor(id)
+      store.delete(key)
+      notify('remove', [[key, record]])
+
+      return record
+    },
+
+    take: async (id: string) => {
+      const record = await resource.delete(id)
+      if (record == null) {
+        throw new UnknownRecordError(id)
       }
-      delete store[_id as StoreKey]
 
-      _notifyListeners(record)
-      _notifyGlobalListeners([record])
-      _notifyQueryListeners()
+      return record
+    },
+
+    purge: async (where: Criteria<T>) => {
+      if (where == null || Object.keys(where).length < 1) {
+        throw new UnsupportedArgumentError('purge:empty-criteria')
+      }
+      const removed = recordQueryHelper.filterRecords(records(), where)
+        .map((record): [string, T] => [storedKey(record), record])
+      for (const [key] of removed) {
+        store.delete(key)
+      }
+      notify('remove', removed)
 
-      return record as any
+      return removed.length
     },
 
-    pick: async (id, opts) => {
-      const _id = typeof id === 'string' ? id : id.id
-      if (_id == null) {
-        throw new MisshapedRecord('id')
+    /**
+     * The store is rewritten before anything is told about it, so a subscriber never sees the
+     * half-applied set. On a `single` resource every record lands in the one slot, which means a
+     * list of several collapses to the last of them.
+     */
+    replace: async list => {
+      const written = list.map((record): [string, T] => [keyOf(record), { ...record }])
+      const keys = new Set(written.map(([key]) => key))
+      const dropped = [...store.entries()].filter(([key]) => !keys.has(key))
+      for (const [key] of dropped) {
+        store.delete(key)
       }
-      const record = await resource.delete(_id, opts)
-      if (record == null) {
-        throw new UnknownRecordError(_id)
+      for (const [key, record] of written) {
+        store.set(key, record)
       }
+      notify('remove', dropped)
+      notify('set', written)
+    },
 
-      return record as any
+    clear: async () => {
+      const dropped = [...store.entries()]
+      store.clear()
+      notify('remove', dropped)
     },
 
-    subscribe: params => {
+    watch: (id, listener) => {
       /**
-       * A query subscription is a different thing from an id subscription and cannot be layered
-       * on top of one: it creates no placeholder record, and its answer is a set that changes
-       * membership rather than a fixed list of records that change content. `id` wins when both
-       * are given, so an existing caller that happens to pass a query keeps its behaviour.
+       * Watching before there is anything to watch is a RENDERING state, not a mistake.
+       *
+       * A screen binds to `useStoreModel(project.record.id)` while the project is still loading,
+       * so the id is legitimately absent for the first renders. Treating that as the
+       * configuration error it would be on `load()` or `save()` crashes the component tree over
+       * data that is simply not here yet. So an absent id on a listed resource watches nothing
+       * and reports an empty model; the error stays where it means something — a direct read or
+       * write with no id, which cannot be anything but a mistake.
        */
-      if (params.query != null && params.id == null) {
-        const subscription: QuerySubscription = { query: params.query, listener: params.listener }
-        const models = _queryModels(params.query)
-
-        if (params._systemId != null) {
-          const key = `${params._systemId}:query:${JSON.stringify(params.query)}`
-          if (systemToQueries[key] != null) {
-            return [_usubscribe(params), models]
-          }
-          subscription.systemId = key
-          systemToQueries[key] = subscription
-        } else {
-          if (listenerToQuery.has(params.listener)) {
-            throw new StateListenerError('subscribed')
-          }
-          listenerToQuery.set(params.listener, subscription)
-        }
+      if (id == null && !single) {
+        listener(emptyModel())
 
-        return [_usubscribe(params), models]
+        return () => { }
       }
 
-      const id = params.id ?? DEFAULT_ID
-      const ids = Array.isArray(id) ? id : [id]
-      const records = ids.map(id => {
-        if (store[id] == null) {
-          store[id as StoreKey] = { ...params.default, id } as R
-        }
-        return createStateModel(store[id], resource)
-      })
-      if (params._systemId != null) {
-        const key = `${params._systemId}:${ids.join(",")}`
-        if (systemToListeners[key] != null) {
-          return [_usubscribe(params), records]
-        }
+      const key = keyFor(id)
+      let listeners = watchers.get(key)
+      if (listeners == null) {
+        listeners = new Set()
+        watchers.set(key, listeners)
+      }
+      const bound = listeners
+      bound.add(listener)
+      /**
+       * Seeded before `watch` returns, and seeded with nothing when the store holds nothing: an
+       * id subscription creates NO record, so a screen bound to an unknown id gets an empty
+       * model rather than putting a blank row into every list reading the same store.
+       */
+      listener(modelFor(key))
 
-        systemToListeners[key] = params.listener
-      } else {
-        if (listenerToRecord.has(params.listener)) {
-          throw new StateListenerError('subscribed')
+      /**
+       * The cached model outlives the subscription on purpose. A React subscriber takes its first
+       * snapshot by watching and stopping again, and a rebuilt model would read as a changed value
+       * the moment it subscribes for real. Keys the store no longer holds are dropped on the next
+       * change to them instead.
+       */
+      return () => {
+        bound.delete(listener)
+        if (bound.size < 1) {
+          watchers.delete(key)
         }
-        listenerToRecord.set(params.listener, ids)
-        ids.forEach(id => {
-          if (!recordToListener.has(id)) {
-            recordToListener.set(id, new Set())
-          }
-          recordToListener.get(id)?.add(params.listener)
-        })
       }
+    },
+
+    query: (where, listener, opts) => {
+      const watch: QueryWatch<T> = { where, opts, listener, last: [] }
+      queries.add(watch)
+      watch.last = queryModels(watch)
+      listener(watch.last)
 
-      return [_usubscribe(params), records]
+      return () => { queries.delete(watch) }
     },
 
-    listen: listener => {
-      globalListeners.push(listener)
+    /**
+     * Writes announce themselves on the default channel, so publishing is for what the store
+     * cannot know it did — a change that arrived from elsewhere, or a channel of a caller's own.
+     */
+    publish: async (value: StateEvent<T>, channel?: string) => {
+      await Promise.all(deliver(value, channel ?? CHANGES))
+    },
 
-      return () => {
-        const index = globalListeners.indexOf(listener)
-        if (index >= 0) {
-          globalListeners.splice(index, 1)
+    subscribe: async (
+      handler: (value: StateEvent<T>) => void | Promise<void>, opts?: SubscribeOptions
+    ) => {
+      const subscription: Subscription<T> = {
+        handler, channel: opts?.channel ?? CHANGES, once: opts?.once === true
+      }
+      subscribers.add(subscription)
+
+      const stop: Unsubscribe = async () => {
+        subscribers.delete(subscription)
+        if (subscription.timer != null) {
+          clearTimeout(subscription.timer)
+          subscription.timer = undefined
         }
       }
-    },
 
-    erase: async () => {
-      await Promise.all(Object.keys(store).map(key => resource.delete(key)))
+      if (opts?.ttl != null) {
+        subscription.timer = setTimeout(() => void stop(), expiresIn(opts.ttl))
+      }
+
+      return stop
     }
   })
 
   return resource
 }
 
-export const appendStateResource = <C extends Config, T extends Context<C>>(
-  ctx: T, alias: string = DEFAULT_ALIAS
-): T & StateResourceAppend => {
-  const resource = createStateResource(alias)
-
+/**
+ * Register a state resource on the context and expose `getStateResource`.
+ *
+ * Idempotent: appending the same alias twice keeps the resource that is already there, so a
+ * setup that runs more than once does not drop what the store has collected. The first alias
+ * appended is the one `getStateResource()` answers with when it is called without one.
+ */
+export const appendStateResource = <
+  C extends Config, T extends Context<C>, R extends ResourceRecord = ResourceRecord
+>(ctx: T, alias: string = STATE, cfg?: StateConfig<R>): T & StateResourceAppend => {
   const _ctx = ctx as T & StateResourceAppend
 
-  _ctx.registerResource(resource)
+  if (!_ctx.hasResource(alias)) {
+    _ctx.registerResource(createStateResource<R>(alias, cfg))
+  }
+
   if (_ctx.getStateResource == null) {
-    _ctx.getStateResource = alias => ctx.resource(alias ?? resource.alias)
+    _ctx.getStateResource = (<S extends ResourceRecord>(_alias?: string) =>
+      ctx.resource<StateResource<S>>(_alias ?? alias)) as StateResourceAppend['getStateResource']
   }
 
   return _ctx