chore: prerelease cleanup (#74)

Author: heldinz

Diff for: dist/index.js

@@ -20,17 +20,13 @@ export default function convertEncoding(options) {
 		throw new PluginError(pluginName, ErrorBindings.missingEncoding);
 	}
 	const { from = UTF8, to = UTF8 } = options;
-	if (!iconv.encodingExists(from)) {
-		throw new PluginError(
-			pluginName,
-			`${ErrorBindings.unsupportedEncoding}: ${from}`,
-		);
-	}
-	if (!iconv.encodingExists(to)) {
-		throw new PluginError(
-			pluginName,
-			`${ErrorBindings.unsupportedEncoding}: ${to}`,
-		);
+	for (const option of [from, to]) {
+		if (!iconv.encodingExists(option)) {
+			throw new PluginError(
+				pluginName,
+				`${ErrorBindings.unsupportedEncoding}: ${option}`,
+			);
+		}
 	}
 	if (from === to) {
 		console.warn(`${pluginName}: ${ErrorBindings.sameEncoding}`);
@@ -49,17 +45,25 @@ export default function convertEncoding(options) {
 				return file;
 			}
 			if (file.isBuffer()) {
-				const decodedContent = iconv.decode(
-					file.contents,
-					from,
-					iconvOptions.decode,
-				);
-				file.contents = iconv.encode(decodedContent, to, iconvOptions.encode);
+				try {
+					const decodedContent = iconv.decode(
+						file.contents,
+						from,
+						iconvOptions.decode,
+					);
+					file.contents = iconv.encode(decodedContent, to, iconvOptions.encode);
+				} catch (err) {
+					throw new PluginError(pluginName, err);
+				}
 			}
 			if (file.isStream()) {
-				file.contents = file.contents
-					.pipe(iconv.decodeStream(from, iconvOptions.decode))
-					.pipe(iconv.encodeStream(to, iconvOptions.encode));
+				try {
+					file.contents = file.contents
+						.pipe(iconv.decodeStream(from, iconvOptions.decode))
+						.pipe(iconv.encodeStream(to, iconvOptions.encode));
+				} catch (err) {
+					throw new PluginError(pluginName, err);
+				}
 			}
 			return file;
 		},

Diff for: package.json

@@ -74,7 +74,7 @@
 		"vinyl": "3.0.0"
 	},
 	"peerDependencies": {
-		"gulp": ">=5"
+		"gulp": ">=4 <5"
 	},
 	"peerDependenciesMeta": {
 		"gulp": {

Diff for: src/index.ts

@@ -39,18 +39,13 @@ export default function convertEncoding(options: Options) {
 
 	const { from = UTF8, to = UTF8 } = options;
 
-	if (!iconv.encodingExists(from)) {
-		throw new PluginError(
-			pluginName,
-			`${ErrorBindings.unsupportedEncoding}: ${from}`,
-		);
-	}
-
-	if (!iconv.encodingExists(to)) {
-		throw new PluginError(
-			pluginName,
-			`${ErrorBindings.unsupportedEncoding}: ${to}`,
-		);
+	for (const option of [from, to]) {
+		if (!iconv.encodingExists(option)) {
+			throw new PluginError(
+				pluginName,
+				`${ErrorBindings.unsupportedEncoding}: ${option}`,
+			);
+		}
 	}
 
 	if (from === to) {
@@ -74,18 +69,26 @@ export default function convertEncoding(options: Options) {
 			}
 
 			if (file.isBuffer()) {
-				const decodedContent = iconv.decode(
-					file.contents,
-					from,
-					iconvOptions.decode,
-				);
-				file.contents = iconv.encode(decodedContent, to, iconvOptions.encode);
+				try {
+					const decodedContent = iconv.decode(
+						file.contents,
+						from,
+						iconvOptions.decode,
+					);
+					file.contents = iconv.encode(decodedContent, to, iconvOptions.encode);
+				} catch (err: unknown) {
+					throw new PluginError(pluginName, err as Error);
+				}
 			}
 
 			if (file.isStream()) {
-				file.contents = file.contents
-					.pipe(iconv.decodeStream(from, iconvOptions.decode))
-					.pipe(iconv.encodeStream(to, iconvOptions.encode));
+				try {
+					file.contents = file.contents
+						.pipe(iconv.decodeStream(from, iconvOptions.decode))
+						.pipe(iconv.encodeStream(to, iconvOptions.encode));
+				} catch (err: unknown) {
+					throw new PluginError(pluginName, err as Error);
+				}
 			}
 
 			return file;

Diff for: test/_helper.js

@@ -3,31 +3,28 @@ import { Readable } from 'node:stream';
 
 import Vinyl from 'vinyl';
 
-const testString = 'äöüß';
-const UTF8 = 'utf8';
 const LATIN1 = 'latin1';
-const LATIN1_ISO = 'iso-8859-1';
+const TEST_STRING = 'äöüß';
+const UTF8 = 'utf8';
 
 export function createFile({ contents }) {
-	const file = new Vinyl({
+	return new Vinyl({
 		contents,
 	});
-
-	return file;
 }
 
 const setUp = ({ isFromLatin1 = false, isStream = false } = {}) => {
 	let from = UTF8;
 	let to = LATIN1;
-	let pluginOptions = { to: LATIN1_ISO };
+	let pluginOptions = { to: LATIN1 };
 
 	if (isFromLatin1) {
 		from = LATIN1;
 		to = UTF8;
-		pluginOptions = { from: LATIN1_ISO };
+		pluginOptions = { from: LATIN1 };
 	}
 
-	const defaultBuffer = Buffer.from(testString);
+	const defaultBuffer = Buffer.from(TEST_STRING);
 	const fileContentsBuffer = isFromLatin1
 		? transcode(defaultBuffer, to, from)
 		: defaultBuffer;
@@ -41,7 +38,7 @@ const setUp = ({ isFromLatin1 = false, isStream = false } = {}) => {
 		to,
 		pluginOptions,
 		vinylFile: createFile({ contents: fileContents }),
-		expected: testString,
+		expected: TEST_STRING,
 		isStream,
 	};
 };