replace-all-mustaches 0.0.7 → 0.0.9

package/.obsidian/app.json

@@ -0,0 +1 @@
+{}

package/.obsidian/appearance.json

@@ -0,0 +1 @@
+{}

package/.obsidian/core-plugins.json

@@ -0,0 +1,33 @@
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "canvas": true,
+  "outgoing-link": true,
+  "tag-pane": true,
+  "footnotes": false,
+  "properties": true,
+  "page-preview": true,
+  "daily-notes": true,
+  "templates": true,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": true,
+  "bookmarks": true,
+  "markdown-importer": false,
+  "zk-prefixer": false,
+  "random-note": false,
+  "outline": true,
+  "word-count": true,
+  "slides": false,
+  "audio-recorder": false,
+  "workspaces": false,
+  "file-recovery": true,
+  "publish": false,
+  "sync": true,
+  "bases": true,
+  "webviewer": false
+}

package/.obsidian/workspace.json

@@ -0,0 +1,188 @@
+{
+  "main": {
+    "id": "4daae414ad798d52",
+    "type": "split",
+    "children": [
+      {
+        "id": "b1b1c90b69ae71a3",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "445cbff87fecafda",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "README.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "README"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "bfcacb4e99960c9a",
+    "type": "split",
+    "children": [
+      {
+        "id": "c68d7a811923bb04",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "5c71a0f5075ce654",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {
+                "sortOrder": "alphabetical",
+                "autoReveal": false
+              },
+              "icon": "lucide-folder-closed",
+              "title": "Files"
+            }
+          },
+          {
+            "id": "84c107d47eaefccf",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              },
+              "icon": "lucide-search",
+              "title": "Search"
+            }
+          },
+          {
+            "id": "a8cbbcba343759c9",
+            "type": "leaf",
+            "state": {
+              "type": "bookmarks",
+              "state": {},
+              "icon": "lucide-bookmark",
+              "title": "Bookmarks"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300
+  },
+  "right": {
+    "id": "8aff1fa5c518451e",
+    "type": "split",
+    "children": [
+      {
+        "id": "43a814ace492ceab",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "28da262e1698e35e",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "README.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              },
+              "icon": "links-coming-in",
+              "title": "Backlinks for README"
+            }
+          },
+          {
+            "id": "7f9babb66cdf09c1",
+            "type": "leaf",
+            "state": {
+              "type": "outgoing-link",
+              "state": {
+                "file": "README.md",
+                "linksCollapsed": false,
+                "unlinkedCollapsed": true
+              },
+              "icon": "links-going-out",
+              "title": "Outgoing links from README"
+            }
+          },
+          {
+            "id": "b31d305f280030e8",
+            "type": "leaf",
+            "state": {
+              "type": "tag",
+              "state": {
+                "sortOrder": "frequency",
+                "useHierarchy": true,
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-tags",
+              "title": "Tags"
+            }
+          },
+          {
+            "id": "375aeedde3085647",
+            "type": "leaf",
+            "state": {
+              "type": "all-properties",
+              "state": {
+                "sortOrder": "frequency",
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-archive",
+              "title": "All properties"
+            }
+          },
+          {
+            "id": "84f7054df9fc73ed",
+            "type": "leaf",
+            "state": {
+              "type": "outline",
+              "state": {
+                "file": "README.md",
+                "followCursor": false,
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-list",
+              "title": "Outline of README"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "left-ribbon": {
+    "hiddenItems": {
+      "switcher:Open quick switcher": false,
+      "graph:Open graph view": false,
+      "canvas:Create new canvas": false,
+      "daily-notes:Open today's daily note": false,
+      "templates:Insert template": false,
+      "command-palette:Open command palette": false,
+      "bases:Create new base": false
+    }
+  },
+  "active": "445cbff87fecafda",
+  "lastOpenFiles": []
+}

package/dist/index.cjs

@@ -38,17 +38,6 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/nodes/helperFunctions.ts
-function hasMustacheTags(template) {
-  return template.includes("{{") || template.includes("}}");
-}
-function hasDuplicates(arr) {
-  return new Set(arr).size !== arr.length;
-}
-
-// src/nodes/replaceAllMustaches.ts
-var import_mustache = __toESM(require("mustache"), 1);
-
 // src/nodes/VariableView.ts
 var VariableView = class _VariableView {
   static _collection = [];
@@ -85,34 +74,41 @@ var VariableView = class _VariableView {
   }
 };
 
+// src/nodes/helperFunctions.ts
+function hasMustacheTags(template) {
+  return template.includes("{{") || template.includes("}}");
+}
+function hasDuplicates(arr) {
+  return new Set(arr).size !== arr.length;
+}
+
 // src/nodes/replaceAllMustaches.ts
+var import_mustache = __toESM(require("mustache"), 1);
 function replaceAllMustaches(template, { maxPasses = 20, detectCycles = true } = {}) {
   let current = template;
-  const seen = /* @__PURE__ */ new Set();
-  let pass = 0;
-  for (pass; pass < maxPasses; pass += 1) {
+  let last = "";
+  for (let pass = 0; pass < maxPasses; pass += 1) {
     if (hasMustacheTags(current)) {
       if (detectCycles) {
-        if (seen.has(current)) {
+        if (last === current) {
           throw new Error(`Render cycle detected at pass ${pass}: "${current}"`);
         }
         ;
-        seen.add(current);
+        last = current;
       }
       ;
       const next = import_mustache.default.render(current, VariableView.all);
-      if (next === current) {
-        return next;
+      if (next !== "" && next === current) {
+        current = next;
+      } else {
+        return current;
       }
-      ;
-      current = next;
     } else {
       console.log("passes:", pass);
       return current;
     }
   }
   ;
-  console.log("passes:", pass);
   return current;
 }
 

package/dist/index.d.cts

@@ -10,6 +10,12 @@ type MustacheIterationOptions = {
     maxPasses?: number;
     detectCycles?: boolean;
 };
+/**
+ * Replaces all mustache tokens recursively until there are none left that can be replaced.
+ * @param template
+ * @param param1
+ * @returns
+ */
 declare function replaceAllMustaches(template: string, { maxPasses, detectCycles }?: MustacheIterationOptions): string;
 
 type MustacheValue = string | string[] | Function;

package/dist/index.d.ts

@@ -10,6 +10,12 @@ type MustacheIterationOptions = {
     maxPasses?: number;
     detectCycles?: boolean;
 };
+/**
+ * Replaces all mustache tokens recursively until there are none left that can be replaced.
+ * @param template
+ * @param param1
+ * @returns
+ */
 declare function replaceAllMustaches(template: string, { maxPasses, detectCycles }?: MustacheIterationOptions): string;
 
 type MustacheValue = string | string[] | Function;

package/dist/index.js

@@ -1,14 +1,3 @@
-// src/nodes/helperFunctions.ts
-function hasMustacheTags(template) {
-  return template.includes("{{") || template.includes("}}");
-}
-function hasDuplicates(arr) {
-  return new Set(arr).size !== arr.length;
-}
-
-// src/nodes/replaceAllMustaches.ts
-import Mustache from "mustache";
-
 // src/nodes/VariableView.ts
 var VariableView = class _VariableView {
   static _collection = [];
@@ -45,34 +34,41 @@ var VariableView = class _VariableView {
   }
 };
 
+// src/nodes/helperFunctions.ts
+function hasMustacheTags(template) {
+  return template.includes("{{") || template.includes("}}");
+}
+function hasDuplicates(arr) {
+  return new Set(arr).size !== arr.length;
+}
+
 // src/nodes/replaceAllMustaches.ts
+import Mustache from "mustache";
 function replaceAllMustaches(template, { maxPasses = 20, detectCycles = true } = {}) {
   let current = template;
-  const seen = /* @__PURE__ */ new Set();
-  let pass = 0;
-  for (pass; pass < maxPasses; pass += 1) {
+  let last = "";
+  for (let pass = 0; pass < maxPasses; pass += 1) {
     if (hasMustacheTags(current)) {
       if (detectCycles) {
-        if (seen.has(current)) {
+        if (last === current) {
           throw new Error(`Render cycle detected at pass ${pass}: "${current}"`);
         }
         ;
-        seen.add(current);
+        last = current;
       }
       ;
       const next = Mustache.render(current, VariableView.all);
-      if (next === current) {
-        return next;
+      if (next !== "" && next === current) {
+        current = next;
+      } else {
+        return current;
       }
-      ;
-      current = next;
     } else {
       console.log("passes:", pass);
       return current;
     }
   }
   ;
-  console.log("passes:", pass);
   return current;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replace-all-mustaches",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Replace all mustache templates in a string, including recursive mustache values",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -23,5 +23,13 @@
   "allowScripts": {
     "esbuild@0.27.7": true,
     "fsevents@2.3.3": true
-  }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jjkubik/replace-all-mustaches.git"
+  },
+  "bugs": {
+    "url": "https://github.com/jjkubik/replace-all-mustaches/issues"
+  },
+  "homepage": "https://github.com/jjkubik/replace-all-mustaches#readme"
 }

package/src/nodes/helperFunctions.ts

@@ -1,12 +1,18 @@
+import { VariableView } from "./VariableView";
+
 /**
  * Confirm whether there are valid mustache tags remaining in the template string.
  * @param template
  * @returns 
  */
 export function hasMustacheTags(template: string): boolean {
-  return template.includes("{{") || template.includes("}}");
+  return template.includes("{{") || template.includes("}}")
 };
 
 export function hasDuplicates(arr:any[]){
     return new Set(arr).size !== arr.length;
+};
+
+function hasVariable(label:string){
+  return VariableView.allNames.includes(label);
 };

package/src/nodes/replaceAllMustaches.ts

@@ -7,37 +7,42 @@ type MustacheIterationOptions = {
   detectCycles?: boolean;
 };
 
+/**
+ * Replaces all mustache tokens recursively until there are none left that can be replaced.
+ * @param template 
+ * @param param1 
+ * @returns 
+ */
 export function replaceAllMustaches(
     template: string,
     { maxPasses = 20, detectCycles = true }: MustacheIterationOptions = {},
     ): string {
         let current = template;
-        const seen = new Set<string>();
+        let last = ""; // To ensure that the same token isn't replaced twice in a row
 
-        let pass = 0
-        for (pass; pass < maxPasses; pass += 1) {
-            if (hasMustacheTags(current)){
-                if (detectCycles) {
-                    if (seen.has(current)) {
+        for (let pass = 0; pass < maxPasses; pass += 1) {
+            if (hasMustacheTags(current)){ // If any {{}} remain...
+                if (detectCycles) { // If you check the number of cycles, which you do by default, throw an error and stop
+                    if (last === current) {
                         throw new Error(`Render cycle detected at pass ${pass}: "${current}"`);
                     };
 
-                    seen.add(current);
+                    last = current; // Now the string it's looping over will be checked next time
                 };
 
                 const next = Mustache.render(current, VariableView.all);
-
-                if (next === current) {
-                    return next; // no more substitutions happened
-                };
-
-                current = next;
+                
+                // If the string's not empty and it's not the same as the current string...
+                if (next !== "" && next === current){
+                    current = next;                    
+                } else {
+                    return current; // no more substitutions happened
+                }
             } else {
                 console.log("passes:",pass)
                 return current;
             }
         };
 
-        console.log("passes:",pass)
         return current;
 };