Fix splicing bug and set identifier to package name

kgryte · kgryte · commit dcd772ea8e0a · 2021-09-05T20:59:52.000-07:00
diff --git a/lib/node_modules/@stdlib/_tools/search/pkg-index/lib/create.js b/lib/node_modules/@stdlib/_tools/search/pkg-index/lib/create.js
@@ -24,6 +24,7 @@ var logger = require( 'debug' );
 var lunr = require( 'lunr' );
 var lowercase = require( '@stdlib/string/lowercase' );
 var replace = require( '@stdlib/string/replace' );
+var dirname = require( '@stdlib/utils/dirname' );
 var sectionText = require( './section_text.js' );
 
 
@@ -36,13 +37,43 @@ var RE_LINKS = /\[([^\]]+)\]\[[^\]]+\]/g;
 var RE_TRAILING_PERIOD = /\.$/;
 
 
+// FUNCTIONS //
+
+/**
+* Returns the last index of a specified string.
+*
+* ## Notes
+*
+* -   We assume that `searchValue.length < str.length`.
+*
+* @private
+* @param {string} str - string to search
+* @param {string} searchValue - string to match
+* @returns {integer} index
+*/
+function lastIndexOf( str, searchValue ) {
+	var len;
+	var N;
+	var i;
+
+	len = str.length;
+	N = searchValue.length;
+	for ( i = len-N; i >= 0; i-- ) {
+		if ( str.substring( i, i+N ) === searchValue ) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+
 // MAIN //
 
 /**
 * Returns a serialized lunr.js search index.
 *
 * @private
-* @param {(EmptyArray|StringArray)} files - list of files and their associated contents
+* @param {(EmptyArray|ObjectArray)} files - list of files and their associated contents
 * @returns {Object} serialized search index
 */
 function createIndex( files ) {
@@ -60,7 +91,9 @@ function createIndex( files ) {
 		var file;
 		var blob;
 		var desc;
+		var id;
 		var i;
+		var j;
 
 		this.field( 'title', {
 			'boost': 10
@@ -87,11 +120,16 @@ function createIndex( files ) {
 			desc = replace( desc, RE_TRAILING_PERIOD, '' );
 			debug( 'Description: %s', desc );
 
+			id = dirname( files[ i ].file );
+			j = lastIndexOf( id, '@' );
+			id = id.substring( j );
+			debug( 'id: %s', id );
+
 			blob = {
 				'title': title,
 				'description': desc,
 				'introduction': sectionText( file, 'intro' ),
-				'id': files[ i ].file
+				'id': id
 			};
 			debug( 'File data: %s', JSON.stringify( blob ) );
 			this.add( blob );
diff --git a/lib/node_modules/@stdlib/_tools/search/pkg-index/lib/extract.js b/lib/node_modules/@stdlib/_tools/search/pkg-index/lib/extract.js
@@ -23,11 +23,6 @@
 var visit = require( 'unist-util-visit' );
 
 
-// VARIABLES //
-
-var splice = Array.prototype.splice;
-
-
 // MAIN //
 
 /**
@@ -58,20 +53,17 @@ function sectionNodes( ast, name ) {
 	*/
 	function replacer( node, index, parent ) {
 		var type;
-		var arr;
-
 		if ( FLG ) {
 			return;
 		}
 		type = isSectionTag( node, name );
 		if ( scope && parent === scope ) {
 			if ( type === 'end' ) {
 				// Replace scope by nodes belonging to the given section...
-				arr = [ 0, scope.children.length, {
+				scope.children.splice( 0, scope.children.length, {
 					'type': 'root',
 					'children': nodes
-				}];
-				splice.apply( scope.children, arr );
+				});
 
 				// Set a flag indicating that we have processed a section having the specified name:
 				FLG = true;
diff --git a/lib/node_modules/@stdlib/_tools/search/pkg-index/lib/remove_elements.js b/lib/node_modules/@stdlib/_tools/search/pkg-index/lib/remove_elements.js
@@ -32,10 +32,12 @@ var visit = require( 'unist-util-visit' );
 * @param {Node} node - reference node
 * @param {number} index - position of `node` in `parent`
 * @param {Node} parent - parent of `node`
+* @returns {number} next index to visit
 */
 function remove( node, index, parent ) {
 	if ( parent ) {
 		parent.children.splice( index, 1 );
+		return index;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,12 @@ var visit = require( 'unist-util-visit' );`
`32`	`32`	`* @param {Node} node - reference node`
`33`	`33`	* @param {number} index - position of `node` in `parent`
`34`	`34`	* @param {Node} parent - parent of `node`
	`35`	`+* @returns {number} next index to visit`
`35`	`36`	`*/`
`36`	`37`	`function remove( node, index, parent ) {`
`37`	`38`	`if ( parent ) {`
`38`	`39`	`parent.children.splice( index, 1 );`
	`40`	`+ return index;`
`39`	`41`	`}`
`40`	`42`	`}`
`41`	`43`