@player-tools/cli 0.5.2--canary.72.2116 → 0.5.2-next.0

package/dist/commands/dsl/validate.js

@@ -22,33 +22,46 @@ class Validate extends base_command_1.BaseCommand {
             inputFiles: Array.isArray(files) ? files : [files],
         };
     }
-    async getTSConfig() {
+    async getTSConfig(filePath, compilerOptions = {}) {
         let TSEnvConfig, configFile;
-        const EnvTSConfig = globby_1.default.sync("./tsconfig.json")[0];
-        this.log(`Local Typesscript file found ${EnvTSConfig}`);
+        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(EnvTSConfig);
+            configFile = await fs_1.promises.readFile(EnvTSConfigPath);
         }
         catch (e) {
-            this.log("Error reading the TypeScript configuration file.");
+            this.warn("Error reading TypeScript configuration file, falling back to internal defaults");
             return;
         }
         const compilerConfigObject = configFile && JSON.parse(configFile.toString());
-        this.log(`Enviroment Typescript compiler configurations found: ${compilerConfigObject}`);
-        if (compilerConfigObject.CompilerOptions) {
-            TSEnvConfig = compilerConfigObject.CompilerOptions;
-            return TSEnvConfig;
+        const configCompilerOpts = compilerConfigObject?.compilerOptions || {};
+        if (compilerConfigObject.extends) {
+            TSEnvConfig = await this.getTSConfig(compilerConfigObject.extends, {
+                ...compilerOptions,
+                ...configCompilerOpts,
+            });
         }
         else {
-            this.log("No compiler configuration found on tsconfig.json file");
+            TSEnvConfig = {
+                ...compilerOptions,
+                ...configCompilerOpts,
+            };
+        }
+        if (TSEnvConfig && Object.keys(TSEnvConfig).length > 0) {
+            if (!compilerConfigObject.extends)
+                this.debug(`Final effective config: ${JSON.stringify(TSEnvConfig, null, 4)}`);
+            return TSEnvConfig;
         }
+        this.log(`No local TypeScript compiler configuration could be found, falling back to internal defaults`);
     }
     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 = (await this.getTSConfig()) ?? compiler_options_1.DEFAULT_COMPILER_OPTIONS;
         const program = ts.createProgram(files, TSConfig);
         const allDiagnostics = ts.getPreEmitDiagnostics(program);
         let diagnosticsCount = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@player-tools/cli",
-  "version": "0.5.2--canary.72.2116",
+  "version": "0.5.2-next.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -21,12 +21,12 @@
     "@oclif/plugin-plugins"
   ],
   "dependencies": {
-    "@player-tools/dsl": "0.5.2--canary.72.2116",
-    "@player-tools/json-language-service": "0.5.2--canary.72.2116",
-    "@player-tools/xlr": "0.5.2--canary.72.2116",
-    "@player-tools/xlr-converters": "0.5.2--canary.72.2116",
-    "@player-tools/xlr-sdk": "0.5.2--canary.72.2116",
-    "@player-tools/xlr-utils": "0.5.2--canary.72.2116",
+    "@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",
     "react": "^18.2.0",
     "tapable-ts": "^0.2.4",
     "@babel/register": "^7.23.3",