@player-tools/cli 0.7.1-next.2 → 0.8.0-next.0

package/dist/commands/dsl/compile.d.ts

@@ -7,6 +7,7 @@ export default class DSLCompile extends BaseCommand {
         output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         "skip-validation": import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         exp: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        severity: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     private getOptions;

package/dist/commands/dsl/compile.js

@@ -35,6 +35,12 @@ class DSLCompile extends base_command_1.BaseCommand {
             description: "Use experimental language features",
             default: false,
         }),
+        severity: core_1.Flags.string({
+            char: "s",
+            description: "The severity of the validation",
+            options: ["error", "warn"],
+            default: "error",
+        }),
     };
     async getOptions() {
         const { flags } = await this.parse(DSLCompile);
@@ -49,10 +55,11 @@ class DSLCompile extends base_command_1.BaseCommand {
             output: flags.output ?? config.dsl?.outDir ?? "_out",
             skipValidation: flags["skip-validation"] ?? config.dsl?.skipValidation ?? false,
             exp,
+            severity: flags.severity,
         };
     }
     async run() {
-        const { input, output, skipValidation, exp } = await this.getOptions();
+        const { input, output, skipValidation, exp, severity } = await this.getOptions();
         const files = await (0, globby_1.default)((0, fs_2.convertToFileGlob)([input], "**/*.(tsx|jsx|js|ts)"), {
             expandDirectories: true,
         });
@@ -62,7 +69,7 @@ class DSLCompile extends base_command_1.BaseCommand {
         (0, babel_register_1.registerForPaths)();
         this.debug("Found %i files to process", files.length);
         if (!skipValidation) {
-            await validate_2.default.run(["-f", input]);
+            await validate_2.default.run(["-f", input, "-s", severity]);
         }
         const context = await this.createCompilerContext();
         /** Compile a file from the DSL format into JSON */

package/dist/commands/dsl/validate.d.ts

@@ -4,6 +4,7 @@ export default class Validate extends BaseCommand {
     static description: string;
     static flags: {
         files: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        severity: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     private getOptions;

package/dist/commands/dsl/validate.js

@@ -20,6 +20,12 @@ class Validate extends base_command_1.BaseCommand {
             description: "A list of files or globs to validate",
             multiple: true,
         }),
+        severity: core_1.Flags.string({
+            char: "s",
+            description: "Setting the validation severity to 'warn' will change the validation step into a warning-only, not halting the process with code 1. That exposes an intermediate option between the default behaviour, where it will fail on errors, and skipping validation.",
+            options: ["error", "warn"],
+            default: "error",
+        }),
     };
     async getOptions() {
         const { flags } = await this.parse(Validate);
@@ -30,6 +36,7 @@ class Validate extends base_command_1.BaseCommand {
         }
         return {
             inputFiles: Array.isArray(files) ? files : [files],
+            severity: flags.severity,
         };
     }
     getTSConfig(filePath) {
@@ -59,44 +66,72 @@ class Validate extends base_command_1.BaseCommand {
         return parsedConfigContent.options;
     }
     async run() {
-        const { inputFiles } = await this.getOptions();
+        const { inputFiles, severity } = await this.getOptions();
         const files = await (0, globby_1.default)((0, fs_2.convertToFileGlob)(inputFiles, "**/*.(tsx|jsx|js|ts)"), {
             expandDirectories: true,
         });
         const TSConfig = this.getTSConfig() ?? compiler_options_1.DEFAULT_COMPILER_OPTIONS;
         const program = ts.createProgram(files, TSConfig);
         const allDiagnostics = ts.getPreEmitDiagnostics(program);
-        let diagnosticsCount = 0;
         const groupedDiagnostics = allDiagnostics.reduce((acc, diagnostic) => {
             const fileName = diagnostic.file?.fileName;
+            const category = diagnostic.category;
             if (fileName && files.includes(fileName)) {
-                if (!acc[fileName]) {
-                    acc[fileName] = [];
+                if (!acc[category][fileName]) {
+                    acc[category][fileName] = [];
                 }
-                acc[fileName].push(diagnostic);
-                diagnosticsCount += 1;
+                acc[category][fileName].push(diagnostic);
             }
             return acc;
-        }, {});
-        const fileNameList = Object.keys(groupedDiagnostics);
-        fileNameList.forEach((diagnosticGroup) => {
-            this.log(`${diagnosticGroup}`);
-            groupedDiagnostics[diagnosticGroup].forEach((diagnostic) => {
-                if (diagnostic.file) {
-                    const { line, character } = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start);
-                    const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
-                    this.log(`  ${log_symbols_1.default.error} (${line + 1},${character + 1}): ${message}`);
-                }
-                else {
-                    this.log(ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n"));
-                }
+        }, {
+            [ts.DiagnosticCategory.Error]: {},
+            [ts.DiagnosticCategory.Warning]: {},
+            [ts.DiagnosticCategory.Message]: {},
+            [ts.DiagnosticCategory.Suggestion]: {},
+        });
+        const diagnosticCategories = [
+            ts.DiagnosticCategory.Error,
+            ts.DiagnosticCategory.Warning,
+            ts.DiagnosticCategory.Message,
+            ts.DiagnosticCategory.Suggestion,
+        ];
+        diagnosticCategories.forEach((category) => {
+            const diagnosticsList = Object.keys(groupedDiagnostics[category]);
+            diagnosticsList.forEach((diagnosticGroup) => {
+                this.log(`${diagnosticGroup}`);
+                groupedDiagnostics[category][diagnosticGroup].forEach((diagnostic) => {
+                    if (diagnostic.file) {
+                        const { line, character } = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start ?? 0);
+                        const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n");
+                        let logSymbol = log_symbols_1.default.info;
+                        switch (category) {
+                            case ts.DiagnosticCategory.Error:
+                                logSymbol = log_symbols_1.default.error;
+                                break;
+                            case ts.DiagnosticCategory.Warning:
+                                logSymbol = log_symbols_1.default.warning;
+                                break;
+                            case ts.DiagnosticCategory.Message:
+                                logSymbol = log_symbols_1.default.info;
+                                break;
+                            case ts.DiagnosticCategory.Suggestion:
+                                logSymbol = log_symbols_1.default.info;
+                                break;
+                        }
+                        this.log(`  ${logSymbol} (${line + 1},${character + 1}): ${message}`);
+                    }
+                    else {
+                        this.log(ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n"));
+                    }
+                });
             });
         });
-        if (fileNameList.length) {
-            this.log(`${diagnosticsCount} type or syntax errors found in 
-        ${fileNameList.length} 
-        file${fileNameList.length > 1 ? "s" : ""}, exiting program`);
-            this.exit(1);
+        const errorsCount = Object.keys(groupedDiagnostics[ts.DiagnosticCategory.Error]).length;
+        if (errorsCount) {
+            this.log(`Type or syntax errors found in ${errorsCount} file${errorsCount > 1 ? "s" : ""}, exiting program`);
+            if (severity === "error") {
+                this.exit(1);
+            }
         }
         else {
             this.log(`${log_symbols_1.default.success} No TSX types or errors found.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/cli",
-  "version": "0.7.1-next.2",
+  "version": "0.8.0-next.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -21,12 +21,12 @@
     "player": "bin/run"
   },
   "dependencies": {
-    "@player-tools/dsl": "0.7.1-next.2",
-    "@player-tools/json-language-service": "0.7.1-next.2",
-    "@player-tools/xlr": "0.7.1-next.2",
-    "@player-tools/xlr-converters": "0.7.1-next.2",
-    "@player-tools/xlr-sdk": "0.7.1-next.2",
-    "@player-tools/xlr-utils": "0.7.1-next.2",
+    "@player-tools/dsl": "0.8.0-next.0",
+    "@player-tools/json-language-service": "0.8.0-next.0",
+    "@player-tools/xlr": "0.8.0-next.0",
+    "@player-tools/xlr-converters": "0.8.0-next.0",
+    "@player-tools/xlr-sdk": "0.8.0-next.0",
+    "@player-tools/xlr-utils": "0.8.0-next.0",
     "@babel/plugin-transform-react-jsx-source": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
     "@babel/preset-react": "^7.23.3",