coralite 0.6.8 → 0.7.0

package/changelog.md

@@ -1,3 +1,34 @@
+# 🎁 Release notes (`v0.7.0`)
+
+## Changes
+- d7b183d (HEAD -> main, tag: v0.7.0, origin/main) fix: use type helper to confirm child is a node - (*Thomas David*)
+- b574569 feat: check if slot is a node - (*Thomas David*)
+- de05e38 feat: type helper functions - (*Thomas David*)
+- 24f3935 test: cover nested components attributes - (*Thomas David*)
+- 8dc8f5d fix: apply nested custom component attribute values - (*Thomas David*)
+- 3fa3eb5 chore: version bump - (*Thomas David*)
+
+## Metadata
+```
+This version -------- v0.7.0
+Previous version ---- v0.6.9
+Total commits ------- 6
+```
+# 🎁 Release notes (`v0.6.9`)
+
+## Changes
+- e79d7c9 (HEAD -> main, tag: v0.6.9, origin/main) fix: aggregation limit is offset by offset - (*[Thomas David](https://codeberg.org/tjdavid)*)
+- 6f8253f test: cover nested document root components - (*[Thomas David](https://codeberg.org/tjdavid)*)
+- 77d0e36 feat: create nested custom elements on  document root - (*[Thomas David](https://codeberg.org/tjdavid)*)
+- 2c176e5 chore: update changelog - (*[Thomas David](https://codeberg.org/tjdavid)*)
+- f5a3639 chore: version bump - (*[Thomas David](https://codeberg.org/tjdavid)*)
+
+## Metadata
+```
+This version -------- v0.6.9
+Previous version ---- v0.6.8
+Total commits ------- 5
+```
 # 🎁 Release notes (`v0.6.8`)
 
 ## Changes

package/lib/html-module.js

@@ -62,18 +62,23 @@ export async function aggregate (options, values, components, document) {
   let startIndex = 0
   let endIndex = pages.length
 
-  if (options.limit && options.limit < pages.length) {
-    endIndex = options.limit
-  }
-
   if (options.offset) {
     if (options.offset > endIndex) {
-      startIndex = endIndex - 1
+      startIndex = endIndex
     } else {
       startIndex = options.offset
     }
   }
 
+  if (options.limit) {
+    const limit = options.limit + startIndex
+
+    if (limit < endIndex) {
+      endIndex = limit
+    }
+  }
+
+
   for (let i = startIndex; i < endIndex; i++) {
     const page = pages[i]
     const meta = parseHTMLMeta(page.content)

package/lib/parse.js

@@ -3,6 +3,8 @@ import { aggregate } from './html-module.js'
 import vm from 'node:vm'
 import { invalidCustomTags, validTags } from './tags.js'
 import { join } from 'path'
+import { isCoraliteComment, isCoraliteElement, isCoraliteTextNode } from './type-helper.js'
+
 /**
  * @import {Module} from 'node:vm'
  * @import {
@@ -567,7 +569,8 @@ export async function createComponent ({
           node
         }
 
-        if (node.attribs && node.attribs.slot) {
+        if (isCoraliteElement(node)) {
+          // @ts-ignore
           slotElement.name = node.attribs.slot
         }
 
@@ -576,10 +579,8 @@ export async function createComponent ({
     }
 
     // append custom attributes to values
-    for (const key in customElement.attribs) {
-      if (!values.hasOwnProperty(key)) {
-        values[key] = customElement.attribs[key]
-      }
+    if (customElement.attribs) {
+      values = Object.assign(values, customElement.attribs)
     }
 
     const component = await createComponent({
@@ -643,6 +644,27 @@ export async function createComponent ({
       if (!slotNodes.length) {
         // set default content
         slotNodes = slot.element.children || []
+      } else {
+        const startIndex = slotNodes.length - 1
+
+        for (let i = startIndex; i > -1; i--) {
+          const node = slotNodes[i]
+          const component = components[node.name]
+
+          if (component) {
+            const component = await createComponent({
+              id: node.name,
+              values,
+              element: node,
+              components,
+              document
+            })
+
+            if (component) {
+              slotNodes.splice(i, 1, ...component.children)
+            }
+          }
+        }
       }
 
       // replace slot element with content
@@ -780,11 +802,23 @@ export async function parseScript ({
                 })
               } else if (Array.isArray(result)) {
                 for (let index = 0; index < result.length; index++) {
-                  /** @TODO create a node checker to verify */
-                  elementSlots.push({
-                    name,
-                    node: result[index]
-                  })
+                  const node = result[index]
+
+                  if (
+                    isCoraliteElement(node)
+                    || isCoraliteTextNode(node)
+                    || isCoraliteComment(node)
+                  ) {
+                    elementSlots.push({
+                      name,
+                      node: result[index]
+                    })
+                  } else {
+                    throw new Error('Unexpected slot value, expected a node but found: '
+                      + '\n result: ' + JSON.stringify(node)
+                      + '\n component: "' + component.id + '"'
+                      + '\n path: "' + join(document.parentPath, document.name) +'"')
+                  }
                 }
               }
 

package/lib/type-helper.js

@@ -0,0 +1,42 @@
+/**
+ * Check if value is an object
+ * @param {Object} obj - The object to check
+ */
+function isObject (obj) {
+  return typeof obj === 'object' && obj !== null
+}
+
+/**
+ * Checks if an object is a CoraliteElement.
+ * @param {Object} obj - The object to check.
+ * @returns {boolean} True if the object is a CoraliteElement, false otherwise.
+ */
+function isCoraliteElement (obj) {
+  return isObject(obj) && obj.type === 'tag'
+}
+
+/**
+* Checks if an object is a CoraliteTextNode.
+* @param {Object} obj - The object to check.
+* @returns {boolean} True if the object is a CoraliteTextNode, false otherwise.
+*/
+function isCoraliteTextNode (obj) {
+  return isObject(obj) && obj.type === 'text'
+}
+
+/**
+* Checks if an object is a CoraliteComment.
+* @param {Object} obj - The object to check.
+* @returns {boolean} True if the object is a CoraliteComment, false otherwise.
+*/
+function isCoraliteComment (obj) {
+  return isObject(obj) && obj.type === 'comment'
+}
+
+
+// Export the functions (if using modules) - important for reusability
+export {
+  isCoraliteElement,
+  isCoraliteTextNode,
+  isCoraliteComment
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coralite",
-  "version": "0.6.8",
+  "version": "0.7.0",
   "description": "HTML modules static site generator",
   "main": "./lib/coralite.js",
   "type": "module",