Skip to content

Commit

Permalink
[FIX] Improve recognition of main module in case of bundles (#341)
Browse files Browse the repository at this point in the history 
This is a port of several changes from the Java bundle tooling, which have been made after the initial migration of the tooling. Additionally, code coverage has been slightly improved by adding further unit and integration tests. Errors that have been revealed by the new tests have been fixed, too.

Details about the migrated changes:

----
Change 3312369 (improve recognition of main module in case of bundles):

So far, the module analyzer always assumed the first module definition to be the main definition. This failed at least for CVOM bundles but might also fail for others.

The analysis has been improved and now accepts a module as main module only in the following cases:
- if it is an unnamed module
- if it is a named module whose name matches the external name
- if it is a named module and there's only one module (no bundle)

If multiple module definitions match the above criteria, this is
reported as an error.

Additionally, AMD special dependencies ('require', 'exports', 'module') are no longer reported in the dependency info.

----
Change 3945349 (JSModuleAnalyzer fails on modules that don't declare a name)

Basically, the JavaScript implementation was less sensitive to this issue. But if a resource could have a dependency to another resource named "null", the JavaScript tooling would fail, too. Although this looked like a purely theoretical scenario, adding a protective 'if' was trivial enough to just do it. 

----
Change 3562114 (fix dep. analysis of new evo bundles)

- recognize and evaluate sap.ui.require.preload calls
- write and extract bundle name and raw module names
  • Loading branch information
@codeworrior
codeworrior authored Sep 30, 2019
1 parent b1d727e commit 7a560b4
Show file tree
Hide file tree
Showing 47 changed files with 1,062 additions and 147 deletions.
201 changes: 139 additions & 62 deletions lib/lbt/analyzer/JSModuleAnalyzer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ const CALL_AMD_DEFINE = ["define"];
const CALL_AMD_REQUIRE = ["require"];
const CALL_REQUIRE_SYNC = ["require", "sync"];
const CALL_REQUIRE_PREDEFINE = ["require", "predefine"];
const CALL_REQUIRE_PRELOAD = ["require", "preload"];
const CALL_SAP_UI_DEFINE = ["sap", "ui", "define"];
const CALL_SAP_UI_REQUIRE = ["sap", "ui", "require"];
const CALL_SAP_UI_REQUIRE_SYNC = ["sap", "ui", "requireSync"];
Expand All @@ -215,11 +214,21 @@ const CALL_JQUERY_SAP_DECLARE = [["jQuery", "$"], "sap", "declare"];
const CALL_JQUERY_SAP_IS_DECLARED = [["jQuery", "$"], "sap", "isDeclared"];
const CALL_JQUERY_SAP_REQUIRE = [["jQuery", "$"], "sap", "require"];
const CALL_JQUERY_SAP_REGISTER_PRELOADED_MODULES = [["jQuery", "$"], "sap", "registerPreloadedModules"];
const SPECIAL_AMD_DEPENDENCIES = ["require", "exports", "module"];


function isCallableExpression(node) {
return node.type == Syntax.FunctionExpression || node.type == Syntax.ArrowFunctionExpression;
}

/*
* Dummy implementation.
* Sole purpose is to easier align with the old (Java) implementation of the bundle tooling.
*/
function getDocumentation(node) {
return undefined;
}

/**
* Analyzes an already parsed JSDocument to collect information about the contained module(s).
*
Expand All @@ -231,21 +240,75 @@ function isCallableExpression(node) {
*/
class JSModuleAnalyzer {
analyze(ast, defaultName, info) {
let nModuleDeclarations = 0;
let mainModuleFound = false;
/**
* Number of (sap.ui.)define calls without a module ID.
* Only tracked to be able to complain about multiple module definitions without ID.
*/
let nUnnamedDefines = 0;
/**
* ID of the first named (sap.ui.)define call.
* Remembered together with the corresponding description in case no other main module
* can be found (no unnamed module, no module with the ID that matches the filename).
* Will be used as main module ID if only one module definition exists in the file.
*/
let candidateName = null;
let candidateDescription = null;

// console.log(JSON.stringify(ast, null, " "));
/**
* Total number of module declarations (declare or define).
*/
let nModuleDeclarations = 0;

// first analyze the whole AST...
visit(ast, false);

// ...then all the comments
if ( Array.isArray(ast.comments) ) {
ast.comments.forEach((comment) => {
if ( comment.type === "Line" && comment.value.startsWith("@ui5-bundle") ) {
if ( comment.value.startsWith("@ui5-bundle-raw-include ") ) {
const subModule = comment.value.slice("@ui5-bundle-raw-include ".length);
info.addSubModule(subModule);
log.debug(`bundle include directive ${subModule}`);
} else if ( comment.value.startsWith("@ui5-bundle ") ) {
const bundleName = comment.value.slice("@ui5-bundle ".length);
setMainModuleInfo(bundleName, null);
log.debug(`bundle name directive ${bundleName}`);
} else {
log.warn(`unrecognized bundle directive ${comment.value}`);
}
}
});
}

// ...and finally take conclusions about the file's content
if ( !mainModuleFound ) {
// if there's exactly one module definition in this file but it didn't
// immediately qualify as main module, make it now the main module
if ( candidateName != null && nModuleDeclarations == 1 ) {
info.name = candidateName;
info.description = candidateDescription;
mainModuleFound = true;
} else {
// no main module found, use the default name
info.name = defaultName;
}
}

// depending on the used module APIs, add an implicit dependency to the loader entry module
if ( info.format === ModuleFormat.UI5_LEGACY ) {
info.addImplicitDependency(UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL);
} else if ( info.format === ModuleFormat.UI5_DEFINE ) {
// Note: the implicit dependency for sap.ui.define modules points to the standard UI5
// loader config module. A more general approach would be to add a dependency to the loader
// only, but then standard configuration would be missed by dependency resolution
// (to be clarified)
info.addImplicitDependency(UI5ClientConstants.MODULE__UI5LOADER_AUTOCONFIG);
}
if ( nModuleDeclarations === 0 && info.name == null ) {
info.name = defaultName;
}
if ( info.dependencies.length === 0 && info.subModules.length === 0 ) {

if ( nModuleDeclarations === 0 && info.dependencies.length === 0 && info.subModules.length === 0 ) {
// when there are no indicators for module APIs, mark the module as 'raw' module
info.rawModule = true;
}

Expand All @@ -260,6 +323,16 @@ class JSModuleAnalyzer {
return;

// hoisted functions
function setMainModuleInfo(name, description) {
if ( mainModuleFound ) {
throw new Error("conflicting main modules found (unnamed + named)");
}
mainModuleFound = true;
info.name = name;
if ( description != null ) {
info.description = description;
}
}

function visit(node, conditional) {
// console.log("visiting ", node);
Expand Down Expand Up @@ -336,13 +409,14 @@ class JSModuleAnalyzer {
// recognizes a call to jQuery.sap.require
info.setFormat(ModuleFormat.UI5_LEGACY);
onJQuerySapRequire(node, conditional);
} else if ( isMethodCall(node, CALL_JQUERY_SAP_REGISTER_PRELOADED_MODULES)
|| isMethodCall(node, CALL_REQUIRE_PRELOAD)
|| isMethodCall(node, CALL_SAP_UI_REQUIRE_PRELOAD) ) {
} else if ( isMethodCall(node, CALL_JQUERY_SAP_REGISTER_PRELOADED_MODULES) ) {
// recognizes a call to jQuery.sap.registerPreloadedModules
const legacyCall = isMethodCall(node, CALL_JQUERY_SAP_REGISTER_PRELOADED_MODULES);
info.setFormat( legacyCall ? ModuleFormat.UI5_LEGACY : ModuleFormat.UI5_DEFINE);
onRegisterPreloadedModules(node, legacyCall);
info.setFormat(ModuleFormat.UI5_LEGACY);
onRegisterPreloadedModules(node, /* evoSyntax= */ false);
} else if ( isMethodCall(node, CALL_SAP_UI_REQUIRE_PRELOAD) ) {
// recognizes a call to sap.ui.require.preload
info.setFormat(ModuleFormat.UI5_DEFINE);
onRegisterPreloadedModules(node, /* evoSyntax= */ true);
} else if ( isCallableExpression(node.callee) ) {
// recognizes a scope function declaration + argument
visit(node.arguments, conditional);
Expand Down Expand Up @@ -393,16 +467,13 @@ class JSModuleAnalyzer {
const args = node.arguments;
if ( args.length > 0 && isString(args[0]) ) {
const name = ModuleName.fromUI5LegacyName( args[0].value );
if ( nModuleDeclarations === 1 ) {
if ( nModuleDeclarations === 1 && !mainModuleFound) {
// if this is the first declaration, then this is the main module declaration
// note that this overrides an already given name
info.name = name;
/* NODE-TODO
info.description = getDocumentation(node);
*/
setMainModuleInfo(name, getDocumentation(node));
} else if ( nModuleDeclarations > 1 && name === info.name ) {
// ignore duplicate declarations (e.g. in behavior file of design time controls)
log.warn(`duplicate declaration of module ${getLocation(args)} in ${name}`);
log.warn(`duplicate declaration of module name at ${getLocation(args)} in ${name}`);
} else {
// otherwise it is just a submodule declaration
info.addSubModule(name);
Expand All @@ -417,29 +488,35 @@ class JSModuleAnalyzer {
const nArgs = args.length;
let i = 0;

// get the documentation from a preceding comment
const desc = getDocumentation(defineCall);

// determine the name of the module
let name = defaultName;
let name = null;
if ( i < nArgs && isString(args[i]) ) {
name = ModuleName.fromRequireJSName( args[i++].value );
}
if ( name == null ) {
throw new TypeError("define/sap.ui.define: module name could not be determined," +
`neither from environment nor from first argument: ${args[i] && args[i].type}`);
}

if ( nModuleDeclarations === 1 ) {
// if this is the first declaration, then this is the main module declaration
info.name = name;

// get the documentation from a preceding comment
/* NODE-TODO
info.description = getDocumentation(defineNode);
*/
} else {
if ( name === defaultName ) {
throw new Error("module name could not be determined");
// hardcoded name equals the file name, so this definition qualifies as main module definition
setMainModuleInfo(name, desc);
} else {
info.addSubModule(name);
if ( candidateName == null ) {
// remember the name and description in case no other module qualifies as main module
candidateName = name;
candidateDescription = desc;
}
}
} else {
nUnnamedDefines++;
if ( nUnnamedDefines > 1 ) {
throw new Error("if multiple modules are contained in a file, only one of them may omit the module ID " + name + " " + nUnnamedDefines);
}
if ( defaultName == null ) {
throw new Error("unnamed module found, but no default name given");
}
info.addSubModule(name);
name = defaultName;
// the first unnamed module definition qualifies as main module
setMainModuleInfo(name, desc);
}

// process array of required modules, if given
Expand Down Expand Up @@ -502,42 +579,42 @@ class JSModuleAnalyzer {
}
}

function onRegisterPreloadedModules(node, legacyCall) {
function onRegisterPreloadedModules(node, evoSyntax) {
const args = node.arguments;

// trace.debug("**** registerPreloadedModules detected");
if ( args.length > 0 && args[0].type == Syntax.ObjectExpression ) {
let modules = args[0];
let isNewSyntax = true;

if ( legacyCall ) {
const obj = args[0];
isNewSyntax = false;
const version = findOwnProperty(obj, "version");
if ( version && isString(version) && parseFloat(version.value) >= 2.0 ) {
isNewSyntax = true;
}
modules = findOwnProperty(obj, "modules");
}
let modules = null;
let namesUseLegacyNotation = false;

if ( modules && modules.type == Syntax.ObjectExpression ) {
modules.properties.forEach( function(property) {
let moduleName = getPropertyKey(property);
if ( !isNewSyntax ) {
moduleName = ModuleName.fromUI5LegacyName(moduleName);
}
info.addSubModule(moduleName);
});
} else {
log.warn("Cannot evaluate registerPreloadedModules: '%s'", modules && modules.type);
}
if ( evoSyntax ) {
modules = args[0];
} else {
const obj = args[0];
const version = findOwnProperty(obj, "version");
namesUseLegacyNotation = !(version && isString(version) && parseFloat(version.value) >= 2.0);
modules = findOwnProperty(obj, "modules");
}
if ( modules && modules.type == Syntax.ObjectExpression ) {
modules.properties.forEach( function(property) {
let moduleName = getPropertyKey(property);
if ( namesUseLegacyNotation ) {
moduleName = ModuleName.fromUI5LegacyName(moduleName);
}
info.addSubModule(moduleName);
});
} else {
log.warn("Cannot evaluate registerPreloadedModules: '%s'", modules && modules.type);
}
}

function analyzeDependencyArray(array, conditional, name) {
// console.log(array);
array.forEach( (item) => {
if ( isString(item) ) {
// ignore special AMD dependencies (require, exports, module)
if ( SPECIAL_AMD_DEPENDENCIES.indexOf(item.value) >= 0 ) {
return;
}
let requiredModule;
if (name == null) {
requiredModule = ModuleName.fromRequireJSName( item.value );
Expand Down
27 changes: 5 additions & 22 deletions lib/lbt/bundle/Builder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const UI5BundleFormat = {
outW.write(`jQuery.sap.registerPreloadedModules(`);
outW.writeln(`{`);
if ( section.name ) {
outW.writeln(`"name":"${section.getSectionName()}",`);
outW.writeln(`"name":"${section.name}",`);
}
outW.writeln(`"version":"2.0",`);
outW.writeln(`"modules":{`);
Expand Down Expand Up @@ -73,7 +73,7 @@ const EVOBundleFormat = {
afterPreloads(outW, section) {
outW.write(`}`);
if ( section.name ) {
outW.write(`,"${section.getSectionName()}"`);
outW.write(`,"${section.name}"`);
}
outW.writeln(`);`);
},
Expand Down Expand Up @@ -144,8 +144,6 @@ class BundleBuilder {
this.jqglobalAvailable = !resolvedModule.containsGlobal;
this.openModule(resolvedModule.name);

this.writeConfiguration(resolvedModule.configuration); // NODE-TODO configuration currently will be undefined

// create all sections in sequence
for ( const section of resolvedModule.sections ) {
log.verbose(" adding section%s of type %s",
Expand All @@ -169,6 +167,7 @@ class BundleBuilder {
this.outW = new BundleWriter();
this.missingRawDeclarations = [];

this.outW.writeln("//@ui5-bundle " + module);
if ( this.shouldDecorate ) {
this.outW.writeln(`window["sap-ui-optimized"] = true;`);
if ( this.options.addTryCatchRestartWrapper ) {
Expand Down Expand Up @@ -230,31 +229,15 @@ class BundleBuilder {
}
}

writeConfiguration(config) {
if ( !config ) {
return;
}
const outW = this.outW;
outW.ensureNewLine(); // for clarity and to avoid issues with single line comments
outW.writeln(`(function(window){`);
outW.writeln(`\tvar cfg=window['sap-ui-config']=window['sap-ui-config']||{},`);
outW.writeln(`\t\troots=cfg.resourceRoots=cfg.resourceRoots||{};`);
config.propertyName.forEach( (property) => {
outW.writeln(`\tcfg[${makeStringLiteral(property)}]=${config.getPropertyAsJSLiteral(property)};`);
});
Object.keys(config.resourceRoots).forEach( (prefix) => {
outW.writeln(`\troots[${makeStringLiteral(prefix)}]=${makeStringLiteral(config.resourceRoots[prefix])};`);
});
outW.writeln(`}(window));`);
}

// TODO check that there are only JS modules contained
async writeRaw(section) {
// write all modules in sequence
for ( const module of section.modules ) {
const resource = await this.pool.findResourceWithInfo(module);
if ( resource != null ) {
this.outW.startSegment(module);
this.outW.ensureNewLine();
this.outW.writeln("//@ui5-bundle-raw-include " + module);
await this.writeRawModule(module, resource);
const compressedSize = this.outW.endSegment();
log.verbose(" %s (%d,%d)", module, resource.info != null ? resource.info.size : -1, compressedSize);
Expand Down
11 changes: 4 additions & 7 deletions lib/lbt/bundle/ResolvedBundleDefinition.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,13 @@ class ResolvedSection {
return this.sectionDefinition.mode;
}

/*
public String getSectionName() {
return sectionDefinition.getSectionName();
get name() {
return this.sectionDefinition.name;
}

public boolean isDeclareRawModules() {
return sectionDefinition.isDeclareRawModules();
get declareRawModules() {
return this.sectionDefinition.declareRawModules;
}
*/
}

module.exports = ResolvedBundleDefinition;
Loading

0 comments on commit 7a560b4

Please sign in to comment.