mikel 0.37.0 → 0.38.1

package/index.d.ts

@@ -12,7 +12,7 @@ export type MikelHelper = (params: {
     fn: MikelHelperCallback;
 }) => string;
 
-export type MikelPartial = {
+export type MikelPartial = string | {
     body: string;
     data: Record<string, any>;
 };
@@ -26,9 +26,11 @@ export type MikelFunction = (params: {
 
 export type MikelState = Record<string, string>;
 
+export type MikelTransform = (content: string) => string;
+
 export type MikelOptions = {
     helpers?: Record<string, MikelHelper>;
-    partials?: Record<string, string | MikelPartial>;
+    partials?: Record<string, MikelPartial>;
     functions?: Record<string, MikelFunction>;
 };
 
@@ -41,6 +43,8 @@ export type MikelContext = {
     functions: Record<string, MikelFunction>;
     partials: Record<string, MikelPartial>;
     initialState: MikelState;
+    preTransforms: MikelTransform[];
+    postTransforms: MikelTransform[];
 };
 
 export type MikelPlugin = (ctx: MikelContext) => void;
@@ -52,7 +56,7 @@ export type Mikel = {
     removeHelper(name: string): void;
     addFunction(name: string, fn: MikelFunction): void;
     removeFunction(name: string): void;
-    addPartial(name: string, partial: string | MikelPartial): void;
+    addPartial(name: string, partial: MikelPartial): void;
     removePartial(name: string): void;
 };
 

package/index.js

@@ -29,8 +29,8 @@ const untokenize = (ts = [], s = "{{", e = "}}") => {
 // @description tokenize args
 const tokenizeArgs = (str = "", tokens = [], strings = []) => {
     let current = "", depth = 0;
-    // 1. replace strings
-    str = str.replace(/"([^"\\]|\\.)*"/g, (match) => {
+    // 1. replace strings in single/double quotes
+    str = str.replace(/("([^"\\]|\\.)*"|'([^'\\]|\\.)*')/g, (match) => {
         const id = `__STR${strings.length}__`;
         strings.push(match);
         return id;
@@ -100,8 +100,9 @@ const parse = (v, data = {}, state = {}, fns = {}) => {
     if (v.startsWith("(") && v.endsWith(")")) {
         return evaluateExpression(v.slice(1, -1).trim(), data, state, fns);
     }
-    if ((v.startsWith(`"`) && v.endsWith(`"`)) || /^-?\d+\.?\d*$/.test(v) || v === "true" || v === "false" || v === "null") {
-        return JSON.parse(v);
+    if ((v.startsWith(`"`) && v.endsWith(`"`)) || (v.startsWith(`'`) && v.endsWith(`'`)) || /^-?\d+\.?\d*$/.test(v) || v === "true" || v === "false" || v === "null") {
+        const normalized = (v.startsWith(`'`) && v.endsWith(`'`)) ? `"${v.slice(1, -1).replace(/"/g, '\\"')}"` : v;
+        return JSON.parse(normalized);
     }
     return (v || "").startsWith("@") ? get(state, v.slice(1)) : get(data, v || ".");
 };
@@ -134,6 +135,7 @@ const compile = (ctx, tokens, output, data, state, index = 0, section = "") => {
             const j = i + 1;
             i = findClosingToken(tokens, j, t);
             output.push(ctx.helpers[t]({
+                context: ctx,
                 args: args,
                 options: opt,
                 tokens: tokens.slice(j, i),
@@ -279,12 +281,14 @@ const create = (options = {}) => {
         partials: Object.assign({}, options?.partials || {}),
         functions: Object.assign({}, options?.functions || {}),
         initialState: {}, // Object.assign({}, options?.initialState || {}),
+        preTransforms: [], // list of pre-transform to apply to the template
+        postTransforms: [], // list of post-transforms to apply to the result
     });
     // entry method to compile the template with the provided data object
     const compileTemplate = (template, data = {}) => {
-        const output = [];
-        compile(ctx, tokenize(template), output, data, { ...ctx.initialState, root: data }, 0, "");
-        return output.join("");
+        const output = [], input = ctx.preTransforms.reduce((content, fn) => fn(content), template);
+        compile(ctx, tokenize(input), output, data, { ...ctx.initialState, root: data }, 0, "");
+        return ctx.postTransforms.reduce((result, fn) => fn(result), output.join(""));
     };
     // assign api methods and return method to compile the template
     return Object.assign(compileTemplate, {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "mikel",
     "description": "Micro templating library with zero dependencies",
-    "version": "0.37.0",
+    "version": "0.38.1",
     "type": "module",
     "author": {
         "name": "Josemi Juanes",