chore: fix model types generation (#6706)
This commit is contained in:
parent
17553e253d
commit
7d0b4c263f
|
|
@ -250,15 +250,15 @@ for (const element of documentation.classesArray) {
|
||||||
renderBaseClass(element);
|
renderBaseClass(element);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (let [name, type] of optionTypes)
|
||||||
|
renderOptionType(name, type);
|
||||||
|
|
||||||
for (let [name, type] of modelTypes)
|
for (let [name, type] of modelTypes)
|
||||||
renderModelType(name, type);
|
renderModelType(name, type);
|
||||||
|
|
||||||
for (let [name, literals] of enumTypes)
|
for (let [name, literals] of enumTypes)
|
||||||
renderEnum(name, literals);
|
renderEnum(name, literals);
|
||||||
|
|
||||||
for (let [name, type] of optionTypes)
|
|
||||||
renderOptionType(name, type);
|
|
||||||
|
|
||||||
if (process.argv[3] !== "--skip-format") {
|
if (process.argv[3] !== "--skip-format") {
|
||||||
// run the formatting tool for .net, to ensure the files are prepped
|
// run the formatting tool for .net, to ensure the files are prepped
|
||||||
execSync(`dotnet format -f "${typesDir}" --include-generated --fix-whitespace`);
|
execSync(`dotnet format -f "${typesDir}" --include-generated --fix-whitespace`);
|
||||||
|
|
@ -438,7 +438,7 @@ function generateNameDefault(member, name, t, parent) {
|
||||||
attemptedName = `${names.pop()}${attemptedName}`;
|
attemptedName = `${names.pop()}${attemptedName}`;
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
modelTypes.set(attemptedName, t);
|
registerModelType(attemptedName, t);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -883,6 +883,8 @@ function translateType(type, parent, generateNameCallback = t => t.name, optiona
|
||||||
function registerModelType(typeName, type) {
|
function registerModelType(typeName, type) {
|
||||||
if (['object', 'string', 'int'].includes(typeName))
|
if (['object', 'string', 'int'].includes(typeName))
|
||||||
return;
|
return;
|
||||||
|
if (typeName.endsWith('Option'))
|
||||||
|
return;
|
||||||
|
|
||||||
let potentialType = modelTypes.get(typeName);
|
let potentialType = modelTypes.get(typeName);
|
||||||
if (potentialType) {
|
if (potentialType) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue