Merge pull request #198 from sempare/add_interface_support

Add interface support

Author: darnocian

.github/workflows/delphi-package.yml

@@ -30,7 +30,7 @@ jobs:
         run: Sempare.Template.Tester.exe -cm:quiet -exit:continue -b -xmlfile:.\results.xml
 
       - name: publish win32 debug test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Win32 Debug Results
           path: './Win32/Debug/results.xml'
@@ -53,7 +53,7 @@ jobs:
         run: Sempare.Template.Tester.exe -cm:quiet -exit:continue -b -xmlfile:.\results.xml
 
       - name: publish win32 release test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Win32 Release Results
           path: './Win32/Release/results.xml'
@@ -75,7 +75,7 @@ jobs:
         run: Sempare.Template.Tester.exe -cm:quiet -exit:continue -b -xmlfile:.\results.xml
 
       - name: publish win64 debug test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Win64 Debug Results
           path: './Win64/Debug/results.xml'
@@ -97,7 +97,7 @@ jobs:
         run: Sempare.Template.Tester.exe -cm:quiet -exit:continue -b -xmlfile:.\results.xml
 
       - name: publish win64 release test results
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Win64 Release Results
           path: './Win64/Release/results.xml'

README.md

@@ -1,6 +1,5 @@
 ![delphi compatibility](https://img.shields.io/badge/delphi%20compatability-XE%204%20or%20newer-brightgreen)
 ![platform compatibility](https://img.shields.io/badge/platform-Android32%20%7C%20Android64%20%7C%20Linux64%20%7C%20macOS64%20%7C%20Win32%20%7C%20Win64-lightgrey)
-![license](https://img.shields.io/github/license/sempare/sempare-delphi-template-engine) 
 
 # ![](./images/sempare-logo-45px.png) Sempare Template Engine
 
@@ -12,6 +11,8 @@ License: [GPL v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html) or [Sempare Li
 
 Open Source: https://github.com/sempare/sempare-delphi-template-engine
 
+*Questionaire*: https://docs.google.com/forms/d/e/1FAIpQLScioIiDxvsWK01fMFqYr9aJ6KhCGeiw4UaU_esGuztEE7vYwA/viewform
+
 ## Contents
 - [Introduction](#Introduction)
 - [Call To Action](#CallToAction)

src/Sempare.Template.Evaluate.pas

@@ -1112,12 +1112,24 @@ function TEvaluationTemplateVisitor.Invoke(const AExpr: IMethodCallExpr; const A
   LObjType: TRttiType;
   LObject: TValue;
   LMethod: TRttiMethod;
+  LIntf: IInterface;
 begin
   LObjType := FContext.RttiContext().GetType(AObject.TypeInfo);
   LMethod := LObjType.GetMethod(AExpr.Method);
   LObject := AObject;
-  if AObject.IsType<TValue> then
-    LObject := AObject.AsType<TValue>;
+  if LObject.Kind = tkInterface then
+  begin
+    LIntf := LObject.AsInterface;
+    LObject := TObject(LIntf);
+    LObjType := FContext.RttiContext.GetType(LObject.TypeInfo);
+  end
+  else
+  begin
+    if AObject.IsType<TValue> then
+      LObject := AObject.AsType<TValue>;
+  end;
+  LMethod := LObjType.GetMethod(AExpr.Method);
+
   exit(DoInvoke(AExpr, LMethod, LObject, AArgs, AHasResult));
 end;
 

src/Sempare.Template.Rtti.pas

@@ -915,6 +915,8 @@ function TryDeref(const APosition: IPosition; const AVar, ADeref: TValue; const
   var
     LFunctionPair: TPair<TDerefMatchInterfaceFunction, TDerefFunction>;
     LIntf: IInterface;
+    LProperty: TRttiProperty;
+    LType: TRttiType;
   begin
     LIntf := AObj.AsInterface;
     for LFunctionPair in GDerefInterfaceFunctions do
@@ -925,10 +927,14 @@ function TryDeref(const APosition: IPosition; const AVar, ADeref: TValue; const
           exit(true);
       end;
     end;
+    LType := AContext.RttiContext.GetType(AObj.TypeInfo);
+    LProperty := LType.GetProperty(ADeref.AsString);
+    if assigned(LProperty) then
+      AResult := LProperty.GetValue(AObj.AsType<pointer>);
     exit(ExitEmpty(AResult));
   end;
 
-  function FixTValue(var AValue: TValue; const AResult:boolean=true): boolean;
+  function FixTValue(var AValue: TValue; const AResult: boolean = true): boolean;
   begin
     if (AValue.Kind = tkRecord) and MatchValue(AValue.TypeInfo) then
     begin

tests/Sempare.Template.TestDeref.pas

@@ -54,6 +54,12 @@   TTestTemplateDeref = class
     procedure TestDerefError;
     [Test]
     procedure TestDerefNull;
+
+    [Test]
+    procedure TestIntfProperty;
+
+    [Test]
+    procedure TestIntfMethod;
   end;
 
   TNullable = class
@@ -62,13 +68,30 @@   TNullable = class
     Other: TNullable;
   end;
 
+  ITestData = interface
+    ['{7F66CDA3-3C98-41AF-A762-8B48FEBF8700}']
+    function GetData: string;
+    property Data: string read GetData;
+  end;
+
+  TTestData = class(TInterfacedObject, ITestData)
+    function GetData: string;
+  end;
+
 implementation
 
 uses
+  System.Rtti,
   System.SysUtils,
   Sempare.Template.Context,
   Sempare.Template;
 
+{ TTestData }
+function TTestData.GetData: string;
+begin
+  exit('hello');
+end;
+
 { TTestTemplateDeref }
 
 procedure TTestTemplateDeref.Test<T>(const AValue: T; const AExpect: string; const ATemplate: string);
@@ -129,6 +152,28 @@ procedure TTestTemplateDeref.TestExprDrefef;
   Test(rec, '''before  123 after ''', '''before <% suffix := ''def'' %> <% a.b[''abc'' + suffix] %> after ''');
 end;
 
+procedure TTestTemplateDeref.TestIntfMethod;
+var
+  LIntf: ITestData;
+begin
+  LIntf := TTestData.Create;
+
+  Assert.AreEqual('hello', Template.Eval('<% _.GetData() %>', TValue.From<ITestData>(LIntf)));
+
+end;
+
+procedure TTestTemplateDeref.TestIntfProperty;
+var
+  LIntf: ITestData;
+begin
+  LIntf := TTestData.Create;
+  Assert.WillRaise(
+    procedure
+    begin
+      Assert.AreEqual('hello', Template.Eval('<% _.data %>', TValue.From<ITestData>(LIntf)));
+    end);
+end;
+
 procedure TTestTemplateDeref.TestSimpleDrefef;
 begin
   Assert.IsNotNull(Template.parse('before <% a.b %> after '));

tests/Sempare.Template.TestInclude.pas

@@ -102,6 +102,9 @@   TTestTemplateInclude = class
     [Test]
     procedure TestFunctionalInclude;
 
+    [Test]
+    procedure TestVariableAfterInclude;
+
   end;
 
 implementation
@@ -242,6 +245,14 @@   TMember = record
   Assert.AreEqual('Parent'#13#10'Child', Template.Eval(LTpl, LMember));
 end;
 
+procedure TTestTemplateInclude.TestVariableAfterInclude;
+var
+  LResult: string;
+begin
+  LResult := Template.Eval('<% template "my_template" %><% _.var %><% end %><% var := 345 %><% my_template { "var"= 123 } %> <% var %>');
+  Assert.AreEqual('123 345', LResult);
+end;
+
 procedure TTestTemplateInclude.TestFunctionalInclude;
 var
   LResult: string;