@artel/artc 0.6.25249 → 0.6.25250

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-CBYKP5SE.js";
-import "./chunk-6OPBY3SK.js";
+} from "./chunk-VYUD26HA.js";
+import "./chunk-ZZKHAAAX.js";
 import {
   __async
-} from "./chunk-G4UMALLG.js";
+} from "./chunk-DJEEXP7U.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-6OPBY3SK.js";
+} from "../chunk-ZZKHAAAX.js";
 import {
   AccessKind,
   AccessedFunctionValueParameter,
@@ -332,7 +332,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldExecution
-} from "../chunk-G4UMALLG.js";
+} from "../chunk-DJEEXP7U.js";
 export {
   AccessKind,
   AccessedFunctionValueParameter,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-CBYKP5SE.js";
-import "../chunk-6OPBY3SK.js";
-import "../chunk-G4UMALLG.js";
+} from "../chunk-VYUD26HA.js";
+import "../chunk-ZZKHAAAX.js";
+import "../chunk-DJEEXP7U.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -178,7 +178,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldExecution
-} from "../chunk-G4UMALLG.js";
+} from "../chunk-DJEEXP7U.js";
 
 // source/services/CustomCommand.ts
 import * as ls from "vscode-languageserver";
@@ -840,8 +840,8 @@ var SyntaxFactory = class {
     const closeBraceToken = this.token(21 /* CloseBrace */);
     return new FunctionBlock(openBraceToken, statementList, closeBraceToken);
   }
-  static noneLiteral() {
-    return new KeywordExpression(this.keyword(57 /* None */));
+  static nullLiteral() {
+    return new KeywordExpression(this.keyword(57 /* Null */));
   }
   static integerLiteral(value) {
     return new TokenExpression(this.token(2 /* IntegerLiteral */, value.toString()));
@@ -2142,16 +2142,16 @@ var SyntaxToCode = class _SyntaxToCode {
       [137 /* FieldOrVariantTranslation */]: this.prototype.writeFieldOrVariantTranslation,
       [138 /* TypeMemberTranslationList */]: this.prototype.writeNodeDefault,
       [139 /* TypeTranslation */]: this.prototype.writeTypeTranslation,
-      [140 /* TextTranslation */]: this.prototype.writeNodeDefault,
+      [140 /* TextTranslationDeclaration */]: this.prototype.writeNodeDefault,
       [149 /* TagList */]: this.prototype.writeNodeDefault,
       [151 /* ModifierList */]: this.prototype.writeNodeDefault,
       [156 /* TypeArgumentList */]: this.prototype.writeNodeDefault,
       [158 /* TypeParameterList */]: this.prototype.writeNodeDefault,
       [159 /* TypeAnnotation */]: this.prototype.writeNodeDefault,
-      [141 /* TranslationTextTemplate */]: this.prototype.writeNodeDefault,
-      [142 /* TranslationTextTemplateSpanList */]: this.prototype.writeNodeDefault,
-      [143 /* TranslationTextTemplateSpan */]: this.prototype.writeNodeDefault,
-      [144 /* TranslationTextTemplateParameterDeclaration */]: this.prototype.writeNodeDefault
+      [141 /* TextTemplateDeclaration */]: this.prototype.writeNodeDefault,
+      [142 /* TextTemplateDeclarationSpanList */]: this.prototype.writeNodeDefault,
+      [143 /* TextTemplateDeclarationSpan */]: this.prototype.writeNodeDefault,
+      [144 /* TextTemplateParameterDeclaration */]: this.prototype.writeNodeDefault
     };
     return writeFunctions;
   }
@@ -3454,7 +3454,7 @@ var CompletionService = class {
     }
     if (role.kind === "array-element") {
       let type = this._analyzer.type.ofExpression(role.array);
-      type = this._analyzer.excludeNoneFromType(type);
+      type = this._analyzer.excludeNullFromType(type);
       const isArrayCheck = this._analyzer.isTypeArrayOrReadonlyArray(type);
       if (isArrayCheck !== void 0) {
         return { targetTypes: [isArrayCheck.elementType], targetSignaturesParameters: void 0 };
@@ -3480,7 +3480,7 @@ var CompletionService = class {
     }
     if (role.kind === "function-block-expression") {
       const targetType = semanticContext.getContainingSubprogram()?.getReturnType();
-      if (targetType !== void 0 && !targetType.equals(this._analyzer.originalStandardTypes.none)) {
+      if (targetType !== void 0 && !targetType.equals(this._analyzer.originalStandardTypes.nullType)) {
         return { targetTypes: [targetType], targetSignaturesParameters: void 0 };
       }
       return { targetTypes: void 0, targetSignaturesParameters: void 0 };
@@ -3589,7 +3589,7 @@ var CompletionService = class {
       kinds.add(9 /* From */);
     }
     if (syntaxContext.isExpressionContext !== void 0) {
-      kinds.add(43 /* Not */).add(52 /* Yes */).add(53 /* No */).add(57 /* None */).add(40 /* Async */).add(12 /* Function */).add(54 /* Reference */).add(2 /* Autotype */).add(30 /* Cond */);
+      kinds.add(43 /* Not */).add(52 /* Yes */).add(53 /* No */).add(57 /* Null */).add(40 /* Async */).add(12 /* Function */).add(54 /* Reference */).add(2 /* Autotype */).add(30 /* Cond */);
       if (positionDescription.kind === "after-token-or-keyword") {
         const container = semanticContext.getContainingTypeOrTypeExtension();
         if (container !== void 0) {
@@ -3900,7 +3900,7 @@ var CompletionService = class {
     return new NamedTypeCompletionItemInfo(this.completionItemInfoContext, entity, prefix, sortText);
   }
   getTypeMemberCompletionItemInfos(ctx) {
-    const type = this._analyzer.excludeNoneFromType(ctx.type);
+    const type = this._analyzer.excludeNullFromType(ctx.type);
     const memberLookup = TypeMemberLookup.ofType(this._analyzer, type, this._locale);
     const options6 = ctx.isStaticAccess ? 2 /* OnlyStaticMembers */ : 1 /* OnlyInstanceMembers */;
     return memberLookup.getNamedMembers(options6, ctx.hidingMatcher, ctx.typeExtensionLookup).map((m) => {
@@ -6742,20 +6742,30 @@ var DefinitionService = class {
         default:
           Debug.never(semanticInfo);
       }
-      if ((result === void 0 || result.definitionLocations.length === 0) && this._sourceGenerationService !== void 0 && semanticInfo.kind === "reference") {
-        const sourceLocations = (yield Promise.all(Query.from(semanticInfo.betterTargets ?? semanticInfo.targets).mapAndFilter((t) => {
-          const referencedEntity = this.getReferenceTargetEntity(t);
+      if (this._sourceGenerationService !== void 0 && semanticInfo.kind === "reference") {
+        const sourceLocations = new Array();
+        for (const referenceTarget of semanticInfo.betterTargets ?? semanticInfo.targets) {
+          const referencedEntity = this.getReferenceTargetEntity(referenceTarget);
           if (referencedEntity !== void 0 && this._sourceGenerationService.entityDefinitionRequiresSourceGeneration(referencedEntity)) {
-            return this._sourceGenerationService.getDefinitionInGeneratedCode(
+            const locations = yield this._sourceGenerationService.getDefinitionInGeneratedCode(
               analyzer,
               referencedEntity,
               cancellationToken
             );
+            if (locations !== void 0) {
+              sourceLocations.push(...locations);
+            }
           }
-          return void 0;
-        }).toArray())).filter((l) => l !== void 0).flatMap((l) => l);
+        }
         if (sourceLocations.length > 0) {
-          result = new DefinitionsAndReferenceInfo(sourceLocations, tokenOrKeyword.value.rangeWithoutTrivia);
+          if (result === void 0) {
+            result = new DefinitionsAndReferenceInfo(sourceLocations, tokenOrKeyword.value.rangeWithoutTrivia);
+          } else {
+            result = new DefinitionsAndReferenceInfo(
+              result.definitionLocations.concat(sourceLocations),
+              result.referenceRange
+            );
+          }
         }
       }
       return result;
@@ -11531,6 +11541,12 @@ var EntityToSyntax = class {
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
+    if (entity.markedBasic()) {
+      modifiers.push(SyntaxFactory.modifier(17 /* Basic */));
+    }
+    if (entity.isAbstract()) {
+      modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
+    }
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
     const body = this.createStructuredTypeDeclarationBody(entity);
@@ -11802,7 +11818,7 @@ var EntityToSyntax = class {
     const type = this.convertType(entity.getType());
     let defaultValue;
     if (entity.isOptional()) {
-      defaultValue = SyntaxFactory.noneLiteral();
+      defaultValue = SyntaxFactory.nullLiteral();
     }
     return SyntaxFactory.parameterDeclaration(tags, name, type, defaultValue);
   }
@@ -11894,10 +11910,10 @@ var EntityToSyntax = class {
   }
   convertUnionType(type) {
     if (type.originalTypes.length === 2) {
-      const noneTypeIndex = type.originalTypes.findIndex((t) => t.equals(this._analyzer.originalStandardTypes.none));
-      if (noneTypeIndex >= 0) {
-        const nonNoneType = noneTypeIndex === 0 ? type.originalTypes[1] : type.originalTypes[0];
-        const result = SyntaxFactory.nullableTypeSpecifier(this.convertType(nonNoneType));
+      const nullTypeIndex = type.originalTypes.findIndex((t) => t.equals(this._analyzer.originalStandardTypes.nullType));
+      if (nullTypeIndex >= 0) {
+        const nonNullType = nullTypeIndex === 0 ? type.originalTypes[1] : type.originalTypes[0];
+        const result = SyntaxFactory.nullableTypeSpecifier(this.convertType(nonNullType));
         return result;
       }
     }