Merge pull request #3 from osvetilka/master

Задача 2.1 доработка, Задача 2.2
js-tasks-ru · Jan 30, 2025 · b7eb8df · b7eb8df
2 parents 4d34923 + 90f4291
commit b7eb8df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/02-javascript-data-types/1-sort-strings/index.js b/02-javascript-data-types/1-sort-strings/index.js
@@ -5,13 +5,12 @@
  * @returns {string[]}
  */
 export function sortStrings(arr, param = 'asc') {
-  let sortArr = [...arr];  
-  
+  const sortArr = [...arr];  
+
   if (param === 'asc') {
     return sortArr.sort((a, b) => a.localeCompare(b,'ru',{caseFirst: 'upper'}));
   }
-  else if (param === 'desc') {
-    return sortArr.sort((a, b) => -a.localeCompare(b,'ru',{caseFirst: 'upper'}));
-  }  
+
+  return sortArr.sort((a, b) => -a.localeCompare(b,'ru',{caseFirst: 'upper'}));
 }
 
diff --git a/02-javascript-data-types/2-pick/index.js b/02-javascript-data-types/2-pick/index.js
@@ -4,6 +4,7 @@
  * @param {...string} fields - the properties paths to pick
  * @returns {object} - returns the new object
  */
-export const pick = (obj, ...fields) => {
-
+export const pick = (obj, ...fields) => { 
+   const filt = Object.entries(obj).filter(item => fields.includes(item[0]))
+  return Object.fromEntries(filt);
 };
diff --git a/02-javascript-data-types/3-omit/index.js b/02-javascript-data-types/3-omit/index.js
@@ -5,5 +5,6 @@
  * @returns {object} - returns the new object
  */
 export const omit = (obj, ...fields) => {
-
+  const filt = Object.entries(obj).filter(item => !fields.includes(item[0]))
+  return Object.fromEntries(filt);
 };