[FEATURE] depCache bundling mode

lib/lbt/bundle/AutoSplitter.js

@@ -74,6 +74,25 @@ class AutoSplitter {
 					totalSize += "sap.ui.requireSync('');".length + toRequireJSName(module).length;
 				});
 				break;
+			case SectionType.DepCache:
+				moduleSizes["__depCacheSize"] = "sap.ui.loader.config({depCacheUI5:{}});".length;
+
+				section.modules.forEach( (module) => {
+					promises.push((async () => {
+						const resource = await this.pool.findResourceWithInfo(module);
+						const deps = resource.info.dependencies.filter(
+							(dep) =>
+								!resource.info.isConditionalDependency(dep) &&
+								!resource.info.isImplicitDependency(dep)
+						);
+						if (deps.length > 0) {
+							const depSize = `"${module}": [${deps.map((dep) => `"${dep}"`).join(",")}],`.length;
+							moduleSizes["__depCacheSize"] += depSize;
+							totalSize += depSize;
+						}
+					})());
+				});
+				break;
 			default:
 				break;
 			}
@@ -180,6 +199,15 @@ class AutoSplitter {
 					totalSize += 21 + toRequireJSName(module).length;
 				});
 				break;
+			case SectionType.DepCache:
+				currentSection = {
+					name: section.name,
+					mode: SectionType.DepCache,
+					filters: section.modules.slice()
+				};
+				currentModule.sections.push( currentSection );
+				totalSize += moduleSizes["__depCacheSize"];
+				break;
 			default:
 				break;
 			}

lib/lbt/bundle/Builder.js

@@ -71,6 +71,14 @@ const EVOBundleFormat = {
 			resolvedModule.executes(MODULE__UI5LOADER_AUTOCONFIG) ||
 			resolvedModule.executes(MODULE__JQUERY_SAP_GLOBAL) ||
 			resolvedModule.executes(MODULE__SAP_UI_CORE_CORE);
+	},
+
+	beforeDepCache(outW) {
+		outW.writeln(`sap.ui.loader.config({depCacheUI5:{`);
+	},
+
+	afterDepCache(outW) {
+		outW.writeln(`}});`);
 	}
 };
 
@@ -220,6 +228,8 @@ class BundleBuilder {
 			return this.writeBundleInfos([section]);
 		case SectionType.Require:
 			return this.writeRequires(section);
+		case SectionType.DepCache:
+			return this.writeDepCache(section);
 		default:
 			throw new Error("unknown section mode " + section.mode);
 		}
@@ -549,6 +559,50 @@ class BundleBuilder {
 		});
 	}
 
+	async writeDepCache(section) {
+		const outW = this.outW;
+		let hasDepCache = false;
+
+		const sequence = section.modules.slice().sort();
+
+		if (sequence.length > 0) {
+			// let i = 0;
+			for (const module of sequence) {
+				let resource = null;
+				try {
+					resource = await this.pool.findResourceWithInfo(module);
+				} catch (e) {
+					log.error(`    couldn't find ${module}`);
+				}
+
+				if (resource != null) {
+					const deps = resource.info.dependencies.filter(
+						(dep) =>
+							!resource.info.isConditionalDependency(dep) &&
+							!resource.info.isImplicitDependency(dep)
+					);
+					if (deps.length > 0) {
+						if (!hasDepCache) {
+							hasDepCache = true;
+							outW.ensureNewLine();
+							this.targetBundleFormat.beforeDepCache(outW, section);
+						}
+
+						outW.writeln(
+							`"${module}": [${deps.map((dep) => `"${dep}"`).join(",")}],`
+						);
+					} else {
+						log.verbose(`    skipped ${module}, no dependencies`);
+					}
+				}
+			}
+
+			if (hasDepCache) {
+				this.targetBundleFormat.afterDepCache(outW, section);
+			}
+		}
+	}
+
 	async getSourceMapForModule({moduleName, moduleContent, resourcePath}) {
 		let moduleSourceMap = null;
 		let newModuleContent = moduleContent;

lib/lbt/bundle/BundleDefinition.js

@@ -27,5 +27,12 @@ export const SectionType = {
 	 * Usually used as the last section in a merged module to enforce loading and
 	 * execution of some specific module or modules.
 	 */
-	Require: "require"
+	Require: "require",
+
+	/**
+	 * Dependency cache information that lists modules and their dependencies
+	 * of all types: JS, declarative views/fragments.
+	 * Only the dependencies of the modules are stored as 'depCache' configuration.
+	 */
+	DepCache: "depCache"
 };

lib/lbt/bundle/ResolvedBundleDefinition.js

@@ -64,7 +64,11 @@ class ResolvedBundleDefinition {
 				return Promise.all(
 					modules.map( (submodule) => {
 						return pool.getModuleInfo(submodule).then(
-							(subinfo) => bundleInfo.addSubModule(subinfo)
+							(subinfo) => {
+								if (!bundleInfo.subModules.includes(subinfo.name)) {
+									bundleInfo.addSubModule(subinfo);
+								}
+							}
 						);
 					})
 				);

lib/lbt/bundle/Resolver.js

@@ -198,7 +198,7 @@ class BundleResolver {
 			let oldIgnoredResources;
 			let oldSelectedResourcesSequence;
 
-			if ( section.mode == SectionType.Require ) {
+			if ( [SectionType.Require, SectionType.DepCache].includes(section.mode) ) {
 				oldSelectedResources = selectedResources;
 				oldIgnoredResources = visitedResources;
 				oldSelectedResourcesSequence = selectedResourcesSequence;
@@ -254,7 +254,7 @@ class BundleResolver {
 			});
 
 			return Promise.all(promises).then( function() {
-				if ( section.mode == SectionType.Require ) {
+				if ( [SectionType.Require, SectionType.DepCache].includes(section.mode) ) {
 					newKeys = selectedResourcesSequence;
 					selectedResources = oldSelectedResources;
 					visitedResources = oldIgnoredResources;

test/lib/lbt/bundle/Builder.js

@@ -817,6 +817,198 @@ ${SOURCE_MAPPING_URL}=library-preload.js.map
 	]);
 });
 
+test.serial("integration: createBundle with depCache", async (t) => {
+	const pool = new ResourcePool();
+	pool.addResource({
+		name: "a.js",
+		getPath: () => "a.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "sap.ui.define([\"./b\", \"./c2\"],function(b, c){return {};});"
+	});
+	pool.addResource({
+		name: "b.js",
+		getPath: () => "b.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Two(){return 2;}"
+	});
+	pool.addResource({
+		name: "c2.js",
+		getPath: () => "c2.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "sap.ui.define([\"./c1\", \"./c3\"],function(c1, c3){return {};});"
+	});
+	pool.addResource({
+		name: "c1.js",
+		getPath: () => "c1.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Three(){return 3.1;}"
+	});
+	pool.addResource({
+		name: "c3.js",
+		getPath: () => "c3.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Three(){return 3.3;}"
+	});
+	pool.addResource({
+		name: "a.library",
+		getPath: () => "a.library",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => `<?xml version="1.0" encoding="UTF-8" ?>
+<library xmlns="http://www.sap.com/sap.ui.library.xsd" >
+	<appData>
+		<packaging xmlns="http://www.sap.com/ui5/buildext/packaging" version="2.0" >
+			  <module-infos>
+				<raw-module name="a.js"
+					requiresTopLevelScope="false" />
+			</module-infos>
+		</packaging>
+	</appData>
+</library>`
+	});
+
+	const bundleDefinition = {
+		name: `library-depCache-preload.js`,
+		sections: [{
+			mode: "preload",
+			name: "preload-section",
+			filters: ["a.js"]
+		}, {
+			mode: "depCache",
+			filters: ["*.js"]
+		}]
+	};
+
+	const builder = new Builder(pool);
+	const oResult = await builder.createBundle(bundleDefinition, {});
+	t.is(oResult.name, "library-depCache-preload.js");
+	const expectedContent = `//@ui5-bundle library-depCache-preload.js
+sap.ui.require.preload({
+	"a.js":function(){
+sap.ui.define(["./b", "./c2"],function(b, c){return {};});
+}
+},"preload-section");
+sap.ui.loader.config({depCacheUI5:{
+"a.js": ["b.js","c2.js"],
+"c2.js": ["c1.js","c3.js"],
+}});
+${SOURCE_MAPPING_URL}=library-depCache-preload.js.map
+`;
+	t.deepEqual(oResult.content, expectedContent, "EVOBundleFormat " +
+		"should contain:" +
+		" preload part from a.js" +
+		" depCache part from a.js && c2.js");
+	t.is(oResult.bundleInfo.name, "library-depCache-preload.js", "bundle info name is correct");
+	t.deepEqual(oResult.bundleInfo.size, expectedContent.length, "bundle info size is correct");
+	t.deepEqual(oResult.bundleInfo.subModules, ["a.js", "b.js", "c2.js", "c1.js", "c3.js"],
+		"bundle info subModules are correct");
+});
+
+test.serial("integration: createBundle with depCache with NO dependencies", async (t) => {
+	const pool = new ResourcePool();
+	pool.addResource({
+		name: "a.js",
+		getPath: () => "a.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "sap.ui.define([],function(){return {};});"
+	});
+	pool.addResource({
+		name: "b.js",
+		getPath: () => "b.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Two(){return 2;}"
+	});
+	pool.addResource({
+		name: "c2.js",
+		getPath: () => "c2.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "sap.ui.define([],function(){return {};});"
+	});
+	pool.addResource({
+		name: "c1.js",
+		getPath: () => "c1.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Three(){return 3.1;}"
+	});
+	pool.addResource({
+		name: "c3.js",
+		getPath: () => "c3.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Three(){return 3.3;}"
+	});
+	pool.addResource({
+		name: "a.library",
+		getPath: () => "a.library",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => `<?xml version="1.0" encoding="UTF-8" ?>
+<library xmlns="http://www.sap.com/sap.ui.library.xsd" >
+	<appData>
+		<packaging xmlns="http://www.sap.com/ui5/buildext/packaging" version="2.0" >
+			  <module-infos>
+				<raw-module name="a.js"
+					requiresTopLevelScope="false" />
+			</module-infos>
+		</packaging>
+	</appData>
+</library>`
+	});
+
+	const bundleDefinition = {
+		name: `library-depCache-preload.js`,
+		sections: [{
+			mode: "preload",
+			name: "preload-section",
+			filters: ["a.js"]
+		}, {
+			mode: "depCache",
+			filters: ["*.js"]
+		}]
+	};
+
+	const builder = new Builder(pool);
+	const oResult = await builder.createBundle(bundleDefinition, {});
+	t.is(oResult.name, "library-depCache-preload.js");
+	const expectedContent = `//@ui5-bundle library-depCache-preload.js
+sap.ui.require.preload({
+	"a.js":function(){
+sap.ui.define([],function(){return {};});
+}
+},"preload-section");
+${SOURCE_MAPPING_URL}=library-depCache-preload.js.map
+`;
+	t.deepEqual(oResult.content, expectedContent, "EVOBundleFormat " +
+		"should contain:" +
+		" preload part from a.js" +
+		" depCache part from a.js && c2.js");
+	t.is(oResult.bundleInfo.name, "library-depCache-preload.js", "bundle info name is correct");
+	t.deepEqual(oResult.bundleInfo.size, expectedContent.length, "bundle info size is correct");
+	t.deepEqual(oResult.bundleInfo.subModules, ["a.js", "b.js", "c2.js", "c1.js", "c3.js"],
+		"bundle info subModules are correct");
+});
+
 test("integration: createBundle using predefine calls with source maps and a single, simple source", async (t) => {
 	const pool = new ResourcePool();