Delphi/delphimvcframework
1
0
Fork 0
mirror of https://github.com/danieleteti/delphimvcframework.git synced 2024-11-15 15:55:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated TemplatePro and htmx_website sample (switch from mustache to templatepro)

Browse Source
This commit is contained in:
Daniele Teti 2024-08-15 22:07:36 +02:00
parent 96a1d543c5
commit 028a88828e
10 changed files with 66 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/htmx_website/ControllerU.pas
View File

@ -37,30 +37,29 @@ uses
function TMyController.Customers: String;
begin
Result := Page(['pages/customers'], not Context.Request.IsHTMX);
Result := Page(['pages/customers']);
end;
function TMyController.Home: String;
begin
Result := Page(['pages/home'], not Context.Request.IsHTMX);
Result := Page(['pages/home']);
end;
procedure TMyController.OnBeforeAction(AContext: TWebContext;
const AActionName: string; var AHandled: Boolean);
begin
inherited;
SetPagesCommonHeaders(['_header']);
SetPagesCommonFooters(['_footer']);
ViewData['ispage'] := not AContext.Request.IsHTMX;
end;
function TMyController.Posts: String;
begin
Result := Page(['pages/posts'], not Context.Request.IsHTMX);
Result := Page(['pages/posts']);
end;
function TMyController.Users: String;
begin
Result := Page(['pages/users'], not Context.Request.IsHTMX);
Result := Page(['pages/users']);
end;
end.

4
samples/htmx_website/WebModuleU.pas
View File

@ -26,7 +26,7 @@ implementation
uses
System.IOUtils,
MVCFramework.Commons,
MVCFramework.View.Renderers.Mustache,
MVCFramework.View.Renderers.TemplatePro,
MVCFramework.Middleware.ActiveRecord,
MVCFramework.Middleware.StaticFiles,
MVCFramework.Middleware.Analytics,
@ -71,7 +71,7 @@ begin
// Controllers - END
// Server Side View
FMVC.SetViewEngine(TMVCMustacheViewEngine);
FMVC.SetViewEngine(TMVCTemplateProViewEngine);
// Server Side View - END
// Middleware

2
samples/htmx_website/bin/templates/_header.html
View File

@ -62,6 +62,6 @@
<main class="container-fluid">
<div class="parent">
<!-- Side Navigation -->
{{>partials/sidenav}}
{{include("partials/sidenav.html")}}
<!-- Main Content Area -->
<div class="main" id="main">

2
samples/htmx_website/bin/templates/pages/customers.html
View File

@ -1 +1,3 @@
{{if(ispage)}}{{include("../_header.html")}}{{endif}}
<h1 class="text-2xl font-bold mb-4">Customers</h1>
{{if(ispage)}}{{include("../_footer.html")}}{{endif}}

2
samples/htmx_website/bin/templates/pages/home.html
View File

@ -1 +1,3 @@
{{if(ispage)}}{{include("../_header.html")}}{{endif}}
<h1 class="text-2xl font-bold mb-4">HTMX WebSite</h1>
{{if(ispage)}}{{include("../_footer.html")}}{{endif}}

2
samples/htmx_website/bin/templates/pages/posts.html
View File

@ -1 +1,3 @@
{{if(ispage)}}{{include("../_header.html")}}{{endif}}
<h1 class="text-2xl font-bold mb-4">Posts</h1>
{{if(ispage)}}{{include("../_footer.html")}}{{endif}}

2
samples/htmx_website/bin/templates/pages/users.html
View File

@ -1 +1,3 @@
{{if(ispage)}}{{include("../_header.html")}}{{endif}}
<h1 class="text-2xl font-bold mb-4">Users</h1>
{{if(ispage)}}{{include("../_footer.html")}}{{endif}}

8
samples/htmx_website/htmx_website.dpr
View File

@ -17,7 +17,6 @@ uses
mormot.core.mustache,
MVCFramework.Signal,
ControllerU in 'ControllerU.pas',
HelpersU in 'HelpersU.pas',
WebModuleU in 'WebModuleU.pas' {MyWebModule: TWebModule};
{$R *.res}
@ -70,13 +69,6 @@ begin
end;
{$ENDIF}
// Project specific Mustache helpers
TMVCMustacheHelpers.OnLoadCustomHelpers := procedure(var MustacheHelpers: TSynMustacheHelpers)
begin
TSynMustache.HelperAdd(MustacheHelpers, 'MyHelper1', TMyMustacheHelpers.MyHelper1);
TSynMustache.HelperAdd(MustacheHelpers, 'MyHelper2', TMyMustacheHelpers.MyHelper2);
end;
RunServer(dotEnv.Env('dmvc.server.port', 8080));
except
on E: Exception do

1
samples/htmx_website/htmx_website.dproj
View File

@ -161,7 +161,6 @@
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="ControllerU.pas"/>
<DCCReference Include="HelpersU.pas"/>
<DCCReference Include="WebModuleU.pas">
<Form>MyWebModule</Form>
<FormType>dfm</FormType>

74
sources/TemplatePro.pas
View File

@ -38,7 +38,7 @@ type
end;
ETProParserException = class(ETProException)
ETProCompilerException = class(ETProException)
end;
@ -55,11 +55,11 @@ type
end;
TTokenType = (
ttContent, ttInclude, ttLoop, ttEndLoop, ttIfThen, ttElse, ttEndIf, ttStartTag,
ttContent, ttInclude, ttLoop, ttEndLoop, ttIfThen, ttElse, ttEndIf, ttStartTag, ttComment,
ttLiteralString, ttEndTag, ttValue, ttFilterName, ttFilterParameter, ttReset, ttLineBreak, ttEOF);
const
TOKEN_TYPE_DESCR: array [Low(TTokenType)..High(TTokenType)] of string =
('ttContent', 'ttInclude', 'ttLoop', 'ttEndLoop', 'ttIfThen', 'ttElse', 'ttEndIf', 'ttStartTag',
('ttContent', 'ttInclude', 'ttLoop', 'ttEndLoop', 'ttIfThen', 'ttElse', 'ttEndIf', 'ttStartTag', 'ttComment',
'ttLiteralString', 'ttEndTag', 'ttValue', 'ttFilterName', 'ttFilterParameter', 'ttReset', 'ttLineBreak', 'ttEOF');
type
TToken = packed record
@ -299,7 +299,10 @@ begin
lCompiler := TTProCompiler.Create(fEncoding);
try
lCompiler.Compile(aTemplate, aTokens, aFileNameRefPath);
Assert(aTokens[aTokens.Count - 1].TokenType = ttEOF);
if aTokens[aTokens.Count - 1].TokenType <> ttEOF then
begin
Error('Included file ' + aFileNameRefPath + ' doesn''t terminate with EOF');
end;
aTokens.Delete(aTokens.Count - 1); // remove the EOF
finally
lCompiler.Free;
@ -411,6 +414,10 @@ var
begin
lTmp := '';
Result := False;
if MatchString(aParamValue) then
begin
Result := True;
end;
if CharInSet(fInputString.Chars[fCharIndex], IdenfierAllowedChars) then
begin
while CharInSet(fInputString.Chars[fCharIndex], ValueAllowedChars) do
@ -494,7 +501,7 @@ var
begin
if aFileNameRefPath.IsEmpty then
begin
lFileNameRefPath := TPath.Combine(TPath.GetDirectoryName(GetModuleName(HInstance)), '<main>');
lFileNameRefPath := TPath.Combine(TPath.GetDirectoryName(GetModuleName(HInstance)), 'main.template');
end
else
begin
@ -524,7 +531,6 @@ var
lFuncName: string;
lIdentifier: string;
lIteratorName: string;
//lFuncParams: TArray<string>;
lStartVerbatim: UInt64;
lEndVerbatim: UInt64;
lIndexOfLatestIfStatement: UInt64;
@ -537,10 +543,11 @@ var
lIncludeFileContent: string;
lCurrentFileName: string;
lStringValue: string;
lIdentifierFound: Boolean;
lStringFound: Boolean;
lRef2: Integer;
lContentOnThisLine: Integer;
begin
lLastToken := ttEOF;
lContentOnThisLine := 0;
fCurrentFileName := aFileNameRefPath;
fCharIndex := -1;
fCurrentLine := 1;
@ -558,7 +565,7 @@ begin
if lEndVerbatim - lStartVerbatim > 0 then
begin
lLastToken := ttContent;
aTokens.Add(TToken.Create(lLastToken, HTMLSpecialCharsEncode(fInputString.Substring(lStartVerbatim, lEndVerbatim - lStartVerbatim)), ''));
aTokens.Add(TToken.Create(lLastToken, fInputString.Substring(lStartVerbatim, lEndVerbatim - lStartVerbatim), ''));
end;
aTokens.Add(TToken.Create(ttEOF, '', ''));
Break;
@ -569,12 +576,18 @@ begin
lEndVerbatim := fCharIndex - Length(sLineBreak);
if lEndVerbatim - lStartVerbatim > 0 then
begin
Inc(lContentOnThisLine);
aTokens.Add(TToken.Create(ttContent, fInputString.Substring(lStartVerbatim, lEndVerbatim - lStartVerbatim), ''));
end;
lStartVerbatim := fCharIndex;
if lLastToken = ttLineBreak then Inc(lContentOnThisLine);
lLastToken := ttLineBreak;
if lContentOnThisLine > 0 then
begin
aTokens.Add(TToken.Create(lLastToken, '', ''));
end;
Inc(fCurrentLine);
lContentOnThisLine := 0;
end else if MatchStartTag then {starttag}
begin
lEndVerbatim := fCharIndex - Length(START_TAG);
@ -619,6 +632,7 @@ begin
lStartVerbatim := fCharIndex;
lLastToken := ttValue;
aTokens.Add(TToken.Create(lLastToken, lVarName, '', lFuncParamsCount, lRef2));
Inc(lContentOnThisLine);
//add function with params
if not lFuncName.IsEmpty then
@ -794,6 +808,7 @@ begin
Error('Cannot read "' + lStringValue + '"');
end;
end;
Inc(lContentOnThisLine);
InternalCompileIncludedTemplate(lIncludeFileContent, aTokens, lCurrentFileName);
lStartVerbatim := fCharIndex;
end
@ -813,6 +828,8 @@ begin
end
else if MatchString(lStringValue) then {string}
begin
lLastToken := ttLiteralString;
Inc(lContentOnThisLine);
lRef2 := IfThen(MatchSymbol('$'),1,-1); // {{value$}} means no escaping
InternalMatchFilter(lStringValue, lStartVerbatim, ttLiteralString, aTokens, lRef2);
end
@ -874,7 +891,7 @@ end;
procedure TTProCompiler.Error(const aMessage: string);
begin
raise ETProParserException.CreateFmt('%s - at line %d in file %s', [aMessage, fCurrentLine, fCurrentFileName]);
raise ETProCompilerException.CreateFmt('%s - at line %d in file %s', [aMessage, fCurrentLine, fCurrentFileName]);
end;
function TTProCompiler.GetFunctionParameters: TArray<String>;
@ -995,14 +1012,14 @@ end;
function HTMLEncode(s: string): string;
begin
Result := TNetEncoding.HTML.Encode(s);
Result := HTMLSpecialCharsEncode(s);
end;
function HTMLSpecialCharsEncode(s: string): string;
procedure repl(var s: string; r: string; posi: Integer);
begin
delete(s, posi, 1);
insert(r, s, posi);
Delete(s, posi, 1);
Insert(r, s, posi);
end;
var
@ -1014,6 +1031,10 @@ begin
begin
r := '';
case ord(s[I]) of
Ord('>'):
r := 'gt';
Ord('<'):
r := 'lt';
160:
r := 'nbsp';
161:
@ -1251,6 +1272,8 @@ destructor TTProCompiledTemplate.Destroy;
begin
fLoopsStack.Free;
fTemplateFunctions.Free;
fTokens.Free;
fVariables.Free;
inherited;
end;
@ -1293,12 +1316,8 @@ function TTProCompiledTemplate.Render: String;
var
lIdx: UInt64;
lBuff: TStringBuilder;
lSectionStack: array[0..49] of String;
lLoopStmIndex: Integer;
lDataSourceName: string;
lPieces: TArray<String>;
lFieldName: string;
lLastTag: TTokenType;
lCurrTokenType: TTokenType;
lVariable: TVarDataSource;
lWrapped: ITProWrappedList;
@ -1312,23 +1331,17 @@ var
lRef2: Integer;
lJArr: TJDOJsonArray;
lJObj: TJDOJsonObject;
lJObjArr: TJDOJsonArray;
lDotPos: Integer;
lHasMember: Boolean;
lVarMember: string;
lBaseVarName: string;
lFullPath: string;
lLoopItem: TLoopStackItem;
lJValue: TJsonDataValueHelper;
begin
lLastTag := ttEOF;
lBuff := TStringBuilder.Create;
try
lIdx := 0;
while fTokens[lIdx].TokenType <> ttEOF do
begin
//Writeln(Format('%4d: %s', [lIdx, fTokens[lIdx].TokenTypeAsString]));
//Readln;
case fTokens[lIdx].TokenType of
ttContent: begin
lBuff.Append(fTokens[lIdx].Value1);
@ -1428,7 +1441,6 @@ begin
lLoopItem := PeekLoop;
lLoopStmIndex := fTokens[lIdx].Ref1;
//lDataSourceName := fTokens[lLoopStmIndex].Value1;
lDataSourceName := lLoopItem.DataSourceName;
if GetVariables.TryGetValue(lDataSourceName, lVariable) then
begin
@ -1567,18 +1579,13 @@ begin
end;
end;
ttLineBreak: begin
if not (lLastTag in [ttLoop, ttEndLoop, ttIfThen, ttEndIf, ttReset, ttElse]) then
begin
lBuff.AppendLine;
end;
end;
else
begin
Error('Invalid token: ' + fTokens[lIdx].TokenTypeAsString);
end;
end;
lLastTag := fTokens[lIdx].TokenType;
Inc(lIdx);
end;
Result := lBuff.ToString;
@ -1670,8 +1677,6 @@ var
lHasMember: Boolean;
lJPath: string;
lDataSource: string;
//lAliasedDataSource: String;
I: Integer;
lIsAnIterator: Boolean;
lJObj: TJDOJsonObject;
lVarName: string;
@ -1731,8 +1736,15 @@ begin
else
begin
lJPath := lCurrentIterator.FullPath;
if lVarMembers.IsEmpty then
begin
Result := lJObj.Path[lJPath].ArrayValue[lCurrentIterator.IteratorPosition].Value;
end
else
begin
Result := lJObj.Path[lJPath].ArrayValue[lCurrentIterator.IteratorPosition].Path[lVarMembers].Value;
end;
end;
end
else
begin