Merge pull request #26 from xanthous-tech/delete-all

Delete all

Author: osmanmesutozcan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xanthous/dgraph-orm",
-  "version": "0.2.0-alpha5",
+  "version": "0.3.2",
   "description": "dgraph ORM in TypeScript",
   "main": "dist/index.js",
   "author": "Xanthous Tech Developers <hi@x-tech.io>",
@@ -19,8 +19,7 @@
   "scripts": {
     "clean": "rimraf dist",
     "build": "tsc -p tsconfig.build.json",
-    "postinstall": "npm run clean && npm run build",
-    "prestart": "npm run postinstall",
+    "prepublish": "npm run test && npm run clean && npm run build",
     "lint": "eslint ./src --ext .ts",
     "lint:fix": "eslint --fix",
     "format": "prettier --write",
@@ -40,6 +39,7 @@
     "@babel/preset-env": "^7.7.1",
     "@babel/preset-typescript": "^7.7.2",
     "@types/jest": "^24.0.23",
+    "@types/uniqid": "^4.1.3",
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
     "eslint": "^6.8.0",
@@ -63,9 +63,9 @@
     "debug": "^4.1.1",
     "dgraph-js": "^2.0.2",
     "grpc": "^1.24.2",
-    "instauuid": "^1.0.4",
     "lodash": "^4.17.15",
-    "reflect-metadata": "^0.1.13"
+    "reflect-metadata": "^0.1.13",
+    "uniqid": "^5.2.0"
   },
   "volta": {
     "node": "10.18.1",

src/decorator/predicate.ts

@@ -118,4 +118,9 @@ export interface IPredicate<T, U = void> {
    * Remove a list of nodes.
    */
   delete(nodes: T[]): IPredicate<T, U>;
+
+  /**
+   * Removes all nodes from the predicate.
+   */
+  deleteAll(): IPredicate<T, U>;
 }

src/transaction/mutation-builder.ts

@@ -95,7 +95,11 @@ export class MutationBuilder {
 
   public getDeleteNQuadsString(): string {
     const quads = this.getDeleteNQuads();
-    return new Writer({ format: 'N-Quads' }).quadsToString(quads);
+    const quadsString = new Writer({ format: 'N-Quads' }).quadsToString(quads);
+
+    const lines = quadsString.split('\n');
+
+    return Array.from(new Set(lines)).join('\n');
   }
 
   public getDeleteNQuads(): Quad[] {

src/transaction/predicate-impl.ts

@@ -72,19 +72,28 @@ export class PredicateImpl<T = any, U = any> implements IPredicate<T, U> {
 
   delete(node: T): IPredicate<T, U>;
   delete(nodes: T[]): IPredicate<T, U>;
-  delete(nodeOrNodes: T | T[]) {
+  delete(nodeOrNodes: T | T[]): IPredicate<T, U> {
     if (!Array.isArray(nodeOrNodes)) {
       nodeOrNodes = [nodeOrNodes];
     }
 
     const deleteDiff = this._diff.deletes.get(this)!;
     for (const node of nodeOrNodes) {
       deleteDiff.add(node);
+      this._data.splice(
+        this._data.findIndex(n => n === node),
+        1
+      );
     }
 
     return this;
   }
 
+  deleteAll(): IPredicate<T, U> {
+    this.delete(this._data);
+    return this;
+  }
+
   private trackFacetValues(facet: Object): void {
     const metadata = MetadataStorage.Instance.facets.get(facet.constructor.name);
     if (!metadata) {

src/transaction/transaction.ts

@@ -1,5 +1,5 @@
 import { Quad } from 'n3';
-import * as UUID from 'instauuid';
+import uniqid from 'uniqid';
 import { plainToClass } from 'class-transformer';
 
 import { IPredicate } from '..';
@@ -76,9 +76,9 @@ export class Transaction<T extends Object, V> implements ITransaction<T> {
     return new MutationBuilder(this.diff, this.tempIDS).getSetNQuadsString();
   }
 
-  public delete(node: T): void;
-  public delete(nodes: T[]): void;
-  public delete(nodeOrNodes: T | T[]) {
+  public delete(node: T): ITransaction<T>;
+  public delete(nodes: T[]): ITransaction<T>;
+  public delete(nodeOrNodes: T | T[]): ITransaction<T> {
     if (!Array.isArray(nodeOrNodes)) {
       nodeOrNodes = [nodeOrNodes];
     }
@@ -109,7 +109,7 @@ export class Transaction<T extends Object, V> implements ITransaction<T> {
       //  new created node instance when assigning data to it.
       delete data.uid;
     } else {
-      id = UUID('hex').toString();
+      id = uniqid();
       this.tempIDS.set(nodeInstance, id);
     }
 
@@ -256,7 +256,13 @@ export class Transaction<T extends Object, V> implements ITransaction<T> {
         facetDataIndices.forEach(idx => {
           const plain = facets.reduce<IObjectLiteral>((acc, f) => {
             const facetPropertyName = `${name}|${f.args.propertyName}`;
-            const facetValue = Private.accessUnsafe(value._owner, facetPropertyName)[idx];
+            const facetDataMap = Private.accessUnsafe(value._owner, facetPropertyName);
+
+            if (!facetDataMap) {
+              return acc;
+            }
+
+            const facetValue = facetDataMap[idx];
 
             if (facetValue) {
               acc[f.args.propertyName] = facetValue;

tests/delete.spec.ts

@@ -45,10 +45,24 @@ describe('Delete handling', function() {
     transaction.delete(kamil);
     transaction.tree[0].friends.delete(jane);
 
+    // XXX: here kamil is not deleted in the friends predicate
+    expect(transaction.tree[0].friends.get().length).toBe(1);
+
+    expect(transaction.getDeleteNQuadsString()).toEqual(
+      `<0x3> * * .
+<0x2> * * .
+<0x1> <Person.friends> <0x2> .
+`
+    );
+
+    transaction.tree[0].friends.deleteAll();
+    expect(transaction.tree[0].friends.get().length).toBe(0);
+
     expect(transaction.getDeleteNQuadsString()).toEqual(
       `<0x3> * * .
 <0x2> * * .
 <0x1> <Person.friends> <0x2> .
+<0x1> <Person.friends> <0x3> .
 `
     );
   });

tests/mutation.spec.ts

@@ -101,6 +101,9 @@ describe('Mutation handling', () => {
     class PersonKnows {
       @Facet()
       familiarity: number;
+
+      @Facet()
+      years: number;
     }
 
     @Node()
@@ -120,6 +123,7 @@ describe('Mutation handling', () => {
         uid: '0x1',
         'Person.name': 'John',
         'Person.friends|familiarity': { '0': 999 },
+        'Person.friends|years': { '0': 3 },
         'Person.friends': [
           {
             uid: '0x2',
@@ -152,7 +156,7 @@ describe('Mutation handling', () => {
       `<0x3> <Person.name> "New Kamil"^^<xs:string> .
 <0x2> <Person.name> "New Jane"^^<xs:string> .
 <0x1> <Person.name> "New John"^^<xs:string> .
-<0x1> <Person.friends> <0x2> (familiarity=666) .
+<0x1> <Person.friends> <0x2> (familiarity=666,years=3) .
 `
     );
   });

tests/perf.spec.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import * as util from 'util';
 
 import { IPredicate, Node, Predicate, Property, TransactionBuilder, Uid } from '../src';
 
@@ -77,15 +75,14 @@ describe('Performance testing', () => {
     console.timeEnd('Second');
   });
 
-  it.only('Fuzz with random data', () => {
+  it('Fuzz with random data', () => {
     interface IStation {
       uid: string;
       name: string;
       connects: IStation[];
     }
 
     @Node()
-    // @ts-ignore
     class Station {
       @Uid()
       uid: string;

tsconfig.build.json

@@ -6,6 +6,7 @@
     "module": "commonjs",
     "declaration": true,
     "removeComments": true,
+    "esModuleInterop": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "es2015",

tsconfig.json

@@ -6,6 +6,7 @@
     "module": "commonjs",
     "declaration": true,
     "removeComments": true,
+    "esModuleInterop": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "es2015",