@slybridges/kiss 0.9.4 → 0.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slybridges/kiss",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Keep It Simple and Static site generator",
   "main": "src/index.js",
   "bin": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "browser-sync": "^3.0.4",
     "chalk": "^4.1.2",
-    "cheerio": "^1.0.0",
+    "cheerio": "^1.1.0",
     "chokidar": "^3.6.0",
     "date-fns": "^4.1.0",
     "fast-glob": "^3.3.3",
@@ -23,17 +23,17 @@
     "lodash": "^4.17.21",
     "marked": "^12.0.2",
     "nunjucks": "^3.2.4",
-    "sharp": "^0.34.1",
+    "sharp": "^0.34.2",
     "slugify": "^1.6.6",
     "xml": "^1.0.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@eslint/js": "^9.26.0",
-    "eslint": "^9.26.0",
-    "eslint-config-prettier": "^10.1.2",
+    "@eslint/js": "^9.30.1",
+    "eslint": "^9.30.1",
+    "eslint-config-prettier": "^10.1.5",
     "globals": "^15.15.0",
-    "prettier": "^3.5.3"
+    "prettier": "^3.6.2"
   },
   "repository": {
     "type": "git",

package/src/helpers.js

@@ -3,16 +3,12 @@ const fs = require("fs")
 const path = require("path")
 
 // @ attribute format: @<attribute>:<value><terminator>
-// terminators: space, comma, newline, end of string, ', ",<, >, ), ], }, #
-// Regex must have global flag for matchAll to work correctly
+// terminators: space, comma, newline, end of string, ', ",<, >, ), ], }, #, \
 const AT_GENERIC_ATTRIBUTE_REGEX =
-  /@([a-zA-Z0-9-_]+):([^,\s\n\]'"<>)}#]+)(?=[,\s\n\]'"<>)}#]|$)/g
+  /@([\w-]+):([^,\s\]'"<>\\)}#]+)(?=[,\s\]'"<>\\)}#]|$)/g
 
 const AT_FILE_ATTRIBUTE_REGEX =
-  /@file:([^,\s\n\]'"<>)}#]+)(?=[,\s\n\]'"<>)}#]|$)/g
-
-// Indexed cached version of collections for faster lookups
-const collectionsCache = new Map()
+  /@file:([^,\s\]'"<>\\)}#]+)(?=[,\s\]'"<>\\)}#]|$)/g
 
 const computePageId = (inputPath, config) => {
   const imputPathObject = path.parse(inputPath)
@@ -37,36 +33,15 @@ const computeParentId = (inputPath, config) => {
   return computePageId(parentPath, config)
 }
 
-// Optimized findCollectionById with caching
 const findCollectionById = (collections, id) => {
   if (id === ".") {
     return collections
   }
-
-  // Quick cache lookup by ID
-  const cacheKey = typeof id === "string" ? id : JSON.stringify(id)
-  if (collectionsCache.has(cacheKey)) {
-    return collectionsCache.get(cacheKey)
-  }
-
   const flatCollections = flattenObjects(
     collections,
     (v) => v._type === "collection",
   )
-
-  const result = flatCollections.find((collection) => collection._id === id)
-
-  // Cache the result for future lookups
-  if (result) {
-    collectionsCache.set(cacheKey, result)
-  }
-
-  return result
-}
-
-// Clear the collections cache - should be called when collections are modified
-const clearCollectionsCache = () => {
-  collectionsCache.clear()
+  return flatCollections.find((collection) => collection._id === id)
 }
 
 const flattenObjects = (obj, predicate) => {
@@ -402,7 +377,6 @@ module.exports = {
   relativeToAbsoluteAttributes,
   sortPageIds,
   sortPages,
-  clearCollectionsCache,
 }
 
 /** private **/

package/src/transforms/atAttributesContentTransform.js

@@ -3,19 +3,7 @@ const path = require("path")
 
 const { AT_GENERIC_ATTRIBUTE_REGEX } = require("../helpers")
 
-// Memoization cache for attribute resolution
-const memoCache = new Map()
-
-// Cache key generator for memoization
-const getCacheKey = (attribute, value, pageId) =>
-  `${pageId}:${attribute}:${value}`
-
 const atAttributesContentTransform = (page, options, config, context) => {
-  // Clear the cache if this is a full build (not incremental)
-  if (!options.incremental) {
-    memoCache.clear()
-  }
-
   // we need to go though all the keys in the page
   // that will be expensive, but YOLO
   for (const objKey in page) {
@@ -45,6 +33,7 @@ const transformAtAttributesInObjValue = (
   config,
   context,
 ) => {
+  let match
   const resolvers = [
     { key: "data", handler: dataAttributeResolver },
     { key: "file", handler: fileAttributeResolver, pageAttribute: "permalink" },
@@ -55,35 +44,8 @@ const transformAtAttributesInObjValue = (
       pageAttribute: "permalink",
     },
   ]
-
   if (typeof objValue === "object") {
-    // Process object values in parallel via Promise.all for nested objects
-    if (Array.isArray(objValue) && objValue.length > 10) {
-      // For large arrays, process in parallel
-      const promises = objValue.map(async (item, index) => {
-        if (typeof item === "string") {
-          return transformAtAttributesInObjValue(
-            `${objKey}[${index}]`,
-            item,
-            page,
-            config,
-            context,
-          )
-        }
-        return item
-      })
-
-      // This is non-blocking but will still return the result immediately
-      // since we're not awaiting the Promise.all
-      Promise.all(promises).then((results) => {
-        results.forEach((result, index) => {
-          objValue[index] = result
-        })
-      })
-      return objValue
-    }
-
-    // For regular objects or small arrays, process sequentially
+    // we need to go though all the keys in the object
     for (const key in objValue) {
       if (typeof objValue[key] === "string") {
         let newValue = transformAtAttributesInObjValue(
@@ -94,49 +56,29 @@ const transformAtAttributesInObjValue = (
           context,
         )
         objValue[key] = newValue
-      } else if (typeof objValue[key] === "object") {
-        objValue[key] = transformAtAttributesInObjValue(
-          key,
-          objValue[key],
-          page,
-          config,
-          context,
-        )
       }
     }
     return objValue
   }
-
   if (typeof objValue !== "string") {
     return objValue
   }
-
-  // Quick check to avoid regex processing if there's no @ symbol
-  if (!objValue.includes("@")) {
-    return objValue
-  }
-
-  // Use matchAll with the global regex (now fixed in helpers.js)
-  const matches = Array.from(objValue.matchAll(AT_GENERIC_ATTRIBUTE_REGEX))
-  if (matches.length === 0) {
-    return objValue
-  }
-
-  // Create a map of attributes to avoid duplicates
+  // we cannot search and replace things as we go, as some attributes may overlap others (e.g. @id:home and @id:home:fr)
+  // so first, we are going to find all the attributes
   let allAttributes = {}
-  for (const match of matches) {
-    const [fullMatch, attribute, value] = match
+  while ((match = AT_GENERIC_ATTRIBUTE_REGEX.exec(objValue))) {
+    let [fullMatch, attribute, value] = match
+    // using an object to deduplicate attributes
     allAttributes[fullMatch] = { attribute, fullMatch, value }
   }
-
-  // Sort attributes by length to replace longest first
+  // we sort attributes by their fullMatch length to make sure we replace the longest first
+  // this is important to make sure we don't replace a shorter attribute that is part of a longer one
   const sortedAttributes = Object.values(allAttributes).sort(
     (a, b) => b.fullMatch.length - a.fullMatch.length,
   )
-
-  // Process the attributes
+  // now we can go through all the attributes and resolve them
   for (const { attribute, fullMatch, value } of sortedAttributes) {
-    // Find the resolver
+    // find the resolver
     const resolver = resolvers.find((r) => r.key === attribute)
     if (!resolver) {
       global.logger.error(
@@ -144,25 +86,12 @@ const transformAtAttributesInObjValue = (
       )
       continue
     }
-
-    // Check memoization cache
-    const cacheKey = getCacheKey(attribute, value, page._meta.id)
-    let result, error
-
-    if (memoCache.has(cacheKey)) {
-      ;[result, error] = memoCache.get(cacheKey)
-    } else {
-      ;[result, error] = resolver.handler(value, page, config, context)
-      // Cache the result
-      memoCache.set(cacheKey, [result, error])
-    }
-
+    const [result, error] = resolver.handler(value, page, config, context)
     if (error) {
       global.logger.error(`Page '${page._meta.id}' in '${objKey}': ${error}`)
       objValue = objValue.replaceAll(fullMatch, value)
       continue
     }
-
     if (resolver.pageAttribute) {
       // result is a page
       // first we check if the page is excluded from write

package/src/transforms/nunjucksContentTransform.js

@@ -1,47 +1,19 @@
 const { findCollectionById } = require("../helpers.js")
 
-// Template context cache for memoization
-const templateContextCache = new Map()
-
-// Cache key generator for memoization
-const getContextCacheKey = (pageId, collectionId) =>
-  `${pageId}:${collectionId || "no-collection"}`
-
 const nunjucksContentTransform = (page, options, config, context) => {
-  // Clear the cache if this is a full build (not incremental)
-  if (!options.incremental) {
-    templateContextCache.clear()
-  }
-
-  let templateContext
-  const cacheKey = getContextCacheKey(
-    page._meta.id,
-    page._meta.isCollection ? page._meta.id : null,
-  )
-
-  // Check if we have a cached context
-  if (templateContextCache.has(cacheKey)) {
-    templateContext = templateContextCache.get(cacheKey)
+  let templateContext = {}
+  if (page._meta.isCollection) {
+    templateContext = {
+      ...context,
+      collection: findCollectionById(context.collections, page._meta.id),
+      ...page,
+    }
   } else {
-    // Create template context based on whether this is a collection or not
-    if (page._meta.isCollection) {
-      templateContext = {
-        ...context,
-        collection: findCollectionById(context.collections, page._meta.id),
-        ...page,
-      }
-    } else {
-      templateContext = {
-        ...context,
-        ...page,
-      }
+    templateContext = {
+      ...context,
+      ...page,
     }
-
-    // Cache the template context for future use
-    templateContextCache.set(cacheKey, templateContext)
   }
-
-  // Render the page using Nunjucks
   page._html = config.libs.nunjucks.render(page.layout, templateContext)
   return page
 }