umberto 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "umberto",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "CKSource Documentation builder",
   "main": "src/index.js",
   "files": [

package/src/data-converter/converters/typedoc/accessorparser.js

@@ -47,7 +47,7 @@ module.exports = class AccessorParser extends AbstractParser {
 
 			scope: this.getScope( item ),
 			readonly: this.isReadonly( item ),
-			access: this.getVisibility( item ),
+			access: this.getVisibilityIncludingSignature( item ),
 			kind: this.getKind( item ),
 			extraId: this.getExtraId( item ),
 			description: this.getComment( getSignature || setSignature ),
@@ -61,4 +61,21 @@ module.exports = class AccessorParser extends AbstractParser {
 			params: null
 		};
 	}
+
+	/**
+	 * Returns the access type for the item based on its signatures.
+	 *
+	 * @param {TypedocReflection<Accessor>} item
+	 * @returns {'public'|'internal'|'protected'|'private'}
+	 */
+	getVisibilityIncludingSignature( item ) {
+		if ( item.setSignature ) {
+			return this.getVisibility( item.setSignature );
+		}
+
+		if ( item.getSignature ) {
+			return this.getVisibility( item.getSignature );
+		}
+		return this.getVisibility( item );
+	}
 };

package/src/tasks/build-documentation.js

@@ -339,6 +339,17 @@ function buildProjects( rootPath, projectPaths, options = {} ) {
 		skipGuides: options.skipGuides
 	} );
 
+	if ( !projectConfigs.length ) {
+		hexoManager.hexo.extend.filter.register( 'template_locals', locals => {
+			// Most probably this if is always true. Locals same for all projects.
+			if ( !locals.projectsData ) {
+				locals.projectsData = [];
+			}
+			locals.umbertoVersion = umbertoVersion;
+			locals.pathJoin = upath.join;
+		} );
+	}
+
 	projectConfigs.forEach( config => {
 		const basePath = upath.join( config.slug, config.version );
 		const extraStyles = getExtraFiles(

package/themes/umberto/layout/_partial/head.pug

@@ -17,9 +17,6 @@ if ( page[ 'twitter-card' ] || ogConfig.description )
 
 meta( name= 'x-generated-at' content= Date() )
 
-if ( projectLocals.projectVersion )
-	meta( name= 'project-version' content= projectLocals.projectVersion )
-
 if ( mainOg || ( projectLocals && projectLocals.og ) || page[ 'og-description' ] )
 	meta( property='og:title' content= page[ 'og-title' ] || title )
 	if ( ogConfig.description || page[ 'og-description' ] )
@@ -67,3 +64,4 @@ include google-optimize
 include google-tag-manager
 include google-analytics
 
+block projectVersion

package/themes/umberto/layout/api.pug

@@ -17,3 +17,8 @@ block navtree
 block append content
 	if page.reportIssueWidget
 		include _partial/report-issue-widget
+
+block projectVersion
+	if projectLocals
+		meta( name= 'project-version' content= projectLocals.projectVersion )
+		meta( name= 'project-slug' content= projectLocals.projectSlug )

package/themes/umberto/layout/page.pug

@@ -19,3 +19,8 @@ block append content
 
 block navtree
 	include _partial/nav-tree
+
+block projectVersion
+	if projectLocals
+		meta( name= 'project-version' content= projectLocals.projectVersion )
+		meta( name= 'project-slug' content= projectLocals.projectSlug )

package/themes/umberto/layout/sdk.pug

@@ -19,3 +19,8 @@ block navtree
 				nav.side-navigation__inner
 					ul.tree.sdk-tree
 						!= projectLocals.sdkNavTree
+
+block projectVersion
+	if projectLocals
+		meta( name= 'project-version' content= projectLocals.projectVersion )
+		meta( name= 'project-slug' content= projectLocals.projectSlug )

package/themes/umberto/src/js/_attachpermalinklistener.js

@@ -3,16 +3,16 @@
  * For licensing, see LICENSE.md.
  */
 
-const latestRegexp = /(?<=\/)latest(?=\/)/;
-
 export default function attachPermalinkListener() {
 	const projectVersionElement = document.querySelector( 'meta[name=project-version]' );
+	const projectSlugElement = document.querySelector( 'meta[name=project-slug]' );
 
-	if ( !projectVersionElement ) {
+	if ( !projectVersionElement || !projectSlugElement ) {
 		return;
 	}
 
 	const projectVersion = projectVersionElement.getAttribute( 'content' );
+	const projectSlug = projectSlugElement.getAttribute( 'content' );
 
 	document.addEventListener( 'keypress', event => {
 		if ( event.metaKey ) {
@@ -27,11 +27,13 @@ export default function attachPermalinkListener() {
 			return;
 		}
 
+		const latestRegexp = new RegExp( `/${ projectSlug }/latest/` );
+
 		if ( !latestRegexp.test( location.href ) ) {
 			return;
 		}
 
-		const newUrl = location.href.replace( latestRegexp, projectVersion );
+		const newUrl = location.href.replace( latestRegexp, `/${ projectSlug }/${ projectVersion }/` );
 
 		history.replaceState( history.state, document.title, newUrl );
 	} );