@symbo.ls/atoms 2.11.418 → 2.11.423

package/Collection.js

@@ -1,17 +1,18 @@
 'use strict'
 
 import { isState, getChildStateInKey } from '@domql/state'
-import { isString, isNot, isArray, isObject, isObjectLike, deepCloneWithExtend } from '@domql/utils'
+import { isString, isNot, isArray, isObject, isObjectLike, exec, deepCloneWithExtend } from '@domql/utils'
 
 export const Collection = {
   define: {
     $collection: (param, el, state) => {
       const { __ref: ref } = el
       const { children, childrenAs, childrenExtend } = (el.props || {})
-      const hasChildren = isArray(children)
+      const childrenExec = children && exec(children, el, state)
+      const hasChildren = isArray(childrenExec)
 
       if (hasChildren) {
-        param = children
+        param = deepCloneWithExtend(childrenExec)
         if (childrenAs) param = param.map(v => ({ extend: childrenExtend, [childrenAs]: v }))
       } else if (!param) return
 
@@ -79,7 +80,8 @@ export const Collection = {
     },
 
     $stateCollection: (param, el, state, ctx) => {
-      if (!param) return
+      const { children, childrenAs } = (el.props || {})
+      if (!param || children || childrenAs) return
 
       if (isString(param)) {
         if (param === 'state') param = state.parse()
@@ -123,7 +125,8 @@ export const Collection = {
     },
 
     $propsCollection: (param, el, state) => {
-      if (!param) return
+      const { children, childrenAs } = (el.props || {})
+      if (!param || children || childrenAs) return
 
       if (isString(param)) {
         if (param === 'state') param = state.parse()

package/Position.js

@@ -9,6 +9,7 @@ export const Position = {
     position: ({ props }) => props.position && ({ position: props.position }),
     inset: ({ props, deps }) => {
       const { inset } = props
+      if (typeof inset !== 'number') return ({ inset })
       if (typeof inset !== 'string') return
       return { inset: inset.split(' ').map(v => deps.getSpacingByKey(v, 'k').k).join(' ') }
     },

package/Text.js

@@ -74,3 +74,5 @@ export const Footnote = {
 export const B = { tag: 'b' }
 
 export const I = { tag: 'i' }
+
+export const Data = { tag: 'data' }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@symbo.ls/atoms",
-  "version": "2.11.418",
+  "version": "2.11.423",
   "main": "index.js",
   "license": "MIT",
-  "gitHead": "95784936b85d53d4f14104ba7246e347fb2c5b01",
+  "gitHead": "1026d12cce4794bf91324f62f9f8eb4c6e07952a",
   "dependencies": {
     "@domql/state": "latest",
     "@domql/utils": "latest",