fix: property type mutableXXX

Author: yulingtianxia

lib/common/utils.js

@@ -1,3 +1,5 @@
+import DNObjectiveCTypeConverter from '../objc/DNObjectiveCTypeConverter.js'
+
 String.prototype.capitalize = function () {
     return this.charAt(0).toUpperCase() + this.slice(1).toLowerCase()
 }
@@ -7,3 +9,10 @@ export function rawGenericType(type) {
     var rawType = isGeneric ? type.substring(0, type.indexOf('<')) : type
     return rawType
 }
+
+export function convertMutableTypeIfNeed(type) {
+    var rawType = rawGenericType(type)
+    var dartType = DNObjectiveCTypeConverter.SupportMutableTypesMap[rawType]
+    var ret = dartType ? type.replace(rawType, dartType) : type
+    return ret
+}

lib/objc/DNObjectiveCContext.js

@@ -1,5 +1,5 @@
 import DNObjectiveCTypeConverter from './DNObjectiveCTypeConverter.js'
-import { rawGenericType } from '../common/utils.js'
+import { rawGenericType, convertMutableTypeIfNeed } from '../common/utils.js'
 
 export class DNContext {
     constructor(internal) {
@@ -190,7 +190,7 @@ export class DNMethodContext extends DNContext {
             return this.constructorImpl()
         } else {
             var result = '  ' + this.availability.map((a) => a.parse()).join(' ') + '\n'
-            result += '  ' + (this.isClassMethod ? 'static ' : '') + this.convertMutableTypeIfNeed(this.returnType) + ' ' + this.methodDeclaration() + this.methodArgs() + ' {\n'
+            result += '  ' + (this.isClassMethod ? 'static ' : '') + convertMutableTypeIfNeed(this.returnType) + ' ' + this.methodDeclaration() + this.methodArgs() + ' {\n'
             result += this.preHandleMutableArgsIfNeed() + '    ' + this.methodImpl()
             result += '  }'
             return result
@@ -288,7 +288,7 @@ export class DNMethodContext extends DNContext {
                 nullableArgs.push(element)
             } else {
                 var argType = element.isOutParam ? 'NSObjectRef<' + element.type + '>' : element.type
-                var arg = element.isBlock ? argType : this.convertMutableTypeIfNeed(argType) + ' ' + element.name
+                var arg = element.isBlock ? argType : convertMutableTypeIfNeed(argType) + ' ' + element.name
                 argList += arg + (index == this.args.length - 1 && nullableArgs.length == 0 ? '' : ', ')
             }
         })
@@ -297,7 +297,7 @@ export class DNMethodContext extends DNContext {
             argList += '{'
             nullableArgs.forEach((element, index) => {
                 var argType = element.isOutParam ? 'NSObjectRef<' + element.type + '>' : element.type
-                var arg = element.isBlock ? argType : this.convertMutableTypeIfNeed(argType) + ' ' + element.name
+                var arg = element.isBlock ? argType : convertMutableTypeIfNeed(argType) + ' ' + element.name
                 argList += arg + (index == nullableArgs.length - 1 ? '' : ', ')
             })
             argList += '}'
@@ -319,13 +319,6 @@ export class DNMethodContext extends DNContext {
         return result
     }
 
-    convertMutableTypeIfNeed(type) {
-        var rawType = rawGenericType(type)
-        var dartType = DNObjectiveCTypeConverter.SupportMutableTypesMap[rawType]
-        var ret = dartType ? type.replace(rawType, dartType) : type
-        return ret
-    }
-
     ocMethodName() {
         var funcName = ''
         this.args.forEach((_element, index) => {
@@ -378,11 +371,11 @@ export class DNPropertyContext extends DNContext {
         }
         var annotation = '  ' + this.availability.map((a) => a.parse()).join(' ') + '\n'
         var isClassPrefix = (this.isClassProperty ? ' Class(\'' + this.parent.name + '\').' : ' ')
-
-        var get = annotation + '  ' + this.type + ' get ' + this.name + ' {\n' +
+        let convertedType = convertMutableTypeIfNeed(this.type)
+        var get = annotation + '  ' + convertedType + ' get ' + this.name + ' {\n' +
             this.handleGetter(isClassPrefix) + '\n}'
         if (!this.isReadOnly) {
-            var set = annotation + '  ' + 'set ' + this.name + '(' + this.type + ' ' + this.name + ')' +
+            var set = annotation + '  ' + 'set ' + this.name + '(' + convertedType + ' ' + this.name + ')' +
                 ' =>' + isClassPrefix + 'perform(SEL(\'set' + this.name.replace(/^\w/, c => c.toUpperCase()) + ':\'), args: [' + this.name + ']);'
         }
         return get + '\n' + set