Browse Source

Improve language pack verification (#206)

* Add warnings for unused files in packs

* Add warnings for todos

* Cleanup pack file conversion
pull/208/head
Matt (IPv4) Cowley 4 years ago committed by GitHub
parent
commit
2b459b47ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 91
      src/nginxconfig/i18n/verify.js
  2. 27
      src/nginxconfig/util/snake_to_camel.js

91
src/nginxconfig/i18n/verify.js

@ -24,10 +24,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { readdirSync } from 'fs';
import { readdirSync, readFileSync } from 'fs';
import { join, sep } from 'path';
import chalk from 'chalk';
import { defaultPack } from '../util/language_pack_default';
import { fromSep } from '../util/language_pack_name';
import { toSep, fromSep } from '../util/language_pack_name';
import snakeToCamel from '../util/snake_to_camel';
// Load all the packs in
const packs = {};
@ -55,6 +57,54 @@ const explore = packFragment => {
return foundKeys;
};
// Recursively get all the files in a i18n pack directory
const files = directory => {
const foundFiles = new Set();
for (const dirent of readdirSync(join(__dirname, directory), { withFileTypes: true })) {
const base = join(directory, dirent.name);
// If this is a file, store it
if (dirent.isFile()) {
foundFiles.add(base);
continue;
}
// If this is a directory, recurse
if (dirent.isDirectory()) {
files(base).forEach(recurseFile => foundFiles.add(recurseFile));
}
// Otherwise, ignore this
}
return foundFiles;
};
// Get all the todo items in a file
const todos = file => {
const content = readFileSync(join(__dirname, file), 'utf8');
const lines = content.split('\n');
const items = [];
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
const match = line.match(/\/\/\s*todo([([].*?[)\]])?\s*:?\s*(.*)/i);
if (match) items.push([i + 1, line, match[0], match[1], match[2]]);
}
return items;
};
// Convert a pack file to a pack object key
const fileToObject = file => file
// Drop language pack prefix
.split(sep).slice(1).join(sep)
// Drop js extension
.split('.').slice(0, -1).join('.')
// Replace sep with period and use camelCase
.split(sep).map(dir => snakeToCamel(dir)).join('.');
// Get all the keys for the default "source" language pack
const defaultKeys = explore(packs[defaultPack]);
@ -65,21 +115,36 @@ let hadError = false;
for (const [pack, packData] of Object.entries(packs)) {
console.log(chalk.underline(`Language pack \`${pack}\``));
// We don't need to compare default to itself
if (pack === defaultPack) {
console.log(` Default pack, found ${defaultKeys.size.toLocaleString()} keys`);
console.log(chalk.reset());
continue;
}
// Get the base data
const packKeys = explore(packData);
const packFiles = files(toSep(pack, '-'));
console.log(` Found ${packKeys.size.toLocaleString()} keys, ${packFiles.size.toLocaleString()} files`);
// Track all our errors and warnings
const errors = [], warnings = [];
// Get all the keys and the set differences
const packKeys = explore(packData);
const missingKeys = [...defaultKeys].filter(x => !packKeys.has(x));
const extraKeys = [...packKeys].filter(x => !defaultKeys.has(x));
// Missing keys are errors, extra keys are just warnings
const errors = missingKeys.map(key => `Missing key \`${key}\``);
const warnings = extraKeys.map(key => `Unexpected key \`${key}\``);
// Missing keys and extra keys are errors
missingKeys.forEach(key => errors.push(`Missing key \`${key}\``));
extraKeys.forEach(key => errors.push(`Unexpected key \`${key}\``));
// Get all the files in the pack directory
const packKeyFiles = new Set([...packFiles].filter(file => file.split(sep).slice(-1)[0] !== 'index.js'));
// Get the objects from the pack keys
const packKeyObjects = new Set([...packKeys]
.map(key => key.split('.').slice(0, -1).join('.')));
// Warn for any files that aren't used as pack objects
[...packKeyFiles].filter(file => !packKeyObjects.has(fileToObject(file)))
.forEach(file => warnings.push(`Unused file \`${file}\``));
// Locate any todos in each file as a warning
for (const file of packFiles)
todos(file).forEach(todo => warnings.push(`TODO in \`${file}\` on line ${todo[0]}`));
// Output the pack results
if (warnings.length)
@ -89,7 +154,7 @@ for (const [pack, packData] of Object.entries(packs)) {
for (const error of errors)
console.log(` ${chalk.red('error')} ${error}`);
if (!errors.length && !warnings.length)
console.log(` ${chalk.green('No issues, all keys present with no unexpected keys')}`);
console.log(` ${chalk.green('No issues')}`);
// If we had errors, script should exit 1
if (errors.length) hadError = true;

27
src/nginxconfig/util/snake_to_camel.js

@ -0,0 +1,27 @@
/*
Copyright 2020 DigitalOcean
This code is licensed under the MIT License.
You may obtain a copy of the License at
https://github.com/digitalocean/nginxconfig.io/blob/master/LICENSE or https://mit-license.org/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions :
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
export default str => str.replace(/_(\w)/g, m => `${m[0].replace('_', '')}${m[1].toUpperCase()}`);
Loading…
Cancel
Save