From e30a863ac55c6ebe2296140933046629176cccf4 Mon Sep 17 00:00:00 2001
From: Ben Gubler <nebrelbug@gmail.com>
Date: Mon, 29 May 2023 12:35:56 -0600
Subject: [PATCH] feat: changes to autoEscape and autoFilter

---
 src/compile-string.ts |  6 +++---
 src/config.ts         | 32 ++++++++++++++++++++------------
 src/core.ts           |  5 +----
 src/file-handling.ts  |  8 ++++----
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/compile-string.ts b/src/compile-string.ts
index ca384a7..36a3d04 100644
--- a/src/compile-string.ts
+++ b/src/compile-string.ts
@@ -21,7 +21,7 @@ export function compileToString(this: Eta, str: string, options?: Partial<Option
 let include = (template, data) => this.render(template, data, options);
 let includeAsync = (template, data) => this.renderAsync(template, data, options);
 
-let __eta = {res: "", e: this.escapeFunction, f: this.filterFunction};
+let __eta = {res: "", e: this.config.escapeFunction, f: this.config.filterFunction};
 
 function layout(path, data) {
   __eta.layout = path;
@@ -88,7 +88,7 @@ function compileBody(this: Eta, buff: Array<AstObject>) {
       if (type === "r") {
         // raw
 
-        if (config.filter) {
+        if (config.autoFilter) {
           content = "__eta.f(" + content + ")";
         }
 
@@ -96,7 +96,7 @@ function compileBody(this: Eta, buff: Array<AstObject>) {
       } else if (type === "i") {
         // interpolate
 
-        if (config.filter) {
+        if (config.autoFilter) {
           content = "__eta.f(" + content + ")";
         }
 
diff --git a/src/config.ts b/src/config.ts
index 3b8baaf..b05be59 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,3 +1,5 @@
+import { XMLEscape } from "./utils";
+
 /* TYPES */
 
 type trimConfig = "nl" | "slurp" | false;
@@ -14,35 +16,37 @@ export interface EtaConfig {
   /** Whether or not to automatically XML-escape interpolations. Default true */
   autoEscape: boolean;
 
+  /** Apply a filter function defined on the class to every interpolation or raw interpolation */
+  autoFilter: boolean;
+
   /** Configure automatic whitespace trimming. Default `[false, 'nl']` */
   autoTrim: trimConfig | [trimConfig, trimConfig];
 
   /** Whether or not to cache templates if `name` or `filename` is passed */
   cache: boolean;
 
-  // TODO: Mention that Eta can't use "-" or "_" for config.parse since they're used for whitespace slurping.
+  escapeFunction: (str: unknown) => string;
+
+  filterFunction: (val: unknown) => string;
+
+  /** Holds cache of resolved filepaths. Set to `false` to disable. */
+  cacheFilepaths: boolean;
 
   /** Parsing options */
   parse: {
-    /** Which prefix to use for evaluation. Default `""` */
+    /** Which prefix to use for evaluation. Default `""`, does not support `"-"` or `"_"` */
     exec: string;
 
-    /** Which prefix to use for interpolation. Default `"="` */
+    /** Which prefix to use for interpolation. Default `"="`, does not support `"-"` or `"_"` */
     interpolate: string;
 
-    /** Which prefix to use for raw interpolation. Default `"~"` */
+    /** Which prefix to use for raw interpolation. Default `"~"`, does not support `"-"` or `"_"` */
     raw: string;
   };
 
   /** Array of plugins */
   plugins: Array<{ processFnString?: Function; processAST?: Function; processTemplate?: Function }>;
 
-  /** Holds cache of resolved filepaths. Set to `false` to disable. */
-  filepathCache?: Record<string, string> | false;
-
-  /** Apply a filter function defined on the class to every interpolation or raw interpolation */
-  filter?: boolean;
-
   /** Remove all safe-to-remove whitespace */
   rmWhitespace: boolean;
 
@@ -50,7 +54,7 @@ export interface EtaConfig {
   tags: [string, string];
 
   /** Make data available on the global object instead of varName */
-  useWith?: boolean;
+  useWith: boolean;
 
   /** Name of the data object. Default `it` */
   varName: string;
@@ -64,9 +68,13 @@ export interface EtaConfig {
 /** Eta's base (global) configuration */
 const defaultConfig: EtaConfig = {
   autoEscape: true,
+  autoFilter: false,
   autoTrim: [false, "nl"],
   cache: false,
-  filepathCache: {},
+  cacheFilepaths: true,
+  escapeFunction: XMLEscape,
+  // default filter function (not used unless enables) just stringifies the input
+  filterFunction: (val) => String(val),
   parse: {
     exec: "",
     interpolate: "=",
diff --git a/src/core.ts b/src/core.ts
index 7643767..7f72a01 100644
--- a/src/core.ts
+++ b/src/core.ts
@@ -5,7 +5,6 @@ import { compile } from "./compile.js";
 import { compileToString } from "./compile-string.js";
 import { render, renderAsync, renderString, renderStringAsync } from "./render.js";
 import { TemplateFunction } from "./compile.js";
-import { XMLEscape } from "./utils.js";
 
 /* TYPES */
 import type { EtaConfig, Options } from "./config.js";
@@ -30,12 +29,10 @@ export class Eta {
   renderString = renderString;
   renderStringAsync = renderStringAsync;
 
+  filepathCache: Record<string, string> = {};
   templatesSync = new Cacher<TemplateFunction>({});
   templatesAsync = new Cacher<TemplateFunction>({});
 
-  escapeFunction = XMLEscape;
-  filterFunction = null;
-
   // resolvePath takes a relative path from the "views" directory
   resolvePath: null | ((this: Eta, template: string, options?: Partial<Options>) => string) = null;
   readFile: null | ((this: Eta, path: string) => string) = null;
diff --git a/src/file-handling.ts b/src/file-handling.ts
index f09f49a..793608d 100644
--- a/src/file-handling.ts
+++ b/src/file-handling.ts
@@ -42,8 +42,8 @@ export function resolvePath(this: EtaCore, template: string, options?: Partial<O
   // if the file was included from another template
   if (baseFilePath) {
     // check the cache
-    if (this.config.filepathCache && this.config.filepathCache[baseFilePath]) {
-      return this.config.filepathCache[baseFilePath];
+    if (this.config.cacheFilepaths && this.filepathCache[baseFilePath]) {
+      return this.filepathCache[baseFilePath];
     }
 
     const absolutePathTest = absolutePathRegExp.exec(template);
@@ -60,8 +60,8 @@ export function resolvePath(this: EtaCore, template: string, options?: Partial<O
 
   if (dirIsChild(views, resolvedFilePath)) {
     // add resolved path to the cache
-    if (baseFilePath && this.config.filepathCache) {
-      this.config.filepathCache[baseFilePath] = resolvedFilePath;
+    if (baseFilePath && this.config.cacheFilepaths) {
+      this.filepathCache[baseFilePath] = resolvedFilePath;
     }
 
     return resolvedFilePath;