@microsoft/powerquery-language-services 0.6.12 → 0.9.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/powerquery-language-services/analysis/analysis.d.ts +12 -11
- package/lib/powerquery-language-services/analysis/analysisBase.d.ts +31 -25
- package/lib/powerquery-language-services/analysis/analysisBase.js +239 -195
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/analysis/analysisUtils.d.ts +1 -1
- package/lib/powerquery-language-services/analysis/analysisUtils.js +3 -3
- package/lib/powerquery-language-services/analysis/analysisUtils.js.map +1 -1
- package/lib/powerquery-language-services/analysis/memoizedAnalysis.d.ts +6 -6
- package/lib/powerquery-language-services/analysis/memoizedAnalysis.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +8 -7
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalType.d.ts +1 -1
- package/lib/powerquery-language-services/externalType/externalType.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalTypeUtils.d.ts +2 -2
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js +8 -7
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/index.d.ts +2 -1
- package/lib/powerquery-language-services/index.js +4 -3
- package/lib/powerquery-language-services/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts +7 -8
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js +3 -4
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +227 -193
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts +4 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +121 -98
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts +3 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +13 -46
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +42 -43
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js +24 -23
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js +7 -7
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js +8 -8
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +8 -9
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js +6 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/commonTypes.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.d.ts +4 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +126 -82
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.d.ts +5 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +305 -53
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/commonTypes.d.ts +6 -7
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +8 -11
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.d.ts +7 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.js +5 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.js.map +1 -0
- package/lib/powerquery-language-services/inspection/autocomplete/{common.d.ts → trailingTokenUtils.d.ts} +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js +19 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js.map +1 -0
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js +23 -20
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/expectedType.js +62 -61
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +20 -15
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +12 -10
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js +7 -7
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +38 -36
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js +20 -18
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.js +24 -21
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +85 -84
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js +38 -38
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js +25 -24
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +15 -13
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +14 -12
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +10 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +10 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +10 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +9 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +89 -88
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +12 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +14 -13
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +9 -7
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.js +3 -3
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspectionSettings.d.ts +1 -1
- package/lib/powerquery-language-services/inspectionSettings.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.d.ts +3 -3
- package/lib/powerquery-language-services/inspectionUtils.js +51 -52
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/library.d.ts +1 -1
- package/lib/powerquery-language-services/library/library.js.map +1 -1
- package/lib/powerquery-language-services/library/librarySymbolUtils.d.ts +10 -2
- package/lib/powerquery-language-services/library/librarySymbolUtils.js +27 -21
- package/lib/powerquery-language-services/library/librarySymbolUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.d.ts +5 -5
- package/lib/powerquery-language-services/library/libraryUtils.js +24 -23
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/templates.js +42 -42
- package/lib/powerquery-language-services/localization/templates.js.map +1 -1
- package/lib/powerquery-language-services/positionUtils.d.ts +9 -4
- package/lib/powerquery-language-services/positionUtils.js +55 -23
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +15 -15
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/libraryProvider.js +9 -8
- package/lib/powerquery-language-services/providers/libraryProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js +16 -14
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js +24 -23
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js +73 -71
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js.map +1 -1
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js +6 -6
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/tokenPositionComparison.d.ts +5 -0
- package/lib/powerquery-language-services/tokenPositionComparison.js +13 -0
- package/lib/powerquery-language-services/tokenPositionComparison.js.map +1 -0
- package/lib/powerquery-language-services/trace.d.ts +4 -4
- package/lib/powerquery-language-services/trace.js.map +1 -1
- package/lib/powerquery-language-services/traceUtils.d.ts +2 -2
- package/lib/powerquery-language-services/traceUtils.js +5 -5
- package/lib/powerquery-language-services/traceUtils.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +6 -5
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +16 -14
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +6 -4
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +7 -5
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js +10 -7
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map +1 -1
- package/package.json +10 -8
- package/lib/powerquery-language-services/inspection/autocomplete/common.js +0 -11
- package/lib/powerquery-language-services/inspection/autocomplete/common.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examineFieldSpecificationList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"examineFieldSpecificationList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAMmE;AACnE,oEAA0D;AAI1D,gCAA+D;AAC/D,mFAAgF;AAQhF,oFAAoF;AACpF,SAAsB,6BAA6B,CAC/C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,6BAA6B,CAAC,IAAI,EAClC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA6B,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QAExG,MAAM,mBAAmB,GAAyB,KAAK,CAAC,mBAAmB,CAAC;QAE5E,MAAM,MAAM,GAAkD,MAAM,8BAAU,CAAC,QAAQ,CACnF,0BAAiB,CAAC,0BAA0B,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAC1E,CAAO,kBAAkD,EAAE,EAAE;YAAC,OAAA;gBAC1D,kBAAkB,CAAC,oBAAoB;gBACvC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;aAClF,CAAA;UAAA,CACJ,CAAC;QAEF,MAAM,MAAM,GACR,uBAAc,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,cAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC;QAEpH,MAAM,MAAM,GAAmC;YAC3C,MAAM,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC;YACvB,MAAM;SACT,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;;CACjB;AApCD,sEAoCC"}
|
|
@@ -6,50 +6,50 @@ exports.inspectTypeConstant = void 0;
|
|
|
6
6
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
7
7
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
8
8
|
function inspectTypeConstant(xorNode) {
|
|
9
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
10
|
-
if (parser_1.XorNodeUtils.
|
|
9
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.Constant);
|
|
10
|
+
if (parser_1.XorNodeUtils.isContext(xorNode)) {
|
|
11
11
|
return language_1.Type.UnknownInstance;
|
|
12
12
|
}
|
|
13
13
|
const constant = xorNode.node;
|
|
14
14
|
switch (constant.constantKind) {
|
|
15
|
-
case
|
|
16
|
-
return language_1.
|
|
17
|
-
case
|
|
15
|
+
case language_1.Constant.PrimitiveTypeConstant.Action:
|
|
16
|
+
return language_1.Type.ActionInstance;
|
|
17
|
+
case language_1.Constant.PrimitiveTypeConstant.Any:
|
|
18
18
|
return language_1.Type.AnyInstance;
|
|
19
|
-
case
|
|
20
|
-
return language_1.
|
|
21
|
-
case
|
|
22
|
-
return language_1.
|
|
23
|
-
case
|
|
24
|
-
return language_1.
|
|
25
|
-
case
|
|
26
|
-
return language_1.
|
|
27
|
-
case
|
|
28
|
-
return language_1.
|
|
29
|
-
case
|
|
30
|
-
return language_1.
|
|
31
|
-
case
|
|
32
|
-
return language_1.
|
|
33
|
-
case
|
|
34
|
-
return language_1.
|
|
35
|
-
case
|
|
36
|
-
return language_1.
|
|
37
|
-
case
|
|
38
|
-
return language_1.TypeUtils.createPrimitiveType(false, "None" /* None */);
|
|
39
|
-
case "null" /* Null */:
|
|
19
|
+
case language_1.Constant.PrimitiveTypeConstant.AnyNonNull:
|
|
20
|
+
return language_1.Type.AnyNonNullInstance;
|
|
21
|
+
case language_1.Constant.PrimitiveTypeConstant.Binary:
|
|
22
|
+
return language_1.Type.BinaryInstance;
|
|
23
|
+
case language_1.Constant.PrimitiveTypeConstant.Date:
|
|
24
|
+
return language_1.Type.DateInstance;
|
|
25
|
+
case language_1.Constant.PrimitiveTypeConstant.DateTime:
|
|
26
|
+
return language_1.Type.DateTimeInstance;
|
|
27
|
+
case language_1.Constant.PrimitiveTypeConstant.DateTimeZone:
|
|
28
|
+
return language_1.Type.DateTimeZoneInstance;
|
|
29
|
+
case language_1.Constant.PrimitiveTypeConstant.Duration:
|
|
30
|
+
return language_1.Type.DurationInstance;
|
|
31
|
+
case language_1.Constant.PrimitiveTypeConstant.Function:
|
|
32
|
+
return language_1.Type.FunctionInstance;
|
|
33
|
+
case language_1.Constant.PrimitiveTypeConstant.List:
|
|
34
|
+
return language_1.Type.ListInstance;
|
|
35
|
+
case language_1.Constant.PrimitiveTypeConstant.Logical:
|
|
36
|
+
return language_1.Type.LogicalInstance;
|
|
37
|
+
case language_1.Constant.PrimitiveTypeConstant.None:
|
|
40
38
|
return language_1.Type.NoneInstance;
|
|
41
|
-
case
|
|
42
|
-
return language_1.
|
|
43
|
-
case
|
|
44
|
-
return language_1.
|
|
45
|
-
case
|
|
46
|
-
return language_1.
|
|
47
|
-
case
|
|
48
|
-
return language_1.
|
|
49
|
-
case
|
|
50
|
-
return language_1.
|
|
51
|
-
case
|
|
52
|
-
return language_1.
|
|
39
|
+
case language_1.Constant.PrimitiveTypeConstant.Null:
|
|
40
|
+
return language_1.Type.NoneInstance;
|
|
41
|
+
case language_1.Constant.PrimitiveTypeConstant.Number:
|
|
42
|
+
return language_1.Type.NumberInstance;
|
|
43
|
+
case language_1.Constant.PrimitiveTypeConstant.Record:
|
|
44
|
+
return language_1.Type.RecordInstance;
|
|
45
|
+
case language_1.Constant.PrimitiveTypeConstant.Table:
|
|
46
|
+
return language_1.Type.TableInstance;
|
|
47
|
+
case language_1.Constant.PrimitiveTypeConstant.Text:
|
|
48
|
+
return language_1.Type.TextInstance;
|
|
49
|
+
case language_1.Constant.PrimitiveTypeConstant.Time:
|
|
50
|
+
return language_1.Type.TimeInstance;
|
|
51
|
+
case language_1.Constant.PrimitiveTypeConstant.Type:
|
|
52
|
+
return language_1.Type.TypePrimitiveInstance;
|
|
53
53
|
default:
|
|
54
54
|
return language_1.Type.UnknownInstance;
|
|
55
55
|
}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeConstant.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,
|
|
1
|
+
{"version":3,"file":"inspectTypeConstant.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAkG;AAClG,sFAAmG;AAEnG,SAAgB,mBAAmB,CAAC,OAAiB;IACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE7E,IAAI,qBAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QACjC,OAAO,eAAI,CAAC,eAAe,CAAC;KAC/B;IAED,MAAM,QAAQ,GAAkB,OAAO,CAAC,IAAI,CAAC;IAE7C,QAAQ,QAAQ,CAAC,YAAY,EAAE;QAC3B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,MAAM;YACtC,OAAO,eAAI,CAAC,cAAc,CAAC;QAE/B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,GAAG;YACnC,OAAO,eAAI,CAAC,WAAW,CAAC;QAE5B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,UAAU;YAC1C,OAAO,eAAI,CAAC,kBAAkB,CAAC;QAEnC,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,MAAM;YACtC,OAAO,eAAI,CAAC,cAAc,CAAC;QAE/B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,IAAI;YACpC,OAAO,eAAI,CAAC,YAAY,CAAC;QAE7B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,QAAQ;YACxC,OAAO,eAAI,CAAC,gBAAgB,CAAC;QAEjC,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,YAAY;YAC5C,OAAO,eAAI,CAAC,oBAAoB,CAAC;QAErC,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,QAAQ;YACxC,OAAO,eAAI,CAAC,gBAAgB,CAAC;QAEjC,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,QAAQ;YACxC,OAAO,eAAI,CAAC,gBAAgB,CAAC;QAEjC,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,IAAI;YACpC,OAAO,eAAI,CAAC,YAAY,CAAC;QAE7B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,OAAO;YACvC,OAAO,eAAI,CAAC,eAAe,CAAC;QAEhC,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,IAAI;YACpC,OAAO,eAAI,CAAC,YAAY,CAAC;QAE7B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,IAAI;YACpC,OAAO,eAAI,CAAC,YAAY,CAAC;QAE7B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,MAAM;YACtC,OAAO,eAAI,CAAC,cAAc,CAAC;QAE/B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,MAAM;YACtC,OAAO,eAAI,CAAC,cAAc,CAAC;QAE/B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,KAAK;YACrC,OAAO,eAAI,CAAC,aAAa,CAAC;QAE9B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,IAAI;YACpC,OAAO,eAAI,CAAC,YAAY,CAAC;QAE7B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,IAAI;YACpC,OAAO,eAAI,CAAC,YAAY,CAAC;QAE7B,KAAK,mBAAQ,CAAC,qBAAqB,CAAC,IAAI;YACpC,OAAO,eAAI,CAAC,qBAAqB,CAAC;QAEtC;YACI,OAAO,eAAI,CAAC,eAAe,CAAC;KACnC;AACL,CAAC;AAtED,kDAsEC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js
CHANGED
|
@@ -13,25 +13,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.inspectTypeEachExpression = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
16
17
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
18
|
const __1 = require("../../..");
|
|
18
19
|
const common_1 = require("./common");
|
|
19
20
|
function inspectTypeEachExpression(state, xorNode, correlationId) {
|
|
20
21
|
var _a;
|
|
21
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry(
|
|
23
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeEachExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
23
24
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
25
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.EachExpression);
|
|
25
26
|
const expressionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1, trace.id);
|
|
26
|
-
const result = language_1.TypeUtils.
|
|
27
|
+
const result = language_1.TypeUtils.definedFunction(false, [
|
|
27
28
|
{
|
|
28
29
|
isNullable: false,
|
|
29
30
|
isOptional: false,
|
|
30
|
-
type:
|
|
31
|
+
type: language_1.Type.TypeKind.Any,
|
|
31
32
|
nameLiteral: "_",
|
|
32
33
|
},
|
|
33
34
|
], expressionType);
|
|
34
|
-
trace.exit({ [
|
|
35
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
35
36
|
return result;
|
|
36
37
|
});
|
|
37
38
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeEachExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;
|
|
1
|
+
{"version":3,"file":"inspectTypeEachExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,2FAAuG;AACvG,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,yBAAyB,CAC3C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,yBAAyB,CAAC,IAAI,EAC9B,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAqB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAExF,MAAM,cAAc,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAEnH,MAAM,MAAM,GAAyB,oBAAS,CAAC,eAAe,CAC1D,KAAK,EACL;YACI;gBACI,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,KAAK;gBACjB,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,GAAG;gBACvB,WAAW,EAAE,GAAG;aACnB;SACJ,EACD,cAAc,CACjB,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAjCD,8DAiCC"}
|
|
@@ -15,27 +15,28 @@ exports.inspectTypeErrorHandlingExpression = void 0;
|
|
|
15
15
|
const PQP = require("@microsoft/powerquery-parser");
|
|
16
16
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
17
17
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
18
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
18
19
|
const __1 = require("../../..");
|
|
19
20
|
const common_1 = require("./common");
|
|
20
21
|
function inspectTypeErrorHandlingExpression(state, xorNode, correlationId) {
|
|
21
22
|
var _a;
|
|
22
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry(
|
|
24
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeErrorHandlingExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
24
25
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
26
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.ErrorHandlingExpression);
|
|
26
27
|
// Grabs Ast.ErrorHandlingExpression.handler
|
|
27
|
-
const handler = parser_1.NodeIdMapUtils.
|
|
28
|
+
const handler = parser_1.NodeIdMapUtils.nthChildXorChecked(state.nodeIdMapCollection, xorNode.node.id, 2, [language_1.Ast.NodeKind.CatchExpression, language_1.Ast.NodeKind.OtherwiseExpression]);
|
|
28
29
|
let errorHandlerResult;
|
|
29
30
|
// No handler exists, i.e. `try 0`
|
|
30
31
|
if (handler === undefined) {
|
|
31
32
|
errorHandlerResult = language_1.Type.RecordInstance;
|
|
32
33
|
}
|
|
33
34
|
// If it's a catch handler, i.e. `try 1/0 catch () => "div by 0"`
|
|
34
|
-
else if (handler.node.kind ===
|
|
35
|
+
else if (handler.node.kind === language_1.Ast.NodeKind.CatchExpression) {
|
|
35
36
|
// We care about the evaluation of the function,
|
|
36
37
|
// and as typing isn't allowed on a catch expression it requires an inspection on the function's body
|
|
37
|
-
const fnExpression = parser_1.NodeIdMapUtils.
|
|
38
|
-
|
|
38
|
+
const fnExpression = parser_1.NodeIdMapUtils.nthChildXorChecked(state.nodeIdMapCollection, handler.node.id, 1, [
|
|
39
|
+
language_1.Ast.NodeKind.FunctionExpression,
|
|
39
40
|
]);
|
|
40
41
|
// If there's no function expression, i.e. `try 1/0 catch`
|
|
41
42
|
if (fnExpression === undefined) {
|
|
@@ -47,14 +48,14 @@ function inspectTypeErrorHandlingExpression(state, xorNode, correlationId) {
|
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
// Much easier here, simply return the paired expression.
|
|
50
|
-
else if (handler.node.kind ===
|
|
51
|
+
else if (handler.node.kind === language_1.Ast.NodeKind.OtherwiseExpression) {
|
|
51
52
|
errorHandlerResult = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, handler, 1, trace.id);
|
|
52
53
|
}
|
|
53
54
|
else {
|
|
54
55
|
throw new PQP.CommonError.InvariantError(`should never be reached`);
|
|
55
56
|
}
|
|
56
|
-
const result = language_1.TypeUtils.
|
|
57
|
-
trace.exit({ [
|
|
57
|
+
const result = language_1.TypeUtils.anyUnion([yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1, trace.id), errorHandlerResult], state.traceManager, trace.id);
|
|
58
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
58
59
|
return result;
|
|
59
60
|
});
|
|
60
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,sFAKmE;
|
|
1
|
+
{"version":3,"file":"inspectTypeErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,sFAKmE;AACnE,2FAAuG;AAEvG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,kCAAkC,CACpD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,kCAAkC,CAAC,IAAI,EACvC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA+B,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;QAE3G,4CAA4C;QAC5C,MAAM,OAAO,GACT,uBAAc,CAAC,kBAAkB,CAC7B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,CAAC,cAAG,CAAC,QAAQ,CAAC,eAAe,EAAE,cAAG,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CACnE,CAAC;QAEN,IAAI,kBAAwC,CAAC;QAE7C,kCAAkC;QAClC,IAAI,OAAO,KAAK,SAAS,EAAE;YACvB,kBAAkB,GAAG,eAAI,CAAC,cAAc,CAAC;SAC5C;QACD,iEAAiE;aAC5D,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,cAAG,CAAC,QAAQ,CAAC,eAAe,EAAE;YACzD,gDAAgD;YAChD,qGAAqG;YACrG,MAAM,YAAY,GACd,uBAAc,CAAC,kBAAkB,CAAyB,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE;gBACrG,cAAG,CAAC,QAAQ,CAAC,kBAAkB;aAClC,CAAC,CAAC;YAEP,0DAA0D;YAC1D,IAAI,YAAY,KAAK,SAAS,EAAE;gBAC5B,kBAAkB,GAAG,eAAI,CAAC,eAAe,CAAC;aAC7C;YACD,iDAAiD;iBAC5C;gBACD,kBAAkB,GAAG,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aACnG;SACJ;QACD,yDAAyD;aACpD,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,cAAG,CAAC,QAAQ,CAAC,mBAAmB,EAAE;YAC7D,kBAAkB,GAAG,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC9F;aAAM;YACH,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;SACvE;QAED,MAAM,MAAM,GAAyB,oBAAS,CAAC,QAAQ,CACnD,CAAC,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,EAC3F,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAhED,gFAgEC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js
CHANGED
|
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectFieldType = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
17
18
|
const __1 = require("../../../..");
|
|
18
19
|
const common_1 = require("../common");
|
|
19
20
|
// A field selection/projection is an operation a target value,
|
|
@@ -28,10 +29,10 @@ const common_1 = require("../common");
|
|
|
28
29
|
function inspectFieldType(state, xorNode, correlationId) {
|
|
29
30
|
var _a, _b;
|
|
30
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
const trace = state.traceManager.entry(
|
|
32
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectFieldType.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
32
33
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, [
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
language_1.Ast.NodeKind.FieldProjection,
|
|
35
|
+
language_1.Ast.NodeKind.FieldSelector,
|
|
35
36
|
]);
|
|
36
37
|
// travels up the AST to see if we're in an EachExpression or RecursivePrimaryExpression.
|
|
37
38
|
const eachExpression = findEachExpression(state, xorNode);
|
|
@@ -46,7 +47,7 @@ function inspectFieldType(state, xorNode, correlationId) {
|
|
|
46
47
|
const previousSibling = parser_1.NodeIdMapUtils.assertRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
|
|
47
48
|
fieldType = yield (0, common_1.inspectXor)(state, previousSibling, trace.id);
|
|
48
49
|
}
|
|
49
|
-
trace.exit({ [
|
|
50
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(fieldType) });
|
|
50
51
|
return fieldType;
|
|
51
52
|
});
|
|
52
53
|
}
|
|
@@ -56,7 +57,7 @@ function findEachExpression(state, xorNode) {
|
|
|
56
57
|
let parent = parser_1.NodeIdMapUtils.parentXor(nodeIdMapCollection, xorNode.node.id);
|
|
57
58
|
while (parent) {
|
|
58
59
|
switch (parent.node.kind) {
|
|
59
|
-
case
|
|
60
|
+
case language_1.Ast.NodeKind.EachExpression:
|
|
60
61
|
return parent;
|
|
61
62
|
default:
|
|
62
63
|
parent = parser_1.NodeIdMapUtils.parentXor(nodeIdMapCollection, parent.node.id);
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAMmE;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAMmE;AACnE,2FAAuG;AAEvG,mCAAkE;AAClE,sCAAyD;AAEzD,+DAA+D;AAC/D,gFAAgF;AAChF,2FAA2F;AAC3F,EAAE;AACF,iCAAiC;AACjC,uFAAuF;AACvF,EAAE;AACF,6CAA6C;AAC7C,uGAAuG;AAEvG,SAAsB,gBAAgB,CAClC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,gBAAgB,CAAC,IAAI,EACrB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,qBAAY,CAAC,gBAAgB,CAA0C,OAAO,EAAE;YAC5E,cAAG,CAAC,QAAQ,CAAC,eAAe;YAC5B,cAAG,CAAC,QAAQ,CAAC,aAAa;SAC7B,CAAC,CAAC;QAEH,yFAAyF;QACzF,MAAM,cAAc,GAA4C,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAEnG,IAAI,SAA+B,CAAC;QAEpC,oCAAoC;QACpC,IAAI,cAAc,EAAE;YAChB,SAAS,GAAG,MAAA,MAAA,KAAK,CAAC,aAAa,0CAAE,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,mCAAI,eAAI,CAAC,eAAe,CAAC;SACxF;QACD,gDAAgD;QAChD,oEAAoE;aAC/D;YACD,MAAM,eAAe,GAAa,uBAAc,CAAC,wCAAwC,CACrF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,CAClB,CAAC;YAEF,SAAS,GAAG,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAClE;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAE1E,OAAO,SAAS,CAAC;;CACpB;AAxCD,4CAwCC;AAED,SAAS,kBAAkB,CAAC,KAAuB,EAAE,OAAiB;IAClE,MAAM,mBAAmB,GAAyB,KAAK,CAAC,mBAAmB,CAAC;IAC5E,IAAI,MAAM,GAAyB,uBAAc,CAAC,SAAS,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAElG,OAAO,MAAM,EAAE;QACX,QAAQ,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;YACtB,KAAK,cAAG,CAAC,QAAQ,CAAC,cAAc;gBAC5B,OAAO,MAAqC,CAAC;YAEjD;gBACI,MAAM,GAAG,uBAAc,CAAC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACvE,MAAM;SACb;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}
|
|
@@ -15,36 +15,37 @@ exports.inspectTypeFieldProjection = void 0;
|
|
|
15
15
|
const PQP = require("@microsoft/powerquery-parser");
|
|
16
16
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
17
17
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
18
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
18
19
|
const __1 = require("../../../..");
|
|
19
20
|
const common_1 = require("./common");
|
|
20
21
|
function inspectTypeFieldProjection(state, xorNode, correlationId) {
|
|
21
22
|
var _a;
|
|
22
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry(
|
|
24
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeFieldProjection.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
24
25
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
26
|
-
const
|
|
26
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.FieldProjection);
|
|
27
|
+
const projectedFieldLiterals = parser_1.NodeIdMapIterator.iterFieldProjectionFieldLiterals(state.nodeIdMapCollection, xorNode);
|
|
27
28
|
const fieldType = yield (0, common_1.inspectFieldType)(state, xorNode, trace.id);
|
|
28
|
-
const isOptional = parser_1.NodeIdMapUtils.
|
|
29
|
+
const isOptional = parser_1.NodeIdMapUtils.nthChildAstChecked(state.nodeIdMapCollection, xorNode.node.id, 3, language_1.Ast.NodeKind.Constant) !== undefined;
|
|
29
30
|
let result;
|
|
30
31
|
switch (fieldType.kind) {
|
|
31
|
-
case
|
|
32
|
-
const projectedFields = new Map(
|
|
32
|
+
case language_1.Type.TypeKind.Any: {
|
|
33
|
+
const projectedFields = new Map(projectedFieldLiterals.map((fieldName) => [fieldName, language_1.Type.AnyInstance]));
|
|
33
34
|
result = {
|
|
34
|
-
kind:
|
|
35
|
-
extendedKind:
|
|
35
|
+
kind: language_1.Type.TypeKind.Any,
|
|
36
|
+
extendedKind: language_1.Type.ExtendedTypeKind.AnyUnion,
|
|
36
37
|
isNullable: fieldType.isNullable,
|
|
37
38
|
unionedTypePairs: [
|
|
38
39
|
{
|
|
39
|
-
kind:
|
|
40
|
-
extendedKind:
|
|
40
|
+
kind: language_1.Type.TypeKind.Record,
|
|
41
|
+
extendedKind: language_1.Type.ExtendedTypeKind.DefinedRecord,
|
|
41
42
|
isNullable: fieldType.isNullable,
|
|
42
43
|
fields: projectedFields,
|
|
43
44
|
isOpen: false,
|
|
44
45
|
},
|
|
45
46
|
{
|
|
46
|
-
kind:
|
|
47
|
-
extendedKind:
|
|
47
|
+
kind: language_1.Type.TypeKind.Table,
|
|
48
|
+
extendedKind: language_1.Type.ExtendedTypeKind.DefinedTable,
|
|
48
49
|
isNullable: fieldType.isNullable,
|
|
49
50
|
fields: new PQP.OrderedMap([...projectedFields]),
|
|
50
51
|
isOpen: false,
|
|
@@ -53,36 +54,36 @@ function inspectTypeFieldProjection(state, xorNode, correlationId) {
|
|
|
53
54
|
};
|
|
54
55
|
break;
|
|
55
56
|
}
|
|
56
|
-
case
|
|
57
|
-
case
|
|
58
|
-
result = inspectRecordOrTableProjection(fieldType,
|
|
57
|
+
case language_1.Type.TypeKind.Record:
|
|
58
|
+
case language_1.Type.TypeKind.Table:
|
|
59
|
+
result = inspectRecordOrTableProjection(fieldType, projectedFieldLiterals, isOptional);
|
|
59
60
|
break;
|
|
60
|
-
case
|
|
61
|
+
case language_1.Type.TypeKind.Unknown:
|
|
61
62
|
result = language_1.Type.UnknownInstance;
|
|
62
63
|
break;
|
|
63
64
|
default:
|
|
64
65
|
result = language_1.Type.NoneInstance;
|
|
65
66
|
break;
|
|
66
67
|
}
|
|
67
|
-
trace.exit({ [
|
|
68
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
68
69
|
return result;
|
|
69
70
|
});
|
|
70
71
|
}
|
|
71
72
|
exports.inspectTypeFieldProjection = inspectTypeFieldProjection;
|
|
72
|
-
function inspectRecordOrTableProjection(fieldType,
|
|
73
|
+
function inspectRecordOrTableProjection(fieldType, projectedFieldLiterals, isOptional) {
|
|
73
74
|
// All we know is fieldType was a Record/Table.
|
|
74
75
|
// Create a DefinedRecord/DefinedTable with the projected fields.
|
|
75
76
|
if (language_1.TypeUtils.isDefinedRecord(fieldType)) {
|
|
76
|
-
return reducedFieldsToKeys(fieldType,
|
|
77
|
+
return reducedFieldsToKeys(fieldType, projectedFieldLiterals, isOptional, reducedRecordFields);
|
|
77
78
|
}
|
|
78
79
|
else if (language_1.TypeUtils.isDefinedTable(fieldType)) {
|
|
79
|
-
return reducedFieldsToKeys(fieldType,
|
|
80
|
+
return reducedFieldsToKeys(fieldType, projectedFieldLiterals, isOptional, reducedTableFields);
|
|
80
81
|
}
|
|
81
82
|
else {
|
|
82
|
-
const newFields = new Map(
|
|
83
|
-
return fieldType.kind ===
|
|
84
|
-
? language_1.TypeUtils.
|
|
85
|
-
: language_1.TypeUtils.
|
|
83
|
+
const newFields = new Map(projectedFieldLiterals.map((fieldName) => [fieldName, language_1.Type.AnyInstance]));
|
|
84
|
+
return fieldType.kind === language_1.Type.TypeKind.Record
|
|
85
|
+
? language_1.TypeUtils.definedRecord(false, newFields, false)
|
|
86
|
+
: language_1.TypeUtils.definedTable(false, new PQP.OrderedMap([...newFields]), false);
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
89
|
// Returns a subset of `current` using `keys`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeFieldProjection.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,sFAKmE;
|
|
1
|
+
{"version":3,"file":"inspectTypeFieldProjection.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,sFAKmE;AACnE,2FAAuG;AAEvG,mCAAkE;AAClE,qCAA4C;AAG5C,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,0BAA0B,CAAC,IAAI,EAC/B,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAE1F,MAAM,sBAAsB,GAA0B,0BAAiB,CAAC,gCAAgC,CACpG,KAAK,CAAC,mBAAmB,EACzB,OAAO,CACV,CAAC;QAEF,MAAM,SAAS,GAAyB,MAAM,IAAA,yBAAgB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAEzF,MAAM,UAAU,GACZ,uBAAc,CAAC,kBAAkB,CAC7B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,QAAQ,CACxB,KAAK,SAAS,CAAC;QAEpB,IAAI,MAA4B,CAAC;QAEjC,QAAQ,SAAS,CAAC,IAAI,EAAE;YACpB,KAAK,eAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACpB,MAAM,eAAe,GAAyB,IAAI,GAAG,CACjD,sBAAsB,CAAC,GAAG,CAAC,CAAC,SAAiB,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,eAAI,CAAC,WAAW,CAAC,CAAC,CACnF,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,GAAG;oBACvB,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,QAAQ;oBAC5C,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,gBAAgB,EAAE;wBACd;4BACI,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,MAAM;4BAC1B,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,aAAa;4BACjD,UAAU,EAAE,SAAS,CAAC,UAAU;4BAChC,MAAM,EAAE,eAAe;4BACvB,MAAM,EAAE,KAAK;yBAChB;wBACD;4BACI,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,KAAK;4BACzB,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,YAAY;4BAChD,UAAU,EAAE,SAAS,CAAC,UAAU;4BAChC,MAAM,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC;4BAChD,MAAM,EAAE,KAAK;yBAChB;qBACJ;iBACJ,CAAC;gBAEF,MAAM;aACT;YAED,KAAK,eAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC1B,KAAK,eAAI,CAAC,QAAQ,CAAC,KAAK;gBACpB,MAAM,GAAG,8BAA8B,CAAC,SAAS,EAAE,sBAAsB,EAAE,UAAU,CAAC,CAAC;gBACvF,MAAM;YAEV,KAAK,eAAI,CAAC,QAAQ,CAAC,OAAO;gBACtB,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;gBAC9B,MAAM;YAEV;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;SACb;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAhFD,gEAgFC;AAED,SAAS,8BAA8B,CACnC,SAAqC,EACrC,sBAA6C,EAC7C,UAAmB;IAEnB,+CAA+C;IAC/C,iEAAiE;IACjE,IAAI,oBAAS,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;QACtC,OAAO,mBAAmB,CAAC,SAAS,EAAE,sBAAsB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;KAClG;SAAM,IAAI,oBAAS,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;QAC5C,OAAO,mBAAmB,CAAC,SAAS,EAAE,sBAAsB,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;KACjG;SAAM;QACH,MAAM,SAAS,GAAsC,IAAI,GAAG,CACxD,sBAAsB,CAAC,GAAG,CAAC,CAAC,SAAiB,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,eAAI,CAAC,WAAW,CAAC,CAAC,CACnF,CAAC;QAEF,OAAO,SAAS,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,MAAM;YAC1C,CAAC,CAAC,oBAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC;YAClD,CAAC,CAAC,oBAAS,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;KAClF;AACL,CAAC;AAED,8CAA8C;AAC9C,0EAA0E;AAC1E,SAAS,mBAAmB,CACxB,OAAU,EACV,IAA2B,EAC3B,UAAmB,EACnB,aAG6E;IAE7E,MAAM,iBAAiB,GAA0B,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IAE5E,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE;QACtE,OAAO,UAAU,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC;KAC7D;IAED,uCACO,OAAO,KACV,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,EACpC,MAAM,EAAE,KAAK,IACf;AACN,CAAC;AAED,SAAS,mBAAmB,CAAC,OAA2B,EAAE,IAA2B;IACjF,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,kBAAkB,CAAC,OAA0B,EAAE,IAA2B;IAC/E,OAAO,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC"}
|
|
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeFieldSelector = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
17
18
|
const __1 = require("../../../..");
|
|
18
19
|
const common_1 = require("./common");
|
|
19
20
|
// A field selection/projection is an operation done on some value.
|
|
@@ -28,30 +29,30 @@ const common_1 = require("./common");
|
|
|
28
29
|
function inspectTypeFieldSelector(state, xorNode, correlationId) {
|
|
29
30
|
var _a;
|
|
30
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
const trace = state.traceManager.entry(
|
|
32
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeFieldSelector.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
32
33
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
33
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
34
|
-
const fieldName = parser_1.NodeIdMapUtils.
|
|
34
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.FieldSelector);
|
|
35
|
+
const fieldName = parser_1.NodeIdMapUtils.wrappedContentAstChecked(state.nodeIdMapCollection, xorNode.node.id, language_1.Ast.NodeKind.GeneralizedIdentifier);
|
|
35
36
|
if (fieldName === undefined) {
|
|
36
|
-
trace.exit({ [
|
|
37
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(language_1.Type.UnknownInstance) });
|
|
37
38
|
return language_1.Type.UnknownInstance;
|
|
38
39
|
}
|
|
39
40
|
const fieldType = yield (0, common_1.inspectFieldType)(state, xorNode, trace.id);
|
|
40
|
-
const isOptional = parser_1.NodeIdMapUtils.
|
|
41
|
+
const isOptional = parser_1.NodeIdMapUtils.nthChildAstChecked(state.nodeIdMapCollection, xorNode.node.id, 3, language_1.Ast.NodeKind.Constant) !== undefined;
|
|
41
42
|
const result = getFieldSelectorType(fieldType, fieldName.literal, isOptional);
|
|
42
|
-
trace.exit({ [
|
|
43
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
43
44
|
return result;
|
|
44
45
|
});
|
|
45
46
|
}
|
|
46
47
|
exports.inspectTypeFieldSelector = inspectTypeFieldSelector;
|
|
47
48
|
function getFieldSelectorType(fieldType, fieldName, isOptional) {
|
|
48
49
|
switch (fieldType.kind) {
|
|
49
|
-
case
|
|
50
|
+
case language_1.Type.TypeKind.Any:
|
|
50
51
|
return language_1.Type.AnyInstance;
|
|
51
|
-
case
|
|
52
|
+
case language_1.Type.TypeKind.Unknown:
|
|
52
53
|
return language_1.Type.UnknownInstance;
|
|
53
|
-
case
|
|
54
|
-
case
|
|
54
|
+
case language_1.Type.TypeKind.Record:
|
|
55
|
+
case language_1.Type.TypeKind.Table:
|
|
55
56
|
return inspectRecordOrTable(fieldType, fieldName, isOptional);
|
|
56
57
|
default:
|
|
57
58
|
return language_1.Type.NoneInstance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeFieldSelector.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;
|
|
1
|
+
{"version":3,"file":"inspectTypeFieldSelector.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AACnH,2FAAuG;AAEvG,mCAAkE;AAClE,qCAA4C;AAG5C,mEAAmE;AACnE,8EAA8E;AAC9E,2FAA2F;AAC3F,EAAE;AACF,iCAAiC;AACjC,sFAAsF;AACtF,EAAE;AACF,6CAA6C;AAC7C,uGAAuG;AAEvG,SAAsB,wBAAwB,CAC1C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,wBAAwB,CAAC,IAAI,EAC7B,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEtF,MAAM,SAAS,GACX,uBAAc,CAAC,wBAAwB,CACnC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,cAAG,CAAC,QAAQ,CAAC,qBAAqB,CACrC,CAAC;QAEN,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAErF,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,SAAS,GAAyB,MAAM,IAAA,yBAAgB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAEzF,MAAM,UAAU,GACZ,uBAAc,CAAC,kBAAkB,CAC7B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,QAAQ,CACxB,KAAK,SAAS,CAAC;QAEpB,MAAM,MAAM,GAAyB,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACpG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AA1CD,4DA0CC;AAED,SAAS,oBAAoB,CACzB,SAA+B,EAC/B,SAAiB,EACjB,UAAmB;IAEnB,QAAQ,SAAS,CAAC,IAAI,EAAE;QACpB,KAAK,eAAI,CAAC,QAAQ,CAAC,GAAG;YAClB,OAAO,eAAI,CAAC,WAAW,CAAC;QAE5B,KAAK,eAAI,CAAC,QAAQ,CAAC,OAAO;YACtB,OAAO,eAAI,CAAC,eAAe,CAAC;QAEhC,KAAK,eAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC1B,KAAK,eAAI,CAAC,QAAQ,CAAC,KAAK;YACpB,OAAO,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAElE;YACI,OAAO,eAAI,CAAC,YAAY,CAAC;KAChC;AACL,CAAC;AAED,SAAS,oBAAoB,CACzB,SAAqC,EACrC,SAAiB,EACjB,UAAmB;IAEnB,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,EAAE;QACtC,OAAO,eAAI,CAAC,WAAW,CAAC;KAC3B;IAED,MAAM,UAAU,GAAqC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAErF,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,OAAO,UAAU,CAAC;KACrB;SAAM,IAAI,SAAS,CAAC,MAAM,EAAE;QACzB,OAAO,eAAI,CAAC,WAAW,CAAC;KAC3B;SAAM;QACH,OAAO,UAAU,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC;KAC7D;AACL,CAAC"}
|
|
@@ -14,19 +14,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeFieldSpecification = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
17
18
|
const __1 = require("../../..");
|
|
18
19
|
const common_1 = require("./common");
|
|
19
20
|
function inspectTypeFieldSpecification(state, xorNode, correlationId) {
|
|
20
21
|
var _a;
|
|
21
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry(
|
|
23
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeFieldSpecification.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
23
24
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
25
|
-
const fieldTypeSpecification = parser_1.NodeIdMapUtils.
|
|
25
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.FieldSpecification);
|
|
26
|
+
const fieldTypeSpecification = parser_1.NodeIdMapUtils.nthChildXor(state.nodeIdMapCollection, xorNode.node.id, 2);
|
|
26
27
|
const result = fieldTypeSpecification !== undefined
|
|
27
28
|
? yield (0, common_1.inspectXor)(state, fieldTypeSpecification, trace.id)
|
|
28
29
|
: language_1.Type.AnyInstance;
|
|
29
|
-
trace.exit({ [
|
|
30
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
30
31
|
return result;
|
|
31
32
|
});
|
|
32
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeFieldSpecification.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;
|
|
1
|
+
{"version":3,"file":"inspectTypeFieldSpecification.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AACnH,2FAAuG;AAEvG,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,6BAA6B,CAC/C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,6BAA6B,CAAC,IAAI,EAClC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAyB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAEhG,MAAM,sBAAsB,GAAyB,uBAAc,CAAC,WAAW,CAC3E,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,MAAM,MAAM,GACR,sBAAsB,KAAK,SAAS;YAChC,CAAC,CAAC,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC;YAC3D,CAAC,CAAC,eAAI,CAAC,WAAW,CAAC;QAE3B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AA7BD,sEA6BC"}
|
|
@@ -13,22 +13,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.inspectTypeFunctionExpression = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
16
17
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
18
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
18
19
|
const common_1 = require("./common");
|
|
19
20
|
const __1 = require("../../..");
|
|
20
21
|
const pseudoFunctionExpressionType_1 = require("../../pseudoFunctionExpressionType");
|
|
22
|
+
const inspectionSettings_1 = require("../../../inspectionSettings");
|
|
21
23
|
function inspectTypeFunctionExpression(state, xorNode, correlationId) {
|
|
22
24
|
var _a;
|
|
23
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const trace = state.traceManager.entry(
|
|
26
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeFunctionExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
25
27
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
26
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
28
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.FunctionExpression);
|
|
27
29
|
const pseudoType = (0, pseudoFunctionExpressionType_1.pseudoFunctionExpressionType)(state.nodeIdMapCollection, xorNode);
|
|
28
30
|
const pseudoReturnType = pseudoType.returnType;
|
|
29
31
|
let result;
|
|
30
32
|
switch (state.typeStrategy) {
|
|
31
|
-
case
|
|
33
|
+
case inspectionSettings_1.TypeStrategy.Extended: {
|
|
32
34
|
const expressionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
|
|
33
35
|
// FunctionExpression.functionReturnType doesn't always match FunctionExpression.expression.
|
|
34
36
|
// By examining the expression we might get a more accurate return type (eg. Function vs DefinedFunction),
|
|
@@ -36,22 +38,22 @@ function inspectTypeFunctionExpression(state, xorNode, correlationId) {
|
|
|
36
38
|
let returnType;
|
|
37
39
|
// If the stated return type is Any,
|
|
38
40
|
// then it might as well be the expression's type as it can't be any wider than Any.
|
|
39
|
-
if (pseudoReturnType.kind ===
|
|
41
|
+
if (pseudoReturnType.kind === language_1.Type.TypeKind.Any) {
|
|
40
42
|
returnType = expressionType;
|
|
41
43
|
}
|
|
42
44
|
// If the return type is Any then see if we can narrow it to the stated return Type.
|
|
43
|
-
else if (expressionType.kind ===
|
|
44
|
-
expressionType.extendedKind ===
|
|
45
|
-
(0, common_1.allForAnyUnion)(expressionType, (type) => type.kind === pseudoReturnType.kind || type.kind ===
|
|
45
|
+
else if (expressionType.kind === language_1.Type.TypeKind.Any &&
|
|
46
|
+
expressionType.extendedKind === language_1.Type.ExtendedTypeKind.AnyUnion &&
|
|
47
|
+
(0, common_1.allForAnyUnion)(expressionType, (type) => type.kind === pseudoReturnType.kind || type.kind === language_1.Type.TypeKind.Any)) {
|
|
46
48
|
returnType = expressionType;
|
|
47
49
|
}
|
|
48
50
|
// If the stated return type doesn't match the expression's type then it's None.
|
|
49
51
|
else if (pseudoReturnType.kind !== expressionType.kind) {
|
|
50
|
-
trace.exit({ [
|
|
52
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(language_1.Type.NoneInstance) });
|
|
51
53
|
return language_1.Type.NoneInstance;
|
|
52
54
|
}
|
|
53
55
|
// If the expression's type can't be known, then assume it's the stated return Type.
|
|
54
|
-
else if (expressionType.kind ===
|
|
56
|
+
else if (expressionType.kind === language_1.Type.TypeKind.Unknown) {
|
|
55
57
|
returnType = pseudoReturnType;
|
|
56
58
|
}
|
|
57
59
|
// Else fallback to the expression's Type.
|
|
@@ -59,8 +61,8 @@ function inspectTypeFunctionExpression(state, xorNode, correlationId) {
|
|
|
59
61
|
returnType = expressionType;
|
|
60
62
|
}
|
|
61
63
|
result = {
|
|
62
|
-
kind:
|
|
63
|
-
extendedKind:
|
|
64
|
+
kind: language_1.Type.TypeKind.Function,
|
|
65
|
+
extendedKind: language_1.Type.ExtendedTypeKind.DefinedFunction,
|
|
64
66
|
isNullable: false,
|
|
65
67
|
parameters: pseudoType.parameters.map((pseudoParameter) => ({
|
|
66
68
|
nameLiteral: pseudoParameter.name.literal,
|
|
@@ -72,13 +74,13 @@ function inspectTypeFunctionExpression(state, xorNode, correlationId) {
|
|
|
72
74
|
};
|
|
73
75
|
break;
|
|
74
76
|
}
|
|
75
|
-
case
|
|
77
|
+
case inspectionSettings_1.TypeStrategy.Primitive:
|
|
76
78
|
result = pseudoReturnType;
|
|
77
79
|
break;
|
|
78
80
|
default:
|
|
79
81
|
powerquery_parser_1.Assert.isNever(state.typeStrategy);
|
|
80
82
|
}
|
|
81
|
-
trace.exit({ [
|
|
83
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
82
84
|
return result;
|
|
83
85
|
});
|
|
84
86
|
}
|