Skip to content

Commit b2023bb

Browse files
committed
fix(core): handle properties types
1 parent b801799 commit b2023bb

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

inspect-extension/components/options/basic01.mpx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</view>
77
<view wx:class="list" bindtap="onClick">
88
<view> parentText: {{ parentText }} </view>
9+
<view> parentObj: {{ parentObj.a.b.c }} </view>
910
<view> msg: {{ msg }} </view>
1011
<view> obj: {{ obj.a + obj.b }} </view>
1112
<view> content: {{ content }} </view>
@@ -27,6 +28,10 @@ createComponent({
2728
parentText: {
2829
type: String,
2930
value: 'parent text',
31+
},
32+
parentObj: {
33+
type: Object,
34+
value: {},
3035
}
3136
},
3237
data: {
@@ -55,7 +60,8 @@ createComponent({
5560
},
5661
methods: {
5762
onClick() {
58-
console.log('click', this.titleRef, this.content, this.$forceUpdate())
63+
console.log('click', this.titleRef, this.content, this.$forceUpdate)
64+
console.log('---> debug', this.parentObj)
5965
this.count++
6066
}
6167
},

packages/language-core/src/codegen/globalTypes/defineComponentTypes.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,15 @@ interface WatchField {
115115
type GetPropsType<T extends Properties> = {
116116
readonly [K in keyof T]: T[K] extends FullPropType<infer V>
117117
? V
118-
: T[K] extends PropType<infer V>
118+
: T[K] extends import('@mpxjs/core').PropType<infer V>
119119
? V
120120
: WechatMiniprogram.Component.PropertyToData<T[K]>
121121
}
122122
type FullPropType<T> = {
123-
type: PropType<T>
123+
type: import('@mpxjs/core').PropType<T>
124124
value?: T
125125
optionalTypes?: WechatMiniprogram.Component.ShortProperty[]
126126
}
127-
type PropType = import('${lib}').PropType
128127
type UnboxMixinField<T extends Mixin<{}, {}, {}, {}>, F> = F extends keyof T ? T[F] : {}
129128
type UnboxMixinsField<Mi extends Array<any>, F> = UnionToIntersection<
130129
RequiredPropertiesForUnion<UnboxMixinField<ArrayType<Mi>, F>>

packages/language-core/src/codegen/template/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export function* generateTemplate(
5858
['$t', '(key: string, values?: I18nValues) => string'],
5959
['$tc', '(key: string, choice: number, values?: I18nValues) => string'],
6060
['$te', '(key: string) => boolean'],
61-
['$tm', '(key: string): any'],
61+
['$tm', '(key: string) => any'],
6262
]
6363

6464
yield `var __MPX_dollars!: {${newLine}`

0 commit comments

Comments
 (0)