ether-code 0.1.6 → 0.1.8

package/cli/compiler.js

@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 
 const { EtherLexer } = require('../lexer/ether-lexer')
+const { EtherParser } = require('../ether-parser')
 
 const { CSSGenerator } = require('../generators/css-generator')
 const { HTMLGenerator } = require('../generators/html-generator')
@@ -67,9 +68,10 @@ class EtherCompiler {
     
     this.lexer = new EtherLexer()
     this.generators = {}
-    this.parsers = {}
+    this.parser = null
     
     this.initGenerators()
+    this.initParser()
   }
 
   initGenerators() {
@@ -86,6 +88,11 @@ class EtherCompiler {
     }
   }
 
+  initParser() {
+    const i18nDir = path.join(__dirname, '..', 'i18n')
+    this.parser = new EtherParser(i18nDir)
+  }
+
   normalizeTarget(target) {
     const mappings = {
       javascript: 'js',
@@ -127,58 +134,7 @@ class EtherCompiler {
 
   parse(content, target) {
     const normalizedTarget = this.normalizeTarget(target)
-    
-    if (normalizedTarget === 'html') {
-      return this.parseHTML(content)
-    }
-    
-    const lexer = new EtherLexer(content)
-    const tokens = lexer.tokenize()
-    
-    try {
-      const ParserClass = this.loadParser(normalizedTarget)
-      if (ParserClass) {
-        const parser = new ParserClass(tokens, this.config)
-        return parser.parse()
-      }
-    } catch (err) {
-    }
-    
-    return this.buildGenericAST(tokens, target)
-  }
-
-  parseHTML(content) {
-    const { HTMLParser } = require('../parsers/html-parser')
-    const i18nPath = path.join(__dirname, '..', 'i18n', 'i18n-html.json')
-    const parser = new HTMLParser(i18nPath)
-    return parser.parse(content)
-  }
-
-  loadParser(target) {
-    try {
-      const parserPath = path.join(__dirname, '..', 'parsers', `${target}-parser.js`)
-      if (fs.existsSync(parserPath)) {
-        const module = require(parserPath)
-        const className = `${target.charAt(0).toUpperCase()}${target.slice(1)}Parser`
-        return module[className] || module.default || Object.values(module)[0]
-      }
-    } catch (err) {
-    }
-    return null
-  }
-
-  buildGenericAST(tokens, target) {
-    return {
-      type: 'Program',
-      target,
-      body: tokens.map(token => ({
-        type: 'Token',
-        tokenType: token.type,
-        value: token.value,
-        line: token.line,
-        column: token.column
-      }))
-    }
+    return this.parser.parse(content, normalizedTarget)
   }
 
   generate(ast, target) {

package/cli/ether.js

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

package/generators/css-generator.js

@@ -5,11 +5,6 @@ class CSSGenerator {
     this.i18n = null
     this.indent = 0
     this.output = ''
-    this.propertyMap = {}
-    this.valueMap = {}
-    this.unitMap = {}
-    this.colorMap = {}
-    this.selectorMap = {}
     
     if (i18nPath) {
       this.loadI18n(i18nPath)
@@ -127,27 +122,7 @@ class CSSGenerator {
       return mapped
     }
     
-    let result = this.translateGeneric(val)
-    result = this.translateColorsInValue(result)
-    return result
-  }
-
-  translateColorsInValue(val) {
-    if (typeof val !== 'string') return val
-    
-    const colorMap = {
-      'blanc': 'white', 'noir': 'black', 'rouge': 'red', 'vert': 'green',
-      'bleu': 'blue', 'jaune': 'yellow', 'orange': 'orange', 'violet': 'purple',
-      'rose': 'pink', 'gris': 'gray', 'cyan': 'cyan', 'magenta': 'magenta',
-      'marron': 'brown', 'beige': 'beige', 'or': 'gold', 'argent': 'silver'
-    }
-    
-    let result = val
-    for (const [fr, en] of Object.entries(colorMap)) {
-      const regex = new RegExp(`\\b${fr}\\b`, 'gi')
-      result = result.replace(regex, en)
-    }
-    return result
+    return this.translateGeneric(val)
   }
 
   translateGeneric(text) {
@@ -160,8 +135,7 @@ class CSSGenerator {
       'style': 'font-style',
       'alignement': 'text-align',
       'decoration': 'text-decoration',
-      'transformation texte': 'text-transform',
-      'transformation': 'transform',
+      'transformation': 'text-transform',
       'debordement': 'overflow',
       'largeur': 'width',
       'hauteur': 'height',
@@ -184,7 +158,6 @@ class CSSGenerator {
       'animation': 'animation',
       'filtre': 'filter',
       'ajustement': 'object-fit',
-      'selection utilisateur': 'user-select',
       'selection': 'user-select',
       'redimensionner': 'resize',
       'visibilite': 'visibility',
@@ -210,7 +183,7 @@ class CSSGenerator {
       'rose': 'pink',
       'gris': 'gray',
       'transparent': 'transparent',
-      'hériter': 'inherit',
+      'heriter': 'inherit',
       'initial': 'initial',
       'aucun': 'none',
       'auto': 'auto',
@@ -223,7 +196,7 @@ class CSSGenerator {
       'statique': 'static',
       'collant': 'sticky',
       'centre': 'center',
-      'début': 'flex-start',
+      'debut': 'flex-start',
       'fin': 'flex-end',
       'entre': 'space-between',
       'autour': 'space-around',
@@ -259,32 +232,32 @@ class CSSGenerator {
   }
 
   translateSelector(selector) {
-    if (!selector) return selector
     let result = selector
 
-    result = result.replace(/\s+au survol/gi, ':hover')
-    result = result.replace(/\s+au clic/gi, ':active')
-    result = result.replace(/\s+au focus/gi, ':focus')
-    result = result.replace(/\s+au focus dans/gi, ':focus-within')
-    result = result.replace(/\s+visite/gi, ':visited')
-    result = result.replace(/\s+premier enfant/gi, ':first-child')
-    result = result.replace(/\s+dernier enfant/gi, ':last-child')
-    result = result.replace(/\s+enfant impair/gi, ':nth-child(odd)')
-    result = result.replace(/\s+enfant pair/gi, ':nth-child(even)')
-    result = result.replace(/\s+avant/gi, '::before')
-    result = result.replace(/\s+apres/gi, '::after')
-    result = result.replace(/\s+selection/gi, '::selection')
-    result = result.replace(/\s+placeholder/gi, '::placeholder')
-    result = result.replace(/\s+premiere lettre/gi, '::first-letter')
-    result = result.replace(/\s+premiere ligne/gi, '::first-line')
-    result = result.replace(/\s+coche/gi, ':checked')
-    result = result.replace(/\s+desactive/gi, ':disabled')
-    result = result.replace(/\s+requis/gi, ':required')
-    result = result.replace(/\s+optionnel/gi, ':optional')
-    result = result.replace(/\s+valide/gi, ':valid')
-    result = result.replace(/\s+invalide/gi, ':invalid')
-    result = result.replace(/\s+vide/gi, ':empty')
-    result = result.replace(/^racine$/gi, ':root')
+    result = result.replace(/au survol/gi, ':hover')
+    result = result.replace(/au clic/gi, ':active')
+    result = result.replace(/au focus/gi, ':focus')
+    result = result.replace(/au focus dans/gi, ':focus-within')
+    result = result.replace(/visite/gi, ':visited')
+    result = result.replace(/premier enfant/gi, ':first-child')
+    result = result.replace(/dernier enfant/gi, ':last-child')
+    result = result.replace(/enfant impair/gi, ':nth-child(odd)')
+    result = result.replace(/enfant pair/gi, ':nth-child(even)')
+    result = result.replace(/avant/gi, '::before')
+    result = result.replace(/apres/gi, '::after')
+    result = result.replace(/selection/gi, '::selection')
+    result = result.replace(/placeholder/gi, '::placeholder')
+    result = result.replace(/premiere lettre/gi, '::first-letter')
+    result = result.replace(/premiere ligne/gi, '::first-line')
+    result = result.replace(/coche/gi, ':checked')
+    result = result.replace(/desactive/gi, ':disabled')
+    result = result.replace(/active/gi, ':enabled')
+    result = result.replace(/requis/gi, ':required')
+    result = result.replace(/optionnel/gi, ':optional')
+    result = result.replace(/valide/gi, ':valid')
+    result = result.replace(/invalide/gi, ':invalid')
+    result = result.replace(/vide/gi, ':empty')
+    result = result.replace(/racine/gi, ':root')
 
     return result
   }
@@ -345,6 +318,14 @@ class CSSGenerator {
     if (!node) return
 
     switch (node.type) {
+      case 'StyleSheet':
+      case 'stylesheet':
+        if (node.rules) {
+          for (const rule of node.rules) {
+            this.generateNode(rule)
+          }
+        }
+        break
       case 'Rule':
       case 'rule':
         this.generateRule(node)
@@ -400,6 +381,12 @@ class CSSGenerator {
     this.indent--
     this.writeLine('}')
     this.writeLine('')
+
+    if (node.nestedRules) {
+      for (const nested of node.nestedRules) {
+        this.generateNode(nested)
+      }
+    }
   }
 
   generateDeclaration(decl) {

package/generators/graphql-generator.js

@@ -5,9 +5,6 @@ class GraphQLGenerator {
     this.i18n = null
     this.indent = 0
     this.output = ''
-    this.keywordMap = {}
-    this.typeMap = {}
-    this.directiveMap = {}
     
     if (i18nPath) {
       this.loadI18n(i18nPath)
@@ -50,45 +47,45 @@ class GraphQLGenerator {
   translateGeneric(word) {
     const translations = {
       'type': 'type',
-      'requête': 'Query',
+      'requete': 'Query',
       'mutation': 'Mutation',
       'abonnement': 'Subscription',
       'schema': 'schema',
       'interface': 'interface',
       'union': 'union',
       'enum': 'enum',
-      'énumération': 'enum',
-      'entrée': 'input',
+      'enumeration': 'enum',
+      'entree': 'input',
       'scalaire': 'scalar',
-      'étend': 'extend',
-      'implémente': 'implements',
+      'etend': 'extend',
+      'implemente': 'implements',
       'fragment': 'fragment',
       'sur': 'on',
       'directive': 'directive',
-      'répéter': '@repeatable',
-      'chaîne': 'String',
+      'repeter': '@repeatable',
+      'chaine': 'String',
       'entier': 'Int',
       'flottant': 'Float',
-      'booléen': 'Boolean',
+      'booleen': 'Boolean',
       'identifiant': 'ID',
       'date': 'Date',
       'datetime': 'DateTime',
       'json': 'JSON',
       'url': 'URL',
-      'courriel': 'Email',
+      'email': 'Email',
       'vrai': 'true',
       'faux': 'false',
       'nul': 'null',
       'non nul': '!',
       'liste': '[]',
-      'déprécié': '@deprecated',
+      'deprecie': '@deprecated',
       'ignorer': '@skip',
       'inclure': '@include',
       'si': 'if',
       'raison': 'reason',
       'requiert': '@requires',
       'fournit': '@provides',
-      'clé': '@key',
+      'cle': '@key',
       'externe': '@external',
       'champs': 'fields'
     }
@@ -101,28 +98,28 @@ class GraphQLGenerator {
     if (!type) return ''
     
     const types = {
-      'chaîne': 'String',
+      'chaine': 'String',
       'entier': 'Int',
       'flottant': 'Float',
-      'booléen': 'Boolean',
+      'booleen': 'Boolean',
       'identifiant': 'ID',
       'date': 'Date',
       'datetime': 'DateTime',
       'heure': 'Time',
       'json': 'JSON',
       'url': 'URL',
-      'courriel': 'Email',
+      'email': 'Email',
       'telephone': 'Phone',
       'uuid': 'UUID',
       'grand entier': 'BigInt',
       'decimal': 'Decimal',
       'positif entier': 'PositiveInt',
-      'négatif entier': 'NegativeInt',
-      'non négatif entier': 'NonNegativeInt',
+      'negatif entier': 'NegativeInt',
+      'non negatif entier': 'NonNegativeInt',
       'non positif entier': 'NonPositiveInt',
       'positif flottant': 'PositiveFloat',
-      'négatif flottant': 'NegativeFloat',
-      'non vide chaîne': 'NonEmptyString',
+      'negatif flottant': 'NegativeFloat',
+      'non vide chaine': 'NonEmptyString',
       'upload': 'Upload',
       'vide': 'Void'
     }
@@ -659,7 +656,7 @@ class GraphQLGenerator {
   }
 
   generateVariableDefinition(variable) {
-    const name = variable.variable?.name?.value || variable.variable?.name || variable.name
+    const name = variable.variable?.name?.value || variable.name
     const type = this.generateType(variable.type)
     const defaultValue = variable.defaultValue
     const directives = variable.directives || []