Body order fixes

esseswann · Sep 30, 2023 · 114e41b · 114e41b
1 parent 331ca5b
commit 114e41b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/metadata/compileTemplates.ts b/src/metadata/compileTemplates.ts
@@ -14,7 +14,7 @@ export const compileTemplates = (
     const compiled = compileTemplate(templates, new Set(path), match[1])
     if (compiled) {
       result.declares = mergeDeclares(result.declares, compiled.declares)
-      result.body += compiled.body
+      result.body = compiled.body + result.body
     }
   }
   return result

diff --git a/src/metadata/templateSections.ts b/src/metadata/templateSections.ts
@@ -2,7 +2,7 @@ import cleanQuery from './cleanQuery'
 
 export const extractSections = (view: string): TemplateSections => {
   const declaresRegex =
-    /declare \$(?<varName>[\w\d]+) as (?<type>[\w\d]+)( = (?<defaultValue>[\w\d]+))?;\s*/g
+    /declare \$(?<varName>[\w\d]+) as (?<type>[\w\d]+)( = (?<defaultValue>[\w\d]+));?\s*/g
 
   const declares = new Map<string, Declare>()
   let match
@@ -29,7 +29,6 @@ export const mergeDeclares = (left: Declares, right: Declares) => {
 
 export const compileDeclares = (declares: Declares) => {
   let result = ''
-  console.log('comipleDeclares', declares)
   for (const declare of declares) result += compileDeclare(declare)
   return result
 }