boxwood 0.69.1 → 0.70.1

package/index.js

@@ -230,27 +230,21 @@ raw.load = function () {
 }
 
 const tag = (a, b, c) => {
-  if (a && b && c) {
+  if (typeof b === "string" || typeof b === "number" || Array.isArray(b)) {
     const name = a
-    const attributes = b
-    const children = c
+    const children = b
     return {
       name,
-      children,
-      attributes,
+      children: children,
     }
   }
   const name = a
-  const children = b
-  if (SELF_CLOSING_TAGS.includes(name)) {
-    return {
-      name,
-      attributes: children,
-    }
-  }
+  const attributes = b
+  const children = c || []
   return {
     name,
     children,
+    attributes,
   }
 }
 
@@ -285,7 +279,8 @@ function css(inputs) {
 
 css.load = function () {
   const path = join(...arguments)
-  const content = readFileSync(path, "utf8")
+  const file = path.endsWith(".css") ? path : join(path, "index.css")
+  const content = readFileSync(file, "utf8")
   return css`
     ${content}
   `
@@ -309,7 +304,8 @@ function js(inputs) {
 
 js.load = function () {
   const path = join(...arguments)
-  const content = readFileSync(path, "utf8")
+  const file = path.endsWith(".js") ? path : join(path, "index.js")
+  const content = readFileSync(file, "utf8")
   return js`${content}`
 }
 
@@ -456,6 +452,7 @@ function classes() {
 const yaml = {
   load() {
     const path = join(...arguments)
+    const file = path.endsWith(".yaml") ? path : join(path, "index.yaml")
     const content = readFileSync(path, "utf8")
     return YAML.parse(content)
   },
@@ -464,7 +461,8 @@ const yaml = {
 const json = {
   load() {
     const path = join(...arguments)
-    const content = readFileSync(path, "utf8")
+    const file = path.endsWith(".json") ? path : join(path, "index.json")
+    const content = readFileSync(file, "utf8")
     return JSON.parse(content)
   },
 }
@@ -479,18 +477,37 @@ i18n.load = function () {
   const path = join(...arguments)
   const data = path.endsWith(".yaml") ? yaml.load(path) : json.load(path)
   return function translate(language, key) {
-    return data[key][language]
+    if (!language) {
+      throw new Error("TranslationError[method]: language is undefined")
+    }
+    const translation = data[key][language]
+    if (!translation) {
+      throw new Error(
+        `TranslationError[method]: translation for [${key}][${language}] is undefined`
+      )
+    }
+    return translation
   }
 }
 
 function component(fn, { styles, i18n } = {}) {
   function execute(a, b) {
-    if (typeof a === "string" || Array.isArray(a)) {
+    if (typeof a === "string" || typeof a === "number" || Array.isArray(a)) {
       return fn({}, a)
     }
     if (i18n) {
+      const { language } = a
       function translate(key) {
-        return i18n[key][a.language]
+        if (!language) {
+          throw new Error("TranslationError[component]: language is undefined")
+        }
+        const translation = i18n[key][language]
+        if (!translation) {
+          throw new Error(
+            `TranslationError[component]: translation for [${key}][${language}] is undefined`
+          )
+        }
+        return translation
       }
       return fn({ ...a, translate }, b || [])
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "boxwood",
-  "version": "0.69.1",
+  "version": "0.70.1",
   "description": "Compile HTML templates into JS",
   "main": "index.js",
   "scripts": {