@typespec/compiler 0.66.0-dev.2 → 0.66.0-dev.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (172) hide show
  1. package/dist/generated-defs/TypeSpec.d.ts +61 -6
  2. package/dist/generated-defs/TypeSpec.d.ts.map +1 -1
  3. package/dist/manifest.js +2 -2
  4. package/dist/src/core/checker.d.ts +1 -1
  5. package/dist/src/core/checker.d.ts.map +1 -1
  6. package/dist/src/core/checker.js +124 -50
  7. package/dist/src/core/checker.js.map +1 -1
  8. package/dist/src/core/cli/actions/compile/compile.d.ts.map +1 -1
  9. package/dist/src/core/cli/actions/compile/compile.js +3 -0
  10. package/dist/src/core/cli/actions/compile/compile.js.map +1 -1
  11. package/dist/src/core/cli/actions/info.js +2 -2
  12. package/dist/src/core/cli/actions/info.js.map +1 -1
  13. package/dist/src/core/cli/cli.js +2 -3
  14. package/dist/src/core/cli/cli.js.map +1 -1
  15. package/dist/src/core/compiler-code-fixes/remove-unused-code.codefix.d.ts +6 -0
  16. package/dist/src/core/compiler-code-fixes/remove-unused-code.codefix.d.ts.map +1 -0
  17. package/dist/src/core/compiler-code-fixes/remove-unused-code.codefix.js +15 -0
  18. package/dist/src/core/compiler-code-fixes/remove-unused-code.codefix.js.map +1 -0
  19. package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.d.ts +6 -0
  20. package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.d.ts.map +1 -0
  21. package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.js +45 -0
  22. package/dist/src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.js.map +1 -0
  23. package/dist/src/core/decorator-utils.d.ts.map +1 -1
  24. package/dist/src/core/decorator-utils.js +6 -0
  25. package/dist/src/core/decorator-utils.js.map +1 -1
  26. package/dist/src/core/helpers/discriminator-utils.d.ts +16 -2
  27. package/dist/src/core/helpers/discriminator-utils.d.ts.map +1 -1
  28. package/dist/src/core/helpers/discriminator-utils.js +80 -10
  29. package/dist/src/core/helpers/discriminator-utils.js.map +1 -1
  30. package/dist/src/core/helpers/index.d.ts +1 -1
  31. package/dist/src/core/helpers/index.d.ts.map +1 -1
  32. package/dist/src/core/helpers/index.js +1 -1
  33. package/dist/src/core/helpers/index.js.map +1 -1
  34. package/dist/src/core/install.d.ts +1 -1
  35. package/dist/src/core/install.d.ts.map +1 -1
  36. package/dist/src/core/install.js +22 -6
  37. package/dist/src/core/install.js.map +1 -1
  38. package/dist/src/core/intrinsic-type-state.d.ts +2 -0
  39. package/dist/src/core/intrinsic-type-state.d.ts.map +1 -1
  40. package/dist/src/core/intrinsic-type-state.js +2 -0
  41. package/dist/src/core/intrinsic-type-state.js.map +1 -1
  42. package/dist/src/core/linter-rules/unused-template-parameter.rule.d.ts +2 -0
  43. package/dist/src/core/linter-rules/unused-template-parameter.rule.d.ts.map +1 -0
  44. package/dist/src/core/linter-rules/unused-template-parameter.rule.js +36 -0
  45. package/dist/src/core/linter-rules/unused-template-parameter.rule.js.map +1 -0
  46. package/dist/src/core/linter-rules/unused-using.rule.d.ts +2 -0
  47. package/dist/src/core/linter-rules/unused-using.rule.d.ts.map +1 -0
  48. package/dist/src/core/linter-rules/unused-using.rule.js +38 -0
  49. package/dist/src/core/linter-rules/unused-using.rule.js.map +1 -0
  50. package/dist/src/core/linter.d.ts +10 -2
  51. package/dist/src/core/linter.d.ts.map +1 -1
  52. package/dist/src/core/linter.js +18 -2
  53. package/dist/src/core/linter.js.map +1 -1
  54. package/dist/src/core/messages.d.ts +30 -5
  55. package/dist/src/core/messages.d.ts.map +1 -1
  56. package/dist/src/core/messages.js +6 -1
  57. package/dist/src/core/messages.js.map +1 -1
  58. package/dist/src/core/name-resolver.d.ts +3 -1
  59. package/dist/src/core/name-resolver.d.ts.map +1 -1
  60. package/dist/src/core/name-resolver.js +40 -1
  61. package/dist/src/core/name-resolver.js.map +1 -1
  62. package/dist/src/core/program.d.ts.map +1 -1
  63. package/dist/src/core/program.js +4 -3
  64. package/dist/src/core/program.js.map +1 -1
  65. package/dist/src/experimental/typekit/define-kit.d.ts +1 -0
  66. package/dist/src/experimental/typekit/define-kit.d.ts.map +1 -1
  67. package/dist/src/experimental/typekit/define-kit.js +14 -1
  68. package/dist/src/experimental/typekit/define-kit.js.map +1 -1
  69. package/dist/src/experimental/typekit/index.d.ts.map +1 -1
  70. package/dist/src/experimental/typekit/index.js +9 -3
  71. package/dist/src/experimental/typekit/index.js.map +1 -1
  72. package/dist/src/experimental/typekit/kits/array.d.ts +28 -0
  73. package/dist/src/experimental/typekit/kits/array.d.ts.map +1 -0
  74. package/dist/src/experimental/typekit/kits/array.js +26 -0
  75. package/dist/src/experimental/typekit/kits/array.js.map +1 -0
  76. package/dist/src/experimental/typekit/kits/builtin.d.ts +117 -0
  77. package/dist/src/experimental/typekit/kits/builtin.d.ts.map +1 -0
  78. package/dist/src/experimental/typekit/kits/builtin.js +81 -0
  79. package/dist/src/experimental/typekit/kits/builtin.js.map +1 -0
  80. package/dist/src/experimental/typekit/kits/enum-member.d.ts +52 -0
  81. package/dist/src/experimental/typekit/kits/enum-member.d.ts.map +1 -0
  82. package/dist/src/experimental/typekit/kits/enum-member.js +22 -0
  83. package/dist/src/experimental/typekit/kits/enum-member.js.map +1 -0
  84. package/dist/src/experimental/typekit/kits/enum.d.ts +54 -0
  85. package/dist/src/experimental/typekit/kits/enum.d.ts.map +1 -0
  86. package/dist/src/experimental/typekit/kits/enum.js +47 -0
  87. package/dist/src/experimental/typekit/kits/enum.js.map +1 -0
  88. package/dist/src/experimental/typekit/kits/index.d.ts +7 -0
  89. package/dist/src/experimental/typekit/kits/index.d.ts.map +1 -1
  90. package/dist/src/experimental/typekit/kits/index.js +7 -0
  91. package/dist/src/experimental/typekit/kits/index.js.map +1 -1
  92. package/dist/src/experimental/typekit/kits/model-property.d.ts +29 -1
  93. package/dist/src/experimental/typekit/kits/model-property.d.ts.map +1 -1
  94. package/dist/src/experimental/typekit/kits/model-property.js +11 -0
  95. package/dist/src/experimental/typekit/kits/model-property.js.map +1 -1
  96. package/dist/src/experimental/typekit/kits/model.d.ts +29 -4
  97. package/dist/src/experimental/typekit/kits/model.d.ts.map +1 -1
  98. package/dist/src/experimental/typekit/kits/model.js +49 -2
  99. package/dist/src/experimental/typekit/kits/model.js.map +1 -1
  100. package/dist/src/experimental/typekit/kits/operation.d.ts +49 -0
  101. package/dist/src/experimental/typekit/kits/operation.d.ts.map +1 -0
  102. package/dist/src/experimental/typekit/kits/operation.js +28 -0
  103. package/dist/src/experimental/typekit/kits/operation.js.map +1 -0
  104. package/dist/src/experimental/typekit/kits/record.d.ts +33 -0
  105. package/dist/src/experimental/typekit/kits/record.d.ts.map +1 -0
  106. package/dist/src/experimental/typekit/kits/record.js +26 -0
  107. package/dist/src/experimental/typekit/kits/record.js.map +1 -0
  108. package/dist/src/experimental/typekit/kits/type.d.ts +94 -1
  109. package/dist/src/experimental/typekit/kits/type.d.ts.map +1 -1
  110. package/dist/src/experimental/typekit/kits/type.js +59 -0
  111. package/dist/src/experimental/typekit/kits/type.js.map +1 -1
  112. package/dist/src/experimental/typekit/kits/union-variant.d.ts +5 -1
  113. package/dist/src/experimental/typekit/kits/union-variant.d.ts.map +1 -1
  114. package/dist/src/experimental/typekit/kits/union-variant.js.map +1 -1
  115. package/dist/src/experimental/typekit/kits/union.d.ts +15 -1
  116. package/dist/src/experimental/typekit/kits/union.d.ts.map +1 -1
  117. package/dist/src/experimental/typekit/kits/union.js +7 -0
  118. package/dist/src/experimental/typekit/kits/union.js.map +1 -1
  119. package/dist/src/experimental/typekit/kits/value.d.ts +84 -0
  120. package/dist/src/experimental/typekit/kits/value.d.ts.map +1 -0
  121. package/dist/src/experimental/typekit/kits/value.js +81 -0
  122. package/dist/src/experimental/typekit/kits/value.js.map +1 -0
  123. package/dist/src/experimental/typekit/utils/get-plausible-name.d.ts +7 -0
  124. package/dist/src/experimental/typekit/utils/get-plausible-name.d.ts.map +1 -0
  125. package/dist/src/experimental/typekit/utils/get-plausible-name.js +17 -0
  126. package/dist/src/experimental/typekit/utils/get-plausible-name.js.map +1 -0
  127. package/dist/src/experimental/typekit/utils/index.d.ts +2 -0
  128. package/dist/src/experimental/typekit/utils/index.d.ts.map +1 -0
  129. package/dist/src/experimental/typekit/utils/index.js +2 -0
  130. package/dist/src/experimental/typekit/utils/index.js.map +1 -0
  131. package/dist/src/init/file-templating.d.ts +2 -0
  132. package/dist/src/init/file-templating.d.ts.map +1 -1
  133. package/dist/src/init/file-templating.js +3 -0
  134. package/dist/src/init/file-templating.js.map +1 -1
  135. package/dist/src/init/init-template.d.ts +2 -0
  136. package/dist/src/init/init-template.d.ts.map +1 -1
  137. package/dist/src/init/init-template.js +1 -0
  138. package/dist/src/init/init-template.js.map +1 -1
  139. package/dist/src/init/init.d.ts +5 -2
  140. package/dist/src/init/init.d.ts.map +1 -1
  141. package/dist/src/init/init.js +158 -89
  142. package/dist/src/init/init.js.map +1 -1
  143. package/dist/src/init/prompts.d.ts +5 -0
  144. package/dist/src/init/prompts.d.ts.map +1 -0
  145. package/dist/src/init/prompts.js +16 -0
  146. package/dist/src/init/prompts.js.map +1 -0
  147. package/dist/src/init/scaffold.d.ts +1 -5
  148. package/dist/src/init/scaffold.d.ts.map +1 -1
  149. package/dist/src/init/scaffold.js +7 -10
  150. package/dist/src/init/scaffold.js.map +1 -1
  151. package/dist/src/lib/decorators.d.ts +3 -2
  152. package/dist/src/lib/decorators.d.ts.map +1 -1
  153. package/dist/src/lib/decorators.js +15 -3
  154. package/dist/src/lib/decorators.js.map +1 -1
  155. package/dist/src/lib/tsp-index.d.ts.map +1 -1
  156. package/dist/src/lib/tsp-index.js +2 -1
  157. package/dist/src/lib/tsp-index.js.map +1 -1
  158. package/dist/src/server/compile-service.d.ts.map +1 -1
  159. package/dist/src/server/compile-service.js +23 -4
  160. package/dist/src/server/compile-service.js.map +1 -1
  161. package/dist/src/server/serverlib.d.ts.map +1 -1
  162. package/dist/src/server/serverlib.js +51 -18
  163. package/dist/src/server/serverlib.js.map +1 -1
  164. package/dist/src/server/tmlanguage.js +1 -1
  165. package/dist/src/server/tmlanguage.js.map +1 -1
  166. package/dist/src/server/types.d.ts +2 -1
  167. package/dist/src/server/types.d.ts.map +1 -1
  168. package/dist/src/server/types.js.map +1 -1
  169. package/dist/typespec.tmLanguage +3 -3
  170. package/lib/std/decorators.tsp +75 -6
  171. package/package.json +4 -3
  172. package/templates/scaffolding.json +20 -22
@@ -1 +1 @@
1
- {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMjD,OAAO,EAAE,cAAc,EAAsB,MAAM,WAAW,CAAC;AAG/D,wBAAsB,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,iBAiB9E"}
1
+ {"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAMjD,OAAO,EAAE,cAAc,EAAsB,MAAM,WAAW,CAAC;AAG/D,wBAAsB,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,iBAoB9E"}
@@ -1,3 +1,4 @@
1
+ import { typespecVersion } from "../../../../utils/misc.js";
1
2
  import { logDiagnostics } from "../../../diagnostics.js";
2
3
  import { resolveTypeSpecEntrypoint } from "../../../entrypoint-resolution.js";
3
4
  import { resolvePath } from "../../../path-utils.js";
@@ -6,6 +7,8 @@ import { handleInternalCompilerError, logDiagnosticCount, logInternalCompilerErr
6
7
  import { getCompilerOptions } from "./args.js";
7
8
  import { createWatchHost, createWatcher } from "./watch.js";
8
9
  export async function compileAction(host, args) {
10
+ // eslint-disable-next-line no-console
11
+ console.log(`TypeSpec compiler v${typespecVersion}\n`);
9
12
  const diagnostics = [];
10
13
  const entrypoint = await resolveTypeSpecEntrypoint(host, resolvePath(process.cwd(), args.path), (diag) => diagnostics.push(diag));
11
14
  if (entrypoint === undefined || diagnostics.length > 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../../../../src/core/cli/actions/compile/compile.ts"],"names":[],"mappings":"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"}
@@ -9,8 +9,8 @@ export async function printInfoAction(host) {
9
9
  const cwd = process.cwd();
10
10
  console.log(`Module: ${fileURLToPath(import.meta.url)}`);
11
11
  const config = await loadTypeSpecConfigForPath(host, cwd, true, true);
12
- const { diagnostics, filename, ...restOfConfig } = config;
13
- console.log(`User Config: ${config.filename ?? "No config file found"}`);
12
+ const { diagnostics, filename, file, ...restOfConfig } = config;
13
+ console.log(`User Config: ${filename ?? "No config file found"}`);
14
14
  console.log("-----------");
15
15
  console.log(stringify(restOfConfig));
16
16
  console.log("-----------");
@@ -1 +1 @@
1
- {"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/info.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAkB;IACtD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACtE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,GAAG,MAAM,CAAC;IAE1D,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,CAAC,QAAQ,IAAI,sBAAsB,EAAE,CAAC,CAAC;IACzE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,WAAW,CAAC;AAC5B,CAAC"}
1
+ {"version":3,"file":"info.js","sourceRoot":"","sources":["../../../../../src/core/cli/actions/info.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAE7E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAkB;IACtD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACtE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,GAAG,MAAM,CAAC;IAEhE,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,IAAI,sBAAsB,EAAE,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,WAAW,CAAC;AAC5B,CAAC"}
@@ -8,6 +8,7 @@ catch {
8
8
  }
9
9
  import yargs from "yargs";
10
10
  import { typespecVersion } from "../../utils/misc.js";
11
+ import { getTypeSpecEngine } from "../engine.js";
11
12
  import { installTypeSpecDependencies } from "../install.js";
12
13
  import { compileAction } from "./actions/compile/compile.js";
13
14
  import { formatAction } from "./actions/format.js";
@@ -17,8 +18,6 @@ import { installVSExtension, uninstallVSExtension } from "./actions/vs.js";
17
18
  import { installVSCodeExtension, uninstallVSCodeExtension, } from "./actions/vscode.js";
18
19
  import { handleInternalCompilerError, withCliHost, withCliHostAndDiagnostics, } from "./utils.js";
19
20
  async function main() {
20
- // eslint-disable-next-line no-console
21
- console.log(`TypeSpec compiler v${typespecVersion}\n`);
22
21
  await yargs(process.argv.slice(2))
23
22
  .scriptName("tsp")
24
23
  .help()
@@ -156,7 +155,7 @@ async function main() {
156
155
  }), withCliHostAndDiagnostics((host, args) => initAction(host, args)))
157
156
  .command("install", "Install TypeSpec dependencies", () => { }, withCliHost((host) => installTypeSpecDependencies(host, process.cwd())))
158
157
  .command("info", "Show information about the current TypeSpec compiler.", () => { }, withCliHostAndDiagnostics((host) => printInfoAction(host)))
159
- .version(typespecVersion)
158
+ .version(getTypeSpecEngine() === "tsp" ? `${typespecVersion} standalone` : typespecVersion)
160
159
  .demandCommand(1, "You must use one of the supported commands.").argv;
161
160
  }
162
161
  process.on("unhandledRejection", (error) => {
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/core/cli/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../src/core/cli/cli.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ import { type ImportStatementNode, type UsingStatementNode } from "../types.js";
2
+ /**
3
+ * Quick fix that remove unused code.
4
+ */
5
+ export declare function removeUnusedCodeCodeFix(node: ImportStatementNode | UsingStatementNode): import("../types.js").CodeFix;
6
+ //# sourceMappingURL=remove-unused-code.codefix.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"remove-unused-code.codefix.d.ts","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/remove-unused-code.codefix.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEhF;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,GAAG,kBAAkB,iCASrF"}
@@ -0,0 +1,15 @@
1
+ import { defineCodeFix, getSourceLocation } from "../diagnostics.js";
2
+ /**
3
+ * Quick fix that remove unused code.
4
+ */
5
+ export function removeUnusedCodeCodeFix(node) {
6
+ return defineCodeFix({
7
+ id: "remove-unused-code",
8
+ label: `Remove unused code`,
9
+ fix: (context) => {
10
+ const location = getSourceLocation(node);
11
+ return context.replaceText(location, "");
12
+ },
13
+ });
14
+ }
15
+ //# sourceMappingURL=remove-unused-code.codefix.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"remove-unused-code.codefix.js","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/remove-unused-code.codefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAA8C;IACpF,OAAO,aAAa,CAAC;QACnB,EAAE,EAAE,oBAAoB;QACxB,KAAK,EAAE,oBAAoB;QAC3B,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;YACf,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,6 @@
1
+ import { TemplateParameterDeclarationNode } from "../types.js";
2
+ /**
3
+ * Quick fix that remove unused template parameter.
4
+ */
5
+ export declare function removeUnusedTemplateParameterCodeFix(node: TemplateParameterDeclarationNode): import("../types.js").CodeFix;
6
+ //# sourceMappingURL=remove-unused-template-parameter.codefix.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"remove-unused-template-parameter.codefix.d.ts","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAE/D;;GAEG;AACH,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,gCAAgC,iCAqC1F"}
@@ -0,0 +1,45 @@
1
+ import { defineCodeFix, getSourceLocation } from "../diagnostics.js";
2
+ /**
3
+ * Quick fix that remove unused template parameter.
4
+ */
5
+ export function removeUnusedTemplateParameterCodeFix(node) {
6
+ return defineCodeFix({
7
+ id: "remove-unused-template-parameter",
8
+ label: `Remove unused template parameter ${node.id.sv}`,
9
+ fix: (context) => {
10
+ let location = getSourceLocation(node);
11
+ const parent = node.parent;
12
+ if (parent) {
13
+ const length = parent.templateParameters.length;
14
+ if (length === 1) {
15
+ location = {
16
+ file: location.file,
17
+ pos: parent.templateParametersRange.pos,
18
+ end: parent.templateParametersRange.end,
19
+ };
20
+ }
21
+ else {
22
+ const index = parent.templateParameters.findIndex((param) => param === node);
23
+ if (index !== -1) {
24
+ if (index !== parent.templateParameters.length - 1) {
25
+ location = {
26
+ file: location.file,
27
+ pos: location.pos,
28
+ end: parent.templateParameters[index + 1].pos,
29
+ };
30
+ }
31
+ else {
32
+ location = {
33
+ file: location.file,
34
+ pos: parent.templateParameters[index - 1].end,
35
+ end: location.end,
36
+ };
37
+ }
38
+ }
39
+ }
40
+ }
41
+ return context.replaceText(location, "");
42
+ },
43
+ });
44
+ }
45
+ //# sourceMappingURL=remove-unused-template-parameter.codefix.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"remove-unused-template-parameter.codefix.js","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/remove-unused-template-parameter.codefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,UAAU,oCAAoC,CAAC,IAAsC;IACzF,OAAO,aAAa,CAAC;QACnB,EAAE,EAAE,kCAAkC;QACtC,KAAK,EAAE,oCAAoC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QACvD,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;YACf,IAAI,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,MAAM,GAAG,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC;gBAChD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;oBACjB,QAAQ,GAAG;wBACT,IAAI,EAAE,QAAQ,CAAC,IAAI;wBACnB,GAAG,EAAE,MAAM,CAAC,uBAAuB,CAAC,GAAG;wBACvC,GAAG,EAAE,MAAM,CAAC,uBAAuB,CAAC,GAAG;qBACxC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,KAAK,GAAG,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;oBAC7E,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;wBACjB,IAAI,KAAK,KAAK,MAAM,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACnD,QAAQ,GAAG;gCACT,IAAI,EAAE,QAAQ,CAAC,IAAI;gCACnB,GAAG,EAAE,QAAQ,CAAC,GAAG;gCACjB,GAAG,EAAE,MAAM,CAAC,kBAAkB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG;6BAC9C,CAAC;wBACJ,CAAC;6BAAM,CAAC;4BACN,QAAQ,GAAG;gCACT,IAAI,EAAE,QAAQ,CAAC,IAAI;gCACnB,GAAG,EAAE,MAAM,CAAC,kBAAkB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG;gCAC7C,GAAG,EAAE,QAAQ,CAAC,GAAG;6BAClB,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"decorator-utils.d.ts","sourceRoot":"","sources":["../../../src/core/decorator-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EAEhB,mBAAmB,EAEnB,aAAa,EACb,MAAM,EAEN,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,oCAAoC;AACpC,MAAM,MAAM,SAAS,GAAG,aAAa,CAAC;AAEtC,MAAM,MAAM,aAAa,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,4CAA4C;AAC5C,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,QAAQ,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAG7E,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,QAAQ,IAClD,CAAC,SAAS,KAAK,GAAG,aAAa,GAC7B,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC,GACrE,CAAC,SAAS,QAAQ,GAAG,MAAM,GAC3B,CAAC,SAAS,QAAQ,GAAG,MAAM,GAC3B,CAAC,SAAS,SAAS,GAAG,OAAO,GAC7B,IAAI,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC;AAEvB;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,QAAQ,EACxD,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,IAAI,EACZ,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,GAC7B,MAAM,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAevD;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,mBAAmB,GACxB,OAAO,CAST;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,mBAAmB,GAAG,mBAAmB,EAAE,GACxD,OAAO,CAqBT;AAED,4CAA4C;AAC5C,eAAO,MAAM,iBAAiB,8BAAwB,CAAC;AAEvD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,QAAQ,EACtD,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,GAC7B,MAAM,IAAI,qBAAqB,CAAC,CAAC,CAAC,CASpC;AAiBD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,EAC/D,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,aAAa,EACpB,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE,GACpB,KAAK,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAanC;AAED,MAAM,WAAW,mBAAmB,CAClC,CAAC,SAAS,QAAQ,EAClB,CAAC,SAAS,SAAS,wBAAwB,CAAC,QAAQ,CAAC,EAAE,EACvD,CAAC,SAAS,wBAAwB,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,SAAS;IAEpE;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;IAElC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjB;;OAEG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,wBAAwB,CAAC,CAAC,SAAS,QAAQ;IAC1D;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,CAAC;IAEhC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,KAAK,eAAe,CAClB,CAAC,SAAS,SAAS,wBAAwB,CAAC,QAAQ,CAAC,EAAE,EACvD,CAAC,SAAS,wBAAwB,CAAC,QAAQ,CAAC,GAAG,SAAS,IACtD,CAAC,SAAS,SAAS,GACnB,kBAAkB,CAAC,CAAC,CAAC,GACrB,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3D,KAAK,oBAAoB,CAAC,CAAC,SAAS,wBAAwB,CAAC,QAAQ,CAAC,GAAG,SAAS,IAChF,CAAC,SAAS,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC;AAEjF,KAAK,kBAAkB,CAAC,CAAC,SAAS,SAAS,wBAAwB,CAAC,QAAQ,CAAC,EAAE,IAAI;KAChF,CAAC,IAAI,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,KAAK,cAAc,CAAC,CAAC,SAAS,wBAAwB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,IAAI,GAC1F,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,GACzC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAGlC,KAAK,kBAAkB,CAAC,CAAC,SAAS,QAAQ,GAAG,SAAS,QAAQ,EAAE,IAC9D,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,SAAS,QAAQ,CAAC,EAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC,GACxE,CAAC,SAAS,QAAQ,GAAG,qBAAqB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AAEzD,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,QAAQ,EAClB,CAAC,SAAS,SAAS,wBAAwB,CAAC,QAAQ,CAAC,EAAE,EACvD,CAAC,SAAS,wBAAwB,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,SAAS;IAEpE,QAAQ,CACN,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAChC,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,GAChC,OAAO,CAAC;CACZ;AAED,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;AAE5C;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,CAAC,SAAS,QAAQ,EAClB,CAAC,SAAS,SAAS,wBAAwB,CAAC,QAAQ,CAAC,EAAE,EACvD,CAAC,SAAS,wBAAwB,CAAC,QAAQ,CAAC,GAAG,SAAS,EACxD,UAAU,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CA+CvE;AAMD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,UAAU,EAAE,OAAO,EAAE,GACpB,OAAO,CAiCT;AASD,yCAAyC;AACzC,eAAO,MAAM,cAAc,2BAAqB,CAAC;AAEjD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,YAAY,EAAE,aAAa,EAC3B,MAAM,EAAE,gBAAgB,GACvB,CAAC,CAAC,GAAG,SAAS,EAAE,UAAU,EAAE,CAAC,CAK/B;AAiED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,iBAAiB,WAoB7B;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,iBAAiB,EAC/B,cAAc,EAAE,iBAAiB,WAoClC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAMpE"}
1
+ {"version":3,"file":"decorator-utils.d.ts","sourceRoot":"","sources":["../../../src/core/decorator-utils.ts"],"names":[],"mappings":"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"}
@@ -246,6 +246,12 @@ function typespecTypeToJsonInternal(typespecType, target, path) {
246
246
  }
247
247
  return [result, []];
248
248
  }
249
+ case "StringTemplate":
250
+ if (typespecType.stringValue) {
251
+ return [typespecType.stringValue, []];
252
+ }
253
+ // By design
254
+ // eslint-disable-next-line no-fallthrough
249
255
  default:
250
256
  const diagnostic = path.length === 0
251
257
  ? createDiagnostic({
@@ -1 +1 @@
1
- {"version":3,"file":"decorator-utils.js","sourceRoot":"","sources":["../../../src/core/decorator-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"decorator-utils.js","sourceRoot":"","sources":["../../../src/core/decorator-utils.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,28 @@
1
+ import { DiscriminatedOptions } from "../../../generated-defs/TypeSpec.js";
1
2
  import { Discriminator } from "../intrinsic-type-state.js";
2
3
  import type { Program } from "../program.js";
3
- import { Diagnostic, Model, Union } from "../types.js";
4
+ import { Diagnostic, Model, Type, Union } from "../types.js";
4
5
  export interface DiscriminatedUnion {
6
+ readonly options: Required<DiscriminatedOptions>;
7
+ readonly variants: Map<string, Type>;
8
+ readonly defaultVariant?: Type;
9
+ readonly type: Union;
10
+ }
11
+ export interface DiscriminatedUnionLegacy {
12
+ kind: "legacy";
5
13
  propertyName: string;
6
14
  variants: Map<string, Model>;
7
15
  }
8
- export declare function getDiscriminatedUnion(type: Model | Union, discriminator: Discriminator): [DiscriminatedUnion, readonly Diagnostic[]];
16
+ export declare function getDiscriminatedUnion(program: Program, type: Union): [DiscriminatedUnion | undefined, readonly Diagnostic[]];
17
+ /**
18
+ * @deprecated Discriminated unions created with `@discriminator` are deprecated.
19
+ * Call `getDiscriminatedUnionFromInheritance` for the legacy model version.
20
+ */
21
+ export declare function getDiscriminatedUnion(type: Model | Union, discriminator: Discriminator): [DiscriminatedUnionLegacy, readonly Diagnostic[]];
9
22
  /**
10
23
  * Run the validation on all discriminated models to make sure the discriminator are valid.
11
24
  * This has to be done after the checker so we can have the full picture of all the dervied models.
12
25
  */
13
26
  export declare function validateInheritanceDiscriminatedUnions(program: Program): void;
27
+ export declare function getDiscriminatedUnionFromInheritance(type: Model, discriminator: Discriminator): [DiscriminatedUnionLegacy, readonly Diagnostic[]];
14
28
  //# sourceMappingURL=discriminator-utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"discriminator-utils.d.ts","sourceRoot":"","sources":["../../../../src/core/helpers/discriminator-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAyB,MAAM,4BAA4B,CAAC;AAElF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAQ,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7D,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAC9B;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,KAAK,GAAG,KAAK,EACnB,aAAa,EAAE,aAAa,GAC3B,CAAC,kBAAkB,EAAE,SAAS,UAAU,EAAE,CAAC,CAO7C;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,QAQtE"}
1
+ {"version":3,"file":"discriminator-utils.d.ts","sourceRoot":"","sources":["../../../../src/core/helpers/discriminator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,EACL,aAAa,EAGd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACjD,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC;IAC/B,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;CAC9B;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GACV,CAAC,kBAAkB,GAAG,SAAS,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC;AAC3D;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,KAAK,GAAG,KAAK,EACnB,aAAa,EAAE,aAAa,GAC3B,CAAC,wBAAwB,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC;AAkBrD;;;GAGG;AACH,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,OAAO,QAQtE;AAsID,wBAAgB,oCAAoC,CAClD,IAAI,EAAE,KAAK,EACX,aAAa,EAAE,aAAa,GAC3B,CAAC,wBAAwB,EAAE,SAAS,UAAU,EAAE,CAAC,CAyCnD"}
@@ -1,14 +1,20 @@
1
1
  import { DuplicateTracker } from "../../utils/duplicate-tracker.js";
2
2
  import { isDefined } from "../../utils/misc.js";
3
- import { getDiscriminatedTypes } from "../intrinsic-type-state.js";
3
+ import { getDiscriminatedOptions, getDiscriminatedTypes, } from "../intrinsic-type-state.js";
4
4
  import { createDiagnostic } from "../messages.js";
5
5
  import { isTemplateDeclarationOrInstance } from "../type-utils.js";
6
- export function getDiscriminatedUnion(type, discriminator) {
7
- switch (type.kind) {
8
- case "Model":
9
- return getDiscriminatedUnionForModel(type, discriminator);
10
- case "Union":
11
- return getDiscriminatedUnionForUnion(type, discriminator);
6
+ export function getDiscriminatedUnion(typeOrProgram, typeOrDiscriminator) {
7
+ if ("propertyName" in typeOrDiscriminator) {
8
+ const type = typeOrProgram;
9
+ switch (type.kind) {
10
+ case "Model":
11
+ return getDiscriminatedUnionFromInheritance(type, typeOrDiscriminator);
12
+ case "Union":
13
+ return getDiscriminatedUnionForUnionLegacy(type, typeOrDiscriminator);
14
+ }
15
+ }
16
+ else {
17
+ return getDiscriminatedUnionForUnion(typeOrProgram, typeOrDiscriminator);
12
18
  }
13
19
  }
14
20
  /**
@@ -19,12 +25,74 @@ export function validateInheritanceDiscriminatedUnions(program) {
19
25
  for (const [type, discriminator] of getDiscriminatedTypes(program)) {
20
26
  // Union would have already reported the issue.
21
27
  if (type.kind === "Model") {
22
- const [_, diagnostics] = getDiscriminatedUnionForModel(type, discriminator);
28
+ const [_, diagnostics] = getDiscriminatedUnionFromInheritance(type, discriminator);
23
29
  program.reportDiagnostics(diagnostics);
24
30
  }
25
31
  }
26
32
  }
27
- function getDiscriminatedUnionForUnion(type, discriminator) {
33
+ function getDiscriminatedUnionForUnion(program, type) {
34
+ const options = getDiscriminatedOptions(program, type);
35
+ const diagnostics = [];
36
+ if (options === undefined) {
37
+ return [undefined, []];
38
+ }
39
+ const variants = new Map();
40
+ let defaultVariant;
41
+ // If there is not envelope then every variant needs to be a model.
42
+ for (const variant of type.variants.values()) {
43
+ if (typeof variant.name !== "string") {
44
+ if (defaultVariant) {
45
+ diagnostics.push(createDiagnostic({
46
+ code: "invalid-discriminated-union-variant",
47
+ messageId: "duplicateDefaultVariant",
48
+ target: variant,
49
+ }));
50
+ }
51
+ else {
52
+ defaultVariant = variant.type;
53
+ }
54
+ continue;
55
+ }
56
+ variants.set(variant.name, variant.type);
57
+ if (options.envelope === "none") {
58
+ if (variant.type.kind !== "Model") {
59
+ diagnostics.push(createDiagnostic({
60
+ code: "invalid-discriminated-union-variant",
61
+ messageId: "noEnvelopeModel",
62
+ format: { name: variant.name.toString() },
63
+ target: variant,
64
+ }));
65
+ continue;
66
+ }
67
+ const prop = variant.type.properties.get(options.discriminatorPropertyName);
68
+ if (prop !== undefined) {
69
+ const key = getStringValue(prop.type);
70
+ if (key !== variant.name) {
71
+ diagnostics.push(createDiagnostic({
72
+ code: "invalid-discriminated-union-variant",
73
+ messageId: "discriminantMismatch",
74
+ format: {
75
+ name: variant.name.toString(),
76
+ discriminant: options.discriminatorPropertyName,
77
+ propertyValue: key,
78
+ variantName: String(variant.name),
79
+ },
80
+ target: variant.type,
81
+ }));
82
+ }
83
+ }
84
+ }
85
+ }
86
+ return [
87
+ {
88
+ type,
89
+ options,
90
+ variants,
91
+ },
92
+ diagnostics,
93
+ ];
94
+ }
95
+ function getDiscriminatedUnionForUnionLegacy(type, discriminator) {
28
96
  const variants = new Map();
29
97
  const diagnostics = [];
30
98
  const duplicates = new DuplicateTracker();
@@ -63,12 +131,13 @@ function getDiscriminatedUnionForUnion(type, discriminator) {
63
131
  }
64
132
  reportDuplicateDiscriminatorValues(duplicates, diagnostics);
65
133
  const discriminatedUnion = {
134
+ kind: "legacy",
66
135
  propertyName: discriminator.propertyName,
67
136
  variants,
68
137
  };
69
138
  return [discriminatedUnion, diagnostics];
70
139
  }
71
- function getDiscriminatedUnionForModel(type, discriminator) {
140
+ export function getDiscriminatedUnionFromInheritance(type, discriminator) {
72
141
  const variants = new Map();
73
142
  const diagnostics = [];
74
143
  const duplicates = new DuplicateTracker();
@@ -101,6 +170,7 @@ function getDiscriminatedUnionForModel(type, discriminator) {
101
170
  checkForVariantsIn(type);
102
171
  reportDuplicateDiscriminatorValues(duplicates, diagnostics);
103
172
  const discriminatedUnion = {
173
+ kind: "legacy",
104
174
  propertyName: discriminator.propertyName,
105
175
  variants,
106
176
  };
@@ -1 +1 @@
1
- {"version":3,"file":"discriminator-utils.js","sourceRoot":"","sources":["../../../../src/core/helpers/discriminator-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"discriminator-utils.js","sourceRoot":"","sources":["../../../../src/core/helpers/discriminator-utils.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- export { DiscriminatedUnion, getDiscriminatedUnion } from "./discriminator-utils.js";
1
+ export { DiscriminatedUnion, DiscriminatedUnionLegacy, getDiscriminatedUnion, getDiscriminatedUnionFromInheritance, } from "./discriminator-utils.js";
2
2
  export { getLocationContext } from "./location-context.js";
3
3
  export * from "./operation-utils.js";
4
4
  export * from "./path-interpolation.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/core/helpers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EACL,oCAAoC,EACpC,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,eAAe,IAAI,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzF,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/core/helpers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,qBAAqB,EACrB,oCAAoC,GACrC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EACL,oCAAoC,EACpC,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,eAAe,IAAI,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzF,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}
@@ -1,4 +1,4 @@
1
- export { getDiscriminatedUnion } from "./discriminator-utils.js";
1
+ export { getDiscriminatedUnion, getDiscriminatedUnionFromInheritance, } from "./discriminator-utils.js";
2
2
  export { getLocationContext } from "./location-context.js";
3
3
  export * from "./operation-utils.js";
4
4
  export * from "./path-interpolation.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/helpers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EACL,oCAAoC,EACpC,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,eAAe,IAAI,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzF,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/helpers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EACrB,oCAAoC,GACrC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAE3C,OAAO,EACL,oCAAoC,EACpC,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,eAAe,IAAI,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzF,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import { CliCompilerHost } from "./cli/types.js";
2
- export declare function installTypeSpecDependencies(host: CliCompilerHost, directory: string): Promise<void>;
2
+ export declare function installTypeSpecDependencies(host: CliCompilerHost, directory: string, stdio?: "inherit" | "pipe"): Promise<void>;
3
3
  //# sourceMappingURL=install.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAWjD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAQf"}
1
+ {"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../src/core/install.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAWjD,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,eAAe,EACrB,SAAS,EAAE,MAAM,EACjB,KAAK,GAAE,SAAS,GAAG,MAAkB,GACpC,OAAO,CAAC,IAAI,CAAC,CAQf"}
@@ -1,14 +1,14 @@
1
1
  import Arborist from "@npmcli/arborist";
2
2
  import { spawn } from "child_process";
3
3
  import { getTypeSpecEngine } from "./engine.js";
4
- export async function installTypeSpecDependencies(host, directory) {
4
+ export async function installTypeSpecDependencies(host, directory, stdio = "inherit") {
5
5
  // Only use the builtin npm when running in standalone tsp mode.
6
6
  // TBD how we'll change this as we move to a more integrated setup and resolve the user package manager.
7
7
  if (getTypeSpecEngine() === "tsp") {
8
8
  await installWithBuiltinNpm(host, directory);
9
9
  }
10
10
  else {
11
- await installWithNpmExe(host, directory);
11
+ await installWithNpmExe(host, directory, stdio);
12
12
  }
13
13
  }
14
14
  async function installWithBuiltinNpm(host, directory) {
@@ -19,14 +19,25 @@ async function installWithBuiltinNpm(host, directory) {
19
19
  await arb.buildIdealTree({});
20
20
  await arb.reify();
21
21
  }
22
- async function installWithNpmExe(host, directory) {
22
+ async function installWithNpmExe(host, directory, stdio) {
23
23
  const child = spawn("npm", ["install"], {
24
24
  shell: process.platform === "win32",
25
- stdio: "inherit",
25
+ stdio: "pipe",
26
26
  cwd: directory,
27
27
  env: process.env,
28
28
  });
29
- return new Promise(() => {
29
+ const stdout = [];
30
+ if (child.stdout) {
31
+ child.stdout.on("data", (data) => {
32
+ stdout.push(data.toString());
33
+ });
34
+ }
35
+ if (child.stderr) {
36
+ child.stderr.on("data", (data) => {
37
+ stdout.push(data.toString());
38
+ });
39
+ }
40
+ return new Promise((resolve, reject) => {
30
41
  child.on("error", (error) => {
31
42
  if (error.code === "ENOENT") {
32
43
  host.logger.error("Cannot find `npm` executable. Make sure to have npm installed in your path.");
@@ -37,7 +48,12 @@ async function installWithNpmExe(host, directory) {
37
48
  process.exit(error.errno);
38
49
  });
39
50
  child.on("exit", (exitCode) => {
40
- process.exit(exitCode ?? -1);
51
+ if (exitCode !== 0) {
52
+ reject(new Error(`Npm installed failed with exit code ${exitCode}\n${stdout.join("\n")}`));
53
+ }
54
+ else {
55
+ resolve();
56
+ }
41
57
  });
42
58
  });
43
59
  }