@peter.naydenov/morph 3.1.5 → 3.3.0

package/src/methods/_readTemplate.js

@@ -52,52 +52,28 @@ function _readTemplate ( tpl ) {
 
     if ( typeof chop  === 'string' )   hasError = chop
     else {
-                    chop.forEach ( (item,i) => {
-                                    const 
-                                            // Placeholder contains: Opening tag(TG_PRX), dataName, delimiter(:), list of operations, placeholder's name, closing tag(TG_SFX)
-                                              finding = RegExp ( TG_PRX + '\\s*(.*?)\\s*(?::\\s*(.*?)\\s*)?(?::\\s*(.*?)\\s*)?' + TG_SFX, 'g' )
-                                            , isPlaceholder = item.includes( TG_PRX )
-                                            ;
-                                           
-                                    if ( isPlaceholder ) {
-                                                    const x = finding.exec ( item )
-                                                    if ( !x ) return
-                                                    let holder = {
-                                                                      index: i
-                                                                    , data   : readData    ( x[1] )
-                                                                    , action : x[2] ? x[2].split(',').map ( x => x.trim()) : null 
-                                                                    , name   : x[3] ? x[3].trim() : null
-                                                                }
-                                                    placeholders.push ( holder )
-                                                    snippets[placeholders.length-1] = holder
-                                                    if ( holder.name )   snippets[holder.name] = holder
-                                            } // if isPlaceholder
-                            }) // forEach chop
-            } // else error
-
-
-
-    // Check helpers - sanity check
-    placeholders.forEach ( holder => {
-                if ( !holder.action ) return
-                holder.action.every ( act => {
-                                        if ( act === '#'  )   return true
-                                        if ( act === '^^' )   return true
-                                        if ( act.startsWith('^') && act !== '^^' )   return true
-                                        if ( act.startsWith ( '?' )) act = act.replace ( '?', '' )
-                                        if ( act.startsWith ( '+' )) act = act.replace ( '+', '' )
-                                        if ( act.startsWith ( '[]' )) act = act.replace ( '[]', '' )
-                                        if ( act.startsWith ( '>' )) act = act.replace ( '>', '' )
-                                        if ( act === ''   )   return true
-                                        if ( helpers[act] )   return true 
-                                        else {
-                                                hasError = `Error: Missing helper: ${act}`
-                                                return false
-                                                }
-                        }) // every action
-            }) // forEach placeholders
-
-
+              chop.forEach ( (item,i) => {
+                              const 
+                                      // Placeholder contains: Opening tag(TG_PRX), dataName, delimiter(:), list of operations, placeholder's name, closing tag(TG_SFX)
+                                        finding = RegExp ( TG_PRX + '\\s*(.*?)\\s*(?::\\s*(.*?)\\s*)?(?::\\s*(.*?)\\s*)?' + TG_SFX, 'g' )
+                                      , isPlaceholder = item.includes( TG_PRX )
+                                      ;
+                                      
+                              if ( isPlaceholder ) {
+                                              const x = finding.exec ( item )
+                                              if ( !x ) return
+                                              let holder = {
+                                                                index: i
+                                                              , data   : readData    ( x[1] )
+                                                              , action : x[2] ? x[2].split(',').map ( x => x.trim()) : null 
+                                                              , name   : x[3] ? x[3].trim() : null
+                                                      }
+                                              placeholders.push ( holder )
+                                              snippets[placeholders.length-1] = holder
+                                              if ( holder.name )   snippets[holder.name] = holder
+                                      } // if isPlaceholder
+                      }) // forEach chop
+      } // else error
 
     return {
               hasError 

package/src/methods/_renderHolder.js

@@ -26,17 +26,23 @@ function _renderHolder ( template, data ) {
           chop = _chopTemplate (settings)( template )
         , set  = settings
         ;
-    chop.forEach ( (item,i) => {
-                            const isPlaceholder = item.includes ( set.TG_PRX )
-                            if ( isPlaceholder ) {
-                                            const field = item.replace ( set.TG_PRX, '' ).replace ( set.TG_SFX, '' ).trim();
-                                            if ( data.hasOwnProperty (field) && data[field] != null )  chop[i] = data[field]
-                                    } // if isPlaceholder
-                    }) // forEach chop
+    if ( typeof chop === 'string' )   return chop
+    chop.forEach ( ( item, i ) => {
+            const isPlaceholder = item.includes ( set.TG_PRX )
+            if ( isPlaceholder ) {
+                        const field = item.replace(set.TG_PRX, '').replace(set.TG_SFX, '').trim();
+                        if (data.hasOwnProperty(field) && data[field] != null) {
+                                let val = data [ field ]
+                                if ( typeof val === 'object' && val.text )   val = val.text
+                                chop[i] = val
+                            }
+                } // if isPlaceholder
+        }) // forEach chop
     return chop.join ( '' )
 } // _renderHolder func.
 
 
+
 export default _renderHolder
 
 

package/src/methods/_setupActions.js

@@ -40,14 +40,7 @@ function _setupActions ( actions, dataDeepLevel=10 ) {
                                     if ( actLevel > dataDeepLevel )  return false
                                     return true
                             }
-                    if ( act.startsWith ( '?' ) ) {   // it's a condition render action
-                                    actSetup[actLevel].push ({
-                                                      type: 'route'
-                                                    , name: act.replace ( '?', '' )
-                                                    , level: actLevel
-                                                    })
-                                    return true
-                            }
+
                     if ( act.startsWith ('^')  && act !== '^^'  ) {
                                    actSetup[actLevel].push ({
                                                           type: 'save'