-
Notifications
You must be signed in to change notification settings - Fork 795
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.
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
fix: restore stats output target functionality. #3030
Changes from 6 commits
aa7fd72
f05890b
da2e392
a58bc3c
d0f7be8
907f105
e8e662a
4ff5749
d1e73fe
807caa9
d5bc274
303af48
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,180 @@ | ||
import { byteSize, sortBy } from '@utils'; | ||
import type * as d from '../../declarations'; | ||
import { isOutputTargetStats } from '../output-targets/output-utils'; | ||
|
||
/** | ||
* | ||
* @param config the project build configuration | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Minor, the summary is missing in these JSDocs |
||
* @param buildCtx An instance of the build which holds the details about the build | ||
* @returns CompilerBuildStats or an Object including diagnostics. | ||
*/ | ||
export function generateBuildStats( | ||
config: d.Config, | ||
buildCtx: d.BuildCtx | ||
): d.CompilerBuildStats | { diagnostics: d.Diagnostic[] } { | ||
const buildResults = buildCtx.buildResults; | ||
|
||
let jsonData: d.CompilerBuildStats | { diagnostics: d.Diagnostic[] }; | ||
|
||
try { | ||
if (buildResults.hasError) { | ||
jsonData = { | ||
diagnostics: buildResults.diagnostics, | ||
}; | ||
} else { | ||
const stats: d.CompilerBuildStats = { | ||
timestamp: buildResults.timestamp, | ||
compiler: { | ||
name: config.sys.name, | ||
version: config.sys.version, | ||
}, | ||
app: { | ||
namespace: config.namespace, | ||
fsNamespace: config.fsNamespace, | ||
components: Object.keys(buildResults.componentGraph).length, | ||
entries: Object.keys(buildResults.componentGraph).length, | ||
bundles: buildResults.outputs.reduce((total, en) => total + en.files.length, 0), | ||
outputs: getAppOutputs(config, buildResults), | ||
}, | ||
options: { | ||
minifyJs: config.minifyJs, | ||
minifyCss: config.minifyCss, | ||
hashFileNames: config.hashFileNames, | ||
hashedFileNameLength: config.hashedFileNameLength, | ||
buildEs5: config.buildEs5, | ||
}, | ||
formats: { | ||
esmBrowser: sanitizeBundlesForStats(buildCtx.esmBrowserComponentBundle), | ||
esm: sanitizeBundlesForStats(buildCtx.esmComponentBundle), | ||
es5: sanitizeBundlesForStats(buildCtx.es5ComponentBundle), | ||
system: sanitizeBundlesForStats(buildCtx.systemComponentBundle), | ||
commonjs: sanitizeBundlesForStats(buildCtx.commonJsComponentBundle), | ||
}, | ||
components: getComponentsFileMap(config, buildCtx), | ||
entries: buildCtx.entryModules, | ||
componentGraph: buildResults.componentGraph, | ||
sourceGraph: getSourceGraph(config, buildCtx), | ||
rollupResults: buildCtx.rollupResults, | ||
collections: getCollections(config, buildCtx), | ||
}; | ||
|
||
jsonData = stats; | ||
} | ||
} catch (e) { | ||
jsonData = { | ||
diagnostics: [e.message], | ||
}; | ||
} | ||
|
||
return jsonData; | ||
} | ||
|
||
/** | ||
* | ||
* @param config the project build configuration | ||
* @param buildCtx An instance of the build which holds the details about the build | ||
* @returns | ||
*/ | ||
export async function writeBuildStats(config: d.Config, data: d.CompilerBuildStats | { diagnostics: d.Diagnostic[] }) { | ||
const statsTargets = config.outputTargets.filter(isOutputTargetStats); | ||
|
||
await Promise.all( | ||
statsTargets.map(async (outputTarget) => { | ||
const result = await config.sys.writeFile(outputTarget.file, JSON.stringify(data, null, 2)); | ||
|
||
if (result.error) { | ||
config.logger.warn([`Stats failed to write file to ${outputTarget.file}: ${result.error}`]); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Have we verified this won't print
? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. file should work fine, I removed the result.error so we can guard against that. |
||
} | ||
}) | ||
); | ||
} | ||
|
||
function sanitizeBundlesForStats(bundleArray: ReadonlyArray<d.BundleModule>): ReadonlyArray<d.CompilerBuildStatBundle> { | ||
if (!bundleArray) { | ||
return []; | ||
} | ||
|
||
return bundleArray.map((bundle) => { | ||
return { | ||
key: bundle.entryKey, | ||
components: bundle.cmps.map((c) => c.tagName), | ||
bundleId: bundle.output.bundleId, | ||
fileName: bundle.output.fileName, | ||
imports: bundle.rollupResult.imports, | ||
// code: bundle.rollupResult.code, // (use this to debug) | ||
// Currently, this number is inaccurate vs what seems to be on disk. | ||
originalByteSize: byteSize(bundle.rollupResult.code), | ||
}; | ||
}); | ||
} | ||
|
||
function getSourceGraph(config: d.Config, buildCtx: d.BuildCtx) { | ||
let sourceGraph: d.BuildSourceGraph = {}; | ||
|
||
sortBy(buildCtx.moduleFiles, (m) => m.sourceFilePath).forEach((moduleFile) => { | ||
const key = relativePath(config, moduleFile.sourceFilePath); | ||
sourceGraph[key] = moduleFile.localImports.map((localImport) => relativePath(config, localImport)).sort(); | ||
}); | ||
|
||
return sourceGraph; | ||
} | ||
|
||
function getAppOutputs(config: d.Config, buildResults: d.CompilerBuildResults) { | ||
return buildResults.outputs.map((output) => { | ||
return { | ||
name: output.type, | ||
files: output.files.length, | ||
generatedFiles: output.files.map((file) => relativePath(config, file)), | ||
}; | ||
}); | ||
} | ||
|
||
function getComponentsFileMap(config: d.Config, buildCtx: d.BuildCtx) { | ||
return buildCtx.components.map((component) => { | ||
return { | ||
tag: component.tagName, | ||
path: relativePath(config, component.jsFilePath), | ||
source: relativePath(config, component.sourceFilePath), | ||
elementRef: component.elementRef, | ||
componentClassName: component.componentClassName, | ||
assetsDirs: component.assetsDirs, | ||
dependencies: component.dependencies, | ||
dependents: component.dependents, | ||
directDependencies: component.directDependencies, | ||
directDependents: component.directDependents, | ||
docs: component.docs, | ||
encapsulation: component.encapsulation, | ||
excludeFromCollection: component.excludeFromCollection, | ||
events: component.events, | ||
internal: component.internal, | ||
legacyConnect: component.legacyConnect, | ||
legacyContext: component.legacyContext, | ||
listeners: component.listeners, | ||
methods: component.methods, | ||
potentialCmpRefs: component.potentialCmpRefs, | ||
properties: component.properties, | ||
shadowDelegatesFocus: component.shadowDelegatesFocus, | ||
states: component.states, | ||
}; | ||
}); | ||
} | ||
|
||
function getCollections(config: d.Config, buildCtx: d.BuildCtx) { | ||
return buildCtx.collections | ||
.map((c) => { | ||
return { | ||
name: c.collectionName, | ||
source: relativePath(config, c.moduleDir), | ||
tags: c.moduleFiles.map((m) => m.cmps.map((cmp: d.ComponentCompilerMeta) => cmp.tagName)).sort(), | ||
}; | ||
}) | ||
.sort((a, b) => { | ||
if (a.name < b.name) return -1; | ||
if (a.name > b.name) return 1; | ||
return 0; | ||
}); | ||
} | ||
|
||
function relativePath(config: d.Config, file: string) { | ||
return config.sys.normalizePath(config.sys.platformPath.relative(config.rootDir, file)); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
import type * as d from '@stencil/core/declarations'; | ||
import { mockConfig, mockCompilerCtx, mockBuildCtx } from '@stencil/core/testing'; | ||
import { generateBuildResults } from '../build-results'; | ||
import { generateBuildStats } from '../build-stats'; | ||
import path from 'path'; | ||
|
||
describe('generateBuildStats', () => { | ||
const root = path.resolve('/'); | ||
const config = mockConfig(); | ||
let compilerCtx: d.CompilerCtx; | ||
let buildCtx: d.BuildCtx; | ||
|
||
beforeEach(() => { | ||
compilerCtx = mockCompilerCtx(config); | ||
buildCtx = mockBuildCtx(config, compilerCtx); | ||
}); | ||
|
||
it('should return a structured json object', async () => { | ||
buildCtx.buildResults = generateBuildResults(config, compilerCtx, buildCtx); | ||
|
||
const result = generateBuildStats(config, buildCtx); | ||
|
||
if (result.hasOwnProperty('timestamp')) { | ||
delete result.timestamp; | ||
} | ||
|
||
expect(result).toStrictEqual({ | ||
app: { bundles: 0, components: 0, entries: 0, fsNamespace: undefined, namespace: 'Testing', outputs: [] }, | ||
collections: [], | ||
compiler: { name: 'in-memory', version: '0.0.0-dev.20210827160156' }, | ||
componentGraph: {}, | ||
components: [], | ||
entries: [], | ||
formats: { commonjs: [], es5: [], esm: [], esmBrowser: [], system: [] }, | ||
options: { | ||
buildEs5: false, | ||
hashFileNames: false, | ||
hashedFileNameLength: undefined, | ||
minifyCss: false, | ||
minifyJs: false, | ||
}, | ||
rollupResults: undefined, | ||
sourceGraph: {}, | ||
}); | ||
}); | ||
|
||
it('should return diagnostics if an error is hit', async () => { | ||
buildCtx.buildResults = generateBuildResults(config, compilerCtx, buildCtx); | ||
|
||
buildCtx.buildResults.hasError = true; | ||
buildCtx.buildResults.diagnostics = ['Something bad happened']; | ||
|
||
const result = generateBuildStats(config, buildCtx); | ||
|
||
expect(result).toStrictEqual({ | ||
diagnostics: ['Something bad happened'], | ||
}); | ||
}); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,7 +11,7 @@ export const generateCjs = async ( | |
buildCtx: d.BuildCtx, | ||
rollupBuild: RollupBuild, | ||
outputTargets: d.OutputTargetDistLazy[] | ||
) => { | ||
): Promise<d.BuildCtx> => { | ||
const cjsOutputs = outputTargets.filter((o) => !!o.cjsDir); | ||
|
||
if (cjsOutputs.length > 0) { | ||
|
@@ -25,7 +25,8 @@ export const generateCjs = async ( | |
const results = await generateRollupOutput(rollupBuild, esmOpts, config, buildCtx.entryModules); | ||
if (results != null) { | ||
const destinations = cjsOutputs.map((o) => o.cjsDir); | ||
await generateLazyModules( | ||
|
||
buildCtx.commonJsComponentBundle = await generateLazyModules( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The bundles here that were produced during a build were not available at any point during the process, and the result would get tossed. I've modified BuildContext to allow for stats to be stored on all instances of the class. The return signature of this has changed as well, providing back an updated buildCtx. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we update the signature of the function to reflect we return something please? (and in the other files where we generate other module outputs for lazy)? |
||
config, | ||
compilerCtx, | ||
buildCtx, | ||
|
@@ -36,16 +37,19 @@ export const generateCjs = async ( | |
false, | ||
'.cjs' | ||
); | ||
|
||
await generateShortcuts(compilerCtx, results, cjsOutputs); | ||
} | ||
} | ||
|
||
return buildCtx; | ||
}; | ||
|
||
const generateShortcuts = ( | ||
compilerCtx: d.CompilerCtx, | ||
rollupResult: d.RollupResult[], | ||
outputTargets: d.OutputTargetDistLazy[] | ||
) => { | ||
): Promise<void[]> => { | ||
const indexFilename = rollupResult.find((r) => r.type === 'chunk' && r.isIndex).fileName; | ||
return Promise.all( | ||
outputTargets.map(async (o) => { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ export const generateEsmBrowser = async ( | |
buildCtx: d.BuildCtx, | ||
rollupBuild: RollupBuild, | ||
outputTargets: d.OutputTargetDistLazy[] | ||
) => { | ||
): Promise<d.BuildCtx> => { | ||
const esmOutputs = outputTargets.filter((o) => !!o.esmDir && !!o.isBrowserBuild); | ||
if (esmOutputs.length) { | ||
const outputTargetType = esmOutputs[0].type; | ||
|
@@ -29,7 +29,7 @@ export const generateEsmBrowser = async ( | |
|
||
if (output != null) { | ||
const es2017destinations = esmOutputs.map((o) => o.esmDir); | ||
const componentBundle = await generateLazyModules( | ||
buildCtx.esmBrowserComponentBundle = await generateLazyModules( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar scenario here as in |
||
config, | ||
compilerCtx, | ||
buildCtx, | ||
|
@@ -40,8 +40,7 @@ export const generateEsmBrowser = async ( | |
true, | ||
'' | ||
); | ||
return componentBundle; | ||
} | ||
} | ||
return undefined; | ||
return buildCtx; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor, the JSDocs in this file just seem to be stubbed out