feat(all): initial work for paramless decorators

Author: steelsojka

.gitignore

@@ -10,4 +10,5 @@ node_modules
 /test
 /buildDocs
 src/**/*.js
-src/**/*.map
+src/**/*.map
+.history

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

src/attempt.spec.ts

@@ -21,4 +21,23 @@ describe('attempt', () => {
     expect(myClass.fn()).to.be.an.instanceOf(Error);
     expect(myClass.fn2()).to.equal(10);
   });
-});
+
+  it('should catch the error and return it (paramless)', () => {
+    class MyClass {
+      @Attempt
+      fn() {
+        throw new Error();
+      }
+
+      @Attempt
+      fn2() {
+        return 10;
+      }
+    }
+
+    const myClass = new MyClass();
+
+    expect(myClass.fn()).to.be.an.instanceOf(Error);
+    expect(myClass.fn2()).to.equal(10);
+  });
+});

src/attempt.ts

@@ -1,13 +1,10 @@
 import attempt = require('lodash/attempt');
 import partial = require('lodash/partial');
 
-import { DecoratorConfig, DecoratorFactory, LodashMethodDecorator } from './factory';
+import { DecoratorConfig, DecoratorFactory, TypedMethodDecorator } from './factory';
 import { PreValueApplicator } from './applicators';
 
 const attemptFn = (fn: () => void) => partial(attempt, fn);
-const decorator = DecoratorFactory.createDecorator(
-  new DecoratorConfig(attemptFn, new PreValueApplicator())
-);
 
 /**
  * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments are provided to func when it's invoked.
@@ -30,8 +27,10 @@ const decorator = DecoratorFactory.createDecorator(
  * myClass.fn(10); // => 10;
  * myClass.fn(null); // => Error
  */
-export function Attempt(...partials: any[]): LodashMethodDecorator {
-  return decorator(...partials);
-}
+export const Attempt = DecoratorFactory.createDecorator(
+  new DecoratorConfig(attemptFn, new PreValueApplicator(), {
+    optionalParams: true
+  })
+) as TypedMethodDecorator;
 export { Attempt as attempt };
-export default decorator;
+export default Attempt;

src/bind.spec.ts

@@ -40,4 +40,24 @@ describe('bind', () => {
     myClass.fn.call(null);
     expect(context).to.equal(myClass);
   });
-});
+
+  it('should bind without params', () => {
+    let context;
+
+    class MyClass {
+      @Bind
+      fn() {
+        context = this;
+      }
+    }
+
+    const myClass = new MyClass();
+    const myClass2 = new MyClass();
+
+    myClass.fn.call(null);
+    expect(context).to.equal(myClass);
+
+    myClass2.fn.call(null);
+    expect(context).to.equal(myClass2);
+  });
+});

src/bind.ts

@@ -1,12 +1,8 @@
 import bind = require('lodash/bind');
 
-import { DecoratorConfig, DecoratorFactory, LodashMethodDecorator } from './factory';
+import { DecoratorConfig, DecoratorFactory, TypedMethodDecorator1 } from './factory';
 import { BindApplicator } from './applicators';
 
-const decorator = DecoratorFactory.createInstanceDecorator(
-  new DecoratorConfig(bind, new BindApplicator())
-);
-
 /**
  * Creates a function that invokes func with the this binding of thisArg and partials prepended to the arguments it receives.
  *
@@ -32,8 +28,10 @@ const decorator = DecoratorFactory.createInstanceDecorator(
  * myClass.bound.call(null); // => myClass {}
  * myClass.unbound.call(null); // => null
  */
-export function Bind(...partials: any[]): LodashMethodDecorator {
-  return decorator(...partials);
-}
-export { Bind as bind };
-export default decorator;
+export const Bind = DecoratorFactory.createInstanceDecorator(
+  new DecoratorConfig(bind, new BindApplicator(), {
+    optionalParams: true
+  })
+) as TypedMethodDecorator1<any>;
+export { Bind as bind, };
+export default Bind;

src/curry.spec.ts

@@ -18,6 +18,21 @@ describe('curry', () => {
     expect(add5(10)).to.equal(15);
   });
 
+  it('should curry the method with default arity (paramless)', () => {
+    class MyClass {
+      @Curry
+      add(a: any, b?: any) {
+        return a + b;
+      }
+    }
+
+    const myClass = new MyClass();
+    const add5 = myClass.add(5);
+
+    expect(add5).to.be.an.instanceOf(Function);
+    expect(add5(10)).to.equal(15);
+  });
+
   it('should curry the method with fixed arity', () => {
     class MyClass {
       @Curry(2)

src/curry.ts

@@ -1,12 +1,8 @@
 import curry = require('lodash/curry');
 
-import { DecoratorConfig, DecoratorFactory, LodashMethodDecorator } from './factory';
+import { DecoratorConfig, DecoratorFactory, TypedMethodDecorator1 } from './factory';
 import { PreValueApplicator } from './applicators';
 
-const decorator = DecoratorFactory.createInstanceDecorator(
-  new DecoratorConfig(curry, new PreValueApplicator(), { bound: true })
-);
-
 /**
  * Creates a function that accepts arguments of func and either invokes func returning its result, if at least arity number of arguments have been provided, or returns a function that accepts the remaining func arguments, and so on.
  * The arity of func may be specified if func.length is not sufficient.
@@ -33,8 +29,8 @@ const decorator = DecoratorFactory.createInstanceDecorator(
  *
  * add5AndMultiply(10); // => 30
  */
-export function Curry(arity?: number): LodashMethodDecorator {
-  return decorator(arity);
-}
+export const Curry = DecoratorFactory.createInstanceDecorator(
+  new DecoratorConfig(curry, new PreValueApplicator(), { bound: true, optionalParams: true })
+) as TypedMethodDecorator1<number>;
 export { Curry as curry };
-export default decorator;
+export default Curry;

src/factory/DecoratorConfig.ts

@@ -6,6 +6,7 @@ export interface DecoratorConfigOptions {
   getter?: boolean;
   property?: boolean;
   method?: boolean;
+  optionalParams?: boolean;
 }
 
 export class DecoratorConfig {
@@ -34,4 +35,8 @@ export class DecoratorConfig {
   get method(): boolean {
     return this.options.method != null ? this.options.method : true;
   }
-}
+
+  get optionalParams(): boolean {
+    return this.options.optionalParams != null ? this.options.optionalParams : false;
+  }
+}

src/factory/DecoratorFactory.ts

@@ -12,10 +12,10 @@ export type GenericDecorator = (...args: any[]) => LodashDecorator;
 
 export class InternalDecoratorFactory {
   createDecorator(config: DecoratorConfig): GenericDecorator {
-    const { applicator } = config;
+    const { applicator, optionalParams } = config;
 
     return (...args: any[]): LodashDecorator => {
-      return (target: Object, name: string, _descriptor?: PropertyDescriptor): PropertyDescriptor => {
+      const decorator = (target: Object, name: string, _descriptor?: PropertyDescriptor): PropertyDescriptor => {
         const descriptor = this._resolveDescriptor(target, name, _descriptor);
         const { value, get, set } = descriptor;
 
@@ -33,14 +33,16 @@ export class InternalDecoratorFactory {
 
         return descriptor;
       };
+
+      return optionalParams && args.length >= 2 ? decorator(args[0], args[1], args[2]) as any : decorator;
     };
   }
 
   createInstanceDecorator(config: DecoratorConfig): GenericDecorator {
-    const { applicator, bound } = config;
+    const { applicator, bound, optionalParams } = config;
 
     return (...args: any[]): LodashDecorator => {
-      return (target: Object, name: string, _descriptor?: PropertyDescriptor): PropertyDescriptor => {
+      const decorator = (target: Object, name: string, _descriptor?: PropertyDescriptor): PropertyDescriptor => {
         const descriptor = this._resolveDescriptor(target, name, _descriptor);
         const { value, writable, enumerable, configurable, get, set } = descriptor;
         const isFirstInstance = !InstanceChainMap.has([ target, name ]);
@@ -146,6 +148,8 @@ export class InternalDecoratorFactory {
 
         return descriptor;
       };
+
+      return optionalParams && args.length >= 2 ? decorator(args[0], args[1], args[2]) as any: decorator;
     };
   }