@azure-tools/typespec-go 0.16.0-dev.4 → 0.16.0-dev.6

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.
@@ -1 +1 @@
1
- {"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAsB,WAAW,EAAY,MAAM,oBAAoB,CAAC;AAO/E,OAAO,EAAE,gBAAgB,EAAoB,MAAM,UAAU,CAAC;AAI9D,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,gBAAgB,CAAC,iBA8KnE;AAoBD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,QAmBtD"}
1
+ {"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAsB,WAAW,EAAY,MAAM,oBAAoB,CAAC;AAO/E,OAAO,EAAE,gBAAgB,EAAoB,MAAM,UAAU,CAAC;AAI9D,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,gBAAgB,CAAC,iBAiPnE;AAiCD;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,QAmBtD"}
@@ -14,6 +14,71 @@ import { Adapter, ExternalError } from "./tcgcadapter/adapter.js";
14
14
  import { AdapterError } from "./tcgcadapter/errors.js";
15
15
  export async function $onEmit(context) {
16
16
  try {
17
+ // if there's an existing go.mod file, we'll use its module
18
+ // identity instead of the provided value. this ensures we
19
+ // get the correct major version suffix (if any). if there's
20
+ // no go.mod file (e.g. the first time an SDK is generated) we
21
+ // fall back to the provided value.
22
+ let moduleIdentity;
23
+ let currentDir = context.emitterOutputDir;
24
+ while (true) {
25
+ const goModFile = path.join(currentDir, "go.mod");
26
+ if (existsSync(goModFile)) {
27
+ const goModFileContent = readFileSync(goModFile, "utf8");
28
+ // the module identity is specified on the "module" directive, e.g.
29
+ // module github.com/Azure/azure-sdk-for-go/sdk/foo/v2
30
+ const match = goModFileContent.match(/^module\s+(\S+)/m);
31
+ if (!match) {
32
+ context.program.reportDiagnostic({
33
+ code: "gomod",
34
+ severity: "error",
35
+ message: `failed to find module directive in ${goModFile}`,
36
+ target: NoTarget,
37
+ });
38
+ return;
39
+ }
40
+ moduleIdentity = match[1];
41
+ break;
42
+ }
43
+ // move to the parent directory
44
+ const parentDir = path.dirname(currentDir);
45
+ if (parentDir === currentDir) {
46
+ // we've reached the filesystem root without finding a go.mod.
47
+ // this is expected the first time an SDK is generated, in which
48
+ // case we fall back to the provided module identity.
49
+ break;
50
+ }
51
+ currentDir = parentDir;
52
+ }
53
+ // if we discovered an existing go.mod, prefer the identity from go.mod
54
+ // so we pick up the correct major version suffix. module and
55
+ // containing-module are mutually exclusive, so update whichever was
56
+ // provided.
57
+ if (moduleIdentity) {
58
+ const providedModule = context.options.module ?? context.options["containing-module"];
59
+ // ensure the existing go.mod's major version isn't behind the requested
60
+ // value (a suffix-less identity is v1). a stale go.mod would otherwise
61
+ // silently downgrade the module identity, so treat it as an error.
62
+ if (providedModule) {
63
+ const discoveredMajor = majorVersion(moduleIdentity);
64
+ const providedMajor = majorVersion(providedModule);
65
+ if (discoveredMajor < providedMajor) {
66
+ context.program.reportDiagnostic({
67
+ code: "gomod",
68
+ severity: "error",
69
+ message: `the existing go.mod module identity '${moduleIdentity}' (major version v${discoveredMajor}) is behind the requested module identity '${providedModule}' (major version v${providedMajor})`,
70
+ target: NoTarget,
71
+ });
72
+ return;
73
+ }
74
+ }
75
+ if (context.options.module) {
76
+ context.options.module = moduleIdentity;
77
+ }
78
+ else if (context.options["containing-module"]) {
79
+ context.options["containing-module"] = moduleIdentity;
80
+ }
81
+ }
17
82
  const adapter = await Adapter.create(context);
18
83
  const codeModel = adapter.tcgcToGoCodeModel();
19
84
  await mkdir(context.emitterOutputDir, { recursive: true });
@@ -193,6 +258,18 @@ function truncateStack(stack, finalFrame) {
193
258
  }
194
259
  return stack;
195
260
  }
261
+ /**
262
+ * extracts the major version from a Go module identity's version suffix.
263
+ * e.g. "github.com/foo/bar/v2" returns 2. modules without a suffix are v0/v1,
264
+ * so 1 is returned.
265
+ *
266
+ * @param identity the Go module identity
267
+ * @returns the major version
268
+ */
269
+ function majorVersion(identity) {
270
+ const match = identity.match(/\/v(\d+)$/);
271
+ return match ? parseInt(match[1], 10) : 1;
272
+ }
196
273
  /**
197
274
  * Clean up existing generated Go files in the output directory.
198
275
  * Removes any .go files that contain the Microsoft code generator comment.
@@ -1 +1 @@
1
- {"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAmC,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAoB,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAsC;IAClE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAE9C,MAAM,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3D,uCAAuC;QACvC,qBAAqB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAEhD,IAAI,UAA8B,CAAC;QACnC,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACnC,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAC5C,8DAA8D;YAC9D,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC9C,UAAU,IAAI,GAAG,CAAC;YACpB,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CACjC,SAAS,EACT;YACE,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;gBACvB,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5E,CAAC;YACD,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC;YAC/E,KAAK,EAAE,KAAK,EAAE,IAAY,EAAE,OAAe,EAAE,EAAE;gBAC7C,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACtF,OAAO,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;YACnE,CAAC;SACF,EACD,EAAE,UAAU,EAAE,CACf,CAAC;QACF,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QAChC,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;QAC7B,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QAChC,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAEjC,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,oBAAoB,GAAG,cAAc;YACzC,CAAC,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,gBAAgB,IAAI,cAAc,EAAE,CAAC;YAC7D,CAAC,CAAC,KAAK,CAAC;QAEV,IAAI,cAAc,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5C,2EAA2E;YAC3E,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC/B,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAE,2DAA2D,OAAO,CAAC,gBAAgB,IAAI,cAAc,EAAE;gBAChH,MAAM,EAAE,QAAQ;aACjB,CAAC,CAAC;YAEH,yFAAyF;YACzF,OAAO;QACT,CAAC;QAED,2CAA2C;QAC3C,IAAI,CAAC;YACH,QAAQ,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpE,CAAC;QAAC,MAAM,CAAC;YACP,qDAAqD;YACrD,qDAAqD;YACrD,yDAAyD;YACzD,YAAY;YACZ,IAAI,QAAQ,GAAuB,SAAS,CAAC;YAC7C,IAAI,OAAO,GAAG,wDAAwD,CAAC;YACvE,IAAI,oBAAoB,EAAE,CAAC;gBACzB,QAAQ,GAAG,OAAO,CAAC;gBACnB,OAAO;oBACL,4FAA4F,CAAC;YACjG,CAAC;YAED,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC/B,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,QAAQ;aACjB,CAAC,CAAC;YAEH,gCAAgC;YAChC,OAAO;QACT,CAAC;QAED,qEAAqE;QACrE,IAAI,oBAAoB,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,QAAQ,CAAC,eAAe,cAAc,EAAE,EAAE;oBACxC,GAAG,EAAE,OAAO,CAAC,gBAAgB;oBAC7B,QAAQ,EAAE,OAAO;iBAClB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;oBAC/B,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,OAAO;oBACjB,OAAO,EAAU,GAAI,CAAC,OAAO;oBAC7B,MAAM,EAAE,QAAQ;iBACjB,CAAC,CAAC;gBAEH,yFAAyF;gBACzF,OAAO;YACT,CAAC;QACH,CAAC;QAED,6DAA6D;QAC7D,IAAI,CAAC;YACH,QAAQ,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC/B,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAU,GAAI,CAAC,OAAO;gBAC7B,MAAM,EAAE,QAAQ;aACjB,CAAC,CAAC;YAEH,OAAO;QACT,CAAC;QAED,kBAAkB;QAClB,IAAI,CAAC;YACH,QAAQ,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAChF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC/B,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,OAAO;gBACjB,OAAO,EAAU,GAAI,CAAC,OAAO;gBAC7B,MAAM,EAAE,QAAQ;aACjB,CAAC,CAAC;YAEH,OAAO;QACT,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;YAClC,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE;gBAChC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,MAAM,EAAE;oBACN,GAAG,EAAE,KAAK,CAAC,OAAO;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAChB,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,mBAAmB,CAAC;wBACjD,CAAC,CAAC,2BAA2B;iBAChC;aACF,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;YAC3C,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE;gBAChC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE;oBACN,GAAG,EAAE,KAAK,CAAC,OAAO;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAChB,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,mBAAmB,CAAC;wBACjD,CAAC,CAAC,2BAA2B;iBAChC;aACF,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,YAAY,OAAO,CAAC,YAAY,EAAE,CAAC;YACjD,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE;gBAChC,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE;oBACN,GAAG,EAAE,KAAK,CAAC,OAAO;oBAClB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAChB,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;wBACzC,CAAC,CAAC,2BAA2B;iBAChC;aACF,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,YAAY,aAAa,EAAE,CAAC;YAC1C,mDAAmD;YACnD,iDAAiD;YACjD,uDAAuD;YACvD,OAAO;QACT,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,aAAa,CAAC,KAAa,EAAE,UAAkB;IACtD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,KAAK,GAAG,EAAE,CAAC;IACX,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC;QACrB,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM;QACR,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACrD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,OAAO;IACT,CAAC;IACD,MAAM,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACnC,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,MAAM;QACR,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACnE,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IACD,GAAG,CAAC,SAAS,EAAE,CAAC;IAChB,qBAAqB,CAAC,SAAS,GAAG,OAAO,CAAC,CAAC;AAC7C,CAAC"}
1
+ {"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/typespec-go",
3
- "version": "0.16.0-dev.4",
3
+ "version": "0.16.0-dev.6",
4
4
  "author": "Microsoft Corporation",
5
5
  "description": "TypeSpec emitter for Go SDKs",
6
6
  "homepage": "https://azure.github.io/typespec-azure",
@@ -38,51 +38,51 @@
38
38
  "LICENSE"
39
39
  ],
40
40
  "peerDependencies": {
41
- "@azure-tools/typespec-autorest": "^0.70.1 || >=0.71.0-dev <0.71.0",
42
- "@azure-tools/typespec-azure-core": "^0.70.0 || >=0.71.0-dev <0.71.0",
43
- "@azure-tools/typespec-azure-resource-manager": "^0.70.0 || >=0.71.0-dev <0.71.0",
44
- "@azure-tools/typespec-azure-rulesets": "^0.70.0 || >=0.71.0-dev <0.71.0",
45
- "@azure-tools/typespec-client-generator-core": "^0.70.0 || >=0.71.0-dev <0.71.0",
41
+ "@azure-tools/typespec-autorest": "^0.70.1 || >= 0.71.0-dev.2",
42
+ "@azure-tools/typespec-azure-core": "^0.70.0 || >= 0.71.0-dev.3",
43
+ "@azure-tools/typespec-azure-resource-manager": "^0.70.0 || >= 0.71.0-dev.5",
44
+ "@azure-tools/typespec-azure-rulesets": "^0.70.0 || >= 0.71.0-dev.1",
45
+ "@azure-tools/typespec-client-generator-core": "^0.70.0 || >= 0.71.0-dev.7",
46
46
  "@typespec/compiler": "^1.14.0",
47
- "@typespec/events": "^0.84.0 || >=0.85.0-dev <0.85.0",
48
47
  "@typespec/http": "^1.14.0",
49
48
  "@typespec/openapi": "^1.14.0",
50
- "@typespec/rest": "^0.84.0 || >=0.85.0-dev <0.85.0",
51
- "@typespec/sse": "^0.84.0 || >=0.85.0-dev <0.85.0",
52
- "@typespec/streams": "^0.84.0 || >=0.85.0-dev <0.85.0",
53
- "@typespec/versioning": "^0.84.0 || >=0.85.0-dev <0.85.0",
54
- "@typespec/xml": "^0.84.0 || >=0.85.0-dev <0.85.0"
49
+ "@typespec/events": "^0.84.0",
50
+ "@typespec/rest": "^0.84.0",
51
+ "@typespec/streams": "^0.84.0",
52
+ "@typespec/versioning": "^0.84.0",
53
+ "@typespec/xml": "^0.84.0",
54
+ "@typespec/sse": "^0.84.0"
55
55
  },
56
56
  "dependencies": {
57
57
  "semver": "^7.7.4"
58
58
  },
59
59
  "devDependencies": {
60
- "@azure-tools/azure-http-specs": "^0.1.0-alpha.43 || >=0.1.0-alpha.44-dev <0.1.0-alpha.44",
61
- "@azure-tools/typespec-autorest": "^0.70.1 || >=0.71.0-dev <0.71.0",
62
- "@azure-tools/typespec-azure-core": "^0.70.0 || >=0.71.0-dev <0.71.0",
63
- "@azure-tools/typespec-azure-resource-manager": "^0.70.0 || >=0.71.0-dev <0.71.0",
64
- "@azure-tools/typespec-azure-rulesets": "^0.70.0 || >=0.71.0-dev <0.71.0",
65
- "@azure-tools/typespec-client-generator-core": "^0.70.0 || >=0.71.0-dev <0.71.0",
60
+ "@azure-tools/azure-http-specs": "^0.1.0-alpha.43 || >= 0.1.0-alpha.44-dev.5",
61
+ "@azure-tools/typespec-autorest": "^0.70.1 || >= 0.71.0-dev.2",
62
+ "@azure-tools/typespec-azure-core": "^0.70.0 || >= 0.71.0-dev.3",
63
+ "@azure-tools/typespec-azure-resource-manager": "^0.70.0 || >= 0.71.0-dev.5",
64
+ "@azure-tools/typespec-azure-rulesets": "^0.70.0 || >= 0.71.0-dev.1",
65
+ "@azure-tools/typespec-client-generator-core": "^0.70.0 || >= 0.71.0-dev.7",
66
66
  "@types/node": "^26.0.0",
67
67
  "@types/semver": "^7.7.1",
68
- "@typespec/compiler": "^1.14.0",
69
- "@typespec/events": "^0.84.0 || >=0.85.0-dev <0.85.0",
70
- "@typespec/http": "^1.14.0",
71
- "@typespec/http-specs": "^0.1.0-alpha.39 || >=0.1.0-alpha.40-dev <0.1.0-alpha.40",
72
- "@typespec/openapi": "^1.14.0",
73
- "@typespec/rest": "^0.84.0 || >=0.85.0-dev <0.85.0",
74
- "@typespec/spec-api": "^0.1.0-alpha.15 || >=0.1.0-alpha.16-dev <0.1.0-alpha.16",
75
- "@typespec/spector": "^0.1.0-alpha.27 || >=0.1.0-alpha.28-dev <0.1.0-alpha.28",
76
- "@typespec/sse": "^0.84.0 || >=0.85.0-dev <0.85.0",
77
- "@typespec/streams": "^0.84.0 || >=0.85.0-dev <0.85.0",
78
- "@typespec/tspd": "^0.76.0 || >=0.77.0-dev <0.77.0",
79
- "@typespec/versioning": "^0.84.0 || >=0.85.0-dev <0.85.0",
80
- "@typespec/xml": "^0.84.0 || >=0.85.0-dev <0.85.0",
81
68
  "@vitest/coverage-v8": "^4.1.3",
82
69
  "@vitest/ui": "^4.1.3",
83
70
  "rimraf": "^6.1.3",
84
71
  "typescript": "~6.0.2",
85
- "vitest": "^4.1.3"
72
+ "vitest": "^4.1.3",
73
+ "@typespec/compiler": "^1.14.0",
74
+ "@typespec/http": "^1.14.0",
75
+ "@typespec/openapi": "^1.14.0",
76
+ "@typespec/http-specs": "^0.1.0-alpha.40",
77
+ "@typespec/rest": "^0.84.0",
78
+ "@typespec/events": "^0.84.0",
79
+ "@typespec/spector": "^0.1.0-alpha.27",
80
+ "@typespec/streams": "^0.84.0",
81
+ "@typespec/sse": "^0.84.0",
82
+ "@typespec/spec-api": "^0.1.0-alpha.15",
83
+ "@typespec/xml": "^0.84.0",
84
+ "@typespec/versioning": "^0.84.0",
85
+ "@typespec/tspd": "^0.76.0"
86
86
  },
87
87
  "scripts": {
88
88
  "clean": "rimraf ./dist ./temp ./node_modules",