mikser-io 6.0.4 → 6.0.6

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "mikser-io",
-	"version": "6.0.4",
+	"version": "6.0.6",
 	"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 --working-folder test"
+		"test": "node --no-warnings app.js --debug --working-folder test"
 	},
 	"bin": {
 		"mikser": "app.js"
@@ -17,18 +17,19 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
+		"@budibase/handlebars-helpers": "^0.14.2",
 		"await-semaphore": "^0.1.3",
 		"axios": "^1.16.0",
 		"chokidar": "^5.0.0",
 		"cli-progress": "^3.12.0",
 		"commander": "^14.0.3",
+		"dayjs": "^1.11.20",
 		"deepdash": "^5.3.9",
 		"escape-string-regexp": "^5.0.0",
 		"execa": "^9.6.1",
 		"front-matter": "^4.0.2",
 		"globby": "^16.2.0",
 		"handlebars": "^4.7.9",
-		"handlebars-helpers": "^0.10.0",
 		"hasha": "^7.0.0",
 		"is-url": "^1.2.4",
 		"knex": "^3.2.10",
@@ -52,6 +53,7 @@
 	},
 	"devDependencies": {
 		"fluent-ffmpeg": "^2.1.3",
+		"mikser-io-render-markdown": "^2.0.0",
 		"sharp": "^0.34.5"
 	},
 	"directories": {

package/src/plugins/layouts.js

@@ -20,6 +20,8 @@ export default ({
     onSync,
     matchEntity,
     changeExtension,
+    findEntity,
+    findEntities,
     constants: { ACTION, OPERATION, TASKS },
 }) => {
     const collection = 'layouts'
@@ -206,20 +208,27 @@ export default ({
                                 break
                             }
                         }
-                        if (!entity.layout && runtime.config.layouts?.autoLayouts && entity.name) {
-                            const nameChunks = entity.name.split('.')
-                            if (nameChunks?.length) {
-                                for (let index = 0; index < nameChunks.length; index++) {
-                                    const autoLayout = [
-                                        path.basename(entity.name).split('.').slice(index).join('.'),
-                                        path.basename(entity.id)
-                                    ]
-                                        .find(layout => layouts[layout])
-                                    if (autoLayout) {
-                                        entity.layout = layouts[autoLayout]
-                                        break
-                                    }
-                                }
+                        if (!entity.layout && runtime.config.layouts?.autoLayouts && entity.id) {
+                            const lookupBase = entity.id.replace(`/${entity.collection}/`,'')
+                            const dir = path.dirname(lookupBase)
+                            const base = path.basename(lookupBase)
+                            const chunks = base.split('.')
+                            const candidates = []
+
+                            // Peel trailing chunks within the entity's directory only.
+                            // "nginx.conf" (dir=".") -> ["nginx.conf", "nginx"]
+                            // "styles/post.css" (dir="styles") -> ["styles/post.css", "styles/post"]
+                            for (let i = chunks.length; i > 0; i--) {
+                                const head = chunks.slice(0, i).join('.')
+                                candidates.push(dir && dir !== '.' ? path.join(dir, head) : head)
+                            }
+
+                            const autoLayout = candidates.find(name => layouts[name])
+                            if (autoLayout) {
+                                entity.layout = layouts[autoLayout]
+                                logger.debug('Auto layout matched %s -> %s for %s', entity.name, autoLayout, entity.id)
+                            } else {
+                                logger.trace('Auto layout no match for %s tried: %s', entity.id, candidates.join(', '))
                             }
                         }
                     } else {
@@ -250,6 +259,7 @@ export default ({
     })
 
     onBeforeRender(async (signal) => {
+        const logger = useLogger()
         const tasks = []
         const entities = Array.from(getSitemapEntities())
             .filter(entity => entity.layout)
@@ -268,7 +278,7 @@ export default ({
             try {
                 var { load, plugins = [] } = await import(`${path.join(runtime.options.layoutsFolder, entity.layout.name)}.js?stamp=${Date.now()}`)
                 if (load) {
-                    data = await load(entity, signal)
+                    data = await load({ entity, findEntity, findEntities, runtime, signal })            
                 }
             } catch (err) {
                 if (err.code != 'ERR_MODULE_NOT_FOUND') throw err

package/src/plugins/render/hbs.js

@@ -1,5 +1,6 @@
 import handlebars from 'handlebars'
-import helpers from 'handlebars-helpers'
+import helpers from '@budibase/handlebars-helpers'
+import dayjs from 'dayjs'
 import { readFile } from 'fs/promises'
 
 export function load({ config, runtime, context }) {
@@ -8,8 +9,6 @@ export function load({ config, runtime, context }) {
         'collection',
         'object',
         'comparison',
-        'date',
-        'markdown',
         'match',
         'math',
         'number',
@@ -23,6 +22,12 @@ export function load({ config, runtime, context }) {
             handlebars.registerPartial(partial, partialLayout)
         }
     }
+    handlebars.registerHelper('date', (date, format) => {
+        if (!date) return ''
+        if (typeof format !== 'string') format = 'YYYY-MM-DD'
+        return dayjs(date).format(format)
+    })
+
     handlebars.registerHelper('url', function(obj, options) {
         // Called as {{url}} with no args — obj is the Handlebars options object,
         // so read url from the current context (this)

package/src/plugins.js

@@ -3,17 +3,25 @@ import { onLoad } from './lifecycle.js'
 import runtime from './runtime.js'
 import path from 'node:path'
 import fs from 'fs'
+import { createRequire } from 'node:module'
 
 import * as core from '../index.js'
 
 export async function loadPlugin(pluginName) {
     const logger = useLogger()
 
+    const require = createRequire(path.join(runtime.options.workingFolder, 'package.json'))
+    let nodeModulesResolved
+    try {
+        nodeModulesResolved = require.resolve(`mikser-io-${pluginName}`)
+    } catch { }
+
     const resolveLocations = [
         path.join(path.dirname(import.meta.url), 'plugins', `${pluginName}.js`),
         path.join(runtime.options.workingFolder, 'plugins', `${pluginName}.js`),
         path.join(runtime.options.workingFolder, 'node_modules', `mikser-io-${pluginName}`, 'index.js'),
-    ]
+        nodeModulesResolved,
+    ].filter(Boolean)
     for (let index = 0; index < resolveLocations.length; index++) {
         const resolveLocation = resolveLocations[index]
         if (fs.existsSync(resolveLocation.replace('file:', ''))) {

package/src/render.js

@@ -1,4 +1,5 @@
 import { readFileSync } from 'node:fs'
+import { createRequire } from 'node:module'
 import path from 'node:path'
 import _ from 'lodash'
 
@@ -22,11 +23,18 @@ export default async ({ entity, options, config, context, state, logger, port })
     }
 
     async function loadPlugin(pluginName) {
+        const require = createRequire(path.join(options.workingFolder, 'package.json'))
+        let nodeModulesResolved
+        try {
+            nodeModulesResolved = require.resolve(`mikser-io-${pluginName}`)
+        } catch { }
+
         const resolveLocations = [
             path.join(options.workingFolder, 'node_modules', `mikser-io-${pluginName}/index.js`),
+            nodeModulesResolved,
             path.join(options.workingFolder, 'plugins', `${pluginName}.js`),
             path.join(path.dirname(import.meta.url), 'plugins', 'render', `${pluginName.replace('render-', '')}.js`)
-        ]
+        ].filter(Boolean)
         for (let resolveLocation of resolveLocations) {
             try {
                 return await import(resolveLocation)