reorganising and splitting complex parts (#5)

* reorganising and splitting complex parts

* Update write-index-htmls.ts

Author: Idrinth

.gitignore

@@ -1,4 +1,5 @@
 .idea
 node_modules
+src/**/*.js
 src/*.js
 /tsconfig.tsbuildinfo

src/configuration.ts

@@ -1,51 +1,6 @@
-import {
-  readFileSync,
-  existsSync,
-} from 'fs';
-
-interface Sitemap {
-  domain: string,
-  build: boolean,
-}
-interface Routes {
-  build: boolean,
-  type: 'tsx'|'jsx',
-  overridePathMappings: {
-    [filesystemPath: string]: string,
-  },
-  useOutput: boolean,
-}
-interface HTMLMinify {
-  collapseBooleanAttributes: boolean,
-  conservativeCollapse: boolean,
-  collapseWhitespace: boolean,
-  removeAttributeQuotes: boolean,
-  removeComments: boolean,
-}
-interface FileBuilder {
-  buildIndex: boolean,
-  minifyPages: boolean,
-  appendPageChunk: boolean,
-  preLoadCSS: boolean,
-  preLoadJS: boolean,
-  preloadStartDelay: number,
-}
-interface FileFinder {
-  fileName: string,
-  pagesRoot: string,
-  distJSRoot: string,
-}
-interface Runtime {
-  reloadWaitMs: number,
-}
-export interface Configuration {
-  runtime: Runtime,
-  sitemap: Sitemap,
-  routes: Routes,
-  htmlMinify: HTMLMinify,
-  fileBuilder: FileBuilder,
-  fileFinder: FileFinder,
-}
+import {Configuration} from './configuration/configuration.js';
+import cli from './configuration/cli.js';
+import file from './configuration/file.js';
 
 export default (cwd: string, cliArguments: string[]): Configuration => {
   const config: Configuration = {
@@ -86,46 +41,8 @@ export default (cwd: string, cliArguments: string[]): Configuration => {
       preloadStartDelay: 5000,
     },
   };
-  const configFile = cwd + '/.idrinth-react-file-based-routes.json';
-  if (existsSync(configFile)) {
-    const userconfig: Configuration = JSON.parse(readFileSync(configFile, 'utf-8'));
-    if (typeof userconfig === 'object') {
-      for (const prop of Object.keys(config) as [keyof Configuration]) {
-        if (typeof userconfig[prop] === 'object' && typeof config[prop] === 'object') {
-          for (const setting of Object.keys(config[prop]) as [keyof Configuration[typeof prop]]) {
-            if (typeof config[prop][setting] === typeof userconfig[prop][setting]) {
-              config[prop][setting] = userconfig[prop][setting];
-            }
-          }
-        }
-      }
-    }
-  }
-  for (const param of cliArguments) {
-    if (param.startsWith('--')) {
-      const [setting, value,] = param.substring(2).split('=') as [string, undefined|string];
-      const [group, detail,] = setting.split('.') as [keyof Configuration, keyof Runtime|keyof Sitemap|keyof Routes|keyof FileFinder|keyof FileBuilder|keyof HTMLMinify];
-      if (group && typeof config[group] === 'object' && detail) {
-        // @ts-ignore TS7053
-        if (typeof config[group][detail] === 'boolean') {
-          if (value === 'true') {
-            // @ts-ignore TS7053
-            config[group][detail] = true;
-          } else if (value === 'false') {
-            // @ts-ignore TS7053
-            config[group][detail] = false;
-          } else {
-            // @ts-ignore TS7053
-            config[group][detail] = !config[group][detail];
-          }
-        // @ts-ignore TS7053
-        } else if (typeof config[group][detail] === 'string' && value) {
-          // @ts-ignore TS7053
-          config[group][detail] = value;
-        }
-      }
-    }
-  }
+  file(cwd, config,)
+  cli(cliArguments, config,);
   if (config.sitemap.build && !config.sitemap.domain) {
     throw new Error('sitemap.domain must be set if a sitemap should be build.');
   }

src/configuration/cli.ts

@@ -0,0 +1,35 @@
+import {Configuration} from './configuration.js';
+import {Runtime} from './runtime.js';
+import {Sitemap} from './sitemap.js';
+import {Routes} from './routes.js';
+import {FileFinder} from './file-finder.js';
+import {FileBuilder} from './file-builder.js';
+import {HTMLMinify} from './html-minify.js';
+
+export default (cliArguments:  string[], config: Configuration) => {
+  for (const param of cliArguments) {
+    if (param.startsWith('--')) {
+      const [setting, value,] = param.substring(2).split('=') as [string, undefined|string];
+      const [group, detail,] = setting.split('.') as [keyof Configuration, keyof Runtime|keyof Sitemap|keyof Routes|keyof FileFinder|keyof FileBuilder|keyof HTMLMinify];
+      if (group && typeof config[group] === 'object' && detail) {
+        // @ts-ignore TS7053
+        if (typeof config[group][detail] === 'boolean') {
+          if (value === 'true') {
+            // @ts-ignore TS7053
+            config[group][detail] = true;
+          } else if (value === 'false') {
+            // @ts-ignore TS7053
+            config[group][detail] = false;
+          } else {
+            // @ts-ignore TS7053
+            config[group][detail] = !config[group][detail];
+          }
+          // @ts-ignore TS7053
+        } else if (typeof config[group][detail] === 'string' && value) {
+          // @ts-ignore TS7053
+          config[group][detail] = value;
+        }
+      }
+    }
+  }
+}

src/configuration/configuration.ts

@@ -0,0 +1,15 @@
+import {Runtime} from './runtime.js';
+import {Sitemap} from './sitemap.js';
+import {Routes} from './routes.js';
+import {HTMLMinify} from './html-minify.js';
+import {FileBuilder} from './file-builder.js';
+import {FileFinder} from './file-finder.js';
+
+export interface Configuration {
+  runtime: Runtime,
+  sitemap: Sitemap,
+  routes: Routes,
+  htmlMinify: HTMLMinify,
+  fileBuilder: FileBuilder,
+  fileFinder: FileFinder,
+}

src/configuration/file-builder.ts

@@ -0,0 +1,8 @@
+export interface FileBuilder {
+  buildIndex: boolean,
+  minifyPages: boolean,
+  appendPageChunk: boolean,
+  preLoadCSS: boolean,
+  preLoadJS: boolean,
+  preloadStartDelay: number,
+}

src/configuration/file-finder.ts

@@ -0,0 +1,5 @@
+export interface FileFinder {
+  fileName: string,
+  pagesRoot: string,
+  distJSRoot: string,
+}

src/configuration/file.ts

@@ -0,0 +1,20 @@
+import {existsSync, readFileSync} from 'fs';
+import {Configuration} from './configuration.js';
+
+export default (cwd: string, config:  Configuration) => {
+  const configFile = cwd + '/.idrinth-react-file-based-routes.json';
+  if (existsSync(configFile)) {
+    const userconfig: Configuration = JSON.parse(readFileSync(configFile, 'utf-8'));
+    if (typeof userconfig === 'object') {
+      for (const prop of Object.keys(config) as [keyof Configuration]) {
+        if (typeof userconfig[prop] === 'object' && typeof config[prop] === 'object') {
+          for (const setting of Object.keys(config[prop]) as [keyof Configuration[typeof prop]]) {
+            if (typeof config[prop][setting] === typeof userconfig[prop][setting]) {
+              config[prop][setting] = userconfig[prop][setting];
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/configuration/html-minify.ts

@@ -0,0 +1,7 @@
+export interface HTMLMinify {
+  collapseBooleanAttributes: boolean,
+  conservativeCollapse: boolean,
+  collapseWhitespace: boolean,
+  removeAttributeQuotes: boolean,
+  removeComments: boolean,
+}

src/configuration/routes.ts

@@ -0,0 +1,8 @@
+export interface Routes {
+  build: boolean,
+  type: 'tsx' | 'jsx',
+  overridePathMappings: {
+    [filesystemPath: string]: string,
+  },
+  useOutput: boolean,
+}

src/configuration/runtime.ts

@@ -0,0 +1,3 @@
+export interface Runtime {
+  reloadWaitMs: number,
+}