@typespec/openapi3 1.0.0-rc.1-dev.1 → 1.0.0-rc.1-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.
@@ -1 +1 @@
1
- {"version":3,"file":"xml-module.d.ts","sourceRoot":"","sources":["../../src/xml-module.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,EACL,aAAa,EACb,OAAO,EACP,MAAM,EAGP,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,EAAE,cAAc,EAAqB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEjF,MAAM,WAAW,SAAS;IACxB,+BAA+B,CAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,GAAG,KAAK,EACpB,UAAU,EAAE,cAAc,GAAG,gBAAgB,GAC5C,IAAI,CAAC;IAER,+BAA+B,CAC7B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,8BAA8B,EACvC,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,cAAc,GAAG,gBAAgB,EAC7C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACxB,IAAI,CAAC;CACT;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAyIvE"}
1
+ {"version":3,"file":"xml-module.d.ts","sourceRoot":"","sources":["../../src/xml-module.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,EACL,aAAa,EACb,OAAO,EACP,MAAM,EAGP,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAqB,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEjF,MAAM,WAAW,SAAS;IACxB,+BAA+B,CAC7B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,GAAG,KAAK,EACpB,UAAU,EAAE,cAAc,GAAG,gBAAgB,GAC5C,IAAI,CAAC;IAER,+BAA+B,CAC7B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,8BAA8B,EACvC,IAAI,EAAE,aAAa,EACnB,UAAU,EAAE,cAAc,GAAG,gBAAgB,EAC7C,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACxB,IAAI,CAAC;CACT;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA8IvE"}
@@ -1,7 +1,7 @@
1
- import { ArrayBuilder, ObjectBuilder } from "@typespec/asset-emitter";
1
+ import { ArrayBuilder, ObjectBuilder, Placeholder } from "@typespec/asset-emitter";
2
2
  import { isArrayModelType, resolveEncodedName, } from "@typespec/compiler";
3
+ import { shouldInline } from "@typespec/openapi";
3
4
  import { reportDiagnostic } from "./lib.js";
4
- import { getSchemaForStdScalars } from "./std-scalar-schemas.js";
5
5
  export async function resolveXmlModule() {
6
6
  const xml = await tryImportXml();
7
7
  if (xml === undefined)
@@ -74,19 +74,8 @@ export async function resolveXmlModule() {
74
74
  const propXmlName = hasUnwrappedDecorator
75
75
  ? xmlName
76
76
  : resolveEncodedName(program, propValue, "application/xml");
77
- if (propValue.kind === "Scalar") {
78
- let scalarSchema = {};
79
- const isStd = program.checker.isStdType(propValue);
80
- if (isStd) {
81
- scalarSchema = getSchemaForStdScalars(propValue, options);
82
- }
83
- else if (propValue.baseScalar) {
84
- scalarSchema = getSchemaForStdScalars(propValue.baseScalar, options);
85
- }
86
- scalarSchema.xml = { name: propXmlName };
87
- refSchema.items = scalarSchema;
88
- }
89
- else {
77
+ if ((refSchema.items instanceof Placeholder || "$ref" in refSchema.items) &&
78
+ !(propValue && shouldInline(program, propValue))) {
90
79
  const items = new ArrayBuilder();
91
80
  items.push(refSchema.items);
92
81
  refSchema.items = new ObjectBuilder({
@@ -94,15 +83,27 @@ export async function resolveXmlModule() {
94
83
  xml: { name: propXmlName },
95
84
  });
96
85
  }
97
- // handel unwrapped decorator
86
+ else {
87
+ refSchema.items = new ObjectBuilder({
88
+ ...refSchema.items,
89
+ xml: { name: propXmlName },
90
+ });
91
+ }
98
92
  if (!hasUnwrappedDecorator) {
99
93
  xmlObject.wrapped = true;
100
94
  }
101
95
  }
102
96
  if (!isArrayProperty && !refSchema.type && !isAttribute) {
97
+ xmlObject.name = xmlName;
98
+ emitObject.allOf = new ArrayBuilder();
99
+ emitObject.allOf.push(refSchema);
100
+ }
101
+ if (isAttribute &&
102
+ (refSchema instanceof Placeholder || "$ref" in refSchema) &&
103
+ !(prop.type && shouldInline(program, prop.type)) &&
104
+ prop.type?.kind !== "Model") {
103
105
  emitObject.allOf = new ArrayBuilder();
104
106
  emitObject.allOf.push(refSchema);
105
- xmlObject.name = xmlName;
106
107
  }
107
108
  if (isArrayProperty && hasUnwrappedDecorator) {
108
109
  // if wrapped is false, xml.name of the wrapping element is ignored.
@@ -124,11 +125,22 @@ function isXmlModelChecker(program, model, checked) {
124
125
  return true;
125
126
  }
126
127
  if (model.kind === "ModelProperty") {
127
- const propModel = model.type;
128
- if (propModel && !checked.includes(propModel.name)) {
129
- checked.push(propModel.name);
130
- if (isXmlModelChecker(program, propModel, checked)) {
131
- return true;
128
+ const isArrayProperty = model.type?.kind === "Model" && isArrayModelType(program, model.type);
129
+ if (isArrayProperty) {
130
+ const propValue = model.type.indexer.value;
131
+ if (propValue.kind === "Scalar") {
132
+ if (isXmlModelChecker(program, propValue, checked)) {
133
+ return true;
134
+ }
135
+ }
136
+ }
137
+ else {
138
+ const propModel = model.type;
139
+ if (propModel && !checked.includes(propModel.name)) {
140
+ checked.push(propModel.name);
141
+ if (isXmlModelChecker(program, propModel, checked)) {
142
+ return true;
143
+ }
132
144
  }
133
145
  }
134
146
  }
@@ -149,6 +161,11 @@ function isXmlModelChecker(program, model, checked) {
149
161
  }
150
162
  }
151
163
  }
164
+ if (model.kind === "Scalar" && model.baseScalar) {
165
+ if (isXmlModelChecker(program, model.baseScalar, checked)) {
166
+ return true;
167
+ }
168
+ }
152
169
  return false;
153
170
  }
154
171
  async function tryImportXml() {
@@ -1 +1 @@
1
- {"version":3,"file":"xml-module.js","sourceRoot":"","sources":["../../src/xml-module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"xml-module.js","sourceRoot":"","sources":["../../src/xml-module.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@typespec/openapi3",
3
- "version": "1.0.0-rc.1-dev.1",
3
+ "version": "1.0.0-rc.1-dev.2",
4
4
  "author": "Microsoft Corporation",
5
5
  "description": "TypeSpec library for emitting OpenAPI 3.0 from the TypeSpec REST protocol binding and converting OpenAPI3 to TypeSpec",
6
6
  "homepage": "https://typespec.io",
@@ -74,6 +74,7 @@
74
74
  "@typespec/library-linter": "^0.68.0 || >=0.69.0-dev <0.69.0",
75
75
  "@typespec/openapi": "^1.0.0-rc.0",
76
76
  "@typespec/rest": "^0.68.0 || >=0.69.0-dev <0.69.0",
77
+ "@typespec/tspd": "^0.68.0 || >=0.69.0-dev <0.69.0",
77
78
  "@typespec/versioning": "^0.68.0 || >=0.69.0-dev <0.69.0",
78
79
  "@typespec/xml": "^0.68.0 || >=0.69.0-dev <0.69.0",
79
80
  "@vitest/coverage-v8": "^3.0.9",
@@ -82,8 +83,7 @@
82
83
  "cross-env": "~7.0.3",
83
84
  "rimraf": "~6.0.1",
84
85
  "typescript": "~5.8.2",
85
- "vitest": "^3.0.9",
86
- "@typespec/tspd": "^0.46.0"
86
+ "vitest": "^3.0.9"
87
87
  },
88
88
  "scripts": {
89
89
  "clean": "rimraf ./dist ./temp",