fix: parent-metadata extends ability

augejs · Sep 19, 2020 · 746e97c · 746e97c
1 parent 24ea5d1
commit 746e97c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@augejs/provider-scanner",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "description": "`provider-scanner` is a scan framework for nodejs.",
   "main": "dist/main.js",
   "scripts": {

diff --git a/src/metadata/Metadata.ts b/src/metadata/Metadata.ts
@@ -27,13 +27,29 @@ export class Metadata {
   }
 
   static defineInsertEndArrayMetadata(key: any, metadata: any[], target: Object, propertyKey?: string | symbol):void {
-    const previousValue:[] = Metadata.getMetadata(key, target, propertyKey) || [];
+    if (metadata.length === 0) return;
+
+    const previousValue: any[] = Metadata.getMetadata(key, target, propertyKey) || [];
+    if (previousValue.length > 0) {
+      metadata = metadata.filter(item => {
+        return !previousValue.includes(item);
+      })
+    }
+
     const value = [...previousValue, ...metadata];
     Metadata.defineMetadata(key, value, target, propertyKey);
   }
 
   static defineInsertBeginArrayMetadata(key: any, metadata: any[], target: Object, propertyKey?: string | symbol):void {
-    const previousValue:[] = Metadata.getMetadata(key, target, propertyKey) || [];
+    if (metadata.length === 0) return;
+    const previousValue: any[] = Metadata.getMetadata(key, target, propertyKey) || [];
+
+    if (previousValue.length > 0) {
+      metadata = metadata.filter(item => {
+        return !previousValue.includes(item);
+      })
+    }
+
     const value = [...metadata, ...previousValue];
     Metadata.defineMetadata(key, value, target, propertyKey);
   }

diff --git a/src/metadata/ParentMetadata.test.ts b/src/metadata/ParentMetadata.test.ts
@@ -9,7 +9,7 @@ describe('decorators: Provider', () => {
     class Y {};
     ParentMetadata.defineMetadata(Y, [{name:1},{name:2},{name:3}]);
     ParentMetadata.defineMetadata(Y, []);
-    expect(ParentMetadata.getMetadata(Y)).toEqual([]);
+    expect(ParentMetadata.getMetadata(Y)).toEqual([{name:1},{name:2},{name:3}]);
   })
 
   it('should Provider decorator has correctly many array value', () => {

diff --git a/src/metadata/ParentMetadata.ts b/src/metadata/ParentMetadata.ts
@@ -16,7 +16,7 @@ export class ParentMetadata {
           parentResults.push(child);
         }
       }
-      Metadata.defineMetadata(ParentMetadata, parentResults, parentTarget);
+      Metadata.defineInsertEndArrayMetadata(ParentMetadata, parentResults, parentTarget);
     }
 
     iterateChildren(target, children, []);