@azure-tools/typespec-autorest-canonical 0.4.0-dev.1 → 0.4.0-dev.2

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 (6) hide show
  1. package/README.md +1 -1
  2. package/dist/src/emitter.js +1 -7
  3. package/dist/src/emitter.js.map +1 -1
  4. package/dist/src/lib.d.ts +1 -1
  5. package/dist/src/lib.js +1 -1
  6. package/package.json +1 -1
package/README.md CHANGED
@@ -37,7 +37,7 @@ Output file will interpolate the following values:
37
37
  - service-name: Name of the service if multiple
38
38
  - azure-resource-provider-folder: Value of the azure-resource-provider-folder option
39
39
 
40
- Default: `{azure-resource-provider-folder}/{service-name}/{version}/openapi.json`
40
+ Default: `{azure-resource-provider-folder}/{service-name}/canonical/openapi.json`
41
41
 
42
42
  Example: Single service
43
43
 
package/dist/src/emitter.js CHANGED
@@ -79,19 +79,13 @@ async function emitAllServices(program, tcgcSdkContext, options) {
79
79
  }
80
80
  }
81
81
  }
82
- function resolveOutputFile(service, multipleServices, options, version) {
82
+ function resolveOutputFile(service, multipleServices, options) {
83
83
  const azureResourceProviderFolder = options.azureResourceProviderFolder;
84
84
  const interpolated = interpolatePath(options.outputFile, {
85
85
  "azure-resource-provider-folder": azureResourceProviderFolder,
86
86
  "service-name": multipleServices || azureResourceProviderFolder
87
87
  ? getNamespaceFullName(service.type)
88
88
  : undefined,
89
- "version-status": azureResourceProviderFolder
90
- ? version?.includes("preview")
91
- ? "preview"
92
- : "stable"
93
- : undefined,
94
- version,
95
89
  });
96
90
  return resolvePath(options.outputDir, interpolated);
97
91
  }
package/dist/src/emitter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAc,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAML,QAAQ,EACR,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,cAAc,EACd,wBAAwB,EACxB,kBAAkB,EAClB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAmC,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7E,MAAM,cAAc,GAAG;IACrB,aAAa,EAAE,wEAAwE;IACvF,UAAU,EAAE,IAAI;IAChB,yBAAyB,EAAE,OAAO;CAC1B,CAAC;AAEX,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC;AAc5C,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAqD;IACjF,MAAM,eAAe,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAClE,MAAM,cAAc,GAAG,gBAAgB,CAAC,OAAO,EAAE,0CAA0C,CAAC,CAAC;IAC7F,MAAM,WAAW,GAAG,eAAe,CACjC,eAAe,CAAC,eAAe,CAAC,IAAI,uDAAuD,EAC3F;QACE,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;QAC3C,oBAAoB,EAAE,OAAO,CAAC,gBAAgB;KAC/C,CACF,CAAC;IACF,MAAM,OAAO,GAA4C;QACvD,UAAU,EAAE,eAAe,CAAC,aAAa,CAAC;QAC1C,SAAS,EAAE,OAAO,CAAC,gBAAgB;QACnC,2BAA2B,EAAE,eAAe,CAAC,gCAAgC,CAAC;QAC9E,OAAO,EAAE,eAAe,CAAC,UAAU,CAAC;QACpC,oBAAoB,EAAE,eAAe,CAAC,wBAAwB,CAAC;QAC/D,oBAAoB,EAAE,eAAe,CAAC,yBAAyB,CAAC;QAChE,WAAW;KACZ,CAAC;IAEF,MAAM,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,OAAgB,EAChB,cAAoC,EACpC,OAAgD;IAEhD,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,6BAA6B,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,OAAO,GAA2B;YACtC,OAAO;YACP,UAAU,EAAE,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,OAAO,CAAC;YACpE,OAAO;YACP,OAAO,EAAE,gBAAgB;YACzB,cAAc;SACf,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;YACxD,EAAE,WAAW,EAAE;YACf,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,+BAA+B,CAAC,GAAG,gBAAgB,CAAC;QACzE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG;YAC7C;gBACE,OAAO,EAAE,0CAA0C;aACpD;SACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC3D,oBAAoB;YACpB,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE5D,oDAAoD;YACpD,MAAM,QAAQ,CAAC,OAAO,EAAE;gBACtB,IAAI,EAAE,OAAO,CAAC,UAAU;gBACxB,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChE,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;YAEH,wCAAwC;YACxC,IAAI,OAAO,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrE,MAAM,YAAY,GAAG,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnF,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACxC,KAAK,MAAM,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;oBACpD,IAAI,QAAQ,EAAE,CAAC;wBACb,KAAK,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;4BAC5D,MAAM,QAAQ,CAAC,OAAO,EAAE;gCACtB,IAAI,EAAE,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC;gCACzC,OAAO,EAAE,IAAI,CAAC,IAAI;gCAClB,OAAO,EAAE,OAAO,CAAC,OAAO;6BACzB,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,OAAgB,EAChB,gBAAyB,EACzB,OAAgD,EAChD,OAAgB;IAEhB,MAAM,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC;IACxE,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE;QACvD,gCAAgC,EAAE,2BAA2B;QAC7D,cAAc,EACZ,gBAAgB,IAAI,2BAA2B;YAC7C,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC;YACpC,CAAC,CAAC,SAAS;QACf,gBAAgB,EAAE,2BAA2B;YAC3C,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC;gBAC5B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,QAAQ;YACZ,CAAC,CAAC,SAAS;QACb,OAAO;KACR,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,OAAO,MAAM,GAAG,IAAI,CAAC;AACvB,CAAC;AAED,SAAS,6BAA6B,CAAC,OAAgB,EAAE,SAAoB;IAC3E,YAAY,CACV,SAAS,EACT;QACE,SAAS,EAAE,CAAC,SAAS,EAAE,EAAE;YACvB,IAAI,wBAAwB,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;gBACjD,yBAAyB,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;QACD,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBAClC,yBAAyB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;gBACtC,yBAAyB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;KACF,EACD,EAAE,CACH,CAAC;IAEF,SAAS,yBAAyB,CAAC,SAAiB,EAAE,IAAU;QAC9D,gBAAgB,CAAC,OAAO,EAAE;YACxB,IAAI,EAAE,kCAAkC;YACxC,MAAM,EAAE,EAAE,SAAS,EAAE;YACrB,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
package/dist/src/lib.d.ts CHANGED
@@ -6,7 +6,7 @@ export interface AutorestCanonicalEmitterOptions {
6
6
  * - version: Version of the service if multiple
7
7
  * - azure-resource-provider-folder: Value of the azure-resource-provider-folder option
8
8
  *
9
- * @default `{azure-resource-provider-folder}/{service-name}/{version}/openapi.json`
9
+ * @default `{azure-resource-provider-folder}/{service-name}/canonical/openapi.json`
10
10
  *
11
11
  *
12
12
  * @example Single service no versioning
package/dist/src/lib.js CHANGED
@@ -12,7 +12,7 @@ const EmitterOptionsSchema = {
12
12
  " - service-name: Name of the service if multiple",
13
13
  " - azure-resource-provider-folder: Value of the azure-resource-provider-folder option",
14
14
  "",
15
- "Default: `{azure-resource-provider-folder}/{service-name}/{version}/openapi.json`",
15
+ "Default: `{azure-resource-provider-folder}/{service-name}/canonical/openapi.json`",
16
16
  "",
17
17
  "",
18
18
  "Example: Single service",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@azure-tools/typespec-autorest-canonical",
3
- "version": "0.4.0-dev.1",
3
+ "version": "0.4.0-dev.2",
4
4
  "author": "Microsoft Corporation",
5
5
  "description": "TypeSpec library for emitting canonical swagger",
6
6
  "homepage": "https://azure.github.io/typespec-azure",