namefully 1.3.0 → 1.3.1

package/dist/lib/config.js

@@ -99,10 +99,16 @@ class Config {
         __classPrivateFieldSet(this, _Config_surname, types_1.Surname.FATHER, "f");
         _a.cache.set(this.name, this);
     }
-    updateOrder(order) {
-        if (order && order !== __classPrivateFieldGet(this, _Config_orderedBy, "f")) {
-            __classPrivateFieldSet(_a.cache.get(this.name), _Config_orderedBy, order, "f");
-        }
+    update({ orderedBy, title, ending }) {
+        const config = _a.cache.get(this.name);
+        if (!config)
+            return;
+        if (orderedBy !== __classPrivateFieldGet(this, _Config_orderedBy, "f"))
+            __classPrivateFieldSet(config, _Config_orderedBy, orderedBy, "f");
+        if (title !== __classPrivateFieldGet(this, _Config_title, "f"))
+            __classPrivateFieldSet(config, _Config_title, title, "f");
+        if (ending !== __classPrivateFieldGet(this, _Config_ending, "f"))
+            __classPrivateFieldSet(config, _Config_ending, ending, "f");
     }
 }
 exports.Config = Config;

package/dist/lib/constants.js

@@ -1,30 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALLOWED_TOKENS = exports.MAX_NUMBER_OF_NAME_PARTS = exports.MIN_NUMBER_OF_NAME_PARTS = exports.VERSION = void 0;
-exports.VERSION = '1.3.0';
+exports.ALLOWED_FORMAT_TOKENS = exports.MAX_NUMBER_OF_NAME_PARTS = exports.MIN_NUMBER_OF_NAME_PARTS = exports.VERSION = void 0;
+exports.VERSION = '1.3.1';
 exports.MIN_NUMBER_OF_NAME_PARTS = 2;
 exports.MAX_NUMBER_OF_NAME_PARTS = 5;
-exports.ALLOWED_TOKENS = [
-    '.',
-    ',',
-    ' ',
-    '-',
-    '_',
-    'b',
-    'B',
-    'f',
-    'F',
-    'l',
-    'L',
-    'm',
-    'M',
-    'n',
-    'N',
-    'o',
-    'O',
-    'p',
-    'P',
-    's',
-    'S',
-    '$',
-];
+exports.ALLOWED_FORMAT_TOKENS = ` .,_-()[]<>'"bBfFlLmMnNoOpPsS$`;

package/dist/lib/error.js

@@ -17,19 +17,14 @@ class NameError extends Error {
         this.name = 'NameError';
     }
     get sourceAsString() {
-        let input = '';
-        if (!this.source)
-            input = '<undefined>';
         if (typeof this.source === 'string')
-            input = this.source;
-        if ((0, utils_1.isNameArray)(this.source))
-            input = this.source.map((n) => n.toString()).join(' ');
+            return this.source;
         if ((0, utils_1.isStringArray)(this.source))
-            input = this.source.join(' ');
-        return input;
+            return this.source.join(' ');
+        return '<undefined>';
     }
     get hasMessage() {
-        return this.message && this.message.trim().length > 0;
+        return this.message.trim().length > 0;
     }
     toString() {
         let report = `${this.name} (${this.sourceAsString})`;
@@ -79,7 +74,7 @@ exports.NotAllowedError = NotAllowedError;
 class UnknownError extends NameError {
     constructor(error) {
         super(error.source, error.message, NameErrorType.UNKNOWN);
-        this.origin = error.error;
+        this.origin = error.origin;
         this.name = 'UnknownError';
     }
     toString() {

package/dist/lib/full-name.js

@@ -14,10 +14,10 @@ var _FullName_prefix, _FullName_firstName, _FullName_middleName, _FullName_lastN
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FullName = void 0;
 const config_1 = require("./config");
+const validator_1 = require("./validator");
+const types_1 = require("./types");
 const error_1 = require("./error");
 const name_1 = require("./name");
-const types_1 = require("./types");
-const validator_1 = require("./validator");
 class FullName {
     constructor(options) {
         _FullName_prefix.set(this, void 0);
@@ -47,14 +47,15 @@ class FullName {
         return __classPrivateFieldGet(this, _FullName_suffix, "f");
     }
     static parse(json, config) {
+        var _a;
         try {
-            const fullName = new FullName(config);
-            fullName.setPrefix(json.prefix);
-            fullName.setFirstName(json.firstName);
-            fullName.setMiddleName(json.middleName);
-            fullName.setLastName(json.lastName);
-            fullName.setSuffix(json.suffix);
-            return fullName;
+            const { prefix, firstName: fn, middleName: mn, lastName: ln, suffix } = json;
+            return new FullName(config)
+                .setPrefix(prefix)
+                .setFirstName(typeof fn === 'string' ? fn : new name_1.FirstName(fn.value, ...((_a = fn.more) !== null && _a !== void 0 ? _a : [])))
+                .setMiddleName(typeof mn === 'string' ? [mn] : (mn !== null && mn !== void 0 ? mn : []))
+                .setLastName(typeof ln === 'string' ? ln : new name_1.LastName(ln.father, ln.mother))
+                .setSuffix(suffix);
         }
         catch (error) {
             if (error instanceof error_1.NameError)
@@ -62,7 +63,7 @@ class FullName {
             throw new error_1.UnknownError({
                 source: Object.values(json).join(' '),
                 message: 'could not parse JSON content',
-                error,
+                origin: error instanceof Error ? error : new Error(String(error)),
             });
         }
     }
@@ -72,7 +73,7 @@ class FullName {
         if (!__classPrivateFieldGet(this, _FullName_config, "f").bypass)
             validator_1.Validators.prefix.validate(name);
         const prefix = name instanceof name_1.Name ? name.value : name;
-        __classPrivateFieldSet(this, _FullName_prefix, name_1.Name.prefix(__classPrivateFieldGet(this, _FullName_config, "f").title === types_1.Title.US ? `${prefix}.` : prefix), "f");
+        __classPrivateFieldSet(this, _FullName_prefix, name_1.Name.prefix(__classPrivateFieldGet(this, _FullName_config, "f").title === types_1.Title.US && !prefix.endsWith('.') ? `${prefix}.` : prefix), "f");
         return this;
     }
     setFirstName(name) {
@@ -92,7 +93,7 @@ class FullName {
             return this;
         if (!__classPrivateFieldGet(this, _FullName_config, "f").bypass)
             validator_1.Validators.middleName.validate(names);
-        __classPrivateFieldSet(this, _FullName_middleName, names.map((name) => (name instanceof name_1.Name ? name : name_1.Name.middle(name))), "f");
+        __classPrivateFieldSet(this, _FullName_middleName, names.map((n) => (n instanceof name_1.Name ? n : name_1.Name.middle(n))), "f");
         return this;
     }
     setSuffix(name) {
@@ -103,13 +104,37 @@ class FullName {
         __classPrivateFieldSet(this, _FullName_suffix, name_1.Name.suffix(name instanceof name_1.Name ? name.value : name), "f");
         return this;
     }
-    has(namon) {
+    has(key) {
+        const namon = typeof key === 'string' ? types_1.Namon.cast(key) : key;
+        if (!namon)
+            return false;
         if (namon.equal(types_1.Namon.PREFIX))
             return !!__classPrivateFieldGet(this, _FullName_prefix, "f");
         if (namon.equal(types_1.Namon.SUFFIX))
             return !!__classPrivateFieldGet(this, _FullName_suffix, "f");
         return namon.equal(types_1.Namon.MIDDLE_NAME) ? __classPrivateFieldGet(this, _FullName_middleName, "f").length > 0 : true;
     }
+    toString() {
+        return Array.from(this.toIterable(true)).join(' ');
+    }
+    *toIterable(flat = false) {
+        if (__classPrivateFieldGet(this, _FullName_prefix, "f"))
+            yield __classPrivateFieldGet(this, _FullName_prefix, "f");
+        if (flat) {
+            yield* __classPrivateFieldGet(this, _FullName_firstName, "f").asNames;
+            yield* __classPrivateFieldGet(this, _FullName_middleName, "f");
+            yield* __classPrivateFieldGet(this, _FullName_lastName, "f").asNames;
+        }
+        else {
+            yield __classPrivateFieldGet(this, _FullName_firstName, "f");
+            yield* __classPrivateFieldGet(this, _FullName_middleName, "f");
+            yield __classPrivateFieldGet(this, _FullName_lastName, "f");
+        }
+        if (__classPrivateFieldGet(this, _FullName_suffix, "f"))
+            yield __classPrivateFieldGet(this, _FullName_suffix, "f");
+    }
+    *[(_FullName_prefix = new WeakMap(), _FullName_firstName = new WeakMap(), _FullName_middleName = new WeakMap(), _FullName_lastName = new WeakMap(), _FullName_suffix = new WeakMap(), _FullName_config = new WeakMap(), Symbol.iterator)]() {
+        yield* this.toIterable(true);
+    }
 }
 exports.FullName = FullName;
-_FullName_prefix = new WeakMap(), _FullName_firstName = new WeakMap(), _FullName_middleName = new WeakMap(), _FullName_lastName = new WeakMap(), _FullName_suffix = new WeakMap(), _FullName_config = new WeakMap();

package/dist/lib/name.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _Name_namon, _FirstName_more, _LastName_mother;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LastName = exports.FirstName = exports.Name = void 0;
+exports.isNameArray = exports.LastName = exports.FirstName = exports.Name = void 0;
 const error_1 = require("./error");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
@@ -52,19 +52,19 @@ class Name {
         return this.type === types_1.Namon.SUFFIX;
     }
     static prefix(value) {
-        return new this(value, types_1.Namon.PREFIX);
+        return new Name(value, types_1.Namon.PREFIX);
     }
     static first(value) {
-        return new this(value, types_1.Namon.FIRST_NAME);
+        return new Name(value, types_1.Namon.FIRST_NAME);
     }
     static middle(value) {
-        return new this(value, types_1.Namon.MIDDLE_NAME);
+        return new Name(value, types_1.Namon.MIDDLE_NAME);
     }
     static last(value) {
-        return new this(value, types_1.Namon.LAST_NAME);
+        return new Name(value, types_1.Namon.LAST_NAME);
     }
     static suffix(value) {
-        return new this(value, types_1.Namon.SUFFIX);
+        return new Name(value, types_1.Namon.SUFFIX);
     }
     initials() {
         return [this.initial];
@@ -84,8 +84,8 @@ class Name {
         return this;
     }
     validate(name) {
-        if ((name === null || name === void 0 ? void 0 : name.trim().length) < 2) {
-            throw new error_1.InputError({ source: name, message: 'must be 2+ characters' });
+        if (typeof name === 'string' && name.trim().length < 1) {
+            throw new error_1.InputError({ source: name, message: 'must be 1+ characters' });
         }
     }
 }
@@ -95,7 +95,7 @@ class FirstName extends Name {
     constructor(value, ...more) {
         super(value, types_1.Namon.FIRST_NAME);
         _FirstName_more.set(this, void 0);
-        more.forEach((n) => this.validate(n));
+        more.forEach(this.validate);
         __classPrivateFieldSet(this, _FirstName_more, more, "f");
     }
     get hasMore() {
@@ -106,9 +106,8 @@ class FirstName extends Name {
     }
     get asNames() {
         const names = [Name.first(this.value)];
-        if (this.hasMore) {
-            names.push(...__classPrivateFieldGet(this, _FirstName_more, "f").map((n) => Name.first(n)));
-        }
+        if (this.hasMore)
+            names.push(...__classPrivateFieldGet(this, _FirstName_more, "f").map(Name.first));
         return names;
     }
     get more() {
@@ -119,9 +118,8 @@ class FirstName extends Name {
     }
     initials(withMore = false) {
         const inits = [this.initial];
-        if (withMore && this.hasMore) {
+        if (withMore && this.hasMore)
             inits.push(...__classPrivateFieldGet(this, _FirstName_more, "f").map((n) => n[0]));
-        }
         return inits;
     }
     caps(range) {
@@ -140,7 +138,7 @@ class FirstName extends Name {
     }
     copyWith(values) {
         var _a, _b;
-        return new FirstName((_a = values.first) !== null && _a !== void 0 ? _a : this.value, ...((_b = values.more) !== null && _b !== void 0 ? _b : __classPrivateFieldGet(this, _FirstName_more, "f")));
+        return new FirstName((_a = values === null || values === void 0 ? void 0 : values.first) !== null && _a !== void 0 ? _a : this.value, ...((_b = values === null || values === void 0 ? void 0 : values.more) !== null && _b !== void 0 ? _b : __classPrivateFieldGet(this, _FirstName_more, "f")));
     }
 }
 exports.FirstName = FirstName;
@@ -168,9 +166,8 @@ class LastName extends Name {
     }
     get asNames() {
         const names = [Name.last(this.value)];
-        if (this.hasMother) {
+        if (__classPrivateFieldGet(this, _LastName_mother, "f"))
             names.push(Name.last(__classPrivateFieldGet(this, _LastName_mother, "f")));
-        }
         return names;
     }
     toString(format) {
@@ -183,39 +180,37 @@ class LastName extends Name {
                 return (_a = this.mother) !== null && _a !== void 0 ? _a : '';
             case types_1.Surname.HYPHENATED:
                 return this.hasMother ? `${this.value}-${__classPrivateFieldGet(this, _LastName_mother, "f")}` : this.value;
-            case types_1.Surname.ALL:
+            default:
                 return this.hasMother ? `${this.value} ${__classPrivateFieldGet(this, _LastName_mother, "f")}` : this.value;
         }
     }
     initials(format) {
-        format = format || this.format;
         const inits = [];
-        switch (format) {
-            case types_1.Surname.MOTHER:
-                if (this.hasMother)
-                    inits.push(__classPrivateFieldGet(this, _LastName_mother, "f")[0]);
-                break;
+        switch (format !== null && format !== void 0 ? format : this.format) {
             case types_1.Surname.HYPHENATED:
             case types_1.Surname.ALL:
                 inits.push(this.initial);
-                if (this.hasMother)
+                if (__classPrivateFieldGet(this, _LastName_mother, "f"))
+                    inits.push(__classPrivateFieldGet(this, _LastName_mother, "f")[0]);
+                break;
+            case types_1.Surname.MOTHER:
+                if (__classPrivateFieldGet(this, _LastName_mother, "f"))
                     inits.push(__classPrivateFieldGet(this, _LastName_mother, "f")[0]);
                 break;
-            case types_1.Surname.FATHER:
             default:
                 inits.push(this.initial);
         }
         return inits;
     }
     caps(range) {
-        range = range || this.capsRange;
+        range !== null && range !== void 0 ? range : (range = this.capsRange);
         this.value = (0, utils_1.capitalize)(this.value, range);
         if (this.hasMother)
             __classPrivateFieldSet(this, _LastName_mother, (0, utils_1.capitalize)(__classPrivateFieldGet(this, _LastName_mother, "f"), range), "f");
         return this;
     }
     decaps(range) {
-        range = range || this.capsRange;
+        range !== null && range !== void 0 ? range : (range = this.capsRange);
         this.value = (0, utils_1.decapitalize)(this.value, range);
         if (this.hasMother)
             __classPrivateFieldSet(this, _LastName_mother, (0, utils_1.decapitalize)(__classPrivateFieldGet(this, _LastName_mother, "f"), range), "f");
@@ -223,8 +218,12 @@ class LastName extends Name {
     }
     copyWith(values) {
         var _a, _b, _c;
-        return new LastName((_a = values.father) !== null && _a !== void 0 ? _a : this.value, (_b = values.mother) !== null && _b !== void 0 ? _b : this.mother, (_c = values.format) !== null && _c !== void 0 ? _c : this.format);
+        return new LastName((_a = values === null || values === void 0 ? void 0 : values.father) !== null && _a !== void 0 ? _a : this.value, (_b = values === null || values === void 0 ? void 0 : values.mother) !== null && _b !== void 0 ? _b : this.mother, (_c = values === null || values === void 0 ? void 0 : values.format) !== null && _c !== void 0 ? _c : this.format);
     }
 }
 exports.LastName = LastName;
 _LastName_mother = new WeakMap();
+function isNameArray(value) {
+    return Array.isArray(value) && value.length > 0 && value.every((e) => e instanceof Name);
+}
+exports.isNameArray = isNameArray;

package/dist/lib/namefully.js

@@ -23,14 +23,16 @@ var _Namefully_instances, _Namefully_fullName, _Namefully_toParser, _Namefully_m
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Namefully = void 0;
 const constants_1 = require("./constants");
+const name_1 = require("./name");
 const error_1 = require("./error");
-const parser_1 = require("./parser");
-const types_1 = require("./types");
 const utils_1 = require("./utils");
+const types_1 = require("./types");
+const parser_1 = require("./parser");
 class Namefully {
     constructor(names, options) {
         _Namefully_instances.add(this);
         _Namefully_fullName.set(this, void 0);
+        this.json = this.toJson;
         __classPrivateFieldSet(this, _Namefully_fullName, __classPrivateFieldGet(this, _Namefully_instances, "m", _Namefully_toParser).call(this, names).parse(options), "f");
     }
     static tryParse(text, index) {
@@ -90,25 +92,43 @@ class Namefully {
     get salutation() {
         return this.format('p l');
     }
+    get parts() {
+        return __classPrivateFieldGet(this, _Namefully_fullName, "f").toIterable();
+    }
+    get size() {
+        return Array.from(this.parts).length;
+    }
+    *[(_Namefully_fullName = new WeakMap(), _Namefully_instances = new WeakSet(), Symbol.iterator)]() {
+        yield* __classPrivateFieldGet(this, _Namefully_fullName, "f").toIterable(true);
+    }
     toString() {
         return this.full;
     }
-    get(namon) {
-        if (namon.equal(types_1.Namon.PREFIX))
+    get(key) {
+        const namon = typeof key === 'string' ? types_1.Namon.cast(key) : key;
+        if (namon === null || namon === void 0 ? void 0 : namon.equal(types_1.Namon.PREFIX))
             return __classPrivateFieldGet(this, _Namefully_fullName, "f").prefix;
-        if (namon.equal(types_1.Namon.FIRST_NAME))
+        if (namon === null || namon === void 0 ? void 0 : namon.equal(types_1.Namon.FIRST_NAME))
             return __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName;
-        if (namon.equal(types_1.Namon.MIDDLE_NAME))
+        if (namon === null || namon === void 0 ? void 0 : namon.equal(types_1.Namon.MIDDLE_NAME))
             return __classPrivateFieldGet(this, _Namefully_fullName, "f").middleName;
-        if (namon.equal(types_1.Namon.LAST_NAME))
+        if (namon === null || namon === void 0 ? void 0 : namon.equal(types_1.Namon.LAST_NAME))
             return __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName;
-        if (namon.equal(types_1.Namon.SUFFIX))
+        if (namon === null || namon === void 0 ? void 0 : namon.equal(types_1.Namon.SUFFIX))
             return __classPrivateFieldGet(this, _Namefully_fullName, "f").suffix;
         return undefined;
     }
     equal(other) {
         return this.toString() === other.toString();
     }
+    deepEqual(other) {
+        const others = Array.from(other.parts);
+        for (const part of this.parts) {
+            if (!others.some((name) => name.equal(part)))
+                return false;
+        }
+        return true;
+    }
     toJson() {
         return {
             prefix: this.prefix,
@@ -124,21 +144,26 @@ class Namefully {
     fullName(orderedBy) {
         const sep = this.config.ending ? ',' : '';
         const names = [];
-        orderedBy = orderedBy || this.config.orderedBy;
         if (this.prefix)
             names.push(this.prefix);
-        if (orderedBy === types_1.NameOrder.FIRST_NAME) {
+        if ((orderedBy !== null && orderedBy !== void 0 ? orderedBy : this.config.orderedBy) === types_1.NameOrder.FIRST_NAME) {
             names.push(this.first, ...this.middleName(), this.last + sep);
         }
         else {
-            names.push(this.last, this.first, this.middleName().join(' ') + sep);
+            names.push(this.last);
+            if (this.hasMiddle) {
+                names.push(this.first, this.middleName().join(' ') + sep);
+            }
+            else {
+                names.push(this.first + sep);
+            }
         }
         if (this.suffix)
             names.push(this.suffix);
         return names.join(' ').trim();
     }
     birthName(orderedBy) {
-        orderedBy = orderedBy || this.config.orderedBy;
+        orderedBy !== null && orderedBy !== void 0 ? orderedBy : (orderedBy = this.config.orderedBy);
         return orderedBy === types_1.NameOrder.FIRST_NAME
             ? [this.first, ...this.middleName(), this.last].join(' ')
             : [this.last, this.first, ...this.middleName()].join(' ');
@@ -153,50 +178,42 @@ class Namefully {
         return __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.toString(format);
     }
     initials(options) {
+        const { orderedBy = this.config.orderedBy, only = types_1.NameType.BIRTH_NAME, asJson } = options !== null && options !== void 0 ? options : {};
         const firstInits = __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.initials();
-        const midInits = __classPrivateFieldGet(this, _Namefully_fullName, "f").middleName.map((n) => n.initials()[0]);
+        const midInits = __classPrivateFieldGet(this, _Namefully_fullName, "f").middleName.map((n) => n.value[0]);
         const lastInits = __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.initials();
-        if (options === null || options === void 0 ? void 0 : options.asJson)
+        if (asJson)
             return { firstName: firstInits, middleName: midInits, lastName: lastInits };
-        const initials = [];
-        const { orderedBy = this.config.orderedBy, only = types_1.NameType.BIRTH_NAME } = options !== null && options !== void 0 ? options : {};
         if (only !== types_1.NameType.BIRTH_NAME) {
-            if (only === types_1.NameType.FIRST_NAME) {
-                initials.push(...firstInits);
-            }
-            else if (only === types_1.NameType.MIDDLE_NAME) {
-                initials.push(...midInits);
-            }
-            else {
-                initials.push(...lastInits);
-            }
+            return only === types_1.NameType.FIRST_NAME ? firstInits : only === types_1.NameType.MIDDLE_NAME ? midInits : lastInits;
         }
         else if (orderedBy === types_1.NameOrder.FIRST_NAME) {
-            initials.push(...firstInits, ...midInits, ...lastInits);
+            return [...firstInits, ...midInits, ...lastInits];
         }
         else {
-            initials.push(...lastInits, ...firstInits, ...midInits);
+            return [...lastInits, ...firstInits, ...midInits];
         }
-        return initials;
     }
     shorten(orderedBy) {
-        orderedBy = orderedBy || this.config.orderedBy;
+        orderedBy !== null && orderedBy !== void 0 ? orderedBy : (orderedBy = this.config.orderedBy);
+        const { firstName, lastName } = __classPrivateFieldGet(this, _Namefully_fullName, "f");
         return orderedBy === types_1.NameOrder.FIRST_NAME
-            ? [__classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.value, __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.toString()].join(' ')
-            : [__classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.toString(), __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.value].join(' ');
+            ? [firstName.value, lastName.toString()].join(' ')
+            : [lastName.toString(), firstName.value].join(' ');
     }
     flatten(options) {
-        if (this.length <= options.limit)
-            return this.full;
         const { by = types_1.Flat.MIDDLE_NAME, limit = 20, recursive = false, withMore = false, withPeriod = true, surname, } = options;
+        if (this.length <= limit)
+            return this.full;
+        const { firstName, lastName, middleName } = __classPrivateFieldGet(this, _Namefully_fullName, "f");
         const sep = withPeriod ? '.' : '';
-        const fn = __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.toString();
-        const mn = this.middleName().join(' ');
-        const ln = __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.toString();
         const hasMid = this.hasMiddle;
-        const f = __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.initials(withMore).join(sep + ' ') + sep;
-        const l = __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.initials(surname).join(sep + ' ') + sep;
-        const m = hasMid ? __classPrivateFieldGet(this, _Namefully_fullName, "f").middleName.map((n) => n.initials()[0]).join(sep + ' ') + sep : '';
+        const fn = firstName.toString();
+        const mn = this.middleName().join(' ');
+        const ln = lastName.toString();
+        const f = firstName.initials(withMore).join(sep + ' ') + sep;
+        const l = lastName.initials(surname).join(sep + ' ') + sep;
+        const m = hasMid ? middleName.map((n) => n.value[0]).join(sep + ' ') + sep : '';
         let name = [];
         if (this.config.orderedBy === types_1.NameOrder.FIRST_NAME) {
             switch (by) {
@@ -215,7 +232,7 @@ class Namefully {
                 case types_1.Flat.MID_LAST:
                     name = hasMid ? [fn, m, l] : [fn, l];
                     break;
-                case types_1.Flat.ALL:
+                default:
                     name = hasMid ? [f, m, l] : [f, l];
                     break;
             }
@@ -237,7 +254,7 @@ class Namefully {
                 case types_1.Flat.MID_LAST:
                     name = hasMid ? [l, fn, m] : [l, fn];
                     break;
-                case types_1.Flat.ALL:
+                default:
                     name = hasMid ? [l, f, m] : [l, f];
                     break;
             }
@@ -278,8 +295,8 @@ class Namefully {
             pattern = 'o';
         let group = '';
         const formatted = [];
-        for (const char of pattern.split('')) {
-            if (constants_1.ALLOWED_TOKENS.indexOf(char) === -1) {
+        for (const char of pattern) {
+            if (!constants_1.ALLOWED_FORMAT_TOKENS.includes(char)) {
                 throw new error_1.NotAllowedError({
                     source: this.full,
                     operation: 'format',
@@ -295,7 +312,8 @@ class Namefully {
         return formatted.join('').trim();
     }
     flip() {
-        this.config.updateOrder(this.config.orderedBy === types_1.NameOrder.FIRST_NAME ? types_1.NameOrder.LAST_NAME : types_1.NameOrder.FIRST_NAME);
+        const order = this.config.orderedBy === types_1.NameOrder.FIRST_NAME ? types_1.NameOrder.LAST_NAME : types_1.NameOrder.FIRST_NAME;
+        this.config.update({ orderedBy: order });
     }
     split(separator = /[' -]/g) {
         return this.birth.replace(separator, ' ').split(' ');
@@ -337,27 +355,21 @@ class Namefully {
     }
 }
 exports.Namefully = Namefully;
-_Namefully_fullName = new WeakMap(), _Namefully_instances = new WeakSet(), _Namefully_toParser = function _Namefully_toParser(raw) {
+_Namefully_toParser = function _Namefully_toParser(raw) {
     if (raw instanceof parser_1.Parser)
         return raw;
     if (typeof raw === 'string')
         return new parser_1.StringParser(raw);
     if ((0, utils_1.isStringArray)(raw))
         return new parser_1.ArrayStringParser(raw);
-    if ((0, utils_1.isNameArray)(raw))
+    if ((0, name_1.isNameArray)(raw))
         return new parser_1.ArrayNameParser(raw);
     if (typeof raw === 'object')
         return new parser_1.NamaParser(raw);
-    throw new error_1.InputError({ source: raw, message: 'Cannot parse raw data. Review expected data types.' });
+    throw new error_1.InputError({ source: raw, message: 'Cannot parse raw data; review expected data types.' });
 }, _Namefully_map = function _Namefully_map(char) {
     var _a, _b;
     switch (char) {
-        case '.':
-        case ',':
-        case ' ':
-        case '-':
-        case '_':
-            return char;
         case 'b':
             return this.birth;
         case 'B':
@@ -376,16 +388,15 @@ _Namefully_fullName = new WeakMap(), _Namefully_instances = new WeakSet(), _Name
         case 'o':
         case 'O':
             return ((character) => {
-                const sep = this.config.ending ? ',' : '', names = [];
+                const sep = this.config.ending ? ',' : '';
+                const names = [];
                 if (this.prefix)
                     names.push(this.prefix);
                 names.push(`${this.last},`.toUpperCase());
-                if (this.hasMiddle) {
+                if (this.hasMiddle)
                     names.push(this.first, this.middleName().join(' ') + sep);
-                }
-                else {
+                else
                     names.push(this.first + sep);
-                }
                 if (this.suffix)
                     names.push(this.suffix);
                 const nama = names.join(' ').trim();
@@ -400,16 +411,19 @@ _Namefully_fullName = new WeakMap(), _Namefully_instances = new WeakSet(), _Name
         case 'S':
             return (_b = this.suffix) === null || _b === void 0 ? void 0 : _b.toUpperCase();
         case '$f':
+            return __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.value[0];
         case '$F':
-            return __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.initials()[0];
+            return __classPrivateFieldGet(this, _Namefully_fullName, "f").firstName.initials(true).join('');
         case '$l':
+            return __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.value[0];
         case '$L':
-            return __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.initials()[0];
+            return __classPrivateFieldGet(this, _Namefully_fullName, "f").lastName.initials().join('');
         case '$m':
-        case '$M':
             return this.hasMiddle ? this.middle[0] : undefined;
+        case '$M':
+            return this.hasMiddle ? __classPrivateFieldGet(this, _Namefully_fullName, "f").middleName.map((n) => n.value[0]).join('') : undefined;
         default:
-            return undefined;
+            return constants_1.ALLOWED_FORMAT_TOKENS.includes(char) ? char : undefined;
     }
 };
 exports.default = (names, options) => {