fix(utilities): add missing deprecated exports

sapphiredev · Oct 2, 2022 · ef08c69 · ef08c69
1 parent fb278ba
commit ef08c69
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 8 deletions.
diff --git a/packages/utilities/package.json b/packages/utilities/package.json
@@ -76,6 +76,16 @@
 			"import": "./dist/lib/filterNullAndUndefined.mjs",
 			"require": "./dist/lib/filterNullAndUndefined.js"
 		},
+		"./filterNullishAndEmpty": {
+			"types": "./dist/lib/filterNullAndUndefinedAndEmpty.d.ts",
+			"import": "./dist/lib/filterNullAndUndefinedAndEmpty.mjs",
+			"require": "./dist/lib/filterNullAndUndefinedAndEmpty.js"
+		},
+		"./filterNullishAndZero": {
+			"types": "./dist/lib/filterNullAndUndefinedAndZero.d.ts",
+			"import": "./dist/lib/filterNullAndUndefinedAndZero.mjs",
+			"require": "./dist/lib/filterNullAndUndefinedAndZero.js"
+		},
 		"./filterNullishOrEmpty": {
 			"types": "./dist/lib/filterNullAndUndefinedAndEmpty.d.ts",
 			"import": "./dist/lib/filterNullAndUndefinedAndEmpty.mjs",

diff --git a/packages/utilities/src/lib/filterNullAndUndefinedAndEmpty.ts b/packages/utilities/src/lib/filterNullAndUndefinedAndEmpty.ts
@@ -21,3 +21,8 @@ export function filterNullAndUndefinedAndEmpty<TValue>(value: TValue | Nullish |
 }
 
 export { filterNullAndUndefinedAndEmpty as filterNullishAndEmpty };
+
+/**
+ * @deprecated Will be removed in the next major version, switch to either `filterNullishAndEmpty` or `filterNullAndUndefinedAndEmpty`.
+ */
+export const filterNullishOrEmpty = filterNullAndUndefinedAndEmpty;
diff --git a/packages/utilities/src/lib/filterNullAndUndefinedAndZero.ts b/packages/utilities/src/lib/filterNullAndUndefinedAndZero.ts
@@ -21,3 +21,8 @@ export function filterNullAndUndefinedAndZero<TValue>(value: TValue | Nullish |
 }
 
 export { filterNullAndUndefinedAndZero as filterNullishAndZero };
+
+/**
+ * @deprecated Will be removed in the next major version, switch to either `filterNullishAndZero` or `filterNullAndUndefinedAndZero`.
+ */
+export const filterNullishOrZero = filterNullAndUndefinedAndZero;
diff --git a/scripts/aliases/utilities.mjs b/scripts/aliases/utilities.mjs
@@ -1,7 +1,7 @@
 export const aliasStore = new Map([
 	['filterNullAndUndefined', 'filterNullish'],
-	['filterNullAndUndefinedAndEmpty', 'filterNullishOrEmpty'],
-	['filterNullAndUndefinedAndZero', 'filterNullishOrZero'],
+	['filterNullAndUndefinedAndEmpty', ['filterNullishAndEmpty', 'filterNullishOrEmpty']],
+	['filterNullAndUndefinedAndZero', ['filterNullishAndZero', 'filterNullishOrZero']],
 	['isNullOrUndefined', 'isNullish'],
 	['isNullOrUndefinedOrEmpty', 'isNullishOrEmpty'],
 	['isNullOrUndefinedOrZero', 'isNullishOrZero'],

diff --git a/scripts/subpath-updater.mjs b/scripts/subpath-updater.mjs
@@ -35,12 +35,23 @@ for await (const file of findFilesRecursivelyStringEndsWith(new URL(`../packages
 		require: `${filePath}.js`
 	});
 
-	if (aliasStore.has(name)) {
-		exportMap.set(`./${aliasStore.get(name)}`, {
-			types: `${filePath}.d.ts`,
-			import: `${filePath}.mjs`,
-			require: `${filePath}.js`
-		});
+	const aliasStoreEntry = aliasStore.get(name);
+	if (aliasStoreEntry) {
+		if (Array.isArray(aliasStoreEntry)) {
+			for (const entry of aliasStoreEntry) {
+				exportMap.set(`./${entry}`, {
+					types: `${filePath}.d.ts`,
+					import: `${filePath}.mjs`,
+					require: `${filePath}.js`
+				});
+			}
+		} else {
+			exportMap.set(`./${aliasStoreEntry}`, {
+				types: `${filePath}.d.ts`,
+				import: `${filePath}.mjs`,
+				require: `${filePath}.js`
+			});
+		}
 	}
 }