@microsoft/powerquery-language-services 0.3.23 → 0.3.24

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.
Files changed (34) hide show
  1. package/lib/powerquery-language-services/inspection/type/inspectType/common.js +3 -4
  2. package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
  3. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +52 -40
  4. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
  5. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts +1 -1
  6. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +32 -20
  7. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
  8. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts +1 -1
  9. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +22 -9
  10. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
  11. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.d.ts +1 -1
  12. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +23 -12
  13. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
  14. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +32 -21
  15. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
  16. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.d.ts +1 -1
  17. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +27 -15
  18. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
  19. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.d.ts +1 -1
  20. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +17 -6
  21. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
  22. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts +1 -1
  23. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +25 -14
  24. package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
  25. package/lib/powerquery-language-services/inspection/type/task.js +22 -27
  26. package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
  27. package/lib/powerquery-language-services/inspectionSettings.d.ts +5 -0
  28. package/lib/powerquery-language-services/inspectionUtils.d.ts +2 -4
  29. package/lib/powerquery-language-services/inspectionUtils.js +3 -3
  30. package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
  31. package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.d.ts +1 -1
  32. package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js +3 -2
  33. package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map +1 -1
  34. package/package.json +1 -1
package/lib/powerquery-language-services/inspection/type/inspectType/common.js CHANGED
@@ -422,11 +422,10 @@ function recursiveIdentifierDereferenceHelper(state, xorNode, correlationId) {
422
422
  });
423
423
  }
424
424
  function createParameterType(parameter) {
425
- if (parameter.maybeType === undefined) {
426
- return language_1.Type.NoneInstance;
427
- }
428
425
  return {
429
- kind: language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(parameter.maybeType),
426
+ kind: parameter.maybeType
427
+ ? language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(parameter.maybeType)
428
+ : "Any" /* Any */,
430
429
  maybeExtendedKind: undefined,
431
430
  isNullable: parameter.isNullable || parameter.isOptional,
432
431
  };
package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/common.ts"],"names":[],"mappings":"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"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js CHANGED
@@ -14,6 +14,7 @@ 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
16
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
17
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
17
18
  const common_1 = require("./common");
18
19
  const __1 = require("../../..");
19
20
  const pseudoFunctionExpressionType_1 = require("../../pseudoFunctionExpressionType");
@@ -25,47 +26,58 @@ function inspectTypeFunctionExpression(state, xorNode, maybeCorrelationId) {
25
26
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionExpression" /* FunctionExpression */);
26
27
  const pseudoType = (0, pseudoFunctionExpressionType_1.pseudoFunctionExpressionType)(state.nodeIdMapCollection, xorNode);
27
28
  const pseudoReturnType = pseudoType.returnType;
28
- const expressionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
29
- // FunctionExpression.maybeFunctionReturnType doesn't always match FunctionExpression.expression.
30
- // By examining the expression we might get a more accurate return type (eg. Function vs DefinedFunction),
31
- // or discover an error (eg. maybeFunctionReturnType is Number but expression is Text).
32
- let returnType;
33
- // If the stated return type is Any,
34
- // then it might as well be the expression's type as it can't be any wider than Any.
35
- if (pseudoReturnType.kind === "Any" /* Any */) {
36
- returnType = expressionType;
29
+ let result;
30
+ switch (state.typeStrategy) {
31
+ case "Extended" /* Extended */: {
32
+ const expressionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
33
+ // FunctionExpression.maybeFunctionReturnType doesn't always match FunctionExpression.expression.
34
+ // By examining the expression we might get a more accurate return type (eg. Function vs DefinedFunction),
35
+ // or discover an error (eg. maybeFunctionReturnType is Number but expression is Text).
36
+ let returnType;
37
+ // If the stated return type is Any,
38
+ // then it might as well be the expression's type as it can't be any wider than Any.
39
+ if (pseudoReturnType.kind === "Any" /* Any */) {
40
+ returnType = expressionType;
41
+ }
42
+ // If the return type is Any then see if we can narrow it to the stated return Type.
43
+ else if (expressionType.kind === "Any" /* Any */ &&
44
+ expressionType.maybeExtendedKind === "AnyUnion" /* AnyUnion */ &&
45
+ (0, common_1.allForAnyUnion)(expressionType, (type) => type.kind === pseudoReturnType.kind || type.kind === "Any" /* Any */)) {
46
+ returnType = expressionType;
47
+ }
48
+ // If the stated return type doesn't match the expression's type then it's None.
49
+ else if (pseudoReturnType.kind !== expressionType.kind) {
50
+ trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.NoneInstance) });
51
+ return language_1.Type.NoneInstance;
52
+ }
53
+ // If the expression's type can't be known, then assume it's the stated return Type.
54
+ else if (expressionType.kind === "Unknown" /* Unknown */) {
55
+ returnType = pseudoReturnType;
56
+ }
57
+ // Else fallback to the expression's Type.
58
+ else {
59
+ returnType = expressionType;
60
+ }
61
+ result = {
62
+ kind: "Function" /* Function */,
63
+ maybeExtendedKind: "DefinedFunction" /* DefinedFunction */,
64
+ isNullable: false,
65
+ parameters: pseudoType.parameters.map((pseudoParameter) => ({
66
+ nameLiteral: pseudoParameter.name.literal,
67
+ isNullable: pseudoParameter.isNullable,
68
+ isOptional: pseudoParameter.isOptional,
69
+ maybeType: pseudoParameter.maybeType,
70
+ })),
71
+ returnType,
72
+ };
73
+ break;
74
+ }
75
+ case "Primitive" /* Primitive */:
76
+ result = pseudoReturnType;
77
+ break;
78
+ default:
79
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
37
80
  }
38
- // If the return type is Any then see if we can narrow it to the stated return Type.
39
- else if (expressionType.kind === "Any" /* Any */ &&
40
- expressionType.maybeExtendedKind === "AnyUnion" /* AnyUnion */ &&
41
- (0, common_1.allForAnyUnion)(expressionType, (type) => type.kind === pseudoReturnType.kind || type.kind === "Any" /* Any */)) {
42
- returnType = expressionType;
43
- }
44
- // If the stated return type doesn't match the expression's type then it's None.
45
- else if (pseudoReturnType.kind !== expressionType.kind) {
46
- trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.NoneInstance) });
47
- return language_1.Type.NoneInstance;
48
- }
49
- // If the expression's type can't be known, then assume it's the stated return Type.
50
- else if (expressionType.kind === "Unknown" /* Unknown */) {
51
- returnType = pseudoReturnType;
52
- }
53
- // Else fallback to the expression's Type.
54
- else {
55
- returnType = expressionType;
56
- }
57
- const result = {
58
- kind: "Function" /* Function */,
59
- maybeExtendedKind: "DefinedFunction" /* DefinedFunction */,
60
- isNullable: false,
61
- parameters: pseudoType.parameters.map((pseudoParameter) => ({
62
- nameLiteral: pseudoParameter.name.literal,
63
- isNullable: pseudoParameter.isNullable,
64
- isOptional: pseudoParameter.isOptional,
65
- maybeType: pseudoParameter.maybeType,
66
- })),
67
- returnType,
68
- };
69
81
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
70
82
  return result;
71
83
  });
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeFunctionExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,qCAAgG;AAChG,gCAA+D;AAC/D,qFAI4C;AAE5C,SAAsB,6BAA6B,CAC/C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,6BAA6B,CAAC,IAAI,EAClC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAyB,OAAO,gDAAkC,CAAC;QAEhG,MAAM,UAAU,GAAiC,IAAA,2DAA4B,EAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAClH,MAAM,gBAAgB,GAAyB,UAAU,CAAC,UAAU,CAAC;QACrE,MAAM,cAAc,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAEnH,iGAAiG;QACjG,0GAA0G;QAC1G,uFAAuF;QAEvF,IAAI,UAAgC,CAAC;QAErC,oCAAoC;QACpC,oFAAoF;QACpF,IAAI,gBAAgB,CAAC,IAAI,oBAAsB,EAAE;YAC7C,UAAU,GAAG,cAAc,CAAC;SAC/B;QACD,oFAAoF;aAC/E,IACD,cAAc,CAAC,IAAI,oBAAsB;YACzC,cAAc,CAAC,iBAAiB,8BAAmC;YACnE,IAAA,uBAAc,EACV,cAAc,EACd,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,oBAAsB,CACzG,EACH;YACE,UAAU,GAAG,cAAc,CAAC;SAC/B;QACD,gFAAgF;aAC3E,IAAI,gBAAgB,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,EAAE;YACpD,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAExF,OAAO,eAAI,CAAC,YAAY,CAAC;SAC5B;QACD,oFAAoF;aAC/E,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;YACpD,UAAU,GAAG,gBAAgB,CAAC;SACjC;QACD,0CAA0C;aACrC;YACD,UAAU,GAAG,cAAc,CAAC;SAC/B;QAED,MAAM,MAAM,GAAyB;YACjC,IAAI,2BAAwB;YAC5B,iBAAiB,yCAAuC;YACxD,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,eAA4C,EAAE,EAAE,CAAC,CAAC;gBACrF,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC,OAAO;gBACzC,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,SAAS,EAAE,eAAe,CAAC,SAAS;aACvC,CAAC,CAAC;YACH,UAAU;SACb,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAxED,sEAwEC"}
1
+ {"version":3,"file":"inspectTypeFunctionExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.ts"],"names":[],"mappings":"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"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
2
2
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeFunctionType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.FunctionType | Type.Unknown>;
4
+ export declare function inspectTypeFunctionType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.FunctionType | Type.Type | Type.Unknown>;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js CHANGED
@@ -16,6 +16,7 @@ const PQP = require("@microsoft/powerquery-parser");
16
16
  const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
17
17
  const __1 = require("../../..");
18
18
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
19
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
19
20
  const common_1 = require("./common");
20
21
  function inspectTypeFunctionType(state, xorNode, maybeCorrelationId) {
21
22
  var _a;
@@ -23,27 +24,38 @@ function inspectTypeFunctionType(state, xorNode, maybeCorrelationId) {
23
24
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFunctionType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
24
25
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
25
26
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionType" /* FunctionType */);
26
- const maybeParameters = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ParameterList" /* ParameterList */);
27
- if (maybeParameters === undefined) {
28
- trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
29
- return language_1.Type.UnknownInstance;
27
+ let result;
28
+ switch (state.typeStrategy) {
29
+ case "Extended" /* Extended */: {
30
+ const maybeParameters = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ParameterList" /* ParameterList */);
31
+ if (maybeParameters === undefined) {
32
+ trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
33
+ return language_1.Type.UnknownInstance;
34
+ }
35
+ const maybeArrayWrapper = parser_1.NodeIdMapUtils.maybeUnboxArrayWrapper(state.nodeIdMapCollection, maybeParameters.node.id);
36
+ if (maybeArrayWrapper === undefined) {
37
+ trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
38
+ return language_1.Type.UnknownInstance;
39
+ }
40
+ const parameterTypes = parser_1.NodeIdMapIterator.iterArrayWrapper(state.nodeIdMapCollection, maybeArrayWrapper)
41
+ .map((parameter) => language_1.TypeUtils.inspectParameter(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter)))
42
+ .filter(PQP.TypeScriptUtils.isDefined);
43
+ const returnType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
44
+ result = {
45
+ kind: "Type" /* Type */,
46
+ maybeExtendedKind: "FunctionType" /* FunctionType */,
47
+ isNullable: false,
48
+ parameters: parameterTypes,
49
+ returnType,
50
+ };
51
+ break;
52
+ }
53
+ case "Primitive" /* Primitive */:
54
+ result = language_1.Type.TypePrimitiveInstance;
55
+ break;
56
+ default:
57
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
30
58
  }
31
- const maybeArrayWrapper = parser_1.NodeIdMapUtils.maybeUnboxArrayWrapper(state.nodeIdMapCollection, maybeParameters.node.id);
32
- if (maybeArrayWrapper === undefined) {
33
- trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
34
- return language_1.Type.UnknownInstance;
35
- }
36
- const parameterTypes = parser_1.NodeIdMapIterator.iterArrayWrapper(state.nodeIdMapCollection, maybeArrayWrapper)
37
- .map((parameter) => language_1.TypeUtils.inspectParameter(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter)))
38
- .filter(PQP.TypeScriptUtils.isDefined);
39
- const returnType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
40
- const result = {
41
- kind: "Type" /* Type */,
42
- maybeExtendedKind: "FunctionType" /* FunctionType */,
43
- isNullable: false,
44
- parameters: parameterTypes,
45
- returnType,
46
- };
47
59
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
48
60
  return result;
49
61
  });
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeFunctionType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,gCAA+D;AAC/D,sFAMmE;AAGnE,qCAAgF;AAEhF,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,MAAM,eAAe,GACjB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,sCAEJ,CAAC;QAEN,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,iBAAiB,GAA2C,uBAAc,CAAC,sBAAsB,CACnG,KAAK,CAAC,mBAAmB,EACzB,eAAe,CAAC,IAAI,CAAC,EAAE,CAC1B,CAAC;QAEF,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,cAAc,GAA0C,0BAAiB,CAAC,gBAAgB,CAC5F,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,CACpB;aACI,GAAG,CAAC,CAAC,SAAmB,EAAE,EAAE,CACzB,oBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CACnG;aACA,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE3C,MAAM,UAAU,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAE/G,MAAM,MAAM,GAAyB;YACjC,IAAI,mBAAoB;YACxB,iBAAiB,mCAAoC;YACrD,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,cAAc;YAC1B,UAAU;SACb,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA9DD,0DA8DC"}
1
+ {"version":3,"file":"inspectTypeFunctionType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,gCAA+D;AAC/D,sFAMmE;AAEnE,oEAAsD;AAEtD,qCAAgF;AAGhF,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,IAAI,MAAoD,CAAC;QAEzD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,eAAe,GACjB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,sCAEJ,CAAC;gBAEN,IAAI,eAAe,KAAK,SAAS,EAAE;oBAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,iBAAiB,GAA2C,uBAAc,CAAC,sBAAsB,CACnG,KAAK,CAAC,mBAAmB,EACzB,eAAe,CAAC,IAAI,CAAC,EAAE,CAC1B,CAAC;gBAEF,IAAI,iBAAiB,KAAK,SAAS,EAAE;oBACjC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,cAAc,GAA0C,0BAAiB,CAAC,gBAAgB,CAC5F,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,CACpB;qBACI,GAAG,CAAC,CAAC,SAAmB,EAAE,EAAE,CACzB,oBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CACnG;qBACA,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBAE3C,MAAM,UAAU,GAAyB,MAAM,IAAA,2CAAkC,EAC7E,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,iBAAiB,mCAAoC;oBACrD,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,cAAc;oBAC1B,UAAU;iBACb,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAlFD,0DAkFC"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
2
2
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeList(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.DefinedList>;
4
+ export declare function inspectTypeList(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.List | Type.DefinedList>;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js CHANGED
@@ -13,21 +13,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeList = void 0;
15
15
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
16
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
17
+ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
16
18
  const __1 = require("../../..");
17
19
  const common_1 = require("./common");
18
20
  function inspectTypeList(state, xorNode, maybeCorrelationId) {
19
21
  var _a;
20
22
  return __awaiter(this, void 0, void 0, function* () {
21
23
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeList.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
22
- (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
23
- const items = parser_1.NodeIdMapIterator.iterListItems(state.nodeIdMapCollection, xorNode);
24
- const elements = yield Promise.all(items.map((item) => (0, common_1.inspectXor)(state, item, trace.id)));
25
- const result = {
26
- kind: "List" /* List */,
27
- isNullable: false,
28
- maybeExtendedKind: "DefinedList" /* DefinedList */,
29
- elements,
30
- };
24
+ let result;
25
+ switch (state.typeStrategy) {
26
+ case "Extended" /* Extended */: {
27
+ (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
28
+ const items = parser_1.NodeIdMapIterator.iterListItems(state.nodeIdMapCollection, xorNode);
29
+ const elements = yield Promise.all(items.map((item) => (0, common_1.inspectXor)(state, item, trace.id)));
30
+ result = {
31
+ kind: "List" /* List */,
32
+ isNullable: false,
33
+ maybeExtendedKind: "DefinedList" /* DefinedList */,
34
+ elements,
35
+ };
36
+ break;
37
+ }
38
+ case "Primitive" /* Primitive */:
39
+ result = language_1.Type.ListInstance;
40
+ break;
41
+ default:
42
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
43
+ }
31
44
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
32
45
  return result;
33
46
  });
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AAIxG,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,eAAe,CAAC,IAAI,EACpB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;QAEF,MAAM,MAAM,GAAyB;YACjC,IAAI,mBAAoB;YACxB,UAAU,EAAE,KAAK;YACjB,iBAAiB,iCAAmC;YACpD,QAAQ;SACX,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA7BD,0CA6BC"}
1
+ {"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AAExG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,eAAe,CAAC,IAAI,EACpB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;gBACjD,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,UAAU,EAAE,KAAK;oBACjB,iBAAiB,iCAAmC;oBACpD,QAAQ;iBACX,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,0CA4CC"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
2
2
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeListType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.ListType | Type.Unknown>;
4
+ export declare function inspectTypeListType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.ListType | Type.Unknown>;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js CHANGED
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeListType = 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 powerquery_parser_1 = require("@microsoft/powerquery-parser");
17
18
  const __1 = require("../../..");
18
19
  const common_1 = require("./common");
19
20
  function inspectTypeListType(state, xorNode, maybeCorrelationId) {
@@ -22,19 +23,29 @@ function inspectTypeListType(state, xorNode, maybeCorrelationId) {
22
23
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeListType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
23
24
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
24
25
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "ListType" /* ListType */);
25
- const maybeListItem = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
26
26
  let result;
27
- if (maybeListItem === undefined) {
28
- result = language_1.Type.UnknownInstance;
29
- }
30
- else {
31
- const itemType = yield (0, common_1.inspectXor)(state, maybeListItem, trace.id);
32
- result = {
33
- kind: "Type" /* Type */,
34
- maybeExtendedKind: "ListType" /* ListType */,
35
- isNullable: false,
36
- itemType,
37
- };
27
+ switch (state.typeStrategy) {
28
+ case "Extended" /* Extended */: {
29
+ const maybeListItem = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
30
+ if (maybeListItem === undefined) {
31
+ result = language_1.Type.UnknownInstance;
32
+ }
33
+ else {
34
+ const itemType = yield (0, common_1.inspectXor)(state, maybeListItem, trace.id);
35
+ result = {
36
+ kind: "Type" /* Type */,
37
+ maybeExtendedKind: "ListType" /* ListType */,
38
+ isNullable: false,
39
+ itemType,
40
+ };
41
+ }
42
+ break;
43
+ }
44
+ case "Primitive" /* Primitive */:
45
+ result = language_1.Type.TypePrimitiveInstance;
46
+ break;
47
+ default:
48
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
38
49
  }
39
50
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
40
51
  return result;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeListType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mBAAmB,CAAC,IAAI,EACxB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAe,OAAO,4BAAwB,CAAC;QAE5E,MAAM,aAAa,GAAyB,uBAAc,CAAC,aAAa,CACpE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,KAAK,SAAS,EAAE;YAC7B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,QAAQ,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YAExF,MAAM,GAAG;gBACL,IAAI,mBAAoB;gBACxB,iBAAiB,2BAAgC;gBACjD,UAAU,EAAE,KAAK;gBACjB,QAAQ;aACX,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAvCD,kDAuCC"}
1
+ {"version":3,"file":"inspectTypeListType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mBAAmB,CAAC,IAAI,EACxB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAe,OAAO,4BAAwB,CAAC;QAE5E,IAAI,MAAgD,CAAC;QAErD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,aAAa,GAAyB,uBAAc,CAAC,aAAa,CACpE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,aAAa,KAAK,SAAS,EAAE;oBAC7B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,QAAQ,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBAExF,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,iBAAiB,2BAAgC;wBACjD,UAAU,EAAE,KAAK;wBACjB,QAAQ;qBACX,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AApDD,kDAoDC"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js CHANGED
@@ -16,35 +16,46 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
16
16
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
17
17
  const __1 = require("../../..");
18
18
  const common_1 = require("./common");
19
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
19
20
  function inspectTypeRangeExpression(state, xorNode, maybeCorrelationId) {
20
21
  var _a;
21
22
  return __awaiter(this, void 0, void 0, function* () {
22
23
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRangeExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
23
24
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
24
25
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RangeExpression" /* RangeExpression */);
25
- const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
26
- const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
27
26
  let result;
28
- if (maybeLeftType === undefined || maybeRightType === undefined) {
29
- result = language_1.Type.UnknownInstance;
30
- }
31
- else if (maybeLeftType.kind === "Number" /* Number */ && maybeRightType.kind === "Number" /* Number */) {
32
- // TODO: handle isNullable better
33
- if (maybeLeftType.isNullable === true || maybeRightType.isNullable === true) {
34
- result = language_1.Type.NoneInstance;
35
- }
36
- else {
37
- result = language_1.TypeUtils.createPrimitiveType(maybeLeftType.isNullable, maybeLeftType.kind);
27
+ switch (state.typeStrategy) {
28
+ case "Extended" /* Extended */: {
29
+ const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
30
+ const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
31
+ if (maybeLeftType === undefined || maybeRightType === undefined) {
32
+ result = language_1.Type.UnknownInstance;
33
+ }
34
+ else if (maybeLeftType.kind === "Number" /* Number */ && maybeRightType.kind === "Number" /* Number */) {
35
+ // TODO: handle isNullable better
36
+ if (maybeLeftType.isNullable === true || maybeRightType.isNullable === true) {
37
+ result = language_1.Type.NoneInstance;
38
+ }
39
+ else {
40
+ result = language_1.Type.ListInstance;
41
+ }
42
+ }
43
+ else if (maybeLeftType.kind === "None" /* None */ || maybeRightType.kind === "None" /* None */) {
44
+ result = language_1.Type.NoneInstance;
45
+ }
46
+ else if (maybeLeftType.kind === "Unknown" /* Unknown */ || maybeRightType.kind === "Unknown" /* Unknown */) {
47
+ result = language_1.Type.UnknownInstance;
48
+ }
49
+ else {
50
+ result = language_1.Type.NoneInstance;
51
+ }
52
+ break;
38
53
  }
39
- }
40
- else if (maybeLeftType.kind === "None" /* None */ || maybeRightType.kind === "None" /* None */) {
41
- result = language_1.Type.NoneInstance;
42
- }
43
- else if (maybeLeftType.kind === "Unknown" /* Unknown */ || maybeRightType.kind === "Unknown" /* Unknown */) {
44
- result = language_1.Type.UnknownInstance;
45
- }
46
- else {
47
- result = language_1.Type.NoneInstance;
54
+ case "Primitive" /* Primitive */:
55
+ result = language_1.Type.ListInstance;
56
+ break;
57
+ default:
58
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
48
59
  }
49
60
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
50
61
  return result;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;QAE1F,MAAM,aAAa,GAAqC,MAAM,IAAA,2CAAkC,EAC5F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,MAAM,cAAc,GAAqC,MAAM,IAAA,2CAAkC,EAC7F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;YAC7D,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,aAAa,CAAC,IAAI,0BAAyB,IAAI,cAAc,CAAC,IAAI,0BAAyB,EAAE;YACpG,iCAAiC;YACjC,IAAI,aAAa,CAAC,UAAU,KAAK,IAAI,IAAI,cAAc,CAAC,UAAU,KAAK,IAAI,EAAE;gBACzE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;aACxF;SACJ;aAAM,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;YAChG,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;YACtG,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,gEAmDC"}
1
+ {"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAChF,oEAAsD;AAGtD,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;QAE1F,IAAI,MAA4C,CAAC;QAEjD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,aAAa,GAAqC,MAAM,IAAA,2CAAkC,EAC5F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,cAAc,GAAqC,MAAM,IAAA,2CAAkC,EAC7F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,IAAI,aAAa,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;oBAC7D,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,aAAa,CAAC,IAAI,0BAAyB,IAAI,cAAc,CAAC,IAAI,0BAAyB,EAAE;oBACpG,iCAAiC;oBACjC,IAAI,aAAa,CAAC,UAAU,KAAK,IAAI,IAAI,cAAc,CAAC,UAAU,KAAK,IAAI,EAAE;wBACzE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;yBAAM;wBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;iBACJ;qBAAM,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;oBAChG,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;qBAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;oBACtG,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhED,gEAgEC"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
2
2
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeRecord(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.DefinedRecord>;
4
+ export declare function inspectTypeRecord(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Record | Type.DefinedRecord>;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js CHANGED
@@ -13,6 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeRecord = void 0;
15
15
  const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
16
+ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
16
17
  const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
17
18
  const __1 = require("../../..");
18
19
  const common_1 = require("./common");
@@ -22,23 +23,34 @@ function inspectTypeRecord(state, xorNode, maybeCorrelationId) {
22
23
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecord.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
23
24
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
24
25
  parser_1.XorNodeUtils.assertIsRecord(xorNode);
25
- const fields = new Map();
26
- for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
27
- if (keyValuePair.maybeValue) {
28
- // eslint-disable-next-line no-await-in-loop
29
- fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
30
- }
31
- else {
32
- fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
26
+ let result;
27
+ switch (state.typeStrategy) {
28
+ case "Extended" /* Extended */: {
29
+ const fields = new Map();
30
+ for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
31
+ if (keyValuePair.maybeValue) {
32
+ // eslint-disable-next-line no-await-in-loop
33
+ fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
34
+ }
35
+ else {
36
+ fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
37
+ }
38
+ }
39
+ result = {
40
+ kind: "Record" /* Record */,
41
+ maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
42
+ isNullable: false,
43
+ fields,
44
+ isOpen: false,
45
+ };
46
+ break;
33
47
  }
48
+ case "Primitive" /* Primitive */:
49
+ result = language_1.Type.RecordInstance;
50
+ break;
51
+ default:
52
+ throw powerquery_parser_1.Assert.isNever(state.typeStrategy);
34
53
  }
35
- const result = {
36
- kind: "Record" /* Record */,
37
- maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
38
- isNullable: false,
39
- fields,
40
- isOpen: false,
41
- };
42
54
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
43
55
  return result;
44
56
  });
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;QAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;YACzF,IAAI,YAAY,CAAC,UAAU,EAAE;gBACzB,4CAA4C;gBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;aACnG;iBAAM;gBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;aAC7D;SACJ;QAED,MAAM,MAAM,GAAyB;YACjC,IAAI,uBAAsB;YAC1B,iBAAiB,qCAAqC;YACtD,UAAU,EAAE,KAAK;YACjB,MAAM;YACN,MAAM,EAAE,KAAK;SAChB,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AArCD,8CAqCC"}
1
+ {"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAwC,CAAC;QAE7C,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;gBAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;oBACzF,IAAI,YAAY,CAAC,UAAU,EAAE;wBACzB,4CAA4C;wBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;qBACnG;yBAAM;wBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;qBAC7D;iBACJ;gBAED,MAAM,GAAG;oBACL,IAAI,uBAAsB;oBAC1B,iBAAiB,qCAAqC;oBACtD,UAAU,EAAE,KAAK;oBACjB,MAAM;oBACN,MAAM,EAAE,KAAK;iBAChB,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,cAAc,CAAC;gBAC7B,MAAM;YAEV;gBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,8CAmDC"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
2
2
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.RecordType | Type.Unknown>;
4
+ export declare function inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.RecordType | Type.Unknown>;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js CHANGED
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeRecordType = 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 powerquery_parser_1 = require("@microsoft/powerquery-parser");
17
18
  const __1 = require("../../..");
18
19
  const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
19
20
  function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
@@ -22,13 +23,23 @@ function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
22
23
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecordType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
23
24
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
24
25
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecordType" /* RecordType */);
25
- const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
26
26
  let result;
27
- if (maybeFields === undefined) {
28
- result = language_1.Type.UnknownInstance;
29
- }
30
- else {
31
- result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
27
+ switch (state.typeStrategy) {
28
+ case "Extended" /* Extended */: {
29
+ const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
30
+ if (maybeFields === undefined) {
31
+ result = language_1.Type.UnknownInstance;
32
+ }
33
+ else {
34
+ result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
35
+ }
36
+ break;
37
+ }
38
+ case "Primitive" /* Primitive */:
39
+ result = language_1.Type.TypePrimitiveInstance;
40
+ break;
41
+ default:
42
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
32
43
  }
33
44
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
34
45
  return result;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,mFAAgF;AAGhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAtCD,sDAsCC"}
1
+ {"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,mFAAgF;AAIhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,IAAI,MAAkD,CAAC;QAEvD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;gBAEF,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,sDAmDC"}
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
2
2
  import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
3
3
  import { InspectTypeState } from "./common";
4
- export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;
4
+ export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js CHANGED
@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
14
14
  exports.inspectTypeTableType = 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 powerquery_parser_1 = require("@microsoft/powerquery-parser");
17
18
  const __1 = require("../../..");
18
19
  const common_1 = require("./common");
19
20
  const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
@@ -23,21 +24,31 @@ function inspectTypeTableType(state, xorNode, maybeCorrelationId) {
23
24
  const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeTableType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
24
25
  (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
25
26
  parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "TableType" /* TableType */);
26
- const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
27
27
  let result;
28
- if (maybeRowType === undefined) {
29
- result = language_1.Type.UnknownInstance;
30
- }
31
- else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
32
- result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
33
- }
34
- else {
35
- result = {
36
- kind: "Type" /* Type */,
37
- maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
38
- isNullable: false,
39
- primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
40
- };
28
+ switch (state.typeStrategy) {
29
+ case "Extended" /* Extended */: {
30
+ const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
31
+ if (maybeRowType === undefined) {
32
+ result = language_1.Type.UnknownInstance;
33
+ }
34
+ else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
35
+ result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
36
+ }
37
+ else {
38
+ result = {
39
+ kind: "Type" /* Type */,
40
+ maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
41
+ isNullable: false,
42
+ primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
43
+ };
44
+ }
45
+ break;
46
+ }
47
+ case "Primitive" /* Primitive */:
48
+ result = language_1.Type.TypePrimitiveInstance;
49
+ break;
50
+ default:
51
+ powerquery_parser_1.Assert.isNever(state.typeStrategy);
41
52
  }
42
53
  trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
43
54
  return result;
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;YACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;SACL;aAAM;YACH,MAAM,GAAG;gBACL,IAAI,mBAAoB;gBACxB,iBAAiB,+DAAkD;gBACnE,UAAU,EAAE,KAAK;gBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;aACrE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,oDA4CC"}
1
+ {"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAGhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,IAAI,MAAmF,CAAC;QAExF,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,YAAY,KAAK,SAAS,EAAE;oBAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;oBACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;iBACL;qBAAM;oBACH,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,iBAAiB,+DAAkD;wBACnE,UAAU,EAAE,KAAK;wBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;qBACrE,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAzDD,oDAyDC"}
package/lib/powerquery-language-services/inspection/type/task.js CHANGED
@@ -23,41 +23,20 @@ function tryScopeType(settings, nodeIdMapCollection, nodeId,
23
23
  typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
24
24
  return __awaiter(this, void 0, void 0, function* () {
25
25
  const trace = settings.traceManager.entry("Inspection.ScopeType" /* InspectScopeType */, tryScopeType.name, settings.maybeInitialCorrelationId);
26
- const state = {
27
- library: settings.library,
28
- locale: settings.locale,
29
- isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
30
- maybeCancellationToken: settings.maybeCancellationToken,
31
- maybeEachScopeById: settings.maybeEachScopeById,
32
- maybeInitialCorrelationId: trace.id,
33
- traceManager: settings.traceManager,
34
- givenTypeById: typeCache.typeById,
35
- deltaTypeById: new Map(),
36
- nodeIdMapCollection,
37
- scopeById: typeCache.scopeById,
38
- };
26
+ const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
39
27
  const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectScopeType(state, nodeId, trace.id), settings.locale);
40
28
  trace.exit();
41
29
  return result;
42
30
  });
43
31
  }
44
32
  exports.tryScopeType = tryScopeType;
45
- function tryType(settings, nodeIdMapCollection, nodeId, typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
33
+ function tryType(settings, nodeIdMapCollection, nodeId,
34
+ // If a TypeCache is given, then potentially add to its values and include it as part of the return,
35
+ // Else create a new TypeCache and include it in the return.
36
+ typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
46
37
  return __awaiter(this, void 0, void 0, function* () {
47
38
  const trace = settings.traceManager.entry("Inspection.Type" /* InspectType */, tryType.name, settings.maybeInitialCorrelationId);
48
- const state = {
49
- library: settings.library,
50
- locale: settings.locale,
51
- isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
52
- maybeCancellationToken: settings.maybeCancellationToken,
53
- maybeEachScopeById: settings.maybeEachScopeById,
54
- maybeInitialCorrelationId: trace.id,
55
- traceManager: settings.traceManager,
56
- givenTypeById: typeCache.typeById,
57
- deltaTypeById: new Map(),
58
- nodeIdMapCollection,
59
- scopeById: typeCache.scopeById,
60
- };
39
+ const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
61
40
  const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => (0, inspectType_1.inspectXor)(state, parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId), trace.id), settings.locale);
62
41
  trace.exit({ ["IsError" /* IsError */]: result.kind });
63
42
  return result;
@@ -86,4 +65,20 @@ function inspectScopeType(state, nodeId, correlationId) {
86
65
  return result;
87
66
  });
88
67
  }
68
+ function createState(settings, nodeIdMapCollection, typeCache, correlationId) {
69
+ return {
70
+ library: settings.library,
71
+ locale: settings.locale,
72
+ isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
73
+ maybeCancellationToken: settings.maybeCancellationToken,
74
+ maybeEachScopeById: settings.maybeEachScopeById,
75
+ maybeInitialCorrelationId: correlationId,
76
+ traceManager: settings.traceManager,
77
+ typeStrategy: settings.typeStrategy,
78
+ givenTypeById: typeCache.typeById,
79
+ deltaTypeById: new Map(),
80
+ nodeIdMapCollection,
81
+ scopeById: typeCache.scopeById,
82
+ };
83
+ }
89
84
  //# sourceMappingURL=task.js.map
package/lib/powerquery-language-services/inspection/type/task.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
package/lib/powerquery-language-services/inspectionSettings.d.ts CHANGED
@@ -1,8 +1,13 @@
1
1
  import * as PQP from "@microsoft/powerquery-parser";
2
2
  import { Library } from "./library";
3
3
  import { TypeById } from "./inspection";
4
+ export declare const enum TypeStrategy {
5
+ Extended = "Extended",
6
+ Primitive = "Primitive"
7
+ }
4
8
  export interface InspectionSettings extends PQP.Settings {
5
9
  readonly isWorkspaceCacheAllowed: boolean;
6
10
  readonly library: Library.ILibrary;
7
11
  readonly maybeEachScopeById: TypeById | undefined;
12
+ readonly typeStrategy: TypeStrategy;
8
13
  }
package/lib/powerquery-language-services/inspectionUtils.d.ts CHANGED
@@ -3,11 +3,9 @@ import { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/la
3
3
  import { DocumentSymbol, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
4
4
  import { AutocompleteItemProviderContext, SignatureProviderContext } from "./providers/commonTypes";
5
5
  import { Inspection } from ".";
6
- import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
7
6
  import { InspectionSettings } from "./inspectionSettings";
8
- import { Library } from "./library";
9
- import { TypeById } from "./inspection";
10
- export declare function createInspectionSettings(settings: PQP.Settings, maybeEachScopeById: TypeById | undefined, maybeLibrary: Library.ILibrary | undefined, isWorkspaceCacheAllowed: boolean): InspectionSettings;
7
+ import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
8
+ export declare function createInspectionSettings(settings: PQP.Settings, overrides?: Partial<InspectionSettings>): InspectionSettings;
11
9
  export declare function getMaybeContextForSignatureProvider(inspected: Inspection.Inspected, traceManager: TraceManager, maybeCorrelationId: number | undefined): Promise<SignatureProviderContext | undefined>;
12
10
  export declare function getMaybeSignatureHelp(context: SignatureProviderContext, correlationId: number): SignatureHelp | null;
13
11
  export declare function getMaybeType(inspected: Inspection.Inspected, identifier: string): Promise<Type.TPowerQueryType | undefined>;
package/lib/powerquery-language-services/inspectionUtils.js CHANGED
@@ -18,9 +18,9 @@ const vscode_languageserver_types_1 = require("vscode-languageserver-types");
18
18
  const _1 = require(".");
19
19
  const autocomplete_1 = require("./inspection/autocomplete");
20
20
  const library_1 = require("./library");
21
- function createInspectionSettings(settings, maybeEachScopeById, maybeLibrary, isWorkspaceCacheAllowed) {
22
- return Object.assign(Object.assign({}, settings), { library: maybeLibrary !== null && maybeLibrary !== void 0 ? maybeLibrary : library_1.Library.NoOpLibrary, maybeEachScopeById,
23
- isWorkspaceCacheAllowed });
21
+ function createInspectionSettings(settings, overrides) {
22
+ var _a, _b, _c, _d;
23
+ return Object.assign(Object.assign({}, settings), { isWorkspaceCacheAllowed: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.isWorkspaceCacheAllowed) !== null && _a !== void 0 ? _a : true, library: (_b = overrides === null || overrides === void 0 ? void 0 : overrides.library) !== null && _b !== void 0 ? _b : library_1.Library.NoOpLibrary, typeStrategy: (_c = overrides === null || overrides === void 0 ? void 0 : overrides.typeStrategy) !== null && _c !== void 0 ? _c : "Extended" /* Extended */, maybeEachScopeById: (_d = overrides === null || overrides === void 0 ? void 0 : overrides.maybeEachScopeById) !== null && _d !== void 0 ? _d : undefined });
24
24
  }
25
25
  exports.createInspectionSettings = createInspectionSettings;
26
26
  function getMaybeContextForSignatureProvider(inspected, traceManager, maybeCorrelationId) {
package/lib/powerquery-language-services/inspectionUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { InspectionSettings } from "../..";
2
2
  import { ValidationSettings } from "./validationSettings";
3
- export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, checkForDuplicateIdentifiers?: boolean, checkInvokeExpressions?: boolean, checkUnknownIdentifiers?: boolean): ValidationSettings;
3
+ export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, overrides?: Partial<ValidationSettings>): ValidationSettings;
package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js CHANGED
@@ -3,8 +3,9 @@
3
3
  // Licensed under the MIT license.
4
4
  Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.createValidationSettings = void 0;
6
- function createValidationSettings(inspectionSettings, source, checkForDuplicateIdentifiers, checkInvokeExpressions, checkUnknownIdentifiers) {
7
- return Object.assign(Object.assign({}, inspectionSettings), { checkForDuplicateIdentifiers: checkForDuplicateIdentifiers !== null && checkForDuplicateIdentifiers !== void 0 ? checkForDuplicateIdentifiers : true, checkInvokeExpressions: checkInvokeExpressions !== null && checkInvokeExpressions !== void 0 ? checkInvokeExpressions : true, checkUnknownIdentifiers: checkUnknownIdentifiers !== null && checkUnknownIdentifiers !== void 0 ? checkUnknownIdentifiers : true, library: inspectionSettings.library, source });
6
+ function createValidationSettings(inspectionSettings, source, overrides) {
7
+ var _a, _b, _c;
8
+ return Object.assign(Object.assign({}, inspectionSettings), { checkForDuplicateIdentifiers: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.checkForDuplicateIdentifiers) !== null && _a !== void 0 ? _a : true, checkInvokeExpressions: (_b = overrides === null || overrides === void 0 ? void 0 : overrides.checkInvokeExpressions) !== null && _b !== void 0 ? _b : true, checkUnknownIdentifiers: (_c = overrides === null || overrides === void 0 ? void 0 : overrides.checkUnknownIdentifiers) !== null && _c !== void 0 ? _c : true, library: inspectionSettings.library, source });
8
9
  }
9
10
  exports.createValidationSettings = createValidationSettings;
10
11
  //# sourceMappingURL=validationSettingsUtils.js.map
package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,4BAAsC,EACtC,sBAAgC,EAChC,uBAAiC;IAEjC,uCACO,kBAAkB,KACrB,4BAA4B,EAAE,4BAA4B,aAA5B,4BAA4B,cAA5B,4BAA4B,GAAI,IAAI,EAClE,sBAAsB,EAAE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,IAAI,EACtD,uBAAuB,EAAE,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,IAAI,EACxD,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,MAAM,IACR;AACN,CAAC;AAfD,4DAeC"}
1
+ {"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,SAAuC;;IAEvC,uCACO,kBAAkB,KACrB,4BAA4B,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,4BAA4B,mCAAI,IAAI,EAC7E,sBAAsB,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,sBAAsB,mCAAI,IAAI,EACjE,uBAAuB,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,uBAAuB,mCAAI,IAAI,EACnE,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,MAAM,IACR;AACN,CAAC;AAbD,4DAaC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/powerquery-language-services",
3
- "version": "0.3.23",
3
+ "version": "0.3.24",
4
4
  "author": "Microsoft",
5
5
  "license": "MIT",
6
6
  "scripts": {