human-ids 1.0.10 → 1.0.12

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.12] - 2023-07-07
+
+### Fixed
+- Fixed bug with undefined disctionaries
+## [1.0.11] - 2023-07-07
+
+### Fixed
+- Fixed bug with custom dictionaries
 ## [1.0.10] - 2023-07-07
 
 ### Added

package/index.d.ts

@@ -12,13 +12,13 @@ declare module 'human-ids' {
       completeWithZeros?: boolean;
     };
     dictionary?: {
-      adjectives?: {
+      adjectives: {
         [key: string]: string[];
       };
-      colors?: {
+      colors: {
         [key: string]: string[];
       };
-      nouns?: {
+      nouns: {
         [key: string]: string[];
       }
     };

package/index.js

@@ -1,7 +1,7 @@
 const dictionaries = require('./dictionaries');
 
 const defaultSettings = {
-  lang: 'en',
+  lang: 'es',
   adjective: true,
   color: true,
   noun: true,
@@ -16,7 +16,7 @@ const defaultSettings = {
 };
 
 function generateId(userSettings = {}) {
-  const settings = Object.assign({}, defaultSettings, userSettings);
+  const settings = {...defaultSettings, ...userSettings};
   const lang = dictionaries[settings.lang] ? settings.lang : dictionaries[settings.lang?.split('-')[0]] ? settings.lang?.split('-')[0] : 'en';
   const useAdjective = settings.adjective || false;
   const useColor = settings.color || false;
@@ -40,15 +40,15 @@ function generateId(userSettings = {}) {
   }
 
   function getAdjectives() {
-    return settings.dictionary && settings.dictionary.adjectives ? settings.dictionary.adjectives : {};
+    return settings.dictionary && settings.dictionary.adjectives ? settings.dictionary.adjectives : dictionaries[lang].adjectives;
   }
 
   function getColors() {
-    return settings.dictionary && settings.dictionary.colors ? settings.dictionary.colors : {};
+    return settings.dictionary && settings.dictionary.colors ? settings.dictionary.colors : dictionaries[lang].colors;
   }
 
   function getNouns() {
-    return settings.dictionary && settings.dictionary.nouns ? settings.dictionary.nouns : {};
+    return settings.dictionary && settings.dictionary.nouns ? settings.dictionary.nouns : dictionaries[lang].nouns;
   }
 
   const parts = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "human-ids",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "A library to generate human readable IDs",
   "main": "index.js",
   "scripts": {

package/tests/index.test.js

@@ -2,7 +2,7 @@ const generateId = require('../index');
 
 describe('generateId', () => {
   test('should return a unique ID', () => {
-    const testLength = 1000000;
+    const testLength = 1000;
     const settings = {
       lang: 'en',
       adjective: true,