@typespec/compiler 1.17.0-dev.0 → 1.17.0-dev.11
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/config/config-interpolation.js.map +1 -1
- package/dist/src/config/config-loader.js.map +1 -1
- package/dist/src/core/auto-decorator.js.map +1 -1
- package/dist/src/core/binder.d.ts +5 -5
- package/dist/src/core/binder.d.ts.map +1 -1
- package/dist/src/core/binder.js +33 -0
- package/dist/src/core/binder.js.map +1 -1
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +168 -53
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/cli/actions/compile/compile.js.map +1 -1
- package/dist/src/core/cli/actions/info.js.map +1 -1
- package/dist/src/core/cli/cli.js.map +1 -1
- package/dist/src/core/cli/utils.js.map +1 -1
- package/dist/src/core/compiler-code-fixes/suppress.codefix.js.map +1 -1
- package/dist/src/core/decorator-utils.js.map +1 -1
- package/dist/src/core/diagnostic-error.d.ts.map +1 -1
- package/dist/src/core/diagnostics.js.map +1 -1
- package/dist/src/core/external-error.d.ts.map +1 -1
- package/dist/src/core/external-error.js.map +1 -1
- package/dist/src/core/features.d.ts +3 -0
- package/dist/src/core/features.d.ts.map +1 -1
- package/dist/src/core/features.js +3 -0
- package/dist/src/core/features.js.map +1 -1
- package/dist/src/core/file-ref.d.ts.map +1 -1
- package/dist/src/core/formatter-fs.js.map +1 -1
- package/dist/src/core/helpers/operation-utils.js.map +1 -1
- package/dist/src/core/helpers/syntax-utils.js.map +1 -1
- package/dist/src/core/helpers/type-name-utils.js +19 -3
- package/dist/src/core/helpers/type-name-utils.js.map +1 -1
- package/dist/src/core/helpers/usage-resolver.js.map +1 -1
- package/dist/src/core/inspector/node.js +6 -1
- package/dist/src/core/inspector/node.js.map +1 -1
- package/dist/src/core/inspector/symbol.js.map +1 -1
- package/dist/src/core/linter-ruleset-file.js.map +1 -1
- package/dist/src/core/logger/console-sink.js.map +1 -1
- package/dist/src/core/logger/dynamic-task.d.ts.map +1 -1
- package/dist/src/core/logger/tracer.js.map +1 -1
- package/dist/src/core/messages.d.ts +88 -52
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +12 -0
- package/dist/src/core/messages.js.map +1 -1
- package/dist/src/core/modifiers.d.ts +9 -2
- package/dist/src/core/modifiers.d.ts.map +1 -1
- package/dist/src/core/modifiers.js +8 -0
- package/dist/src/core/modifiers.js.map +1 -1
- package/dist/src/core/name-resolver.d.ts.map +1 -1
- package/dist/src/core/name-resolver.js +30 -4
- package/dist/src/core/name-resolver.js.map +1 -1
- package/dist/src/core/node-host.js.map +1 -1
- package/dist/src/core/node-system-host.d.ts.map +1 -1
- package/dist/src/core/numeric.js.map +1 -1
- package/dist/src/core/parser.d.ts.map +1 -1
- package/dist/src/core/parser.js +257 -23
- package/dist/src/core/parser.js.map +1 -1
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/scanner.d.ts +5 -0
- package/dist/src/core/scanner.d.ts.map +1 -1
- package/dist/src/core/scanner.js +10 -0
- package/dist/src/core/scanner.js.map +1 -1
- package/dist/src/core/schema-validator.js.map +1 -1
- package/dist/src/core/semantic-walker.d.ts.map +1 -1
- package/dist/src/core/semantic-walker.js.map +1 -1
- package/dist/src/core/source-loader.js.map +1 -1
- package/dist/src/core/state-accessors.d.ts.map +1 -1
- 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-utils.d.ts.map +1 -1
- package/dist/src/core/type-utils.js +3 -0
- package/dist/src/core/type-utils.js.map +1 -1
- package/dist/src/core/types.d.ts +111 -14
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/types.js +4 -0
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/core/visibility/core.d.ts.map +1 -1
- package/dist/src/experimental/mutators.js.map +1 -1
- package/dist/src/experimental/realm.d.ts.map +1 -1
- package/dist/src/experimental/realm.js.map +1 -1
- package/dist/src/formatter/index.d.ts.map +1 -1
- package/dist/src/formatter/parser.d.ts.map +1 -1
- package/dist/src/formatter/parser.js.map +1 -1
- package/dist/src/formatter/print/comment-handler.js +11 -1
- package/dist/src/formatter/print/comment-handler.js.map +1 -1
- package/dist/src/formatter/print/printer.d.ts +4 -4
- package/dist/src/formatter/print/printer.d.ts.map +1 -1
- package/dist/src/formatter/print/printer.js +106 -15
- package/dist/src/formatter/print/printer.js.map +1 -1
- package/dist/src/init/init.d.ts.map +1 -1
- package/dist/src/init/init.js +3 -1
- package/dist/src/init/init.js.map +1 -1
- package/dist/src/init/prompts.d.ts +1 -1
- package/dist/src/init/prompts.d.ts.map +1 -1
- package/dist/src/init/prompts.js +1 -1
- package/dist/src/init/prompts.js.map +1 -1
- package/dist/src/init/scaffold.d.ts.map +1 -1
- package/dist/src/init/scaffold.js +31 -3
- package/dist/src/init/scaffold.js.map +1 -1
- package/dist/src/init/template-source/in-memory-template-source.d.ts +1 -1
- package/dist/src/init/template-source/in-memory-template-source.d.ts.map +1 -1
- package/dist/src/init/template-source/in-memory-template-source.js +2 -1
- package/dist/src/init/template-source/in-memory-template-source.js.map +1 -1
- package/dist/src/init/template-source/types.d.ts +1 -0
- package/dist/src/init/template-source/types.d.ts.map +1 -1
- package/dist/src/init/template-source/types.js +10 -1
- package/dist/src/init/template-source/types.js.map +1 -1
- package/dist/src/init/template-source/uri-template-source.d.ts +1 -1
- package/dist/src/init/template-source/uri-template-source.d.ts.map +1 -1
- package/dist/src/init/template-source/uri-template-source.js +23 -2
- package/dist/src/init/template-source/uri-template-source.js.map +1 -1
- package/dist/src/install/install.d.ts.map +1 -1
- package/dist/src/install/spec.d.ts.map +1 -1
- package/dist/src/internals/prettier-formatter.d.ts.map +1 -1
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/lib/examples.d.ts.map +1 -1
- package/dist/src/lib/examples.js.map +1 -1
- package/dist/src/lib/intrinsic/decorators.d.ts.map +1 -1
- package/dist/src/lib/intrinsic/tsp-index.d.ts +3 -2
- package/dist/src/lib/intrinsic/tsp-index.d.ts.map +1 -1
- package/dist/src/lib/paging.js.map +1 -1
- package/dist/src/lib/service.js.map +1 -1
- package/dist/src/lib/visibility.js.map +1 -1
- package/dist/src/module-resolver/esm/utils.d.ts.map +1 -1
- package/dist/src/module-resolver/module-resolver.d.ts.map +1 -1
- package/dist/src/module-resolver/module-resolver.js.map +1 -1
- package/dist/src/module-resolver/node-package-resolver.d.ts.map +1 -1
- package/dist/src/module-resolver/utils.d.ts.map +1 -1
- package/dist/src/module-resolver/utils.js +6 -2
- package/dist/src/module-resolver/utils.js.map +1 -1
- package/dist/src/package-manger/npm-package-download.js.map +1 -1
- package/dist/src/runner.js.map +1 -1
- package/dist/src/server/classify.d.ts.map +1 -1
- package/dist/src/server/classify.js +12 -4
- package/dist/src/server/classify.js.map +1 -1
- package/dist/src/server/completion.js +14 -1
- package/dist/src/server/completion.js.map +1 -1
- package/dist/src/server/debug.d.ts.map +1 -1
- package/dist/src/server/language-config.d.ts +4 -4
- package/dist/src/server/language-config.d.ts.map +1 -1
- package/dist/src/server/lib-provider.d.ts.map +1 -1
- package/dist/src/server/lib-provider.js.map +1 -1
- package/dist/src/server/npm-package-provider.d.ts.map +1 -1
- package/dist/src/server/npm-package-provider.js.map +1 -1
- package/dist/src/server/server-compile-manager.d.ts.map +1 -1
- package/dist/src/server/server-compile-manager.js.map +1 -1
- package/dist/src/server/server-track-action-task.d.ts.map +1 -1
- package/dist/src/server/server.js.map +1 -1
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/tmlanguage.d.ts.map +1 -1
- package/dist/src/server/tmlanguage.js +69 -1
- package/dist/src/server/tmlanguage.js.map +1 -1
- package/dist/src/server/tspconfig/completion.js.map +1 -1
- package/dist/src/server/type-details.js.map +1 -1
- package/dist/src/server/type-signature.js +4 -1
- package/dist/src/server/type-signature.js.map +1 -1
- package/dist/src/server/update-manager.d.ts.map +1 -1
- package/dist/src/server/update-manager.js.map +1 -1
- package/dist/src/testing/expect.d.ts.map +1 -1
- package/dist/src/testing/fs.d.ts.map +1 -1
- package/dist/src/testing/marked-template.d.ts.map +1 -1
- package/dist/src/testing/test-host.js.map +1 -1
- package/dist/src/testing/test-utils.js.map +1 -1
- package/dist/src/testing/tester.d.ts +11 -0
- package/dist/src/testing/tester.d.ts.map +1 -1
- package/dist/src/testing/tester.js +28 -3
- package/dist/src/testing/tester.js.map +1 -1
- package/dist/src/testing/types.d.ts.map +1 -1
- package/dist/src/testing/types.js.map +1 -1
- package/dist/src/typekit/kits/enum.d.ts +14 -1
- package/dist/src/typekit/kits/enum.d.ts.map +1 -1
- package/dist/src/typekit/kits/enum.js +2 -1
- package/dist/src/typekit/kits/enum.js.map +1 -1
- package/dist/src/typekit/kits/model.d.ts +12 -1
- package/dist/src/typekit/kits/model.d.ts.map +1 -1
- package/dist/src/typekit/kits/model.js +3 -2
- package/dist/src/typekit/kits/model.js.map +1 -1
- package/dist/src/typekit/kits/tuple.js.map +1 -1
- package/dist/src/typekit/kits/type.d.ts +2 -2
- package/dist/src/typekit/kits/type.d.ts.map +1 -1
- package/dist/src/typekit/kits/union.d.ts +12 -1
- package/dist/src/typekit/kits/union.d.ts.map +1 -1
- package/dist/src/typekit/kits/union.js +3 -3
- package/dist/src/typekit/kits/union.js.map +1 -1
- package/dist/src/typekit/kits/value.d.ts +2 -2
- package/dist/src/typekit/kits/value.d.ts.map +1 -1
- package/dist/src/typekit/utils.d.ts.map +1 -1
- package/dist/src/typekit/utils.js +17 -0
- package/dist/src/typekit/utils.js.map +1 -1
- package/dist/src/utils/custom-key-map.d.ts.map +1 -1
- package/dist/src/utils/duplicate-tracker.d.ts.map +1 -1
- package/dist/src/utils/misc.d.ts.map +1 -1
- package/dist/src/utils/misc.js.map +1 -1
- package/dist/src/yaml/diagnostics.js.map +1 -1
- package/dist/typespec.tmLanguage +209 -37
- package/package.json +10 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"realm.d.ts","sourceRoot":"","sources":["../../../src/experimental/realm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGnD;;;;;;;GAOG;AACH,cAAM,iBAAiB,CAAC,CAAC,CAAE,YAAW,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;;
|
|
1
|
+
{"version":3,"file":"realm.d.ts","sourceRoot":"","sources":["../../../src/experimental/realm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGnD;;;;;;;GAOG;AACH,cAAM,iBAAiB,CAAC,CAAC,CAAE,YAAW,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;;IAKhD,YAAmB,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,EAInF;IAED,GAAG,CAAC,CAAC,EAAE,IAAI,WAEV;IAED,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,QAGlB;IAED,GAAG,CAAC,CAAC,EAAE,IAAI,iBAEV;IAED,MAAM,CAAC,CAAC,EAAE,IAAI,WAEb;IAED,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,GAAG,QAM1E;IAED,IAAI,IAAI,WAEP;IAED,KAAK,SAEJ;IAEA,OAAO,IAAI,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAUjC;IAEA,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,CAMxB;IAEA,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,CAMzB;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAEhB;IAED,CAAC,MAAM,CAAC,WAAW,CAAC,SAAc;CASnC;AAED;;;;;;;;GAQG;AACH,qBAAa,KAAK;;IAeT,GAAG,EAAG,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,YAAY,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAGhD;IAID;;;;OAIG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;;;;;;;OAQG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,0BASxB;IAED;;;;;OAKG;IACH,KAAK,CAAC,CAAC,SAAS,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAOhC;IAED;;;;;OAKG;IACH,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAEvB;IAED;;;;;OAKG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAE3B;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAGxB;IAeD,MAAM,CAAC,YAAY,uBAAqE;CACzF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"realm.js","sourceRoot":"","sources":["../../../src/experimental/realm.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"realm.js","sourceRoot":"","sources":["../../../src/experimental/realm.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,MAAM,iBAAiB;IACrB,MAAM,CAAQ;IACd,YAAY,CAAe;IAC3B,WAAW,CAAe;IAE1B,YAAmB,KAAY,EAAE,UAAwB,EAAE,WAAyB;QAClF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,GAAG,CAAC,CAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,CAAO,EAAE,CAAM;QACjB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,CAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,CAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,CAAC,EAAoD,EAAE,OAAa;QACzE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAClC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IACxD,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,CAAC,OAAO;QACN,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC;QACb,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC;QACb,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,CAAC,MAAM;QACL,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,CAAC,IAAI;QACH,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC;QACf,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,UAAU,CAAC;IAElC,OAAO,CAAC,OAAa;QACnB,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,OAAO,KAAK;IAChB,QAAQ,CAAU;IAElB;;OAEG;IACH,MAAM,GAAG,IAAI,GAAG,EAAQ,CAAC;IAEzB;;;OAGG;IACH,aAAa,GAAG,IAAI,OAAO,EAAQ,CAAC;IAEpC,UAAU,GAAG,IAAI,GAAG,EAA0B,CAAC;IACxC,GAAG,CAAU;IAEpB;;;;;OAKG;IACH,YAAY,OAAgB,EAAE,WAAmB;QAC/C,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,SAAS,CAAsB;IAE/B;;;;OAIG;IACH,IAAI,OAAO;QACT,OAAO,CAAC,IAAI,CAAC,SAAS,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;;;;;;;OAQG;IACH,QAAQ,CAAC,QAAgB;QACvB,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEtC,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,IAAI,iBAAiB,CAAM,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAiB,IAAO;QAC3B,cAAc,CAAC,IAAI,EAAE,gCAAgC,CAAC,CAAC;QAEvD,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAEpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,IAAU;QACf,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,IAAU;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,IAAU;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtB,EAAK,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,eAAe,CAAiB,IAAO;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvB,EAAK,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mBAAmB;IACnB,gBAAgB;IAChB,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,EAAe,CAAC,CAAC;CACzF;;AAED;;;;;GAKG;AACH,SAAS,SAAS,CAAI,GAAW,EAAE,IAAa;IAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAE,UAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,UAAkB,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;IACpC,CAAC;IAED,OAAQ,UAAkB,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/formatter/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAI7C,eAAO,MAAM,cAAc,IAAK,CAAC;AAEjC,eAAO,MAAM,SAAS,EAAE,eAAe,EAOtC,CAAC;AAYF,eAAO,MAAM,OAAO
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/formatter/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAI7C,eAAO,MAAM,cAAc,IAAK,CAAC;AAEjC,eAAO,MAAM,SAAS,EAAE,eAAe,EAOtC,CAAC;AAYF,eAAO,MAAM,OAAO;IAClB,QAAQ;CACT,CAAC;AAEF,eAAO,MAAM,QAAQ;IACnB,iBAAiB;CAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/formatter/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI7E,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAcnF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,QAe3C;AAED,qBAAa,mBAAoB,SAAQ,KAAK;aAET,KAAK,EAAE,UAAU;IAD7C,GAAG,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/formatter/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI7E,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAcnF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,QAe3C;AAED,qBAAa,mBAAoB,SAAQ,KAAK;aAET,KAAK,EAAE,UAAU;IAD7C,GAAG,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,YAAmC,KAAK,EAAE,UAAU,EAOnD;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/formatter/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,MAAM,UAAU,KAAK,CAAC,IAAY,EAAE,OAA2B;IAC7D,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnE,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IAC7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAC3C,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,qDAAqD;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAC9C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC,CAC/D,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAU;IAC1C,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAChD,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtB,OAAO,OAAO,CAAC,UAAU,IAAI,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC1D,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;gBAC7B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE;gBAC3B,GAAG;aACJ,CAAC,CAAC;YACH,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAET;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/formatter/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,KAAK,IAAI,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,MAAM,UAAU,KAAK,CAAC,IAAY,EAAE,OAA2B;IAC7D,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnE,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC;IAC7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAC3C,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,qDAAqD;IACrD,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAC9C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC,CAC/D,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAU;IAC1C,aAAa,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAChD,IAAI,OAAO,GAAG,IAAI,CAAC;YACnB,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACtB,OAAO,OAAO,CAAC,UAAU,IAAI,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC1D,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;gBAC7B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE;gBAC3B,GAAG;aACJ,CAAC,CAAC;YACH,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAET,KAAK;IADjC,GAAG,CAAiC;IAC3C,YAAmC,KAAiB;QAClD,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;qBADY,KAAK;QAEtC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,GAAG;YACT,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YACzB,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;SACxB,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -30,6 +30,7 @@ function addEmptyDeclarationComment({ comment }) {
|
|
|
30
30
|
enclosingNode.operations.length === 0 && precedingNode.kind === SyntaxKind.Identifier;
|
|
31
31
|
break;
|
|
32
32
|
case SyntaxKind.ModelStatement:
|
|
33
|
+
case SyntaxKind.ModelDeclarationExpression:
|
|
33
34
|
isEmptyDeclarationBody =
|
|
34
35
|
enclosingNode.properties.length === 0 &&
|
|
35
36
|
(precedingNode === enclosingNode.is ||
|
|
@@ -37,6 +38,7 @@ function addEmptyDeclarationComment({ comment }) {
|
|
|
37
38
|
precedingNode === enclosingNode.extends);
|
|
38
39
|
break;
|
|
39
40
|
case SyntaxKind.ScalarStatement:
|
|
41
|
+
case SyntaxKind.ScalarDeclarationExpression:
|
|
40
42
|
isEmptyDeclarationBody =
|
|
41
43
|
enclosingNode.members.length === 0 &&
|
|
42
44
|
(precedingNode === enclosingNode.id || precedingNode === enclosingNode.extends);
|
|
@@ -46,6 +48,10 @@ function addEmptyDeclarationComment({ comment }) {
|
|
|
46
48
|
enclosingNode.options.length === 0 &&
|
|
47
49
|
(precedingNode === enclosingNode.id || precedingNode === enclosingNode.extends);
|
|
48
50
|
break;
|
|
51
|
+
case SyntaxKind.UnionDeclarationExpression:
|
|
52
|
+
isEmptyDeclarationBody =
|
|
53
|
+
enclosingNode.options.length === 0 && precedingNode === enclosingNode.id;
|
|
54
|
+
break;
|
|
49
55
|
}
|
|
50
56
|
if (isEmptyDeclarationBody) {
|
|
51
57
|
util.addDanglingComment(enclosingNode, comment, undefined);
|
|
@@ -73,14 +79,18 @@ function addCommentBetweenAnnotationsAndNode({ comment }) {
|
|
|
73
79
|
enclosingNode &&
|
|
74
80
|
(enclosingNode.kind === SyntaxKind.NamespaceStatement ||
|
|
75
81
|
enclosingNode.kind === SyntaxKind.ModelStatement ||
|
|
82
|
+
enclosingNode.kind === SyntaxKind.ModelDeclarationExpression ||
|
|
76
83
|
enclosingNode.kind === SyntaxKind.EnumStatement ||
|
|
84
|
+
enclosingNode.kind === SyntaxKind.EnumDeclarationExpression ||
|
|
77
85
|
enclosingNode.kind === SyntaxKind.OperationStatement ||
|
|
78
86
|
enclosingNode.kind === SyntaxKind.ScalarStatement ||
|
|
87
|
+
enclosingNode.kind === SyntaxKind.ScalarDeclarationExpression ||
|
|
79
88
|
enclosingNode.kind === SyntaxKind.InterfaceStatement ||
|
|
80
89
|
enclosingNode.kind === SyntaxKind.ModelProperty ||
|
|
81
90
|
enclosingNode.kind === SyntaxKind.EnumMember ||
|
|
82
91
|
enclosingNode.kind === SyntaxKind.UnionVariant ||
|
|
83
|
-
enclosingNode.kind === SyntaxKind.UnionStatement
|
|
92
|
+
enclosingNode.kind === SyntaxKind.UnionStatement ||
|
|
93
|
+
enclosingNode.kind === SyntaxKind.UnionDeclarationExpression)) {
|
|
84
94
|
util.addTrailingComment(precedingNode, comment);
|
|
85
95
|
return true;
|
|
86
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment-handler.js","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,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,CAAC,0BAA0B,EAAE,mCAAmC,EAAE,kBAAkB,CAAC,CAAC,IAAI,CACxF,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,GAAyB,EAAE,aAAa,EAAE,CAAC,CACpF;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;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;;;;;;;;;GASG;AACH,SAAS,0BAA0B,CAAC,EAAE,OAAO,EAAkB;IAC7D,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,sBAAsB,GAAG,KAAK,CAAC;IACnC,QAAQ,aAAa,CAAC,IAAI,EAAE,CAAC;QAC3B,KAAK,UAAU,CAAC,kBAAkB;YAChC,sBAAsB;gBACpB,aAAa,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,UAAU,CAAC;YACxF,MAAM;QACR,KAAK,UAAU,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"comment-handler.js","sourceRoot":"","sources":["../../../../src/formatter/print/comment-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AstPath, Doc, Printer } from "prettier";
|
|
2
2
|
import { builders } from "prettier/doc";
|
|
3
|
-
import type { AliasStatementNode, ArrayExpressionNode, ArrayLiteralNode, AugmentDecoratorStatementNode, CallExpressionNode, Comment, ConstStatementNode, DeclarationNode, DecoratorExpressionNode, DirectiveExpressionNode, EnumMemberNode, EnumStatementNode, 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";
|
|
3
|
+
import type { AliasStatementNode, ArrayExpressionNode, ArrayLiteralNode, AugmentDecoratorStatementNode, CallExpressionNode, Comment, ConstStatementNode, DeclarationNode, DecoratorExpressionNode, DirectiveExpressionNode, EnumMemberNode, EnumStatementNode, InterfaceStatementNode, IntersectionExpressionNode, MemberExpressionNode, ModelExpressionNode, ModelPropertyNode, ModelStatementNode, Node, ObjectLiteralNode, ObjectLiteralPropertyNode, ObjectLiteralSpreadPropertyNode, OperationSignatureDeclarationNode, OperationSignatureReferenceNode, OperationStatementNode, OptionallyNamedDeclarationNode, StringTemplateExpressionNode, TemplateArgumentNode, TupleExpressionNode, TypeOfExpressionNode, TypeReferenceNode, TypeSpecScriptNode, UnionExpressionNode, UnionStatementNode, UnionVariantNode, ValueOfExpressionNode } from "../../core/types.js";
|
|
4
4
|
import type { FlattenedNamespaceStatementNode } from "../types.js";
|
|
5
5
|
import type { DecorableNode, PrettierChildPrint, TypeSpecPrettierOptions } from "./types.js";
|
|
6
6
|
export declare const typespecPrinter: Printer<Node>;
|
|
@@ -45,7 +45,7 @@ export declare function printArray(path: AstPath<ArrayExpressionNode>, options:
|
|
|
45
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
47
|
export declare function printModelExpression(path: AstPath<ModelExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): builders.Group;
|
|
48
|
-
export declare function printObjectLiteral(path: AstPath<ObjectLiteralNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint):
|
|
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;
|
|
@@ -61,6 +61,6 @@ export declare function printTypeReference(path: AstPath<TypeReferenceNode>, opt
|
|
|
61
61
|
export declare function printTemplateArgument(path: AstPath<TemplateArgumentNode>, _options: TypeSpecPrettierOptions, print: PrettierChildPrint): Doc;
|
|
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
|
-
export declare function printModifiers(path: AstPath<DeclarationNode & Node>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): Doc;
|
|
65
|
-
export declare function printStringTemplateExpression(path: AstPath<StringTemplateExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): (string | builders.
|
|
64
|
+
export declare function printModifiers(path: AstPath<(DeclarationNode | OptionallyNamedDeclarationNode) & Node>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): Doc;
|
|
65
|
+
export declare function printStringTemplateExpression(path: AstPath<StringTemplateExpressionNode>, options: TypeSpecPrettierOptions, print: PrettierChildPrint): (string | builders.Doc[][])[] | (string | builders.Indent)[];
|
|
66
66
|
//# sourceMappingURL=printer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/printer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMxC,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,6BAA6B,EAG7B,kBAAkB,EAClB,OAAO,EACP,kBAAkB,EAClB,eAAe,EAEf,uBAAuB,EACvB,uBAAuB,EAEvB,cAAc,EAEd,iBAAiB,EAKjB,sBAAsB,EACtB,0BAA0B,EAE1B,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EAEjB,kBAAkB,EAClB,IAAI,EAEJ,iBAAiB,EACjB,yBAAyB,EACzB,+BAA+B,EAC/B,iCAAiC,EACjC,+BAA+B,EAC/B,sBAAsB,
|
|
1
|
+
{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/formatter/print/printer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { NodeFlags, SyntaxKind } from "../../core/types.js";
|
|
|
5
5
|
import { commentHandler } from "./comment-handler.js";
|
|
6
6
|
import { needsParens } from "./needs-parens.js";
|
|
7
7
|
import { util } from "./util.js";
|
|
8
|
-
const { align, breakParent, group, hardline, ifBreak, indent, join, line, softline, literalline, markAsRoot, } = builders;
|
|
8
|
+
const { align, breakParent, conditionalGroup, group, hardline, ifBreak, indent, join, line, softline, literalline, markAsRoot, } = builders;
|
|
9
9
|
const { isNextLineEmpty } = util;
|
|
10
10
|
/**
|
|
11
11
|
* If the decorators for that node should try to be kept inline.
|
|
@@ -26,6 +26,11 @@ export function printTypeSpec(
|
|
|
26
26
|
// Path to the AST node to print
|
|
27
27
|
path, options, print) {
|
|
28
28
|
const node = path.node;
|
|
29
|
+
if (isDeclarationExpressionNode(node)) {
|
|
30
|
+
// Declaration expressions own the layout of their doc comments and decorators so
|
|
31
|
+
// they can break (and indent) together with the declaration when too wide.
|
|
32
|
+
return printDeclarationExpression(path, options, print);
|
|
33
|
+
}
|
|
29
34
|
const docs = printDocComments(path, options, print);
|
|
30
35
|
const directives = shouldPrintDirective(node) ? printDirectives(path, options, print) : "";
|
|
31
36
|
const printedNode = printNode(path, options, print);
|
|
@@ -39,6 +44,50 @@ path, options, print) {
|
|
|
39
44
|
}
|
|
40
45
|
return parts;
|
|
41
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Print a declaration expression (`model`/`enum`/`union`/`scalar` used in expression
|
|
49
|
+
* position) together with its doc comments and decorators.
|
|
50
|
+
*
|
|
51
|
+
* When everything fits on the line the doc comments and decorators are kept inline
|
|
52
|
+
* (e.g. `@a @b enum { ... }`). When it does not fit, each doc comment and decorator is
|
|
53
|
+
* placed on its own line and the whole block is indented one level relative to the
|
|
54
|
+
* surrounding expression.
|
|
55
|
+
*
|
|
56
|
+
* The declaration body always breaks (it contains hardlines), so a plain `group` would
|
|
57
|
+
* always break. A `conditionalGroup` is used instead so the break decision is based on
|
|
58
|
+
* the width of the first line only.
|
|
59
|
+
*/
|
|
60
|
+
function printDeclarationExpression(path, options, print) {
|
|
61
|
+
const node = path.node;
|
|
62
|
+
const bare = printNode(path, options, print);
|
|
63
|
+
const docs = node.docs?.length ? path.map((x) => print(x), "docs") : [];
|
|
64
|
+
const decorators = node.decorators?.length
|
|
65
|
+
? path.map((x) => print(x), "decorators")
|
|
66
|
+
: [];
|
|
67
|
+
const prefix = [...docs, ...decorators];
|
|
68
|
+
// No doc comments or decorators: nothing to lay out, print the bare declaration.
|
|
69
|
+
if (prefix.length === 0) {
|
|
70
|
+
return bare;
|
|
71
|
+
}
|
|
72
|
+
const inline = join(" ", [...prefix, bare]);
|
|
73
|
+
// In argument position (e.g. a decorator argument) the enclosing parentheses already
|
|
74
|
+
// provide the line break and indentation, so the block must not add its own.
|
|
75
|
+
const broken = isInArgumentPosition(path)
|
|
76
|
+
? join(hardline, [...prefix, bare])
|
|
77
|
+
: indent([hardline, join(hardline, [...prefix, bare])]);
|
|
78
|
+
return conditionalGroup([inline, broken]);
|
|
79
|
+
}
|
|
80
|
+
function isInArgumentPosition(path) {
|
|
81
|
+
const parent = path.getParentNode();
|
|
82
|
+
switch (parent?.kind) {
|
|
83
|
+
case SyntaxKind.DecoratorExpression:
|
|
84
|
+
case SyntaxKind.AugmentDecoratorStatement:
|
|
85
|
+
case SyntaxKind.CallExpression:
|
|
86
|
+
return true;
|
|
87
|
+
default:
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
42
91
|
function shouldPrintDirective(node) {
|
|
43
92
|
// Model property handle printing directive itself.
|
|
44
93
|
return node.kind !== SyntaxKind.ModelProperty;
|
|
@@ -66,16 +115,24 @@ path, options, print) {
|
|
|
66
115
|
return printNamespaceStatement(path, options, print);
|
|
67
116
|
case SyntaxKind.ModelStatement:
|
|
68
117
|
return printModelStatement(path, options, print);
|
|
118
|
+
case SyntaxKind.ModelDeclarationExpression:
|
|
119
|
+
return printModelStatement(path, options, print);
|
|
69
120
|
case SyntaxKind.ScalarStatement:
|
|
70
121
|
return printScalarStatement(path, options, print);
|
|
122
|
+
case SyntaxKind.ScalarDeclarationExpression:
|
|
123
|
+
return printScalarStatement(path, options, print);
|
|
71
124
|
case SyntaxKind.ScalarConstructor:
|
|
72
125
|
return printScalarConstructor(path, options, print);
|
|
73
126
|
case SyntaxKind.AliasStatement:
|
|
74
127
|
return printAliasStatement(path, options, print);
|
|
75
128
|
case SyntaxKind.EnumStatement:
|
|
76
129
|
return printEnumStatement(path, options, print);
|
|
130
|
+
case SyntaxKind.EnumDeclarationExpression:
|
|
131
|
+
return printEnumStatement(path, options, print);
|
|
77
132
|
case SyntaxKind.UnionStatement:
|
|
78
133
|
return printUnionStatement(path, options, print);
|
|
134
|
+
case SyntaxKind.UnionDeclarationExpression:
|
|
135
|
+
return printUnionStatement(path, options, print);
|
|
79
136
|
case SyntaxKind.InterfaceStatement:
|
|
80
137
|
return printInterfaceStatement(path, options, print);
|
|
81
138
|
// Others.
|
|
@@ -421,6 +478,17 @@ export function printDocComments(path, options, print) {
|
|
|
421
478
|
const docs = path.map((x) => [print(x), line], "docs");
|
|
422
479
|
return group([...docs, breakParent]);
|
|
423
480
|
}
|
|
481
|
+
function isDeclarationExpressionNode(node) {
|
|
482
|
+
switch (node.kind) {
|
|
483
|
+
case SyntaxKind.ModelDeclarationExpression:
|
|
484
|
+
case SyntaxKind.EnumDeclarationExpression:
|
|
485
|
+
case SyntaxKind.UnionDeclarationExpression:
|
|
486
|
+
case SyntaxKind.ScalarDeclarationExpression:
|
|
487
|
+
return true;
|
|
488
|
+
default:
|
|
489
|
+
return false;
|
|
490
|
+
}
|
|
491
|
+
}
|
|
424
492
|
export function printDirectives(path, options, print) {
|
|
425
493
|
const node = path.node;
|
|
426
494
|
if (node.directives === undefined || node.directives.length === 0) {
|
|
@@ -476,12 +544,15 @@ export function printDirectiveArgs(path, options, print) {
|
|
|
476
544
|
return join(" ", path.map((arg) => [print(arg)], "arguments"));
|
|
477
545
|
}
|
|
478
546
|
export function printEnumStatement(path, options, print) {
|
|
479
|
-
const
|
|
480
|
-
const
|
|
547
|
+
const inExpressionPosition = isDeclarationExpressionNode(path.node);
|
|
548
|
+
const decorators = inExpressionPosition
|
|
549
|
+
? ""
|
|
550
|
+
: printDecorators(path, options, print, { tryInline: false }).decorators;
|
|
551
|
+
const id = path.node.id ? [" ", path.call(print, "id")] : "";
|
|
481
552
|
return [
|
|
482
553
|
decorators,
|
|
483
554
|
printModifiers(path, options, print),
|
|
484
|
-
"enum
|
|
555
|
+
"enum",
|
|
485
556
|
id,
|
|
486
557
|
" ",
|
|
487
558
|
printEnumBlock(path, options, print),
|
|
@@ -508,14 +579,17 @@ function printEnumSpreadMember(path, options, print) {
|
|
|
508
579
|
return ["...", path.call(print, "target")];
|
|
509
580
|
}
|
|
510
581
|
export function printUnionStatement(path, options, print) {
|
|
511
|
-
const
|
|
512
|
-
const
|
|
582
|
+
const inExpressionPosition = isDeclarationExpressionNode(path.node);
|
|
583
|
+
const id = path.node.id ? [" ", path.call(print, "id")] : "";
|
|
584
|
+
const decorators = inExpressionPosition
|
|
585
|
+
? ""
|
|
586
|
+
: printDecorators(path, options, print, { tryInline: false }).decorators;
|
|
513
587
|
const generic = printTemplateParameterDeclarations(path, options, print, "templateParameters");
|
|
514
588
|
const heritage = printHeritageClause(path, print, "extends", "extends");
|
|
515
589
|
return [
|
|
516
590
|
decorators,
|
|
517
591
|
printModifiers(path, options, print),
|
|
518
|
-
"union
|
|
592
|
+
"union",
|
|
519
593
|
id,
|
|
520
594
|
generic,
|
|
521
595
|
heritage,
|
|
@@ -738,17 +812,25 @@ function isMultiArgTemplateReference(node) {
|
|
|
738
812
|
}
|
|
739
813
|
export function printModelStatement(path, options, print) {
|
|
740
814
|
const node = path.node;
|
|
741
|
-
const id = path.call(print, "id");
|
|
815
|
+
const id = node.id ? [" ", path.call(print, "id")] : "";
|
|
742
816
|
const heritage = printHeritageClause(path, print, "extends", "extends");
|
|
743
817
|
const isBase = printHeritageClause(path, print, "is", "is");
|
|
744
818
|
const generic = printTemplateParameterDeclarations(path, options, print, "templateParameters");
|
|
745
819
|
const nodeHasComments = hasComments(node, CommentCheckFlags.Dangling);
|
|
746
820
|
const shouldPrintBody = nodeHasComments || !(node.properties.length === 0 && node.is);
|
|
747
|
-
const
|
|
821
|
+
const inExpressionPosition = isDeclarationExpressionNode(node);
|
|
822
|
+
const body = shouldPrintBody
|
|
823
|
+
? [" ", printModelPropertiesBlock(path, options, print)]
|
|
824
|
+
: inExpressionPosition
|
|
825
|
+
? ""
|
|
826
|
+
: ";";
|
|
827
|
+
const decorators = inExpressionPosition
|
|
828
|
+
? ""
|
|
829
|
+
: printDecorators(path, options, print, { tryInline: false }).decorators;
|
|
748
830
|
return [
|
|
749
|
-
|
|
831
|
+
decorators,
|
|
750
832
|
printModifiers(path, options, print),
|
|
751
|
-
"model
|
|
833
|
+
"model",
|
|
752
834
|
id,
|
|
753
835
|
generic,
|
|
754
836
|
heritage,
|
|
@@ -838,6 +920,7 @@ function isModelAValue(path) {
|
|
|
838
920
|
do {
|
|
839
921
|
switch (node.kind) {
|
|
840
922
|
case SyntaxKind.ModelStatement:
|
|
923
|
+
case SyntaxKind.ModelDeclarationExpression:
|
|
841
924
|
case SyntaxKind.AliasStatement:
|
|
842
925
|
case SyntaxKind.OperationStatement:
|
|
843
926
|
return false;
|
|
@@ -876,16 +959,24 @@ function isModelExpressionInBlock(path) {
|
|
|
876
959
|
}
|
|
877
960
|
function printScalarStatement(path, options, print) {
|
|
878
961
|
const node = path.node;
|
|
879
|
-
const id = path.call(print, "id");
|
|
962
|
+
const id = node.id ? [" ", path.call(print, "id")] : "";
|
|
880
963
|
const template = printTemplateParameterDeclarations(path, options, print, "templateParameters");
|
|
881
964
|
const heritage = printHeritageClause(path, print, "extends", "extends");
|
|
882
965
|
const nodeHasComments = hasComments(node, CommentCheckFlags.Dangling);
|
|
883
966
|
const shouldPrintBody = nodeHasComments || !(node.members.length === 0);
|
|
884
|
-
const
|
|
967
|
+
const inExpressionPosition = isDeclarationExpressionNode(node);
|
|
968
|
+
const members = shouldPrintBody
|
|
969
|
+
? [" ", printScalarBody(path, options, print)]
|
|
970
|
+
: inExpressionPosition
|
|
971
|
+
? ""
|
|
972
|
+
: ";";
|
|
973
|
+
const decorators = inExpressionPosition
|
|
974
|
+
? ""
|
|
975
|
+
: printDecorators(path, options, print, { tryInline: false }).decorators;
|
|
885
976
|
return [
|
|
886
|
-
|
|
977
|
+
decorators,
|
|
887
978
|
printModifiers(path, options, print),
|
|
888
|
-
"scalar
|
|
979
|
+
"scalar",
|
|
889
980
|
id,
|
|
890
981
|
template,
|
|
891
982
|
heritage,
|