Merge pull request #6 from corpusculejs/refactor/decorators

Refactor to decorators
corpusculejs · Jul 29, 2018 · bd36907 · bd36907
2 parents f54f57f + dc2fc04
commit bd36907
Show file tree

Hide file tree

Showing 35 changed files with 659 additions and 845 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -7,6 +7,14 @@
   },
   "rules": {
     "callback-return": "off",
-    "global-require": "off"
+    "global-require": "off",
+    "no-unused-vars": ["error", {
+      "args": "all",
+      "argsIgnorePattern": "^_[a-zA-Z]*$",
+      "caughtErrors": "all",
+      "caughtErrorsIgnorePattern": "^_[a-zA-Z]*$",
+      "vars": "all",
+      "varsIgnorePattern": "^_[a-zA-Z]*$"
+    }],
   }
 }
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "ts-loader": "^4.4.1",
     "tslint": "^5.10.0",
     "tslint-config-poetez": "^1.1.1",
-    "typescript": "^2.9.2",
+    "typescript": "^3.0.0-rc",
     "universal-router": "^6.0.0",
     "uuid": "^3.2.1",
     "webpack": "^4.12.0"

diff --git a/packages/context/__tests__/index.ts b/packages/context/__tests__/index.ts
@@ -18,13 +18,15 @@ describe("@corpuscule/context", () => {
         providingValue,
       } = createContext();
 
-      class TestProvider extends provider(BasicProvider) {
+      @provider
+      class TestProvider extends BasicProvider {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [providingValue]: number = 2;
       }
 
-      class TestConsumer extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
@@ -43,19 +45,22 @@ describe("@corpuscule/context", () => {
         providingValue,
       } = createContext();
 
-      class TestProvider extends provider(BasicProvider) {
+      @provider
+      class TestProvider extends BasicProvider {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [providingValue]: number = 2;
       }
 
-      class TestConsumer1 extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer1 extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
       }
 
-      class TestConsumer2 extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer2 extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
@@ -74,11 +79,13 @@ describe("@corpuscule/context", () => {
         provider,
       } = createContext(5);
 
-      class TestProvider extends provider(BasicProvider) {
+      @provider
+      class TestProvider extends BasicProvider {
         public static readonly is: string = `x-${uuid()}`;
       }
 
-      class TestConsumer extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
@@ -97,13 +104,15 @@ describe("@corpuscule/context", () => {
         providingValue,
       } = createContext();
 
-      class TestProvider extends provider(BasicProvider) {
+      @provider
+      class TestProvider extends BasicProvider {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [providingValue]: number = 2;
       }
 
-      class TestConsumer extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
@@ -128,7 +137,8 @@ describe("@corpuscule/context", () => {
         providingValue,
       } = createContext();
 
-      class TestProvider extends provider(BasicProvider) {
+      @provider
+      class TestProvider extends BasicProvider {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [providingValue]: number = 2;
@@ -143,7 +153,8 @@ describe("@corpuscule/context", () => {
         }
       }
 
-      class TestConsumer extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
@@ -173,19 +184,22 @@ describe("@corpuscule/context", () => {
         providingValue,
       } = createContext();
 
-      class TestProvider extends provider(BasicProvider) {
+      @provider
+      class TestProvider extends BasicProvider {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [providingValue]: number = 2;
       }
 
-      class TestConsumer1 extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer1 extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
       }
 
-      class TestConsumer2 extends consumer(BasicConsumer) {
+      @consumer
+      class TestConsumer2 extends BasicConsumer {
         public static readonly is: string = `x-${uuid()}`;
 
         protected [contextValue]?: number;
@@ -208,7 +222,8 @@ describe("@corpuscule/context", () => {
     //     contextValue,
     //   } = createContext();
     //
-    //   class TestConsumer extends consumer(HTMLElement) {
+    //   @consumer
+    //   class TestConsumer extends HTMLElement {
     //     public static readonly is: string = `x-${uuid()}`;
     //
     //     public [contextValue]?: number;

diff --git a/packages/context/package.json b/packages/context/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@corpuscule/context",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "DOM-dependent context for Corpuscule",
   "main": "lib/index.js",
   "module": "lib/index.js",
@@ -14,8 +14,5 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/corpusculejs/corpuscule.git"
-  },
-  "dependencies": {
-    "@corpuscule/typings": "^0.2.0"
   }
 }
diff --git a/packages/context/src/index.d.ts b/packages/context/src/index.d.ts
@@ -1,9 +1,7 @@
-import {CustomElementClass, UncertainCustomElementClass} from "@corpuscule/typings";
-
 declare const createContext: <T>(defaultValue?: T) => {
-  readonly consumer: <T = {}>(target: UncertainCustomElementClass<T>) => CustomElementClass<T>;
+  readonly consumer: ClassDecorator;
   readonly contextValue: "contextValue"; // hack to resolve unique symbol widening
-  readonly provider: <T = {}>(target: UncertainCustomElementClass<T>) => CustomElementClass<T>;
+  readonly provider: ClassDecorator;
   readonly providingValue: "providingValue"; // hack to resolve unique symbol widening
 };