Skip to content
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.

Sign up for GitHub

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

Jump to bottom

remove node module caching dependency #1691

Merged
merged 2 commits into from
Jan 25, 2021
Merged

remove node module caching dependency #1691

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
156795f
split static.js
5saviahv Jan 20, 2021
d1e65eb
Update index.js
5saviahv Jan 25, 2021
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
8 changes: 5 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
'use strict';
/**
* @module cheerio
* @borrows load.load as load
* @borrows static.load as load
5saviahv marked this conversation as resolved.
Show resolved Hide resolved
* @borrows static.html as html
* @borrows static.text as text
* @borrows static.xml as xml
*/
var staticMethods = require('./lib/static');

exports = module.exports = require('./lib/cheerio');

var staticMethods = require('./lib/static');
var loadMethod = require('./lib/load');

/**
* An identifier describing the version of Cheerio which has been executed.
*
* @type {string}
*/
exports.version = require('./package.json').version;

exports.load = staticMethods.load;
exports.load = loadMethod.load;
exports.html = staticMethods.html;
exports.text = staticMethods.text;
exports.xml = staticMethods.xml;
Expand Down
65 changes: 65 additions & 0 deletions lib/load.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
'use strict';
/**
* @module cheerio/load
* @ignore
*/
var defaultOptions = require('./options').default;
var flattenOptions = require('./options').flatten;
var staticMethods = require('./static');
var Cheerio = require('./cheerio');
var parse = require('./parse');

/**
* Create a querying function, bound to a document created from the provided
* markup. Note that similar to web browser contexts, this operation may
* introduce `<html>`, `<head>`, and `<body>` elements; set `isDocument` to
* `false` to switch to fragment mode and disable this.
*
* See the README section titled "Loading" for additional usage information.
*
* @param {string} content - Markup to be loaded.
* @param {object} [options] - Options for the created instance.
* @param {boolean} [isDocument] - Allows parser to be switched to fragment mode.
* @returns {Cheerio} - The loaded document.
*/
exports.load = function (content, options, isDocument) {
if (content === null || content === undefined) {
throw new Error('cheerio.load() expects a string');
}

options = Object.assign({}, defaultOptions, flattenOptions(options));

if (typeof isDocument === 'undefined') isDocument = true;

var root = parse(content, options, isDocument);

function initialize(selector, context, r, opts) {
if (!(this instanceof initialize)) {
return new initialize(selector, context, r, opts);
}
opts = Object.assign({}, options, opts);
return Cheerio.call(this, selector, context, r || root, opts);
}

// Ensure that selections created by the "loaded" `initialize` function are
// true Cheerio instances.
initialize.prototype = Object.create(Cheerio.prototype);
initialize.prototype.constructor = initialize;

// Mimic jQuery's prototype alias for plugin authors.
initialize.fn = initialize.prototype;

// Keep a reference to the top-level scope so we can chain methods that implicitly
// resolve selectors; e.g. $("<span>").(".bar"), which otherwise loses ._root
initialize.prototype._originalRoot = root;

// Add in the static methods
Object.assign(initialize, staticMethods, exports);

// Add in the root
initialize._root = root;
// store options
initialize._options = options;

return initialize;
};
58 changes: 0 additions & 58 deletions lib/static.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,6 @@ var flattenOptions = require('./options').flatten;
var select = require('cheerio-select').select;
var renderWithParse5 = require('./parsers/parse5').render;
var renderWithHtmlparser2 = require('./parsers/htmlparser2').render;
var parse = require('./parse');

/**
* Create a querying function, bound to a document created from the provided
* markup. Note that similar to web browser contexts, this operation may
* introduce `<html>`, `<head>`, and `<body>` elements; set `isDocument` to
* `false` to switch to fragment mode and disable this.
*
* See the README section titled "Loading" for additional usage information.
*
* @param {string} content - Markup to be loaded.
* @param {object} [options] - Options for the created instance.
* @param {boolean} [isDocument] - Allows parser to be switched to fragment mode.
* @returns {Cheerio} - The loaded document.
*/
exports.load = function (content, options, isDocument) {
if (content === null || content === undefined) {
throw new Error('cheerio.load() expects a string');
}

var Cheerio = require('./cheerio');

options = Object.assign({}, defaultOptions, flattenOptions(options));

if (typeof isDocument === 'undefined') isDocument = true;

var root = parse(content, options, isDocument);

function initialize(selector, context, r, opts) {
if (!(this instanceof initialize)) {
return new initialize(selector, context, r, opts);
}
opts = Object.assign({}, options, opts);
return Cheerio.call(this, selector, context, r || root, opts);
}