@player-tools/cli 0.9.1-next.0 → 0.9.1-next.2

package/dist/commands/dsl/compile.js

@@ -56,7 +56,7 @@ class DSLCompile extends base_command_1.BaseCommand {
             skipValidation: flags["skip-validation"] ?? config.dsl?.skipValidation ?? false,
             exp,
             severity: flags.severity,
-            loglevel: flags.loglevel
+            loglevel: flags.loglevel,
         };
     }
     async run() {

package/dist/commands/json/validate.js

@@ -44,11 +44,11 @@ class Validate extends base_command_1.BaseCommand {
             files: Array.isArray(files) ? files : [files],
             exp,
             severity: flags.severity,
-            loglevel: flags.loglevel
+            loglevel: flags.loglevel,
         };
     }
     async run() {
-        const { files: inputFiles, exp, severity, loglevel } = await this.getOptions();
+        const { files: inputFiles, exp, severity, loglevel, } = await this.getOptions();
         const expandedFilesList = (0, fs_2.convertToFileGlob)(inputFiles, "**/*.json");
         this.debug("Searching for files using: %o", expandedFilesList);
         const files = await (0, globby_1.default)(expandedFilesList, {
@@ -71,7 +71,7 @@ class Validate extends base_command_1.BaseCommand {
                     return validations;
                 },
             })),
-            loglevel: (0, log_levels_1.stringToLogLevel)(loglevel)
+            loglevel: (0, log_levels_1.stringToLogLevel)(loglevel),
         });
         const taskResults = await taskRunner.run();
         if (severity !== "error") {

package/dist/utils/diag-renderer.js

@@ -9,6 +9,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log_symbols_1 = tslib_1.__importDefault(require("log-symbols"));
 const elegant_spinner_1 = tslib_1.__importDefault(require("elegant-spinner"));
 const fs_1 = require("./fs");
+const source_map_js_1 = tslib_1.__importDefault(require("source-map-js"));
 /** Compare the ranges and return the one that starts of finishes first */
 function rangeComparator(first, second) {
     if (first.start.line < second.start.line) {
@@ -84,16 +85,46 @@ function formatDiagnostic(diag, longestLine, fName) {
         `${fName}:${range.padEnd(longestLine)}`,
     ].join(" ");
 }
+function mapDiagnosticBackToSourceLine(diag, mapper) {
+    const { line, character } = diag.range.start;
+    if (mapper && line && character >= 1) {
+        const sourceNode = mapper.originalPositionFor({
+            line,
+            column: character,
+        });
+        if (sourceNode.source) {
+            return {
+                diagnostic: {
+                    ...diag,
+                    range: {
+                        ...diag.range,
+                        start: {
+                            line: sourceNode.line,
+                            character: sourceNode.column,
+                        },
+                    },
+                },
+                sourceFile: sourceNode.source,
+            };
+        }
+    }
+}
 /** Format the results for printing on the console */
 function formatDiagnosticResults(filePath, results, loglevel) {
     const count = {
         errors: 0,
         warnings: 0,
         info: 0,
-        trace: 0
+        trace: 0,
     };
     const linePrefix = "  ";
     const longestLine = Math.max(...results.map((r) => getLineRange(r.range).length));
+    //try and load map file
+    const mapFile = (0, fs_1.tryAndLoadSourceMap)(filePath);
+    let sourceMapper;
+    if (mapFile) {
+        sourceMapper = new source_map_js_1.default.SourceMapConsumer(JSON.parse(mapFile));
+    }
     let lines = results
         .map((diag) => {
         if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Error) {
@@ -108,8 +139,9 @@ function formatDiagnosticResults(filePath, results, loglevel) {
         else if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Hint) {
             count.trace += 1;
         }
+        const { diagnostic, sourceFile } = mapDiagnosticBackToSourceLine(diag, sourceMapper) ?? { diagnostic: diag, sourceFile: filePath };
         if (diag.severity && loglevel >= diag.severity) {
-            return linePrefix + formatDiagnostic(diag, longestLine + 1, filePath);
+            return (linePrefix + formatDiagnostic(diagnostic, longestLine + 1, sourceFile));
         }
         return "";
     })
@@ -126,20 +158,10 @@ function formatDiagnosticResults(filePath, results, loglevel) {
         ];
     }
     else if (count.info > 0 && loglevel >= vscode_languageserver_types_1.DiagnosticSeverity.Information) {
-        lines = [
-            "",
-            `${chalk_1.default.blue(log_symbols_1.default.info)} ${filePath}`,
-            ...lines,
-            "",
-        ];
+        lines = ["", `${chalk_1.default.blue(log_symbols_1.default.info)} ${filePath}`, ...lines, ""];
     }
     else if (count.trace > 0 && loglevel >= vscode_languageserver_types_1.DiagnosticSeverity.Hint) {
-        lines = [
-            "",
-            `${chalk_1.default.gray(log_symbols_1.default.info)} ${filePath}`,
-            ...lines,
-            "",
-        ];
+        lines = ["", `${chalk_1.default.gray(log_symbols_1.default.info)} ${filePath}`, ...lines, ""];
     }
     else {
         lines = [`${chalk_1.default.green(log_symbols_1.default.success)} ${filePath}`, ...lines];

package/dist/utils/fs.d.ts

@@ -2,4 +2,8 @@
 export declare const convertToFileGlob: (input: string[], glob: string) => string[];
 /** Normalize a path for display */
 export declare const normalizePath: (p: string) => string;
+/**
+ * Tries to load a source map file
+ */
+export declare const tryAndLoadSourceMap: (f: string) => string | undefined;
 //# sourceMappingURL=fs.d.ts.map

package/dist/utils/fs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePath = exports.convertToFileGlob = void 0;
+exports.tryAndLoadSourceMap = exports.normalizePath = exports.convertToFileGlob = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
@@ -28,4 +28,15 @@ const normalizePath = (p) => {
     return path_1.default.relative(process.cwd(), p);
 };
 exports.normalizePath = normalizePath;
+/**
+ * Tries to load a source map file
+ */
+const tryAndLoadSourceMap = (f) => {
+    const mapFileName = f + ".map";
+    if (fs_1.default.existsSync(mapFileName)) {
+        return fs_1.default.readFileSync(mapFileName, "utf8");
+    }
+    return undefined;
+};
+exports.tryAndLoadSourceMap = tryAndLoadSourceMap;
 //# sourceMappingURL=fs.js.map

package/dist/utils/task-runner.js

@@ -44,7 +44,7 @@ const createTaskRunner = ({ tasks, renderer, loglevel, }) => {
         const output = renderer.onEnd({
             duration,
             tasks: statefulTasks,
-            loglevel
+            loglevel,
         });
         console.log(output);
         log_update_1.default.done();

package/package.json

@@ -5,7 +5,7 @@
     "dist"
   ],
   "name": "@player-tools/cli",
-  "version": "0.9.1-next.0",
+  "version": "0.9.1-next.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "oclif": {
@@ -21,12 +21,12 @@
     "player": "bin/run"
   },
   "dependencies": {
-    "@player-tools/dsl": "0.9.1-next.0",
-    "@player-tools/json-language-service": "0.9.1-next.0",
-    "@player-tools/xlr": "0.9.1-next.0",
-    "@player-tools/xlr-converters": "0.9.1-next.0",
-    "@player-tools/xlr-sdk": "0.9.1-next.0",
-    "@player-tools/xlr-utils": "0.9.1-next.0",
+    "@player-tools/dsl": "0.9.1-next.2",
+    "@player-tools/json-language-service": "0.9.1-next.2",
+    "@player-tools/xlr": "0.9.1-next.2",
+    "@player-tools/xlr-converters": "0.9.1-next.2",
+    "@player-tools/xlr-sdk": "0.9.1-next.2",
+    "@player-tools/xlr-utils": "0.9.1-next.2",
     "@babel/plugin-transform-react-jsx-source": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
     "@babel/preset-react": "^7.23.3",
@@ -47,6 +47,7 @@
     "log-update": "^4.0.0",
     "mkdirp": "^1.0.4",
     "react": "^18.2.0",
+    "source-map-js": "^1.2.0",
     "tapable-ts": "^0.2.4",
     "tslib": "^2.6.2",
     "typescript": "5.5.4",