ether-code 0.1.6 → 0.1.7

package/generators/node-generator.js

@@ -19,12 +19,12 @@ class NodeGenerator extends JSGenerator {
       'nom dossier': '__dirname',
       'tampon': 'Buffer',
       'chemin': 'path',
-      'système fichiers': 'fs',
+      'systeme fichiers': 'fs',
       'http': 'http',
       'https': 'https',
       'url': 'url',
-      'chaîne requête': 'querystring',
-      'événements': 'events',
+      'chaine requete': 'querystring',
+      'evenements': 'events',
       'flux': 'stream',
       'utilitaires': 'util',
       'os': 'os',
@@ -34,38 +34,33 @@ class NodeGenerator extends JSGenerator {
       'net': 'net',
       'dns': 'dns',
       'zlib': 'zlib',
-      'créer serveur': 'createServer',
-      'écouter': 'listen',
-      'requête': 'request',
-      'réponse': 'response',
-      'entêtes': 'headers',
-      'méthode': 'method',
-      'url requête': 'url',
-      'écrire tête': 'writeHead',
+      'creer serveur': 'createServer',
+      'ecouter': 'listen',
+      'requete': 'request',
+      'reponse': 'response',
+      'entetes': 'headers',
+      'methode': 'method',
+      'url requete': 'url',
+      'ecrire tete': 'writeHead',
       'terminer': 'end',
       'sur': 'on',
-      'émettre': 'emit',
+      'emettre': 'emit',
       'une fois': 'once',
-      'retirer écouteur': 'removeListener',
+      'retirer ecouteur': 'removeListener',
       'lire fichier': 'readFile',
       'lire fichier sync': 'readFileSync',
-      'écrire fichier': 'writeFile',
-      'écrire fichier sync': 'writeFileSync',
+      'ecrire fichier': 'writeFile',
+      'ecrire fichier sync': 'writeFileSync',
       'ajouter fichier': 'appendFile',
       'supprimer fichier': 'unlink',
       'renommer': 'rename',
       'existe': 'existsSync',
       'statistiques': 'stat',
-      'créer dossier': 'mkdir',
+      'creer dossier': 'mkdir',
       'lire dossier': 'readdir',
       'supprimer dossier': 'rmdir',
       'joindre': 'join',
-      'joindre chemin': 'join',
-      'de': 'from',
-      'temporiser': 'setTimeout',
-      'intervalle': 'setInterval',
-      'promettifier': 'promisify',
-      'résoudre': 'resolve',
+      'resoudre': 'resolve',
       'base': 'basename',
       'dossier': 'dirname',
       'extension': 'extname',
@@ -75,20 +70,20 @@ class NodeGenerator extends JSGenerator {
       'arguments': 'argv',
       'environnement': 'env',
       'sortie': 'exit',
-      'répertoire travail': 'cwd',
+      'repertoire travail': 'cwd',
       'changer dossier': 'chdir',
-      'mémoire': 'memoryUsage',
+      'memoire': 'memoryUsage',
       'temps fonctionnement': 'uptime',
       'prochain tick': 'nextTick',
       'plateforme': 'platform',
       'architecture': 'arch',
       'cpus': 'cpus',
-      'mémoire totale': 'totalmem',
-      'mémoire libre': 'freemem',
+      'memoire totale': 'totalmem',
+      'memoire libre': 'freemem',
       'dossier maison': 'homedir',
       'dossier temp': 'tmpdir',
       'nom hote': 'hostname',
-      'exécuter': 'exec',
+      'executer': 'exec',
       'spawn': 'spawn',
       'fork': 'fork',
       'pid': 'pid',
@@ -97,7 +92,7 @@ class NodeGenerator extends JSGenerator {
       'socket': 'Socket',
       'serveur': 'Server',
       'chercher': 'lookup',
-      'résoudre dns': 'resolve',
+      'resoudre dns': 'resolve',
       'compresser': 'gzip',
       'decompresser': 'gunzip',
       'degonfler': 'deflate',
@@ -105,12 +100,12 @@ class NodeGenerator extends JSGenerator {
       'hash': 'createHash',
       'hmac': 'createHmac',
       'chiffrer': 'createCipher',
-      'déchiffrer': 'createDecipher',
-      'aléatoire octets': 'randomBytes',
+      'dechiffrer': 'createDecipher',
+      'aleatoire octets': 'randomBytes',
       'promisifier': 'promisify',
       'inspecter': 'inspect',
-      'hériter': 'inherits',
-      'formater chaîne': 'format',
+      'heriter': 'inherits',
+      'formater chaine': 'format',
       'deboguer': 'debuglog',
       'express': 'express',
       'application': 'app',
@@ -124,7 +119,7 @@ class NodeGenerator extends JSGenerator {
       'middleware': 'middleware',
       'corps': 'body',
       'params': 'params',
-      'requête query': 'query',
+      'requete query': 'query',
       'cookies': 'cookies',
       'session': 'session',
       'json': 'json',
@@ -142,7 +137,7 @@ class NodeGenerator extends JSGenerator {
       'trouver': 'find',
       'trouver un': 'findOne',
       'trouver par id': 'findById',
-      'créer': 'create',
+      'creer': 'create',
       'mettre a jour un': 'updateOne',
       'supprimer un': 'deleteOne',
       'sauvegarder': 'save',
@@ -164,22 +159,13 @@ class NodeGenerator extends JSGenerator {
 
     if (Array.isArray(ast)) {
       for (const node of ast) {
-        const result = this.generateNode(node)
-        if (result !== undefined && result !== '' && this.output === '') {
-          return result
-        }
+        this.generateNode(node)
       }
     } else if (ast && ast.type) {
-      const result = this.generateNode(ast)
-      if (result !== undefined && result !== '' && this.output === '') {
-        return result
-      }
+      this.generateNode(ast)
     } else if (ast && ast.body) {
       for (const node of ast.body) {
-        const result = this.generateNode(node)
-        if (result !== undefined && result !== '' && this.output === '') {
-          return result
-        }
+        this.generateNode(node)
       }
     }
 
@@ -193,10 +179,7 @@ class NodeGenerator extends JSGenerator {
       case 'RequireStatement':
         return this.generateRequire(node)
       case 'ModuleExports':
-      case 'ModuleExportsStatement':
         return this.generateModuleExports(node)
-      case 'ExportsStatement':
-        return this.generateExportsStatement(node)
       case 'ServerCreation':
         return this.generateServerCreation(node)
       case 'RouteHandler':
@@ -215,60 +198,33 @@ class NodeGenerator extends JSGenerator {
   }
 
   generateRequire(node) {
-    const module = node.source || node.module
-    const modulePath = typeof module === 'string' ? module : this.generateNode(module)
+    const module = typeof node.module === 'string' ? node.module : this.generateNode(node.module)
+    const variable = node.variable || node.name
     
-    const id = node.id || node.variable || node.name
-    
-    if (id?.type === 'ObjectPattern') {
-      const props = (id.properties || []).map(p => {
-        const key = p.key?.name || p.key
-        return this.translate(key)
-      }).join(', ')
-      this.writeLine(`const { ${props} } = require('${modulePath}');`)
-    } else if (node.destructure && node.destructure.length > 0) {
+    if (node.destructure && node.destructure.length > 0) {
       const props = node.destructure.map(p => this.translate(p)).join(', ')
-      this.writeLine(`const { ${props} } = require('${modulePath}');`)
-    } else if (id) {
-      const varName = typeof id === 'string' ? id : (id.name || this.generateNode(id))
-      this.writeLine(`const ${this.translate(varName)} = require('${modulePath}');`)
+      this.writeLine(`const { ${props} } = require('${module}');`)
+    } else if (variable) {
+      this.writeLine(`const ${this.translate(variable)} = require('${module}');`)
     } else {
-      this.writeLine(`require('${modulePath}');`)
+      this.writeLine(`require('${module}');`)
     }
   }
 
   generateModuleExports(node) {
-    const exports = node.exports || node.default
-    
-    if (exports?.type === 'ObjectExpression') {
-      const props = (exports.properties || []).map(p => {
-        const key = p.key?.name || p.key
-        if (p.shorthand) {
-          return this.translate(key)
-        }
-        const value = this.generateNode(p.value)
-        return `${this.translate(key)}: ${value}`
-      })
-      this.writeLine(`module.exports = { ${props.join(', ')} };`)
-    } else if (exports) {
-      const value = this.generateNode(exports)
-      this.writeLine(`module.exports = ${value};`)
-    } else if (node.named && Object.keys(node.named).length > 0) {
-      const exportsList = Object.entries(node.named).map(([key, value]) => {
+    if (node.named && Object.keys(node.named).length > 0) {
+      const exports = Object.entries(node.named).map(([key, value]) => {
         const translatedKey = this.translate(key)
         const translatedValue = this.generateNode(value)
         return translatedKey === translatedValue ? translatedKey : `${translatedKey}: ${translatedValue}`
       })
-      this.writeLine(`module.exports = { ${exportsList.join(', ')} };`)
+      this.writeLine(`module.exports = { ${exports.join(', ')} };`)
+    } else if (node.default) {
+      const value = this.generateNode(node.default)
+      this.writeLine(`module.exports = ${value};`)
     }
   }
 
-  generateExportsStatement(node) {
-    const name = this.translate(node.name)
-    const value = this.generateNode(node.value)
-    this.writeLine(`exports.${name} = ${value};`)
-  }
-
   generateServerCreation(node) {
     const framework = node.framework || 'http'
     
@@ -294,7 +250,7 @@ class NodeGenerator extends JSGenerator {
       const port = node.port || 3000
       this.writeLine(`app.listen(${port}, () => {`)
       this.indent++
-      this.writeLine(`console.log('Serveur démarré sur le port ${port}');`)
+      this.writeLine(`console.log('Serveur démarré sur le port ${port}');`)
       this.indent--
       this.writeLine('});')
     } else {
@@ -317,7 +273,7 @@ class NodeGenerator extends JSGenerator {
       const port = node.port || 3000
       this.writeLine(`server.listen(${port}, () => {`)
       this.indent++
-      this.writeLine(`console.log('Serveur démarré sur le port ${port}');`)
+      this.writeLine(`console.log('Serveur démarré sur le port ${port}');`)
       this.indent--
       this.writeLine('});')
     }
@@ -383,7 +339,7 @@ class NodeGenerator extends JSGenerator {
         }
         break
         
-      case 'écrire':
+      case 'ecrire':
       case 'write':
         const content = this.generateNode(node.content)
         if (node.sync) {
@@ -454,7 +410,7 @@ class NodeGenerator extends JSGenerator {
         this.writeLine(`const ${node.variable || 'readStream'} = fs.createReadStream(${source});`)
         break
         
-      case 'écrire flux':
+      case 'ecrire flux':
       case 'createWriteStream':
         this.writeLine(`const ${node.variable || 'writeStream'} = fs.createWriteStream(${source});`)
         break

package/generators/php-generator.js

@@ -5,8 +5,6 @@ class PHPGenerator {
     this.i18n = null
     this.indent = 0
     this.output = ''
-    this.keywordMap = {}
-    this.functionMap = {}
     
     if (i18nPath) {
       this.loadI18n(i18nPath)
@@ -80,7 +78,7 @@ class PHPGenerator {
       'faire': 'do',
       'selon': 'switch',
       'cas': 'case',
-      'défaut': 'default',
+      'defaut': 'default',
       'sortir': 'break',
       'continuer': 'continue',
       'essayer': 'try',
@@ -91,21 +89,21 @@ class PHPGenerator {
       'classe': 'class',
       'interface': 'interface',
       'trait': 'trait',
-      'étend': 'extends',
-      'implémente': 'implements',
+      'etend': 'extends',
+      'implemente': 'implements',
       'utiliser': 'use',
       'public': 'public',
-      'privé': 'private',
-      'protégé': 'protected',
+      'prive': 'private',
+      'protege': 'protected',
       'statique': 'static',
       'final': 'final',
       'abstrait': 'abstract',
       'constructeur': '__construct',
       'destructeur': '__destruct',
       'obtenir': '__get',
-      'définir': '__set',
+      'definir': '__set',
       'appeler': '__call',
-      'vers chaîne': '__toString',
+      'vers chaine': '__toString',
       'espace de noms': 'namespace',
       'comme': 'as',
       'vrai': 'true',
@@ -121,10 +119,10 @@ class PHPGenerator {
       'different': '!==',
       'concatener': '.',
       'tableau': 'array',
-      'chaîne': 'string',
+      'chaine': 'string',
       'entier': 'int',
       'flottant': 'float',
-      'booléen': 'bool',
+      'booleen': 'bool',
       'objet': 'object',
       'vide': 'void',
       'mixte': 'mixed',
@@ -136,7 +134,7 @@ class PHPGenerator {
       'imploser': 'implode',
       'remplacer': 'str_replace',
       'position': 'strpos',
-      'sous chaîne': 'substr',
+      'sous chaine': 'substr',
       'majuscules': 'strtoupper',
       'minuscules': 'strtolower',
       'supprimer espaces': 'trim',
@@ -145,21 +143,21 @@ class PHPGenerator {
       'fusionner': 'array_merge',
       'filtrer': 'array_filter',
       'mapper': 'array_map',
-      'réduire': 'array_reduce',
+      'reduire': 'array_reduce',
       'trier': 'sort',
       'inverser': 'array_reverse',
-      'clés': 'array_keys',
+      'cles': 'array_keys',
       'valeurs': 'array_values',
       'existe': 'isset',
       'vide test': 'empty',
       'est tableau': 'is_array',
-      'est chaîne': 'is_string',
+      'est chaine': 'is_string',
       'est entier': 'is_int',
       'est flottant': 'is_float',
       'est numerique': 'is_numeric',
       'est nul': 'is_null',
       'type de': 'gettype',
-      'convertir chaîne': 'strval',
+      'convertir chaine': 'strval',
       'convertir entier': 'intval',
       'convertir flottant': 'floatval',
       'date': 'date',
@@ -167,24 +165,23 @@ class PHPGenerator {
       'maintenant': 'now',
       'fichier existe': 'file_exists',
       'lire fichier': 'file_get_contents',
-      'écrire fichier': 'file_put_contents',
+      'ecrire fichier': 'file_put_contents',
       'ouvrir': 'fopen',
       'fermer': 'fclose',
       'lire': 'fread',
-      'écrire': 'fwrite',
+      'ecrire': 'fwrite',
       'json encoder': 'json_encode',
-      'json décoder': 'json_decode',
       'json decoder': 'json_decode',
       'regex correspondance': 'preg_match',
       'regex toutes': 'preg_match_all',
       'regex remplacer': 'preg_replace',
       'en tete': 'header',
       'rediriger': 'header',
-      'session démarrer': 'session_start',
+      'session demarrer': 'session_start',
       'session': '$_SESSION',
       'post': '$_POST',
       'get': '$_GET',
-      'requête': '$_REQUEST',
+      'requete': '$_REQUEST',
       'serveur': '$_SERVER',
       'fichiers': '$_FILES',
       'cookie': '$_COOKIE',
@@ -201,37 +198,35 @@ class PHPGenerator {
   }
 
   generate(ast) {
-    this.output = ''
+    this.output = '<?php\n\n'
     this.indent = 0
 
     if (Array.isArray(ast)) {
       for (const node of ast) {
-        const result = this.generateNode(node)
-        if (result !== undefined && result !== '' && this.output === '') {
-          return result
-        }
+        this.generateNode(node)
       }
     } else if (ast && ast.type) {
-      const result = this.generateNode(ast)
-      if (result !== undefined && result !== '' && this.output === '') {
-        return result
-      }
+      this.generateNode(ast)
     } else if (ast && ast.body) {
       for (const node of ast.body) {
-        const result = this.generateNode(node)
-        if (result !== undefined && result !== '' && this.output === '') {
-          return result
-        }
+        this.generateNode(node)
       }
     }
 
-    return this.output.trim() || '<?php'
+    return this.output.trim()
   }
 
   generateNode(node) {
     if (!node) return ''
 
     switch (node.type) {
+      case 'Program':
+        if (node.body) {
+          for (const child of node.body) {
+            this.generateNode(child)
+          }
+        }
+        return
       case 'VariableDeclaration':
         return this.generateVariableDeclaration(node)
       case 'FunctionDeclaration':
@@ -278,8 +273,6 @@ class PHPGenerator {
         return this.generateBinaryExpression(node)
       case 'AssignmentExpression':
         return this.generateAssignmentExpression(node)
-      case 'UpdateExpression':
-        return this.generateUpdateExpression(node)
       case 'ArrayExpression':
         return this.generateArrayExpression(node)
       case 'ObjectExpression':
@@ -291,29 +284,25 @@ class PHPGenerator {
       case 'NewExpression':
         return this.generateNewExpression(node)
       default:
-        if (node.name && !node.type) {
-          return this.generateIdentifier(node)
-        }
         return ''
     }
   }
 
-  generateUpdateExpression(node) {
-    const arg = this.generateNode(node.argument)
-    const op = node.operator
-    if (node.prefix) {
-      return `${op}${arg}`
-    }
-    return `${arg}${op}`
-  }
-
   generateVariableDeclaration(node) {
-    const declarations = node.declarations || []
-    
-    for (const decl of declarations) {
-      const name = this.generateIdentifier(decl.id || { name: decl.name })
-      if (decl.init) {
-        const init = this.generateNode(decl.init)
+    if (node.declarations && node.declarations.length > 0) {
+      for (const decl of node.declarations) {
+        const name = this.generateIdentifier(decl.id || { name: decl.name })
+        if (decl.init) {
+          const init = this.generateNode(decl.init)
+          this.writeLine(`${name} = ${init};`)
+        } else {
+          this.writeLine(`${name};`)
+        }
+      }
+    } else {
+      const name = '$' + (node.name || (node.id && node.id.name) || 'var')
+      if (node.init) {
+        const init = this.generateNode(node.init)
         this.writeLine(`${name} = ${init};`)
       } else {
         this.writeLine(`${name};`)
@@ -433,22 +422,14 @@ class PHPGenerator {
 
     if (node.alternate) {
       if (node.alternate.type === 'IfStatement') {
-        this.output = this.output.trimEnd() + '\n' + this.getIndent() + '} elseif '
+        this.output = this.output.trimEnd() + ' elseif '
         const altTest = this.generateNode(node.alternate.test)
         this.output += `(${altTest}) {\n`
         this.indent++
         this.generateNode(node.alternate.consequent)
         this.indent--
         if (node.alternate.alternate) {
-          if (node.alternate.alternate.type === 'IfStatement') {
-            this.generateIfStatement({ test: node.alternate.alternate.test, consequent: node.alternate.alternate.consequent, alternate: node.alternate.alternate.alternate })
-          } else {
-            this.writeLine('} else {')
-            this.indent++
-            this.generateNode(node.alternate.alternate)
-            this.indent--
-            this.writeLine('}')
-          }
+          this.generateIfStatement({ alternate: node.alternate.alternate })
         } else {
           this.writeLine('}')
         }
@@ -690,9 +671,6 @@ class PHPGenerator {
   }
 
   writeLine(text) {
-    if (this.output === '') {
-      this.output = '<?php '
-    }
     this.output += this.getIndent() + text + '\n'
   }