Remove fp doc to be simplified in a later commit.

This commit is contained in:
John-David Dalton
2016-02-11 21:02:44 -08:00
parent b7ae5f0885
commit bd2428dde5
9 changed files with 16 additions and 1198 deletions

View File

@@ -1,72 +0,0 @@
var _ = require('lodash'),
Entry = require('docdown/lib/entry');
var baseGetParams = Entry.prototype.getParams;
// Function copied from docdown/lib/entry that is not exported.
function getMultilineValue(string, tagName) {
var prelude = tagName == 'description' ? '^ */\\*\\*(?: *\\n *\\* *)?' : ('^ *\\*[\\t ]*@' + _.escapeRegExp(tagName) + '\\b'),
postlude = '(?=\\*\\s+\\@[a-z]|\\*/)',
result = _.result(RegExp(prelude + '([\\s\\S]*?)' + postlude, 'gm').exec(string), 1, '');
return _.trim(result.replace(RegExp('(?:^|\\n)[\\t ]*\\*[\\t ]' + (tagName == 'example' ? '?' : '*'), 'g'), '\n'));
}
// Function copied from docdown/lib/entry that is not exported.
function hasTag(string, tagName) {
tagName = tagName == '*' ? '\\w+' : _.escapeRegExp(tagName);
return RegExp('^ *\\*[\\t ]*@' + tagName + '\\b', 'm').test(string);
}
/**
* Return the new ary of a given function.
*
* @param {object} mapping Mapping object that defines the arity of all functions.
* @param {String} name Name of the function associated to the call/function definition.
* @param {boolean} wrapped Flag indicating whether method is wrapped. Will decrement ary if true.
* @return {number} Ary of the function as an integer
*/
function getMethodAry(mapping, name, wrapped) {
var ary = _.find(mapping.caps, function(cap) {
return _.includes(mapping.aryMethod[cap], name) && cap;
});
if (_.isNumber(ary) && wrapped) {
return ary - 1;
}
return ary;
}
/**
* Reorder `params` for a given function definition/call.
*
* @param {object} mapping Mapping object that defines if and how the `params` will be reordered.
* @param {String} name Name of the function associated to the call/function definition.
* @param {*[]} params Parameters/arguments to reorder.
* @param {boolean} wrapped Flag indicating whether method is wrapped. Will decrement ary if true.
* @returns {*[]} Reordered parameters/arguments.
*/
function reorderParams(mapping, name, params, wrapped) {
// Check if reordering is needed.
if (!mapping || mapping.skipRearg[name]) {
return params;
}
var reargOrder = mapping.methodRearg[name] || mapping.aryRearg[getMethodAry(mapping, name, wrapped)];
if (!reargOrder) {
return params;
}
// Reorder params.
var newParams = [];
reargOrder.forEach(function(newPosition, index) {
newParams[newPosition] = params[index];
});
return newParams;
}
module.exports = {
baseGetParams: baseGetParams,
getMultilineValue: getMultilineValue,
hasTag: hasTag,
getMethodAry: getMethodAry,
reorderParams: reorderParams
};

View File

@@ -1,39 +0,0 @@
var _ = require('lodash'),
j = require('jscodeshift'),
Entry = require('docdown/lib/entry'),
common = require('./common');
var baseGetDesc = Entry.prototype.getDesc;
var lineBreaksRegex = /<br\/?>\n?$/g;
/**
* Return the `description` of the entry, only without the possible note about mutation.
*
* @returns {Function} Updated description.
*/
function getReorderedExample() {
var lines = baseGetDesc.call(this).split('\n');
var indexOfLine = _.findIndex(lines, function(line) {
return _.includes(line, 'mutate');
});
if (indexOfLine === -1) {
return lines.join('\n');
}
var linesToDelete = 1;
while (indexOfLine + linesToDelete < lines.length &&
!lines[indexOfLine + linesToDelete].startsWith('<br')) {
linesToDelete++;
}
lines.splice(indexOfLine, linesToDelete);
while (_.last(lines).startsWith('<br')) {
lines = _.initial(lines);
}
return lines.join('\n');
}
module.exports = getReorderedExample;

View File

@@ -1,268 +0,0 @@
var _ = require('lodash'),
recast = require('recast'),
j = require('jscodeshift'),
common = require('./common');
/**
* Return the name of a parameter from its description.
*
* @param {string[]} paramDescription Parameter description.
* @return {string} name of the parameter.
*/
function paramName(paramDescription) {
var name = paramDescription[1];
if (name[0] !== '[') {
return name;
}
return name
.slice(1, name.length - 1)
.split('=')
[0];
}
/**
* Return the default value of the given parameter.
*
* @param {string[]} paramDescription Parameter description.
* @return {string} Default value as string if found, null otherwise.
*/
function getDefaultValue(paramDescription) {
var name = paramDescription[1];
if (name[0] !== '[') {
return null;
}
return name
.slice(1, name.length - 1)
.split('=')
[1] || null;
}
/**
* Return an AST node representation of `str`.
*
* @param {object} j JSCodeShift object.
* @param {string} str String to convert.
* @return {ASTObject} AST node.
*/
function stringToASTNode(j, str) {
return j(str).find(j.Expression).paths()[0].value;
}
/**
* Return a AST node representation of `object.property`.
* If `object.property` can be evaluated (ex: [].length --> 0), the node will be simplified.
* If `defaultValue` references another argument, it will be replaced by the value of that argument.
*
* @param {object} j JSCodeShift object.
* @param {ASTObject} object Object of the member expression.
* @param {string} property Property of the member expression.
* @return {ASTObject} AST node.
*/
function memberExpressiontoASTNode(j, object, property) {
var node = j.memberExpression(object, j.identifier(property));
try {
// Attempt to evaluate the value of the node to have simpler calls
// [1, 2, 3, 4].length --> 4
var evaluatedNode = eval(recast.print(node).code);
return stringToASTNode(j, JSON.stringify(evaluatedNode));
} catch (e) {
return node;
}
}
/**
* Return a AST node representation of `defaultValue`.
* If `defaultValue` references another argument, it will be replaced by the value of that argument.
*
* @param {object} j JSCodeShift object.
* @param {string} defaultValue Value to convert.
* @param {ASTObject[]} args Arguments given to the function.
* @param {string[]} paramNames Name of the expected parameters.
* @return {ASTObject} AST node representation of `defaultValue`.
*/
function defaultValueToASTNode(j, defaultValue, args, paramNames) {
// var endValue = replaceValueByArgValue(j, defaultValue, args, paramNames);
var splitDefaultValue = defaultValue.split('.');
var indexOfReferencedParam = paramNames.indexOf(splitDefaultValue[0]);
if (indexOfReferencedParam !== -1) {
if (splitDefaultValue.length > 1) {
// defaultValue is probably of the type 'someArg.length'
// Other more complicated cases could be handled but none exist as of this writing.
return memberExpressiontoASTNode(j, args[indexOfReferencedParam], splitDefaultValue[1]);
}
return args[indexOfReferencedParam];
}
return stringToASTNode(j, defaultValue);
}
/**
* Same as _.map, but applied in reverse order.
*
* @param {Array} collection The collection to iterate over.
* @param {Function} iteratee The function invoked per iteration.
* @return {Array} Returns the new mapped array.
*/
function mapRight(array, iteratee) {
var res = [];
var index = array.length;
while (index--) {
res = [iteratee(array[index], index)].concat(res);
}
return res;
}
/**
* Return the list of arguments, augmented by the default value of the arguments that were ommitted.
* The augmentation only happens when the method call is made without some of the optional arguments,
* and when the arguments these optional arguments have become compulsory.
* For a `function fn(a, b, c=0, d=b.length) { ... }` with an arity of 4,
* when called with `args` [a, ['b']], returns [a, ['b'], 0, ['b'].length].
* If possible, the value will be evaluated such that ̀`['b'].length` becomes `1`.
*
* @param {object} j JSCodeShift object.
* @param {object} mapping Mapping object that defines if and how the arguments will be reordered.
* @param {String} name Name of the function associated to the call/function definition.
* @param {ASTObject[]} args Arguments to concatenate.
* @param {string[][]} paramsDescription Description of the expected params.
* @return {ASTObject[]} Args along with missing arguments.
*/
function addMissingArguments(j, mapping, name, args, paramsDescription) {
var ary = common.getMethodAry(mapping, name);
if (ary === undefined) {
console.log('WARNING: method `' + name + '` is not capped');
}
ary = ary || 1;
if (ary <= args.length) {
return args;
}
var paramNames = paramsDescription.map(paramName);
var tmpArgs = _.clone(args);
var newArgs = mapRight(_.take(paramsDescription, ary), function(paramDescription, index) {
if (index === tmpArgs.length - 1) {
return tmpArgs.pop();
}
var defaultValue = getDefaultValue(paramDescription);
if (defaultValue !== null) {
return defaultValueToASTNode(j, defaultValue, args, paramNames);
}
return tmpArgs.pop();
});
return newArgs;
}
/**
* Concatenate arguments into an array of arguments.
* For a `function fn(a, b, ...args) { ... }` with an arity of 3,
* when called with `args` [a, b, c, d, e, f], returns [a, b, [c, d, e, f]].
*
* @param {object} j JSCodeShift object.
* @param {object} mapping Mapping object that defines if and how the arguments will be reordered.
* @param {String} name Name of the function associated to the call/function definition.
* @param {ASTObject[]} args Arguments to concatenate.
* @return {ASTObject[]} Concatenated arguments
*/
function concatExtraArgs(j, mapping, name, args) {
var ary = common.getMethodAry(mapping, name);
if (args.length <= ary) {
return args;
}
var concatenatedArgs = j.arrayExpression(_.takeRight(args, args.length - ary + 1));
return _.take(args, ary - 1).concat(concatenatedArgs);
}
/**
* Reorder the args in the example if needed, and eventually merges them when
* the method is called with more args than the method's ary.
*
* @param {object} j JSCodeShift object.
* @param {ASTObject} root AST representation of the example
* @param {object} mapping Mapping object that defines if and how the arguments will be reordered.
* @return {ASTObject} AST object where the arguments are reordered/merged
*/
function reorderMethodArgs(j, root, mapping, paramsDescription) {
root.find(j.CallExpression, { callee: { object: {name: '_' }}})
.replaceWith(function(callExpr, i) {
var value = callExpr.value;
var name = value.callee.property.name;
var argsIncludingMissingOnes = addMissingArguments(j, mapping, name, value.arguments, paramsDescription);
var args = concatExtraArgs(j, mapping, name, argsIncludingMissingOnes);
return j.callExpression(
value.callee,
common.reorderParams(mapping, name, args)
);
});
}
/**
* Remove calls to `console.log` from `codeSample`.
*
* @param {string} codeSample string to remove the calls from.
* @return {string} Updated code sample.
*/
function removeConsoleLogs(codeSample) {
return codeSample
.split('\n')
.filter(function(line) {
return !line.startsWith('console.log');
})
.join('\n');
}
/**
* Updates a code sample so that the arguments in the call are reordered according to `mapping`.
*
* @param {object} mapping Mapping object that defines if and how the arguments will be reordered.
* @param {string} codeSample Code sample to update.
* @returns {string} Updated code sample.
*/
function reorderParamsInExample(mapping, codeSample, paramsDescription) {
var root = j(removeConsoleLogs(codeSample));
try {
reorderMethodArgs(j, root, mapping, paramsDescription);
} catch (error) {
console.error(codeSample);
console.error(error.stack);
process.exit(1);
}
return root.toSource();
}
/**
* Returns the original, not reordered, list of parameters.
*
* @param {Entry} entryItem Entry whose parameters to get.
* @return {string[][]} List of args.
*/
function getOriginalParams(entryItem) {
var prev = entryItem._params;
entryItem._params = undefined;
common.baseGetParams.call(entryItem);
var result = entryItem._params;
entryItem._params = prev;
return result;
}
/**
* Returns a function that extracts the entry's `example` data,
* where function call arguments are reordered according to `mapping`.
*
* @param {object} mapping Mapping object that defines if and how the `params` will be reordered.
* @returns {Function} Function that returns the entry's `example` data.
*/
function getReorderedExample(mapping) {
return function() {
var result = common.getMultilineValue(this.entry, 'example');
if (!result) {
return result;
}
var paramsDescription = getOriginalParams(this);
var resultReordered = reorderParamsInExample(mapping, result, paramsDescription);
return '```' + this.lang + '\n' + resultReordered + '\n```';
};
}
module.exports = getReorderedExample;

View File

@@ -1,13 +0,0 @@
var Entry = require('docdown/lib/entry'),
getUpdatedDesc = require('./description'),
getReorderedParams = require('./parameters'),
getReorderedExample = require('./example');
/**
* Updates `docdown` `Entry`'s prototype so that parameters/arguments are reordered according to `mapping`.
*/
module.exports = function applyFPMapping(mapping) {
Entry.prototype.getDesc = getUpdatedDesc;
Entry.prototype.getParams = getReorderedParams(mapping);
Entry.prototype.getExample = getReorderedExample(mapping);
};

View File

@@ -1,206 +0,0 @@
var _ = require('lodash'),
j = require('jscodeshift'),
Entry = require('docdown/lib/entry'),
common = require('./common');
var baseGetParams = Entry.prototype.getParams;
var dotsRegex = /^\.\.\./;
var parensRegex = /^\((.*)\)$/;
var squareBracketsRegex = /^\[(.*)\]$/;
var arrayRegex = /\[\]$/;
/**
* Return whether method is wrapped.
*
* @param {Entry} entry Entry to look at.
* @return {Boolean} true if the method is wrapped, false if it is static.
*/
function isWrapped(entry) {
return !common.hasTag(entry, 'static');
}
/**
* Extract the entry's `name` data.
* Sub-part of Entry.prototype.getCall() that fetches the name. Using `Entry.prototype.getCall()`
* makes a call to getParams(), which itself call getBaseName --> infinite recursion.
*
* @param {object} entry Entry whose name to extract.
* @returns {string} The entry's `name` data.
*/
function getBaseName(entry) {
var result = /\*\/\s*(?:function\s+([^(]*)|(.*?)(?=[:=,]))/.exec(entry);
if (result) {
result = (result[1] || result[2]).split('.').pop();
result = _.trim(_.trim(result), "'").split('var ').pop();
result = _.trim(result);
}
// Get the function name.
return _.result(/\*[\t ]*@name\s+(.+)/.exec(entry), 1, result || '');
}
/**
* Return `types` as '(X|Y|...)' if `types` contains multiple values, `types[0]` otherwise.
*
* @param {string[]} types Possible types of the parameter.
* @return {string} `types` as a string.
*/
function wrapInParensIfMultiple(types) {
if (types.length > 1) {
return '(' + types.join('|') + ')';
}
return types[0];
}
/**
* Transform parameter type from 'X' to 'X|X[]'.
*
* @param {string[]} param Array whose first item is a description of the parameter type.
* @return {string[]} `param` with the updated type.
*/
function singleItemOrArrayOf(type) {
return type + '|' + type + '[]';
}
/**
* Replace parameter type from something like `...number` to `number|number[]`.
*
* @param {string[]} param Array whose first item is a description of the parameter type.
* @return {string[]} `param` with the updated type.
*/
function removeDotsFromTypeAndAllowMultiple(param) {
var type = param[0];
if (!dotsRegex.test(type)) {
return param;
}
var newType = _.chain(type)
.replace(dotsRegex, '')
.replace(parensRegex, '$1')
.split('|')
.map(function(s) {
return s.replace(arrayRegex, '');
})
.uniq()
.thru(wrapInParensIfMultiple)
.thru(singleItemOrArrayOf)
.value();
return [newType].concat(_.tail(param));
}
/**
* Replace parameter type from something like `...number` to `number|number[]`.
*
* @param {string[]} param Array whose first item is a description of the parameter type.
* @return {string[]} `param` with the updated type.
*/
function removeDotsFromType(param) {
var type = param[0];
if (!dotsRegex.test(type)) {
return param;
}
var newType = type
.replace(dotsRegex, '')
.replace(parensRegex, '$1');
return [newType].concat(_.tail(param));
}
/**
* Find and duplicate the parameter with a type of the form '...x'.
*
* @param {string} name Name of the method.
* @param {string[]} params Description of the parameters of the method.
* @return {string[]} Updated parameters.
*/
function duplicateRestArrays(name, params) {
var indexOfRestParam = _.findIndex(params, function(param) {
return dotsRegex.test(param[0]);
});
if (indexOfRestParam === -1) {
console.log('WARNING: method `' + name + '`',
'is capped to more arguments than its declared number of parameters,',
'but does not have a parameter like `...x`');
}
// duplicates param[indexOfRestParam] at its position
return params.slice(0, indexOfRestParam + 1)
.concat(params.slice(indexOfRestParam));
}
/**
* Remove the optional default value and brackets around the name of the method.
*
* @param {string[]} param Array whose second item is the name of the param of the form
* 'name', '[name]' or [name=defaultValue].
* @return {string[]} `param` with the updated name.
*/
function removeDefaultValue(param) {
var name = param[1]
.replace(squareBracketsRegex, '$1')
.split('=')
[0];
return [param[0], name, param[2]];
}
/**
* Return the updated list of parameters of a method described by `entry`,
* according to changes described by `mapping`. Will, if needed:
* - reorder the arguments
* - remove default values and brackets around previously optional arguments
* - remove ignored arguments
* - duplicate rest arguments if the number of params is less than its cap
* - de-restify arguments
*
* @param {object} mapping Mapping object that defines if and how the `params` will be reordered.
* @param {Entry} entry Method to update.
* @param {string[][]} params List of the original parameters of the method.
* @return {string[][]} Updated list of params.
*/
function updateParamsDescription(mapping, entry, params) {
var tmpParams;
var name = getBaseName(entry);
var ary = common.getMethodAry(mapping, name);
var wrapped = isWrapped(entry);
if (wrapped) {
// Needs one less argument when wrapped
ary = ary - 1;
params.shift();
}
if (ary > params.length) {
tmpParams = duplicateRestArrays(name, params)
.map(removeDotsFromType);
} else {
tmpParams = params
.map(removeDotsFromTypeAndAllowMultiple);
}
tmpParams = _.take(tmpParams, ary).map(removeDefaultValue);
return common.reorderParams(mapping, name, tmpParams, wrapped);
}
/**
* Return a function that extracts the entry's `param` data, reordered according to `mapping`.
*
* @param {object} mapping Mapping object that defines if and how the `params` will be reordered.
* @returns {Function} Function that returns the entry's `param` data.
*/
function getReorderedParams(mapping) {
return function(index) {
if (!this._params) {
// Call baseGetParams in order to compute `this._params`.
baseGetParams.call(this);
// Reorder params according to the `mapping`.
this._params = updateParamsDescription(mapping, this.entry, this._params);
}
return baseGetParams.call(this, index);
};
}
/**
* Updates `docdown` `Entry`'s prototype so that parameters/arguments are reordered according to `mapping`.
*/
module.exports = getReorderedParams;

9
lib/fp/build-doc.js Normal file
View File

@@ -0,0 +1,9 @@
'use strict';
/*----------------------------------------------------------------------------*/
function build(type) {
}
build(_.last(process.argv));

View File

@@ -5,13 +5,9 @@ var _ = require('lodash'),
fs = require('fs-extra'),
path = require('path');
var mapping = require('../../fp/_mapping'),
applyFPMapping = require('./apply-fp-mapping');
var basePath = path.join(__dirname, '..', '..'),
docPath = path.join(basePath, 'doc'),
readmePath = path.join(docPath, 'README.md'),
fpReadmePath = path.join(docPath, 'fp.md');
readmePath = path.join(docPath, 'README.md');
var pkg = require('../../package.json'),
version = pkg.version;
@@ -49,15 +45,11 @@ function onComplete(error) {
}
}
function build(fpFlag, type) {
if (fpFlag) {
applyFPMapping(mapping);
}
function build(type) {
var options = _.defaults({}, config.base, config[type]),
markdown = docdown(options),
filePath = fpFlag ? fpReadmePath : readmePath;
markdown = docdown(options);
fs.writeFile(filePath, postprocess(markdown), onComplete);
fs.writeFile(readmePath, postprocess(markdown), onComplete);
}
build(_.includes(process.argv, '--fp'), _.last(process.argv));
build(_.last(process.argv));