Merge pull request #17 from Exabyte-io/feat/SOF-6398-1

SOF-6398-1: prettier reformat
Exabyte-io · Nov 18, 2022 · bfdf016 · bfdf016
2 parents 6542756 + 9f1d7f8
commit bfdf016
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 27 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,7 @@
+{
+    "singleQuote": false,
+    "printWidth": 100,
+    "trailingComma": "all",
+    "tabWidth": 4
+}
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,10 +4,11 @@
     "description": "Application DEfinitions",
     "scripts": {
         "test": "nyc --reporter=text mocha --recursive --bail --require @babel/register/lib --require tests/setup.js tests",
-        "lint": "eslint src tests",
-        "lint:fix": "eslint --fix --cache src tests",
+        "lint": "eslint src tests && prettier --write src tests",
+        "lint:fix": "eslint --fix --cache src tests && prettier --write src tests",
         "transpile": "babel --out-dir dist src",
         "postinstall": "npm run transpile",
+        "prettier": "prettier --check src tests",
         "prepare": "husky install"
     },
     "repository": {
@@ -45,14 +46,16 @@
     },
     "devDependencies": {
         "@exabyte-io/code.js": "2022.11.11-0",
-        "@exabyte-io/eslint-config": "^2022.11.16-0",
+        "@exabyte-io/eslint-config": "^2022.11.17-0",
         "@exabyte-io/made.js": "2022.6.15-0",
         "chai": "^4.3.4",
         "eslint": "7.32.0",
         "eslint-config-airbnb": "19.0.2",
+        "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-import": "2.25.3",
         "eslint-plugin-jsdoc": "37.1.0",
         "eslint-plugin-jsx-a11y": "6.5.1",
+        "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "7.30.0",
         "eslint-plugin-simple-import-sort": "7.0.0",
         "husky": "^7.0.4",
@@ -69,6 +72,7 @@
         "node": ">=12.0.0"
     },
     "lint-staged": {
-        "*.js": "eslint --cache --fix"
+        "*.js": "eslint --cache --fix",
+        "*.{js,css}": "prettier --write"
     }
 }
diff --git a/src/application.js b/src/application.js
@@ -97,9 +97,7 @@ export class Application extends NamedDefaultableInMemoryEntity {
     get executables() {
         const tree = getAppTree(this.prop("name"));
         return Object.keys(tree).map((key) => {
-            return new this.constructor.Executable(
-                { ...tree[key], name: key },
-            );
+            return new this.constructor.Executable({ ...tree[key], name: key });
         });
     }
 

diff --git a/src/flavor.js b/src/flavor.js
@@ -4,7 +4,9 @@ import { mix } from "mixwith";
 import { Template } from "./template";
 
 export class Flavor extends mix(NamedDefaultableInMemoryEntity).with(RuntimeItemsMixin) {
-    get input() { return this.prop("input", []); }
+    get input() {
+        return this.prop("input", []);
+    }
 
     // TODO : prevent this from running in client
     get inputAsTemplates() {

diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,8 @@
 import {
-    allApplications, allowedMonitors, allowedResults, allTemplates,
+    allApplications,
+    allowedMonitors,
+    allowedResults,
+    allTemplates,
 } from "@exabyte-io/application-flavors.js";
 
 import { Application } from "./application";

diff --git a/src/template.js b/src/template.js
@@ -56,8 +56,7 @@ export class Template extends NamedInMemoryEntity {
 
     render(externalContext) {
         const renderingContext = this.getRenderingContext(externalContext);
-        let template,
-            rendered;
+        let template, rendered;
         if (!this.isManuallyChanged) {
             try {
                 template = jinja.compile(this.content);
@@ -85,9 +84,10 @@ export class Template extends NamedInMemoryEntity {
 
     static fromFlavor(appName, execName, inputName) {
         const filtered = allTemplates.filter(
-            (temp) => temp.applicationName === appName
-                && temp.executableName === execName
-                && temp.name === inputName,
+            (temp) =>
+                temp.applicationName === appName &&
+                temp.executableName === execName &&
+                temp.name === inputName,
         );
         if (filtered.length !== 1) {
             console.log(
@@ -105,8 +105,8 @@ export class Template extends NamedInMemoryEntity {
     getContextProvidersAsClassInstances(providerContext) {
         const me = this;
         return this.contextProviders.map((p) => {
-            const { constructor, config } = me.constructor.providerRegistry
-                .findProviderInstanceByName(p.name);
+            const { constructor, config } =
+                me.constructor.providerRegistry.findProviderInstanceByName(p.name);
             const clsInstance = new constructor({
                 ...config,
                 context: providerContext,

diff --git a/src/tree.js b/src/tree.js
@@ -12,9 +12,7 @@ export function getAllApplications(cls = null) {
     const applicationsArray = [];
     allApplications.forEach((appName) => {
         applicationsTree[appName] = {};
-        const {
-            versions, defaultVersion, build = "Default", ...appData
-        } = getAppData(appName);
+        const { versions, defaultVersion, build = "Default", ...appData } = getAppData(appName);
         applicationsTree[appName].defaultVersion = defaultVersion;
         versions.forEach((options) => {
             const { version } = options;
@@ -40,9 +38,7 @@ export function getAllApplications(cls = null) {
  * @param build {String} the build to use (optional, defaults to Default)
  * @return {*} an application
  */
-export function getApplication({
-    applicationsTree, name, version = null, build = "Default",
-}) {
+export function getApplication({ applicationsTree, name, version = null, build = "Default" }) {
     const app = applicationsTree[name];
     // eslint-disable-next-line no-param-reassign
     if (!version) version = app.defaultVersion;
@@ -60,7 +56,10 @@ const { applicationsTree } = getAllApplications(null);
  */
 export function getApplicationConfig({ name, version = null, build = "Default" }) {
     return getApplication({
-        applicationsTree, name, version, build,
+        applicationsTree,
+        name,
+        version,
+        build,
     });
 }
 
@@ -72,7 +71,9 @@ export function getApplicationConfig({ name, version = null, build = "Default" }
  */
 export function getExecutableConfig({ appName, execName }) {
     const appTree = getAppTree(appName);
-    Object.entries(appTree).forEach(([name, exec]) => { exec.name = name; });
+    Object.entries(appTree).forEach(([name, exec]) => {
+        exec.name = name;
+    });
     if (!execName) return getOneMatchFromObject(appTree, "isDefault", true);
     return appTree[execName];
 }