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

package/dist/commands/dsl/compile.js

@@ -105,8 +105,7 @@ class DSLCompile extends base_command_1.BaseCommand {
             catch (e) {
                 results.exitCode = 100;
                 this.log("");
-                this.log(chalk_1.default.red(`${log_symbols_1.default.error} Error compiling ${file}: ${e.message}`));
-                this.debug(e);
+                this.log(chalk_1.default.red(`${log_symbols_1.default.error} Error compiling ${file}: ${e.stack}`));
                 compilerResults.push({
                     state: "completed",
                     error: e,

package/dist/commands/dsl/validate.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const globby_1 = tslib_1.__importDefault(require("globby"));
 const log_symbols_1 = tslib_1.__importDefault(require("log-symbols"));
 const fs_1 = require("fs");
+const path_1 = tslib_1.__importDefault(require("path"));
 const ts = tslib_1.__importStar(require("typescript"));
 const core_1 = require("@oclif/core");
 const base_command_1 = require("../../utils/base-command");
@@ -22,46 +23,38 @@ class Validate extends base_command_1.BaseCommand {
             inputFiles: Array.isArray(files) ? files : [files],
         };
     }
-    async getTSConfig(filePath, compilerOptions = {}) {
-        let TSEnvConfig, configFile;
-        const EnvTSConfigPath = filePath
-            ? filePath
-            : globby_1.default.sync("./tsconfig.json")[0];
-        this.log(`Loading TypeScript config from path ${EnvTSConfigPath}`);
-        try {
-            configFile = await fs_1.promises.readFile(EnvTSConfigPath);
-        }
-        catch (e) {
-            this.warn("Error reading TypeScript configuration file, falling back to internal defaults");
+    getTSConfig(filePath) {
+        const configFileLocation = ts.findConfigFile(filePath ?? ".", (fName) => {
+            return (0, fs_1.existsSync)(fName);
+        });
+        if (!configFileLocation) {
+            this.debug(`No TSConfig found`);
             return;
         }
-        const compilerConfigObject = configFile && JSON.parse(configFile.toString());
-        const configCompilerOpts = compilerConfigObject?.compilerOptions || {};
-        if (compilerConfigObject.extends) {
-            TSEnvConfig = await this.getTSConfig(compilerConfigObject.extends, {
-                ...compilerOptions,
-                ...configCompilerOpts,
-            });
-        }
-        else {
-            TSEnvConfig = {
-                ...compilerOptions,
-                ...configCompilerOpts,
-            };
+        const configContent = ts.readConfigFile(configFileLocation, (p) => {
+            return (0, fs_1.readFileSync)(p, "utf-8");
+        });
+        if (configContent.error) {
+            this.warn(ts.flattenDiagnosticMessageText(configContent.error.messageText, "\n"));
+            return;
         }
-        if (TSEnvConfig && Object.keys(TSEnvConfig).length > 0) {
-            if (!compilerConfigObject.extends)
-                this.debug(`Final effective config: ${JSON.stringify(TSEnvConfig, null, 4)}`);
-            return TSEnvConfig;
+        const basePath = path_1.default.dirname(configFileLocation);
+        const parsedConfigContent = ts.parseJsonConfigFileContent(configContent.config, ts.sys, basePath);
+        if (parsedConfigContent.errors.length > 0) {
+            throw new Error(`Error while parsing tsconfig: ${parsedConfigContent.errors
+                .map((d) => {
+                return ts.flattenDiagnosticMessageText(d.messageText, "\n");
+            })
+                .join("\n\n")}`);
         }
-        this.log(`No local TypeScript compiler configuration could be found, falling back to internal defaults`);
+        return parsedConfigContent.options;
     }
     async run() {
         const { inputFiles } = await this.getOptions();
         const files = await (0, globby_1.default)((0, fs_2.convertToFileGlob)(inputFiles, "**/*.(tsx|jsx|js|ts)"), {
             expandDirectories: true,
         });
-        const TSConfig = (await this.getTSConfig()) ?? compiler_options_1.DEFAULT_COMPILER_OPTIONS;
+        const TSConfig = this.getTSConfig() ?? compiler_options_1.DEFAULT_COMPILER_OPTIONS;
         const program = ts.createProgram(files, TSConfig);
         const allDiagnostics = ts.getPreEmitDiagnostics(program);
         let diagnosticsCount = 0;

package/dist/plugins/LSPAssetsPlugin.d.ts

@@ -23,7 +23,7 @@ export interface LSPAssetsPluginConfig {
  */
 export declare class LSPAssetsPlugin implements PlayerCLIPlugin {
     private config;
-    constructor(config: LSPAssetsPluginConfig);
+    constructor(config: LSPAssetsPluginConfig | Array<LSPAssetsPluginConfig>);
     onCreateLanguageService(lsp: PlayerLanguageService, exp: boolean): Promise<void>;
 }
 //# sourceMappingURL=LSPAssetsPlugin.d.ts.map

package/dist/plugins/LSPAssetsPlugin.js

@@ -21,7 +21,12 @@ class LSPAssetsPlugin {
         this.config = config;
     }
     async onCreateLanguageService(lsp, exp) {
-        await lsp.setAssetTypes([this.config.path]);
+        if (Array.isArray(this.config)) {
+            await lsp.setAssetTypes(this.config.map((c) => c.path));
+        }
+        else {
+            await lsp.setAssetTypes([this.config.path]);
+        }
     }
 }
 exports.LSPAssetsPlugin = LSPAssetsPlugin;

package/dist/plugins/LSPPluginPlugin.d.ts

@@ -5,7 +5,7 @@ import type { PlayerCLIPlugin } from "./index";
  */
 export declare class LSPPluginPlugin implements PlayerCLIPlugin {
     private plugin;
-    constructor(plugin: PlayerLanguageServicePlugin);
+    constructor(plugin: PlayerLanguageServicePlugin | Array<PlayerLanguageServicePlugin>);
     onCreateLanguageService(lsp: PlayerLanguageService, exp: boolean): Promise<void>;
 }
 //# sourceMappingURL=LSPPluginPlugin.d.ts.map

package/dist/plugins/LSPPluginPlugin.js

@@ -9,7 +9,12 @@ class LSPPluginPlugin {
         this.plugin = plugin;
     }
     async onCreateLanguageService(lsp, exp) {
-        lsp.addLSPPlugin(this.plugin);
+        if (Array.isArray(this.plugin)) {
+            this.plugin.forEach((p) => lsp.addLSPPlugin(p));
+        }
+        else {
+            lsp.addLSPPlugin(this.plugin);
+        }
     }
 }
 exports.LSPPluginPlugin = LSPPluginPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/cli",
-  "version": "0.5.2-next.0",
+  "version": "0.5.2-next.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -12,21 +12,21 @@
     "bin": "player",
     "dirname": "player",
     "topicSeparator": " ",
-    "commands": "dist/commands"
+    "commands": "dist/commands",
+    "plugins": [
+      "@oclif/plugin-plugins"
+    ]
   },
   "bin": {
     "player": "bin/run"
   },
-  "plugins": [
-    "@oclif/plugin-plugins"
-  ],
   "dependencies": {
-    "@player-tools/dsl": "0.5.2-next.0",
-    "@player-tools/json-language-service": "0.5.2-next.0",
-    "@player-tools/xlr": "0.5.2-next.0",
-    "@player-tools/xlr-converters": "0.5.2-next.0",
-    "@player-tools/xlr-sdk": "0.5.2-next.0",
-    "@player-tools/xlr-utils": "0.5.2-next.0",
+    "@player-tools/dsl": "0.5.2-next.2",
+    "@player-tools/json-language-service": "0.5.2-next.2",
+    "@player-tools/xlr": "0.5.2-next.2",
+    "@player-tools/xlr-converters": "0.5.2-next.2",
+    "@player-tools/xlr-sdk": "0.5.2-next.2",
+    "@player-tools/xlr-utils": "0.5.2-next.2",
     "react": "^18.2.0",
     "tapable-ts": "^0.2.4",
     "@babel/register": "^7.23.3",
@@ -36,6 +36,7 @@
     "@babel/plugin-transform-react-jsx-source": "^7.23.3",
     "@oclif/core": "1.9.0",
     "@oclif/plugin-legacy": "^1.2.7",
+    "@oclif/plugin-plugins": "^1.9.0",
     "chalk": "^4.0.1",
     "cosmiconfig": "^7.0.1",
     "cross-fetch": "^3.0.5",
@@ -50,7 +51,7 @@
     "mkdirp": "^1.0.4",
     "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-languageserver-types": "^3.15.1",
-    "typescript": "4.8.4",
+    "typescript": "^5.4.4",
     "tslib": "^2.6.2"
   },
   "sideEffects": false,