Merge pull request #7 from Omar-Belghaouti/chore/dry-utils

Chore: DRY utilities
omdxp · May 13, 2022 · d24d922 · d24d922
2 parents 7c0ac19 + fffb4af
commit d24d922
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 33 deletions.
diff --git a/bin/create/component/functions/create-component.js b/bin/create/component/functions/create-component.js
@@ -4,7 +4,7 @@ const {
   componentTemplateTs,
   stylesTemplate,
 } = require("../templates");
-const { config } = require("../../../utils");
+const { config, getComponentName } = require("../../../utils");
 
 /**
  * @function createComponent
@@ -26,15 +26,7 @@ exports.createComponent = (
   overwrite
 ) => {
   const { withStyles, withProps, defaultExports, componentsRoot } = config;
-  let component =
-    componentName.charAt(0).toUpperCase() + componentName.slice(1);
-  if (componentName.includes("-")) {
-    component = "";
-    let words = componentName.split("-");
-    words.forEach((w) => {
-      component += w.charAt(0).toUpperCase() + w.slice(1);
-    });
-  }
+  let component = getComponentName(componentName);
   if (ts) {
     const path =
       folder === ""

diff --git a/bin/create/redux/functions/create-redux-store.js b/bin/create/redux/functions/create-redux-store.js
@@ -20,7 +20,6 @@ const { config } = require("../../../utils");
  */
 exports.createReduxStore = (js, ts, overwrite) => {
   const { reduxRoot } = config;
-
   const path = `${reduxRoot}/`;
   if (fs.existsSync(path) && !overwrite) {
     console.log("Redux implementation already exists");

diff --git a/bin/create/screen/functions/create-screen.js b/bin/create/screen/functions/create-screen.js
@@ -6,7 +6,7 @@ const {
   screenFunctionTemplateTs,
   stylesTemplate,
 } = require("../templates");
-const { config } = require("../../../utils");
+const { config, getComponentName } = require("../../../utils");
 
 /**
  * @function createScreen
@@ -22,14 +22,7 @@ const { config } = require("../../../utils");
 exports.createScreen = (screenName, js, ts, folder, template, overwrite) => {
   const { withStyles, withFunctions, withProps, defaultExports, screensRoot } =
     config;
-  let screen = screenName.charAt(0).toUpperCase() + screenName.slice(1);
-  if (screenName.includes("-")) {
-    screen = "";
-    let words = screenName.split("-");
-    words.forEach((w) => {
-      screen += w.charAt(0).toUpperCase() + w.slice(1);
-    });
-  }
+  let screen = getComponentName(screenName);
   const path =
     folder === ""
       ? `${screensRoot}/${screenName.toLowerCase()}/`
@@ -50,7 +43,7 @@ exports.createScreen = (screenName, js, ts, folder, template, overwrite) => {
           });
           fs.writeFile(
             `${path}index.tsx`,
-            file.replace(/__COMPONENT__/g, page),
+            file.replace(/__COMPONENT__/g, screen),
             (err) => {
               if (err) {
                 console.log(`Unable to create ${screen} screen`);
@@ -130,7 +123,7 @@ exports.createScreen = (screenName, js, ts, folder, template, overwrite) => {
           });
           fs.writeFile(
             `${path}index.jsx`,
-            file.replace(/__COMPONENT__/g, page),
+            file.replace(/__COMPONENT__/g, screen),
             (err) => {
               if (err) {
                 console.log(`Unable to create ${screen} screen`);

diff --git a/bin/index.js b/bin/index.js
@@ -17,7 +17,7 @@ const {
   deleteConfig,
 } = require("./delete");
 const { combineComponents, combineScreens } = require("./combine");
-const { loadConfig } = require("./utils");
+const { loadConfig, rootChecker, languageChecker } = require("./utils");
 
 yargs
   .scriptName("rnhc")
@@ -83,7 +83,7 @@ yargs
         });
     },
     (argv) => {
-      if (fs.existsSync("package.json")) {
+      if (rootChecker()) {
         let {
           component,
           screen,
@@ -100,13 +100,7 @@ yargs
           loadConfig();
         } catch {}
         // check if project is written in typescript
-        let faf = fs.readdirSync("."); // folders and files
-        for (let i = 0; i < faf.length; i++) {
-          if (faf[i].endsWith("tsx")) {
-            ts = true;
-            break;
-          }
-        }
+        ts = languageChecker() === "ts" ? true : ts;
         if (component) {
           component.forEach((c) =>
             createComponent(c, js, ts, folder, template, overwrite)
@@ -170,7 +164,7 @@ yargs
         });
     },
     (argv) => {
-      if (fs.existsSync("package.json")) {
+      if (rootChecker()) {
         const { component, screen, redux, navigation, config, folder } = argv;
         try {
           loadConfig();
@@ -222,7 +216,7 @@ yargs
         });
     },
     (argv) => {
-      if (fs.existsSync("package.json")) {
+      if (rootChecker()) {
         const { component, screen, folder } = argv;
         try {
           loadConfig();

diff --git a/bin/utils/get-component-name.js b/bin/utils/get-component-name.js
@@ -0,0 +1,19 @@
+/**
+ * @function getComponentName
+ * @description Get the name of the component
+ * @param {string} name - name of component.
+ * @example getComponentName("component-name");
+ * @returns {string} "ComponentName"
+ * @author [Omar Belghaouti](https://github.com/Omar-Belghaouti)
+ */
+exports.getComponentName = (name) => {
+  let component = name.charAt(0).toUpperCase() + name.slice(1);
+  if (name.includes("-")) {
+    component = "";
+    let words = name.split("-");
+    words.forEach((w) => {
+      component += w.charAt(0).toUpperCase() + w.slice(1);
+    });
+  }
+  return component;
+};
diff --git a/bin/utils/index.js b/bin/utils/index.js
@@ -1,5 +1,11 @@
 const { config } = require("./configs");
 const { loadConfig } = require("./load-config");
+const { rootChecker } = require("./root-checker");
+const { languageChecker } = require("./language-checker");
+const { getComponentName } = require("./get-component-name");
 
 exports.config = config;
 exports.loadConfig = loadConfig;
+exports.rootChecker = rootChecker;
+exports.languageChecker = languageChecker;
+exports.getComponentName = getComponentName;
diff --git a/bin/utils/language-checker.js b/bin/utils/language-checker.js
@@ -0,0 +1,17 @@
+const fs = require("file-system");
+
+/**
+ * @function languageChecker
+ * @description Checks if the react project is written in javascript or typescript.
+ * @returns {string} "js" if the project is written in javascript and "ts" if the project is written in typescript.
+ * @author [Omar Belghaouti](https://github.com/Omar-Belghaouti)
+ */
+exports.languageChecker = () => {
+  let faf = fs.readdirSync("."); // folders and files
+  for (let i = 0; i < faf.length; i++) {
+    if (faf[i].endsWith("tsx")) {
+      return "ts";
+    }
+  }
+  return "js";
+};
diff --git a/bin/utils/root-checker.js b/bin/utils/root-checker.js
@@ -0,0 +1,11 @@
+const fs = require("file-system");
+
+/**
+ * @function rootChecker
+ * @description Check if the current directory is the root of a react project.
+ * @returns {boolean} true if the current directory is the root of a react project.
+ * @author [Omar Belghaouti](https://github.com/Omar-Belghaouti)
+ */
+exports.rootChecker = () => {
+  return fs.existsSync("package.json");
+};