@makeshift27015/typescript-yaml-plugin 1.1.0 → 1.1.1
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.
- package/dist/index.js +10 -10
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -45,6 +45,7 @@ module.exports = ({ typescript: ts_ }) => ({
|
|
|
45
45
|
const { logger } = info.project.projectService;
|
|
46
46
|
const { languageServiceHost, languageService } = info;
|
|
47
47
|
const constImports = new Set();
|
|
48
|
+
let isOpenAPI;
|
|
48
49
|
let openAPIVersion;
|
|
49
50
|
const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
|
|
50
51
|
languageServiceHost.getScriptKind = fileName => {
|
|
@@ -74,17 +75,15 @@ module.exports = ({ typescript: ts_ }) => ({
|
|
|
74
75
|
if (constImports.has(fileName)) {
|
|
75
76
|
asConst = 'as const';
|
|
76
77
|
}
|
|
77
|
-
if (
|
|
78
|
+
if (isOpenAPI) {
|
|
78
79
|
const parsedDoc = parseAsOpenAPIDocument(object, openAPIVersion);
|
|
79
|
-
|
|
80
|
+
let typeName = `OpenAPI`;
|
|
81
|
+
if (openAPIVersion) {
|
|
82
|
+
typeName = `OpenAPIV${openAPIVersion.replace('.', '_')}`;
|
|
83
|
+
}
|
|
84
|
+
text = `import type { ${typeName} } from 'openapi-types'
|
|
80
85
|
const parsed = ${JSON.stringify(parsedDoc)} ${asConst}
|
|
81
|
-
export default parsed`;
|
|
82
|
-
// This overrode the asConst :/
|
|
83
|
-
// if (openAPIVersion) {
|
|
84
|
-
// text += ' satisfies OpenAPI.OpenAPIV' + openAPIVersion.replace('.', '_')
|
|
85
|
-
// } else {
|
|
86
|
-
// text += ' satisfies OpenAPI.Document'
|
|
87
|
-
// }
|
|
86
|
+
export default parsed satisfies ${typeName}.Document`;
|
|
88
87
|
}
|
|
89
88
|
else {
|
|
90
89
|
text = `export default ${JSON.stringify(object)} ${asConst}`;
|
|
@@ -102,7 +101,8 @@ export default parsed`;
|
|
|
102
101
|
constImports.add(resolvedFileName);
|
|
103
102
|
}
|
|
104
103
|
if (hasStringAttribute(ts_, moduleLiteral, 'openAPI', 'true') || hasStringAttribute(ts_, moduleLiteral, 'openAPIVersion')) {
|
|
105
|
-
|
|
104
|
+
isOpenAPI = true;
|
|
105
|
+
openAPIVersion = getStringAttribute(ts_, moduleLiteral, 'openAPIVersion');
|
|
106
106
|
}
|
|
107
107
|
return {
|
|
108
108
|
...resolvedModule,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,iFAAuD;AACvD,sDAA6B;AAC7B,sDAAwB;AACxB,0DAA4B;AAG5B,gDAAuB;AAEvB,MAAM,eAAe,GAAG,IAAA,iBAAO,EAG7B,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;IAClB,wBAAa,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC1C,QAAQ,CAAC,GAAG,EAAE,GAAI,CAAC,CAAA;IACrB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,kBAAkB,GAAG,CAAC,GAAc,EAAE,IAAa,EAAE,aAAqB,EAAsB,EAAE;IACtG,MAAM,UAAU,GAAG,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAA;IAC3F,IAAI,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAA;IACzE,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAA;IAClD,IAAI,CAAC,UAAU;QAAE,OAAO,SAAS,CAAA;IACjC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;IAC3E,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAA;IAChC,OAAO,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;AAChF,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,GAAc,EAAE,IAAa,EAAE,aAAqB,EAAE,cAAuB,EAAW,EAAE;IACpH,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;IAC1D,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,KAAK,KAAK,cAAc,CAAA;IACjC,CAAC;IACD,OAAO,CAAC,CAAC,KAAK,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|