yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix spaces in attribute names

Browse Source
This commit is contained in:
Maxwell Simmer 2019-07-09 23:51:21 +02:00
parent abef483bc4
commit b04177e37a
1 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
packages/strapi-generate-api/lib/before.js
View File

@ -13,7 +13,10 @@ const _ = require('lodash');
const pluralize = require('pluralize');
// Fetch stub attribute template on initial load.
const attributeTemplate = fs.readFileSync(path.resolve(__dirname, '..', 'templates', 'attribute.template'), 'utf8');
const attributeTemplate = fs.readFileSync(
path.resolve(__dirname, '..', 'templates', 'attribute.template'),
'utf8'
);
/* eslint-disable prefer-template */
/**
* This `before` function is run before generating targets.
@ -38,39 +41,41 @@ module.exports = (scope, cb) => {
_.defaults(scope, {
idPluralized: pluralize.plural(_.trim(_.camelCase(scope.id))),
parentId: _.isEmpty(parent) ? undefined : _.trim(_.deburr(parent)),
parentIdPluralized: _.isEmpty(scope.parentId) ? undefined : pluralize.plural(_.trim(_.camelCase(scope.parentId))),
environment: process.env.NODE_ENV || 'development'
parentIdPluralized: _.isEmpty(scope.parentId)
? undefined
: pluralize.plural(_.trim(_.camelCase(scope.parentId))),
environment: process.env.NODE_ENV || 'development',
});
// Determine default values based on the available scope.
_.defaults(scope, {
globalID: _.upperFirst(_.camelCase(scope.id)),
ext: '.js'
ext: '.js',
});
// Take another pass to take advantage of the defaults absorbed in previous passes.
_.defaults(scope, {
rootPath: scope.rootPath,
filename: `${scope.globalID}${scope.ext}`,
filenameSettings: scope.globalID + '.settings.json',
folderPrefix: !scope.args.api && scope.args.plugin ? 'plugins' : 'api',
folderName: _.camelCase(scope.parentId || scope.id).toLowerCase()
folderName: _.camelCase(scope.parentId || scope.id).toLowerCase(),
});
// Humanize output.
_.defaults(scope, {
humanizeId: _.camelCase(scope.id).toLowerCase(),
humanizeIdPluralized: pluralize.plural(_.camelCase(scope.id).toLowerCase()),
humanizedPath: `\`./${scope.folderPrefix}/${scope.parentId ? '' + scope.folderName : ''}\``
humanizedPath: `\`./${scope.folderPrefix}/${
scope.parentId ? '' + scope.folderName : ''
}\``,
});
// Validate optional attribute arguments.
const invalidAttributes = [];
// Map attributes and split them for CLI.
scope.attributes = scope.args.attributes.map((attribute) => {
scope.attributes = scope.args.attributes.map(attribute => {
if (_.isString(attribute)) {
const parts = attribute.split(':');
@ -78,15 +83,17 @@ module.exports = (scope, cb) => {
// Handle invalid attributes.
if (!parts[1] || !parts[0]) {
invalidAttributes.push('Error: Invalid attribute notation `' + attribute + '`.');
invalidAttributes.push(
'Error: Invalid attribute notation `' + attribute + '`.'
);
return;
}
return {
name: _.trim(_.deburr(_.lowerCase(parts[0]).toLowerCase())),
name: _.trim(_.deburr(parts[0].toLowerCase())),
params: {
type: _.trim(_.deburr(_.lowerCase(parts[1]).toLowerCase()))
}
type: _.trim(_.deburr(parts[1].toLowerCase())),
},
};
} else {
return _.has(attribute, 'params.type') ? attribute : undefined;
@ -102,29 +109,56 @@ module.exports = (scope, cb) => {
}
// Make sure there aren't duplicates.
if (_(scope.attributes.map(attribute => (attribute.name))).uniq().valueOf().length !== scope.attributes.length) {
if (
_(scope.attributes.map(attribute => attribute.name))
.uniq()
.valueOf().length !== scope.attributes.length
) {
return cb.invalid('Duplicate attributes not allowed!');
}
// Render some stringified code from the action template
// and make it available in our scope for use later on.
scope.attributes = scope.attributes.map((attribute) => {
const compiled = _.template(attributeTemplate);
return _.trimEnd(_.unescape(compiled({
name: attribute.name,
params: attribute.params
})));
}).join(',\n');
scope.attributes = scope.attributes
.map(attribute => {
const compiled = _.template(attributeTemplate);
return _.trimEnd(
_.unescape(
compiled({
name: attribute.name,
params: attribute.params,
})
)
);
})
.join(',\n');
// Set collectionName
scope.collectionName = _.has(scope.args, 'collectionName') ? scope.args.collectionName : undefined;
scope.collectionName = _.has(scope.args, 'collectionName')
? scope.args.collectionName
: undefined;
// Set description
scope.description = _.has(scope.args, 'description') ? scope.args.description : undefined;
scope.description = _.has(scope.args, 'description')
? scope.args.description
: undefined;
// Get default connection
try {
scope.connection = _.get(scope.args, 'connection') || JSON.parse(fs.readFileSync(path.resolve(scope.rootPath, 'config', 'environments', scope.environment, 'database.json'))).defaultConnection || '';
scope.connection =
_.get(scope.args, 'connection') ||
JSON.parse(
fs.readFileSync(
path.resolve(
scope.rootPath,
'config',
'environments',
scope.environment,
'database.json'
)
)
).defaultConnection ||
'';
} catch (err) {
return cb.invalid(err);
}