@typespec/compiler 0.67.0-dev.11 → 0.67.0-dev.13
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/dist/manifest.js +2 -2
- package/dist/src/core/binder.d.ts.map +1 -1
- package/dist/src/core/binder.js +17 -130
- package/dist/src/core/binder.js.map +1 -1
- package/dist/src/core/checker.d.ts +3 -8
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +30 -674
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/decorator-utils.d.ts.map +1 -1
- package/dist/src/core/decorator-utils.js +1 -3
- package/dist/src/core/decorator-utils.js.map +1 -1
- package/dist/src/core/diagnostics.d.ts +0 -6
- package/dist/src/core/diagnostics.d.ts.map +1 -1
- package/dist/src/core/diagnostics.js +2 -11
- package/dist/src/core/diagnostics.js.map +1 -1
- package/dist/src/core/inspector/symbol.d.ts.map +1 -1
- package/dist/src/core/inspector/symbol.js +9 -11
- package/dist/src/core/inspector/symbol.js.map +1 -1
- package/dist/src/core/messages.d.ts +20 -40
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +6 -10
- package/dist/src/core/messages.js.map +1 -1
- package/dist/src/core/name-resolver.d.ts.map +1 -1
- package/dist/src/core/name-resolver.js +12 -23
- package/dist/src/core/name-resolver.js.map +1 -1
- package/dist/src/core/parser.d.ts.map +1 -1
- package/dist/src/core/parser.js +0 -642
- package/dist/src/core/parser.js.map +1 -1
- package/dist/src/core/program.d.ts +1 -10
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +2 -7
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/semantic-walker.d.ts.map +1 -1
- package/dist/src/core/semantic-walker.js +0 -9
- package/dist/src/core/semantic-walker.js.map +1 -1
- package/dist/src/core/state-accessors.d.ts +53 -12
- package/dist/src/core/state-accessors.d.ts.map +1 -1
- package/dist/src/core/state-accessors.js +75 -48
- package/dist/src/core/state-accessors.js.map +1 -1
- package/dist/src/core/type-relation-checker.d.ts.map +1 -1
- package/dist/src/core/type-relation-checker.js +3 -6
- package/dist/src/core/type-relation-checker.js.map +1 -1
- package/dist/src/core/type-utils.js +2 -2
- package/dist/src/core/type-utils.js.map +1 -1
- package/dist/src/core/types.d.ts +41 -274
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/types.js +24 -55
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/core/visibility/lifecycle.d.ts.map +1 -1
- package/dist/src/core/visibility/lifecycle.js +2 -11
- package/dist/src/core/visibility/lifecycle.js.map +1 -1
- package/dist/src/experimental/freeze-graph.d.ts.map +1 -1
- package/dist/src/experimental/freeze-graph.js +0 -3
- package/dist/src/experimental/freeze-graph.js.map +1 -1
- package/dist/src/experimental/mutators.d.ts +2 -2
- package/dist/src/experimental/mutators.d.ts.map +1 -1
- package/dist/src/experimental/mutators.js +0 -6
- package/dist/src/experimental/mutators.js.map +1 -1
- package/dist/src/experimental/typekit/kits/model.d.ts +6 -0
- package/dist/src/experimental/typekit/kits/model.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/model.js +10 -0
- package/dist/src/experimental/typekit/kits/model.js.map +1 -1
- package/dist/src/experimental/typekit/kits/type.d.ts +0 -6
- package/dist/src/experimental/typekit/kits/type.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/type.js +15 -9
- package/dist/src/experimental/typekit/kits/type.js.map +1 -1
- package/dist/src/experimental/typekit/kits/union.d.ts +6 -0
- package/dist/src/experimental/typekit/kits/union.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/union.js +4 -0
- package/dist/src/experimental/typekit/kits/union.js.map +1 -1
- package/dist/src/formatter/print/needs-parens.d.ts.map +1 -1
- package/dist/src/formatter/print/needs-parens.js +0 -4
- package/dist/src/formatter/print/needs-parens.js.map +1 -1
- package/dist/src/formatter/print/printer.d.ts +4 -12
- package/dist/src/formatter/print/printer.d.ts.map +1 -1
- package/dist/src/formatter/print/printer.js +0 -187
- package/dist/src/formatter/print/printer.js.map +1 -1
- package/dist/src/index.d.ts +3 -4
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/lib/decorators.d.ts +3 -3
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +14 -29
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/lib/examples.js +1 -5
- package/dist/src/lib/examples.js.map +1 -1
- package/dist/src/lib/tsp-index.d.ts.map +1 -1
- package/dist/src/lib/tsp-index.js +0 -1
- package/dist/src/lib/tsp-index.js.map +1 -1
- package/dist/src/server/classify.d.ts.map +1 -1
- package/dist/src/server/classify.js +0 -26
- package/dist/src/server/classify.js.map +1 -1
- package/dist/src/server/completion.js +1 -1
- package/dist/src/server/completion.js.map +1 -1
- package/dist/src/server/tmlanguage.d.ts.map +1 -1
- package/dist/src/server/tmlanguage.js +0 -125
- package/dist/src/server/tmlanguage.js.map +1 -1
- package/dist/src/server/type-signature.js +0 -11
- package/dist/src/server/type-signature.js.map +1 -1
- package/dist/typespec.tmLanguage +0 -342
- package/package.json +1 -1
- package/dist/src/core/helpers/projected-names-utils.d.ts +0 -20
- package/dist/src/core/helpers/projected-names-utils.d.ts.map +0 -1
- package/dist/src/core/helpers/projected-names-utils.js +0 -42
- package/dist/src/core/helpers/projected-names-utils.js.map +0 -1
- package/dist/src/core/projected-program.d.ts +0 -3
- package/dist/src/core/projected-program.d.ts.map +0 -1
- package/dist/src/core/projected-program.js +0 -4
- package/dist/src/core/projected-program.js.map +0 -1
- package/dist/src/core/projection-members.d.ts +0 -8
- package/dist/src/core/projection-members.d.ts.map +0 -1
- package/dist/src/core/projection-members.js +0 -382
- package/dist/src/core/projection-members.js.map +0 -1
- package/dist/src/core/projector.d.ts +0 -26
- package/dist/src/core/projector.d.ts.map +0 -1
- package/dist/src/core/projector.js +0 -572
- package/dist/src/core/projector.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { DiscriminatedUnion } from "../../../core/helpers/discriminator-utils.js";
|
|
2
1
|
import { Discriminator } from "../../../core/intrinsic-type-state.js";
|
|
3
2
|
import { Enum, Model, Scalar, Union, type Type } from "../../../core/types.js";
|
|
4
3
|
/** @experimental */
|
|
@@ -43,11 +42,6 @@ export interface TypeTypekit {
|
|
|
43
42
|
* @param type The scalar to get the name of.z
|
|
44
43
|
*/
|
|
45
44
|
getPlausibleName(type: Model | Union | Enum | Scalar): string;
|
|
46
|
-
/**
|
|
47
|
-
* Resolves a discriminated union for the given model or union.
|
|
48
|
-
* @param type Model or Union to resolve the discriminated union for.
|
|
49
|
-
*/
|
|
50
|
-
getDiscriminatedUnion(type: Union): DiscriminatedUnion | undefined;
|
|
51
45
|
/**
|
|
52
46
|
* Resolves the discriminator for a discriminated union. Returns undefined if the type is not a discriminated union.
|
|
53
47
|
* @param type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EAUd,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAQ/E,qBAAqB;AACrB,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,KAAK,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;IAClC;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAC7B;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAC7B;;OAEG;IACH,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAExE;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAE3C;;;;;OAKG;IACH,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACvC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;IAC9D;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK,GAAG,aAAa,GAAG,SAAS,CAAC;IACjE;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAEzC;;;OAGG;IACH,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAElD;;;OAGG;IACH,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAElD;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAC1C;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,CAAC;IACzC;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;IAC7B;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC;CACpC;AAED,UAAU,gBAAgB;IACxB;;;OAGG;IACH,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,OAAO,QAAQ,kBAAkB,CAAC;IAChC,UAAU,OAAQ,SAAQ,gBAAgB;KAAG;CAC9C"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ignoreDiagnostics } from "../../../core/diagnostics.js";
|
|
2
|
+
import { getDiscriminatedUnion } from "../../../core/helpers/discriminator-utils.js";
|
|
2
3
|
import { getLocationContext } from "../../../core/helpers/location-context.js";
|
|
3
4
|
import { getDiscriminator, getMaxItems, getMaxLength, getMaxValue, getMaxValueExclusive, getMinItems, getMinLength, getMinValue, getMinValueExclusive, } from "../../../core/intrinsic-type-state.js";
|
|
4
5
|
import { isErrorType, isNeverType } from "../../../core/type-utils.js";
|
|
5
6
|
import { getDoc, getSummary } from "../../../lib/decorators.js";
|
|
6
7
|
import { resolveEncodedName } from "../../../lib/encoded-names.js";
|
|
7
8
|
import { defineKit } from "../define-kit.js";
|
|
9
|
+
import { $ } from "../index.js";
|
|
8
10
|
import { copyMap } from "../utils.js";
|
|
9
11
|
import { getPlausibleName } from "../utils/get-plausible-name.js";
|
|
10
12
|
defineKit({
|
|
@@ -56,15 +58,12 @@ defineKit({
|
|
|
56
58
|
instantiationParameters: type.instantiationParameters
|
|
57
59
|
? [...type.instantiationParameters]
|
|
58
60
|
: undefined,
|
|
59
|
-
// eslint-disable-next-line @typescript-eslint/no-deprecated
|
|
60
|
-
projections: [...type.projections],
|
|
61
61
|
models: copyMap(type.models),
|
|
62
62
|
decoratorDeclarations: copyMap(type.decoratorDeclarations),
|
|
63
63
|
enums: copyMap(type.enums),
|
|
64
64
|
unions: copyMap(type.unions),
|
|
65
65
|
operations: copyMap(type.operations),
|
|
66
66
|
interfaces: copyMap(type.interfaces),
|
|
67
|
-
functionDeclarations: copyMap(type.functionDeclarations),
|
|
68
67
|
namespaces: copyMap(type.namespaces),
|
|
69
68
|
scalars: copyMap(type.scalars),
|
|
70
69
|
});
|
|
@@ -103,11 +102,18 @@ defineKit({
|
|
|
103
102
|
return getPlausibleName(type);
|
|
104
103
|
},
|
|
105
104
|
getDiscriminator(type) {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
105
|
+
let discriminator;
|
|
106
|
+
if ($.model.is(type)) {
|
|
107
|
+
discriminator = getDiscriminator(this.program, type);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
const unionDiscriminator = ignoreDiagnostics(getDiscriminatedUnion(this.program, type));
|
|
111
|
+
const propertyName = unionDiscriminator?.options.discriminatorPropertyName;
|
|
112
|
+
if (propertyName) {
|
|
113
|
+
discriminator = { propertyName };
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return discriminator;
|
|
111
117
|
},
|
|
112
118
|
maxValue(type) {
|
|
113
119
|
return getMaxValue(this.program, type);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/type.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DiscriminatedUnion } from "../../../core/helpers/discriminator-utils.js";
|
|
1
2
|
import type { Type, Union, UnionVariant } from "../../../core/types.js";
|
|
2
3
|
import { DecoratorArgs } from "../utils.js";
|
|
3
4
|
/**
|
|
@@ -62,6 +63,11 @@ export interface UnionKit {
|
|
|
62
63
|
* @param type Uniton to check if it is an expression
|
|
63
64
|
*/
|
|
64
65
|
isExpression(type: Union): boolean;
|
|
66
|
+
/**
|
|
67
|
+
* Resolves a discriminated union for the given union.
|
|
68
|
+
* @param type Union to resolve the discriminated union for.
|
|
69
|
+
*/
|
|
70
|
+
getDiscriminatedUnion(type: Union): DiscriminatedUnion | undefined;
|
|
65
71
|
}
|
|
66
72
|
interface TypekitExtension {
|
|
67
73
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"union.d.ts","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/union.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGxE,OAAO,EAAwB,aAAa,EAAE,MAAM,aAAa,CAAC;AAElE;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;IAE7B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,YAAY,EAAE,CAAC;CACtE;AAED;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,GAAG,KAAK,CAAC;IAC1E;;;;OAIG;IACH,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CAAC;IAErC;;;;OAIG;IACH,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,IAAI,KAAK,CAAC;IAE9B;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IAEnC;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"union.d.ts","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/union.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAEnB,MAAM,8CAA8C,CAAC;AACtD,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGxE,OAAO,EAAwB,aAAa,EAAE,MAAM,aAAa,CAAC;AAElE;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,UAAU,CAAC,EAAE,aAAa,EAAE,CAAC;IAE7B;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,YAAY,EAAE,CAAC;CACtE;AAED;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,GAAG,KAAK,CAAC;IAC1E;;;;OAIG;IACH,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,KAAK,CAAC;IAErC;;;;OAIG;IACH,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,IAAI,KAAK,CAAC;IAE9B;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IAEnC;;;OAGG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC;IACnC;;;OAGG;IACH,qBAAqB,CAAC,IAAI,EAAE,KAAK,GAAG,kBAAkB,GAAG,SAAS,CAAC;CACpE;AAED,UAAU,gBAAgB;IACxB;;;OAGG;IACH,KAAK,EAAE,QAAQ,CAAC;CACjB;AAED,OAAO,QAAQ,kBAAkB,CAAC;IAChC,UAAU,OAAQ,SAAQ,gBAAgB;KAAG;CAC9C;AAED,eAAO,MAAM,QAAQ,MAyFnB,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ignoreDiagnostics } from "../../../core/diagnostics.js";
|
|
2
|
+
import { getDiscriminatedUnion, } from "../../../core/helpers/discriminator-utils.js";
|
|
2
3
|
import { createRekeyableMap } from "../../../utils/misc.js";
|
|
3
4
|
import { defineKit } from "../define-kit.js";
|
|
4
5
|
import { decoratorApplication } from "../utils.js";
|
|
@@ -71,6 +72,9 @@ export const UnionKit = defineKit({
|
|
|
71
72
|
isExpression(type) {
|
|
72
73
|
return type.name === undefined || type.name === "";
|
|
73
74
|
},
|
|
75
|
+
getDiscriminatedUnion(type) {
|
|
76
|
+
return ignoreDiagnostics(getDiscriminatedUnion(this.program, type));
|
|
77
|
+
},
|
|
74
78
|
},
|
|
75
79
|
});
|
|
76
80
|
//# sourceMappingURL=union.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/union.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../../../src/experimental/typekit/kits/union.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"needs-parens.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/needs-parens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,IAAI,EAAc,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAErD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"needs-parens.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/needs-parens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,IAAI,EAAc,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAErD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAuB,GAAG,OAAO,CA0B1F"}
|
|
@@ -20,10 +20,6 @@ export function needsParens(path, options) {
|
|
|
20
20
|
case SyntaxKind.UnionExpression:
|
|
21
21
|
return (parent.kind === SyntaxKind.IntersectionExpression ||
|
|
22
22
|
parent.kind === SyntaxKind.ArrayExpression);
|
|
23
|
-
case SyntaxKind.ProjectionLogicalExpression:
|
|
24
|
-
return parent.kind === SyntaxKind.ProjectionLogicalExpression;
|
|
25
|
-
case SyntaxKind.ProjectionArithmeticExpression:
|
|
26
|
-
return parent.kind === SyntaxKind.ProjectionArithmeticExpression;
|
|
27
23
|
default:
|
|
28
24
|
return false;
|
|
29
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"needs-parens.js","sourceRoot":"","sources":["../../../../src/formatter/print/needs-parens.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGvD;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,IAAmB,EAAE,OAAgC;IAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,UAAU,CAAC,iBAAiB;YAC/B,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe;gBAC1C,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe;gBAC1C,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,sBAAsB,CAClD,CAAC;QACJ,KAAK,UAAU,CAAC,sBAAsB;YACpC,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe,CACzF,CAAC;QACJ,KAAK,UAAU,CAAC,eAAe;YAC7B,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,sBAAsB;gBACjD,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe,CAC3C,CAAC;QACJ
|
|
1
|
+
{"version":3,"file":"needs-parens.js","sourceRoot":"","sources":["../../../../src/formatter/print/needs-parens.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGvD;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,IAAmB,EAAE,OAAgC;IAC/E,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACvB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,UAAU,CAAC,iBAAiB;YAC/B,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe;gBAC1C,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe;gBAC1C,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,sBAAsB,CAClD,CAAC;QACJ,KAAK,UAAU,CAAC,sBAAsB;YACpC,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe,CACzF,CAAC;QACJ,KAAK,UAAU,CAAC,eAAe;YAC7B,OAAO,CACL,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,sBAAsB;gBACjD,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe,CAC3C,CAAC;QACJ;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AstPath, Doc, Printer } from "prettier";
|
|
2
2
|
import { builders } from "prettier/doc";
|
|
3
|
-
import { AliasStatementNode, ArrayExpressionNode, ArrayLiteralNode, AugmentDecoratorStatementNode, CallExpressionNode, Comment, ConstStatementNode, DecoratorDeclarationStatementNode, DecoratorExpressionNode, DirectiveExpressionNode, EnumMemberNode, EnumStatementNode, FunctionDeclarationStatementNode, InterfaceStatementNode, IntersectionExpressionNode, MemberExpressionNode, ModelExpressionNode, ModelPropertyNode, ModelStatementNode, Node, ObjectLiteralNode, ObjectLiteralPropertyNode, ObjectLiteralSpreadPropertyNode, OperationSignatureDeclarationNode, OperationSignatureReferenceNode, OperationStatementNode,
|
|
3
|
+
import { AliasStatementNode, ArrayExpressionNode, ArrayLiteralNode, AugmentDecoratorStatementNode, CallExpressionNode, Comment, ConstStatementNode, DecoratorDeclarationStatementNode, DecoratorExpressionNode, DirectiveExpressionNode, EnumMemberNode, EnumStatementNode, FunctionDeclarationStatementNode, InterfaceStatementNode, IntersectionExpressionNode, MemberExpressionNode, ModelExpressionNode, ModelPropertyNode, ModelStatementNode, Node, ObjectLiteralNode, ObjectLiteralPropertyNode, ObjectLiteralSpreadPropertyNode, OperationSignatureDeclarationNode, OperationSignatureReferenceNode, OperationStatementNode, StringTemplateExpressionNode, TemplateArgumentNode, TupleExpressionNode, TypeOfExpressionNode, TypeReferenceNode, TypeSpecScriptNode, UnionExpressionNode, UnionStatementNode, UnionVariantNode, ValueOfExpressionNode } from "../../core/types.js";
|
|
4
4
|
import { FlattenedNamespaceStatementNode } from "../types.js";
|
|
5
5
|
import { DecorableNode, PrettierChildPrint, TypeSpecPrettierOptions } from "./types.js";
|
|
6
6
|
export declare const typespecPrinter: Printer<Node>;
|
|
@@ -42,15 +42,15 @@ export declare function printInterfaceMembers(path: AstPath<InterfaceStatementNo
|
|
|
42
42
|
*/
|
|
43
43
|
export declare function printIntersection(path: AstPath<IntersectionExpressionNode>, options: object, print: PrettierChildPrint): builders.Group;
|
|
44
44
|
export declare function printArray(path: AstPath<ArrayExpressionNode>, options: object, print: PrettierChildPrint): Doc;
|
|
45
|
-
export declare function printTuple(path: AstPath<TupleExpressionNode
|
|
45
|
+
export declare function printTuple(path: AstPath<TupleExpressionNode>, options: object, print: PrettierChildPrint): Doc;
|
|
46
46
|
export declare function printMemberExpression(path: AstPath<MemberExpressionNode>, options: object, print: PrettierChildPrint): Doc;
|
|
47
|
-
export declare function printModelExpression(path: AstPath<ModelExpressionNode
|
|
47
|
+
export declare function printModelExpression(path: AstPath<ModelExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Group;
|
|
48
48
|
export declare function printObjectLiteral(path: AstPath<ObjectLiteralNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Group | "#{}";
|
|
49
49
|
export declare function printObjectLiteralProperty(path: AstPath<ObjectLiteralPropertyNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
50
50
|
export declare function printObjectLiteralSpreadProperty(path: AstPath<ObjectLiteralSpreadPropertyNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
51
51
|
export declare function printArrayLiteral(path: AstPath<ArrayLiteralNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Group;
|
|
52
52
|
export declare function printModelStatement(path: AstPath<ModelStatementNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
53
|
-
export declare function printModelProperty(path: AstPath<ModelPropertyNode
|
|
53
|
+
export declare function printModelProperty(path: AstPath<ModelPropertyNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
54
54
|
export declare function printNamespaceStatement(path: AstPath<FlattenedNamespaceStatementNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
55
55
|
export declare function printOperationSignatureDeclaration(path: AstPath<OperationSignatureDeclarationNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
56
56
|
export declare function printOperationSignatureReference(path: AstPath<OperationSignatureReferenceNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
@@ -62,13 +62,5 @@ export declare function printTemplateArgument(path: AstPath<TemplateArgumentNode
|
|
|
62
62
|
export declare function printValueOfExpression(path: AstPath<ValueOfExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): Doc;
|
|
63
63
|
export declare function printTypeOfExpression(path: AstPath<TypeOfExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): Doc;
|
|
64
64
|
export declare function printModifiers(path: AstPath<DecoratorDeclarationStatementNode | FunctionDeclarationStatementNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): Doc;
|
|
65
|
-
export declare function printProjectionBlockExpressionNode(path: AstPath<ProjectionBlockExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): "{}" | (string | builders.Indent | builders.Hardline)[];
|
|
66
|
-
export declare function printProjectionMemberExpression(path: AstPath<ProjectionMemberExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
67
|
-
export declare function printProjectionLeftRightExpression(path: AstPath<ProjectionLogicalExpressionNode | ProjectionRelationalExpressionNode | ProjectionEqualityExpressionNode | ProjectionArithmeticExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
68
|
-
export declare function printProjectionUnaryExpression(path: AstPath<ProjectionUnaryExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
69
|
-
export declare function printProjectionCallExpression(path: AstPath<ProjectionCallExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
70
|
-
export declare function printProjectionLambdaExpression(path: AstPath<ProjectionLambdaExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
71
|
-
export declare function printProjectionLambdaParameterDeclaration(path: AstPath<ProjectionLambdaParameterDeclarationNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc;
|
|
72
|
-
export declare function printReturnExpression(path: AstPath<ReturnExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Doc[];
|
|
73
65
|
export declare function printStringTemplateExpression(path: AstPath<StringTemplateExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): (string | builders.Indent)[] | (string | builders.Doc[][])[];
|
|
74
66
|
//# sourceMappingURL=printer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/printer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/printer.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,63 +139,6 @@ path, options, print) {
|
|
|
139
139
|
return "never";
|
|
140
140
|
case SyntaxKind.UnknownKeyword:
|
|
141
141
|
return "unknown";
|
|
142
|
-
case SyntaxKind.ProjectionStatement:
|
|
143
|
-
return printProjectionStatement(path, options, print);
|
|
144
|
-
case SyntaxKind.ProjectionModelSelector:
|
|
145
|
-
return "model";
|
|
146
|
-
case SyntaxKind.ProjectionModelPropertySelector:
|
|
147
|
-
return "modelproperty";
|
|
148
|
-
case SyntaxKind.ProjectionScalarSelector:
|
|
149
|
-
return "scalar";
|
|
150
|
-
case SyntaxKind.ProjectionOperationSelector:
|
|
151
|
-
return "op";
|
|
152
|
-
case SyntaxKind.ProjectionUnionSelector:
|
|
153
|
-
return "union";
|
|
154
|
-
case SyntaxKind.ProjectionUnionVariantSelector:
|
|
155
|
-
return "unionvariant";
|
|
156
|
-
case SyntaxKind.ProjectionInterfaceSelector:
|
|
157
|
-
return "interface";
|
|
158
|
-
case SyntaxKind.ProjectionEnumSelector:
|
|
159
|
-
return "enum";
|
|
160
|
-
case SyntaxKind.ProjectionEnumMemberSelector:
|
|
161
|
-
return "enummember";
|
|
162
|
-
case SyntaxKind.Projection:
|
|
163
|
-
return printProjection(path, options, print);
|
|
164
|
-
case SyntaxKind.ProjectionParameterDeclaration:
|
|
165
|
-
return printProjectionParameterDeclaration(path, options, print);
|
|
166
|
-
case SyntaxKind.ProjectionExpressionStatement:
|
|
167
|
-
return printProjectionExpressionStatement(path, options, print);
|
|
168
|
-
case SyntaxKind.ProjectionIfExpression:
|
|
169
|
-
return printProjectionIfExpressionNode(path, options, print);
|
|
170
|
-
case SyntaxKind.ProjectionBlockExpression:
|
|
171
|
-
return printProjectionBlockExpressionNode(path, options, print);
|
|
172
|
-
case SyntaxKind.ProjectionMemberExpression:
|
|
173
|
-
return printProjectionMemberExpression(path, options, print);
|
|
174
|
-
case SyntaxKind.ProjectionLogicalExpression:
|
|
175
|
-
case SyntaxKind.ProjectionEqualityExpression:
|
|
176
|
-
case SyntaxKind.ProjectionRelationalExpression:
|
|
177
|
-
case SyntaxKind.ProjectionArithmeticExpression:
|
|
178
|
-
return printProjectionLeftRightExpression(path, options, print);
|
|
179
|
-
case SyntaxKind.ProjectionUnaryExpression:
|
|
180
|
-
return printProjectionUnaryExpression(path, options, print);
|
|
181
|
-
case SyntaxKind.ProjectionCallExpression:
|
|
182
|
-
return printProjectionCallExpression(path, options, print);
|
|
183
|
-
case SyntaxKind.ProjectionLambdaExpression:
|
|
184
|
-
return printProjectionLambdaExpression(path, options, print);
|
|
185
|
-
case SyntaxKind.ProjectionLambdaParameterDeclaration:
|
|
186
|
-
return printProjectionLambdaParameterDeclaration(path, options, print);
|
|
187
|
-
case SyntaxKind.ProjectionModelExpression:
|
|
188
|
-
return printModelExpression(path, options, print);
|
|
189
|
-
case SyntaxKind.ProjectionModelProperty:
|
|
190
|
-
return printModelProperty(path, options, print);
|
|
191
|
-
case SyntaxKind.ProjectionModelSpreadProperty:
|
|
192
|
-
return printModelSpread(path, options, print);
|
|
193
|
-
case SyntaxKind.ProjectionTupleExpression:
|
|
194
|
-
return printTuple(path, options, print);
|
|
195
|
-
case SyntaxKind.ProjectionDecoratorReferenceExpression:
|
|
196
|
-
return path.call(print, "target");
|
|
197
|
-
case SyntaxKind.Return:
|
|
198
|
-
return printReturnExpression(path, options, print);
|
|
199
142
|
case SyntaxKind.Doc:
|
|
200
143
|
return printDoc(path, options, print);
|
|
201
144
|
case SyntaxKind.DocText:
|
|
@@ -740,7 +683,6 @@ function joinMembersInBlock(path, member, options, print, separator, regularLine
|
|
|
740
683
|
function shouldWrapMemberInNewLines(path, options) {
|
|
741
684
|
const node = path.node;
|
|
742
685
|
return ((node.kind !== SyntaxKind.ModelSpreadProperty &&
|
|
743
|
-
node.kind !== SyntaxKind.ProjectionModelSpreadProperty &&
|
|
744
686
|
node.kind !== SyntaxKind.EnumSpreadMember &&
|
|
745
687
|
node.kind !== SyntaxKind.ScalarConstructor &&
|
|
746
688
|
node.kind !== SyntaxKind.ObjectLiteralProperty &&
|
|
@@ -1031,132 +973,6 @@ function printBooleanLiteral(path, options) {
|
|
|
1031
973
|
const node = path.node;
|
|
1032
974
|
return node.value ? "true" : "false";
|
|
1033
975
|
}
|
|
1034
|
-
function printProjectionStatement(path, options, print) {
|
|
1035
|
-
const selector = path.call(print, "selector");
|
|
1036
|
-
const id = path.call(print, "id");
|
|
1037
|
-
const projections = path.map(print, "projections").flatMap((x) => [hardline, x]);
|
|
1038
|
-
return [
|
|
1039
|
-
"projection ",
|
|
1040
|
-
selector,
|
|
1041
|
-
"#",
|
|
1042
|
-
id,
|
|
1043
|
-
" {",
|
|
1044
|
-
indent(projections),
|
|
1045
|
-
projections.length > 0 ? hardline : "",
|
|
1046
|
-
"}",
|
|
1047
|
-
];
|
|
1048
|
-
}
|
|
1049
|
-
function printProjection(path, options, print) {
|
|
1050
|
-
const node = path.node;
|
|
1051
|
-
const params = printProjectionParameters(path, options, print);
|
|
1052
|
-
const body = printProjectionExpressionStatements(path, options, print, "body");
|
|
1053
|
-
return [
|
|
1054
|
-
...node.modifierIds.flatMap((i) => [i.sv, " "]),
|
|
1055
|
-
node.directionId.sv,
|
|
1056
|
-
params,
|
|
1057
|
-
" {",
|
|
1058
|
-
indent(body),
|
|
1059
|
-
hardline,
|
|
1060
|
-
"}",
|
|
1061
|
-
];
|
|
1062
|
-
}
|
|
1063
|
-
function printProjectionParameters(path, options, print) {
|
|
1064
|
-
const node = path.node;
|
|
1065
|
-
const params = node.parameters;
|
|
1066
|
-
if (params.length === 0) {
|
|
1067
|
-
return "";
|
|
1068
|
-
}
|
|
1069
|
-
const shouldHug = params.length === 1;
|
|
1070
|
-
if (shouldHug) {
|
|
1071
|
-
return ["(", printItemList(path, options, print, "parameters"), ")"];
|
|
1072
|
-
}
|
|
1073
|
-
else {
|
|
1074
|
-
const body = indent([softline, join([", ", softline], path.map(print, "parameters"))]);
|
|
1075
|
-
return group(["(", body, softline, ")"]);
|
|
1076
|
-
}
|
|
1077
|
-
}
|
|
1078
|
-
function printProjectionExpressionStatements(path, options, print, key) {
|
|
1079
|
-
const parts = [hardline];
|
|
1080
|
-
const lastIndex = path.node[key].length - 1;
|
|
1081
|
-
path.each((statementPath, index) => {
|
|
1082
|
-
const node = path.node;
|
|
1083
|
-
if (node.kind === SyntaxKind.EmptyStatement) {
|
|
1084
|
-
return;
|
|
1085
|
-
}
|
|
1086
|
-
const printed = print(statementPath);
|
|
1087
|
-
parts.push(printed);
|
|
1088
|
-
parts.push(";");
|
|
1089
|
-
if (index < lastIndex) {
|
|
1090
|
-
parts.push(hardline);
|
|
1091
|
-
if (isNextLineEmpty(options.originalText, node, options.locEnd)) {
|
|
1092
|
-
parts.push(hardline);
|
|
1093
|
-
}
|
|
1094
|
-
}
|
|
1095
|
-
}, key);
|
|
1096
|
-
return parts;
|
|
1097
|
-
}
|
|
1098
|
-
function printProjectionParameterDeclaration(path, options, print) {
|
|
1099
|
-
return path.call(print, "id");
|
|
1100
|
-
}
|
|
1101
|
-
function printProjectionExpressionStatement(path, options, print) {
|
|
1102
|
-
return path.call(print, "expr");
|
|
1103
|
-
}
|
|
1104
|
-
function printProjectionIfExpressionNode(path, options, print) {
|
|
1105
|
-
const node = path.node;
|
|
1106
|
-
const test = path.call(print, "test");
|
|
1107
|
-
const consequent = path.call(print, "consequent");
|
|
1108
|
-
const alternate = node.alternate ? [" else ", path.call(print, "alternate")] : "";
|
|
1109
|
-
return ["if ", test, " ", consequent, alternate];
|
|
1110
|
-
}
|
|
1111
|
-
export function printProjectionBlockExpressionNode(path, options, print) {
|
|
1112
|
-
const node = path.node;
|
|
1113
|
-
if (node.statements.length === 0) {
|
|
1114
|
-
return "{}";
|
|
1115
|
-
}
|
|
1116
|
-
return [
|
|
1117
|
-
"{",
|
|
1118
|
-
indent(printProjectionExpressionStatements(path, options, print, "statements")),
|
|
1119
|
-
hardline,
|
|
1120
|
-
"}",
|
|
1121
|
-
];
|
|
1122
|
-
}
|
|
1123
|
-
export function printProjectionMemberExpression(path, options, print) {
|
|
1124
|
-
const node = path.node;
|
|
1125
|
-
return [path.call(print, "base"), node.selector, path.call(print, "id")];
|
|
1126
|
-
}
|
|
1127
|
-
export function printProjectionLeftRightExpression(path, options, print) {
|
|
1128
|
-
const node = path.node;
|
|
1129
|
-
return [path.call(print, "left"), " ", node.op, " ", path.call(print, "right")];
|
|
1130
|
-
}
|
|
1131
|
-
export function printProjectionUnaryExpression(path, options, print) {
|
|
1132
|
-
return ["!", path.call(print, "target")];
|
|
1133
|
-
}
|
|
1134
|
-
export function printProjectionCallExpression(path, options, print) {
|
|
1135
|
-
const node = path.node;
|
|
1136
|
-
const target = path.call(print, "target");
|
|
1137
|
-
const params = printItemList(path, options, print, "arguments");
|
|
1138
|
-
if (node.callKind === "method") {
|
|
1139
|
-
return [target, "(", params, ")"];
|
|
1140
|
-
}
|
|
1141
|
-
else {
|
|
1142
|
-
return [target, "<", params, ">"];
|
|
1143
|
-
}
|
|
1144
|
-
}
|
|
1145
|
-
export function printProjectionLambdaExpression(path, options, print) {
|
|
1146
|
-
return [
|
|
1147
|
-
"(",
|
|
1148
|
-
printItemList(path, options, print, "parameters"),
|
|
1149
|
-
")",
|
|
1150
|
-
" => ",
|
|
1151
|
-
path.call(print, "body"),
|
|
1152
|
-
];
|
|
1153
|
-
}
|
|
1154
|
-
export function printProjectionLambdaParameterDeclaration(path, options, print) {
|
|
1155
|
-
return path.call(print, "id");
|
|
1156
|
-
}
|
|
1157
|
-
export function printReturnExpression(path, options, print) {
|
|
1158
|
-
return ["return ", path.call(print, "value")];
|
|
1159
|
-
}
|
|
1160
976
|
export function printStringTemplateExpression(path, options, print) {
|
|
1161
977
|
const node = path.node;
|
|
1162
978
|
const multiline = isMultiline(node, options);
|
|
@@ -1202,9 +1018,6 @@ function trimMultilineString(lines, whitespaceIndent) {
|
|
|
1202
1018
|
}
|
|
1203
1019
|
return newLines;
|
|
1204
1020
|
}
|
|
1205
|
-
function printItemList(path, options, print, key) {
|
|
1206
|
-
return join(", ", path.map(print, key));
|
|
1207
|
-
}
|
|
1208
1021
|
/**
|
|
1209
1022
|
* @param node Node that has postition information.
|
|
1210
1023
|
* @param options Prettier options
|