Merge pull request #19 from nanostores/feat/update-to-0.10

feat: bump `nanostores` to 0.10

Author: euaaaio

build-creator-logger/errors.ts

@@ -8,7 +8,7 @@ let $atom = atom()
 buildCreatorLogger($atom, 'Atom', {})
 
 buildCreatorLogger($atom, 'Atom', {
-  // THROWS Argument of type '{ mount: () => void; }' is not assignable to
+  // THROWS 'mount' does not exist in typ
   mount: () => {}
 })
 
@@ -20,7 +20,7 @@ buildCreatorLogger(
   },
   {
     messages: {
-      // THROWS Type '{ mount: false; }' is not assignable to
+      // THROWS 'mount' does not exist in type
       mount: false
     }
   }

build-logger/index.d.ts

@@ -1,11 +1,6 @@
 import type { AnyStore, Store, StoreValue } from 'nanostores'
 
 interface LoggerOptionsMessages {
-  /**
-   * Disable action logs.
-   */
-  action?: boolean
-
   /**
    * Disable change logs.
    */
@@ -23,11 +18,6 @@ interface LoggerOptionsMessages {
 }
 
 export interface LoggerOptions {
-  /**
-   * Disable logs of actions with a specific name.
-   */
-  ignoreActions?: string[]
-
   /**
    * Disable specific types of logs.
    */
@@ -39,19 +29,12 @@ interface EventPayloadBase {
 }
 
 interface EventChangePayload extends EventPayloadBase {
-  actionId?: number
-  actionName?: string
   changed?: keyof StoreValue<Store>
   newValue: any
   oldValue?: any
   valueMessage?: string
 }
 
-interface EventActionPayload extends EventPayloadBase {
-  actionId: number
-  actionName: string
-}
-
 interface EventActionStartPayload extends EventActionPayload {
   args: any[]
 }
@@ -61,11 +44,6 @@ interface EventActionErrorPayload extends EventActionPayload {
 }
 
 interface BuildLoggerEvents {
-  action?: {
-    end?: (payload: EventActionPayload) => void
-    error?: (payload: EventActionErrorPayload) => void
-    start?: (payload: EventActionStartPayload) => void
-  }
   change?: (payload: EventChangePayload) => void
   mount?: (payload: EventPayloadBase) => void
   unmount?: (payload: EventPayloadBase) => void
@@ -94,22 +72,6 @@ interface BuildLoggerEvents {
  *     message += `to ${newValue}`
  *     if (actionName) message += `by action ${actionName}`
  *     console.log(message, valueMessage)
- *   },
- *
- *   action: {
- *     start: ({ actionName, args }) => {
- *       let message = `${actionName} was started`
- *       if (args.length) message += 'with arguments'
- *       console.log(message, args)
- *     },
- *
- *     error: ({ actionName, error }) => {
- *       console.log(`${actionName} was failed`, error)
- *     },
- *
- *     end: ({ actionName }) => {
- *       console.log(`${actionName} was ended`)
- *     }
  *   }
  * ```
  *

build-logger/index.js

@@ -1,11 +1,4 @@
-import {
-  actionId,
-  lastAction,
-  onAction,
-  onMount,
-  onNotify,
-  onSet
-} from 'nanostores'
+import { onMount, onNotify, onSet } from 'nanostores'
 
 const isAtom = store => store.setKey === undefined
 const isDeepMapKey = key => /.+(\..+|\[\d+\.*])/.test(key)
@@ -23,30 +16,8 @@ function handleMount(store, storeName, messages, events) {
   })
 }
 
-function handleAction(store, storeName, ignoreActions, events) {
-  return onAction(store, ({ actionName, args, id, onEnd, onError }) => {
-    if (ignoreActions && ignoreActions.includes(actionName)) return
-
-    events.action.start({ actionId: id, actionName, args, storeName })
-
-    onError(({ error }) => {
-      events.action.error({ actionId: id, actionName, error, storeName })
-    })
-
-    onEnd(() => {
-      events.action.end({ actionId: id, actionName, storeName })
-    })
-  })
-}
-
-function handleSet(store, storeName, messages, ignoreActions, events) {
+function handleSet(store, storeName, events) {
   return onSet(store, ({ changed }) => {
-    let currentActionId = store[actionId]
-    let currentActionName = store[lastAction]
-
-    if (messages.action === false && currentActionId) return
-    if (ignoreActions && ignoreActions.includes(currentActionName)) return
-
     let oldValue = isAtom(store) ? store.value : { ...store.value }
     oldValue = isDeepMapKey(changed) ? structuredClone(oldValue) : oldValue
     let unbindNotify = onNotify(store, () => {
@@ -57,8 +28,6 @@ function handleSet(store, storeName, messages, ignoreActions, events) {
       }
 
       events.change({
-        actionId: currentActionId,
-        actionName: currentActionName,
         changed,
         newValue,
         oldValue,
@@ -72,20 +41,15 @@ function handleSet(store, storeName, messages, ignoreActions, events) {
 }
 
 export function buildLogger(store, storeName, events, opts = {}) {
-  let ignoreActions = opts.ignoreActions
   let messages = opts.messages || {}
   let unbind = []
 
   if (messages.mount !== false || messages.unmount !== false) {
     unbind.push(handleMount(store, storeName, messages, events))
   }
 
-  if (messages.action !== false) {
-    unbind.push(handleAction(store, storeName, ignoreActions, events))
-  }
-
   if (messages.change !== false) {
-    unbind.push(handleSet(store, storeName, messages, ignoreActions, events))
+    unbind.push(handleSet(store, storeName, events))
   }
 
   return () => {

creator-logger/__snapshots__/index.test.ts.snap

@@ -8,63 +8,18 @@ Nano Stores build: Map Creator:3 store was built by Map Creator creator
 Nano Stores mount: Map Creator:1 store was mounted
 Nano Stores change: Map Creator:1 store was changed in the value key
   value: null → 0 
-  new: {\\"id\\":\\"1\\",\\"value\\":0}
-  old: {\\"id\\":\\"1\\",\\"value\\":null}
-Nano Stores action: Map Creator:1 store was changed by action Increase Value
-  change: Map Creator:1 store was changed in the value key
-    value: 0 → 1 
-    new: {\\"id\\":\\"1\\",\\"value\\":1}
-    old: {\\"id\\":\\"1\\",\\"value\\":0}
-Nano Stores action: Map Creator:1 store was changed by action Increase Value
-  change: Map Creator:1 store was changed in the value key
-    value: 1 → 2 
-    new: {\\"id\\":\\"1\\",\\"value\\":2}
-    old: {\\"id\\":\\"1\\",\\"value\\":1}
-Nano Stores action: Map Creator:1 store was changed by action Increase Value
-  change: Map Creator:1 store was changed in the value key
-    value: 2 → 3 
-    new: {\\"id\\":\\"1\\",\\"value\\":3}
-    old: {\\"id\\":\\"1\\",\\"value\\":2}
+  new: {"id":"1","value":0}
+  old: {"id":"1","value":null}
 Nano Stores mount: Map Creator:2 store was mounted
 Nano Stores change: Map Creator:2 store was changed in the value key
   value: null → 0 
-  new: {\\"id\\":\\"2\\",\\"value\\":0}
-  old: {\\"id\\":\\"2\\",\\"value\\":null}
-Nano Stores action: Map Creator:2 store was changed by action Increase Value
-  change: Map Creator:2 store was changed in the value key
-    value: 0 → 1 
-    new: {\\"id\\":\\"2\\",\\"value\\":1}
-    old: {\\"id\\":\\"2\\",\\"value\\":0}
-Nano Stores action: Map Creator:2 store was changed by action Increase Value
-  change: Map Creator:2 store was changed in the value key
-    value: 1 → 2 
-    new: {\\"id\\":\\"2\\",\\"value\\":2}
-    old: {\\"id\\":\\"2\\",\\"value\\":1}
-Nano Stores action: Map Creator:2 store was changed by action Increase Value
-  change: Map Creator:2 store was changed in the value key
-    value: 2 → 3 
-    new: {\\"id\\":\\"2\\",\\"value\\":3}
-    old: {\\"id\\":\\"2\\",\\"value\\":2}
+  new: {"id":"2","value":0}
+  old: {"id":"2","value":null}
 Nano Stores mount: Map Creator:3 store was mounted
 Nano Stores change: Map Creator:3 store was changed in the value key
   value: null → 0 
-  new: {\\"id\\":\\"3\\",\\"value\\":0}
-  old: {\\"id\\":\\"3\\",\\"value\\":null}
-Nano Stores action: Map Creator:3 store was changed by action Increase Value
-  change: Map Creator:3 store was changed in the value key
-    value: 0 → 1 
-    new: {\\"id\\":\\"3\\",\\"value\\":1}
-    old: {\\"id\\":\\"3\\",\\"value\\":0}
-Nano Stores action: Map Creator:3 store was changed by action Increase Value
-  change: Map Creator:3 store was changed in the value key
-    value: 1 → 2 
-    new: {\\"id\\":\\"3\\",\\"value\\":2}
-    old: {\\"id\\":\\"3\\",\\"value\\":1}
-Nano Stores action: Map Creator:3 store was changed by action Increase Value
-  change: Map Creator:3 store was changed in the value key
-    value: 2 → 3 
-    new: {\\"id\\":\\"3\\",\\"value\\":3}
-    old: {\\"id\\":\\"3\\",\\"value\\":2}
+  new: {"id":"3","value":0}
+  old: {"id":"3","value":null}
 Nano Stores unmount: Map Creator:1 store was unmounted
 Nano Stores unmount: Map Creator:2 store was unmounted
 Nano Stores unmount: Map Creator:3 store was unmounted

creator-logger/index.test.ts

@@ -1,6 +1,6 @@
 import { delay } from 'nanodelay'
 import type { MapCreator, MapStore } from 'nanostores'
-import { action, map, onMount, STORE_UNMOUNT_DELAY } from 'nanostores'
+import { map, onMount, STORE_UNMOUNT_DELAY } from 'nanostores'
 import { afterEach, beforeAll, expect, it, vi } from 'vitest'
 
 import { format } from '../test/index.js'
@@ -57,12 +57,6 @@ afterEach(() => {
 it('prints logs from store builder', async () => {
   let creator = createMapCreator($store => {
     $store.setKey('value', 0)
-    let increaseValue = action($store, 'Increase Value', store => {
-      store.setKey('value', Number(store.get().value) + 1)
-    })
-    increaseValue()
-    increaseValue()
-    increaseValue()
   })
   let destroy = creatorLogger({ 'Map Creator': creator })
 

creator-logger/types.ts

@@ -13,7 +13,6 @@ let $creator = createCreator()
 let destroy = creatorLogger(
   { $creator },
   {
-    ignoreActions: ['Increase Value'],
     messages: {
       build: false,
       mount: false

demo/index.ts

@@ -1,5 +1,5 @@
 import { delay } from 'nanodelay'
-import { action, atom, deepMap, map, STORE_UNMOUNT_DELAY } from 'nanostores'
+import { atom, deepMap, map, STORE_UNMOUNT_DELAY } from 'nanostores'
 
 import { logger } from '../index.js'
 
@@ -26,41 +26,6 @@ let $deepMap = deepMap<{
   }
 })
 
-let increaseCounter = action($atom, 'Increase Counter', store => {
-  store.set(Number(store.get()) + 1)
-})
-
-let changeUserArtworks = action(
-  $map,
-  'Change User Artworks',
-  (store, value) => {
-    store.setKey('artworks', value)
-  }
-)
-
-let changeUser = action(
-  $map,
-  'Change User',
-  async (store, username = 'chashnik', fullname = 'Ilya Chashnik') => {
-    await delay(1000)
-    store.setKey('username', username)
-    store.setKey('fullname', fullname)
-  }
-)
-
-let addArtworks = action(
-  $deepMap,
-  'Add Artworks',
-  async (store, artist: string, artworks: string[]) => {
-    for (let item of artworks) {
-      await delay(100)
-      let index = store.get().artists.malevich.artworks.length
-      store.setKey(`artists.${artist}.artworks[${index}]`, item)
-    }
-    throw Error('Something went wrong in action Add Artworks')
-  }
-)
-
 logger({
   Artist: $map,
   Counter: $atom,
@@ -69,22 +34,32 @@ logger({
 
 async function run(): Promise<void> {
   let unbindAtom = $atom.listen(() => {})
-  increaseCounter()
+  $atom.set(100)
+  $atom.set(101)
+  $atom.set(Number($atom.get()) + 1)
+  $atom.set(Number($atom.get()) + 1)
+  $atom.set(Number($atom.get()) + 1)
   unbindAtom()
   await delay(STORE_UNMOUNT_DELAY + 10)
 
-  changeUserArtworks(303)
+  $map.setKey('artworks', 303)
 
-  await changeUser('malevich', 'Kazimir Malevich')
+  await delay(STORE_UNMOUNT_DELAY)
+  $map.setKey('username', 'chashnik')
+  $map.setKey('fullname', 'Ilya Chashnik')
+
+  await delay(STORE_UNMOUNT_DELAY)
+  $map.setKey('username', 'malevich')
+  $map.setKey('fullname', 'Kazimir Malevich')
 
   $deepMap.setKey('artists.malevich.movement', 'Suprematism')
-  try {
-    await addArtworks('malevich', [
-      'White on White',
-      'Suprematist Composition',
-      'Black Circle'
-    ])
-  } catch {}
+
+  let artworks = ['White on White', 'Suprematist Composition', 'Black Circle']
+  for (let item of artworks) {
+    await delay(100)
+    let index = $deepMap.get().artists.malevich.artworks.length
+    $deepMap.setKey(`artists.malevich.artworks[${index}]`, item)
+  }
   await delay(STORE_UNMOUNT_DELAY + 10)
 }