mikser-io 6.3.0 → 6.4.1

package/package.json

@@ -1,10 +1,13 @@
 {
 	"name": "mikser-io",
-	"version": "6.3.0",
+	"version": "6.4.1",
 	"description": "<p align=\"center\">   <img src=\"mikser-lockup-stacked.svg\" alt=\"mikser\" width=\"198\" /> </p>",
 	"main": "index.js",
 	"scripts": {
-		"test": "node --no-warnings app.js --debug --working-folder test"
+		"debug": "node --no-warnings app.js --debug --working-folder test/fixture",
+		"test:unit": "node --test --test-reporter=spec 'test/unit/**/*.test.js'",
+		"test:smoke": "node --no-warnings app.js --working-folder test/fixture",
+		"test": "npm run test:unit && npm run test:smoke"
 	},
 	"bin": {
 		"mikser": "app.js"

package/src/plugins/layouts.js

@@ -21,6 +21,7 @@ export default ({
     onSync,
     matchEntity,
     changeExtension,
+    getFormatInfo,
     findEntity,
     findEntities,
     constants: { ACTION, OPERATION, TASKS },
@@ -28,15 +29,6 @@ export default ({
     const collection = 'layouts'
     const type = 'layout'
 
-    function getFormatInfo(relativePath) {
-        const template = path.extname(relativePath).substring(1).toLowerCase()
-        const withoutTemplate = relativePath.replace(path.extname(relativePath), '')
-        const formatExt = path.extname(withoutTemplate).substring(1).toLowerCase()
-        const [format, postprocessor] = formatExt.split('-')
-        const name = formatExt ? withoutTemplate.replace(path.extname(withoutTemplate), '') : withoutTemplate
-        return { name, format: format || 'html', template, postprocessor }
-    }
-
     function addToSitemap(entity) {
         const logger = useLogger()
         const { sitemap } = runtime.state.layouts

package/src/plugins/rest.js

@@ -36,7 +36,7 @@ export default ({
             try {
                 const { page: rawPage, limit: rawLimit, ...filter } = req.query
                 const page = Math.max(1, parseInt(rawPage) || 1)
-                const limit = Math.min(100, Math.max(1, parseInt(rawLimit) || runtime.config.rest?.pageSize ?? 10))
+                const limit = Math.min(100, Math.max(1, parseInt(rawLimit) || (runtime.config.rest?.pageSize ?? 10)))
                 const query = Object.keys(filter).length ? filter : undefined
 
                 const all = await findEntities(query)

package/src/plugins/validator.js

@@ -10,7 +10,7 @@ export default ({
     onLoad(() => {
         for (let { match, validate, operations = [OPERATION.CREATE, OPERATION.UPDATE] } of runtime.config.validator?.validators || []) {
             onValidate(operations, async entry => {
-                if (entity.meta && matchEntity(entry.entity, match)) {
+                if (entry.entity?.meta && matchEntity(entry.entity, match)) {
                     return await validate(entry.entity)
                 }
             })

package/src/plugins.js

@@ -51,7 +51,7 @@ export async function loadPlugin(pluginName) {
             }
         }
     }
-    logger.error('Plugin %s not found. Searched: %s', pluginName, resolveLocations.join(', '))
+    logger.error('Plugin %s not found.', pluginName)
 }
 
 onLoad(async () => {

package/src/postprocess.js

@@ -36,7 +36,7 @@ export async function loadPlugin(pluginName, workingFolder) {
         }
     }
 
-    logger?.error('Postprocess plugin %s not found. Searched: %s', pluginName, resolveLocations.join(', '))
+    logger?.error('Postprocess plugin %s not found.', pluginName)
 }
 
 export default async ({ entity, options, config, context, state, logger }) => {

package/src/render.js

@@ -3,24 +3,7 @@ import { createRequire } from 'node:module'
 import path from 'node:path'
 import _ from 'lodash'
 import { useLogger } from './engine.js'
-
-// Flatten template-helper args into a single human-readable message.
-// Handlebars helpers receive a trailing options object (it has a `.hash`
-// property) which we drop.
-function formatLogArgs(args) {
-    if (args.length && typeof args[args.length - 1] === 'object' && args[args.length - 1] !== null && 'hash' in args[args.length - 1]) {
-        args = args.slice(0, -1)
-    }
-    return args
-        .map(arg => {
-            if (arg == null) return String(arg)
-            if (typeof arg === 'object') {
-                try { return JSON.stringify(arg) } catch { return String(arg) }
-            }
-            return String(arg)
-        })
-        .join(' ')
-}
+import { formatLogArgs } from './utils.js'
 
 export default async ({ entity, options, config, context, state, logger, port }) => {
     logger = logger || {
@@ -73,7 +56,7 @@ export default async ({ entity, options, config, context, state, logger, port })
             }
         }
 
-        logger.error('Render plugin %s not found. Searched: %s', pluginName, resolveLocations.join(', '))
+        logger.error('Render plugin %s not found.', pluginName)
     }
 
     const { renderer } = options

package/src/utils.js

@@ -1,4 +1,4 @@
-import { hashFile, hashingStream } from 'hasha'
+import { hashFile, hash } from 'hasha'
 import { stat } from 'node:fs/promises'
 import TruncateStream from 'truncate-stream'
 import { createReadStream } from 'node:fs'
@@ -23,7 +23,7 @@ export async function checksum(uri) {
         const truncate = new TruncateStream({ maxBytes })
         const fileStream = createReadStream(uri)
         fileStream.pipe(truncate)
-        const checksum = size.toString() + ':' + await hashingStream(truncate, { algorithm: 'md5' })
+        const checksum = size.toString() + ':' + await hash(truncate, { algorithm: 'md5' })
         return checksum
     }
 }
@@ -48,7 +48,7 @@ export function matchEntity(entity, match) {
     if (!match) return false
     if (typeof match == 'function') return match(entity)
     else if (typeof match == 'string') {
-        if (match.substring(0, 1) == '@/') {
+        if (match.substring(0, 2) == '@/') {
             return minimatch(entity.name, match.substring(2))
         } else {
             return minimatch(entity.id, match)
@@ -64,6 +64,43 @@ export function changeExtension(file, format) {
     return result
 }
 
+// Decode a layout filename into its parts. `template` is the outer
+// extension (the renderer); `format` is the output format encoded as a
+// second extension (defaults to 'html'); `postprocessor`, if present,
+// is everything after the `-` in the format segment.
+//
+// Examples:
+//   foo.hbs                 -> { name:'foo',  format:'html', template:'hbs',  postprocessor:undefined }
+//   page.css.hbs            -> { name:'page', format:'css',  template:'hbs',  postprocessor:undefined }
+//   report.html-pdf.hbs     -> { name:'report', format:'html', template:'hbs', postprocessor:'pdf' }
+//   welcome.html-mjml.liquid-> { name:'welcome', format:'html', template:'liquid', postprocessor:'mjml' }
+export function getFormatInfo(relativePath) {
+    const template = path.extname(relativePath).substring(1).toLowerCase()
+    const withoutTemplate = relativePath.replace(path.extname(relativePath), '')
+    const formatExt = path.extname(withoutTemplate).substring(1).toLowerCase()
+    const [format, postprocessor] = formatExt.split('-')
+    const name = formatExt ? withoutTemplate.replace(path.extname(withoutTemplate), '') : withoutTemplate
+    return { name, format: format || 'html', template, postprocessor }
+}
+
+// Flatten template-helper args into a single human-readable message.
+// Handlebars helpers receive a trailing options object (it has a `.hash`
+// property) which we drop. Liquid filters and Eta calls don't.
+export function formatLogArgs(args) {
+    if (args.length && typeof args[args.length - 1] === 'object' && args[args.length - 1] !== null && 'hash' in args[args.length - 1]) {
+        args = args.slice(0, -1)
+    }
+    return args
+        .map(arg => {
+            if (arg == null) return String(arg)
+            if (typeof arg === 'object') {
+                try { return JSON.stringify(arg) } catch { return String(arg) }
+            }
+            return String(arg)
+        })
+        .join(' ')
+}
+
 // Build a compact "[layouts/foo.hbs:12:4]" suffix from whatever the
 // underlying template engine attached to its thrown error. Renderer
 // plugins are expected to set `err.layoutUri` (and optionally `err.line` /