@typespec/compiler 0.67.0-dev.8 → 0.67.0
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/generated-defs/TypeSpec.Prototypes.d.ts +1 -1
- package/dist/generated-defs/TypeSpec.Prototypes.d.ts.map +1 -1
- package/dist/generated-defs/TypeSpec.d.ts +29 -2
- package/dist/generated-defs/TypeSpec.d.ts.map +1 -1
- package/dist/manifest.js +2 -2
- package/dist/src/ast/index.d.ts +14 -0
- package/dist/src/ast/index.d.ts.map +1 -0
- package/dist/src/ast/index.js +13 -0
- package/dist/src/ast/index.js.map +1 -0
- package/dist/src/config/config-loader.d.ts.map +1 -1
- package/dist/src/config/config-loader.js +2 -1
- package/dist/src/config/config-loader.js.map +1 -1
- package/dist/src/config/config-to-options.d.ts.map +1 -1
- package/dist/src/config/config-to-options.js +4 -2
- package/dist/src/config/config-to-options.js.map +1 -1
- package/dist/src/config/types.d.ts +1 -1
- package/dist/src/core/binder.d.ts.map +1 -1
- package/dist/src/core/binder.js +18 -137
- package/dist/src/core/binder.js.map +1 -1
- package/dist/src/core/checker.d.ts +7 -23
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +59 -780
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/cli/actions/compile/args.d.ts +1 -0
- package/dist/src/core/cli/actions/compile/args.d.ts.map +1 -1
- package/dist/src/core/cli/actions/compile/args.js +3 -0
- package/dist/src/core/cli/actions/compile/args.js.map +1 -1
- package/dist/src/core/cli/actions/compile/compile.js +1 -1
- package/dist/src/core/cli/actions/compile/compile.js.map +1 -1
- package/dist/src/core/cli/cli.js +14 -4
- package/dist/src/core/cli/cli.js.map +1 -1
- package/dist/src/core/cli/utils.d.ts.map +1 -1
- package/dist/src/core/cli/utils.js +5 -1
- package/dist/src/core/cli/utils.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/diagnostic-error.d.ts +7 -0
- package/dist/src/core/diagnostic-error.d.ts.map +1 -0
- package/dist/src/core/diagnostic-error.js +9 -0
- package/dist/src/core/diagnostic-error.js.map +1 -0
- package/dist/src/core/diagnostics.d.ts +6 -6
- package/dist/src/core/diagnostics.d.ts.map +1 -1
- package/dist/src/core/diagnostics.js +10 -11
- package/dist/src/core/diagnostics.js.map +1 -1
- package/dist/src/core/emitter-utils.js +2 -2
- package/dist/src/core/emitter-utils.js.map +1 -1
- package/dist/src/core/entrypoint-resolution.d.ts.map +1 -1
- package/dist/src/core/entrypoint-resolution.js +2 -1
- package/dist/src/core/entrypoint-resolution.js.map +1 -1
- package/dist/src/core/helpers/discriminator-utils.d.ts +1 -6
- package/dist/src/core/helpers/discriminator-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/discriminator-utils.js +1 -57
- package/dist/src/core/helpers/discriminator-utils.js.map +1 -1
- package/dist/src/core/helpers/index.d.ts +5 -6
- package/dist/src/core/helpers/index.d.ts.map +1 -1
- package/dist/src/core/helpers/index.js +5 -6
- package/dist/src/core/helpers/index.js.map +1 -1
- package/dist/src/core/helpers/syntax-utils.d.ts +2 -1
- package/dist/src/core/helpers/syntax-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/syntax-utils.js +8 -4
- package/dist/src/core/helpers/syntax-utils.js.map +1 -1
- package/dist/src/core/index.d.ts +1 -26
- package/dist/src/core/index.d.ts.map +1 -1
- package/dist/src/core/index.js +1 -26
- package/dist/src/core/index.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/intrinsic-type-state.d.ts +1 -1
- package/dist/src/core/intrinsic-type-state.d.ts.map +1 -1
- package/dist/src/core/js-marshaller.d.ts +0 -9
- package/dist/src/core/js-marshaller.d.ts.map +1 -1
- package/dist/src/core/js-marshaller.js +0 -26
- package/dist/src/core/js-marshaller.js.map +1 -1
- package/dist/src/core/logger/console-sink.browser.d.ts.map +1 -1
- package/dist/src/core/logger/console-sink.browser.js +0 -16
- package/dist/src/core/logger/console-sink.browser.js.map +1 -1
- package/dist/src/core/logger/console-sink.d.ts +2 -3
- package/dist/src/core/logger/console-sink.d.ts.map +1 -1
- package/dist/src/core/logger/console-sink.js +16 -43
- package/dist/src/core/logger/console-sink.js.map +1 -1
- package/dist/src/core/logger/dynamic-task.d.ts +16 -0
- package/dist/src/core/logger/dynamic-task.d.ts.map +1 -0
- package/dist/src/core/logger/dynamic-task.js +93 -0
- package/dist/src/core/logger/dynamic-task.js.map +1 -0
- package/dist/src/core/logger/logger.d.ts.map +1 -1
- package/dist/src/core/logger/logger.js +11 -1
- package/dist/src/core/logger/logger.js.map +1 -1
- package/dist/src/core/messages.d.ts +35 -45
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +9 -11
- 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/node-host.d.ts +0 -3
- package/dist/src/core/node-host.d.ts.map +1 -1
- package/dist/src/core/node-host.js +5 -51
- package/dist/src/core/node-host.js.map +1 -1
- package/dist/src/core/node-system-host.d.ts +9 -0
- package/dist/src/core/node-system-host.d.ts.map +1 -0
- package/dist/src/core/node-system-host.js +57 -0
- package/dist/src/core/node-system-host.js.map +1 -0
- package/dist/src/core/options.d.ts +9 -0
- package/dist/src/core/options.d.ts.map +1 -1
- package/dist/src/core/parser.d.ts.map +1 -1
- package/dist/src/core/parser.js +50 -654
- package/dist/src/core/parser.js.map +1 -1
- package/dist/src/core/program.d.ts +6 -16
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +48 -24
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/scanner.d.ts +37 -1
- package/dist/src/core/scanner.d.ts.map +1 -1
- package/dist/src/core/scanner.js +150 -3
- package/dist/src/core/scanner.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/source-loader.d.ts.map +1 -1
- package/dist/src/core/source-loader.js +2 -1
- package/dist/src/core/source-loader.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 +4 -22
- 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 +58 -324
- 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/emitter-framework/asset-emitter.d.ts +2 -1
- package/dist/src/emitter-framework/asset-emitter.d.ts.map +1 -1
- package/dist/src/emitter-framework/asset-emitter.js +2 -2
- package/dist/src/emitter-framework/asset-emitter.js.map +1 -1
- package/dist/src/emitter-framework/builders/array-builder.js +1 -1
- package/dist/src/emitter-framework/builders/array-builder.js.map +1 -1
- package/dist/src/emitter-framework/builders/object-builder.js +1 -1
- package/dist/src/emitter-framework/builders/object-builder.js.map +1 -1
- package/dist/src/emitter-framework/index.d.ts +74 -8
- package/dist/src/emitter-framework/index.d.ts.map +1 -1
- package/dist/src/emitter-framework/index.js +32 -8
- package/dist/src/emitter-framework/index.js.map +1 -1
- package/dist/src/emitter-framework/reference-cycle.d.ts +1 -1
- package/dist/src/emitter-framework/types.d.ts +2 -1
- package/dist/src/emitter-framework/types.d.ts.map +1 -1
- package/dist/src/experimental/freeze-graph.d.ts +1 -1
- package/dist/src/experimental/freeze-graph.d.ts.map +1 -1
- package/dist/src/experimental/freeze-graph.js +1 -4
- 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 +3 -8
- package/dist/src/experimental/mutators.js.map +1 -1
- package/dist/src/experimental/typekit/index.d.ts +1 -1
- package/dist/src/experimental/typekit/index.d.ts.map +1 -1
- package/dist/src/experimental/typekit/index.js +1 -1
- package/dist/src/experimental/typekit/index.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 +16 -10
- 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/comment-handler.js +1 -0
- package/dist/src/formatter/print/comment-handler.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 +14 -196
- package/dist/src/formatter/print/printer.js.map +1 -1
- package/dist/src/index.d.ts +27 -5
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +32 -5
- package/dist/src/index.js.map +1 -1
- package/dist/src/init/core-templates.d.ts +2 -2
- package/dist/src/init/core-templates.d.ts.map +1 -1
- package/dist/src/init/core-templates.js.map +1 -1
- package/dist/src/init/init.d.ts +0 -2
- package/dist/src/init/init.d.ts.map +1 -1
- package/dist/src/init/init.js +17 -51
- package/dist/src/init/init.js.map +1 -1
- package/dist/src/init/scaffold.d.ts +4 -3
- package/dist/src/init/scaffold.d.ts.map +1 -1
- package/dist/src/init/scaffold.js +3 -4
- package/dist/src/init/scaffold.js.map +1 -1
- package/dist/src/install/config.d.ts +9 -0
- package/dist/src/install/config.d.ts.map +1 -0
- package/dist/src/install/config.js +16 -0
- package/dist/src/install/config.js.map +1 -0
- package/dist/src/install/install.d.ts +14 -0
- package/dist/src/install/install.d.ts.map +1 -0
- package/dist/src/install/install.js +191 -0
- package/dist/src/install/install.js.map +1 -0
- package/dist/src/install/spec.d.ts +39 -0
- package/dist/src/install/spec.d.ts.map +1 -0
- package/dist/src/install/spec.js +152 -0
- package/dist/src/install/spec.js.map +1 -0
- package/dist/src/internals/index.d.ts +8 -0
- package/dist/src/internals/index.d.ts.map +1 -0
- package/dist/src/internals/index.js +11 -0
- package/dist/src/internals/index.js.map +1 -0
- package/dist/src/lib/decorators.d.ts +16 -4
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +89 -46
- 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/key.d.ts +1 -1
- package/dist/src/lib/key.d.ts.map +1 -1
- package/dist/src/lib/paging.d.ts +1 -1
- package/dist/src/lib/paging.d.ts.map +1 -1
- package/dist/src/lib/paging.js +3 -1
- package/dist/src/lib/paging.js.map +1 -1
- package/dist/src/lib/service.d.ts.map +1 -1
- package/dist/src/lib/service.js +0 -4
- package/dist/src/lib/service.js.map +1 -1
- package/dist/src/lib/tsp-index.d.ts.map +1 -1
- package/dist/src/lib/tsp-index.js +2 -2
- package/dist/src/lib/tsp-index.js.map +1 -1
- package/dist/src/lib/visibility.js +1 -1
- package/dist/src/lib/visibility.js.map +1 -1
- package/dist/src/module-resolver/module-resolver.d.ts.map +1 -1
- package/dist/src/module-resolver/module-resolver.js +20 -13
- package/dist/src/module-resolver/module-resolver.js.map +1 -1
- package/dist/src/package-manger/npm-registry-utils.d.ts +83 -0
- package/dist/src/package-manger/npm-registry-utils.d.ts.map +1 -0
- package/dist/src/package-manger/npm-registry-utils.js +42 -0
- package/dist/src/package-manger/npm-registry-utils.js.map +1 -0
- package/dist/src/server/classify.d.ts +1 -1
- package/dist/src/server/classify.d.ts.map +1 -1
- package/dist/src/server/classify.js +4 -27
- package/dist/src/server/classify.js.map +1 -1
- package/dist/src/server/compile-service.d.ts +1 -1
- package/dist/src/server/compile-service.d.ts.map +1 -1
- package/dist/src/server/compile-service.js +5 -2
- package/dist/src/server/compile-service.js.map +1 -1
- package/dist/src/server/completion.d.ts +2 -1
- package/dist/src/server/completion.d.ts.map +1 -1
- package/dist/src/server/completion.js +24 -10
- package/dist/src/server/completion.js.map +1 -1
- package/dist/src/server/constants.d.ts +1 -1
- package/dist/src/server/constants.d.ts.map +1 -1
- package/dist/src/server/constants.js +1 -1
- package/dist/src/server/index.d.ts +2 -2
- package/dist/src/server/index.d.ts.map +1 -1
- package/dist/src/server/index.js +1 -2
- package/dist/src/server/index.js.map +1 -1
- package/dist/src/server/server.js +1 -1
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +3 -2
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/symbol-structure.d.ts +1 -1
- package/dist/src/server/symbol-structure.d.ts.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-details.js +4 -1
- package/dist/src/server/type-details.js.map +1 -1
- package/dist/src/server/type-signature.js +4 -15
- package/dist/src/server/type-signature.js.map +1 -1
- package/dist/src/server/types.d.ts +4 -2
- package/dist/src/server/types.d.ts.map +1 -1
- package/dist/src/server/types.js.map +1 -1
- package/dist/src/server/yaml-resolver.d.ts +1 -1
- package/dist/src/server/yaml-resolver.d.ts.map +1 -1
- package/dist/src/testing/code-fix-testing.d.ts +1 -1
- package/dist/src/testing/code-fix-testing.d.ts.map +1 -1
- package/dist/src/testing/code-fix-testing.js +3 -2
- package/dist/src/testing/code-fix-testing.js.map +1 -1
- package/dist/src/testing/expect.d.ts +1 -7
- package/dist/src/testing/expect.d.ts.map +1 -1
- package/dist/src/testing/expect.js +2 -13
- package/dist/src/testing/expect.js.map +1 -1
- package/dist/src/testing/index.d.ts +6 -6
- package/dist/src/testing/index.d.ts.map +1 -1
- package/dist/src/testing/index.js +5 -6
- package/dist/src/testing/index.js.map +1 -1
- package/dist/src/testing/rule-tester.d.ts +1 -1
- package/dist/src/testing/rule-tester.d.ts.map +1 -1
- package/dist/src/testing/rule-tester.js +2 -1
- package/dist/src/testing/rule-tester.js.map +1 -1
- package/dist/src/testing/source-utils.d.ts +20 -0
- package/dist/src/testing/source-utils.d.ts.map +1 -0
- package/dist/src/testing/source-utils.js +23 -0
- package/dist/src/testing/source-utils.js.map +1 -0
- package/dist/src/testing/test-host.d.ts.map +1 -1
- package/dist/src/testing/test-host.js +0 -4
- package/dist/src/testing/test-host.js.map +1 -1
- package/dist/src/testing/test-server-host.d.ts +0 -19
- package/dist/src/testing/test-server-host.d.ts.map +1 -1
- package/dist/src/testing/test-server-host.js +0 -22
- package/dist/src/testing/test-server-host.js.map +1 -1
- package/dist/src/testing/test-utils.d.ts +1 -1
- package/dist/src/testing/test-utils.d.ts.map +1 -1
- package/dist/src/testing/test-utils.js +4 -2
- package/dist/src/testing/test-utils.js.map +1 -1
- package/dist/src/testing/types.d.ts +3 -2
- package/dist/src/testing/types.d.ts.map +1 -1
- package/dist/src/testing/types.js.map +1 -1
- package/dist/src/types/package-json.d.ts +14 -0
- package/dist/src/types/package-json.d.ts.map +1 -1
- package/dist/src/utils/custom-key-map.d.ts.map +1 -0
- package/dist/src/utils/custom-key-map.js.map +1 -0
- package/dist/src/utils/fs-utils.d.ts +3 -0
- package/dist/src/utils/fs-utils.d.ts.map +1 -0
- package/dist/src/utils/fs-utils.js +19 -0
- package/dist/src/utils/fs-utils.js.map +1 -0
- package/dist/src/utils/io.d.ts +16 -0
- package/dist/src/utils/io.d.ts.map +1 -0
- package/dist/src/utils/io.js +77 -0
- package/dist/src/utils/io.js.map +1 -0
- package/dist/src/utils/misc.d.ts +4 -18
- package/dist/src/utils/misc.d.ts.map +1 -1
- package/dist/src/utils/misc.js +1 -77
- package/dist/src/utils/misc.js.map +1 -1
- package/dist/typespec.tmLanguage +0 -342
- package/lib/std/decorators.tsp +37 -2
- package/package.json +14 -7
- package/templates/__snapshots__/emitter-ts/src/emitter.ts +4 -6
- package/templates/emitter-ts/src/emitter.ts +4 -6
- package/templates/scaffolding.json +4 -4
- 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/install.d.ts +0 -3
- package/dist/src/core/install.d.ts.map +0 -1
- package/dist/src/core/install.js +0 -60
- package/dist/src/core/install.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
- package/dist/src/emitter-framework/custom-key-map.d.ts.map +0 -1
- package/dist/src/emitter-framework/custom-key-map.js.map +0 -1
- /package/dist/src/{emitter-framework → utils}/custom-key-map.d.ts +0 -0
- /package/dist/src/{emitter-framework → utils}/custom-key-map.js +0 -0
|
@@ -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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"}
|
|
@@ -61,6 +61,7 @@ function addCommentBetweenAnnotationsAndNode({ comment }) {
|
|
|
61
61
|
enclosingNode.kind === SyntaxKind.InterfaceStatement ||
|
|
62
62
|
enclosingNode.kind === SyntaxKind.ModelProperty ||
|
|
63
63
|
enclosingNode.kind === SyntaxKind.EnumMember ||
|
|
64
|
+
enclosingNode.kind === SyntaxKind.UnionVariant ||
|
|
64
65
|
enclosingNode.kind === SyntaxKind.UnionStatement)) {
|
|
65
66
|
util.addTrailingComment(precedingNode, comment);
|
|
66
67
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment-handler.js","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"comment-handler.js","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,UAAU,EAAiC,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AASjC;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAoC;IAC7D,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,CACtD;QACE,wBAAwB;QACxB,oBAAoB;QACpB,qBAAqB;QACrB,mCAAmC;QACnC,kBAAkB;KACnB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAyB,EAAE,aAAa,EAAE,CAAC,CAAC;IAC7F,SAAS,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,CACxD,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAyB,EAAE,aAAa,EAAE,CAAC,CAC7E;IACH,SAAS,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,CACxD,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAyB,EAAE,aAAa,EAAE,CAAC,CAC7E;CACJ,CAAC;AASF;;;;;;;;GAQG;AACH,SAAS,wBAAwB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAkB;IAChE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IACE,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB;QACpD,aAAa,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QACrC,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,UAAU,EAC5C,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,mCAAmC,CAAC,EAAE,OAAO,EAAkB;IACtE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IACE,aAAa;QACb,CAAC,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,mBAAmB;YACpD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,mBAAmB;YACrD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,GAAG,CAAC;QACxC,aAAa;QACb,CAAC,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB;YACnD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc;YAChD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,aAAa;YAC/C,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB;YACpD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe;YACjD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB;YACpD,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,aAAa;YAC/C,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,UAAU;YAC5C,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,YAAY;YAC9C,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc,CAAC,EACnD,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,oBAAoB,CAAC,EAAE,OAAO,EAAkB;IACvD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IACE,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,cAAc;QAChD,aAAa,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QACrC,aAAa;QACb,CAAC,aAAa,KAAK,aAAa,CAAC,EAAE;YACjC,aAAa,KAAK,aAAa,CAAC,EAAE;YAClC,aAAa,KAAK,aAAa,CAAC,OAAO,CAAC,EAC1C,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,qBAAqB,CAAC,EAAE,OAAO,EAAkB;IACxD,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IACE,aAAa;QACb,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,eAAe;QACjD,aAAa,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAClC,aAAa;QACb,CAAC,aAAa,KAAK,aAAa,CAAC,EAAE,IAAI,aAAa,KAAK,aAAa,CAAC,OAAO,CAAC,EAC/E,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAkB;IACzE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAClC,IAAI,GAAG,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,aAAa,EAAE,IAAI,KAAK,UAAU,CAAC,cAAc;QACjD,aAAa,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QACrC,aAAa,CAAC,UAAU,EAAE,MAAM,KAAK,CAAC,EACtC,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -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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"}
|
|
@@ -80,7 +80,7 @@ path, options, print) {
|
|
|
80
80
|
return printInterfaceStatement(path, options, print);
|
|
81
81
|
// Others.
|
|
82
82
|
case SyntaxKind.Identifier:
|
|
83
|
-
return printIdentifier(node
|
|
83
|
+
return printIdentifier(node);
|
|
84
84
|
case SyntaxKind.StringLiteral:
|
|
85
85
|
return printStringLiteral(path, options);
|
|
86
86
|
case SyntaxKind.NumericLiteral:
|
|
@@ -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:
|
|
@@ -365,7 +308,11 @@ function hasNewlineBetweenOrAfterDecorators(node, options) {
|
|
|
365
308
|
}
|
|
366
309
|
export function printDecorator(path, options, print) {
|
|
367
310
|
const args = printDecoratorArgs(path, options, print);
|
|
368
|
-
|
|
311
|
+
const node = path.node;
|
|
312
|
+
const name = node.target.kind === SyntaxKind.Identifier
|
|
313
|
+
? printIdentifier(node.target, "allow-reserved")
|
|
314
|
+
: path.call(print, "target");
|
|
315
|
+
return ["@", name, args];
|
|
369
316
|
}
|
|
370
317
|
export function printAugmentDecorator(path, options, print) {
|
|
371
318
|
const args = printAugmentDecoratorArgs(path, options, print);
|
|
@@ -461,7 +408,7 @@ function printEnumBlock(path, options, print) {
|
|
|
461
408
|
}
|
|
462
409
|
export function printEnumMember(path, options, print) {
|
|
463
410
|
const node = path.node;
|
|
464
|
-
const id =
|
|
411
|
+
const id = printIdentifier(node.id, "allow-reserved");
|
|
465
412
|
const value = node.value ? [": ", path.call(print, "value")] : "";
|
|
466
413
|
const { decorators } = printDecorators(path, options, print, {
|
|
467
414
|
tryInline: DecoratorsTryInline.enumMember,
|
|
@@ -486,7 +433,7 @@ export function printUnionVariantsBlock(path, options, print) {
|
|
|
486
433
|
return group(["{", indent(body), hardline, "}"]);
|
|
487
434
|
}
|
|
488
435
|
export function printUnionVariant(path, options, print) {
|
|
489
|
-
const id = path.node.id === undefined ? "" : [path.
|
|
436
|
+
const id = path.node.id === undefined ? "" : [printIdentifier(path.node.id, "allow-reserved"), ": "];
|
|
490
437
|
const { decorators } = printDecorators(path, options, print, {
|
|
491
438
|
tryInline: DecoratorsTryInline.unionVariant,
|
|
492
439
|
});
|
|
@@ -613,7 +560,8 @@ export function printTuple(path, options, print) {
|
|
|
613
560
|
}
|
|
614
561
|
export function printMemberExpression(path, options, print) {
|
|
615
562
|
const node = path.node;
|
|
616
|
-
|
|
563
|
+
const id = printIdentifier(node.id, "allow-reserved");
|
|
564
|
+
return [node.base ? [path.call(print, "base"), node.selector] : "", id];
|
|
617
565
|
}
|
|
618
566
|
export function printModelExpression(path, options, print) {
|
|
619
567
|
const inBlock = isModelExpressionInBlock(path);
|
|
@@ -646,7 +594,7 @@ export function printObjectLiteral(path, options, print) {
|
|
|
646
594
|
}
|
|
647
595
|
export function printObjectLiteralProperty(path, options, print) {
|
|
648
596
|
const node = path.node;
|
|
649
|
-
const id = printIdentifier(node.id,
|
|
597
|
+
const id = printIdentifier(node.id, "allow-reserved");
|
|
650
598
|
return [printDirectives(path, options, print), id, ": ", path.call(print, "value")];
|
|
651
599
|
}
|
|
652
600
|
export function printObjectLiteralSpreadProperty(path, options, print) {
|
|
@@ -740,7 +688,6 @@ function joinMembersInBlock(path, member, options, print, separator, regularLine
|
|
|
740
688
|
function shouldWrapMemberInNewLines(path, options) {
|
|
741
689
|
const node = path.node;
|
|
742
690
|
return ((node.kind !== SyntaxKind.ModelSpreadProperty &&
|
|
743
|
-
node.kind !== SyntaxKind.ProjectionModelSpreadProperty &&
|
|
744
691
|
node.kind !== SyntaxKind.EnumSpreadMember &&
|
|
745
692
|
node.kind !== SyntaxKind.ScalarConstructor &&
|
|
746
693
|
node.kind !== SyntaxKind.ObjectLiteralProperty &&
|
|
@@ -775,7 +722,7 @@ export function printModelProperty(path, options, print) {
|
|
|
775
722
|
const { decorators } = printDecorators(path, options, print, {
|
|
776
723
|
tryInline: DecoratorsTryInline.modelProperty,
|
|
777
724
|
});
|
|
778
|
-
const id = printIdentifier(node.id,
|
|
725
|
+
const id = printIdentifier(node.id, "allow-reserved");
|
|
779
726
|
return [
|
|
780
727
|
printDirectives(path, options, print),
|
|
781
728
|
decorators,
|
|
@@ -785,8 +732,8 @@ export function printModelProperty(path, options, print) {
|
|
|
785
732
|
node.default ? [" = ", path.call(print, "default")] : "",
|
|
786
733
|
];
|
|
787
734
|
}
|
|
788
|
-
function printIdentifier(id,
|
|
789
|
-
return printIdentifierString(id.sv);
|
|
735
|
+
function printIdentifier(id, context = "disallow-reserved") {
|
|
736
|
+
return printIdentifierString(id.sv, context);
|
|
790
737
|
}
|
|
791
738
|
function isModelExpressionInBlock(path) {
|
|
792
739
|
const parent = path.getParentNode();
|
|
@@ -1031,132 +978,6 @@ function printBooleanLiteral(path, options) {
|
|
|
1031
978
|
const node = path.node;
|
|
1032
979
|
return node.value ? "true" : "false";
|
|
1033
980
|
}
|
|
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
981
|
export function printStringTemplateExpression(path, options, print) {
|
|
1161
982
|
const node = path.node;
|
|
1162
983
|
const multiline = isMultiline(node, options);
|
|
@@ -1202,9 +1023,6 @@ function trimMultilineString(lines, whitespaceIndent) {
|
|
|
1202
1023
|
}
|
|
1203
1024
|
return newLines;
|
|
1204
1025
|
}
|
|
1205
|
-
function printItemList(path, options, print, key) {
|
|
1206
|
-
return join(", ", path.map(print, key));
|
|
1207
|
-
}
|
|
1208
1026
|
/**
|
|
1209
1027
|
* @param node Node that has postition information.
|
|
1210
1028
|
* @param options Prettier options
|