fix: remove "-" from generator configs

Norgate-AV · Feb 8, 2024 · 9115b41 · 9115b41
1 parent 75120c5
commit 9115b41
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 25 deletions.
diff --git a/config/default.json b/config/default.json
@@ -1,6 +1,6 @@
 {
     "generators": {
-        "template-c": {
+        "c": {
             "signature": {
                 "name": "C",
                 "id": "template-c",
@@ -69,7 +69,7 @@
                 }
             ]
         },
-        "template-ts": {
+        "ts": {
             "signature": {
                 "name": "Node.js (TypeScript)",
                 "id": "template-ts",
@@ -171,7 +171,7 @@
                 }
             ]
         },
-        "template-js": {
+        "js": {
             "signature": {
                 "name": "Node.js (Javascript)",
                 "id": "template-js",
@@ -237,7 +237,7 @@
                 }
             ]
         },
-        "template-node-cli": {
+        "nodecli": {
             "signature": {
                 "name": "Node.js (CLI)",
                 "id": "template-node-cli",
@@ -303,7 +303,7 @@
                 }
             ]
         },
-        "template-py": {
+        "py": {
             "signature": {
                 "name": "Python",
                 "id": "template-py",
@@ -339,7 +339,7 @@
                 }
             ]
         },
-        "template-html": {
+        "html": {
             "signature": {
                 "name": "HTML, CSS & JS",
                 "id": "template-html",
@@ -408,7 +408,7 @@
                 }
             ]
         },
-        "template-simpl": {
+        "simpl": {
             "signature": {
                 "name": "Crestron SIMPL",
                 "id": "template-simpl",

diff --git a/src/app.ts b/src/app.ts
@@ -2,10 +2,7 @@ import path from "node:path";
 import Generator from "yeoman-generator";
 import chalk from "chalk";
 import yosay from "yosay";
-
-process.env["SUPPRESS_NO_CONFIG_WARNING"] = "y";
 import config from "config";
-
 import {
     Answers,
     AppOptions,
@@ -18,6 +15,7 @@ import { CliHelper, CodeHelper, GitHelper } from "./helpers/index.js";
 import { ProjectType } from "./questions/index.js";
 import appConfig from "../config/default.json";
 
+process.env["SUPPRESS_NO_CONFIG_WARNING"] = "y";
 config.util.setModuleDefaults("config", appConfig);
 
 class AppGenerator extends Generator<AppOptions> {

diff --git a/src/generators/ClangGenerator.ts b/src/generators/ClangGenerator.ts
@@ -41,9 +41,7 @@ export class ClangGenerator implements GeneratorInterface {
     }
 
     public static getSignature(): GeneratorSignature {
-        return config.get<GeneratorSignature>(
-            "config.generators.template-c.signature",
-        );
+        return config.get<GeneratorSignature>("config.generators.c.signature");
     }
 
     public getSourceRoot(): string {

diff --git a/src/generators/CrestronSimplGenerator.ts b/src/generators/CrestronSimplGenerator.ts
@@ -42,7 +42,7 @@ export class CrestronSimplGenerator implements GeneratorInterface {
 
     public static getSignature(): GeneratorSignature {
         return config.get<GeneratorSignature>(
-            "config.generators.template-simpl.signature",
+            "config.generators.simpl.signature",
         );
     }
 

diff --git a/src/generators/HtmlGenerator.ts b/src/generators/HtmlGenerator.ts
@@ -42,7 +42,7 @@ export class HtmlGenerator implements GeneratorInterface {
 
     public static getSignature(): GeneratorSignature {
         return config.get<GeneratorSignature>(
-            "config.generators.template-html.signature",
+            "config.generators.html.signature",
         );
     }
 

diff --git a/src/generators/JavascriptGenerator.ts b/src/generators/JavascriptGenerator.ts
@@ -41,9 +41,7 @@ export class JavascriptGenerator implements GeneratorInterface {
     }
 
     public static getSignature(): GeneratorSignature {
-        return config.get<GeneratorSignature>(
-            "config.generators.template-js.signature",
-        );
+        return config.get<GeneratorSignature>("config.generators.js.signature");
     }
 
     public getSourceRoot(): string {

diff --git a/src/generators/NodeCliGenerator.ts b/src/generators/NodeCliGenerator.ts
@@ -42,7 +42,7 @@ export class NodeCliGenerator implements GeneratorInterface {
 
     public static getSignature(): GeneratorSignature {
         return config.get<GeneratorSignature>(
-            "config.generators.template-node-cli.signature",
+            "config.generators.nodecli.signature",
         );
     }
 

diff --git a/src/generators/PythonGenerator.ts b/src/generators/PythonGenerator.ts
@@ -37,9 +37,7 @@ export class PythonGenerator implements GeneratorInterface {
     }
 
     public static getSignature(): GeneratorSignature {
-        return config.get<GeneratorSignature>(
-            "config.generators.template-py.signature",
-        );
+        return config.get<GeneratorSignature>("config.generators.py.signature");
     }
 
     public getSourceRoot(): string {

diff --git a/src/generators/TypescriptGenerator.ts b/src/generators/TypescriptGenerator.ts
@@ -41,9 +41,7 @@ export class TypescriptGenerator implements GeneratorInterface {
     }
 
     public static getSignature(): GeneratorSignature {
-        return config.get<GeneratorSignature>(
-            "config.generators.template-ts.signature",
-        );
+        return config.get<GeneratorSignature>("config.generators.ts.signature");
     }
 
     public getSourceRoot(): string {