abdk-mustache-js 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -7,6 +7,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [1.0.4] — 2026-04-11
+
+### Added
+
+- **Standalone tag whitespace stripping** — section, inverted-section, comment,
+  set-delimiter, partial, block, and parent tags that appear alone on a line
+  (with only optional leading whitespace) now consume the entire line, including
+  leading whitespace and trailing newline (`\n` or `\r\n`), per the Mustache
+  spec.  Variable tags are never treated as standalone.
+- **Permissive whitespace inside tags** — spaces are now permitted before and
+  after any tag sigil and around the tag name: `{{ # section }}`,
+  `{{> partial }}`, `{{ = [ ] = }}`, etc.  Applies uniformly to all tag types.
+- **Function-based partial loader** — all four public functions
+  (`render`, `renderCompiled`, `renderAsync`, `renderCompiledAsync`) now accept
+  either a plain partial object *or* a single loader function
+  `(name) => template | null` (async for the async variants) in place of the
+  `partials` argument.  The loader is called at most once per partial name per
+  render call.
+- **Stricter parent-body validation** — inside a `{{< parent}}` body, sections,
+  variables, partials, and nested parents now raise a compile-time error instead
+  of being silently ignored.  Plain text and comments are still silently
+  discarded; block overrides (`{{$ block}}`) and set-delimiter tags are
+  processed normally.
+
+---
+
+## [1.0.3] — 2026-04-11
+
+### Fixed
+
+- `renderCompiledAsync` / `renderAsync`: `wrapView` was calling async view
+  functions **eagerly** at wrap time and returning `null` directly to
+  Mustache.js instead of returning a callable wrapper function.  As a result,
+  every async function in the view was always rendered as an empty string,
+  regardless of its resolved value, and every async function — including unused
+  ones — was invoked unconditionally.  `wrapView` now returns a proper wrapper
+  function registered in `wrappedValues`; the underlying async function is only
+  called when Mustache.js actually invokes it during rendering.
+
+---
+
 ## [1.0.2] — 2026-04-11
 
 ### Fixed

package/README.md

@@ -16,8 +16,13 @@ functions** for high-throughput rendering.
   function; subsequent renders are pure function calls with no parsing overhead
 - **Full Mustache syntax** — variables, sections, inverted sections, comments,
   partials, dynamic partials, and set-delimiter tags
+- **Standalone tag whitespace stripping** — section, comment, partial,
+  set-delimiter, and inheritance tags on their own line consume that whole line
+  (leading whitespace + trailing newline), per spec
 - **Template inheritance** — `{{< parent}}` / `{{$ block}}` for layout
   composition (extends the base Mustache spec)
+- **Permissive tag whitespace** — spaces are allowed before and after any tag
+  sigil: `{{ # name }}`, `{{> partial }}`, `{{ = [ ] = }}`, etc.
 - **Async rendering** — `renderAsync` / `renderCompiledAsync` resolve async
   and Promise-returning view values automatically, with lazy async partial
   loading
@@ -115,6 +120,76 @@ const page = compile(`
 renderCompiled(page, { name: "Alice" }, { layout });
 ```
 
+#### What is allowed inside a parent body (`{{< parent}} … {{/parent}}`)
+
+The spec says everything except block overrides should be silently ignored
+inside a parent. This implementation is deliberately stricter on errors but
+also more useful:
+
+| Content | Behaviour |
+|---------|-----------|
+| Plain text | Silently ignored |
+| Comments `{{! … }}` | Silently ignored |
+| Block overrides `{{$ block }} … {{/block}}` | Processed normally — overrides the named block in the parent template |
+| Set-delimiter tags `{{= … =}}` | **Processed** — delimiter change takes effect for the rest of the parent body, allowing different delimiters for different block overrides |
+| Sections `{{#}}` / `{{^}}` | **Compile-time error** — hiding structural tags would conceal bugs |
+| Variables `{{name}}` / `{{{name}}}` / `{{& name}}` | **Compile-time error** |
+| Partials `{{> …}}` / `{{> *…}}` | **Compile-time error** |
+| Nested parents `{{< …}}` | **Compile-time error** |
+
+Example — changing delimiters mid-parent to override two blocks with
+different delimiter styles:
+
+```ts
+const parent = compile("{{$a}}A{{/a}} {{$b}}B{{/b}}");
+const child  = compile("{{< parent}}{{=[ ]=}}[$a]X[/a][={{ }}=]{{$b}}Y{{/b}}{{/parent}}");
+renderCompiled(child, {}, { parent }); // "X Y"
+```
+
+### Standalone tags
+
+Tags that appear alone on a line (with only optional leading whitespace) are
+treated as **standalone**: the entire line, including the leading whitespace
+and the trailing newline (`\n` or `\r\n`), is removed from the output. This
+applies to section, inverted-section, comment, set-delimiter, partial, block,
+and parent tags. Variable tags are never standalone.
+
+```
+Template:
+  | before
+  {{#show}}
+  | inside
+  {{/show}}
+  | after
+
+Output (show = true):
+  | before
+  | inside
+  | after
+```
+
+> **Note:** The spec also requires standalone partial tags to prepend their
+> leading whitespace as indentation to every line of the included partial.
+> This implementation does **not** support partial indentation — the partial
+> content is inserted as-is.
+
+### Whitespace inside tags
+
+Spaces are permitted before and after any tag sigil, and around any tag name.
+All three positions are equivalent:
+
+```
+{{ name }}        — spaces around name
+{{# section }}    — space after sigil
+{{ # section }}   — space before and after sigil
+{{> * dynamic }}  — spaces around * in dynamic partial
+{{ = [ ] = }}     — spaces around = in set-delimiter
+```
+
+This applies uniformly to all tag types: variables, sections, inverted
+sections, comments, partials, dynamic partials, blocks, parents, and
+set-delimiter tags.
+
 ### Unescaped output
 
 Use triple mustaches `{{{…}}}` or `{{& …}}` to skip HTML escaping:
@@ -146,7 +221,7 @@ const html = await renderAsync(
 );
 ```
 
-Async partials (loaded on demand):
+Async partials (loaded on demand via a loader function):
 
 ```ts
 import { renderAsync } from "abdk-mustache-js";
@@ -154,12 +229,18 @@ import { renderAsync } from "abdk-mustache-js";
 const html = await renderAsync(
   "{{> header}}{{body}}",
   { body: "Content" },
-  {
-    // string partial — compiled eagerly
-    header: "<h1>ABDK</h1>",
-    // async partial — compiled lazily, result cached for subsequent iterations
-    nav: async () => fetchNavTemplate(),
-  }
+  // loader function — called once per partial name, result cached
+  async (name) => fetchTemplate(name)
+);
+```
+
+Or pass a plain object of pre-compiled string partials:
+
+```ts
+const html = await renderAsync(
+  "{{> header}}{{body}}",
+  { body: "Content" },
+  { header: "<h1>ABDK</h1>" }
 );
 ```
 
@@ -181,7 +262,7 @@ Renders a pre-compiled template synchronously.
 |-----------|------|---------|
 | `template` | `CompiledTemplate` | — |
 | `view` | `any` | — |
-| `partials` | `{ [name: string]: CompiledTemplate }` | `{}` |
+| `partials` | `{ [name: string]: CompiledTemplate }` \| `(name: string) => CompiledTemplate \| null` | `{}` |
 | `escape` | `(s: string) => string` | built-in HTML escape |
 
 ### `render(template, view, partials?, escape?): string`
@@ -193,32 +274,33 @@ first use per `render` call).
 |-----------|------|---------|
 | `template` | `string` | — |
 | `view` | `any` | — |
-| `partials` | `{ [name: string]: string }` | `{}` |
+| `partials` | `{ [name: string]: string }` \| `(name: string) => string \| null` | `{}` |
 | `escape` | `(s: string) => string` | built-in HTML escape |
 
 ### `renderCompiledAsync(template, view, partials?, escape?): Promise<string>`
 
 Renders a pre-compiled template; asynchronous view property functions are
-resolved automatically (re-rendering until all promises settle). Partial
-loaders are called at most once per `renderCompiledAsync` call.
+resolved automatically (re-rendering until all promises settle). When a loader
+function is supplied, it is called at most once per partial name per
+`renderCompiledAsync` call.
 
 | Parameter | Type | Default |
-|-----------|------|---------|
+|-----------|------|---------||
 | `template` | `CompiledTemplate` | — |
 | `view` | `any` | — |
-| `partials` | `{ [name: string]: () => Promise<CompiledTemplate> }` | `{}` |
+| `partials` | `{ [name: string]: CompiledTemplate }` \| `(name: string) => Promise<CompiledTemplate \| null>` | `{}` |
 | `escape` | `(s: string) => string` | built-in HTML escape |
 
 ### `renderAsync(template, view, partials?, escape?): Promise<string>`
 
 Convenience wrapper around `renderCompiledAsync` that accepts a template
-string and string / async-function partials.
+string and string partials or an async loader function.
 
 | Parameter | Type | Default |
-|-----------|------|---------|
+|-----------|------|---------||
 | `template` | `string` | — |
 | `view` | `any` | — |
-| `partials` | `{ [name: string]: string \| (() => Promise<string>) }` | `{}` |
+| `partials` | `{ [name: string]: string }` \| `(name: string) => Promise<string \| null>` | `{}` |
 | `escape` | `(s: string) => string` | built-in HTML escape |
 
 ### `CompiledTemplate` (type)
@@ -226,7 +308,8 @@ string and string / async-function partials.
 ```ts
 type CompiledTemplate = (
   view: any[],
-  partials: { [name: string]: CompiledTemplate },
+  partials: { [name: string]: CompiledTemplate }
+    | ((name: string) => CompiledTemplate | null),
   blocks: { [name: string]: () => string },
   escape: (string: string) => string
 ) => string;
@@ -247,9 +330,10 @@ type CompiledTemplate = (
 | Dynamic partials `{{> *name}}` | ✓ |
 | Set delimiters `{{= <% %> =}}` | ✓ |
 | Template inheritance `{{< parent}}` / `{{$ block}}` | ✓ (extension) |
+| Standalone tag whitespace stripping | ✓ |
+| Whitespace before/after any tag sigil | ✓ (extension) |
 | Lambda sections (raw text + render callback) | ✗ (optional spec feature) |
-| Standalone tag whitespace stripping | ✗ |
-| Partial indentation | ✗ |
+| Partial indentation (standalone partial prepends indent) | ✗ (intentionally omitted) |
 
 ---
 

package/dist/index.d.ts

@@ -1,19 +1,19 @@
 export type CompiledTemplate = (view: any[], partials: {
     [name: string]: CompiledTemplate;
-}, blocks: {
+} | ((name: string) => CompiledTemplate | null), blocks: {
     [name: string]: () => string;
 }, escape: (string: string) => string) => string;
 export declare function compile(template: string): CompiledTemplate;
 export declare function renderCompiled(template: CompiledTemplate, view: any, partials?: {
     [name: string]: CompiledTemplate;
-}, escape?: (string: string) => string): string;
+} | ((name: string) => CompiledTemplate | null), escape?: (string: string) => string): string;
 export declare function render(template: string, view: any, partials?: {
     [name: string]: string;
-}, escape?: (string: string) => string): string;
+} | ((name: string) => string | null), escape?: (string: string) => string): string;
 export declare function renderCompiledAsync(template: CompiledTemplate, view: any, partials?: {
-    [name: string]: () => Promise<CompiledTemplate>;
-}, escape?: (string: string) => string): Promise<string>;
+    [name: string]: CompiledTemplate;
+} | ((name: string) => Promise<CompiledTemplate | null>), escape?: (string: string) => string): Promise<string>;
 export declare function renderAsync(template: string, view: any, partials?: {
-    [name: string]: string | (() => Promise<string>);
-}, escape?: (string: string) => string): Promise<string>;
+    [name: string]: string;
+} | ((name: string) => Promise<string | null>), escape?: (string: string) => string): Promise<string>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAuBA,MAAM,MAAM,gBAAgB,GAAG,CAC7B,IAAI,EAAE,GAAG,EAAE,EACX,QAAQ,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAE,EAC9C,MAAM,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,MAAM,CAAA;CAAE,EACxC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,KAAK,MAAM,CAAC;AAEhD,wBAAgB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CA0I1D;AAeD,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAO,EACnD,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,MAAM,CAER;AAED,wBAAgB,MAAM,CACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACzC,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,MAAM,CAYR;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAA;CAAO,EAClE,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CA6EjB;AAED,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;CAAO,EACnE,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAUjB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAuBA,MAAM,MAAM,gBAAgB,GAAG,CAC7B,IAAI,EAAE,GAAG,EAAE,EACX,QAAQ,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAE,GAC1C,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,GAAG,IAAI,CAAC,EAC/C,MAAM,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,MAAM,CAAA;CAAE,EACxC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,KAAK,MAAM,CAAC;AAEhD,wBAAgB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAuK1D;AAeD,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAE,GAC1C,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,gBAAgB,GAAG,IAAI,CAAM,EACpD,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,MAAM,CAER;AAED,wBAAgB,MAAM,CACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAChC,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAM,EAC1C,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,MAAM,CAWR;AAED,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAE,GAC1C,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAM,EAC7D,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CA6EjB;AAED,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG,EACT,QAAQ,GAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAChC,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAM,EACnD,MAAM,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAmB,GAC9C,OAAO,CAAC,MAAM,CAAC,CAUjB"}

package/dist/index.js

@@ -29,7 +29,7 @@ function escapeRegExp(string) {
 function compileTagRegExp(leftDelimiter, rightDelimiter) {
     const escapedLeftDelimiter = escapeRegExp(leftDelimiter);
     const escapedRightDelimiter = escapeRegExp(rightDelimiter);
-    return new RegExp(`${escapedLeftDelimiter}\\s*(\\{[^}]*\\}\\s*|[^{\\s].*?)${escapedRightDelimiter}`, "g");
+    return new RegExp(`${escapedLeftDelimiter}\\s*(\\{[^}]*\\}\\s*|[^{\\s].*?)${escapedRightDelimiter}`, "gs");
 }
 function compile(template) {
     let code = ``;
@@ -53,6 +53,7 @@ function compile(template) {
     code += `const s=(x)=>x==null?"":String(x);`;
     code += `const S=(x)=>x==null?"":e(x);`;
     code += `const o=(n)=>v.find(x=>x!=null&&typeof x==="object"&&n in x);`;
+    code += `const P=(n)=>typeof p==="function"?p(n):p[n];`;
     code += `let x;`;
     code += `let r="";`;
     let tagRegExp = compileTagRegExp('{{', '}}');
@@ -64,13 +65,52 @@ function compile(template) {
         const match = tagRegExp.exec(template);
         if (!match)
             break;
-        if (!inParent && match.index > index)
-            code += `r+=${quoteString(template.slice(index, match.index))};`;
-        index = tagRegExp.lastIndex;
         const tag = match[1].trim();
-        const tagMatch = tag.match(/^(?:=\s*([^=\s]+)\s+([^=\s]+)\s*=|#\s*(\S+)|\^\s*(\S+)|\/\s*(\S+)|\{\s*(\S+)\s*\}|&\s*(\S+)|!.*|>\s*\*\s*(\S+)|>\s*(\S+)|\$\s*(\S+)|<\s*\*\s*(\S+)|<\s*(\S+)|\s*(\S+))$/);
+        const tagMatch = tag.match(/^(?:=\s*([^=\s]+)\s+([^=\s]+)\s*=|#\s*(\S+)|\^\s*(\S+)|\/\s*(\S+)|\{\s*(\S+)\s*\}|&\s*(\S+)|![\s\S]*|>\s*\*\s*(\S+)|>\s*(\S+)|\$\s*(\S+)|<\s*\*\s*(\S+)|<\s*(\S+)|\s*(\S+))$/);
         if (!tagMatch)
             throw new Error(`Invalid tag: ${tag}`);
+        let left = match.index;
+        let right = tagRegExp.lastIndex;
+        if (!tagMatch[6] && !tagMatch[7] && !tagMatch[13]) { // Standalone tags
+            let isStandalone = true;
+            while (left > 0) {
+                const ch = template[left - 1];
+                if (ch.match(/\S/)) {
+                    isStandalone = false;
+                    break;
+                }
+                else if (ch.match(/[\n\r]/))
+                    break;
+                else
+                    left--;
+            }
+            if (isStandalone) {
+                while (right < template.length) {
+                    const ch = template[right];
+                    if (ch.match(/\S/)) {
+                        isStandalone = false;
+                        break;
+                    }
+                    else if (ch.match(/[\n\r]/)) {
+                        right++;
+                        if (right < template.length
+                            && template[right].match(/[\n\r]/)
+                            && template[right] !== ch)
+                            right++;
+                        break;
+                    }
+                    else
+                        right++;
+                }
+            }
+            if (!isStandalone) {
+                left = match.index;
+                right = tagRegExp.lastIndex;
+            }
+        }
+        if (!inParent && match.index > index)
+            code += `r+=${quoteString(template.slice(index, left))};`;
+        index = right;
         if (tagMatch[1] && tagMatch[2]) { // Set delimiters
             tagRegExp = compileTagRegExp(tagMatch[1], tagMatch[2]);
         }
@@ -112,16 +152,13 @@ function compile(template) {
             if (inParent)
                 throw new Error("Partials cannot be nested inside parents");
             resolve(tagMatch[8]);
-            code += `x=p[x];`;
+            code += `x=P(x);`;
             code += `r+=x?x(v,p,{},e):"";`;
         }
         else if (tagMatch[9]) { // Partial
             if (inParent)
                 throw new Error("Partials cannot be nested inside parents");
-            if (isIdentifier(tagMatch[9]))
-                code += `x=p.${tagMatch[9]};`;
-            else
-                code += `x=p[${quoteString(tagMatch[9])}];`;
+            code += `x=P(${quoteString(tagMatch[9])});`;
             code += `r+=x?x(v,p,{},e):"";`;
         }
         else if (tagMatch[10]) { // Block
@@ -150,17 +187,14 @@ function compile(template) {
             if (inParent)
                 throw new Error("Parents cannot be nested inside parents");
             resolve(tagMatch[11]);
-            code += `x=p[x];`;
+            code += `x=P(x);`;
             code += `if(x)r+=x(v,p,{`;
             stack.push([tagMatch[11], () => code += `},e);`]);
         }
         else if (tagMatch[12]) { // Parent
             if (inParent)
                 throw new Error("Parents cannot be nested inside parents");
-            if (isIdentifier(tagMatch[12]))
-                code += `x=p.${tagMatch[12]};`;
-            else
-                code += `x=p[${quoteString(tagMatch[12])}];`;
+            code += `x=P(${quoteString(tagMatch[12])});`;
             code += `if(x)r+=x(v,p,{`;
             inParent = true;
             stack.push([tagMatch[12], () => {
@@ -211,12 +245,13 @@ function renderCompiled(template, view, partials = {}, escape = escapeHTML) {
 }
 function render(template, view, partials = {}, escape = escapeHTML) {
     const compiledPartials = {};
-    return renderCompiled(compile(template), view, Object.fromEntries(Object.entries(partials).map(([name, template]) => [name, (v, p, b, e) => {
-            if (!(name in compiledPartials)) {
-                compiledPartials[name] = compile(template);
-            }
-            return compiledPartials[name](v, p, b, e);
-        }])), escape);
+    return renderCompiled(compile(template), view, name => {
+        var _a;
+        const template = typeof partials === "function"
+            ? partials(name)
+            : (_a = partials[name]) !== null && _a !== void 0 ? _a : null;
+        return template === null ? null : compile(template);
+    }, escape);
 }
 function renderCompiledAsync(template_1, view_1) {
     return __awaiter(this, arguments, void 0, function* (template, view, partials = {}, escape = escapeHTML) {
@@ -241,73 +276,74 @@ function renderCompiledAsync(template_1, view_1) {
                 return wrappedObject;
             }
             else if (typeof view === "function") {
-                if (values.has(view))
-                    return wrapView(values.get(view));
-                else if (pendingValues.has(view))
-                    return null;
-                else {
-                    const promise = Promise.resolve(view());
-                    pendingValues.set(view, promise);
-                    promise.then(value => {
-                        values.set(view, value);
-                        pendingValues.delete(view);
-                    }).catch(() => {
-                        // Rejection is handled by Promise.all in the render loop;
-                        // suppress the unhandled rejection on this detached chain.
-                    });
-                    return values.has(view) ? wrapView(values.get(view)) : null;
-                }
+                const wrappedFunction = () => {
+                    if (values.has(view))
+                        return wrapView(values.get(view));
+                    else if (pendingValues.has(view))
+                        return null;
+                    else {
+                        const promise = Promise.resolve(view());
+                        pendingValues.set(view, promise);
+                        promise.then(value => {
+                            values.set(view, value);
+                            pendingValues.delete(view);
+                        }).catch(() => {
+                            // Rejection is handled by Promise.all in the render loop;
+                            // suppress the unhandled rejection on this detached chain.
+                        });
+                        return values.has(view) ? wrapView(values.get(view)) : null;
+                    }
+                };
+                wrappedValues.set(view, wrappedFunction);
+                return wrappedFunction;
             }
             else
                 return view;
         };
-        const wrappedPartials = {};
-        const pendingPartials = {};
-        const wrapPartials = (partials) => {
-            return Object.fromEntries(Object.entries(partials)
-                .map(([name, partial]) => {
-                if (name in wrappedPartials)
-                    return [name, wrappedPartials[name]];
-                else if (name in pendingPartials)
+        const wrappedPartials = new Map();
+        const pendingPartials = new Map();
+        while (true) {
+            const result = template([wrapView(view)], (name) => {
+                var _a;
+                if (wrappedPartials.has(name))
+                    return wrappedPartials.get(name);
+                else if (pendingPartials.has(name))
                     return null;
                 else {
-                    const promise = Promise.resolve(partial());
-                    pendingPartials[name] = promise;
-                    promise.then(compiled => {
-                        wrappedPartials[name] = compiled;
-                        delete pendingPartials[name];
+                    const promise = Promise.resolve(typeof partials === "function"
+                        ? partials(name)
+                        : (_a = partials[name]) !== null && _a !== void 0 ? _a : null);
+                    pendingPartials.set(name, promise);
+                    promise.then(partial => {
+                        wrappedPartials.set(name, partial);
+                        pendingPartials.delete(name);
                     }).catch(() => {
                         // Rejection is handled by Promise.all in the render loop;
                         // suppress the unhandled rejection on this detached chain.
                     });
-                    return name in wrappedPartials
-                        ? [name, wrappedPartials[name]]
+                    return wrappedPartials.has(name)
+                        ? wrappedPartials.get(name)
                         : null;
                 }
-            })
-                .filter((entry) => entry !== null));
-        };
-        while (true) {
-            const result = template([wrapView(view)], wrapPartials(partials), {}, escape);
-            if (pendingValues.size === 0 && Object.keys(pendingPartials).length === 0)
+            }, {}, escape);
+            if (pendingValues.size === 0 && pendingPartials.size === 0)
                 return result;
             yield Promise.all([
                 ...pendingValues.values(),
-                ...Object.values(pendingPartials)
+                ...pendingPartials.values()
             ]);
-            pendingValues.clear();
             wrappedValues.clear();
         }
     });
 }
 function renderAsync(template_1, view_1) {
     return __awaiter(this, arguments, void 0, function* (template, view, partials = {}, escape = escapeHTML) {
-        return renderCompiledAsync(compile(template), view, Object.fromEntries(Object.entries(partials).map(([name, template]) => [name, () => __awaiter(this, void 0, void 0, function* () {
-                return compile(typeof template === "function"
-                    ? yield template()
-                    : template);
-            })
-        ])), escape);
+        return renderCompiledAsync(compile(template), view, (name) => __awaiter(this, void 0, void 0, function* () {
+            const template = typeof partials === "function"
+                ? yield partials(name)
+                : partials[name];
+            return template === null ? null : compile(template);
+        }), escape);
     });
 }
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abdk-mustache-js",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Mustache Template Engine for JavaScript by ABDK Consulting",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -18,12 +18,13 @@ function compileTagRegExp(leftDelimiter: string, rightDelimiter: string): RegExp
   const escapedLeftDelimiter = escapeRegExp(leftDelimiter);
   const escapedRightDelimiter = escapeRegExp(rightDelimiter);
   return new RegExp(`${escapedLeftDelimiter}\\s*(\\{[^}]*\\}\\s*|[^{\\s].*?)${escapedRightDelimiter}`,
-    "g");
+    "gs");
 }
 
 export type CompiledTemplate = (
   view: any[],
-  partials: { [name: string]: CompiledTemplate },
+  partials: { [name: string]: CompiledTemplate }
+    | ((name: string) => CompiledTemplate | null),
   blocks: { [name: string]: () => string },
   escape: (string: string) => string) => string;
 
@@ -49,6 +50,7 @@ export function compile(template: string): CompiledTemplate {
   code += `const s=(x)=>x==null?"":String(x);`;
   code += `const S=(x)=>x==null?"":e(x);`;
   code += `const o=(n)=>v.find(x=>x!=null&&typeof x==="object"&&n in x);`;
+  code += `const P=(n)=>typeof p==="function"?p(n):p[n];`
   code += `let x;`;
   code += `let r="";`;
 
@@ -60,12 +62,44 @@ export function compile(template: string): CompiledTemplate {
     tagRegExp.lastIndex = index;
     const match = tagRegExp.exec(template);
     if (!match) break;
-    if (!inParent && match.index > index)
-      code += `r+=${quoteString(template.slice(index, match.index))};`;
-    index = tagRegExp.lastIndex;
     const tag = match[1].trim();
-    const tagMatch = tag.match(/^(?:=\s*([^=\s]+)\s+([^=\s]+)\s*=|#\s*(\S+)|\^\s*(\S+)|\/\s*(\S+)|\{\s*(\S+)\s*\}|&\s*(\S+)|!.*|>\s*\*\s*(\S+)|>\s*(\S+)|\$\s*(\S+)|<\s*\*\s*(\S+)|<\s*(\S+)|\s*(\S+))$/);
+    const tagMatch = tag.match(/^(?:=\s*([^=\s]+)\s+([^=\s]+)\s*=|#\s*(\S+)|\^\s*(\S+)|\/\s*(\S+)|\{\s*(\S+)\s*\}|&\s*(\S+)|![\s\S]*|>\s*\*\s*(\S+)|>\s*(\S+)|\$\s*(\S+)|<\s*\*\s*(\S+)|<\s*(\S+)|\s*(\S+))$/);
     if (!tagMatch) throw new Error(`Invalid tag: ${tag}`);
+    let left = match.index;
+    let right = tagRegExp.lastIndex;
+    if (!tagMatch[6] && !tagMatch[7] && !tagMatch[13]) { // Standalone tags
+      let isStandalone = true;
+      while (left > 0) {
+        const ch = template[left - 1];
+        if (ch.match(/\S/)) {
+          isStandalone = false;
+          break;
+        } else if (ch.match(/[\n\r]/)) break;
+        else left--;
+      }
+      if (isStandalone) {
+        while (right < template.length) {
+          const ch = template[right];
+          if (ch.match(/\S/)) {
+            isStandalone = false;
+            break;
+          } else if (ch.match(/[\n\r]/)) {
+            right++;
+            if (right < template.length
+              && template[right].match(/[\n\r]/)
+              && template[right] !== ch) right++;
+            break;
+          } else right++;
+        }
+      }
+      if (!isStandalone) {
+        left = match.index;
+        right = tagRegExp.lastIndex;
+      }
+    }
+    if (!inParent && match.index > index)
+      code += `r+=${quoteString(template.slice(index, left))};`;
+    index = right;
     if (tagMatch[1] && tagMatch[2]) { // Set delimiters
       tagRegExp = compileTagRegExp(tagMatch[1], tagMatch[2]);
     } else if (tagMatch[3]) { // Section
@@ -99,13 +133,11 @@ export function compile(template: string): CompiledTemplate {
       if (inParent)
         throw new Error("Partials cannot be nested inside parents");
       resolve(tagMatch[8]);
-      code += `x=p[x];`;
+      code += `x=P(x);`;
       code += `r+=x?x(v,p,{},e):"";`;
     } else if (tagMatch[9]) { // Partial
       if (inParent) throw new Error("Partials cannot be nested inside parents");
-      if (isIdentifier(tagMatch[9]))
-        code += `x=p.${tagMatch[9]};`;
-      else code += `x=p[${quoteString(tagMatch[9])}];`;
+      code += `x=P(${quoteString(tagMatch[9])});`;
       code += `r+=x?x(v,p,{},e):"";`;
     } else if (tagMatch[10]) { // Block
       if (inParent) {
@@ -128,14 +160,12 @@ export function compile(template: string): CompiledTemplate {
     } else if (tagMatch[11]) { // Dynamic Parent
       if (inParent) throw new Error("Parents cannot be nested inside parents");
       resolve(tagMatch[11]);
-      code += `x=p[x];`;
+      code += `x=P(x);`;
       code += `if(x)r+=x(v,p,{`;
       stack.push([tagMatch[11], () => code += `},e);`]);
     } else if (tagMatch[12]) { // Parent
       if (inParent) throw new Error("Parents cannot be nested inside parents");
-      if (isIdentifier(tagMatch[12]))
-        code += `x=p.${tagMatch[12]};`;
-      else code += `x=p[${quoteString(tagMatch[12])}];`;
+      code += `x=P(${quoteString(tagMatch[12])});`;
       code += `if(x)r+=x(v,p,{`;
       inParent = true;
       stack.push([tagMatch[12], () => {
@@ -183,7 +213,8 @@ function escapeHTML(string: string): string {
 export function renderCompiled(
   template: CompiledTemplate,
   view: any,
-  partials: { [name: string]: CompiledTemplate } = {},
+  partials: { [name: string]: CompiledTemplate }
+    | ((name: string) => CompiledTemplate | null) = {},
   escape: (string: string) => string = escapeHTML
 ): string {
   return template([view], partials, {}, escape);
@@ -192,26 +223,27 @@ export function renderCompiled(
 export function render(
   template: string,
   view: any,
-  partials: { [name: string]: string } = {},
+  partials: { [name: string]: string }
+    | ((name: string) => string | null) = {},
   escape: (string: string) => string = escapeHTML
 ): string {
   const compiledPartials: { [name: string]: CompiledTemplate } = {};
   return renderCompiled(
     compile(template),
     view,
-    Object.fromEntries(Object.entries(partials).map(([name, template]) =>
-      [name, (v, p, b, e) => {
-        if (!(name in compiledPartials)) {
-          compiledPartials[name] = compile(template);
-        }
-        return compiledPartials[name](v, p, b, e);
-      }])), escape);
+    name => {
+      const template = typeof partials === "function"
+        ? partials(name)
+        : partials[name] ?? null;
+      return template === null ? null : compile(template);
+    }, escape);
 }
 
 export async function renderCompiledAsync(
   template: CompiledTemplate,
   view: any,
-  partials: { [name: string]: () => Promise<CompiledTemplate> } = {},
+  partials: { [name: string]: CompiledTemplate }
+    | ((name: string) => Promise<CompiledTemplate | null>) = {},
   escape: (string: string) => string = escapeHTML
 ): Promise<string> {
   const wrappedValues = new Map<any, any>();
@@ -233,61 +265,61 @@ export async function renderCompiledAsync(
         wrappedObject[key] = wrapView(view[key]);
       return wrappedObject;
     } else if (typeof view === "function") {
-      if (values.has(view)) return wrapView(values.get(view));
-      else if (pendingValues.has(view)) return null;
-      else {
-        const promise = Promise.resolve(view());
-        pendingValues.set(view, promise);
-        promise.then(value => {
-          values.set(view, value);
-          pendingValues.delete(view);
-        }).catch(() => {
-          // Rejection is handled by Promise.all in the render loop;
-          // suppress the unhandled rejection on this detached chain.
-        });
-        return values.has(view) ? wrapView(values.get(view)) : null;
-      }
+      const wrappedFunction = () => {
+        if (values.has(view)) return wrapView(values.get(view));
+        else if (pendingValues.has(view)) return null;
+        else {
+          const promise = Promise.resolve(view());
+          pendingValues.set(view, promise);
+          promise.then(value => {
+            values.set(view, value);
+            pendingValues.delete(view);
+          }).catch(() => {
+            // Rejection is handled by Promise.all in the render loop;
+            // suppress the unhandled rejection on this detached chain.
+          });
+          return values.has(view) ? wrapView(values.get(view)) : null;
+        }
+      };
+      wrappedValues.set(view, wrappedFunction);
+      return wrappedFunction;
     } else return view;
   };
 
-  const wrappedPartials: { [name: string]: CompiledTemplate } = {};
-  const pendingPartials: { [name: string]: Promise<CompiledTemplate> } = {};
-
-  const wrapPartials = (partials: {
-    [name: string]: () => Promise<CompiledTemplate>
-  }) => {
-    return Object.fromEntries(
-      Object.entries(partials)
-        .map(([name, partial]) => {
-          if (name in wrappedPartials) return [name, wrappedPartials[name]];
-          else if (name in pendingPartials) return null;
-          else {
-            const promise = Promise.resolve(partial());
-            pendingPartials[name] = promise;
-            promise.then(compiled => {
-              wrappedPartials[name] = compiled;
-              delete pendingPartials[name];
-            }).catch(() => {
-              // Rejection is handled by Promise.all in the render loop;
-              // suppress the unhandled rejection on this detached chain.
-            });
-            return name in wrappedPartials
-              ? [name, wrappedPartials[name]]
-              : null;
-          }
-        })
-        .filter((entry): entry is [string, CompiledTemplate] => entry !== null)
-    );
-  };
+  const wrappedPartials = new Map<string, CompiledTemplate | null>();
+  const pendingPartials = new Map<string, Promise<CompiledTemplate | null>>();
 
   while (true) {
-    const result = template([wrapView(view)], wrapPartials(partials), {}, escape);
-    if (pendingValues.size === 0 && Object.keys(pendingPartials).length === 0) return result;
+    const result = template(
+      [wrapView(view)],
+      (name) => {
+        if (wrappedPartials.has(name)) return wrappedPartials.get(name)!;
+        else if (pendingPartials.has(name)) return null;
+        else {
+          const promise = Promise.resolve(
+            typeof partials === "function"
+              ? partials(name)
+              : partials[name] ?? null
+          );
+          pendingPartials.set(name, promise);
+          promise.then(partial => {
+            wrappedPartials.set(name, partial);
+            pendingPartials.delete(name);
+          }).catch(() => {
+            // Rejection is handled by Promise.all in the render loop;
+            // suppress the unhandled rejection on this detached chain.
+          });
+          return wrappedPartials.has(name)
+            ? wrappedPartials.get(name)!
+            : null;
+        }
+      },
+      {}, escape);
+    if (pendingValues.size === 0 && pendingPartials.size === 0) return result;
     await Promise.all([
       ...pendingValues.values(),
-      ...Object.values(pendingPartials)
+      ...pendingPartials.values()
     ]);
-    pendingValues.clear();
     wrappedValues.clear();
   }
 }
@@ -295,16 +327,17 @@ export async function renderCompiledAsync(
 export async function renderAsync(
   template: string,
   view: any,
-  partials: { [name: string]: string | (() => Promise<string>) } = {},
+  partials: { [name: string]: string }
+    | ((name: string) => Promise<string | null>) = {},
   escape: (string: string) => string = escapeHTML
 ): Promise<string> {
   return renderCompiledAsync(
     compile(template),
     view,
-    Object.fromEntries(Object.entries(partials).map(([name, template]) =>
-      [name, async () =>
-        compile(typeof template === "function"
-          ? await template()
-          : template)
-      ])), escape);
+    async (name) => {
+      const template = typeof partials === "function"
+        ? await partials(name)
+        : partials[name];
+      return template === null ? null : compile(template);
+    }, escape);
 }