cellery 1.4.0 → 1.4.2

package/index.d.ts

@@ -121,7 +121,6 @@ declare module 'cellery' {
     _render(): this
     render(opts?: Record<string, any>): void
     destroy(): void
-    register(cellery: Cellery): void // lunte-disable-line
   }
 
   export interface ContainerOptions extends CellOptions {

package/lib/cellery.js

@@ -8,7 +8,6 @@ class Cellery extends Iambus {
     this.adapter = adapter
 
     Cell.cellery = this
-    this.app.register(this)
   }
 
   // TODO: pipe compat...

package/lib/cells.js

@@ -13,6 +13,7 @@ class Cell {
     this.size = opts.size
     this.events = opts.events
     this.style = opts.style
+    this.class = opts.class
 
     this._eventsRegistered = false
   }
@@ -67,26 +68,11 @@ class Cell {
       destroy: true
     })
   }
-
-  // @deprecated
-  register(cellery) {}
 }
 
 class Style {
   constructor(opts = {}) {
     this.content = parse(opts.children?.join('\n'))
-
-    // setup data-cellery-cell for namespaced matching
-    const cellNames = new Set(Object.keys(opts.cells))
-
-    walk(this.content, {
-      visit: 'TypeSelector',
-      enter(node) {
-        if (cellNames.has(node.name)) {
-          node.name = `[data-cellery-cell="${node.name}"]`
-        }
-      }
-    })
   }
 
   findPropertyOfCell(name, property) {
@@ -113,14 +99,11 @@ class Style {
     return value
   }
 
-  addScope(target, parent) {
+  addScope(parent) {
     walk(this.content, {
       visit: 'Rule',
       enter(rule) {
         rule.prelude.children.forEach((selector) => {
-          const str = generate(selector)
-          if (!str.startsWith(target)) return
-
           selector.children.prependData({ type: 'Combinator', name: ' ' })
           selector.children.prependData({ type: 'IdSelector', name: parent })
         })
@@ -173,11 +156,27 @@ class Input extends Cell {
   }
 }
 
+class Detail extends Cell {
+  constructor(opts = {}) {
+    super(opts)
+    this.value = opts.value || this.children.filter((c) => typeof c === 'string').join('') || ''
+  }
+}
+
+class Summary extends Cell {
+  constructor(opts = {}) {
+    super(opts)
+    this.value = opts.value || this.children.filter((c) => typeof c === 'string').join('') || ''
+  }
+}
+
 module.exports = {
   Cell,
   Container,
   Fragment,
   Text,
   Input,
+  Detail,
+  Summary,
   Style
 }

package/lib/compat.js

@@ -1,4 +1,4 @@
-const { Text, Input, Container, Fragment, Style } = require('./cells')
+const { Text, Input, Container, Fragment, Style, Detail, Summary } = require('./cells')
 
 module.exports = {
   '': Fragment,
@@ -12,7 +12,9 @@ module.exports = {
   input: Input.Styled({ multiline: false }),
   textbox: Input.Styled({ multiline: true }),
   span: Text,
-  button: Text.Styled({ events: ['click'] }),
+  button: Container.Styled({ events: ['click'] }),
   p: Text.Styled({ paragraph: true }),
+  detail: Detail,
+  summary: Summary,
   style: Style
 }

package/lib/template.js

@@ -1,17 +1,11 @@
-const { Cell, Container, Fragment, Text, Paragraph, Input, Style } = require('./cells')
+const cells = require('./cells')
 const compat = require('./compat')
 
 const SENTINEL = '\x00'
 
 const registry = {
   ...compat,
-  Cell,
-  Container,
-  Fragment,
-  Text,
-  Paragraph,
-  Input,
-  Style
+  ...cells
 }
 
 function register(cells) {
@@ -178,9 +172,12 @@ function build(node, slots) {
 
   let style = null
   const children = node.children
-    .map((c) => build(c, slots))
+    .flatMap((c) => {
+      const built = build(c, slots)
+      return Array.isArray(built) ? built : [built]
+    })
     .filter((c) => {
-      if (c instanceof Style) {
+      if (c instanceof cells.Style) {
         style = c
         return false
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cellery",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "cellery",
   "exports": {
     "./package": "./package.json",