Specify template bodies on ServiceStack Script Blocks

mythz · mythz · commit f42270ad9c15 · 2019-09-20T22:43:26.000-04:00
diff --git a/src/ServiceStack.Common/Script/Blocks/WhileScriptBlock.cs b/src/ServiceStack.Common/Script/Blocks/WhileScriptBlock.cs
@@ -6,7 +6,7 @@ namespace ServiceStack.Script
 {
     /// <summary>
     /// while block
-    /// Usages: {{#while b}} {{ false | to => b }} {{/while}}
+    /// Usages: {{#while times > 0}} {{times}}. {{times - 1 | to => times}} {{/while}}
     ///         {{#while b}} {{ false | to => b }} {{else}} {{b}} was false {{/while}}
     /// 
     /// Max Iterations = Context.Args[ScriptConstants.MaxQuota]
diff --git a/src/ServiceStack/ServiceStackScripts.cs b/src/ServiceStack/ServiceStackScripts.cs
@@ -598,6 +598,7 @@ public IRawString bundleHtml(object virtualPaths, object options)
     public class SvgScriptBlock : ScriptBlock
     {
         public override string Name => "svg";
+        public override ScriptLanguage Body => ScriptTemplate.Language;
         public override async Task WriteAsync(ScriptScopeContext scope, PageBlockFragment block, CancellationToken token)
         {
             if (block.Argument.IsEmpty)
@@ -621,7 +622,8 @@ public override async Task WriteAsync(ScriptScopeContext scope, PageBlockFragmen
     public abstract class MinifyScriptBlockBase : ScriptBlock
     {
         public abstract ICompressor Minifier { get; }
-        
+        public override ScriptLanguage Body => ScriptVerbatim.Language;
+
         //reduce string allocation of block contents at runtime
         readonly ConcurrentDictionary<ReadOnlyMemory<char>, Tuple<string,string>> allocatedStringsCache = 
             new ConcurrentDictionary<ReadOnlyMemory<char>, Tuple<string,string>>();

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace ServiceStack.Script`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// while block`
`9`		`- /// Usages: {{#while b}} {{ false \| to => b }} {{/while}}`
	`9`	`+ /// Usages: {{#while times > 0}} {{times}}. {{times - 1 \| to => times}} {{/while}}`
`10`	`10`	`/// {{#while b}} {{ false \| to => b }} {{else}} {{b}} was false {{/while}}`
`11`	`11`	`///`
`12`	`12`	`/// Max Iterations = Context.Args[ScriptConstants.MaxQuota]`
Original file line number	Diff line number	Diff line change
`@@ -598,6 +598,7 @@ public IRawString bundleHtml(object virtualPaths, object options)`
`598`	`598`	`public class SvgScriptBlock : ScriptBlock`
`599`	`599`	`{`
`600`	`600`	`public override string Name => "svg";`
	`601`	`+ public override ScriptLanguage Body => ScriptTemplate.Language;`
`601`	`602`	`public override async Task WriteAsync(ScriptScopeContext scope, PageBlockFragment block, CancellationToken token)`
`602`	`603`	`{`
`603`	`604`	`if (block.Argument.IsEmpty)`
`@@ -621,7 +622,8 @@ public override async Task WriteAsync(ScriptScopeContext scope, PageBlockFragmen`
`621`	`622`	`public abstract class MinifyScriptBlockBase : ScriptBlock`
`622`	`623`	`{`
`623`	`624`	`public abstract ICompressor Minifier { get; }`
`624`		`-`
	`625`	`+ public override ScriptLanguage Body => ScriptVerbatim.Language;`
	`626`	`+`
`625`	`627`	`//reduce string allocation of block contents at runtime`
`626`	`628`	`readonly ConcurrentDictionary<ReadOnlyMemory<char>, Tuple<string,string>> allocatedStringsCache =`
`627`	`629`	`new ConcurrentDictionary<ReadOnlyMemory<char>, Tuple<string,string>>();`