Skip to content

refactor: move utils to own-file #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions lib/compile-exports.js

This file was deleted.

19 changes: 0 additions & 19 deletions lib/getImportPrefix.js

This file was deleted.

43 changes: 0 additions & 43 deletions lib/getLocalIdent.js

This file was deleted.

3 changes: 1 addition & 2 deletions lib/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
const loaderUtils = require('loader-utils');

const processCss = require('./processCss');
const getImportPrefix = require('./getImportPrefix');
const compileExports = require('./compile-exports');
const { getImportPrefix, compileExports } = require('./utils');

module.exports = function loader(content, map) {
const callback = this.async();
Expand Down
3 changes: 1 addition & 2 deletions lib/localsLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
const loaderUtils = require('loader-utils');

const processCss = require('./processCss');
const getImportPrefix = require('./getImportPrefix');
const compileExports = require('./compile-exports');
const { getImportPrefix, compileExports } = require('./utils');

module.exports = function loader(content) {
const callback = this.async();
Expand Down
2 changes: 1 addition & 1 deletion lib/processCss.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const modulesValues = require('postcss-modules-values');
const cssLoaderParser = require('./postcss-css-loader-parser');

const CssSyntaxError = require('./CssSyntaxError');
const getLocalIdent = require('./getLocalIdent');
const { getLocalIdent } = require('./utils');

module.exports = function processCss(inputSource, inputMap, options, callback) {
const { query } = options;
Expand Down
117 changes: 117 additions & 0 deletions lib/utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/*
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra
*/
const path = require('path');

const camelCase = require('lodash/camelCase');
const loaderUtils = require('loader-utils');

function dashesCamelCase(str) {
return str.replace(/-+(\w)/g, (match, firstLetter) =>
firstLetter.toUpperCase()
);
}

function compileExports(result, importItemMatcher, camelCaseKeys) {
if (!Object.keys(result.exports).length) {
return '';
}

const exportJs = Object.keys(result.exports)
.reduce((res, key) => {
let valueAsString = JSON.stringify(result.exports[key]);
valueAsString = valueAsString.replace(
result.importItemRegExpG,
importItemMatcher
);
function addEntry(k) {
res.push(`\t${JSON.stringify(k)}: ${valueAsString}`);
}

let targetKey;
switch (camelCaseKeys) {
case true:
addEntry(key);
targetKey = camelCase(key);
if (targetKey !== key) {
addEntry(targetKey);
}
break;
case 'dashes':
addEntry(key);
targetKey = dashesCamelCase(key);
if (targetKey !== key) {
addEntry(targetKey);
}
break;
case 'only':
addEntry(camelCase(key));
break;
case 'dashesOnly':
addEntry(dashesCamelCase(key));
break;
default:
addEntry(key);
break;
}
return res;
}, [])
.join(',\n');

return `{\n${exportJs}\n}`;
}

function getImportPrefix(loaderContext, query) {
if (query.importLoaders === false) {
return '';
}

const importLoaders = parseInt(query.importLoaders, 10) || 0;
const loadersRequest = loaderContext.loaders
.slice(
loaderContext.loaderIndex,
loaderContext.loaderIndex + 1 + importLoaders
)
.map((x) => x.request)
.join('!');
return `-!${loadersRequest}!`;
}

function getLocalIdent(loaderContext, localIdentName, localName, options) {
if (!options.context) {
if (loaderContext.rootContext) {
// eslint-disable-next-line no-param-reassign
options.context = loaderContext.rootContext;
} else if (
loaderContext.options &&
typeof loaderContext.options.context === 'string'
) {
// eslint-disable-next-line no-param-reassign
options.context = loaderContext.options.context;
} else {
// eslint-disable-next-line no-param-reassign
options.context = loaderContext.context;
}
}
const request = path.relative(options.context, loaderContext.resourcePath);
// eslint-disable-next-line no-param-reassign
options.content = `${options.hashPrefix + request}+${localName}`;
// eslint-disable-next-line no-param-reassign
localIdentName = localIdentName.replace(/\[local\]/gi, localName);
const hash = loaderUtils.interpolateName(
loaderContext,
localIdentName,
options
);
return hash
.replace(new RegExp('[^a-zA-Z0-9\\-_\u00A0-\uFFFF]', 'g'), '-')
.replace(/^((-?[0-9])|--)/, '_$1');
}

module.exports = {
dashesCamelCase,
compileExports,
getImportPrefix,
getLocalIdent,
};