Merge pull request #14 from js-items/develop

fix: fixed facade interface

Author: mariocoski

dist/FactoryConfig.d.ts

@@ -39,5 +39,4 @@ export default interface FactoryConfig<I extends Item> {
     readonly createItemOptions?: ConvertItemIntoOptions<I>;
     readonly defaultPaginationLimit?: number;
     readonly itemName: string;
-    readonly service: Facade<I>;
 }

src/FactoryConfig.ts

@@ -1,6 +1,7 @@
 // tslint:disable:no-any
 import {
   CreateItem,
+  DeleteItem,
   DeleteItems,
   Filter,
   GetItem,
@@ -10,7 +11,6 @@ import {
   Sort,
   UpdateItem,
 } from '@js-items/foundation';
-import Facade from '@js-items/foundation/dist/Facade';
 import ky from 'ky';
 import { ConvertItemIntoOptions } from './types/convertItemIntoOptions';
 import { Handler } from './types/handler';
@@ -32,24 +32,23 @@ export default interface FactoryConfig<I extends Item> {
   readonly envelopParamName?: string;
   readonly prettyParamName?: string;
   readonly createFilter: (filter?: Filter<I>) => any;
-  readonly convertDocumentIntoItem: (document: Document) => I;
-  readonly convertItemIntoOptions: ConvertItemIntoOptions<I>;
-  readonly createSort: (sort: Sort<I>) => any;
+  readonly convertDocumentIntoItem?: (document: Document) => I;
+  readonly convertItemIntoOptions?: ConvertItemIntoOptions<I>;
+  readonly createSort?: (sort: Sort<I>) => any;
   readonly updateItem?: Handler<I, UpdateItem<I>>;
   readonly updateItemOptions?: ConvertItemIntoOptions<I>;
   readonly replaceItem?: Handler<I, ReplaceItem<I>>;
   readonly replaceItemOptions?: ConvertItemIntoOptions<I>;
-  readonly deleteItem?: Handler<I, DeleteItems<I>>;
+  readonly deleteItem?: Handler<I, DeleteItem<I>>;
   readonly deleteItemOptions?: ConvertItemIntoOptions<I>;
-  readonly deleteItems?: Handler<I, CreateItem<I>>;
+  readonly deleteItems?: Handler<I, DeleteItems<I>>;
   readonly deleteItemsOptions?: ConvertItemIntoOptions<I>;
   readonly getItem?: Handler<I, GetItem<I>>;
   readonly getItemOptions?: ConvertItemIntoOptions<I>;
   readonly getItems?: Handler<I, GetItems<I>>;
   readonly getItemsOptions?: ConvertItemIntoOptions<I>;
-  readonly createItem?: Handler<I, ReplaceItem<I>>;
+  readonly createItem?: Handler<I, CreateItem<I>>;
   readonly createItemOptions?: ConvertItemIntoOptions<I>;
   readonly defaultPaginationLimit?: number;
   readonly itemName: string;
-  readonly service: Facade<I>;
 }

src/factory.ts

@@ -1,19 +1,16 @@
 // tslint:disable:no-any
-// TODO: uncomment all commented lines
-import { /* DeleteItem, */ Item } from '@js-items/foundation';
-// import Facade from '@js-items/foundation/dist/Facade';
-// import Facade from '@js-items/foundation/dist/Facade';
+import { Item } from '@js-items/foundation';
+import Facade from '@js-items/foundation/dist/Facade';
 import _defaultTo from 'ramda/src/defaultTo';
 import FacadeConfig from './FacadeConfig';
 import FactoryConfig from './FactoryConfig';
 import defaultCreateItem from './functions/createItem';
-// import defaultDeleteItem from './functions/deleteItem';
-// import defaultDeleteItems from './functions/deleteItems';
-// import defaultGetItem from './functions/getItem';
-// import defaultGetItems from './functions/getItems';
-// import defaultReplaceItem from './functions/replaceItem';
-// import defaultUpdateItem from './functions/updateItem';
-// import { Handler } from './types/handler';
+import defaultDeleteItem from './functions/deleteItem';
+import defaultDeleteItems from './functions/deleteItems';
+import defaultGetItem from './functions/getItem';
+import defaultGetItems from './functions/getItems';
+import defaultReplaceItem from './functions/replaceItem';
+import defaultUpdateItem from './functions/updateItem';
 import defaultConvertItemToOptions from './utils/defaultConvertItemToOptions';
 import { emptyOptions } from './utils/emptyOptions';
 
@@ -27,9 +24,7 @@ export default <I extends Item>({
   createItem,
   convertItemIntoOptions,
   ...config
-}: FactoryConfig<
-  I
->): any /* uncomment when finished entirely:  Facade<I> */ => {
+}: FactoryConfig<I>): Facade<I> => {
   const itemIntoOptions = _defaultTo(defaultConvertItemToOptions)(
     convertItemIntoOptions
   );
@@ -51,22 +46,20 @@ export default <I extends Item>({
   };
 
   const createItemFactory = _defaultTo(defaultCreateItem)(createItem);
-  // const deleteItemFactory = _defaultTo(
-  //   defaultDeleteItem
-  // )(deleteItem);
-  // const getItemFactory = _defaultTo(defaultGetItem)(getItem);
-  // const updateItemFactory = _defaultTo(defaultUpdateItem)(updateItem);
-  // const replaceItemFactory = _defaultTo(defaultReplaceItem)(replaceItem);
-  // const deleteItemsFactory = _defaultTo(defaultDeleteItems)(deleteItems);
-  // const getItemsFactory = _defaultTo(defaultGetItems)(getItems);
+  const deleteItemFactory = _defaultTo(defaultDeleteItem)(deleteItem);
+  const getItemFactory = _defaultTo(defaultGetItem)(getItem);
+  const updateItemFactory = _defaultTo(defaultUpdateItem)(updateItem);
+  const replaceItemFactory = _defaultTo(defaultReplaceItem)(replaceItem);
+  const deleteItemsFactory = _defaultTo(defaultDeleteItems)(deleteItems);
+  const getItemsFactory = _defaultTo(defaultGetItems)(getItems);
 
   return {
     createItem: createItemFactory(facadeConfig),
-    // deleteItem: deleteItemFactory(facadeConfig),
-    // deleteItems: deleteItemsFactory(facadeConfig),
-    // getItem: getItemFactory(facadeConfig),
-    // getItems: getItemsFactory(facadeConfig),
-    // replaceItem: replaceItemFactory(facadeConfig),
-    // updateItem: updateItemFactory(facadeConfig),
+    deleteItem: deleteItemFactory(facadeConfig),
+    deleteItems: deleteItemsFactory(facadeConfig),
+    getItem: getItemFactory(facadeConfig),
+    getItems: getItemsFactory(facadeConfig),
+    replaceItem: replaceItemFactory(facadeConfig),
+    updateItem: updateItemFactory(facadeConfig),
   };
 };