mikel 0.37.0 → 0.38.0

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>;
 };
@@ -28,7 +28,7 @@ export type MikelState = Record<string, string>;
 
 export type MikelOptions = {
     helpers?: Record<string, MikelHelper>;
-    partials?: Record<string, string | MikelPartial>;
+    partials?: Record<string, MikelPartial>;
     functions?: Record<string, MikelFunction>;
 };
 
@@ -52,7 +52,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 || ".");
 };

package/package.json

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