ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make code prettier

Browse Source 
This updates ESLint and our shared eslint-config-openlayers to use Prettier.  Most formatting changes were automatically applied with this:

    npm run lint -- --fix

A few manual changes were required:

 * In `examples/offscreen-canvas.js`, the `//eslint-disable-line` comment needed to be moved to the appropriate line to disable the error about the `'worker-loader!./offscreen-canvas.worker.js'` import.
 * In `examples/webpack/exapmle-builder.js`, spaces could not be added after a couple `function`s for some reason.  While editing this, I reworked `ExampleBuilder` to be a class.
 * In `src/ol/format/WMSGetFeatureInfo.js`, the `// @ts-ignore` comment needed to be moved down one line so it applied to the `parsersNS` argument.
This commit is contained in:
Tim Schaub
2020-04-06 12:25:12 -06:00
parent 53b48baf62
commit 054af09032
790 changed files with 46833 additions and 33765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tasks/generate-index.js
View File

@@ -2,14 +2,13 @@ const fse = require('fs-extra');
const path = require('path');
const generateInfo = require('./generate-info');
/**
* Read the symbols from info file.
* @return {Promise<Array>} Resolves with an array of symbol objects.
*/
async function getSymbols() {
const info = await generateInfo();
return info.symbols.filter(symbol => symbol.kind != 'member');
return info.symbols.filter((symbol) => symbol.kind != 'member');
}
/**
@@ -32,7 +31,6 @@ function getImport(symbol, member) {
}
}
/**
* Generate code to export a named symbol.
* @param {Object} symbol Symbol.
@@ -46,20 +44,20 @@ function formatSymbolExport(symbol, namespaces, imports) {
const isNamed = parts[0].indexOf('.') !== -1;
const nsParts = parts[0].replace(/^module\:/, '').split(/[\/\.]/);
const last = nsParts.length - 1;
const importName = isNamed ?
'_' + nsParts.slice(0, last).join('_') + '$' + nsParts[last] :
'$' + nsParts.join('$');
const importName = isNamed
? '_' + nsParts.slice(0, last).join('_') + '$' + nsParts[last]
: '$' + nsParts.join('$');
let line = nsParts[0];
for (let i = 1, ii = nsParts.length; i < ii; ++i) {
line += `.${nsParts[i]}`;
namespaces[line] = (line in namespaces ? namespaces[line] : true) && i < ii - 1;
namespaces[line] =
(line in namespaces ? namespaces[line] : true) && i < ii - 1;
}
line += ` = ${importName};`;
imports[getImport(symbol, nsParts.pop())] = true;
return line;
}
/**
* Generate export code given a list symbol names.
* @param {Array<Object>} symbols List of symbols.
@@ -71,7 +69,7 @@ function generateExports(symbols) {
const namespaces = {};
const imports = [];
let blocks = [];
symbols.forEach(function(symbol) {
symbols.forEach(function (symbol) {
const name = symbol.name;
if (name.indexOf('#') == -1) {
const imp = getImport(symbol);
@@ -91,12 +89,13 @@ function generateExports(symbols) {
nsdefs.push(`${ns[i]} = {};`);
}
}
blocks = Object.keys(imports).concat('\nvar ol = {};\n', nsdefs.sort()).concat(blocks.sort());
blocks = Object.keys(imports)
.concat('\nvar ol = {};\n', nsdefs.sort())
.concat(blocks.sort());
blocks.push('', 'export default ol;');
return blocks.join('\n');
}
/**
* Generate the exports code.
* @return {Promise<string>} Resolves with the exports code.
@@ -106,21 +105,21 @@ async function main() {
return generateExports(symbols);
}
/**
* If running this module directly, read the config file, call the main
* function, and write the output file.
*/
if (require.main === module) {
main().then(async code => {
const filepath = path.join(__dirname, '..', 'build', 'index.js');
await fse.outputFile(filepath, code);
}).catch(err => {
process.stderr.write(`${err.message}\n`, () => process.exit(1));
});
main()
.then(async (code) => {
const filepath = path.join(__dirname, '..', 'build', 'index.js');
await fse.outputFile(filepath, code);
})
.catch((err) => {
process.stderr.write(`${err.message}\n`, () => process.exit(1));
});
}
/**
* Export main function.
*/