Skip to content

Commit 0d05eea

Browse files
snehaljha-sfsnehaljha-sf
authored
snehaljha-sf/fileNamingFix
File naming fix
2 parents c118313 + 2108ce0 commit 0d05eea

File tree

9 files changed

+182
-211
lines changed

9 files changed

+182
-211
lines changed

‎CHANGELOG.md‎

Lines changed: 84 additions & 199 deletions
Large diffs are not rendered by default.

‎src/migration/omniscript.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,6 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
925925
}
926926

927927
mappedObject[ElementMappings.PropertySet__c] = JSON.stringify(propertySet);
928-
mappedObject['Name'] = this.cleanName(mappedObject['Name']);
929928

930929
// BATCH framework requires that each record has an "attributes" property
931930
mappedObject['attributes'] = {

‎src/migration/related/ApexMigration.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
TokenUpdater,
1414
} from '../../utils/apex/parser/apexparser';
1515
import { sfProject } from '../../utils/sfcli/project/sfProject';
16-
import { fileUtil, File } from '../../utils/file/fileUtil';
16+
import { FileUtil, File } from '../../utils/file/fileUtil';
1717
import { Logger } from '../../utils/logger';
1818
import { ApexAssessmentInfo } from '../../utils';
1919
import { FileDiffUtil } from '../../utils/lwcparser/fileutils/FileDiffUtil';
@@ -72,7 +72,7 @@ export class ApexMigration extends BaseRelatedObjectMigration {
7272
public processApexFiles(dir: string): ApexAssessmentInfo[] {
7373
dir += APEX_CLASS_PATH;
7474
let files: File[] = [];
75-
files = fileUtil.readFilesSync(dir);
75+
files = FileUtil.readFilesSync(dir);
7676
const fileAssessmentInfo: ApexAssessmentInfo[] = [];
7777
for (const file of files) {
7878
if (file.ext !== '.cls') continue;

‎src/migration/related/LwcMigration.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable @typescript-eslint/no-shadow */
22
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
33
import * as shell from 'shelljs';
4-
import { fileUtil, File } from '../../utils/file/fileUtil';
4+
import { FileUtil, File } from '../../utils/file/fileUtil';
55
import { sfProject } from '../../utils/sfcli/project/sfProject';
66
import { Logger } from '../../utils/logger';
77
import { FileProcessorFactory } from '../../utils/lwcparser/fileutils/FileProcessorFactory';
@@ -52,7 +52,7 @@ export class LwcMigration extends BaseRelatedObjectMigration {
5252
dir += LWC_DIR_PATH;
5353
let filesMap: Map<string, File[]>;
5454
try {
55-
filesMap = fileUtil.readAndProcessFiles(dir, 'OmniScript Auto-generated');
55+
filesMap = FileUtil.readAndProcessFiles(dir, 'OmniScript Auto-generated');
5656
} catch (error) {
5757
Logger.logger.error('Error in reading files', error);
5858
}

src/utils/file/fileutil.ts renamed to src/utils/file/fileUtil.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as fs from 'fs';
66
import * as path from 'path';
77
import { Logger } from '../logger';
88

9-
export class fileUtil {
9+
export class FileUtil {
1010
public static readFilesSync(dir: string): File[] {
1111
const files: File[] = [];
1212
fs.readdirSync(dir).forEach((filename) => {

‎src/utils/lwcparser/fileutils/HtmlFileProcessor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/explicit-member-accessibility */
22
import { FileProcessor } from '../../../utils';
3-
import { File, fileUtil } from '../../file/fileUtil';
3+
import { File, FileUtil } from '../../file/fileUtil';
44
import { HTMLParser } from '../../lwcparser/htmlParser/HTMLParser';
55
import { FileConstant } from '../fileutils/FileConstant';
66
import { FileDiffUtil } from './FileDiffUtil';
@@ -22,7 +22,7 @@ export class HtmlFileProcessor implements FileProcessor {
2222
fileContent.get(FileConstant.MODIFIED_CONTENT)
2323
);
2424
if (type != null && type === 'migration' && diff.length > 0) {
25-
fileUtil.saveToFile(filePath, fileContent.get(FileConstant.MODIFIED_CONTENT));
25+
FileUtil.saveToFile(filePath, fileContent.get(FileConstant.MODIFIED_CONTENT));
2626
}
2727
return JSON.stringify(diff);
2828
}

‎src/utils/lwcparser/fileutils/JavascriptFileProcessor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
55
/* eslint-disable @typescript-eslint/explicit-member-accessibility */
66
import { FileProcessor } from '../../../utils';
7-
import { File, fileUtil } from '../../file/fileUtil';
7+
import { File, FileUtil } from '../../file/fileUtil';
88
import { JavaScriptParser } from '../../lwcparser/jsParser/JavaScriptParser';
99
import { FileConstant } from '../fileutils/FileConstant';
1010
import { FileDiffUtil } from './FileDiffUtil';
@@ -26,7 +26,7 @@ export class JavascriptFileProcessor implements FileProcessor {
2626
fileContent.get(FileConstant.MODIFIED_CONTENT)
2727
);
2828
if (type != null && type === 'migration') {
29-
fileUtil.saveToFile(filePath, fileContent.get(FileConstant.MODIFIED_CONTENT));
29+
FileUtil.saveToFile(filePath, fileContent.get(FileConstant.MODIFIED_CONTENT));
3030
}
3131
return JSON.stringify(diff);
3232
}

‎src/utils/lwcparser/fileutils/XmlFileProcessor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/* eslint-disable no-console */
44
/* eslint-disable @typescript-eslint/explicit-member-accessibility */
55
import { FileProcessor } from '../../../utils';
6-
import { File, fileUtil } from '../../file/fileUtil';
6+
import { File, FileUtil } from '../../file/fileUtil';
77
import { XmlParser } from '../../lwcparser/xmlParser/XmlParser';
88
import { FileConstant } from '../fileutils/FileConstant';
99
import { FileDiffUtil } from './FileDiffUtil';
@@ -26,7 +26,7 @@ export class XmlFileProcessor implements FileProcessor {
2626
fileContent.get(FileConstant.MODIFIED_CONTENT)
2727
);
2828
if (type != null && type === 'migration') {
29-
fileUtil.saveToFile(filePath, fileContent.get(FileConstant.MODIFIED_CONTENT));
29+
FileUtil.saveToFile(filePath, fileContent.get(FileConstant.MODIFIED_CONTENT));
3030
}
3131
return JSON.stringify(diff);
3232
}

‎yarn.lock‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,6 +1735,11 @@ bl@^4.0.3:
17351735
inherits "^2.0.4"
17361736
readable-stream "^3.4.0"
17371737

1738+
boolbase@^1.0.0:
1739+
version "1.0.0"
1740+
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
1741+
integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
1742+
17381743
brace-expansion@^1.1.7:
17391744
version "1.1.11"
17401745
resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
@@ -1959,6 +1964,35 @@ check-error@^1.0.3:
19591964
dependencies:
19601965
get-func-name "^2.0.2"
19611966

1967+
cheerio-select@^2.1.0:
1968+
version "2.1.0"
1969+
resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
1970+
integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==
1971+
dependencies:
1972+
boolbase "^1.0.0"
1973+
css-select "^5.1.0"
1974+
css-what "^6.1.0"
1975+
domelementtype "^2.3.0"
1976+
domhandler "^5.0.3"
1977+
domutils "^3.0.1"
1978+
1979+
cheerio@^1.0.0:
1980+
version "1.0.0"
1981+
resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0.tgz#1ede4895a82f26e8af71009f961a9b8cb60d6a81"
1982+
integrity sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==
1983+
dependencies:
1984+
cheerio-select "^2.1.0"
1985+
dom-serializer "^2.0.0"
1986+
domhandler "^5.0.3"
1987+
domutils "^3.1.0"
1988+
encoding-sniffer "^0.2.0"
1989+
htmlparser2 "^9.1.0"
1990+
parse5 "^7.1.2"
1991+
parse5-htmlparser2-tree-adapter "^7.0.0"
1992+
parse5-parser-stream "^7.1.2"
1993+
undici "^6.19.5"
1994+
whatwg-mimetype "^4.0.0"
1995+
19621996
[email protected]:
19631997
version "3.5.1"
19641998
resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"
@@ -2540,6 +2574,36 @@ doctrine@^3.0.0:
25402574
dependencies:
25412575
esutils "^2.0.2"
25422576

2577+
dom-serializer@^2.0.0:
2578+
version "2.0.0"
2579+
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
2580+
integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
2581+
dependencies:
2582+
domelementtype "^2.3.0"
2583+
domhandler "^5.0.2"
2584+
entities "^4.2.0"
2585+
2586+
domelementtype@^2.3.0:
2587+
version "2.3.0"
2588+
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
2589+
integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
2590+
2591+
domhandler@^5.0.2, domhandler@^5.0.3:
2592+
version "5.0.3"
2593+
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
2594+
integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
2595+
dependencies:
2596+
domelementtype "^2.3.0"
2597+
2598+
domutils@^3.0.1, domutils@^3.1.0:
2599+
version "3.1.0"
2600+
resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
2601+
integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
2602+
dependencies:
2603+
dom-serializer "^2.0.0"
2604+
domelementtype "^2.3.0"
2605+
domhandler "^5.0.3"
2606+
25432607
dot-case@^3.0.4:
25442608
version "3.0.4"
25452609
resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
@@ -2599,6 +2663,14 @@ emoji-regex@^8.0.0:
25992663
resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
26002664
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
26012665

2666+
encoding-sniffer@^0.2.0:
2667+
version "0.2.0"
2668+
resolved "https://registry.yarnpkg.com/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz#799569d66d443babe82af18c9f403498365ef1d5"
2669+
integrity sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==
2670+
dependencies:
2671+
iconv-lite "^0.6.3"
2672+
whatwg-encoding "^3.1.1"
2673+
26022674
end-of-stream@^1.1.0, end-of-stream@^1.4.1:
26032675
version "1.4.4"
26042676
resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
@@ -3675,6 +3747,16 @@ html-escaper@^2.0.0:
36753747
resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
36763748
integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
36773749

3750+
htmlparser2@^9.1.0:
3751+
version "9.1.0"
3752+
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-9.1.0.tgz#cdb498d8a75a51f739b61d3f718136c369bc8c23"
3753+
integrity sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==
3754+
dependencies:
3755+
domelementtype "^2.3.0"
3756+
domhandler "^5.0.3"
3757+
domutils "^3.1.0"
3758+
entities "^4.5.0"
3759+
36783760
http-call@^5.1.2:
36793761
version "5.3.0"
36803762
resolved "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz"
@@ -6715,6 +6797,11 @@ unbox-primitive@^1.0.1:
67156797
has-symbols "^1.0.2"
67166798
which-boxed-primitive "^1.0.2"
67176799

6800+
undici@^6.19.5:
6801+
version "6.19.8"
6802+
resolved "https://registry.yarnpkg.com/undici/-/undici-6.19.8.tgz#002d7c8a28f8cc3a44ff33c3d4be4d85e15d40e1"
6803+
integrity sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==
6804+
67186805
universalify@^0.1.0, universalify@^0.1.2:
67196806
version "0.1.2"
67206807
resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"

0 commit comments

Comments
 (0)