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

Use individual imports instead of * imports

Browse Source
This commit is contained in:
ahocevar
2018-10-25 21:54:06 +02:00
parent 6ceb03f86b
commit 1674620943
1 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tasks/generate-index.js
View File

@@ -13,44 +13,41 @@ async function getSymbols() {
} }
/** /**
* Generate a list of imports. * Generate an import statement.
* @param {Array<Object>} symbols List of symbols. * @param {Object} symbol Symbol.
* @return {Promise<Array>} A list of imports sorted by export name. * @param {string} member Member.
* @return {string} An import statement.
*/ */
function getImports(symbols) { function getImport(symbol, member) {
const imports = {}; const defaultExport = symbol.name.split('~');
symbols.forEach(symbol => { const namedExport = symbol.name.split('.');
const defaultExport = symbol.name.split('~'); if (defaultExport.length > 1) {
const namedExport = symbol.name.split('.'); const from = defaultExport[0].replace(/^module\:/, './');
if (defaultExport.length > 1) { const importName = from.replace(/[.\/]+/g, '$');
const from = defaultExport[0].replace(/^module\:/, './'); return `import ${importName} from '${from}';`;
const importName = from.replace(/[.\/]+/g, '$'); } else if (namedExport.length > 1 && member) {
const defaultImport = `import ${importName} from '${from}';`; const from = namedExport[0].replace(/^module\:/, './');
imports[defaultImport] = true; const importName = from.replace(/[.\/]+/g, '_');
} else if (namedExport.length > 1) { return `import {${member} as ${importName}$${member}} from '${from}';`;
const from = namedExport[0].replace(/^module\:/, './'); }
const importName = from.replace(/[.\/]+/g, '_');
const namedImport = `import * as ${importName} from '${from}';`;
imports[namedImport] = true;
}
});
return Object.keys(imports).sort();
} }
/** /**
* Generate code to export a named symbol. * Generate code to export a named symbol.
* @param {string} name Symbol name. * @param {Object} symbol Symbol.
* @param {Object<string, string>} namespaces Already defined namespaces. * @param {Object<string, string>} namespaces Already defined namespaces.
* @param {Object} imports Imports.
* @return {string} Export code. * @return {string} Export code.
*/ */
function formatSymbolExport(name, namespaces) { function formatSymbolExport(symbol, namespaces, imports) {
const name = symbol.name;
const parts = name.split('~'); const parts = name.split('~');
const isNamed = parts[0].indexOf('.') !== -1; const isNamed = parts[0].indexOf('.') !== -1;
const nsParts = parts[0].replace(/^module\:/, '').split(/[\/\.]/); const nsParts = parts[0].replace(/^module\:/, '').split(/[\/\.]/);
const last = nsParts.length - 1; const last = nsParts.length - 1;
const importName = isNamed ? const importName = isNamed ?
'_' + nsParts.slice(0, last).join('_') + '.' + nsParts[last] : '_' + nsParts.slice(0, last).join('_') + '$' + nsParts[last] :
'$' + nsParts.join('$'); '$' + nsParts.join('$');
let line = nsParts[0]; let line = nsParts[0];
for (let i = 1, ii = nsParts.length; i < ii; ++i) { for (let i = 1, ii = nsParts.length; i < ii; ++i) {
@@ -58,6 +55,7 @@ function formatSymbolExport(name, namespaces) {
namespaces[line] = (line in namespaces ? namespaces[line] : true) && i < ii - 1; namespaces[line] = (line in namespaces ? namespaces[line] : true) && i < ii - 1;
} }
line += ` = ${importName};`; line += ` = ${importName};`;
imports[getImport(symbol, nsParts.pop())] = true;
return line; return line;
} }
@@ -69,12 +67,18 @@ function formatSymbolExport(name, namespaces) {
* @param {Array<string>} imports List of all imports. * @param {Array<string>} imports List of all imports.
* @return {string} Export code. * @return {string} Export code.
*/ */
function generateExports(symbols, namespaces, imports) { function generateExports(symbols) {
const namespaces = {};
const imports = [];
let blocks = []; let blocks = [];
symbols.forEach(function(symbol) { symbols.forEach(function(symbol) {
const name = symbol.name; const name = symbol.name;
if (name.indexOf('#') == -1) { if (name.indexOf('#') == -1) {
const block = formatSymbolExport(name, namespaces); const imp = getImport(symbol);
if (imp) {
imports[getImport(symbol)] = true;
}
const block = formatSymbolExport(symbol, namespaces, imports);
if (block !== blocks[blocks.length - 1]) { if (block !== blocks[blocks.length - 1]) {
blocks.push(block); blocks.push(block);
} }
@@ -87,8 +91,8 @@ function generateExports(symbols, namespaces, imports) {
nsdefs.push(`${ns[i]} = {};`); nsdefs.push(`${ns[i]} = {};`);
} }
} }
blocks = imports.concat('\nvar ol = window[\'ol\'] = {};\n', nsdefs.sort()).concat(blocks.sort()); blocks = Object.keys(imports).concat('\nvar ol = {};\n', nsdefs.sort()).concat(blocks.sort());
blocks.push(''); blocks.push('', 'export default ol;');
return blocks.join('\n'); return blocks.join('\n');
} }
@@ -99,8 +103,7 @@ function generateExports(symbols, namespaces, imports) {
*/ */
async function main() { async function main() {
const symbols = await getSymbols(); const symbols = await getSymbols();
const imports = await getImports(symbols); return generateExports(symbols);
return generateExports(symbols, {}, imports);
} }