yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-08 14:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added silence option and handle skipped schemas

Browse Source
This commit is contained in:
Convly 2022-06-03 16:45:20 +02:00
parent da56cc6a7b
commit 4308a2f269
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/strapi/bin/strapi.js
View File

@ -221,6 +221,7 @@ program
'Specify a relative directory in which the schemas definitions will be generated'
)
.option('-f, --file <file>', 'Specify a filename to store the schemas definitions')
.option('-s, --silence', `Don't display debug information`, false)
.action(getLocalScript('content-types/generate-types'));
program

41
packages/core/strapi/lib/commands/content-types/generate-types/index.js
View File

@ -17,7 +17,7 @@ const { generateGlobalDefinition } = require('./global');
const { generateImports } = require('./imports');
const { logWarning, getSchemaTypeName } = require('./utils');
module.exports = async function({ outDir, file }) {
module.exports = async function({ outDir, file, silence }) {
const [app, dirs] = await setup();
const schemas = getAllStrapiSchemas(app);
@ -36,17 +36,42 @@ module.exports = async function({ outDir, file }) {
await generateSchemaFile(outDir || dirs.app, fullDefinition, file);
for (const defintion of definitions) {
table.push([defintion.kind, defintion.uid, defintion.type, chalk.greenBright('✓')]);
for (const definition of definitions) {
const isValidDefinition = definition.definition !== null;
const validateAndTransform = isValidDefinition ? fp.identity : chalk.redBright;
table.push([
validateAndTransform(definition.kind),
validateAndTransform(definition.uid),
validateAndTransform(definition.type),
isValidDefinition ? chalk.greenBright('✓') : chalk.redBright('✗'),
]);
}
const successfullDefinition = fp.filter(d => !fp.isNil(d.definition), definitions);
const skippedDefinition = fp.filter(d => fp.isNil(d.definition), definitions);
if (!silence) {
console.log(table.toString());
console.log(
chalk.greenBright(
`Generated ${fp.size(definitions)} type definition for your Strapi application's schemas.`
`Generated ${fp.size(
successfullDefinition
)} type definition for your Strapi application's schemas.`
)
);
const skippedAmount = fp.size(skippedDefinition);
if (skippedAmount > 0) {
console.log(
chalk.redBright(
`Skipped ${skippedAmount} (${skippedDefinition.map(d => d.uid).join(', ')})`
)
);
}
}
app.destroy();
};
@ -90,16 +115,14 @@ const generateTypesDefinitions = schemas => {
}
// Content Types
else if (modelType === 'contentType') {
else if (modelType === 'contentType' && ['singleType', 'collectionType'].includes(kind)) {
definition = generateContentTypeDefinition(uid, schema, type);
}
// Other
else {
logWarning(
`${uid} has an invalid model type: "${modelType}". Allowed model types are "component" and "contentType"`
);
continue;
logWarning(`"${uid}" has an invalid model definition. Skipping...`);
definition = null;
}
// Add the generated definition to the list