react-fs-router 0.2.8 → 0.2.12

package/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env", "@babel/preset-react"]
+}

package/bin/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const genPath = require(__dirname + "/../src/genPath/index.js");
+const genPath = require("../src/genPath");
 const { Command } = require("commander");
 const { version, name } = require("../package.json");
 
@@ -9,7 +9,13 @@ program.storeOptionsAsProperties(name);
 
 program.version(version, "-v --version", "Output the current version");
 
-program.requiredOption("-p,--path <path>", "Path to your pages folder");
+program.requiredOption("-p,--page <page>", "Path to your pages folder");
+program.requiredOption(
+  "-c,--configs <configs>",
+  "Path to store generated files"
+);
 program.parse(process.argv);
 
-genPath(program.path);
+genPath(program.page, program.configs);
+
+module.exports = { configs_path: program.configs };

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "react-fs-router",
-  "version": "0.2.8",
+  "version": "0.2.12",
   "description": "File-system based routing for React.",
   "main": "./bin/index.js",
   "git repository": "https://github.com/Mehran9675/react-filesystem-routing",
-  "types": "./dist/index.d.ts",
   "scripts": {
-    "test": "node index.js -p ./pages",
+    "test": "node ./bin/index.js -p ./pages -c ./configs",
     "build": "npx -p typescript tsc"
   },
   "keywords": [
@@ -20,7 +19,6 @@
   "dependencies": {
     "chokidar": "^3.5.2",
     "commander": "^8.2.0",
-    "node": "^16.10.0",
     "react": "^17.0.2",
     "react-router-dom": "^5.3.0"
   },
@@ -29,7 +27,6 @@
     "rfr": "./bin/index.js"
   },
   "devDependencies": {
-    "@types/node": "^16.10.5",
     "typescript": "^4.4.4",
     "prettier": "^2.4.1"
   }

package/src/Route.d.ts

@@ -0,0 +1 @@
+export default function Route(): any;

package/src/Route.js

@@ -0,0 +1,34 @@
+"use strict";
+exports.__esModule = true;
+var configs_path = require("../bin/index").configs_path;
+var routes = require(configs_path + "/routeConfigs.js").routes;
+var Pages = require(configs_path + "/route.js");
+var react_1 = require("react");
+var react_router_dom_1 = require("react-router-dom");
+function Route() {
+    var _a = (0, react_1.useState)(), pages = _a[0], setPages = _a[1];
+    var randomStr = function () { return (Math.random() + 1).toString(36).substring(7); };
+    (0, react_1.useEffect)(function () {
+        setPages(renderConponents(Pages));
+    }, []);
+    function renderComponent(key, module) {
+        return module[key] || module["default"] || module;
+    }
+    function renderConponents(imports) {
+        var renders = [];
+        var _loop_1 = function (key, Value) {
+            var Component = renderComponent(key, Value);
+            var route = routes.filter(function (config) { return (config === null || config === void 0 ? void 0 : config.component) === (Component === null || Component === void 0 ? void 0 : Component.name); })[0];
+            renders.push(<react_router_dom_1.Route exact={true} key={randomStr()} path={(route === null || route === void 0 ? void 0 : route.path) || ""}>
+          <Component />
+        </react_router_dom_1.Route>);
+        };
+        for (var _i = 0, _a = Object.entries(imports); _i < _a.length; _i++) {
+            var _b = _a[_i], key = _b[0], Value = _b[1];
+            _loop_1(key, Value);
+        }
+        return renders;
+    }
+    return <react_router_dom_1.Switch>{pages}</react_router_dom_1.Switch>;
+}
+exports["default"] = Route;

package/src/{Routes/index.tsx → Route.tsx}

@@ -1,10 +1,12 @@
-import { routes } from "src/generated/routeConfigs"; //@ts-ignore
-import * as Pages from "src/generated/routes";
-import React, { ReactElement, ReactNode, useState, useEffect } from "react";
+const { configs_path } = require("../bin/index");
+const { routes } = require(configs_path + "/routeConfigs.js");
+const Pages = require(configs_path + "/route.js");
+
+import React, { useState, useEffect } from "react";
 import { Route, Switch } from "react-router-dom";
 
-export default function Route(): ReactElement {
-  const [pages, setPages] = useState<React.ReactNode[]>();
+export default function Route() {
+  const [pages, setPages] = useState();
   const randomStr = () => (Math.random() + 1).toString(36).substring(7);
 
   useEffect(() => {
@@ -15,15 +17,14 @@ export default function Route(): ReactElement {
     return module[key] || module["default"] || module;
   }
 
-  function renderConponents(imports: Record<string, ReactNode>) {
-    let renders: React.ReactNode[] = [];
+  function renderConponents(imports) {
+    let renders = [];
     for (const [key, Value] of Object.entries(imports)) {
       const Component = renderComponent(key, Value);
       const route = routes.filter(
         (config) => config?.component === Component?.name
       )[0];
 
-      //@ts-ignore
       renders.push(
         <Route exact={true} key={randomStr()} path={route?.path || ""}>
           <Component />

package/src/genPath.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(page_directory: any): void;
+export = _exports;

package/src/{genPath/index.ts → genPath.js}

@@ -4,10 +4,10 @@ const chokidar = require("chokidar");
 
 let isNotThefirstTimeRunning = true;
 
-module.exports = (page_directory) => {
+module.exports = (page_directory, configs_directory) => {
   const pathMaker = () => {
-    const readDirectory = (directory: string, includeDirectory?: boolean) => {
-      const pages: Record<string, any> = {};
+    const readDirectory = (directory, includeDirectory) => {
+      const pages = {};
       const read = fs.readdirSync(directory);
       read.forEach((page) => {
         const name = page.split(".")[0];
@@ -23,7 +23,7 @@ module.exports = (page_directory) => {
     };
     const pages = readDirectory(page_directory);
 
-    const readFileProperties = (filepath: string) => {
+    const readFileProperties = (filepath) => {
       const file = String(fs.readFileSync(page_directory + filepath)); // todo: put in try catch
       const component = file.match(/(export default .*)\w/g); //todo: export default function *
       const props = file.match(
@@ -51,15 +51,8 @@ module.exports = (page_directory) => {
       return result;
     };
 
-    const makeRouteObject = (filepath: string, filename: string) => {
-      const route: {
-        component?: string;
-        name?: string;
-        icon?: string;
-        index?: number;
-        path?: string;
-        file?: string;
-      } = {
+    const makeRouteObject = (filepath, filename) => {
+      const route = {
         component: null,
         name: null,
         icon: null,
@@ -82,14 +75,11 @@ module.exports = (page_directory) => {
       return route;
     };
 
-    const makePathsArray = (
-      paths: Record<string, any>,
-      prevPath?: boolean
-    ): Record<string, string>[] => {
+    const makePathsArray = (paths, prevPath) => {
       const result = [];
       for (const [file, path] of Object.entries(paths)) {
         if (typeof path === "string") {
-          const oj: Record<string, string> = { file };
+          const oj = { file };
           if (prevPath) oj.path = path.replace(page_directory, "");
           else oj.path = path;
           result.push(oj);
@@ -117,7 +107,7 @@ module.exports = (page_directory) => {
       .join("")}};`;
 
     fs.writeFileSync(
-      "./node_modules/react-fs-router/dist/src/generated/routeConfigs.js",
+      configs_directory + "/routeConfigs.js",
       prettier.format(_config, { semi: false, parser: "babel" }),
       (err) => {
         if (err) return console.error(err);
@@ -125,7 +115,7 @@ module.exports = (page_directory) => {
     );
 
     fs.writeFileSync(
-      "./node_modules/react-fs-router/dist/src/generated/route.js",
+      configs_directory + "/route.js",
       prettier.format(_routes, { semi: false, parser: "babel" }),
       (err) => {
         if (err) return console.error(err);

package/src/routeConfigs.d.ts

@@ -0,0 +1 @@
+export const routes: {}[];

package/src/routeConfigs.js

@@ -0,0 +1 @@
+export const routes = [{}];

package/src/routes.d.ts

@@ -0,0 +1 @@
+export {};

package/src/routes.js

@@ -0,0 +1 @@
+export {};

package/tsconfig.json

@@ -1,14 +1,14 @@
 {
   // Change this to match your project
-  "include": ["src/**/*"],
-  "exclude": ["dist/**/*", "bin/index.js"],
+  "include": ["./src"],
+  "exclude": ["bin/index.js", "*.d.ts"],
   "compilerOptions": {
     "allowJs": true,
     "declaration": true,
     // This compiler run should
     // only output d.ts files
-    "emitDeclarationOnly": false,
-    "baseUrl": ".",
+    "emitDeclarationOnly": true,
+    "outDir": "./src",
     "jsx": "react-jsx"
   }
 }

package/src/Routes/index.d.ts

@@ -1,2 +0,0 @@
-import { ReactElement } from "react";
-export default function Route(): ReactElement;

package/src/Routes/index.js

@@ -1,44 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-exports.__esModule = true;
-var jsx_runtime_1 = require("react/jsx-runtime");
-var routeConfigs_1 = require("src/generated/routeConfigs"); //@ts-ignore
-var Pages = require("src/generated/routes");
-var react_1 = require("react");
-var react_router_dom_1 = require("react-router-dom");
-function Route() {
-    var _a = (0, react_1.useState)(), pages = _a[0], setPages = _a[1];
-    var randomStr = function () { return (Math.random() + 1).toString(36).substring(7); };
-    (0, react_1.useEffect)(function () {
-        setPages(renderConponents(Pages));
-    }, []);
-    function renderComponent(key, module) {
-        return module[key] || module["default"] || module;
-    }
-    function renderConponents(imports) {
-        var renders = [];
-        var _loop_1 = function (key, Value) {
-            var Component = renderComponent(key, Value);
-            var route = routeConfigs_1.routes.filter(function (config) { return (config === null || config === void 0 ? void 0 : config.component) === (Component === null || Component === void 0 ? void 0 : Component.name); })[0];
-            //@ts-ignore
-            renders.push((0, jsx_runtime_1.jsx)(react_router_dom_1.Route, __assign({ exact: true, path: (route === null || route === void 0 ? void 0 : route.path) || "" }, { children: (0, jsx_runtime_1.jsx)(Component, {}, void 0) }), randomStr()));
-        };
-        for (var _i = 0, _a = Object.entries(imports); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b[0], Value = _b[1];
-            _loop_1(key, Value);
-        }
-        return renders;
-    }
-    return (0, jsx_runtime_1.jsx)(react_router_dom_1.Switch, { children: pages }, void 0);
-}
-exports["default"] = Route;

package/src/genPath/index.d.ts

@@ -1,4 +0,0 @@
-declare const fs: any;
-declare const prettier: any;
-declare const chokidar: any;
-declare let isNotThefirstTimeRunning: boolean;

package/src/genPath/index.js

@@ -1,138 +0,0 @@
-var fs = require("fs");
-var prettier = require("prettier");
-var chokidar = require("chokidar");
-var isNotThefirstTimeRunning = true;
-module.exports = function (page_directory) {
-    var pathMaker = function () {
-        var readDirectory = function (directory, includeDirectory) {
-            var pages = {};
-            var read = fs.readdirSync(directory);
-            read.forEach(function (page) {
-                var name = page.split(".")[0];
-                if (page.includes(".")) {
-                    pages[page.replace(".", "_")] = (includeDirectory ? directory : "") + "/" + (name === "index" ? "" : name);
-                }
-                else {
-                    pages[name] = readDirectory(directory + "/" + page, true);
-                }
-            });
-            return pages;
-        };
-        var pages = readDirectory(page_directory);
-        var readFileProperties = function (filepath) {
-            var file = String(fs.readFileSync(page_directory + filepath)); // todo: put in try catch
-            var component = file.match(/(export default .*)\w/g); //todo: export default function *
-            var props = file.match(/((name|icon|index):( |).*[^{}\[\]-_=\/\\\(\)\*&^%$#@!~`|?><,;:"'])/g);
-            var result = {
-                component: null,
-                name: null,
-                icon: null,
-                index: null
-            };
-            if (!file)
-                return result;
-            if (component === null || component === void 0 ? void 0 : component.length) {
-                result.component = component[0].split("default")[1].trim();
-            }
-            if (props === null || props === void 0 ? void 0 : props.length) {
-                var name_1 = props.filter(function (match) { return match.includes("name"); });
-                var icon = props.filter(function (match) { return match.includes("icon"); });
-                var index = props.filter(function (match) { return match.includes("index"); });
-                if (name_1.length)
-                    result.name = name_1[0].split(":")[1].trim();
-                if (icon.length)
-                    result.icon = icon[0].split(":")[1].trim();
-                if (index.length)
-                    result.index = Number(index[0].split(":")[1].trim()) || 0;
-            }
-            return result;
-        };
-        var makeRouteObject = function (filepath, filename) {
-            var route = {
-                component: null,
-                name: null,
-                icon: null,
-                index: 0,
-                path: filepath
-            };
-            var _a = readFileProperties("" + (filepath.match(/(\/)/g).length ? filepath : "") + (filename.includes("index")
-                ? "/" + filename.replace("_", ".")
-                : "." + filename.split("_")[1])), component = _a.component, name = _a.name, icon = _a.icon, index = _a.index;
-            if (component)
-                route.component = component;
-            if (name)
-                route.name = name;
-            if (icon)
-                route.icon = icon;
-            if (index)
-                route.index = index;
-            if (filepath)
-                route.path = filepath;
-            if (filename)
-                route.file = filename;
-            return route;
-        };
-        var makePathsArray = function (paths, prevPath) {
-            var result = [];
-            for (var _i = 0, _a = Object.entries(paths); _i < _a.length; _i++) {
-                var _b = _a[_i], file = _b[0], path = _b[1];
-                if (typeof path === "string") {
-                    var oj = { file: file };
-                    if (prevPath)
-                        oj.path = path.replace(page_directory, "");
-                    else
-                        oj.path = path;
-                    result.push(oj);
-                }
-                else
-                    result.push.apply(result, makePathsArray(path, true));
-            }
-            return result;
-        };
-        var routes = makePathsArray(pages).map(function (page) {
-            return makeRouteObject(page.path, page.file);
-        });
-        var _config = "export const routes = " + JSON.stringify(routes);
-        var _routes = routes
-            .map(function (node) {
-            return (node === null || node === void 0 ? void 0 : node.component)
-                ? "import " + node.component + " from \"" + (process.env.PWD + page_directory.replace(".", "")) + (node.path === "/" ? "" : node.path) + "\";"
-                : "";
-        })
-            .join("") + " \n \n export{" + routes
-            .map(function (node) { return ((node === null || node === void 0 ? void 0 : node.component) ? node.component + "," : ""); })
-            .join("") + "};";
-        fs.writeFileSync("./node_modules/react-fs-router/dist/src/generated/routeConfigs.js", prettier.format(_config, { semi: false, parser: "babel" }), function (err) {
-            if (err)
-                return console.error(err);
-        });
-        fs.writeFileSync("./node_modules/react-fs-router/dist/src/generated/route.js", prettier.format(_routes, { semi: false, parser: "babel" }), function (err) {
-            if (err)
-                return console.error(err);
-        });
-    };
-    if (isNotThefirstTimeRunning) {
-        pathMaker();
-        isNotThefirstTimeRunning = false;
-    }
-    var watcher = chokidar.watch(page_directory, {
-        ignored: /^\./,
-        persistent: true
-    });
-    watcher
-        .on("add", function (path) {
-        pathMaker();
-        console.log("File", path, "has been added");
-    })
-        .on("change", function (path) {
-        pathMaker();
-        console.log("File", path, "has been changed");
-    })
-        .on("unlink", function (path) {
-        pathMaker();
-        console.log("File", path, "has been removed");
-    })
-        .on("error", function (error) {
-        console.error("Error happened", error);
-    });
-};

package/src/generated/routeConfigs.d.ts

@@ -1,9 +0,0 @@
-export declare interface RoutesI {
-    component?: string;
-    name?: string;
-    icon?: string;
-    index?: number;
-    path?: string;
-    file?: string;
-}
-export declare const routes: RoutesI[];

package/src/generated/routeConfigs.js

@@ -1,2 +0,0 @@
-"use strict";
-exports.__esModule = true;

package/src/generated/routeConfigs.ts

@@ -1,9 +0,0 @@
-export declare interface RoutesI {
-  component?: string;
-  name?: string;
-  icon?: string;
-  index?: number;
-  path?: string;
-  file?: string;
-}
-export declare const routes: RoutesI[];