@fto-consult/expo-ui 6.66.6 → 6.67.1

package/babel.config.js

@@ -14,34 +14,7 @@ module.exports = function(api,opts) {
   }
   /*** par défaut, les variables d'environnements sont stockés dans le fichier .env situé à la racine du projet, référencée par la prop base  */
   const alias =  require("./babel.config.alias")(options);
-  const $eelectron = path.resolve(__dirname,"electron");
-  const packageRootPath = path.resolve(process.cwd(),"package.json");
-  const packageJSON = fs.existsSync(packageRootPath) && require(`${packageRootPath}`) || {};
-  const envObj = require("./parse-env")();
-  const writeFilePath = path.resolve($eelectron,"utils","writeFile.js");
-  if($eelectron && fs.existsSync($eelectron)){
-     if(fs.existsSync(writeFilePath)){
-        const writeFile = require(`${writeFilePath}`);
-        //generate getTable.js file
-        const tableDataPath = envObj.TABLES_DATA_PATH && path.resolve(String(envObj.TABLES_DATA_PATH)) || packageJSON?.tablesDataPath && path.resolve(String(packageJSON.tablesDataPath)) || null;
-        if(tableDataPath && fs.existsSync(tableDataPath)){
-          const getTableJSContent = generateTableOrStructDataStr(tableDataPath);
-          if(getTableJSContent){
-            writeFile(path.resolve(tableDataPath,"getTable.js"),getTableJSContent);
-          }
-        }
-        
-        //generate getStructData.js file 
-        const structsDataPath = envObj.STRUCTS_DATA_PATH && path.resolve(String(envObj.STRUCTS_DATA_PATH)) || packageJSON?.structsDataPath && path.resolve(String(packageJSON.structsDataPath)) || null;
-        if(structsDataPath && fs.existsSync(structsDataPath)){
-          const getStructDataJSContent = generateTableOrStructDataStr(structsDataPath);
-          if(getStructDataJSContent){
-            writeFile(path.resolve(structsDataPath,"getStructData.js"),getStructDataJSContent);
-          }
-        }
-     }
-    
-  }
+  require("@fto-consult/expo-ui/bin/generate-tables")();//génère les tables des bases de données
   return {
     presets: [
       ['babel-preset-expo']
@@ -57,43 +30,3 @@ module.exports = function(api,opts) {
 };
 
 
-/****
-  retourne la chaine de caractère liée à la fonction getTable.js ou getStructData.js
-  @param {string} tableDataPath, le chemin de la tableDataPath
-  @return {string}, la chaine de caractère à enregistrer  dans la fonction getTable.js ou getStructData.js
-*/
-const generateTableOrStructDataStr = (tableDataPath)=>{
-  if(typeof tableDataPath !== 'string' || !tableDataPath.trim()) return null;
-  tableDataPath = tableDataPath.trim();
-  const fs = require("fs"), path = require("path");
-  if(fs.lstatSync(tableDataPath).isDirectory()){
-    let getTableJSContent = '';
-    const tables = fs.readdirSync(tableDataPath);
-    if(Array.isArray(tables)){
-        tables.map((table,i)=>{
-          table = table.trim();
-          const tableName = table.toUpperCase();
-          const tablePath = path.join(tableDataPath, table);
-          const indexTablePath = path.join(tablePath,"index.js");
-          const stat = fs.lstatSync(tablePath);
-          if(!stat.isDirectory() || !fs.existsSync(indexTablePath)) return;
-          const indexContent = fs.readFileSync(indexTablePath,'utf8') ;
-          if(!indexContent || (!indexContent.includes("table") && !indexContent.includes("tableName"))){
-              return;
-          }
-           getTableJSContent+=`\t\tif(tableName === "${tableName}"){return require("./${table}").default;}\n`;
-        });
-        //on génère le fichier getTable des tables data de l'application
-        if(getTableJSContent){
-          return (`
-export default function(tableName){
-\tif(!tableName || typeof tableName !=="string") return null;
-\ttableName = tableName.toUpperCase().trim();
-${getTableJSContent}\treturn null;
-}
-            `);
-        }
-    }
-  }
-  return null;
-}

package/bin/generate-tables.js

@@ -0,0 +1,69 @@
+
+const path = require("path"), fs = require("fs");
+const {writeFile} = require("./utils");
+
+/*** permet de générer les tables des bases de données de l'application
+*/
+module.exports = ()=>{
+    const projectRoot = path.resolve(process.cwd());
+    const packageRootPath = path.resolve(projectRoot,"package.json");
+    const packageJSON = fs.existsSync(packageRootPath) && require(`${packageRootPath}`) || {};
+    if(!packageJSON) return;
+    
+    //generate getTable.js file
+    const tableDataPath = packageJSON?.tablesDataPath && path.resolve(String(packageJSON.tablesDataPath)) || null;
+    if(tableDataPath && fs.existsSync(tableDataPath)){
+      const getTableJSContent = generateTableOrStructDataStr(tableDataPath);
+      if(getTableJSContent){
+        writeFile(path.resolve(tableDataPath,"getTable.js"),getTableJSContent);
+      }
+    }
+    
+    //generate getStructData.js file 
+    const structsDataPath = packageJSON?.structsDataPath && path.resolve(String(packageJSON.structsDataPath)) || null;
+    if(structsDataPath && fs.existsSync(structsDataPath)){
+      const getStructDataJSContent = generateTableOrStructDataStr(structsDataPath);
+      if(getStructDataJSContent){
+        writeFile(path.resolve(structsDataPath,"getStructData.js"),getStructDataJSContent);
+      }
+    }
+}
+/****
+  retourne la chaine de caractère liée à la fonction getTable.js ou getStructData.js
+  @param {string} tableDataPath, le chemin de la tableDataPath
+  @return {string}, la chaine de caractère à enregistrer  dans la fonction getTable.js ou getStructData.js
+*/
+const generateTableOrStructDataStr = (tableDataPath)=>{
+    if(typeof tableDataPath !== 'string' || !tableDataPath.trim()) return null;
+    tableDataPath = tableDataPath.trim();
+    if(fs.lstatSync(tableDataPath).isDirectory()){
+      let getTableJSContent = '';
+      const tables = fs.readdirSync(tableDataPath);
+      if(Array.isArray(tables)){
+          tables.map((table,i)=>{
+            table = table.trim();
+            const tableName = table.toUpperCase();
+            const tablePath = path.join(tableDataPath, table);
+            const indexTablePath = path.join(tablePath,"index.js");
+            const stat = fs.lstatSync(tablePath);
+            if(!stat.isDirectory() || !fs.existsSync(indexTablePath)) return;
+            const indexContent = fs.readFileSync(indexTablePath,'utf8') ;
+            if(!indexContent || (!indexContent.includes("table") && !indexContent.includes("tableName"))){
+                return;
+            }
+            getTableJSContent+=`\tif(tableName === "${tableName}"){return require("./${table}").default;}\n`;
+          });
+          //on génère le fichier getTable des tables data de l'application
+          if(getTableJSContent){
+            return (`
+  export default function(tableName){
+  \tif(!tableName || typeof tableName !=="string") return null;
+  \ttableName = tableName.toUpperCase().trim();
+  ${getTableJSContent}\treturn null;
+  }
+              `);
+          }
+      }
+    }
+    return null;
+  }

package/bin/index.js

@@ -15,9 +15,10 @@ const supportedScript = {
   "start" : true,//start electron
   "build" : true, //script pour faire un build,
   "package" : true, ///script pour le packagin de l'application
+  "generate-getTable" : true,/// script pour la génération de la fonction getTable des tables de l'application
   [createAppScript] : true,//les script de création de l'application
 }
-const  {createDir,writeFile,electronDir,copy,exec,throwError} = require("./utils");
+const  {createDir,electronDir,copy,exec,throwError} = require("./utils");
 const path= require("path");
 const fs = require("fs");
 const dir = path.resolve(__dirname);
@@ -124,6 +125,9 @@ if(parsedArgs.electron){
           break;
         case "build":
           break;
+        case "generate-getTable" : 
+          require("./generate-tables")();
+          break;
         default :
           if(!fs.existsSync(packagePath)){
               throwError("package.json file does not exist in "+projectRoot+". please make jure that your have running package script in expo root application");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.66.6",
+  "version": "6.67.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {