fix: make the code compatible with TypeScript 2.9.x

loopbackio · May 31, 2018 · 37aba50 · 37aba50
1 parent 7d8345c
commit 37aba50
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 65 deletions.
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -21,12 +21,12 @@
     "glob": "^7.1.2",
     "mocha": "^5.1.1",
     "nyc": "^11.7.1",
-    "prettier": "^1.12.1",
+    "prettier": "^1.13.3",
     "rimraf": "^2.6.2",
     "source-map-support": "^0.5.5",
     "strong-docs": "^3.0.1",
     "tslint": "^5.9.1",
-    "typescript": "^2.8.1"
+    "typescript": "^2.9.1"
   },
   "bin": {
     "lb-tsc": "./bin/compile-package.js",

diff --git a/packages/context/src/inject.ts b/packages/context/src/inject.ts
@@ -58,7 +58,7 @@ export interface InjectionMetadata {
  */
 export interface Injection<ValueType = BoundValue> {
   target: Object;
-  member?: string | symbol;
+  member?: string;
   methodDescriptorOrParameterIndex?:
     | TypedPropertyDescriptor<ValueType>
     | number;
@@ -102,7 +102,7 @@ export function inject(
   metadata = Object.assign({decorator: '@inject'}, metadata);
   return function markParameterOrPropertyAsInjected(
     target: Object,
-    member: string | symbol,
+    member: string,
     methodDescriptorOrParameterIndex?:
       | TypedPropertyDescriptor<BoundValue>
       | number,
@@ -296,7 +296,7 @@ function resolveAsSetter(ctx: Context, injection: Injection) {
  */
 export function describeInjectedArguments(
   target: Object,
-  method?: string | symbol,
+  method?: string,
 ): Readonly<Injection>[] {
   method = method || '';
   const meta = MetadataInspector.getAllParameterMetadata<Readonly<Injection>>(

diff --git a/packages/metadata/README.md b/packages/metadata/README.md
@@ -295,7 +295,7 @@ method parameters. Please note `M` is a map for methods/properties/parameters.
 protected mergeWithInherited(
   inheritedMetadata: M,
   target: Object,
-  member?: string | symbol,
+  member?: string,
   descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
 ): M {
   // ...
@@ -304,7 +304,7 @@ protected mergeWithInherited(
 protected mergeWithOwn(
   ownMetadata: M,
   target: Object,
-  member?: string | symbol,
+  member?: string,
   descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
 ): M {
   // ...

diff --git a/packages/metadata/src/decorator-factory.ts b/packages/metadata/src/decorator-factory.ts
@@ -124,7 +124,7 @@ export class DecoratorFactory<
    */
   static getTargetName(
     target: Object,
-    member?: string | symbol,
+    member?: string,
     descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     let name =
@@ -151,7 +151,7 @@ export class DecoratorFactory<
    * @param target Class or the prototype
    * @param member Method name
    */
-  static getNumberOfParameters(target: Object, member?: string | symbol) {
+  static getNumberOfParameters(target: Object, member?: string) {
     if (target instanceof Function && !member) {
       // constructor
       return target.length;
@@ -210,7 +210,7 @@ export class DecoratorFactory<
   protected mergeWithInherited(
     inheritedMetadata: M,
     target: Object,
-    member?: string | symbol,
+    member?: string,
     descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
   ): M {
     throw new Error('mergeWithInherited() is not implemented');
@@ -232,7 +232,7 @@ export class DecoratorFactory<
   protected mergeWithOwn(
     ownMetadata: M,
     target: Object,
-    member?: string | symbol,
+    member?: string,
     descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
   ): M {
     throw new Error('mergeWithOwn() is not implemented');
@@ -254,7 +254,7 @@ export class DecoratorFactory<
    */
   protected decorate(
     target: Object,
-    member?: string | symbol,
+    member?: string,
     descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     const targetName = DecoratorFactory.getTargetName(
@@ -349,7 +349,7 @@ export class ClassDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithInherited(
     inheritedMetadata: T,
     target: Object,
-    member?: string | symbol,
+    member?: string,
     descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     return this.withTarget(<T>this.inherit(inheritedMetadata), target);
@@ -358,7 +358,7 @@ export class ClassDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithOwn(
     ownMetadata: T,
     target: Object,
-    member?: string | symbol,
+    member?: string,
     descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     if (ownMetadata != null) {
@@ -400,7 +400,7 @@ export class PropertyDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithInherited(
     inheritedMetadata: MetadataMap<T>,
     target: Object,
-    propertyName?: string | symbol,
+    propertyName?: string,
     descriptorOrIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     inheritedMetadata = inheritedMetadata || {};
@@ -415,7 +415,7 @@ export class PropertyDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithOwn(
     ownMetadata: MetadataMap<T>,
     target: Object,
-    propertyName?: string | symbol,
+    propertyName?: string,
     descriptorOrParameterIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     ownMetadata = ownMetadata || {};
@@ -430,7 +430,7 @@ export class PropertyDecoratorFactory<T> extends DecoratorFactory<
   }
 
   create(): PropertyDecorator {
-    return (target: Object, propertyName: string | symbol) =>
+    return (target: Object, propertyName: string) =>
       this.decorate(target, propertyName);
   }
 
@@ -464,7 +464,7 @@ export class MethodDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithInherited(
     inheritedMetadata: MetadataMap<T>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     methodDescriptor?: TypedPropertyDescriptor<any> | number,
   ) {
     inheritedMetadata = inheritedMetadata || {};
@@ -479,7 +479,7 @@ export class MethodDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithOwn(
     ownMetadata: MetadataMap<T>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     methodDescriptor?: TypedPropertyDescriptor<any> | number,
   ) {
     ownMetadata = ownMetadata || {};
@@ -498,7 +498,7 @@ export class MethodDecoratorFactory<T> extends DecoratorFactory<
   create(): MethodDecorator {
     return (
       target: Object,
-      methodName: string | symbol,
+      methodName: string,
       descriptor: TypedPropertyDescriptor<any>,
     ) => this.decorate(target, methodName, descriptor);
   }
@@ -533,7 +533,7 @@ export class ParameterDecoratorFactory<T> extends DecoratorFactory<
   private getOrInitMetadata(
     meta: MetadataMap<T[]>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
   ) {
     const method = methodName ? methodName : '';
     let methodMeta = meta[method];
@@ -550,7 +550,7 @@ export class ParameterDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithInherited(
     inheritedMetadata: MetadataMap<T[]>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     parameterIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     inheritedMetadata = inheritedMetadata || {};
@@ -570,7 +570,7 @@ export class ParameterDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithOwn(
     ownMetadata: MetadataMap<T[]>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     parameterIndex?: TypedPropertyDescriptor<any> | number,
   ) {
     ownMetadata = ownMetadata || {};
@@ -592,11 +592,8 @@ export class ParameterDecoratorFactory<T> extends DecoratorFactory<
   }
 
   create(): ParameterDecorator {
-    return (
-      target: Object,
-      methodName: string | symbol,
-      parameterIndex: number,
-    ) => this.decorate(target, methodName, parameterIndex);
+    return (target: Object, methodName: string, parameterIndex: number) =>
+      this.decorate(target, methodName, parameterIndex);
   }
 
   /**
@@ -642,7 +639,7 @@ export class MethodParameterDecoratorFactory<T> extends DecoratorFactory<
    */
   private getParameterIndex(
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     methodDescriptor?: TypedPropertyDescriptor<any> | number,
   ) {
     const numOfParams = DecoratorFactory.getNumberOfParameters(
@@ -674,7 +671,7 @@ export class MethodParameterDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithInherited(
     inheritedMetadata: MetadataMap<T[]>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     methodDescriptor?: TypedPropertyDescriptor<any> | number,
   ) {
     inheritedMetadata = inheritedMetadata || {};
@@ -703,7 +700,7 @@ export class MethodParameterDecoratorFactory<T> extends DecoratorFactory<
   protected mergeWithOwn(
     ownMetadata: MetadataMap<T[]>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     methodDescriptor?: TypedPropertyDescriptor<any> | number,
   ) {
     ownMetadata = ownMetadata || {};
@@ -726,7 +723,7 @@ export class MethodParameterDecoratorFactory<T> extends DecoratorFactory<
   create(): MethodDecorator {
     return (
       target: Object,
-      methodName: string | symbol,
+      methodName: string,
       descriptor: TypedPropertyDescriptor<any>,
     ) => this.decorate(target, methodName, descriptor);
   }

diff --git a/packages/metadata/src/inspector.ts b/packages/metadata/src/inspector.ts
@@ -74,7 +74,7 @@ export class MetadataInspector {
     key: MetadataKey<T, DecoratorType>,
     value: T,
     target: Object,
-    member?: string | symbol,
+    member?: string,
   ) {
     Reflector.defineMetadata(key.toString(), value, target, member);
   }
@@ -108,7 +108,7 @@ export class MetadataInspector {
   static getMethodMetadata<T>(
     key: MetadataKey<T, MethodDecorator>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     options?: InspectionOptions,
   ): T | undefined {
     methodName = methodName || '';
@@ -148,7 +148,7 @@ export class MetadataInspector {
   static getPropertyMetadata<T>(
     key: MetadataKey<T, PropertyDecorator>,
     target: Object,
-    propertyName: string | symbol,
+    propertyName: string,
     options?: InspectionOptions,
   ): T | undefined {
     const meta: MetadataMap<T> =
@@ -170,7 +170,7 @@ export class MetadataInspector {
   static getAllParameterMetadata<T>(
     key: MetadataKey<T, ParameterDecorator>,
     target: Object,
-    methodName?: string | symbol,
+    methodName?: string,
     options?: InspectionOptions,
   ): T[] | undefined {
     methodName = methodName || '';
@@ -194,7 +194,7 @@ export class MetadataInspector {
   static getParameterMetadata<T>(
     key: MetadataKey<T, ParameterDecorator>,
     target: Object,
-    methodName: string | symbol,
+    methodName: string,
     index: number,
     options?: InspectionOptions,
   ): T | undefined {
@@ -214,7 +214,7 @@ export class MetadataInspector {
    */
   static getDesignTypeForProperty(
     target: Object,
-    propertyName: string | symbol,
+    propertyName: string,
   ): Function {
     return TSReflector.getMetadata('design:type', target, propertyName);
   }
@@ -226,7 +226,7 @@ export class MetadataInspector {
    */
   static getDesignTypeForMethod(
     target: Object,
-    methodName: string | symbol,
+    methodName: string,
   ): DesignTimeMethodMetadata {
     const type = TSReflector.getMetadata('design:type', target, methodName);
     const parameterTypes = TSReflector.getMetadata(