From 0a5464522c801e832c2fb9bf61050737651fc987 Mon Sep 17 00:00:00 2001
From: lostfields <nicolai.gjaerum@gmail.com>
Date: Wed, 8 Apr 2020 18:39:06 +0200
Subject: [PATCH] better repository usage

---
 package.json                 |  2 +-
 src/linq/base.ts             |  4 ++--
 src/linq/index.ts            |  4 +++-
 src/repository/repository.ts | 37 +++++++++++++++++++++++-------------
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index e3aa162..bb8ffe6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tfso/js-enumerable",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index",
diff --git a/src/linq/base.ts b/src/linq/base.ts
index 27ea0d6..80caee4 100644
--- a/src/linq/base.ts
+++ b/src/linq/base.ts
@@ -26,7 +26,7 @@ export default abstract class Base<TEntity extends any> implements IEnumerable<T
     private iterableName: string | null = null
     private items: Iterable<TEntity> | AsyncIterable<TEntity> | null = null
     
-    protected operators: Array<LinqOperator<TEntity>> = []
+    public operators: Array<LinqOperator<TEntity>> = []
 
     public constructor(items?: Array<TEntity>)
     public constructor(items?: Iterable<TEntity>)
@@ -115,7 +115,7 @@ export default abstract class Base<TEntity extends any> implements IEnumerable<T
             }
         }
 
-        let iterator = iterate(this.items instanceof Repository ? this.items.query(this) : this.items[Symbol.asyncIterator](), this.operators),
+        let iterator = iterate(this.items instanceof Repository ? this.items[Symbol.asyncIterator](this) : this.items[Symbol.asyncIterator](), this.operators),
             result: IteratorResult<TEntity>
 
         while (!(result = await Promise.resolve(iterator.next())).done) {
diff --git a/src/linq/index.ts b/src/linq/index.ts
index 05e57cc..088f2a7 100644
--- a/src/linq/index.ts
+++ b/src/linq/index.ts
@@ -1,2 +1,4 @@
 export { Enumerable } from './enumerable'
-export { IEnumerable } from './base'
\ No newline at end of file
+export { IEnumerable } from './base'
+
+export { LinqType } from './operator'
\ No newline at end of file
diff --git a/src/repository/repository.ts b/src/repository/repository.ts
index 0c9d603..487986f 100644
--- a/src/repository/repository.ts
+++ b/src/repository/repository.ts
@@ -1,27 +1,38 @@
 import { IEnumerable } from './../linq'
 
-export interface IRepository<TEntity, TEntityId> extends AsyncIterable<TEntity> {
-    query(linq?: IEnumerable<TEntity>, meta?: Partial<{ continuationToken: string }>): AsyncIterableIterator<TEntity>
+export interface IRepository<TEntity extends Record<string, any>, TEntityId> extends AsyncIterable<TEntity> {
+    query(enumerable?: IEnumerable<TEntity>, meta?: Partial<{ etag: string, continuationToken: string }>): AsyncIterableIterator<TEntity>
 
-    create(item: Partial<TEntity>): Promise<TEntity> 
+    create(item: Partial<TEntity>, meta?: Partial<{ etag: string }>): Promise<TEntity> 
     read(id?: TEntityId): Promise<TEntity>
-    update(entity: Partial<TEntity>): Promise<TEntity>
-    delete(id: TEntityId): Promise<boolean>
+    update(entity: Partial<TEntity>, meta?: Partial<{ etag: string }>, ...fields: Array<keyof TEntity>): Promise<TEntity>
+    delete(id: TEntityId, meta?: Partial<{ etag: string }>): Promise<boolean>
+
+    getIterable(meta?: Partial<{ continuationToken: string }>): AsyncIterable<TEntity>
 }
 
-export abstract class Repository<TEntity, TEntityId> implements IRepository<TEntity, TEntityId>, AsyncIterable<TEntity> {
-    abstract query(linq?: IEnumerable<TEntity>, meta?: Partial<{ continuationToken: string }>): AsyncIterableIterator<TEntity>
+export abstract class Repository<TEntity extends Record<string, any>, TEntityId> implements IRepository<TEntity, TEntityId>, AsyncIterable<TEntity> {
+    
+    abstract query(enumerable?: IEnumerable<TEntity>, meta?: Partial<{ etag: string, continuationToken: string }>): AsyncIterableIterator<TEntity>
 
-    abstract async create(item: Partial<TEntity>): Promise<TEntity>
+    abstract async create(item: Partial<TEntity>, meta?: Partial<{ etag: string }>): Promise<TEntity>
     abstract async read(id?: TEntityId): Promise<TEntity>
-    abstract async update(item: Partial<TEntity>): Promise<TEntity>
-    abstract async delete(id: TEntityId): Promise<boolean>
+    abstract async update(item: Partial<TEntity>, meta?: Partial<{ etag: string }>, ...fields: Array<keyof TEntity>): Promise<TEntity>
+    abstract async delete(id: TEntityId, meta?: Partial<{ etag: string }>): Promise<boolean>
+
+    public getIterable(meta?: Partial<{ etag: string, continuationToken: string }>): AsyncIterable<TEntity> {
+        return Object.assign(Object.create(Object.getPrototypeOf(this)), this, {
+            [Symbol.asyncIterator]: (enumerable?: IEnumerable<TEntity>) => {
+                return this.query(enumerable, meta)
+            }
+        })
+    }
 
-    [Symbol.iterator](...options: any[]): IterableIterator<Promise<TEntity>> {
+    [Symbol.iterator](...options: any[]): IterableIterator<TEntity> {
         throw new TypeError('Repository is async iterable but it used as iterable')
     }
 
-    [Symbol.asyncIterator](linq?: IEnumerable<TEntity>, meta?: Partial<{ continuationToken: string }>): AsyncIterableIterator<TEntity> {
-        return this.query(linq, meta)
+    [Symbol.asyncIterator](enumerable?: IEnumerable<TEntity>, meta?: Partial<{ etag: string, continuationToken: string }>): AsyncIterableIterator<TEntity> {
+        return this.query(enumerable, meta)
     }
 }
\ No newline at end of file