From b761d700efff9666b9bc4749830767f9c585c8a6 Mon Sep 17 00:00:00 2001
From: Alex Hoyau <a.hoyau@silexlabs.org>
Date: Thu, 16 Nov 2023 17:56:02 +0300
Subject: [PATCH] implement all states at publish time

---
 src/client/publication.ts | 30 ++++++++++++++----------------
 src/liquid.test.ts        |  4 ++--
 src/liquid.ts             |  2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/client/publication.ts b/src/client/publication.ts
index 41b50b3..3969b33 100644
--- a/src/client/publication.ts
+++ b/src/client/publication.ts
@@ -49,14 +49,13 @@ export function transformFiles(editor: DataSourceEditor, options: EleventyPlugin
     })
     if(Object.keys(query).length > 0) {
       data.files?.push({
-        type: 'other',
-        path: transformPath(editor, `/${page.getName() || 'index'}.11tydata.js`, 'other'),
+        type: ClientSideFileType.OTHER,
+        path: transformPath(editor, `/${page.getName() || 'index'}.11tydata.js`, ClientSideFileType.OTHER),
         //path: `/${page.getName() || 'index'}.11tydata.js`,
         content: getDataFile(editor, page, query),
       })
-      console.log('Create page', page.getName())
     } else {
-      console.log('no query for page', page)
+      // console.log('no query for page', page)
     }
   })
 }
@@ -134,25 +133,24 @@ export function renderComponent(component: Component, toHtml: () => string): str
     if (tagName) {
       const className = component.getClasses().join(' ')
         + statesObj.className && statesObj.className?.expression.length ? ` ${echoBlock(component, statesObj.className.expression)}` : ''
+      // Initial attributes
       const attributes = Object.entries(component.get('attributes') as object).map(([key, value]) => makeAttribute(key, value)).join(' ')
-      // TODO: + statesObj.attributes
+        // Attributes from attributes state
+        + statesObj.attributes && statesObj.attributes?.expression.length ? ` ${echoBlock(component, statesObj.attributes.expression)}` : ''
+        // SRC state
+        + statesObj.src && statesObj.src?.expression.length ? ` src="${echoBlock(component, statesObj.src.expression)}"` : ''
+        // HREF state
+        + statesObj.href && statesObj.href?.expression.length ? ` href="${echoBlock(component, statesObj.href.expression)}"` : ''
+        // Title state
+        + statesObj.title && statesObj.title?.expression.length ? ` title="${echoBlock(component, statesObj.title.expression)}"` : ''
       const style = Object.entries(component.getStyle()).map(([key, value]) => makeStyle(key, value)).join(' ')
         + statesObj.style && statesObj.style?.expression.length ? ` ${echoBlock(component, statesObj.style.expression)}` : ''
-      const innerHtml = component.getInnerHTML()
-        + statesObj.innerHtml && statesObj.innerHtml?.expression.length ? echoBlock(component, statesObj.innerHtml.expression) : ''
+      const innerHtml = statesObj.innerHTML && statesObj.innerHTML?.expression.length ? echoBlock(component, statesObj.innerHTML.expression) : component.getInnerHTML()
       const [ifStart, ifEnd] = statesObj.condition?.expression.length ? ifBlock(component, statesObj.condition.expression) : []
       const [forStart, forEnd] = statesObj.__data?.expression.length ? loopBlock('__data', component, statesObj.__data.expression) : []
       const before = (ifStart ?? '') + (forStart ?? '')
-
       const after = (ifEnd ?? '') + (forEnd ?? '')
-      // TODO: src, href, alt
-      console.log('render component', statesObj.__data, before)
-      return `${before
-      }<${tagName}
-                ${attributes}${className ? ` class="${className}"` : ''}${style ? ` style="${style}"` : ''}
-              >${innerHtml
-}</${tagName}>${after
-}`
+      return `${before}<${tagName}${attributes ? ` ${attributes}` : ''}${className ? ` class="${className}"` : ''}${style ? ` style="${style}"` : ''}>${innerHtml}</${tagName}>${after}`
     } else {
       // Not a real component
       // FIXME: understand why
diff --git a/src/liquid.test.ts b/src/liquid.test.ts
index 959f7a6..a5b45b8 100644
--- a/src/liquid.test.ts
+++ b/src/liquid.test.ts
@@ -120,7 +120,7 @@ test('get liquid bloc', () => {
   const component = editor.addComponents('test')[0]
   const result = getLiquidBlock(component, expression)
   expect(result).toHaveLength(1)
-  expect(result[0].variableName).toMatch(/var_\w+_0/)
+  expect(result[0].variableName).toMatch(/var_\w+_[09]*/)
   expect(result[0].liquid).toMatch(/assign \w+ = countries\.language/)
 })
 
@@ -130,7 +130,7 @@ test('get liquid bloc', () => {
   const component = editor.addComponents('test')[0]
   const result = getLiquidBlock(component, expression)
   expect(result).toHaveLength(2)
-  expect(result[0].variableName).toMatch(/var_\w+_0/)
+  expect(result[0].variableName).toMatch(/var_\w+_[09]*/)
   expect(result[0].liquid).toMatch(/assign \w+ = countries\.continent.countries \| first/)
 })
 
diff --git a/src/liquid.ts b/src/liquid.ts
index 3892815..ef8d6cb 100644
--- a/src/liquid.ts
+++ b/src/liquid.ts
@@ -87,6 +87,7 @@ export function ifBlock(component: Component, expression: Expression): [start: s
   `, `{% endif %}`]
 }
 
+let numNextVar = 0
 /**
  * Convert an expression to liquid code
  */
@@ -94,7 +95,6 @@ export function getLiquidBlock(component: Component, expression: Expression): {
   if(expression.length === 0) return []
   const rest = [...expression]
   const result = []
-  let numNextVar = 0
   const firstToken = expression[0]
   if(firstToken.type === 'filter') throw new Error('Expression cannot start with a filter')
   let lastVariableName = firstToken.type === 'property' ? firstToken.dataSourceId.toString() : ''