ayo/mcfly
ayo/mcfly
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: improve evaluation of dynamic content inside {{ }}

Browse source 
- evaluate js expressions
- fix regex matching skips every other match
This commit is contained in:
Ayo Ayco 2024-12-27 22:43:05 +01:00
parent bd13f2f243
commit 0598c9705b
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
packages/core/event-handler.js
View file

@ -220,25 +220,43 @@ function evaluateServerScript(html) {
Object.assign(setupMap, new evalStore()) Object.assign(setupMap, new evalStore())
}) })
const regex = /{{(.*?)}}/g const regex = /\{\{(.*?)\}\}/g
let match let match
while ((match = regex.exec(html))) { while ((match = regex.exec(html))) {
let [key, value] = match let [key, rawValue] = match
value = value.replace(/\s/g, '')
// nested objects const value = rawValue.replace(/\s/g, '')
console.log('>>> value', rawValue)
const keys = value.split('.') const keys = value.split('.')
let finalValue = '' let finalValue = ''
let setupCopy = setupMap let setupCopy = setupMap
keys.forEach((i) => { // if not in the server script, it could be a js expression
finalValue = setupCopy[i] if (!(keys[0] in setupMap)) {
try {
console.log('>>> trying to evaluate', rawValue)
finalValue = eval(rawValue)
} catch (e) {
console.error('ERR! Failed to evaluate expression', e)
}
}
// nested objects
keys.forEach((key) => {
if (key in setupCopy) {
finalValue = setupCopy[key]
setupCopy = finalValue setupCopy = finalValue
}
}) })
html = html.replace(key, finalValue) html = html.replace(key, finalValue ?? '')
regex.lastIndex = -1
} }
console.log('setupMap', setupMap)
console.log('________')
return html return html
} }

4
site/src/pages/demo.html
View file

@ -17,6 +17,9 @@
function sum(x, y) { function sum(x, y) {
return x + y; return x + y;
} }
const hey = 'hey'
const world = 'world'
</script> </script>
</my-head> </my-head>
<body> <body>
@ -26,6 +29,7 @@
<main> <main>
<section id="intro"> <section id="intro">
<h1>McFly Demo</h1> <h1>McFly Demo</h1>
<h2>{{ hey }}, {{ world }} {{1+1}} {{hey}} {{3-2}} {{hey}} {{new Date().toString()}}</h2>
<warning-block <warning-block
><span>This page is in-progress. See the ><span>This page is in-progress. See the
<a <a