Added merge method to extension, updated package and misc. (#19)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mixtape/core",
-  "version": "0.2.2",
+  "version": "1.0.0",
   "description": "Supercharged fixture library for organizing and generating test data",
   "main": "lib/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "jest": "^24.7.1",
     "ts-jest": "^24.0.2",
     "tslint": "^5.16.0",
-    "typescript": "^3.4.3",
+    "typescript": "^3.4.5",
     "validator": "^10.11.0"
   },
   "files": [
@@ -36,13 +36,13 @@
   "keywords": [
     "test",
     "testing",
+    "tdd",
+    "fixture",
     "unit",
     "integration",
-    "fixture",
     "autofixture",
     "factory",
     "builder",
-    "tdd",
     "data",
     "generator",
     "automation",

src/__tests__/extension.test.ts

@@ -177,6 +177,37 @@ describe('Extension', () => {
         expect(sut.builders.length).toBe(0);
     });
 
+    test('should merge extension', () => {
+        // Arrange
+        const builderTypeToMerge = uuid();
+        const builderTypeAliasToMerge = uuid();
+        const dummyBuilderToMerge: TypeBuilder<any> = {
+            type: builderTypeToMerge,
+            aliases: [builderTypeAliasToMerge],
+            build: undefined
+        };
+        const extensionToMerge = new Extension();
+        extensionToMerge.add(dummyBuilderToMerge);
+        const existingBuilderType = uuid();
+        const existingBuilderAlias = uuid();
+        const existingDummyBuilder: TypeBuilder<any> = {
+            aliases: [existingBuilderAlias],
+            type: existingBuilderType,
+            build: undefined
+        };
+        const sut = new Extension();
+        sut.add(existingDummyBuilder);
+
+        // Act
+        sut.merge(extensionToMerge);
+
+        // Assert
+        expect(sut.get(existingBuilderType)).toEqual(existingDummyBuilder);
+        expect(sut.get(existingBuilderAlias)).toEqual(existingDummyBuilder);
+        expect(sut.get(builderTypeToMerge)).toEqual(dummyBuilderToMerge);
+        expect(sut.get(builderTypeAliasToMerge)).toEqual(dummyBuilderToMerge);
+    });
+
     test('should clear added builders', () => {
         // Arrange
         const sut = new Extension();

src/builder.ts

@@ -41,7 +41,6 @@ export abstract class Builder<T> implements TypeBuilder<T> {
      * Register new alias for type, e.g. 'surname' and 'lastName'
      * @protected
      * @param alias - alias for type
-     * @param type - type (use the one from builder)
      */
     protected createAlias(alias: string) {
         this.aliases.push(alias);

src/extension.ts

@@ -2,8 +2,8 @@ import { TypeBuilder } from './builder';
 import { ensure } from './utils';
 
 /**
- * Class for bundling builders together
- * Bundling builders together in extension to make it easy to add to `Fixture`s.
+ * Class for bundling builders
+ * Bundle builders in an extension to make it easy to add to a given `Fixture`.
  */
 export class Extension {
     private _builders: {[type: string]: TypeBuilder<any>};
@@ -75,6 +75,12 @@ export class Extension {
         return this;
     }
 
+    merge(extension: Extension): this {
+        extension.builders.forEach(b => this.add(b));
+
+        return this;
+    }
+
     /**
      * Remove all builders (and aliases)
      */

src/fixture.ts

@@ -37,7 +37,7 @@ export class Fixture implements FixtureContext {
      * @returns `this`
      */
     extend(extension: Extension): this {
-        extension.builders.forEach(b => this._extensions.add(b));
+        this._extensions.merge(extension);
 
         return this;
     }

src/object-builder.ts

@@ -78,7 +78,7 @@ export default class ObjectBuilder<T extends object> {
                 if (isArray(value)) {
                     ensure(
                         () => value.length === 1 && typeof value[0] === 'string',
-                        'Array in template should only contain one type (string)');
+                        'Array in template should (only) contain one type');
                     o[k] = context.createMany(value[0] as string);
                     return o;
                 }