fix: template engine

PR: #14

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esseswann/lev",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "repository": {
     "urL": "git+https://github.com/esseswann/lev.git",
     "type": "git"
@@ -13,7 +13,7 @@
     "lib",
     "package.json",
     "README.md"
-  ],  
+  ],
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
@@ -47,4 +47,4 @@
     "ydb-codegen": "0.2.7",
     "ydb-sdk": "5.1.1"
   }
-}
+}

src/metadata/compileTemplates.ts

@@ -10,13 +10,15 @@ export const compileTemplates = (
 ) => {
   const matches = template.content.matchAll(IMPORT_REGEX)
   const result = extractSections(template.content)
+  let compiledTemplates = ''
   for (const match of matches) {
     const compiled = compileTemplate(templates, new Set(path), match[1])
     if (compiled) {
       result.declares = mergeDeclares(result.declares, compiled.declares)
-      result.body = compiled.body + result.body
+      compiledTemplates += compiled.body
     }
   }
+  result.body = compiledTemplates + result.body
   return result
 }
 

tests/metadata/basicTemplates/templates/access.sql

@@ -0,0 +1,3 @@
+-- import connection.sql
+
+$access = 'access';

tests/metadata/basicTemplates/templates/role.sql

@@ -1,8 +1,11 @@
 -- import connection.sql
+
 declare $input as Struct<
   from: Optional<Datetime>,
   to:  Optional<Datetime>,
   limit: Optional<Uint64>
 >;
 
-declare $kek as Optional<List<Struct< test: Utf8, plest: Utf8 >>>;declare $role as Utf8
+declare $kek as Optional<List<Struct< test: Utf8, plest: Utf8 >>>;declare $role as Utf8;
+
+$role = 'role';

tests/metadata/basicTemplates/views/view.sql

@@ -1,3 +1,4 @@
 -- import role.sql
+-- import access.sql
 
 select $role;

tests/metadata/compileView.test.ts

@@ -12,7 +12,7 @@ describe('compile view', () => {
     for await (const { result } of compileViews(viewsPath, templatesPath))
       views.push(result)
     const targetViews = [
-      'declare $connectionId as Utf8;declare $role as Utf8;declare $kek as Optional<List<Struct<test:Utf8,plest:Utf8>>>;declare $input as Struct<from:Optional<Datetime>,to:Optional<Datetime>,limit:Optional<Uint64>>;select $connectionId;select $role;'
+      `declare $connectionId as Utf8;declare $role as Utf8;declare $kek as Optional<List<Struct<test:Utf8,plest:Utf8>>>;declare $input as Struct<from:Optional<Datetime>,to:Optional<Datetime>,limit:Optional<Uint64>>;select $connectionId;$role = 'role';$access = 'access';select $role;`
     ]
     expect(views).toEqual(targetViews)
   })