Skip to content

refactor(builder): Include component path in versionInfoGenerator logs #1471

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

Open
RandomByte wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −5
Open

refactor(builder): Include component path in versionInfoGenerator logs #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/builder/lib/processors/versionInfoGenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const processManifest = async (manifestResource) => {
*/
const isBundledWithLibrary = (embeddedBy, componentPath, libraryPathPrefix) => {
if (typeof embeddedBy === "undefined") {
log.verbose(" Component doesn't declare 'sap.app/embeddedBy', don't list it as 'embedded'");
log.verbose(` Component '${componentPath}' doesn't declare 'sap.app/embeddedBy', don't list it as 'embedded'`);
return false;
}
if (typeof embeddedBy !== "string") {
Expand All @@ -122,11 +122,13 @@ const isBundledWithLibrary = (embeddedBy, componentPath, libraryPathPrefix) => {
resolvedEmbeddedBy = resolvedEmbeddedBy + "/";
}
if ( libraryPathPrefix === resolvedEmbeddedBy ) {
log.verbose(" Component's 'sap.app/embeddedBy' property points to library, list it as 'embedded'");
log.verbose(
` Component '${componentPath}': property 'sap.app/embeddedBy' points to library, list it as 'embedded'`);
return true;
} else {
log.verbose(
` Component's 'sap.app/embeddedBy' points to '${resolvedEmbeddedBy}', don't list it as 'embedded'`);
` Component '${componentPath}': property 'sap.app/embeddedBy' points to '${resolvedEmbeddedBy}', ` +
`don't list it as 'embedded'`);
return false;
}
};
Expand Down
8 changes: 8 additions & 0 deletions packages/builder/test/lib/processors/versionInfoGenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,10 @@ test.serial("versionInfoGenerator library infos with embeds", async (t) => {
assertVersionInfoContent(t, oExpected, result);
t.is(t.context.infoLogStub.callCount, 0);
t.is(t.context.warnLogStub.callCount, 0);
t.is(t.context.verboseLogStub.callCount, 1);
t.is(t.context.verboseLogStub.getCall(0).args[0],
" Component '/resources/lib/a/sub' doesn't declare 'sap.app/embeddedBy', " +
"don't list it as 'embedded'");
});

test.serial("versionInfoGenerator library infos with no embeds", async (t) => {
Expand Down Expand Up @@ -512,4 +516,8 @@ test.serial("versionInfoGenerator library infos with embeds and embeddedBy (hasO
assertVersionInfoContent(t, oExpected, result);
t.is(t.context.infoLogStub.callCount, 0);
t.is(t.context.warnLogStub.callCount, 0);
t.is(t.context.verboseLogStub.callCount, 1);
t.is(t.context.verboseLogStub.getCall(0).args[0],
" Component '/resources/lib/a/sub': property 'sap.app/embeddedBy' points to library, " +
"list it as 'embedded'");
});
6 changes: 4 additions & 2 deletions packages/builder/test/lib/tasks/generateVersionInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,8 @@ test.serial("integration: Library without dependencies and embeddedBy undefined"

t.is(verboseLogStub.callCount, 1);
t.is(verboseLogStub.firstCall.args[0],
" Component doesn't declare 'sap.app/embeddedBy', don't list it as 'embedded'");
" Component '/resources/lib/a/sub/fold' doesn't declare 'sap.app/embeddedBy', " +
"don't list it as 'embedded'");
});

test.serial("integration: Library without dependencies and embeddedBy not a string", async (t) => {
Expand Down Expand Up @@ -1098,7 +1099,8 @@ test.serial("integration: Library without dependencies and embeddedBy path not c

t.is(verboseLogStub.callCount, 1);
t.is(verboseLogStub.firstCall.args[0],
" Component's 'sap.app/embeddedBy' points to '/resources/lib/a/sub/', don't list it as 'embedded'");
" Component '/resources/lib/a/sub/fold': property 'sap.app/embeddedBy' points to " +
"'/resources/lib/a/sub/', don't list it as 'embedded'");
});

test.serial("integration: Library with manifest with invalid dependency", async (t) => {
Expand Down
Loading