hbvariables now ignores any variables in the script helper

nhaouari · Nov 6, 2023 · 633eb6b · 633eb6b
1 parent 66d628d
commit 633eb6b
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 81 deletions.
diff --git a/src/context-manager.ts b/src/context-manager.ts
@@ -204,53 +204,54 @@ export default class ContextManager {
     return contexts;
   }
 
-  extractVariablesFromTemplate(templateContent: string): string[] {
-    const ast: hbs.AST.Program =
-      Handlebars.parseWithoutProcessing(templateContent);
-
-    const extractVariablesFromBody = (
-      body: hbs.AST.Statement[],
-      eachContext: string | null = null
-    ): string[] => {
-      return body
-        .flatMap((statement: hbs.AST.Statement) => {
-          if (statement.type === "MustacheStatement") {
-            const moustacheStatement: hbs.AST.MustacheStatement =
-              statement as hbs.AST.MustacheStatement;
-            const paramsExpressionList =
-              moustacheStatement.params as hbs.AST.PathExpression[];
-            const pathExpression =
-              moustacheStatement.path as hbs.AST.PathExpression;
-            const fullPath = eachContext
-              ? `${eachContext}.${pathExpression.original}`
-              : pathExpression.original;
-
-            return paramsExpressionList[0]?.original || fullPath;
-          } else if (
-            statement.type === "BlockStatement" &&
-            // @ts-ignore
-            statement.path.original === "each"
-          ) {
-            const blockStatement: hbs.AST.BlockStatement =
-              statement as hbs.AST.BlockStatement;
-            const eachVariable = blockStatement.path.original;
-            // @ts-ignore
-            const eachContext = blockStatement.params[0]?.original;
-
-            return extractVariablesFromBody(
-              blockStatement.program.body,
-              eachContext
-            );
-          } else {
-            return [];
-          }
-        })
-        .filter((value, index, self) => self.indexOf(value) === index);
-    };
-
-    const handlebarsVariables = extractVariablesFromBody(ast.body);
-    return handlebarsVariables;
-  }
+  // DEPRICATED
+  // extractVariablesFromTemplate(templateContent: string): string[] {
+  //   const ast: hbs.AST.Program =
+  //     Handlebars.parseWithoutProcessing(templateContent);
+
+  //   const extractVariablesFromBody = (
+  //     body: hbs.AST.Statement[],
+  //     eachContext: string | null = null
+  //   ): string[] => {
+  //     return body
+  //       .flatMap((statement: hbs.AST.Statement) => {
+  //         if (statement.type === "MustacheStatement") {
+  //           const moustacheStatement: hbs.AST.MustacheStatement =
+  //             statement as hbs.AST.MustacheStatement;
+  //           const paramsExpressionList =
+  //             moustacheStatement.params as hbs.AST.PathExpression[];
+  //           const pathExpression =
+  //             moustacheStatement.path as hbs.AST.PathExpression;
+  //           const fullPath = eachContext
+  //             ? `${eachContext}.${pathExpression.original}`
+  //             : pathExpression.original;
+
+  //           return paramsExpressionList[0]?.original || fullPath;
+  //         } else if (
+  //           statement.type === "BlockStatement" &&
+  //           // @ts-ignore
+  //           statement.path.original === "each"
+  //         ) {
+  //           const blockStatement: hbs.AST.BlockStatement =
+  //             statement as hbs.AST.BlockStatement;
+  //           const eachVariable = blockStatement.path.original;
+  //           // @ts-ignore
+  //           const eachContext = blockStatement.params[0]?.original;
+
+  //           return extractVariablesFromBody(
+  //             blockStatement.program.body,
+  //             eachContext
+  //           );
+  //         } else {
+  //           return [];
+  //         }
+  //       })
+  //       .filter((value, index, self) => self.indexOf(value) === index);
+  //   };
+
+  //   const handlebarsVariables = extractVariablesFromBody(ast.body);
+  //   return handlebarsVariables;
+  // }
 
   async getTemplateContext(props: {
     editor?: Editor;

diff --git a/src/text-generator.ts b/src/text-generator.ts
@@ -741,15 +741,16 @@ ${removeYAML(content)}
       this.contextManager.splitTemplate(templateContent);
 
     const variables = this.contextManager.getHBVariablesOfTemplate(
+      preRunnerContent,
       inputContent,
       outputContent,
-      preRunnerContent
     );
 
-    console.log(
-      { variables },
-      this.contextManager.extractVariablesFromTemplate(inputContent)
-    );
+    console.log({
+      taking: "variables",
+      outputContent,
+      variables
+    })
 
     const metadata = this.getMetadata(props.templatePath || "");
     const tempateContext = await this.contextManager.getTemplateContext(props);

diff --git a/src/ui/settings/sections/considered-context.tsx b/src/ui/settings/sections/considered-context.tsx
@@ -132,11 +132,36 @@ export default function ConsideredContextSetting(props: {
         </SettingItem>
       </SettingsSection>
       <SettingsSection
-        title="Considered Context For Templates"
+        title="Template Settings"
         className="flex w-full flex-col"
         register={props.register}
         id={sectionId}
       >
+        <SettingItem
+          name="{{Context}} Template"
+          description="Template for {{context}} variable"
+          register={props.register}
+          sectionId={sectionId}
+          textArea
+        >
+          <textarea
+            placeholder="Textarea will autosize to fit the content"
+            className="resize-y"
+            value={
+              global.plugin.settings.context.contextTemplate ||
+              global.plugin.defaultSettings.context.contextTemplate
+            }
+            onChange={async (e) => {
+              global.plugin.settings.context.contextTemplate = e.target.value;
+              global.triggerReload();
+              await global.plugin.saveSettings();
+            }}
+            spellCheck={false}
+            rows={10}
+          />
+        </SettingItem>
+        <AvailableVars vars={contextVariablesObj} />
+
         {(["includeClipboard"] as (keyof Context)[])
           //   .filter((d) => !contextNotForTemplate.contains(d as any))
           .map((key) => {
@@ -171,30 +196,7 @@ export default function ConsideredContextSetting(props: {
               </SettingItem>
             );
           })}
-        <SettingItem
-          name="{{Context}} Template"
-          description="Template for {{context}} variable"
-          register={props.register}
-          sectionId={sectionId}
-          textArea
-        >
-          <textarea
-            placeholder="Textarea will autosize to fit the content"
-            className="resize-y"
-            value={
-              global.plugin.settings.context.contextTemplate ||
-              global.plugin.defaultSettings.context.contextTemplate
-            }
-            onChange={async (e) => {
-              global.plugin.settings.context.contextTemplate = e.target.value;
-              global.triggerReload();
-              await global.plugin.saveSettings();
-            }}
-            spellCheck={false}
-            rows={10}
-          />
-        </SettingItem>
-        <AvailableVars vars={contextVariablesObj} />
+
         <SettingItem
           name="Allow scripts"
           description="Only enable this if you trust the authors of the templates, or know what you're doing."

diff --git a/src/ui/settings/sections/index.tsx b/src/ui/settings/sections/index.tsx
@@ -37,8 +37,8 @@ export default function SectionsMain() {
       !searchTerm.length
         ? Object.entries(items)
         : Object.entries(items).filter(([key, val]) =>
-            `${val.term} ${items[val.sectionId]?.term}`.includes(searchTerm)
-          ),
+          `${val.term} ${items[val.sectionId]?.term}`.includes(searchTerm)
+        ),
     [items, searchTerm]
   );
 
@@ -92,11 +92,11 @@ export default function SectionsMain() {
       </div>
       <ProviderSetting register={register} />
       <AdvancedSetting register={register} />
-      <OtherProvidersSetting register={register} />
       <DMPSetting register={register} />
+      <AutoSuggestSetting register={register} />
       <ConsideredContextSetting register={register} />
       <ExtractorOptionsSetting register={register} />
-      <AutoSuggestSetting register={register} />
+      <OtherProvidersSetting register={register} />
       <OptionsSetting register={register} />
     </div>
   );

diff --git a/src/utils/barhandles.ts b/src/utils/barhandles.ts
@@ -9,6 +9,12 @@ const ignoredVariables = ["output", "this", "true", "false", "script"];
 const defaultHelpers = ["if", "unless", "with", "each"];
 
 export const getHBValues = (text: string) => {
+  console.log({
+    text,
+    edited: removeScriptOccurrences(text)
+  })
+  text = removeScriptOccurrences(text);
+
   const re = /{{[{]?[{]?(.*?)[}]?[}]?}}/g;
   const tags: string[] = [];
   let matches: any;
@@ -157,4 +163,10 @@ function extractVariablesAndStrings(input: string): string[] {
   }
 
   return results;
+}
+
+function removeScriptOccurrences(text: string): string {
+  const pattern = /\{\{#script\}\}[\s\S]*?\{\{\/script\}\}/g;
+  const pattern2 = /\{\{\{\{script\}\}\}\}[\s\S]*?\{\{\{\{\/script\}\}\}\}/g;
+  return text.replace(pattern2, "").replace(pattern, "");
 }