openharmony/developtools_ace_ets2bundle
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_ace_ets2bundle synced 2024-11-23 16:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!3549 Fix incremental building failure when package with sourceRoots changes version

Browse Source 
Merge pull request !3549 from huangyu/0626_fix_incre_sourceroots
This commit is contained in:
openharmony_ci 2024-06-28 08:19:56 +00:00 committed by Gitee
commit 208ab67494
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/src/ets_checker.ts
View File

@ -172,7 +172,8 @@ function setCompilerOptions(resolveModulePaths: string[]): void {
// options incremental && tsBuildInfoFile are required for applying incremental ability of typescript
'incremental': true,
'tsBuildInfoFile': buildInfoPath,
'tsImportSendableEnable': tsImportSendable
'tsImportSendableEnable': tsImportSendable,
'skipPathsInKeyForCompilationSettings': reuseLanguageServiceForDepChange
});
if (projectConfig.compileMode === ESMODULE) {
Object.assign(compilerOptions, {

82
compiler/test/ark_compiler_ut/ets_checker.test.ts
View File

@ -15,17 +15,24 @@
import mocha from 'mocha';
import fs from 'fs';
import path from 'path';
import { expect } from 'chai';
import { EXPECT_INDEX_ETS } from './mock/rollup_mock/path_config';
import RollUpPluginMock from './mock/rollup_mock/rollup_plugin_mock';
import {
addLocalPackageSet,
compilerOptions,
localPackageSet,
needReCheckForChangedDepUsers,
resetEtsCheck,
serviceChecker,
} from '../../lib/ets_checker';
import { projectConfig } from '../../main';
import { TS_BUILD_INFO_SUFFIX } from '../../lib/pre_define'
import {
globalProgram,
projectConfig
} from '../../main';
mocha.describe('test ets_checker file api', function () {
mocha.before(function () {
@ -34,6 +41,18 @@ mocha.describe('test ets_checker file api', function () {
mocha.after(() => {
delete this.rollup;
const cacheFile: string = path.resolve(projectConfig.cachePath, '../.ts_checker_cache');
if (fs.existsSync(cacheFile)) {
fs.unlinkSync(cacheFile);
}
const tsBuildInfoFilePath: string = path.resolve(projectConfig.cachePath, '..', TS_BUILD_INFO_SUFFIX);
if (fs.existsSync(tsBuildInfoFilePath)) {
fs.unlinkSync(tsBuildInfoFilePath);
}
const tsBuildInfoLinterFilePath: string = tsBuildInfoFilePath + '.linter';
if (fs.existsSync(tsBuildInfoLinterFilePath)) {
fs.unlinkSync(tsBuildInfoLinterFilePath);
}
});
mocha.it('1-1: test addLocalPackageSet for original ohmurl', function () {
@ -92,14 +111,69 @@ mocha.describe('test ets_checker file api', function () {
Object.assign(projectConfig, rollupObject.share.projectConfig);
// The current hash and the hash in cache of the dependency differs, should recheck
serviceChecker(['../testdata/expect/expect_Index.ets'], null, null, null, rollupObject.share);
serviceChecker([EXPECT_INDEX_ETS], null, null, null, rollupObject.share);
expect(needReCheckForChangedDepUsers).to.be.true;
expect(globalProgram.program != null).to.be.true;
resetEtsCheck();
expect(needReCheckForChangedDepUsers).to.be.false;
expect(globalProgram.program == null).to.be.true;
// The current hash and the hash in cache of the dependency are the same, no need to recheck
serviceChecker(['../testdata/expect/expect_Index.ets'], null, null, null, rollupObject.share);
serviceChecker([EXPECT_INDEX_ETS], null, null, null, rollupObject.share);
expect(needReCheckForChangedDepUsers).to.be.false;
})
expect(globalProgram.program != null).to.be.true;
resetEtsCheck();
expect(needReCheckForChangedDepUsers).to.be.false;
expect(globalProgram.program == null).to.be.true;
});
mocha.it('1-4: test getOrCreateLanguageService when paths in compilerOptions change', function () {
this.timeout(10000);
this.rollup.build();
let rollupObject = this.rollup;
process.env.compileTool = 'rollup';
Object.assign(projectConfig, rollupObject.share.projectConfig);
serviceChecker([EXPECT_INDEX_ETS], null, null, null, rollupObject.share);
expect(JSON.stringify(compilerOptions.paths) === '{"*":["*","../../../../*","../*"]}').to.be.true;
expect(needReCheckForChangedDepUsers).to.be.false;
expect(globalProgram.program != null).to.be.true;
expect(compilerOptions.skipPathsInKeyForCompilationSettings).to.be.true;
resetEtsCheck();
expect(needReCheckForChangedDepUsers).to.be.false;
expect(globalProgram.program == null).to.be.true;
expect(compilerOptions.skipPathsInKeyForCompilationSettings).to.be.true;
interface MockCacheStore {
service: Object | undefined;
pkgJsonFileHash: string;
targetESVersion: number;
}
const mockServiceCache = {
service: undefined,
pkgJsonFileHash: '9f07917d395682c73a90af8f5796a2c6',
targetESVersion: 8
}
let mockCache = new Map<string, MockCacheStore>();
mockCache.set('service', mockServiceCache);
rollupObject.share.cache = mockCache;
rollupObject.share.depInfo = {enableIncre: true};
rollupObject.share.projectConfig.pkgJsonFileHash = '26bde0f30dda53b0afcbf39428ec9851';
// The current hash of the dependency differs, and the paths in compilerOptions will change since resolveModulePaths change
const resolveModulePaths = ['../testdata/expect'];
serviceChecker([EXPECT_INDEX_ETS], null, resolveModulePaths, null, rollupObject.share);
expect(JSON.stringify(compilerOptions.paths) === '{"*":["*","../../../../../../../testdata/expect/*"]}').to.be.true;
expect(needReCheckForChangedDepUsers).to.be.true;
expect(globalProgram.program != null).to.be.true;
expect(compilerOptions.skipPathsInKeyForCompilationSettings).to.be.true;
resetEtsCheck();
expect(needReCheckForChangedDepUsers).to.be.false;
expect(globalProgram.program == null).to.be.true;
expect(compilerOptions.skipPathsInKeyForCompilationSettings).to.be.true;
});
});