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

package/dist/commands/dependency-versions/check.d.ts

@@ -8,6 +8,7 @@ export default class DependencyVersionsCheck extends BaseCommand {
         path: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         ignore: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     private getOptions;
     run(): Promise<{

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

@@ -9,6 +9,7 @@ export default class DSLCompile extends BaseCommand {
         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>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     private getOptions;
     run(): Promise<{

package/dist/commands/dsl/compile.js

@@ -37,7 +37,7 @@ class DSLCompile extends base_command_1.BaseCommand {
         }),
         severity: core_1.Flags.string({
             char: "s",
-            description: "The severity of the validation",
+            description: "The severity of validation issues",
             options: ["error", "warn"],
             default: "error",
         }),
@@ -56,10 +56,11 @@ class DSLCompile extends base_command_1.BaseCommand {
             skipValidation: flags["skip-validation"] ?? config.dsl?.skipValidation ?? false,
             exp,
             severity: flags.severity,
+            loglevel: flags.loglevel
         };
     }
     async run() {
-        const { input, output, skipValidation, exp, severity } = await this.getOptions();
+        const { input, output, skipValidation, exp, severity, loglevel } = await this.getOptions();
         const files = await (0, globby_1.default)((0, fs_2.convertToFileGlob)([input], "**/*.(tsx|jsx|js|ts)"), {
             expandDirectories: true,
         });
@@ -148,6 +149,7 @@ class DSLCompile extends base_command_1.BaseCommand {
                         return result.output?.outputFile ?? "";
                     }),
                     ...(exp ? ["--exp"] : []),
+                    `-s ${severity} -v ${loglevel}`
                 ]);
             }
             else {

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

@@ -6,6 +6,7 @@ export default class Validate extends BaseCommand {
         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>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     private getOptions;
     private getTSConfig;

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

@@ -5,7 +5,9 @@ export default class Validate extends BaseCommand {
     static flags: {
         files: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
         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>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     private getOptions;
     run(): Promise<{

package/dist/commands/json/validate.js

@@ -10,6 +10,7 @@ const base_command_1 = require("../../utils/base-command");
 const diag_renderer_1 = require("../../utils/diag-renderer");
 const fs_2 = require("../../utils/fs");
 const task_runner_1 = require("../../utils/task-runner");
+const log_levels_1 = require("../../utils/log-levels");
 /** A command to validate JSON content */
 class Validate extends base_command_1.BaseCommand {
     static description = "Validate Player JSON content";
@@ -24,6 +25,12 @@ class Validate extends base_command_1.BaseCommand {
             description: "Use experimental language features",
             default: false,
         }),
+        severity: core_1.Flags.string({
+            char: "s",
+            description: "The severity of validation issues",
+            options: ["error", "warn"],
+            default: "error",
+        }),
     };
     async getOptions() {
         const { flags } = await this.parse(Validate);
@@ -36,10 +43,12 @@ class Validate extends base_command_1.BaseCommand {
         return {
             files: Array.isArray(files) ? files : [files],
             exp,
+            severity: flags.severity,
+            loglevel: flags.loglevel
         };
     }
     async run() {
-        const { files: inputFiles, exp } = 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, {
@@ -58,19 +67,21 @@ class Validate extends base_command_1.BaseCommand {
                 },
                 run: async () => {
                     const contents = await fs_1.promises.readFile(f, "utf-8");
-                    const lsp = await this.createLanguageService(exp);
                     const validations = (await lsp.validateTextDocument(vscode_languageserver_textdocument_1.TextDocument.create(`file://${f}`, "json", 1, contents))) ?? [];
                     return validations;
                 },
             })),
+            loglevel: (0, log_levels_1.stringToLogLevel)(loglevel)
         });
         const taskResults = await taskRunner.run();
-        taskResults.forEach((t) => {
-            if (t.error ||
-                t.output.some((d) => d.severity === vscode_languageserver_types_1.DiagnosticSeverity.Error)) {
-                results.exitCode = 100;
-            }
-        });
+        if (severity !== "error") {
+            taskResults.forEach((t) => {
+                if (t.error ||
+                    t.output.some((d) => d.severity === vscode_languageserver_types_1.DiagnosticSeverity.Error)) {
+                    results.exitCode = 100;
+                }
+            });
+        }
         this.debug("finished");
         this.exit(results.exitCode);
         return results;

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

@@ -9,6 +9,7 @@ export default class XLRCompile extends BaseCommand {
         output: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         mode: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     private getOptions;
     run(): Promise<{

package/dist/commands/xlr/convert.d.ts

@@ -9,6 +9,7 @@ export default class XLRConvert extends BaseCommand {
         output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         lang: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     private getOptions;
     run(): Promise<{

package/dist/index.d.ts

@@ -3,4 +3,5 @@ export * from "./config";
 export * from "./plugins";
 export * from "./utils/base-command";
 export * from "./utils/compilation-context";
+export * from "./utils/log-levels";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -8,4 +8,5 @@ tslib_1.__exportStar(require("./config"), exports);
 tslib_1.__exportStar(require("./plugins"), exports);
 tslib_1.__exportStar(require("./utils/base-command"), exports);
 tslib_1.__exportStar(require("./utils/compilation-context"), exports);
+tslib_1.__exportStar(require("./utils/log-levels"), exports);
 //# sourceMappingURL=index.js.map

package/dist/plugins/LSPAssetsPlugin.d.ts

@@ -1,11 +1,31 @@
 import type { PlayerLanguageService } from "@player-tools/json-language-service";
 import type { PlayerCLIPlugin } from "./index";
-export interface LSPAssetsPluginConfig {
-    /** the path to the asset library to load */
+import { TSManifest } from "@player-tools/xlr";
+/** Loads XLRs into the LSP via the manifest.js file */
+export interface LSPAssetsPluginModuleConfig {
+    type: "module";
+    /** Result of module import/require of xlr manifest.js file */
+    manifest: TSManifest;
+}
+/** Loads XLRs to the LSP by specifying a filesystem location */
+export interface LSPAssetsPluginManifestConfig {
+    type: "manifest";
+    /** Path to dist folder for XLR enabled plugins */
+    path: string;
+}
+/**
+ * Legacy type for providing XLR manifest paths that assumes its a manifest
+ * @deprecated
+ * */
+export interface LSPAssetsPluginLegacyConfig {
+    type?: undefined;
     path: string;
+}
+export type LSPAssetPluginConfigTypes = LSPAssetsPluginModuleConfig | LSPAssetsPluginManifestConfig | LSPAssetsPluginLegacyConfig;
+export type LSPAssetsPluginConfig = LSPAssetPluginConfigTypes & {
     /** Provides experimental language features */
     exp?: boolean;
-}
+};
 /**
  * Handles setting the assets when loading the LSP
  *
@@ -25,5 +45,6 @@ export declare class LSPAssetsPlugin implements PlayerCLIPlugin {
     private config;
     constructor(config: LSPAssetsPluginConfig | Array<LSPAssetsPluginConfig>);
     onCreateLanguageService(lsp: PlayerLanguageService, exp: boolean): Promise<void>;
+    loadConfig(config: LSPAssetPluginConfigTypes, lsp: PlayerLanguageService): Promise<void>;
 }
 //# sourceMappingURL=LSPAssetsPlugin.d.ts.map

package/dist/plugins/LSPAssetsPlugin.js

@@ -23,10 +23,23 @@ class LSPAssetsPlugin {
     }
     async onCreateLanguageService(lsp, exp) {
         if (Array.isArray(this.config)) {
-            await lsp.setAssetTypes(this.config.map((c) => c.path));
+            await Promise.all(this.config.map((c) => {
+                this.loadConfig(c, lsp);
+            }));
         }
         else {
-            await lsp.setAssetTypes([this.config.path]);
+            await this.loadConfig(this.config, lsp);
+        }
+    }
+    async loadConfig(config, lsp) {
+        if (config.type === "manifest" || config.type === undefined) {
+            await lsp.setAssetTypes([config.path]);
+        }
+        else if (config.type === "module") {
+            await lsp.setAssetTypesFromModule([config.manifest]);
+        }
+        else {
+            throw Error(`Unknown config type: ${config.type}`);
         }
     }
 }

package/dist/utils/base-command.d.ts

@@ -9,6 +9,7 @@ import { CompilationContext } from "./compilation-context";
 export declare abstract class BaseCommand extends Command {
     static flags: {
         config: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     static strict: boolean;
     private resolvedConfig;

package/dist/utils/base-command.js

@@ -8,6 +8,7 @@ const cosmiconfig_1 = require("cosmiconfig");
 const json_language_service_1 = require("@player-tools/json-language-service");
 const dsl_1 = require("@player-tools/dsl");
 const compilation_context_1 = require("./compilation-context");
+const log_levels_1 = require("./log-levels");
 const configLoader = (0, cosmiconfig_1.cosmiconfig)("player");
 /** The common configs for all  */
 class BaseCommand extends core_1.Command {
@@ -16,6 +17,12 @@ class BaseCommand extends core_1.Command {
             description: "Path to a specific config file to load.\nBy default, will automatically search for an rc or config file to load",
             char: "c",
         }),
+        loglevel: core_1.Flags.string({
+            char: "v",
+            description: "How verbose logs should be",
+            options: log_levels_1.LogLevels,
+            default: "warn",
+        }),
     };
     static strict = false;
     resolvedConfig;

package/dist/utils/diag-renderer.d.ts

@@ -1,4 +1,5 @@
-import type { Diagnostic } from "vscode-languageserver-types";
+import { Diagnostic } from "vscode-languageserver-types";
+import { DiagnosticSeverity } from "vscode-languageserver-types";
 import type { Task, TaskProgressRenderer } from "./task-runner";
 /** Get the lines representing the summary of the results */
 export declare function getSummary({ errors, warnings, skipped, fileCount, duration, }: {
@@ -14,10 +15,12 @@ export declare function getSummary({ errors, warnings, skipped, fileCount, durat
     duration: number | undefined;
 }): string;
 /** Format the results for printing on the console */
-export declare function formatDiagnosticResults(filePath: string, results: Diagnostic[], verbose?: boolean): {
+export declare function formatDiagnosticResults(filePath: string, results: Diagnostic[], loglevel: DiagnosticSeverity): {
     lines: string[];
     errors: number;
     warnings: number;
+    info: number;
+    trace: number;
 };
 /** Get the symbol for a given task */
 export declare const getTaskSymbol: (task: Task<any, any>) => string;

package/dist/utils/diag-renderer.js

@@ -59,9 +59,22 @@ function getSummary({ errors, warnings, skipped, fileCount, duration, }) {
 }
 /** Format a diag for printing on the console */
 function formatDiagnostic(diag, longestLine, fName) {
-    const type = diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Error
-        ? chalk_1.default.red(`${log_symbols_1.default.error}  `)
-        : chalk_1.default.yellow(`${log_symbols_1.default.warning}  `);
+    let type;
+    if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Error) {
+        type = chalk_1.default.red(`${log_symbols_1.default.error}  `);
+    }
+    else if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Warning) {
+        type = chalk_1.default.yellow(`${log_symbols_1.default.warning}  `);
+    }
+    else if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Information) {
+        type = chalk_1.default.blue(`${log_symbols_1.default.info}  `);
+    }
+    else if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Hint) {
+        type = chalk_1.default.gray(`${log_symbols_1.default.info}  `);
+    }
+    else {
+        type = chalk_1.default.green(`${log_symbols_1.default.info}  `);
+    }
     const msg = chalk_1.default.bold(diag.message);
     const range = getLineRange(diag.range);
     return [
@@ -72,10 +85,12 @@ function formatDiagnostic(diag, longestLine, fName) {
     ].join(" ");
 }
 /** Format the results for printing on the console */
-function formatDiagnosticResults(filePath, results, verbose = false) {
+function formatDiagnosticResults(filePath, results, loglevel) {
     const count = {
         errors: 0,
         warnings: 0,
+        info: 0,
+        trace: 0
     };
     const linePrefix = "  ";
     const longestLine = Math.max(...results.map((r) => getLineRange(r.range).length));
@@ -87,7 +102,13 @@ function formatDiagnosticResults(filePath, results, verbose = false) {
         else if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Warning) {
             count.warnings += 1;
         }
-        if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Error || verbose) {
+        else if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Information) {
+            count.info += 1;
+        }
+        else if (diag.severity === vscode_languageserver_types_1.DiagnosticSeverity.Hint) {
+            count.trace += 1;
+        }
+        if (diag.severity && loglevel >= diag.severity) {
             return linePrefix + formatDiagnostic(diag, longestLine + 1, filePath);
         }
         return "";
@@ -96,18 +117,32 @@ function formatDiagnosticResults(filePath, results, verbose = false) {
     if (count.errors > 0) {
         lines = ["", `${chalk_1.default.red(log_symbols_1.default.error)} ${filePath}`, ...lines, ""];
     }
-    else if (verbose) {
-        if (count.warnings > 0) {
-            lines = [
-                "",
-                `${chalk_1.default.yellow(log_symbols_1.default.warning)} ${filePath}`,
-                ...lines,
-                "",
-            ];
-        }
-        else {
-            lines = [`${chalk_1.default.green(log_symbols_1.default.success)} ${filePath}`, ...lines];
-        }
+    else if (count.warnings > 0 && loglevel >= vscode_languageserver_types_1.DiagnosticSeverity.Warning) {
+        lines = [
+            "",
+            `${chalk_1.default.yellow(log_symbols_1.default.warning)} ${filePath}`,
+            ...lines,
+            "",
+        ];
+    }
+    else if (count.info > 0 && loglevel >= vscode_languageserver_types_1.DiagnosticSeverity.Information) {
+        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,
+            "",
+        ];
+    }
+    else {
+        lines = [`${chalk_1.default.green(log_symbols_1.default.success)} ${filePath}`, ...lines];
     }
     return {
         ...count,
@@ -137,7 +172,7 @@ exports.validationRenderer = {
         const output = ["Validating content"];
         tasks.forEach((task) => {
             if (task.state === "completed" && task.output) {
-                const formattedDiags = formatDiagnosticResults(task.data?.file ? (0, fs_1.normalizePath)(task.data.file) : "", sortDiagnostics(task.output), true);
+                const formattedDiags = formatDiagnosticResults(task.data?.file ? (0, fs_1.normalizePath)(task.data.file) : "", sortDiagnostics(task.output), ctx.loglevel);
                 output.push(...formattedDiags.lines);
             }
             else {
@@ -156,7 +191,7 @@ exports.validationRenderer = {
         };
         ctx.tasks.forEach((t) => {
             if (t.state === "completed" && t.output) {
-                const formattedDiags = formatDiagnosticResults(t.data?.file ?? "", t.output, true);
+                const formattedDiags = formatDiagnosticResults(t.data?.file ?? "", t.output, ctx.loglevel);
                 count.errors += formattedDiags.errors;
                 count.warnings += formattedDiags.warnings;
             }

package/dist/utils/log-levels.d.ts

@@ -0,0 +1,11 @@
+import { DiagnosticSeverity } from "vscode-languageserver-types";
+export declare const LogLevelsMap: {
+    error: 1;
+    warn: 2;
+    info: 3;
+    trace: 4;
+};
+export type LogLevelsType = keyof typeof LogLevelsMap;
+export declare const LogLevels: string[];
+export declare function stringToLogLevel(level: string): DiagnosticSeverity;
+//# sourceMappingURL=log-levels.d.ts.map

package/dist/utils/log-levels.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogLevels = exports.LogLevelsMap = void 0;
+exports.stringToLogLevel = stringToLogLevel;
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+exports.LogLevelsMap = {
+    error: vscode_languageserver_types_1.DiagnosticSeverity.Error,
+    warn: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
+    info: vscode_languageserver_types_1.DiagnosticSeverity.Information,
+    trace: vscode_languageserver_types_1.DiagnosticSeverity.Hint,
+};
+exports.LogLevels = Object.keys(exports.LogLevelsMap);
+function isValidLogLevel(level) {
+    return exports.LogLevels.includes(level);
+}
+function stringToLogLevel(level) {
+    return isValidLogLevel(level)
+        ? exports.LogLevelsMap[level]
+        : vscode_languageserver_types_1.DiagnosticSeverity.Warning;
+}
+//# sourceMappingURL=log-levels.js.map

package/dist/utils/task-runner.d.ts

@@ -1,3 +1,4 @@
+import { DiagnosticSeverity } from "vscode-languageserver-types";
 interface BaseTask<Results, Data> {
     /** The state of the task */
     state: "idle" | "pending";
@@ -26,6 +27,8 @@ export interface TaskProgressRenderer<ResultType, Data = unknown> {
     onUpdate: (ctx: {
         /** The tasks that are running */
         tasks: Array<Task<ResultType, Data>>;
+        /** What level of information to log */
+        loglevel: DiagnosticSeverity;
     }) => string;
     /** Called for a summary */
     onEnd: (ctx: {
@@ -33,6 +36,8 @@ export interface TaskProgressRenderer<ResultType, Data = unknown> {
         tasks: Array<CompletedTask<ResultType, Data>>;
         /** Number of ms it took to run */
         duration: number;
+        /** What level of information to log */
+        loglevel: DiagnosticSeverity;
     }) => string;
 }
 interface TaskRunner<R, Data> {
@@ -42,11 +47,13 @@ interface TaskRunner<R, Data> {
     run: () => Promise<Array<CompletedTask<R, Data>>>;
 }
 /** Create a runner to kick off tasks in parallel */
-export declare const createTaskRunner: <R, D>({ tasks, renderer, }: {
+export declare const createTaskRunner: <R, D>({ tasks, renderer, loglevel, }: {
     /** A list of tasks to run */
     tasks: Array<Pick<BaseTask<R, D>, "data" | "run">>;
     /** How to report progress */
     renderer: TaskProgressRenderer<R, D>;
+    /** What level of logs to write */
+    loglevel: DiagnosticSeverity;
 }) => TaskRunner<R, D>;
 export {};
 //# sourceMappingURL=task-runner.d.ts.map

package/dist/utils/task-runner.js

@@ -4,7 +4,7 @@ exports.createTaskRunner = void 0;
 const tslib_1 = require("tslib");
 const log_update_1 = tslib_1.__importDefault(require("log-update"));
 /** Create a runner to kick off tasks in parallel */
-const createTaskRunner = ({ tasks, renderer, }) => {
+const createTaskRunner = ({ tasks, renderer, loglevel, }) => {
     const statefulTasks = tasks.map((t) => {
         return {
             ...t,
@@ -19,7 +19,7 @@ const createTaskRunner = ({ tasks, renderer, }) => {
             if (ended) {
                 return;
             }
-            const output = renderer.onUpdate({ tasks: statefulTasks });
+            const output = renderer.onUpdate({ tasks: statefulTasks, loglevel });
             if (process.stdout.isTTY) {
                 (0, log_update_1.default)(output);
             }
@@ -44,6 +44,7 @@ const createTaskRunner = ({ tasks, renderer, }) => {
         const output = renderer.onEnd({
             duration,
             tasks: statefulTasks,
+            loglevel
         });
         console.log(output);
         log_update_1.default.done();

package/package.json

@@ -5,7 +5,7 @@
     "dist"
   ],
   "name": "@player-tools/cli",
-  "version": "0.9.0-next.0",
+  "version": "0.9.0-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.0-next.0",
-    "@player-tools/json-language-service": "0.9.0-next.0",
-    "@player-tools/xlr": "0.9.0-next.0",
-    "@player-tools/xlr-converters": "0.9.0-next.0",
-    "@player-tools/xlr-sdk": "0.9.0-next.0",
-    "@player-tools/xlr-utils": "0.9.0-next.0",
+    "@player-tools/dsl": "0.9.0-next.2",
+    "@player-tools/json-language-service": "0.9.0-next.2",
+    "@player-tools/xlr": "0.9.0-next.2",
+    "@player-tools/xlr-converters": "0.9.0-next.2",
+    "@player-tools/xlr-sdk": "0.9.0-next.2",
+    "@player-tools/xlr-utils": "0.9.0-next.2",
     "@babel/plugin-transform-react-jsx-source": "^7.23.3",
     "@babel/preset-env": "^7.23.3",
     "@babel/preset-react": "^7.23.3",