Skip to content

Commit 4b99815

Browse files
author
Kyle Zhang
committed
move func from compiler to openapi3
1 parent 06f9fdc commit 4b99815

File tree

4 files changed

+32
-34
lines changed

4 files changed

+32
-34
lines changed

packages/compiler/src/core/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ export {
2626
getMinValueAsNumeric,
2727
getMinValueExclusive,
2828
getMinValueExclusiveAsNumeric,
29-
getXmlNs,
30-
isXmlAttribute,
31-
isXmlUnwrapped,
3229
type Discriminator,
3330
} from "./intrinsic-type-state.js";
3431
export {

packages/compiler/src/core/intrinsic-type-state.ts

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ function createStateSymbol(name: string) {
99
return Symbol.for(`TypeSpec.${name}`);
1010
}
1111

12-
function createXmlStateSymbol(name: string) {
13-
return Symbol.for(`@typespec/xml/${name}`);
14-
}
15-
1612
const stateKeys = {
1713
minValues: createStateSymbol("minValues"),
1814
maxValues: createStateSymbol("maxValues"),
@@ -29,13 +25,6 @@ const stateKeys = {
2925

3026
discriminator: createStateSymbol("discriminator"),
3127
};
32-
33-
const XmlStateKeys = {
34-
attribute: createXmlStateSymbol("attribute"),
35-
unwrapped: createXmlStateSymbol("unwrapped"),
36-
nsDeclaration: createXmlStateSymbol("nsDeclaration"),
37-
};
38-
3928
// #region @minValue
4029

4130
export function setMinValue(program: Program, target: Type, value: Numeric): void {
@@ -160,22 +149,6 @@ export function getMaxItems(program: Program, target: Type): number | undefined
160149
}
161150
// #endregion @maxItems
162151

163-
// #region @xml object
164-
export function isXmlAttribute(program: Program, target: Type): boolean {
165-
return program.stateSet(XmlStateKeys.attribute).has(target);
166-
}
167-
export function isXmlUnwrapped(program: Program, target: Type): boolean {
168-
return program.stateSet(XmlStateKeys.unwrapped).has(target);
169-
}
170-
export function getXmlNs(program: Program, target: Type): XmlNamespace | undefined {
171-
return program.stateMap(XmlStateKeys.nsDeclaration).get(target);
172-
}
173-
export interface XmlNamespace {
174-
readonly namespace: string;
175-
readonly prefix: string;
176-
}
177-
// #endregion @xml object
178-
179152
// #region doc
180153

181154
/** @internal */
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Contains all intrinsic data setter or getter
2+
// Anything that the TypeSpec check might should be here.
3+
4+
import { Type, type Program } from "@typespec/compiler";
5+
6+
function createXmlStateSymbol(name: string) {
7+
return Symbol.for(`@typespec/xml/${name}`);
8+
}
9+
10+
const XmlStateKeys = {
11+
attribute: createXmlStateSymbol("attribute"),
12+
unwrapped: createXmlStateSymbol("unwrapped"),
13+
nsDeclaration: createXmlStateSymbol("nsDeclaration"),
14+
};
15+
16+
// #region @xml object
17+
export function isXmlAttribute(program: Program, target: Type): boolean {
18+
return program.stateSet(XmlStateKeys.attribute).has(target);
19+
}
20+
export function isXmlUnwrapped(program: Program, target: Type): boolean {
21+
return program.stateSet(XmlStateKeys.unwrapped).has(target);
22+
}
23+
export function getXmlNs(program: Program, target: Type): XmlNamespace | undefined {
24+
return program.stateMap(XmlStateKeys.nsDeclaration).get(target);
25+
}
26+
export interface XmlNamespace {
27+
readonly namespace: string;
28+
readonly prefix: string;
29+
}
30+
// #endregion @xml object

packages/openapi3/src/schema-emitter.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,12 @@ import {
4040
getPattern,
4141
getSummary,
4242
getTypeName,
43-
getXmlNs,
4443
ignoreDiagnostics,
4544
isArrayModelType,
4645
isNeverType,
4746
isNullType,
4847
isSecret,
4948
isTemplateDeclaration,
50-
isXmlAttribute,
51-
isXmlUnwrapped,
5249
resolveEncodedName,
5350
serializeValueAsJson,
5451
} from "@typespec/compiler";
@@ -77,6 +74,7 @@ import {
7774
} from "@typespec/openapi";
7875
import { getOneOf, getRef } from "./decorators.js";
7976
import { applyEncoding } from "./encoding.js";
77+
import { getXmlNs, isXmlAttribute, isXmlUnwrapped } from "./intrinsic-type-state.js";
8078
import { OpenAPI3EmitterOptions, reportDiagnostic } from "./lib.js";
8179
import { ResolvedOpenAPI3EmitterOptions } from "./openapi.js";
8280
import { getSchemaForStdScalars } from "./std-scalar-schemas.js";
@@ -838,7 +836,7 @@ export class OpenAPI3SchemaEmitter extends TypeEmitter<
838836
"deprecated"
839837
);
840838

841-
this.#attachXmlObject(program, type as ModelProperty, schema);
839+
//this.#attachXmlObject(program, type as ModelProperty, schema);
842840

843841
this.#attachExtensions(program, type, schema);
844842

0 commit comments

Comments
 (0)