@oino-ts/common 0.10.4 → 0.12.0

package/src/OINOHtmlTemplate.ts

@@ -1,12 +1,19 @@
 import { OINOStr, OINOContentType, OINOResult, OINOHttpResult, OINO_ERROR_PREFIX, OINO_WARNING_PREFIX, OINO_INFO_PREFIX, OINO_DEBUG_PREFIX, OINOBenchmark } from "."
+import { OINO_EMPTY_FORMATTER, OINOFormatter } from "./OINOFormatter"
 
 /**
  * Class for rendering HTML from data. 
  */
 export class OINOHtmlTemplate {
-    private _tag:string
-    private _tagCleanRegex:RegExp 
+    private _tagOpen:string
+    private _tagClose:string
     private _variables:Record<string, string> = {}
+    private _tagStart:number[] = []
+    private _tagEnd:number[] = []
+    private _tagVariable:string[] = []
+    private _tagFormatters:OINOFormatter[] = []
+    private _tagCount:number = 0
+
     /** HTML template string */
 	template: string;
 
@@ -23,12 +30,13 @@ export class OINOHtmlTemplate {
      * @param tag tag to identify variables in template
      * 
      */
-	constructor (template:string, tag:string = "###") {
+	constructor (template:string, tagOpen:string = "{{{", tagClose:string = "}}}") {
 		this.template = template
 		this.modified = 0
 		this.expires = 0
-        this._tag = tag
-        this._tagCleanRegex = new RegExp(tag + ".*" + tag, "g")
+        this._tagOpen = tagOpen
+        this._tagClose = tagClose
+        this._parseTemplate()
 	}
 
     /**
@@ -38,10 +46,30 @@ export class OINOHtmlTemplate {
 		return this.template == ""
 	}
 
-    protected _createHttpResult(html:string, removeUnusedTags:boolean):OINOHttpResult {
-        if (removeUnusedTags) {
-            html = html.replace(this._tagCleanRegex, "")
+    protected _parseTemplate() {
+        const tag_open_length = this._tagOpen.length
+        const tag_close_length = this._tagClose.length
+        let tag_start_pos = this.template.indexOf(this._tagOpen, 0) 
+        let tag_end_pos = this.template.indexOf(this._tagClose, tag_start_pos + tag_open_length) + tag_close_length
+        while ((tag_start_pos >= 0) && (tag_end_pos > tag_start_pos)) {
+            this._tagStart.push(tag_start_pos)
+            this._tagEnd.push(tag_end_pos)
+            let variable = this.template.slice(tag_start_pos+tag_open_length, tag_end_pos - tag_close_length)
+            const variable_parts = variable.split("|")
+            if (variable_parts.length > 1) {
+                const formatter: OINOFormatter = OINOFormatter.parse(variable_parts.slice(1))
+                this._tagFormatters.push(formatter)
+            } else {
+                this._tagFormatters.push(OINO_EMPTY_FORMATTER)
+            }
+            this._tagVariable.push(variable_parts[0])
+            this._tagCount = this._tagCount + 1
+            tag_start_pos = this.template.indexOf(this._tagOpen, tag_end_pos) 
+            tag_end_pos = this.template.indexOf(this._tagClose, tag_start_pos + tag_open_length) + tag_close_length
         }
+    }
+
+    protected _createHttpResult(html:string):OINOHttpResult {
         const result:OINOHttpResult = new OINOHttpResult(html)
         if (this.expires >= 1) {
             result.expires = Math.round(this.expires)
@@ -53,11 +81,22 @@ export class OINOHtmlTemplate {
     }
 
     protected _renderHtml():string {
-        let html:string = this.template
-        for (let key in this._variables) {
-            const value = this._variables[key]
-            html = html.replaceAll(this._tag + key + this._tag, value)
+        let html:string = ""
+        let start_pos = 0
+        let end_pos = 0
+        for (let i=0; i<this._tagCount; i++) {
+            end_pos = this._tagStart[i]
+            const key = this._tagVariable[i]
+            const value = this._tagFormatters[i].format(this._variables[key] || "")
+            html += this.template.slice(start_pos, end_pos) + value
+            start_pos = this._tagEnd[i]
         }
+        html += this.template.slice(start_pos)
+        // let html:string = this.template
+        // for (let key in this._variables) {
+        //     const value = this._variables[key]
+        //     html = html.replaceAll(this._tag + key + this._tag, value)
+        // }
         return html
     }
 
@@ -105,14 +144,12 @@ export class OINOHtmlTemplate {
 
     /**
      * Creates HTML Response from set variables.
-     *
-     * @param removeUnusedTags whether to remove unused tags
      * 
      */
-    render(removeUnusedTags:boolean = true):OINOHttpResult {
+    render():OINOHttpResult {
         const html:string = this._renderHtml()
         this.clearVariables() // clear variables after rendering
-        return this._createHttpResult(html, removeUnusedTags)
+        return this._createHttpResult(html)
     }
 
     /**
@@ -120,13 +157,12 @@ export class OINOHtmlTemplate {
      *
      * @param key key
      * @param value value
-     * @param removeUnusedTags whether to remove unused tags
      * 
      */
-    renderFromKeyValue(key:string, value:string, removeUnusedTags:boolean = true):OINOHttpResult {
+    renderFromKeyValue(key:string, value:string):OINOHttpResult {
         OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromKeyValue")
         this.setVariableFromValue(key, value)
-        const result:OINOHttpResult = this.render(removeUnusedTags)
+        const result:OINOHttpResult = this.render()
         OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromKeyValue")
         return result
     }
@@ -135,13 +171,12 @@ export class OINOHtmlTemplate {
      * Creates HTML Response from object properties.
      *
      * @param object object
-     * @param removeUnusedTags whether to remove unused tags
      * 
      */
-    renderFromObject(object:any, removeUnusedTags:boolean = true):OINOHttpResult {
+    renderFromObject(object:any = true):OINOHttpResult {
         OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromObject")
         this.setVariableFromProperties(object)
-        const result:OINOHttpResult = this.render(removeUnusedTags)
+        const result:OINOHttpResult = this.render()
         OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromObject")
         return result
     }
@@ -150,7 +185,6 @@ export class OINOHtmlTemplate {
      * Creates HTML Response from API result.
      *
      * @param result OINOResult-object
-     * @param removeUnusedTags whether to remove unused tags
      * @param messageSeparator HTML separator for messages
      * @param includeErrorMessages include debug messages in result
      * @param includeWarningMessages include debug messages in result
@@ -158,7 +192,7 @@ export class OINOHtmlTemplate {
      * @param includeDebugMessages include debug messages in result
      * 
      */
-    renderFromResult(result:OINOResult, removeUnusedTags:boolean=true, messageSeparator:string = "", includeErrorMessages:boolean=false, includeWarningMessages:boolean=false, includeInfoMessages:boolean=false, includeDebugMessages:boolean=false):OINOHttpResult {
+    renderFromResult(result:OINOResult, messageSeparator:string = "", includeErrorMessages:boolean=false, includeWarningMessages:boolean=false, includeInfoMessages:boolean=false, includeDebugMessages:boolean=false):OINOHttpResult {
         OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromResult")
         this.setVariableFromValue("statusCode", result.statusCode.toString())
         this.setVariableFromValue("statusMessage", result.statusMessage.toString())
@@ -181,7 +215,7 @@ export class OINOHtmlTemplate {
         if (messageSeparator && (messages.length > 0)) {
             this.setVariableFromValue("messages", messages.join(messageSeparator), false) // messages have been escaped already
         }        
-        const http_result:OINOHttpResult = this.render(removeUnusedTags)
+        const http_result:OINOHttpResult = this.render()
         OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromResult")
         return http_result
     }

package/src/OINOLog.ts

@@ -213,14 +213,13 @@ export abstract class OINOLog {
 
 
     /**
-     * Import log levels from an array of objects with domain, channel, method and level.
+     * Set log levels from an array of objects with domain, channel, method and level overwriting existing values (i.e. non-existing values are not affected).
      * 
      * @param logLevels array of log level objects
      * 
      */
-    static importLogLevels(logLevels:any[]):void {
+    static setLogLevels(logLevels:any[]):void {
         if (OINOLog._instance) {
-            OINOLog._instance._logLevels = {"||": OINOLog._instance._defaultLogLevel} // reset to default log level
             for (const logLevel of logLevels) {
                 const domain = logLevel.domain || ""
                 const channel = logLevel.channel || ""
@@ -232,6 +231,19 @@ export abstract class OINOLog {
             }
         }
     }
+
+    /**
+     * Import log levels from an array of objects with domain, channel, method and level resetting existing values (i.e. non-existing values get removed).
+     * 
+     * @param logLevels array of log level objects
+     * 
+     */
+    static importLogLevels(logLevels:any[]):void {
+        if (OINOLog._instance) {
+            OINOLog._instance._logLevels = {"||": OINOLog._instance._defaultLogLevel} // reset to default log level
+            this.setLogLevels(logLevels)
+        }
+    }
 }
 
 /**

package/src/index.ts

@@ -3,6 +3,7 @@ export { OINOLog, OINOLogLevel, OINOConsoleLog } from "./OINOLog.js"
 export { OINOResult, OINOHttpResult } from "./OINOResult.js"
 export { OINOStr } from "./OINOStr.js"
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js"
+export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js"
 
 /** OINO error message prefix */
 export const OINO_ERROR_PREFIX = "OINO ERROR"