prettier + fix control mappingOptions

.eslintrc.yml

@@ -1,7 +1,9 @@
 env:
   browser: true
   es2021: true
-extends: standard-with-typescript
+extends: 
+  - standard-with-typescript
+  - plugin:prettier/recommended
 overrides: []
 parserOptions:
   ecmaVersion: latest
@@ -12,4 +14,6 @@ rules:
   no-mixed-operators: off
   "@typescript-eslint/strict-boolean-expressions": off
   "@typescript-eslint/restrict-plus-operands": off
-  curly: off
+  curly: off
+  no-useless-return: off
+  prettier/prettier: error

.prettierignore

@@ -0,0 +1,7 @@
+# Ignore artifacts:
+build
+coverage
+node_modules
+*.md
+*.json
+*.yml

.prettierrc.json

@@ -0,0 +1,11 @@
+{
+  "parser": "typescript",
+  "printWidth": 85,
+  "tabWidth": 2,
+  "singleQuote": true,
+  "proseWrap": "preserve",
+  "quoteProps": "as-needed",
+  "arrowParens": "avoid",
+  "trailingComma": "none",
+  "semi": false
+}

CHANGELOG.md

@@ -1,3 +1,9 @@
+# [3.0.1](https://github.com/ugoevola/ts-mapstruct/releases/tag/v3.0.1)
+
+### Added
+- Prettier
+### Fixed
+- Controls on MappingOptions
 # [3.0.0](https://github.com/ugoevola/ts-mapstruct/releases/tag/v3.0.0)
 ### Breaking Changed
 - The **@Mappings** decorator doesn't work without **@Mapper** on the parent class

README.md

@@ -141,12 +141,11 @@ In the previous example, the friends and bestFriends properties will remain Frie
 The library allows you  to define the targeted type for each property:
 ```ts
 @Mappings(
-    { target: 'fullName', expression: 'getConcatProperties(userDto.fname, userDto.lname)' },
-    { target: 'cn', source: 'userDto.fname' },
-    { target: 'sn', source: 'userDto.lname' },
-    { target: 'lastConnexionTime', value: Date.now() },
-    // changed
-    { target: 'bestFriend', expression: 'getBestFriend(userDto.friends)', type: FriendEntity },
+    { 
+      target: 'bestFriend',
+      expression: 'getBestFriend(userDto.friends)',
+      type: FriendEntity
+    },
     { target: 'friends', type: FriendEntity }
   )
   entityFromDto(_userDto: UserDto): UserEntity {
@@ -157,13 +156,12 @@ The library allows you  to define the targeted type for each property:
 If you have multiple depths in your object, you can target the right property with the right type like this:
 ```ts
 @Mappings(
-    { target: 'fullName', expression: 'getConcatProperties(userDto.fname, userDto.lname)' },
-    { target: 'cn', source: 'userDto.fname' },
-    { target: 'sn', source: 'userDto.lname' },
-    { target: 'lastConnexionTime', value: Date.now() },
-    { target: 'bestFriend', expression: 'getBestFriend(userDto.friends)', type: FriendEntity },
+    { 
+      target: 'bestFriend',
+      expression: 'getBestFriend(userDto.friends)',
+      type: FriendEntity
+    },
     { target: 'friends', type: FriendEntity },
-    // changed
     { target: 'friends.bdate', type: Date },
     { target: 'bestFriend.bdate', type: Date }
   )
@@ -186,7 +184,11 @@ Below are examples of options that may exist:
   { target: 'prop', type: 'date' }
   // used to convert Date to string with a specific format
   // cf. Intl.DateTimeFormat for more informations
-  { target: 'prop', type: String, dateFormat: ['Fr-fr', { dateStyle: 'full', timeStyle: 'long' }] }
+  {
+    target: 'prop',
+    type: String,
+    dateFormat: ['Fr-fr', { dateStyle: 'full', timeStyle: 'long' }]
+  }
 ```
 ### @BeforeMapping / @AfterMapping
 These decorators are to be placed on internal methods of the mapper. They allow to execute them before or after the mapping.<br>
@@ -376,7 +378,7 @@ export class UserMapper {
 
   // this will throw a BadExpressionExceptionMapper because the expression for fullName can't be evaluated (unknownMethod does not exist)
   @Mappings(
-    { target: 'fullName', expression: 'unknownMethod()' },
+    { target: 'fullName', expression: 'unknownMethod()' }
   )
   entityFromDto(_userDto: UserDto): UserEntity {
     return new UserEntity;
@@ -411,7 +413,7 @@ export class UserMapper {
 
   // this will throw an InvalidMappingOptionsExceptionMapper because you provide multiple sources (value and source) for cn in one MappingOption
   @Mappings(
-    { target: 'cn', value: 'Ugo', source: 'userDto.fname' },
+    { target: 'cn', value: 'Ugo', source: 'userDto.fname' }
   )
   entityFromDto(_userDto: UserDto): UserEntity {
     return new UserEntity;
@@ -442,7 +444,7 @@ export class UserMapper {
 
   // this will throw an InvalidSourceExceptionMapper because userDto.unknownProperty does not exist
   @Mappings(
-    { target: 'cn', source: 'userDto.unknownProperty' },
+    { target: 'cn', source: 'userDto.unknownProperty' }
   )
   entityFromDto(_userDto: UserDto): UserEntity {
     return new UserEntity;
@@ -458,7 +460,7 @@ export class UserMapper {
 
   // this will throw an InvalidTargetExceptionMapper because unknown does not exist on UserEntity
   @Mappings(
-    { target: 'unknown', source: 'userDto.fname' },
+    { target: 'unknown', source: 'userDto.fname' }
   )
   entityFromDto(_userDto: UserDto): UserEntity {
     return new UserEntity;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-mapstruct",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -21,23 +21,25 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
     "lodash": "^4.17.21",
-    "reflect-metadata": "^0.1.13"
+    "reflect-metadata": "^0.1.13",
+    "rxjs": "^7.5.6"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
     "@types/jest": "^29.0.2",
     "@types/lodash": "^4.14.182",
-    "@types/sanitizer": "0.0.28",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "eslint": "^8.23.1",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard-with-typescript": "^23.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-n": "^15.2.5",
+    "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.0.1",
     "jest": "^29.0.3",
-    "rxjs": "^6.5.4",
-    "typescript": "^4.8.3",
-    "ts-jest": "^29.0.1"
+    "prettier": "2.7.1",
+    "ts-jest": "^29.0.1",
+    "typescript": "^4.8.3"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -56,7 +58,7 @@
     "testEnvironment": "node",
     "coverageThreshold": {
       "global": {
-        "lines": 90
+        "lines": 100
       }
     }
   },

src/core/get-after-suppliers.ts

@@ -9,18 +9,33 @@ export const getAfterSuppliers = <T>(
   targetedObject: T
 ): SupplierDescriptor[] => {
   return (Reflect.getOwnMetadata(AFTER_MAPPING, mapperClass) || [])
-    ?.map((fnName: string) => new SupplierDescriptor(fnName, Reflect.getOwnMetadata(VALUE, mapperClass, fnName), mapperClass))
-    ?.filter((supplier: SupplierDescriptor) => checkForInvocationForAfter(supplier.args, sourceArgs, targetedObject))
+    ?.map(
+      (fnName: string) =>
+        new SupplierDescriptor(
+          fnName,
+          Reflect.getOwnMetadata(VALUE, mapperClass, fnName),
+          mapperClass
+        )
+    )
+    ?.filter((supplier: SupplierDescriptor) =>
+      checkForInvocationForAfter(supplier.args, sourceArgs, targetedObject)
+    )
 }
 
-const checkForInvocationForAfter = <T> (
+const checkForInvocationForAfter = <T>(
   supplierArgs: ArgumentDescriptor[],
   sourceArgs: ArgumentDescriptor[],
   targetedObject: T
 ): boolean => {
-  const result = supplierArgs.filter((supplierArg: ArgumentDescriptor) => !(
-    !supplierArg.isMappingTarget && sourceArgs.some(arg => arg.sameNameAs(supplierArg)) ||
-    supplierArg.isMappingTarget && sameType(supplierArg.type.prototype, targetedObject)))
-    .length === 0
+  const result =
+    supplierArgs.filter(
+      (supplierArg: ArgumentDescriptor) =>
+        !(
+          (!supplierArg.isMappingTarget &&
+            sourceArgs.some(arg => arg.sameNameAs(supplierArg))) ||
+          (supplierArg.isMappingTarget &&
+            sameType(supplierArg.type.prototype, targetedObject))
+        )
+    ).length === 0
   return result
 }

src/core/get-before-suppliers.ts

@@ -7,16 +7,32 @@ export const getBeforeSuppliers = (
   sourceArgs: ArgumentDescriptor[]
 ): SupplierDescriptor[] => {
   return (Reflect.getOwnMetadata(BEFORE_MAPPING, mapperClass) || [])
-    ?.map((fnName: string) => new SupplierDescriptor(fnName, Reflect.getOwnMetadata(VALUE, mapperClass, fnName), mapperClass))
-    ?.filter((supplier: SupplierDescriptor) => checkForInvocationForBefore(supplier.args, sourceArgs))
+    ?.map(
+      (fnName: string) =>
+        new SupplierDescriptor(
+          fnName,
+          Reflect.getOwnMetadata(VALUE, mapperClass, fnName),
+          mapperClass
+        )
+    )
+    ?.filter((supplier: SupplierDescriptor) =>
+      checkForInvocationForBefore(supplier.args, sourceArgs)
+    )
 }
 
 const checkForInvocationForBefore = (
   supplierArgs: ArgumentDescriptor[],
   sourceArgs: ArgumentDescriptor[]
 ): boolean => {
-  return supplierArgs.filter((supplierArg: ArgumentDescriptor) => !(
-    !supplierArg.isMappingTarget && sourceArgs.some(sourceArg => sourceArg.sameNameAs(supplierArg)) ||
-    sourceArgs.find(sourceArg => sourceArg.sameNameAs(supplierArg))?.isMappingTarget))
-    .length === 0
+  return (
+    supplierArgs.filter(
+      (supplierArg: ArgumentDescriptor) =>
+        !(
+          (!supplierArg.isMappingTarget &&
+            sourceArgs.some(sourceArg => sourceArg.sameNameAs(supplierArg))) ||
+          sourceArgs.find(sourceArg => sourceArg.sameNameAs(supplierArg))
+            ?.isMappingTarget
+        )
+    ).length === 0
+  )
 }