ether-code 0.8.9 → 0.9.0

package/cli/ether.js

@@ -6,7 +6,7 @@ const http = require('http')
 const { EtherCompiler } = require('./compiler')
 const { Watcher } = require('./watcher')
 
-const VERSION = '0.8.9'
+const VERSION = '0.9.0'
 
 const COLORS = {
   reset: '\x1b[0m',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ether-code",
-  "version": "0.8.9",
+  "version": "0.9.0",
   "description": "Ether - Le langage intentionnel",
   "main": "cli/compiler.js",
   "bin": {

package/parsers/ether-parser-css.js

@@ -68,7 +68,7 @@ class EtherParserCSS extends EtherParserBase {
       if (!current || current.type === TokenType.EOF) break
       
       if (current.type === TokenType.IDENTIFIER) {
-        const value = current.value.toLowerCase()
+        const value = String(current.value || '').toLowerCase()
         
         if (value.startsWith('au ') || value === 'au survol' || value === 'au clic' || 
             value === 'au focus' || value === 'actif' || value === 'visite' ||
@@ -188,6 +188,9 @@ class EtherParserCSS extends EtherParserBase {
 
   translateCSSSelector(selector) {
     const map = this.reverseMaps.css || {}
+    if (typeof selector !== 'string') {
+      selector = String(selector || '')
+    }
     const lower = selector.toLowerCase()
     
     const selectorTranslations = {
@@ -248,7 +251,7 @@ class EtherParserCSS extends EtherParserBase {
       'alignement': ['texte'],
       'decoration': ['texte'],
       'transformation': ['texte'],
-      'ombre': ['texte', 'boite', 'boîte'],
+      'ombre': ['texte', 'boite', 'boîte'],
       'espacement': ['lettres'],
       'bordure': ['haut', 'bas', 'gauche', 'droite', 'couleur', 'style', 'largeur', 'arrondi'],
       'couleur': ['bordure', 'fond', 'texte', 'remplissage'],
@@ -259,19 +262,19 @@ class EtherParserCSS extends EtherParserBase {
       'direction': ['flex'],
       'enveloppe': ['flex'],
       'justifier': ['contenu'],
-      'aligner': ['elements', 'éléments', 'contenu'],
+      'aligner': ['elements', 'éléments', 'contenu'],
       'colonnes': ['grille'],
       'lignes': ['grille'],
       'espace': ['ligne', 'colonne', 'blanc'],
-      'débordement': ['x', 'y'],
+      'débordement': ['x', 'y'],
       'debordement': ['x', 'y'],
-      'événements': ['pointeur'],
+      'événements': ['pointeur'],
       'evenements': ['pointeur'],
-      'modèle': ['boite', 'boîte'],
-      'modele': ['boite', 'boîte'],
+      'modèle': ['boite', 'boîte'],
+      'modele': ['boite', 'boîte'],
       'filtre': ['fond'],
       'decoupe': ['fond'],
-      'découpe': ['fond'],
+      'découpe': ['fond'],
       'origine': ['transformation', 'perspective'],
       'liste': ['style', 'type', 'position', 'image'],
     }
@@ -281,8 +284,9 @@ class EtherParserCSS extends EtherParserBase {
     
     let nextToken = this.current()
     while (nextToken && nextToken.type === TokenType.IDENTIFIER) {
-      const propLower = property.toLowerCase()
-      if (compoundProperties[propLower] && compoundProperties[propLower].includes(nextToken.value.toLowerCase())) {
+      const propLower = String(property || '').toLowerCase()
+      const nextVal = String(nextToken.value || '').toLowerCase()
+      if (compoundProperties[propLower] && compoundProperties[propLower].includes(nextVal)) {
         property = property + ' ' + nextToken.value
         this.advance()
         nextToken = this.current()
@@ -321,7 +325,7 @@ class EtherParserCSS extends EtherParserBase {
       if (lastType === TokenType.NUMBER || lastType === TokenType.INTEGER || lastType === TokenType.FLOAT) {
         if (current.type === TokenType.IDENTIFIER) {
           const units = ['px', 'em', 'rem', '%', 'vw', 'vh', 'vmin', 'vmax', 'ch', 'ex', 'cm', 'mm', 'in', 'pt', 'pc', 'deg', 'rad', 'turn', 'ms', 's', 'fr', 'cqw', 'cqh']
-          if (units.includes(current.value.toLowerCase())) {
+          if (units.includes(String(current.value || '').toLowerCase())) {
             needsSpace = false
           }
         }
@@ -460,7 +464,7 @@ class EtherParserCSS extends EtherParserBase {
       'marqueur': '::marker'
     }
     
-    const lower = value.toLowerCase()
+    const lower = String(value || '').toLowerCase()
     return map[lower] || ':' + lower.replace(/\s+/g, '-')
   }
 
@@ -470,7 +474,7 @@ class EtherParserCSS extends EtherParserBase {
     
     if (!nameToken) return null
     
-    const name = nameToken.value.toLowerCase()
+    const name = String(nameToken.value || '').toLowerCase()
     this.advance()
     
     if (name === 'media' || name === 'requete media' || name === 'ecran' || name === 'si') {
@@ -615,7 +619,7 @@ class EtherParserCSS extends EtherParserBase {
       'vers': 'to'
     }
     
-    selector = selectorMap[selector.toLowerCase()] || selector
+    selector = typeof selector === 'string' ? (selectorMap[selector.toLowerCase()] || selector) : String(selector || '')
     this.advance()
     
     this.skipNewlines()
@@ -742,4 +746,4 @@ class EtherParserCSS extends EtherParserBase {
   }
 }
 
-module.exports = { EtherParserCSS }
+module.exports = { EtherParserCSS }

package/parsers/ether-parser-php.js

@@ -278,16 +278,6 @@ class EtherParserPHP extends EtherParserBase {
 
     const value = token.value != null ? this.normalizeAccents(String(token.value).toLowerCase()) : ''
 
-    if (token.type === TokenType.IDENTIFIER) {
-      const multiWordCall = this.tryParseMultiWordCallFromStart(lang)
-      if (multiWordCall) {
-        return {
-          type: 'ExpressionStatement',
-          expression: multiWordCall
-        }
-      }
-    }
-
     if (this.isDeclare(value)) {
       return this.parseDeclare(lang)
     }
@@ -336,6 +326,16 @@ class EtherParserPHP extends EtherParserBase {
       return this.parseSwitch(lang)
     }
 
+    if (token.type === TokenType.IDENTIFIER) {
+      const multiWordCall = this.tryParseMultiWordCallFromStart(lang)
+      if (multiWordCall) {
+        return {
+          type: 'ExpressionStatement',
+          expression: multiWordCall
+        }
+      }
+    }
+
     if (this.isTry(value)) {
       return this.parseTryStatement(lang)
     }