astzweig/swiftpm-mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Render optimisation

Browse Source
This commit is contained in:
Adam Fowler
2021-03-18 10:55:55 +00:00
parent c560bd0fd9
commit 9b17bd6827
3 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/HummingbirdMustache/Template+Parser.swift
View File

@@ -143,12 +143,6 @@ extension HBMustacheTemplate {
// partial
parser.unsafeAdvance()
let (name, _) = try parseName(&parser)
/* if newLine && hasLineFinished(&parser) {
setNewLine = true
if parser.current() == "\n" {
parser.unsafeAdvance()
}
} */
if whiteSpaceBefore.count > 0 {
tokens.append(.text(whiteSpaceBefore))
}

70
Sources/HummingbirdMustache/Template+Render.swift
View File

@@ -2,47 +2,59 @@
extension HBMustacheTemplate {
/// Render template using object
/// - Parameters:
/// - object: Object
/// - stack: Object
/// - context: Context that render is occurring in. Contains information about position in sequence
/// - indentation: indentation of partial
/// - Returns: Rendered text
func render(_ object: [Any], context: HBMustacheContext? = nil, indentation: String? = nil) -> String {
func render(_ stack: [Any], context: HBMustacheContext? = nil, indentation: String? = nil) -> String {
var string = ""
if let indentation = indentation {
for token in tokens {
if let indentation = indentation, string.last == "\n" {
if string.last == "\n" {
string += indentation
}
switch token {
case let .text(text):
string += text
case let .variable(variable, method):
if let child = getChild(named: variable, from: object, method: method, context: context) {
if let template = child as? HBMustacheTemplate {
string += template.render(object)
string += renderToken(token, stack: stack, context: context)
}
} else {
string += String(describing: child).htmlEscape()
}
}
case let .unescapedVariable(variable, method):
if let child = getChild(named: variable, from: object, method: method, context: context) {
string += String(describing: child)
}
case let .section(variable, method, template):
let child = getChild(named: variable, from: object, method: method, context: context)
string += renderSection(child, stack: object, with: template)
case let .invertedSection(variable, method, template):
let child = getChild(named: variable, from: object, method: method, context: context)
string += renderInvertedSection(child, stack: object, with: template)
case let .partial(name, indentation):
if let template = library?.getTemplate(named: name) {
string += template.render(object, indentation: indentation)
}
for token in tokens {
string += renderToken(token, stack: stack, context: context)
}
}
return string
}
func renderToken(_ token: Token, stack: [Any], context: HBMustacheContext? = nil) -> String {
switch token {
case let .text(text):
return text
case let .variable(variable, method):
if let child = getChild(named: variable, from: stack, method: method, context: context) {
if let template = child as? HBMustacheTemplate {
return template.render(stack)
} else {
return String(describing: child).htmlEscape()
}
}
case let .unescapedVariable(variable, method):
if let child = getChild(named: variable, from: stack, method: method, context: context) {
return String(describing: child)
}
case let .section(variable, method, template):
let child = getChild(named: variable, from: stack, method: method, context: context)
return renderSection(child, stack: stack, with: template)
case let .invertedSection(variable, method, template):
let child = getChild(named: variable, from: stack, method: method, context: context)
return renderInvertedSection(child, stack: stack, with: template)
case let .partial(name, indentation):
if let template = library?.getTemplate(named: name) {
return template.render(stack, indentation: indentation)
}
}
return ""
}
/// Render a section
/// - Parameters:
/// - child: Object to render section for