@artel/artc 0.6.25289 → 0.6.25290

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-WQJII6CO.js";
-import "./chunk-X6VSO3OR.js";
+} from "./chunk-HYJB7VUR.js";
+import "./chunk-P7GXE2XS.js";
 import {
   __async
-} from "./chunk-F62D5WPV.js";
+} from "./chunk-ZV4RVSWH.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-X6VSO3OR.js";
+} from "../chunk-P7GXE2XS.js";
 import {
   AccessKind,
   AccessedFunctionParameter,
@@ -347,7 +347,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-F62D5WPV.js";
+} from "../chunk-ZV4RVSWH.js";
 export {
   AccessKind,
   AccessedFunctionParameter,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-WQJII6CO.js";
-import "../chunk-X6VSO3OR.js";
-import "../chunk-F62D5WPV.js";
+} from "../chunk-HYJB7VUR.js";
+import "../chunk-P7GXE2XS.js";
+import "../chunk-ZV4RVSWH.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -183,7 +183,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldTask
-} from "../chunk-F62D5WPV.js";
+} from "../chunk-ZV4RVSWH.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";

package/build/{chunk-WQJII6CO.js → chunk-HYJB7VUR.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-X6VSO3OR.js";
+} from "./chunk-P7GXE2XS.js";
 import {
   ArtelVersion,
   Cached,
@@ -15,7 +15,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-F62D5WPV.js";
+} from "./chunk-ZV4RVSWH.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";
@@ -78,6 +78,13 @@ var PhysicalFileSystem = class {
       return text;
     });
   }
+  directoryExists(uri) {
+    return __async(this, null, function* () {
+      const path = FileSystemUri.toPath(uri);
+      const stats = yield this.tryLstat(path);
+      return stats?.isDirectory() === true;
+    });
+  }
   readEntry(uri) {
     return __async(this, null, function* () {
       const path = FileSystemUri.toPath(uri);
@@ -192,6 +199,15 @@ var NodeCompiler = class {
   static get fileSystem() {
     return this.fileSystem_ ??= new PhysicalFileSystem();
   }
+  static validateInputPaths(inputPaths, diagnostics) {
+    const inputUris = {
+      projectUri: FileSystemUri.pathToUri(inputPaths.projectPath),
+      workspaceUri: inputPaths.workspacePath !== void 0 ? FileSystemUri.pathToUri(inputPaths.workspacePath) : void 0,
+      builtInsStandardPackagesUri: inputPaths.builtInsStandardPackagesPath !== void 0 ? FileSystemUri.pathToUri(inputPaths.builtInsStandardPackagesPath) : void 0,
+      userStandardPackagesUri: inputPaths.userStandardPackagesPath !== void 0 ? FileSystemUri.pathToUri(inputPaths.userStandardPackagesPath) : void 0
+    };
+    return Compiler.validateInputUris(inputUris, this.fileSystem, diagnostics);
+  }
   static findStandardTypeScriptLibrary(nodeModulesSearchPaths, defaultTsLibraryPath) {
     return __async(this, null, function* () {
       const nodeModulesSearchUris = nodeModulesSearchPaths.map((p) => FileSystemUri.pathToUri(p));
@@ -275,6 +291,16 @@ var NodeCompiler = class {
   }
   static compile(task) {
     return __async(this, null, function* () {
+      const inputPaths = {
+        projectPath: task.projectPath,
+        workspacePath: task.loadCompilationOptions?.workspacePath,
+        builtInsStandardPackagesPath: task.loadCompilationOptions?.builtInsStandardPackagesPath,
+        userStandardPackagesPath: task.loadCompilationOptions?.userStandardPackagesPath
+      };
+      const areValidInputPaths = yield this.validateInputPaths(inputPaths, task.diagnostics);
+      if (!areValidInputPaths) {
+        return void 0;
+      }
       const typeScriptLibrariesProvider = yield this.createTypeScriptLibrariesProvider(
         task.nodeModulesWithTypeScriptSearchPaths,
         task.defaultTsLibraryPath,
@@ -356,22 +382,25 @@ var CommandLineCompiler = class {
   }
   static run(args) {
     return __async(this, null, function* () {
-      const parsedArguments = ArgumentsParser.parseArguments(args);
+      const argumentsDiagnostics = new PrintingDiagnosticAcceptor(false);
+      const parsedArguments = ArgumentsParser.parseArguments(args, argumentsDiagnostics);
       if (parsedArguments.command === void 0) {
         this.displayUsageMessage(parsedArguments);
         return this.errorExitCode;
       }
+      if (parsedArguments.hasErrors) {
+        return this.errorExitCode;
+      }
       if (parsedArguments.command === 5 /* Help */) {
         this.displayUsageMessage(parsedArguments);
-        return this.errorExitCode;
+        return this.successExitCode;
       }
       if (parsedArguments.command === 4 /* Version */) {
         console.log(ArtelVersion);
         return this.successExitCode;
       }
       if (parsedArguments.projectPath === void 0 || parsedArguments.outputPath === void 0) {
-        this.displayUsageMessage(parsedArguments);
-        return this.successExitCode;
+        return this.errorExitCode;
       }
       if (parsedArguments.measurePerformance) {
         PerformanceMeasurement.isEnabled = true;
@@ -452,15 +481,16 @@ ${e.stack}`);
           shell: true,
           env: process.env
         });
-        program.once("exit", (code) => resolve2(code ?? 0));
+        program.once("exit", (code) => resolve2(code ?? this.successExitCode));
         program.once("error", reject);
       });
     });
   }
 };
 var ArgumentsParser = class {
-  static parseArguments(args) {
+  static parseArguments(args, diagnostics) {
     const result = {
+      hasErrors: false,
       command: void 0,
       projectPath: void 0,
       outputPath: void 0,
@@ -473,12 +503,13 @@ var ArgumentsParser = class {
       builtInStandardPackagesPath: void 0,
       attachSyntaxNodeUrisInCompiledCode: false
     };
-    const index = this.parseMainCommand(0, args, result);
-    this.parseNamedArguments(index, args, result);
+    const index = this.parseMainCommand(0, args, result, diagnostics);
+    this.parseNamedArguments(index, args, result, diagnostics);
     return result;
   }
-  static parseMainCommand(index, args, result) {
-    if (index < args.length && !args[index].startsWith("-")) {
+  static parseMainCommand(index, args, result, diagnostics) {
+    if (index < args.length) {
+      const commandText = args[index];
       result.command = this.getCommandKind(args[index]);
       index++;
       if (result.command !== void 0) {
@@ -492,11 +523,25 @@ var ArgumentsParser = class {
             if (projectPath !== void 0) {
               result.projectPath = resolve(cwd, projectPath);
               index++;
-              const outputPath = this.tryParseStringArgument(index, args);
-              if (outputPath !== void 0) {
-                result.outputPath = resolve(cwd, outputPath);
-                index++;
+              if (result.command !== 0 /* Setup */) {
+                const outputPath = this.tryParseStringArgument(index, args);
+                if (outputPath !== void 0) {
+                  result.outputPath = resolve(cwd, outputPath);
+                  index++;
+                } else {
+                  diagnostics.addDiagnostic(new Diagnostic(
+                    DiagnosticData.withCode(3016 /* ExpectedOutputDirectoryPath */),
+                    void 0
+                  ));
+                  result.hasErrors = true;
+                }
               }
+            } else {
+              diagnostics.addDiagnostic(new Diagnostic(
+                DiagnosticData.withCode(3015 /* ExpectedProjectDirectoryPath */),
+                void 0
+              ));
+              result.hasErrors = true;
             }
             break;
           }
@@ -506,7 +551,19 @@ var ArgumentsParser = class {
           default:
             Debug.never(result.command);
         }
+      } else {
+        diagnostics.addDiagnostic(new Diagnostic(DiagnosticData.withCode(
+          3013 /* UnknownCompilerCommand0 */,
+          [commandText]
+        ), void 0));
+        result.hasErrors = true;
       }
+    } else {
+      diagnostics.addDiagnostic(new Diagnostic(
+        DiagnosticData.withCode(3012 /* ExpectedCompilerCommand */),
+        void 0
+      ));
+      result.hasErrors = true;
     }
     return index;
   }
@@ -534,7 +591,7 @@ var ArgumentsParser = class {
         return void 0;
     }
   }
-  static parseNamedArguments(index, args, result) {
+  static parseNamedArguments(index, args, result, diagnostics) {
     const cwd = process.cwd();
     for (; index < args.length; index++) {
       const argumentName = args[index];
@@ -544,7 +601,7 @@ var ArgumentsParser = class {
       switch (argumentName) {
         case "--\u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0430\u044F-\u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430-type-script":
         case "--standard-type-script-library": {
-          const path = this.tryParseStringArgument(index + 1, args);
+          const path = this.parseStringArgument(index + 1, args, argumentName, diagnostics, result);
           if (path !== void 0) {
             result.defaultTsLibraryPath = resolve(cwd, path);
             index++;
@@ -553,7 +610,7 @@ var ArgumentsParser = class {
         }
         case "--workspace":
         case "--\u0440\u0430\u0431\u043E\u0447\u0430\u044F-\u043E\u0431\u043B\u0430\u0441\u0442\u044C": {
-          const path = this.tryParseStringArgument(index + 1, args);
+          const path = this.parseStringArgument(index + 1, args, argumentName, diagnostics, result);
           if (path !== void 0) {
             result.workspacePath = resolve(cwd, path);
             index++;
@@ -562,7 +619,7 @@ var ArgumentsParser = class {
         }
         case "--standard-packages":
         case "--\u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435-\u043F\u0430\u043A\u0435\u0442\u044B": {
-          const path = this.tryParseStringArgument(index + 1, args);
+          const path = this.parseStringArgument(index + 1, args, argumentName, diagnostics, result);
           if (path !== void 0) {
             result.standardPackagesPath = resolve(cwd, path);
             index++;
@@ -571,7 +628,7 @@ var ArgumentsParser = class {
         }
         case "--built-in-standard-packages":
         case "--\u0432\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0435-\u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435-\u043F\u0430\u043A\u0435\u0442\u044B": {
-          const path = this.tryParseStringArgument(index + 1, args);
+          const path = this.parseStringArgument(index + 1, args, argumentName, diagnostics, result);
           if (path !== void 0) {
             result.builtInStandardPackagesPath = resolve(cwd, path);
             index++;
@@ -598,9 +655,28 @@ var ArgumentsParser = class {
           result.attachSyntaxNodeUrisInCompiledCode = true;
           break;
         }
+        default: {
+          diagnostics.addDiagnostic(new Diagnostic(
+            DiagnosticData.withCode(3014 /* UnknownCommandLineArgument0 */, [argumentName]),
+            void 0
+          ));
+          result.hasErrors = true;
+          break;
+        }
       }
     }
   }
+  static parseStringArgument(index, args, name, diagnostics, parsedArguments) {
+    const result = this.tryParseStringArgument(index, args);
+    if (result === void 0) {
+      diagnostics.addDiagnostic(new Diagnostic(
+        DiagnosticData.withCode(3017 /* ExpectedTextValueForArgument0 */, [name]),
+        void 0
+      ));
+      parsedArguments.hasErrors = true;
+    }
+    return result;
+  }
   static tryParseStringArgument(index, args) {
     if (index < args.length && !args[index].startsWith("-")) {
       return args[index];

package/build/{chunk-X6VSO3OR.js → chunk-P7GXE2XS.js}

@@ -2,16 +2,103 @@ import {
   Analyzer,
   CompilationLoader,
   DefaultNamesOfDirectoriesToIgnore,
+  Diagnostic,
+  DiagnosticData,
   Emitter,
   SourceFileAnalyzer,
   SourcePackageDependencyGraph,
   WellKnownDeclarationsLoadError,
   __async,
   createTsInteropInputsForCompilation
-} from "./chunk-F62D5WPV.js";
+} from "./chunk-ZV4RVSWH.js";
 
 // source/executor/Compiler.ts
 var Compiler = class {
+  static validateInputUris(inputUris, sourcesProvider, diagnostics) {
+    return __async(this, null, function* () {
+      if (!(yield sourcesProvider.directoryExists(inputUris.projectUri))) {
+        diagnostics?.addDiagnostic(new Diagnostic(DiagnosticData.withCode(
+          3006 /* ProjectDirectoryDoesNotExist0 */,
+          [inputUris.projectUri.getFSPathWithFallback()]
+        ), void 0));
+        return false;
+      }
+      if (inputUris.workspaceUri !== void 0) {
+        if (!(yield sourcesProvider.directoryExists(inputUris.workspaceUri))) {
+          diagnostics?.addDiagnostic(new Diagnostic(
+            DiagnosticData.withCode(
+              3008 /* WorkspaceDirectoryDoesNotExist0 */,
+              [inputUris.workspaceUri.getFSPathWithFallback()]
+            ),
+            void 0
+          ));
+          return false;
+        }
+        if (inputUris.projectUri.checkIfRelativeTo(inputUris.workspaceUri) === 2 /* NotRelativeOrEqual */) {
+          diagnostics?.addDiagnostic(new Diagnostic(
+            DiagnosticData.withCode(
+              3009 /* ProjectDirectory0MustBeNestedInWorkspaceDirectory1 */,
+              [inputUris.projectUri.getFSPathWithFallback(), inputUris.workspaceUri.getFSPathWithFallback()]
+            ),
+            void 0
+          ));
+          return false;
+        }
+      }
+      if (inputUris.userStandardPackagesUri !== void 0) {
+        if (!(yield sourcesProvider.directoryExists(inputUris.userStandardPackagesUri))) {
+          diagnostics?.addDiagnostic(new Diagnostic(
+            DiagnosticData.withCode(
+              3007 /* StandardPackagesDirectoryDoesNotExist0 */,
+              [inputUris.userStandardPackagesUri.getFSPathWithFallback()]
+            ),
+            void 0
+          ));
+          return false;
+        }
+        if (inputUris.workspaceUri !== void 0) {
+          if (inputUris.userStandardPackagesUri.checkIfRelativeTo(inputUris.workspaceUri) === 2 /* NotRelativeOrEqual */) {
+            diagnostics?.addDiagnostic(new Diagnostic(
+              DiagnosticData.withCode(
+                3011 /* StandardPackagesDirectory0MustBeNestedInWorkspaceDirectory1 */,
+                [
+                  inputUris.userStandardPackagesUri.getFSPathWithFallback(),
+                  inputUris.workspaceUri.getFSPathWithFallback()
+                ]
+              ),
+              void 0
+            ));
+            return false;
+          }
+        } else {
+          if (inputUris.userStandardPackagesUri.checkIfRelativeTo(inputUris.projectUri) === 2 /* NotRelativeOrEqual */) {
+            diagnostics?.addDiagnostic(new Diagnostic(
+              DiagnosticData.withCode(
+                3010 /* StandardPackagesDirectory0MustBeNestedInProjectDirectory1 */,
+                [
+                  inputUris.userStandardPackagesUri.getFSPathWithFallback(),
+                  inputUris.projectUri.getFSPathWithFallback()
+                ]
+              ),
+              void 0
+            ));
+            return false;
+          }
+        }
+      }
+      if (inputUris.builtInsStandardPackagesUri !== void 0 && !(yield sourcesProvider.directoryExists(inputUris.builtInsStandardPackagesUri))) {
+        diagnostics?.addDiagnostic(new Diagnostic(
+          DiagnosticData.withCode(
+            3007 /* StandardPackagesDirectoryDoesNotExist0 */,
+            [inputUris.builtInsStandardPackagesUri.getFSPathWithFallback()]
+          ),
+          void 0
+        ));
+        return false;
+      }
+      return true;
+    });
+  }
   static loadCompilation(projectUri, sourcesProvider, tsLibrariesProvider, diagnostics, taskController, options) {
     return __async(this, null, function* () {
       const loaderOptions = {