Update deps, enforce return type.

VicariousNetwork · Mar 20, 2021 · 2540ca3 · 2540ca3
1 parent 07ea0e8
commit 2540ca3
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 78 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -37,6 +37,7 @@
                 }
             }
         ],
-        "@typescript-eslint/no-non-null-assertion": "off"
+        "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/explicit-function-return-type": ["warn"]
     }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,12 +30,12 @@
     "@types/fs-extra": "^9.0.8",
     "@types/luxon": "^1.26.2",
     "@types/minimatch": "^3.0.3",
-    "@types/node": "^14.14.32",
+    "@types/node": "^14.14.35",
     "@types/triple-beam": "^1.3.2",
     "@types/yargs": "^16.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.16.1",
-    "@typescript-eslint/parser": "^4.16.1",
-    "eslint": "^7.21.0",
+    "@typescript-eslint/eslint-plugin": "^4.18.0",
+    "@typescript-eslint/parser": "^4.18.0",
+    "eslint": "^7.22.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.2.3"
   },
@@ -49,7 +49,7 @@
     "node-stream-zip": "^1.13.2",
     "toml": "^3.0.0",
     "triple-beam": "^1.3.0",
-    "ts-json-schema-generator": "^0.88.0",
+    "ts-json-schema-generator": "^0.89.0",
     "winston": "^3.3.3",
     "yargs": "^16.2.0"
   }

diff --git a/src/index.ts b/src/index.ts
@@ -41,7 +41,7 @@ function getBaseURL(): string {
     return (new URL(baseUrl)).toString()
 }
 
-function installLocalOption(yargs: yargs.Argv) {
+function installLocalOption(yargs: yargs.Argv): yargs.Argv {
     return yargs.option('installLocal', {
         describe: 'Install the generated distribution to your local Helios data folder.',
         type: 'boolean',

diff --git a/src/structure/spec_model/module/ToggleableModule.struct.ts b/src/structure/spec_model/module/ToggleableModule.struct.ts
@@ -73,11 +73,11 @@ export abstract class ToggleableModuleStructure extends ModuleStructure {
     protected getNamespaceMapper(namespace: ToggleableNamespace): (x: Module) => void {
         switch(namespace) {
             case ToggleableNamespace.REQUIRED:
-                return () => { /* do nothing */ }
+                return (): void => { /* do nothing */ }
             case ToggleableNamespace.OPTIONAL_ON:
-                return (x) => x.required = { value: false }
+                return (x): void => { x.required = { value: false } }
             case ToggleableNamespace.OPTIONAL_OFF:
-                return (x) => x.required = { value: false, def: false }
+                return (x): void => { x.required = { value: false, def: false } }
         }
     }
 

diff --git a/src/util/SchemaUtil.ts b/src/util/SchemaUtil.ts
@@ -24,7 +24,7 @@ export enum SchemaTypes {
     ServerMetaSchema = 'ServerMetaSchema'
 }
 
-function getSchemaFileName(typeName: string) {
+function getSchemaFileName(typeName: string): string {
     return `${typeName}.schema.json`
 }