Skip to content

Commit b0b307a

Browse files
committed
fix(objectconvertion): respect delimiter
1 parent ce6ed70 commit b0b307a

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"start-object:snake": "ts-node ./src/bin/svg-to-ts.ts --convertionType object -s './inputfilesBis/*.svg' -d SNAKE",
1919
"start-object:camel": "ts-node ./src/bin/svg-to-ts.ts --convertionType object -s './inputfilesBis/*.svg' -d CAMEL",
2020
"start-object:multiple-source": "ts-node ./src/bin/svg-to-ts.ts --convertionType object -s './inputfiles/*.svg' -s './inputfilesBis/*.svg'",
21-
"start-object:custom": "ts-node ./src/bin/svg-to-ts.ts --convertionType object -s './inputfiles/*.svg' -o ./dist --objectName awesomeIcons -f icons",
21+
"start-object:custom": "ts-node ./src/bin/svg-to-ts.ts --convertionType object -s './inputfiles/*.svg' -o ./dist --objectName awesomeIcons -f icons -d CAMEL",
2222
"start-constants": "ts-node ./src/bin/svg-to-ts.ts --convertionType constants -s './inputfiles/*.svg'",
2323
"start-constants:svgconfig": "ts-node ./src/bin/svg-to-ts.ts --convertionType constants -s './inputfiles/*.svg' --svgoConfig ./svgo-test.config.json",
2424
"start-constants:regex": "ts-node ./src/bin/svg-to-ts.ts --convertionType constants -s './inputfilesRegex/**/*.svg'",

src/bin/svg-to-ts.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#!/usr/bin/env node
2-
import { convertToSingleFile } from '../lib/converters/single-file.converter';
3-
import { convertToMultipleFiles } from '../lib/converters/multiple-files.converter';
42
import {
53
ConvertionType,
64
getOptions,
@@ -11,6 +9,8 @@ import {
119
import { info, printLogo } from '../lib/helpers/log-helper';
1210
import { setupCommander } from '../lib/options/args-collector';
1311
import { convertToSingleObject } from '../lib/converters/object.converter';
12+
import { convertToConstants } from '../lib/converters/constants.converter';
13+
import { convertToFiles } from '../lib/converters/files.converter';
1414

1515
(async () => {
1616
setupCommander();
@@ -19,12 +19,12 @@ import { convertToSingleObject } from '../lib/converters/object.converter';
1919

2020
if (convertionOptions.convertionType === ConvertionType.FILES) {
2121
info('We are using the convertiontype "files"');
22-
await convertToMultipleFiles(convertionOptions as FileConvertionOptions);
22+
await convertToFiles(convertionOptions as FileConvertionOptions);
2323
}
2424

2525
if (convertionOptions.convertionType === ConvertionType.CONSTANTS) {
2626
info('We are using the convertiontype "constants"');
27-
await convertToSingleFile(convertionOptions as ConstantsConvertionOptions);
27+
await convertToConstants(convertionOptions as ConstantsConvertionOptions);
2828
}
2929

3030
if (convertionOptions.convertionType === ConvertionType.OBJECT) {

src/lib/converters/single-file.converter.ts renamed to src/lib/converters/constants.converter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const getSvgConstants = svgDefinitions => {
2020
return svgConstants.join('');
2121
};
2222

23-
export const convertToSingleFile = async (convertionOptions: ConstantsConvertionOptions): Promise<void> => {
23+
export const convertToConstants = async (convertionOptions: ConstantsConvertionOptions): Promise<void> => {
2424
const { outputDirectory, fileName } = convertionOptions;
2525
try {
2626
const svgDefinitions = await filesProcessor(convertionOptions);

src/lib/converters/multiple-files.converter.ts renamed to src/lib/converters/files.converter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const writeFiles = async (outputDirectory, iconsFolderName, modelFileName, prefi
3131
return fileContent.join('');
3232
};
3333

34-
export const convertToMultipleFiles = async (convertionOptions: FileConvertionOptions): Promise<void> => {
34+
export const convertToFiles = async (convertionOptions: FileConvertionOptions): Promise<void> => {
3535
const {
3636
prefix,
3737
outputDirectory,

src/lib/converters/object.converter.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ import { error, success, underlineSuccess } from '../helpers/log-helper';
55
import { filesProcessor, SvgDefinition } from './shared.converter';
66

77
export const convertToSingleObject = async (convertionOptions: ObjectConvertionOptions): Promise<void> => {
8-
const { outputDirectory, fileName } = convertionOptions;
8+
const { outputDirectory, fileName, objectName } = convertionOptions;
99
try {
1010
const svgObject = {};
1111
const svgDefinitions = await filesProcessor(convertionOptions);
12-
svgDefinitions.forEach(
13-
(svgDefinition: SvgDefinition) => (svgObject[svgDefinition.filenameWithoutEnding] = svgDefinition.data)
14-
);
15-
await writeFile(outputDirectory, fileName, `export const icons = ${JSON.stringify(svgObject)}`);
12+
svgDefinitions.forEach((svgDefinition: SvgDefinition) => (svgObject[svgDefinition.typeName] = svgDefinition.data));
13+
await writeFile(outputDirectory, fileName, `export const ${objectName} = ${JSON.stringify(svgObject)}`);
1614
success(`Icons file successfully generated under ${underlineSuccess(outputDirectory)}`);
1715
} catch (exception) {
1816
error(`Something went wrong: ${exception}`);

0 commit comments

Comments
 (0)