Use metadata-booster

package.json

@@ -30,8 +30,8 @@
     "nyc": "^15.0.1",
     "prettier": "^1.19.1",
     "rimraf": "^3.0.0",
-    "ts-node": "^8.6.2",
-    "typescript": "3.9.4",
+    "ts-node": "9.1.1",
+    "typescript": "4.1.5",
     "yargs": "^15.1.0"
   },
   "license": "Apache-2.0"

packages/cli/src/templates/project/package-json.ts

@@ -25,7 +25,9 @@ export const template = `{
     "prettier": "^1.19.1",
     "typescript": "^3.9.3",
     "ts-node": "^8.6.2",
-    "@types/node": "^13.5.1"
+    "@types/node": "^13.5.1",
+    "ttypescript": "1.5.12",
+    "metadata-booster": "0.3.1"
   },
   "engines": {
     "node": ">=8.0.0"
@@ -37,7 +39,7 @@ export const template = `{
   "scripts": {
     "lint:check": "eslint --ext '.js,.ts' **/*.ts",
     "lint:fix": "eslint --quiet --fix --ext '.js,.ts' **/*.ts",
-    "compile": "npx tsc -b tsconfig.json",
+    "compile": "npx ttsc -b tsconfig.json",
     "deploy": "boost deploy",
     "clean": "npx rimraf ./dist tsconfig.tsbuildinfo",
     "test": "npx nyc --extension .ts mocha --forbid-only \\"test/**/*.test.ts\\""

packages/cli/src/templates/project/tsconfig-json.ts

@@ -14,7 +14,10 @@ export const template = `{
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
+    "emitDecoratorMetadata": true,
+    "plugins": [
+      { "transform": "metadata-booster" }
+    ]
   },
   "include": [
     "src/**/*"

packages/cli/test/fixtures/mock_project/tsconfig.json

@@ -14,7 +14,9 @@
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
+    "plugins": [
+      { "transform": "metadata-booster" }
+    ]
   },
   "include": [
     "src/**/*"

packages/cli/test/fixtures/mock_project_bad_index/tsconfig.json

@@ -14,7 +14,9 @@
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
+    "plugins": [
+      { "transform": "metadata-booster" }
+    ]
   },
   "include": [
     "src/**/*"

packages/framework-core/package.json

@@ -55,6 +55,7 @@
     "mock-jwks": "^0.3.1",
     "nock": "^13.0.4",
     "sinon": "9.2.3",
-    "sinon-chai": "3.5.0"
+    "sinon-chai": "3.5.0",
+    "metadata-booster": "0.3.1"
   }
 }

packages/framework-core/src/decorators/metadata.ts

@@ -1,22 +1,14 @@
-import { PropertyMetadata, Class, AnyClass } from '@boostercloud/framework-types'
+import { Class } from '@boostercloud/framework-types'
+import { ClassMetadata, PropertyMetadata } from 'metadata-booster'
 import 'reflect-metadata'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getPropertiesMetadata(classType: Class<any>): Array<PropertyMetadata> {
-  const propertyNames = Object.getOwnPropertyNames(new classType())
-  const propertyTypes = Reflect.getMetadata('design:paramtypes', classType)
-  if (propertyNames.length != propertyTypes.length) {
+  const meta: ClassMetadata = Reflect.getMetadata('booster:typeinfo', classType)
+  if (!meta) {
     // eslint-disable-next-line prettier/prettier
-    throw new Error(`Could not get proper metadata information of ${classType.name}. While inspecting the class, the following properties were found:
-> ${propertyNames.join(', ')}
-But its constructor parameters have the following types:
-> ${propertyTypes.map((type: AnyClass) => type.name).join(', ')}
-They mismatch. Make sure you define all properties as "constructor parameter properties" (see https://www.typescriptlang.org/docs/handbook/classes.html#parameter-properties)
-`)
+    throw new Error(`Could not get proper metadata information of ${classType.name}`)
   }
 
-  return propertyNames.map((propertyName, index) => ({
-    name: propertyName,
-    type: propertyTypes[index],
-  }))
+  return meta.fields
 }

packages/framework-core/src/services/graphql/common.ts

@@ -1,7 +1,8 @@
 import { GraphQLList, GraphQLScalarType, GraphQLObjectType } from 'graphql/type/definition'
-import { AnyClass, PropertyMetadata, UserEnvelope, UUID, GraphQLOperation } from '@boostercloud/framework-types'
+import { AnyClass, UserEnvelope, UUID, GraphQLOperation } from '@boostercloud/framework-types'
 import { GraphQLFieldResolver } from 'graphql'
 import { ReadModelPubSub } from '../pub-sub/read-model-pub-sub'
+import { PropertyMetadata } from 'metadata-booster'
 
 export type TargetTypesMap = Record<string, TargetTypeMetadata>
 export interface TargetTypeMetadata {

packages/framework-core/src/services/graphql/graphql-query-generator.ts

@@ -9,20 +9,14 @@ import {
   GraphQLNonNull,
   GraphQLObjectType,
   GraphQLScalarType,
-  GraphQLString
+  GraphQLString,
 } from 'graphql'
 import { GraphQLNonInputType, ResolverBuilder, TargetTypeMetadata, TargetTypesMap } from './common'
 import { GraphQLTypeInformer } from './graphql-type-informer'
 import * as inflected from 'inflected'
 import { GraphQLJSONObject } from 'graphql-type-json'
-import {
-  AnyClass,
-  BooleanOperations,
-  NumberOperations,
-  PropertyMetadata,
-  StringOperations,
-  UUID,
-} from '@boostercloud/framework-types'
+import { AnyClass, BooleanOperations, NumberOperations, StringOperations, UUID } from '@boostercloud/framework-types'
+import { PropertyMetadata } from 'metadata-booster'
 
 export class GraphQLQueryGenerator {
   private generatedFiltersByTypeName: Record<string, GraphQLInputObjectType> = {}
@@ -38,13 +32,13 @@ export class GraphQLQueryGenerator {
   public generate(): GraphQLObjectType {
     const byIDQueries = this.generateByIDQueries()
     const filterQueries = this.generateFilterQueries()
-    const fields = {...byIDQueries, ...filterQueries}
+    const fields = { ...byIDQueries, ...filterQueries }
     if (Object.keys(fields).length === 0) {
       return new GraphQLObjectType({
         name: 'Query',
         fields: {
-          NoQueriesDefined: { type: GraphQLString }
-        }
+          NoQueriesDefined: { type: GraphQLString },
+        },
       })
     }
     return new GraphQLObjectType({
@@ -86,13 +80,13 @@ export class GraphQLQueryGenerator {
   public generateFilterArguments(typeMetadata: TargetTypeMetadata): GraphQLFieldConfigArgumentMap {
     const args: GraphQLFieldConfigArgumentMap = {}
     typeMetadata.properties.forEach((prop: PropertyMetadata) => {
-      const graphQLPropType = this.typeInformer.getGraphQLTypeFor(prop.type)
+      const graphQLPropType = this.typeInformer.getGraphQLTypeFor(prop.typeInfo.type)
       if (!this.canFilter(graphQLPropType)) {
         // TODO: We still don't handle filtering by complex properties
         return
       }
       args[prop.name] = {
-        type: this.generateFilterFor(prop.type),
+        type: this.generateFilterFor(prop.typeInfo.type),
       }
     })
     return args

packages/framework-core/src/services/graphql/graphql-type-informer.ts

@@ -1,6 +1,6 @@
 import { GraphQLJSONObject } from 'graphql-type-json'
 import { GraphQLNonInputType, TargetTypeMetadata, TargetTypesMap } from './common'
-import { AnyClass, UUID, PropertyMetadata } from '@boostercloud/framework-types'
+import { AnyClass, UUID } from '@boostercloud/framework-types'
 import {
   GraphQLFieldConfigMap,
   GraphQLList,
@@ -18,6 +18,7 @@ import {
   GraphQLInterfaceType,
 } from 'graphql'
 import { GraphQLFieldMap, GraphQLInputFieldConfigMap } from 'graphql/type/definition'
+import { PropertyMetadata } from 'metadata-booster'
 
 export class GraphQLTypeInformer {
   private graphQLTypesByName: Record<string, GraphQLNonInputType> = {}
@@ -41,7 +42,7 @@ export class GraphQLTypeInformer {
   private metadataPropertiesToGraphQLFields(properties: Array<PropertyMetadata>): GraphQLFieldConfigMap<any, any> {
     const fields: GraphQLFieldConfigMap<any, any> = {}
     for (const prop of properties) {
-      fields[prop.name] = { type: this.getGraphQLTypeFor(prop.type) }
+      fields[prop.name] = { type: this.getGraphQLTypeFor(prop.typeInfo.type) }
     }
     return fields
   }

packages/framework-core/test/decorators/read-model.test.ts

@@ -31,15 +31,27 @@ describe('the `ReadModel` decorator', () => {
       properties: [
         {
           name: 'id',
-          type: UUID,
+          typeInfo: {
+            name: 'UUID',
+            parameters: [],
+            type: UUID,
+          },
         },
         {
           name: 'aStringProp',
-          type: String,
+          typeInfo: {
+            name: 'String',
+            parameters: [],
+            type: String,
+          },
         },
         {
           name: 'aNumberProp',
-          type: Number,
+          typeInfo: {
+            name: 'Number',
+            parameters: [],
+            type: Number,
+          },
         },
       ],
     })

packages/framework-core/test/services/graphql/graphql-query-generator.test.ts

@@ -132,7 +132,11 @@ describe('GraphQLQueryGenerator', () => {
               properties: [
                 {
                   name: mockPropertyName,
-                  type: mockPropertyType,
+                  typeInfo: {
+                    name: mockPropertyType.name,
+                    type: mockPropertyType,
+                    parameters: [],
+                  },
                 },
               ],
             }

packages/framework-core/tsconfig.json

@@ -1,11 +1,20 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "emitDecoratorMetadata": true,
     "outDir": "./dist",
     "rootDir": "./src"
   },
   "include": [
     "src/**/*"
-  ]
+  ],
+  "ts-node": {
+    "compiler": "ttypescript",
+    "compilerOptions": {
+      "plugins": [
+        {
+          "transform": "metadata-booster"
+        }
+      ]
+    }
+  }
 }

packages/framework-integration-tests/integration/fixtures/cart-demo/tsconfig.json

@@ -14,7 +14,9 @@
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
+    "plugins": [
+      { "transform": "metadata-booster" }
+    ]
   },
   "include": [
     "src/**/*"

packages/framework-integration-tests/package.json

@@ -34,7 +34,9 @@
     "faker": "5.1.0",
     "graphql-tag": "^2.10.3",
     "subscriptions-transport-ws": "^0.9.16",
-    "ws": "^7.3.0"
+    "ws": "^7.3.0",
+    "ttypescript": "1.5.12",
+    "metadata-booster": "0.3.1"
   },
   "engines": {
     "node": ">=8.0.0"
@@ -46,7 +48,7 @@
     "watch:local": "nodemon --watch ../framework-provider-local/dist --watch ../framework-provider-local-infrastructure --watch dist --exec \"../cli/bin/run start -e local\"",
     "lint:check": "eslint --ext '.js,.ts' **/*.ts",
     "lint:fix": "eslint --quiet --fix --ext '.js,.ts' **/*.ts",
-    "compile": "tsc -b tsconfig.json",
+    "compile": "npx ttsc -b tsconfig.json",
     "clean": "npx rimraf ./dist tsconfig.tsbuildinfo",
     "integration": "npm run integration/cli && npm run integration/local && npm run integration/aws-deploy && npm run integration/aws-func && npm run integration/end-to-end && npm run integration/aws-nuke",
     "integration/aws-deploy": "AWS_SDK_LOAD_CONFIG=true mocha --forbid-only --exit --config \"integration/providers/aws/deployment/.mocharc.yml\" \"integration/providers/aws/deployment/**/*.integration.ts\"",

packages/framework-integration-tests/tsconfig.json

@@ -14,7 +14,9 @@
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "experimentalDecorators": true,
-    "emitDecoratorMetadata": true
+    "plugins": [
+      { "transform": "metadata-booster" }
+    ]
   },
   "include": [
     "src/**/*"

packages/framework-types/package.json

@@ -40,6 +40,7 @@
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
     "fast-check": "^1.18.1",
-    "sinon-chai": "3.5.0"
+    "sinon-chai": "3.5.0",
+    "metadata-booster": "0.3.1"
   }
 }

packages/framework-types/src/concepts/command.ts

@@ -1,6 +1,7 @@
 import { Register } from './register'
-import { PropertyMetadata, Class } from '../typelevel'
+import { Class } from '../typelevel'
 import { RoleAccess } from './role'
+import { PropertyMetadata } from 'metadata-booster'
 
 export interface CommandInterface<TCommand = unknown> extends Class<TCommand> {
   // The command's type is `unknown` because the CommandInterface type specifies the