@cloudbase/cals 0.5.12-aplph.1 → 0.5.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/lib/parser/cals/utils/code/index.js +2 -2
  2. package/lib/utils/dts/auto-generated.d.ts +1 -1
  3. package/lib/utils/dts/auto-generated.d.ts.map +1 -1
  4. package/lib/utils/dts/auto-generated.js +67 -239
  5. package/lib/utils/dts/build.js +13 -37
  6. package/lib/utils/dts/index.d.ts +0 -5
  7. package/lib/utils/dts/index.d.ts.map +1 -1
  8. package/lib/utils/dts/index.js +3 -30
  9. package/package.json +2 -2
package/lib/parser/cals/utils/code/index.js CHANGED
@@ -38,8 +38,8 @@ function calsToCode(calsJSON, version = 'v1') {
38
38
  * 生成 page-config.json
39
39
  */
40
40
  // 来自 IPageComponent
41
- // :class, :style, component, dataVariables, directives, id, listeners, module, type 忽略，所以这里不包含
42
- const pageConfigFields = ['attributes', 'dataset', 'extra', 'label', 'name'];
41
+ // :class, :style, component, dataVariables, directives, id, module, type 忽略，所以这里不包含
42
+ const pageConfigFields = ['attributes', 'dataset', 'extra', 'label', 'name', 'listeners'];
43
43
  genConfig(pageItem, pageConfigFields, `${pagePath}/page-config.json`);
44
44
  /**
45
45
  * 生成 page.json
package/lib/utils/dts/auto-generated.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const wedaDTS = "declare class UserWidget {\n // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n // \u5185\u7F6E\u547D\u540D\u7A7A\u95F4\n // get sys(): {\n // readonly id: string;\n // readonly module: string;\n // readonly component: string;\n // readonly parent: UserWidget;\n // readonly children: UserWidget[];\n\n // closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n // };\n\n // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n // \u81EA\u5B9A\u4E49\u547D\u540D\u7A7A\u95F4\n // get custom(): { [key: string]: any };\n\n // ========== \u5FEB\u6377\u8BBF\u95EE\u65B9\u5F0F ========== //\n\n /**\n * \u7EC4\u4EF6 id\n */\n readonly id: string;\n /**\n * \u7EC4\u4EF6\u5E93\u540D\u79F0\n */\n readonly module: string;\n /**\n * \u7EC4\u4EF6\u540D\u79F0\n */\n readonly component: string;\n // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n // readonly parent: UserWidget;\n // readonly children: UserWidget[];\n\n // closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n}\n\n// Used Components Inner Begin\n// Used Components - Don't touch me\n// Used Components Inner End\n\ndeclare namespace $app {\n namespace dataset {\n\n const state: {\n // Global State Inner Begin\n // Global State \u5168\u5C40\u53D8\u91CF - Don't touch me\n // Global State Inner End\n }\n\n }\n\n namespace utils {\n function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n }\n\n namespace common {\n // Global Common Inner Begin\n // Global Common \u5168\u5C40\u65B9\u6CD5 - Don't touch me\n // Global Common Inner End\n }\n\n // $w.auth\n interface CurrentUserInfo {\n userId?: string;\n phone?: string;\n type?: number;\n relatedRoles?: {\n id?: string;\n envId?: string;\n name?: string;\n roleIdentity?: string;\n }[];\n openId?: string;\n name?: string;\n nickName?: string;\n email?: string;\n mainOrg?: {\n id?: string;\n name?: string;\n };\n orgs?: {\n id?: string;\n name?: string;\n }[];\n}\n namespace auth {\n function getUserInfo(): CurrentUserInfo;\n const currentUser: CurrentUserInfo;\n}\n\n\n // \u8BBE\u7F6E\u72B6\u6001\n \n function setState(userSetState: Record<string, any>): void;\n \n\n \n interface navigatorOptions {\n packageName: string;\n pageId: string;\n data?: Record<string, any>;\n params?: Record<string, any>;\n events?: Record<string, (data: any) => void>;\n success(res: any);\n fail(res: any);\n complete(res: any);\n }\n\n interface navigateBackOptions {\n delta: number;\n }\n\n // \u663E\u793A\u63D0\u793A\n function showToast(options);\n\n // \u663E\u793A loading \u63D0\u793A\n function showLoading(options);\n\n // \u9690\u85CF loading \u63D0\u793A\n function hideLoading(options);\n\n // \u663E\u793A\u6A21\u6001\u63D0\u793A\n function showModal(options);\n\n // \u62E8\u6253\u7535\u8BDD\n function callPhone(options);\n\n // sacnCode\n function scanCode(options: {\n onlyFromCamera?: boolean;\n enableDefaultBehavior?: boolean;\n scanType?: ('barCode' | 'qrCode')[];\n success?: (res: { result: string; scanType: string }) => void;\n fail?: (err: Error) => void;\n complete?: () => void;\n }): Promise<ScanCodeResult> | ScanCodeResult;\n\n // \u7279\u5236\u8DEF\u7531\n function navigateTo(options: navigatorOptions);\n\n function redirectTo(options: navigatorOptions);\n\n function reLaunch(options: navigatorOptions);\n\n function relaunchHome();\n\n function navigateBack(options: navigateBackOptions);\n\n \n}\n\ndeclare const app = $app\n\n\ndeclare namespace $w {\n function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n\n // used widgets Inner Begin\n // used widgets - Don't touch me\n // used widgets Inner End\n\n // repeater scope Inner Begin\n // repeater scope - Don't touch me\n // repeater scope Inner End\n\n // $w.app\n namespace app {\n namespace dataset {\n const state: {\n // wGlobal State Inner Begin\n // Global State \u5168\u5C40\u53D8\u91CF - Don't touch me\n // wGlobal State Inner End\n };\n }\n\n namespace common {\n // wGlobal Common Inner Begin\n // Global Common \u5168\u5C40\u65B9\u6CD5 - Don't touch me\n // wGlobal Common Inner End\n }\n\n function setState(data: Object): void;\n}\n\n\n // $w.page\n namespace page {\n const id: string;\n\n namespace dataset {\n const state: {\n // wPage State Inner Begin\n // Page State \u9875\u9762\u53D8\u91CF - Don't touch me\n // wPage State Inner End\n }\n const params: {\n // wPage Param Inner Begin\n // Page Param \u9875\u9762\u53C2\u6570 - Don't touch me\n // wPage Param Inner End\n }\n }\n namespace handler {\n // wPage Handler Inner Begin\n // Page Handler \u9875\u9762\u65B9\u6CD5 - Don't touch me\n // wPage Handler Inner End\n }\n\n // ============ setState API Inner Begin ============\n function setState(userSetState: Record<string, any>): void;\n // ============ setState API Inner Begin ============\n}\n\n\n // $w.auth\n interface CurrentUserInfo {\n userId?: string;\n phone?: string;\n type?: number;\n relatedRoles?: {\n id?: string;\n envId?: string;\n name?: string;\n roleIdentity?: string;\n }[];\n openId?: string;\n name?: string;\n nickName?: string;\n email?: string;\n mainOrg?: {\n id?: string;\n name?: string;\n };\n orgs?: {\n id?: string;\n name?: string;\n }[];\n}\n namespace auth {\n function getUserInfo(): CurrentUserInfo;\n const currentUser: CurrentUserInfo;\n}\n\n\n // $w.cloud\n interface ICallDataSourceParams {\n dataSourceName: string;\n methodName: string;\n params: Object;\n}\ninterface ICallFunctionParams {\n name: string;\n data?: any;\n}\ninterface IParseOptions {\n unwrapResult?: boolean;\n parseBusinessInfo?: boolean;\n}\ninterface ICallWorkflowParams {\n action: string;\n data?: Record<string, any>;\n capitalizeDataKey?: boolean;\n}\n namespace cloud {\n function callDataSource(params: ICallDataSourceParams): any;\n function getTempFileURL(params: string | string[]): Promise<string | string[]>;\n function callWorkflow(action: ICallWorkflowParams): Promise<any>;\n function callFunction(params: ICallFunctionParams, parseOptions?: IParseOptions): Promise<any>;\n function getCloudInstance(): Promise<CloudInstance>;\n}\n\n\n // $w.utils\n namespace utils {\n // ============ utils API Inner Begin ============\n interface navigatorOptions {\n packageName: string;\n pageId: string;\n data?: Record<string, any>;\n params?: Record<string, any>;\n events?: Record<string, (data: any) => void>;\n success(res: any);\n fail(res: any);\n complete(res: any);\n }\n\n interface navigateBackOptions {\n delta: number;\n }\n\n // \u663E\u793A\u63D0\u793A\n function showToast(options);\n\n // \u663E\u793A loading \u63D0\u793A\n function showLoading(options);\n\n // \u9690\u85CF loading \u63D0\u793A\n function hideLoading(options);\n\n // \u663E\u793A\u6A21\u6001\u63D0\u793A\n function showModal(options);\n\n // \u62E8\u6253\u7535\u8BDD\n function callPhone(options);\n\n // sacnCode\n function scanCode(options: {\n onlyFromCamera?: boolean;\n enableDefaultBehavior?: boolean;\n scanType?: ('barCode' | 'qrCode')[];\n success?: (res: { result: string; scanType: string }) => void;\n fail?: (err: Error) => void;\n complete?: () => void;\n }): Promise<ScanCodeResult> | ScanCodeResult;\n\n // \u7279\u5236\u8DEF\u7531\n function navigateTo(options: navigatorOptions);\n\n function redirectTo(options: navigatorOptions);\n\n function reLaunch(options: navigatorOptions);\n\n function relaunchHome();\n\n function navigateBack(options: navigateBackOptions);\n\n // ============ utils API Inner Begin ============\n}\n\n\n}\n\n// Global For Begin\ndeclare const $for: {\n // Global For Inner Begin\n // For \u5FAA\u73AF\u53D8\u91CF - Don't touch me\n // Global For Inner End\n}\ndeclare const forItems = $for\n// Global For End\n\n// $page Begin\ndeclare namespace $page {\n namespace dataset {\n\n const state: {\n // Page State Inner Begin\n // Page State \u9875\u9762\u53D8\u91CF - Don't touch me\n // Page State Inner End\n }\n\n const params: {\n // Page Param Inner Begin\n // Page Param \u9875\u9762\u53C2\u6570 - Don't touch me\n // Page Param Inner End\n }\n\n }\n\n namespace handler {\n // Page Handler Inner Begin\n // Page Handler \u9875\u9762\u65B9\u6CD5 - Don't touch me\n // Page Handler Inner End\n }\n\n // \u8BBE\u7F6E\u72B6\u6001\n \n function setState(userSetState: Record<string, any>): void;\n \n}\n// $page End\n\n// $comp Begin\ndeclare namespace $comp {\n\n namespace props {\n\n const data: {\n // Comp Prop Data Inner Begin\n // Comp Prop Data \u7EC4\u4EF6\u5C5E\u6027 - Don't touch me\n // Comp Prop Data Inner End\n }\n\n namespace events {\n // Comp Prop Events Inner Begin\n // Comp Prop Events \u7EC4\u4EF6\u4E8B\u4EF6 - Don't touch me\n // Comp Prop Events Inner End\n }\n\n }\n\n namespace dataset {\n\n const state: {\n // Comp State Inner Begin\n // Comp State \u7EC4\u4EF6\u53D8\u91CF - Don't touch me\n // Comp State Inner End\n }\n\n }\n\n namespace handler {\n // Comp Handler Inner Begin\n // Comp Handler \u7EC4\u4EF6\u65B9\u6CD5 - Don't touch me\n // Comp Handler Inner End\n }\n\n}\n// $comp End\n\n// Global Formula Begin\n\ndeclare function ABS(num: number): number;\ndeclare function Min(...args: number[]): number;\ndeclare function Max(...args: number[]): number;\ndeclare function Average(...args: number[]): number;\ndeclare function Floor(num: number): number;\ndeclare function Ceiling(num: number): number;\ndeclare function Round(num: number): number;\ndeclare function Sum(...args: number[]): number;\ndeclare function Rand(num: number): number;\n\ndeclare function If(condition: boolean, val1: any, val2: any): any;\ndeclare function IsEmpty(text: string | string[]): boolean;\ndeclare function NotNull(val: any): boolean;\ndeclare function And(...args: boolean[]): boolean;\ndeclare function Or(...args: boolean[]): boolean;\n\ndeclare function Len(text: string): number;\ndeclare function Contains(text1: string, text2: string): boolean;\ndeclare function Split(text1: string, text2: string): string[];\ndeclare function Trim(text: string): string;\ndeclare function Upper(text: string): string;\ndeclare function Lower(text: string): string;\ndeclare function Concat(...text: string[]): string;\n\ndeclare function Now(): number;\ndeclare function Timestamp(arg: number | string | Date): number;\ndeclare function Second(arg: number | string | Date): number;\ndeclare function Minute(arg: number | string | Date): number;\ndeclare function Hour(arg: number | string | Date): number;\ndeclare function Day(arg: number | string | Date): number;\ndeclare function DayOfWeek(arg: number | string | Date): number;\ndeclare function Month(arg: number | string | Date): number;\ndeclare function Year(arg: number | string | Date): number;\ndeclare function GetDate(year: number, month: number, day: number): number;\ndeclare function DateTimeValue(arg: string, val: string): number;\ndeclare function Age(arg: number | string | Date, val: number | string | Date): number;\ndeclare function AgeOfNow(arg: number | string | Date): number;\ndeclare function DateAdd(arg: number | string | Date, day: number): number;\ndeclare function MonthAdd(arg: number | string | Date, month: number): number;\ndeclare function YearAdd(arg: number | string | Date, year: number): number;\ndeclare function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function DateText(createdTime: number | string | Date, text: string): string;\ndeclare function IsToday(date: number | string | Date): boolean;\n\n\n// Global Formula End\n";
1
+ export declare const wedaDTS = "\ndeclare class UserWidget {\n // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n // \u5185\u7F6E\u547D\u540D\u7A7A\u95F4\n // get sys(): {\n // readonly id: string;\n // readonly module: string;\n // readonly component: string;\n // readonly parent: UserWidget;\n // readonly children: UserWidget[];\n\n // closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n // };\n\n // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n // \u81EA\u5B9A\u4E49\u547D\u540D\u7A7A\u95F4\n // get custom(): { [key: string]: any };\n\n // ========== \u5FEB\u6377\u8BBF\u95EE\u65B9\u5F0F ========== //\n\n /**\n * \u7EC4\u4EF6 id\n */\n readonly id: string;\n /**\n * \u7EC4\u4EF6\u5E93\u540D\u79F0\n */\n readonly module: string;\n /**\n * \u7EC4\u4EF6\u540D\u79F0\n */\n readonly component: string;\n // FIXME: \u6682\u65F6\u4E0D\u5BF9\u5916\u66B4\u9732\n // readonly parent: UserWidget;\n // readonly children: UserWidget[];\n\n // closest(filter?: (parentWidget: UserWidget) => boolean): UserWidget | null;\n}\n\n// Used Components Inner Begin\n// Used Components - Don't touch me\n// Used Components Inner End\n\ndeclare namespace $app {\n namespace dataset {\n\n const state: {\n // Global State Inner Begin\n // Global State \u5168\u5C40\u53D8\u91CF - Don't touch me\n // Global State Inner End\n }\n\n }\n\n namespace utils {\n function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n }\n\n namespace common {\n // Global Common Inner Begin\n // Global Common \u5168\u5C40\u65B9\u6CD5 - Don't touch me\n // Global Common Inner End\n }\n\n namespace auth {\n const currentUser: {\n userId?: string\n phone?: string\n type?: number\n relatedRoles?: {\n id?: string\n envId?: string\n name?: string\n roleIdentity?: string\n }[]\n openId?: string\n name?: string\n nickName?: string\n email?: string\n mainOrg?: {\n id?: string\n name?: string\n }\n orgs?: {\n id?: string\n name?: string\n }[]\n}\n\n }\n\n \n\ninterface navigatorOptions {\n packageName: string;\n pageId: string;\n data?: Record<string, any>;\n params?: Record<string, any>;\n events?: Record<string, (data: any) => void>;\n success(res: any);\n fail(res: any);\n complete(res: any);\n}\n\ninterface navigateBackOptions {\n delta: number;\n}\n\n// \u8BBE\u7F6E\u72B6\u6001\nfunction setState(userSetState: Record<string, any>): void\n\n// \u7279\u5236\u8DEF\u7531\nfunction navigateTo(options: navigatorOptions)\nfunction redirectTo(options: navigatorOptions)\nfunction reLaunch(options: navigatorOptions)\nfunction navigateBack(options: navigateBackOptions)\n\n// \u663E\u793A\u63D0\u793A\nfunction showToast(options);\n\n// \u663E\u793A\u6A21\u6001\u63D0\u793A\nfunction showModal(options);\n\n// \u663E\u793A loading \u63D0\u793A\nfunction showLoading(options);\n\n// \u9690\u85CF loading \u63D0\u793A\nfunction hideLoading(options);\n\n// \u9690\u85CF\u63D0\u793A\nfunction hideToast(options);\n\n// sacnCode\nfunction scanCode(options: {\n onlyFromCamera?: boolean;\n enableDefaultBehavior?: boolean;\n scanType?: ('barCode' | 'qrCode')[];\n success?: (res: { result: string; scanType: string }) => void;\n fail?: (err: Error) => void;\n complete?: () => void;\n}): Promise<ScanCodeResult> | ScanCodeResult;\n\n\n}\n\ndeclare const app = $app\n\ndeclare namespace $w {\n function ABS(num: number): number;\n function Min(...args: number[]): number;\n function Max(...args: number[]): number;\n function Average(...args: number[]): number;\n function Floor(num: number): number;\n function Ceiling(num: number): number;\n function Round(num: number): number;\n function Sum(...args: number[]): number;\n function Rand(num: number): number;\n\n function If(condition: boolean, val1: any, val2: any): any;\n function IsEmpty(text: string | string[]): boolean;\n function NotNull(val: any): boolean;\n function And(...args: boolean[]): boolean;\n function Or(...args: boolean[]): boolean;\n\n function Len(text: string): number;\n function Contains(text1: string, text2: string): boolean;\n function Split(text1: string, text2: string): string[];\n function Trim(text: string): string;\n function Upper(text: string): string;\n function Lower(text: string): string;\n function Concat(...text: string[]): string;\n\n function Now(): number;\n function Timestamp(arg: number | string | Date): number;\n function Second(arg: number | string | Date): number;\n function Minute(arg: number | string | Date): number;\n function Hour(arg: number | string | Date): number;\n function Day(arg: number | string | Date): number;\n function DayOfWeek(arg: number | string | Date): number;\n function Month(arg: number | string | Date): number;\n function Year(arg: number | string | Date): number;\n function GetDate(year: number, month: number, day: number): number;\n function DateTimeValue(arg: string, val: string): number;\n function Age(arg: number | string | Date, val: number | string | Date): number;\n function AgeOfNow(arg: number | string | Date): number;\n function DateAdd(arg: number | string | Date, day: number): number;\n function MonthAdd(arg: number | string | Date, month: number): number;\n function YearAdd(arg: number | string | Date, year: number): number;\n function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\n function DateText(createdTime: number | string | Date, text: string): string;\n function IsToday(date: number | string | Date): boolean;\n\n\n // used widgets Inner Begin\n // used widgets - Don't touch me\n // used widgets Inner End\n\n // repeater scope Inner Begin\n // repeater scope - Don't touch me\n // repeater scope Inner End\n}\n\n// Global For Begin\ndeclare const $for: {\n // Global For Inner Begin\n // For \u5FAA\u73AF\u53D8\u91CF - Don't touch me\n // Global For Inner End\n}\ndeclare const forItems = $for\n// Global For End\n\n// $page Begin\ndeclare namespace $page {\n namespace dataset {\n\n const state: {\n // Page State Inner Begin\n // Page State \u9875\u9762\u53D8\u91CF - Don't touch me\n // Page State Inner End\n }\n\n const params: {\n // Page Param Inner Begin\n // Page Param \u9875\u9762\u53C2\u6570 - Don't touch me\n // Page Param Inner End\n }\n\n }\n\n namespace handler {\n // Page Handler Inner Begin\n // Page Handler \u9875\u9762\u65B9\u6CD5 - Don't touch me\n // Page Handler Inner End\n }\n\n \n\n// \u8BBE\u7F6E\u72B6\u6001\nfunction setState(userSetState: Record<string, any>): void\n\n\n}\n// $page End\n\n// $comp Begin\ndeclare namespace $comp {\n\n namespace props {\n\n const data: {\n // Comp Prop Data Inner Begin\n // Comp Prop Data \u7EC4\u4EF6\u5C5E\u6027 - Don't touch me\n // Comp Prop Data Inner End\n }\n\n namespace events {\n // Comp Prop Events Inner Begin\n // Comp Prop Events \u7EC4\u4EF6\u4E8B\u4EF6 - Don't touch me\n // Comp Prop Events Inner End\n }\n\n }\n\n namespace dataset {\n\n const state: {\n // Comp State Inner Begin\n // Comp State \u7EC4\u4EF6\u53D8\u91CF - Don't touch me\n // Comp State Inner End\n }\n\n }\n\n namespace handler {\n // Comp Handler Inner Begin\n // Comp Handler \u7EC4\u4EF6\u65B9\u6CD5 - Don't touch me\n // Comp Handler Inner End\n }\n\n}\n// $comp End\n\n// Global Formula Begin\n\ndeclare function ABS(num: number): number;\ndeclare function Min(...args: number[]): number;\ndeclare function Max(...args: number[]): number;\ndeclare function Average(...args: number[]): number;\ndeclare function Floor(num: number): number;\ndeclare function Ceiling(num: number): number;\ndeclare function Round(num: number): number;\ndeclare function Sum(...args: number[]): number;\ndeclare function Rand(num: number): number;\n\ndeclare function If(condition: boolean, val1: any, val2: any): any;\ndeclare function IsEmpty(text: string | string[]): boolean;\ndeclare function NotNull(val: any): boolean;\ndeclare function And(...args: boolean[]): boolean;\ndeclare function Or(...args: boolean[]): boolean;\n\ndeclare function Len(text: string): number;\ndeclare function Contains(text1: string, text2: string): boolean;\ndeclare function Split(text1: string, text2: string): string[];\ndeclare function Trim(text: string): string;\ndeclare function Upper(text: string): string;\ndeclare function Lower(text: string): string;\ndeclare function Concat(...text: string[]): string;\n\ndeclare function Now(): number;\ndeclare function Timestamp(arg: number | string | Date): number;\ndeclare function Second(arg: number | string | Date): number;\ndeclare function Minute(arg: number | string | Date): number;\ndeclare function Hour(arg: number | string | Date): number;\ndeclare function Day(arg: number | string | Date): number;\ndeclare function DayOfWeek(arg: number | string | Date): number;\ndeclare function Month(arg: number | string | Date): number;\ndeclare function Year(arg: number | string | Date): number;\ndeclare function GetDate(year: number, month: number, day: number): number;\ndeclare function DateTimeValue(arg: string, val: string): number;\ndeclare function Age(arg: number | string | Date, val: number | string | Date): number;\ndeclare function AgeOfNow(arg: number | string | Date): number;\ndeclare function DateAdd(arg: number | string | Date, day: number): number;\ndeclare function MonthAdd(arg: number | string | Date, month: number): number;\ndeclare function YearAdd(arg: number | string | Date, year: number): number;\ndeclare function DateDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function HourDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MinuteDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function SecondDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function MonthDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function YearDiff(startDay: number | string | Date, endDay: number | string | Date): number;\ndeclare function DateText(createdTime: number | string | Date, text: string): string;\ndeclare function IsToday(date: number | string | Date): boolean;\n\n\n// Global Formula End\n";
2
2
  //# sourceMappingURL=auto-generated.d.ts.map
package/lib/utils/dts/auto-generated.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auto-generated.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/auto-generated.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,muiBAgjBnB,CAAA"}
1
+ {"version":3,"file":"auto-generated.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/auto-generated.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,+maAoYnB,CAAA"}
package/lib/utils/dts/auto-generated.js CHANGED
@@ -1,7 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.wedaDTS = void 0;
4
- exports.wedaDTS = `declare class UserWidget {
4
+ exports.wedaDTS = `
5
+ declare class UserWidget {
5
6
  // FIXME: 暂时不对外暴露
6
7
  // 内置命名空间
7
8
  // get sys(): {
@@ -112,99 +113,89 @@ declare namespace $app {
112
113
  // Global Common Inner End
113
114
  }
114
115
 
115
- // $w.auth
116
- interface CurrentUserInfo {
117
- userId?: string;
118
- phone?: string;
119
- type?: number;
116
+ namespace auth {
117
+ const currentUser: {
118
+ userId?: string
119
+ phone?: string
120
+ type?: number
120
121
  relatedRoles?: {
121
- id?: string;
122
- envId?: string;
123
- name?: string;
124
- roleIdentity?: string;
125
- }[];
126
- openId?: string;
127
- name?: string;
128
- nickName?: string;
129
- email?: string;
122
+ id?: string
123
+ envId?: string
124
+ name?: string
125
+ roleIdentity?: string
126
+ }[]
127
+ openId?: string
128
+ name?: string
129
+ nickName?: string
130
+ email?: string
130
131
  mainOrg?: {
131
- id?: string;
132
- name?: string;
133
- };
132
+ id?: string
133
+ name?: string
134
+ }
134
135
  orgs?: {
135
- id?: string;
136
- name?: string;
137
- }[];
138
- }
139
- namespace auth {
140
- function getUserInfo(): CurrentUserInfo;
141
- const currentUser: CurrentUserInfo;
136
+ id?: string
137
+ name?: string
138
+ }[]
142
139
  }
143
140
 
144
-
145
- // 设置状态
146
-
147
- function setState(userSetState: Record<string, any>): void;
148
-
149
-
150
-
151
- interface navigatorOptions {
152
- packageName: string;
153
- pageId: string;
154
- data?: Record<string, any>;
155
- params?: Record<string, any>;
156
- events?: Record<string, (data: any) => void>;
157
- success(res: any);
158
- fail(res: any);
159
- complete(res: any);
160
141
  }
161
142
 
162
- interface navigateBackOptions {
163
- delta: number;
164
- }
143
+
165
144
 
166
- // 显示提示
167
- function showToast(options);
145
+ interface navigatorOptions {
146
+ packageName: string;
147
+ pageId: string;
148
+ data?: Record<string, any>;
149
+ params?: Record<string, any>;
150
+ events?: Record<string, (data: any) => void>;
151
+ success(res: any);
152
+ fail(res: any);
153
+ complete(res: any);
154
+ }
168
155
 
169
- // 显示 loading 提示
170
- function showLoading(options);
156
+ interface navigateBackOptions {
157
+ delta: number;
158
+ }
171
159
 
172
- // 隐藏 loading 提示
173
- function hideLoading(options);
160
+ // 设置状态
161
+ function setState(userSetState: Record<string, any>): void
174
162
 
175
- // 显示模态提示
176
- function showModal(options);
163
+ // 特制路由
164
+ function navigateTo(options: navigatorOptions)
165
+ function redirectTo(options: navigatorOptions)
166
+ function reLaunch(options: navigatorOptions)
167
+ function navigateBack(options: navigateBackOptions)
177
168
 
178
- // 拨打电话
179
- function callPhone(options);
169
+ // 显示提示
170
+ function showToast(options);
180
171
 
181
- // sacnCode
182
- function scanCode(options: {
183
- onlyFromCamera?: boolean;
184
- enableDefaultBehavior?: boolean;
185
- scanType?: ('barCode' | 'qrCode')[];
186
- success?: (res: { result: string; scanType: string }) => void;
187
- fail?: (err: Error) => void;
188
- complete?: () => void;
189
- }): Promise<ScanCodeResult> | ScanCodeResult;
172
+ // 显示模态提示
173
+ function showModal(options);
190
174
 
191
- // 特制路由
192
- function navigateTo(options: navigatorOptions);
175
+ // 显示 loading 提示
176
+ function showLoading(options);
193
177
 
194
- function redirectTo(options: navigatorOptions);
178
+ // 隐藏 loading 提示
179
+ function hideLoading(options);
195
180
 
196
- function reLaunch(options: navigatorOptions);
181
+ // 隐藏提示
182
+ function hideToast(options);
197
183
 
198
- function relaunchHome();
184
+ // sacnCode
185
+ function scanCode(options: {
186
+ onlyFromCamera?: boolean;
187
+ enableDefaultBehavior?: boolean;
188
+ scanType?: ('barCode' | 'qrCode')[];
189
+ success?: (res: { result: string; scanType: string }) => void;
190
+ fail?: (err: Error) => void;
191
+ complete?: () => void;
192
+ }): Promise<ScanCodeResult> | ScanCodeResult;
199
193
 
200
- function navigateBack(options: navigateBackOptions);
201
194
 
202
-
203
195
  }
204
196
 
205
197
  declare const app = $app
206
198
 
207
-
208
199
  declare namespace $w {
209
200
  function ABS(num: number): number;
210
201
  function Min(...args: number[]): number;
@@ -263,171 +254,6 @@ declare namespace $w {
263
254
  // repeater scope Inner Begin
264
255
  // repeater scope - Don't touch me
265
256
  // repeater scope Inner End
266
-
267
- // $w.app
268
- namespace app {
269
- namespace dataset {
270
- const state: {
271
- // wGlobal State Inner Begin
272
- // Global State 全局变量 - Don't touch me
273
- // wGlobal State Inner End
274
- };
275
- }
276
-
277
- namespace common {
278
- // wGlobal Common Inner Begin
279
- // Global Common 全局方法 - Don't touch me
280
- // wGlobal Common Inner End
281
- }
282
-
283
- function setState(data: Object): void;
284
- }
285
-
286
-
287
- // $w.page
288
- namespace page {
289
- const id: string;
290
-
291
- namespace dataset {
292
- const state: {
293
- // wPage State Inner Begin
294
- // Page State 页面变量 - Don't touch me
295
- // wPage State Inner End
296
- }
297
- const params: {
298
- // wPage Param Inner Begin
299
- // Page Param 页面参数 - Don't touch me
300
- // wPage Param Inner End
301
- }
302
- }
303
- namespace handler {
304
- // wPage Handler Inner Begin
305
- // Page Handler 页面方法 - Don't touch me
306
- // wPage Handler Inner End
307
- }
308
-
309
- // ============ setState API Inner Begin ============
310
- function setState(userSetState: Record<string, any>): void;
311
- // ============ setState API Inner Begin ============
312
- }
313
-
314
-
315
- // $w.auth
316
- interface CurrentUserInfo {
317
- userId?: string;
318
- phone?: string;
319
- type?: number;
320
- relatedRoles?: {
321
- id?: string;
322
- envId?: string;
323
- name?: string;
324
- roleIdentity?: string;
325
- }[];
326
- openId?: string;
327
- name?: string;
328
- nickName?: string;
329
- email?: string;
330
- mainOrg?: {
331
- id?: string;
332
- name?: string;
333
- };
334
- orgs?: {
335
- id?: string;
336
- name?: string;
337
- }[];
338
- }
339
- namespace auth {
340
- function getUserInfo(): CurrentUserInfo;
341
- const currentUser: CurrentUserInfo;
342
- }
343
-
344
-
345
- // $w.cloud
346
- interface ICallDataSourceParams {
347
- dataSourceName: string;
348
- methodName: string;
349
- params: Object;
350
- }
351
- interface ICallFunctionParams {
352
- name: string;
353
- data?: any;
354
- }
355
- interface IParseOptions {
356
- unwrapResult?: boolean;
357
- parseBusinessInfo?: boolean;
358
- }
359
- interface ICallWorkflowParams {
360
- action: string;
361
- data?: Record<string, any>;
362
- capitalizeDataKey?: boolean;
363
- }
364
- namespace cloud {
365
- function callDataSource(params: ICallDataSourceParams): any;
366
- function getTempFileURL(params: string | string[]): Promise<string | string[]>;
367
- function callWorkflow(action: ICallWorkflowParams): Promise<any>;
368
- function callFunction(params: ICallFunctionParams, parseOptions?: IParseOptions): Promise<any>;
369
- function getCloudInstance(): Promise<CloudInstance>;
370
- }
371
-
372
-
373
- // $w.utils
374
- namespace utils {
375
- // ============ utils API Inner Begin ============
376
- interface navigatorOptions {
377
- packageName: string;
378
- pageId: string;
379
- data?: Record<string, any>;
380
- params?: Record<string, any>;
381
- events?: Record<string, (data: any) => void>;
382
- success(res: any);
383
- fail(res: any);
384
- complete(res: any);
385
- }
386
-
387
- interface navigateBackOptions {
388
- delta: number;
389
- }
390
-
391
- // 显示提示
392
- function showToast(options);
393
-
394
- // 显示 loading 提示
395
- function showLoading(options);
396
-
397
- // 隐藏 loading 提示
398
- function hideLoading(options);
399
-
400
- // 显示模态提示
401
- function showModal(options);
402
-
403
- // 拨打电话
404
- function callPhone(options);
405
-
406
- // sacnCode
407
- function scanCode(options: {
408
- onlyFromCamera?: boolean;
409
- enableDefaultBehavior?: boolean;
410
- scanType?: ('barCode' | 'qrCode')[];
411
- success?: (res: { result: string; scanType: string }) => void;
412
- fail?: (err: Error) => void;
413
- complete?: () => void;
414
- }): Promise<ScanCodeResult> | ScanCodeResult;
415
-
416
- // 特制路由
417
- function navigateTo(options: navigatorOptions);
418
-
419
- function redirectTo(options: navigatorOptions);
420
-
421
- function reLaunch(options: navigatorOptions);
422
-
423
- function relaunchHome();
424
-
425
- function navigateBack(options: navigateBackOptions);
426
-
427
- // ============ utils API Inner Begin ============
428
- }
429
-
430
-
431
257
  }
432
258
 
433
259
  // Global For Begin
@@ -463,10 +289,12 @@ declare namespace $page {
463
289
  // Page Handler Inner End
464
290
  }
465
291
 
466
- // 设置状态
467
-
468
- function setState(userSetState: Record<string, any>): void;
469
292
 
293
+
294
+ // 设置状态
295
+ function setState(userSetState: Record<string, any>): void
296
+
297
+
470
298
  }
471
299
  // $page End
472
300
 
package/lib/utils/dts/build.js CHANGED
@@ -56,25 +56,13 @@ function genWeDaAPPDTS() {
56
56
  * 获取所有的 DTS
57
57
  */
58
58
  const wedaFrameworkDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-framework.d.ts'), 'utf8'); // 低码框架
59
- // const wedaAPIDTS = await fs.readFile(path.resolve(__dirname, 'framework', 'weda-api.d.ts'), 'utf8') // 低码 API
60
- const wedaAppDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-app.d.ts'), 'utf-8'); // app对象
61
- const wedaPageDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-page.d.ts'), 'utf-8'); // page对象
62
- const wedaAuthDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), 'utf8'); // auth对象
63
- const wedaCloudDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-cloud.d.ts'), 'utf-8'); // cloud对象
64
- const wedaUtilsDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-utils.d.ts'), 'utf-8'); // page对象
59
+ const wedaAPIDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-api.d.ts'), 'utf8'); // 低码 API
60
+ const wedaAuthDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), 'utf8'); // Auth 信息
65
61
  const formulaDTS = yield buildFormulaDTS(); // 函数公式
66
62
  /**
67
63
  * 聚合 DTS
68
64
  */
69
- const wedaDTS = groupDTSs({
70
- wedaFrameworkDTS,
71
- wedaAppDTS,
72
- wedaPageDTS,
73
- wedaAuthDTS,
74
- wedaCloudDTS,
75
- wedaUtilsDTS,
76
- formulaDTS,
77
- });
65
+ const wedaDTS = groupDTSs({ wedaFrameworkDTS, wedaAPIDTS, wedaAuthDTS, formulaDTS });
78
66
  /**
79
67
  * 将聚合结果保存在 auto-generated.ts
80
68
  */
@@ -85,30 +73,21 @@ function genWeDaAPPDTS() {
85
73
  /**
86
74
  * 聚合所有的 DTS（不包括动态生成的）
87
75
  */
88
- function groupDTSs({ wedaFrameworkDTS = '', wedaAppDTS = '', wedaPageDTS = '', wedaAuthDTS = '', wedaCloudDTS = '', wedaUtilsDTS = '', formulaDTS = '', }) {
76
+ function groupDTSs({ wedaFrameworkDTS = '', wedaAPIDTS = '', wedaAuthDTS = '', formulaDTS = '' }) {
89
77
  let resultDts = wedaFrameworkDTS;
90
- // $w.app
91
- resultDts = resultDts.replaceAll("// $w.app - Don't touch me", wedaAppDTS.replace(/declare/g, ''));
92
- // $w.page
93
- resultDts = resultDts.replaceAll("// $w.page - Don't touch me", wedaPageDTS.replace(/declare/g, ''));
94
- // $w.auth
95
- resultDts = resultDts.replaceAll("// $w.auth - Don't touch me", wedaAuthDTS.replace(/declare/g, ''));
96
- // $w.cloud
97
- resultDts = resultDts.replaceAll("// $w.cloud - Don't touch me", wedaCloudDTS.replace(/declare/g, ''));
98
- // $w.utils
99
- resultDts = resultDts.replaceAll("// $w.utils - Don't touch me", wedaUtilsDTS.replace(/declare/g, ''));
100
78
  // 函数公式：$app.utils.xxx
101
- resultDts = resultDts.replaceAll("// Formula 函数公式 - Don't touch me", formulaDTS.replace(/export/g, ''));
79
+ resultDts = resultDts.replace("// Formula 函数公式 - Don't touch me", formulaDTS.replace(/export/g, ''));
102
80
  // 函数公式：全局变量提示
103
81
  resultDts = resultDts.replace("// Global Formula 全局函数公式- Don't touch me", formulaDTS.replace(/export/g, 'declare'));
104
82
  // 函数公式：$w.xxx
105
83
  resultDts = resultDts.replace("// $w global APIs - Don't touch me", formulaDTS.replace(/export/g, ''));
106
- // 添加$app.setState、$app.navigateTo等
107
- const utilsAPI = wedaUtilsDTS.replace(/[\s\S]*\/\/ ============ utils API Inner Begin ============([\s\S]*?)\/\/ ============ utils API Inner Begin ============[\s\S]*/, '$1');
108
- resultDts = resultDts.replace("// utils API - Don't touch me", utilsAPI);
109
- // 添加setState API
110
- const setStateAPI = wedaPageDTS.replace(/[\s\S]*\/\/ ============ setState API Inner Begin ============([\s\S]*?)\/\/ ============ setState API Inner Begin ============[\s\S]*/, '$1');
111
- resultDts = resultDts.replaceAll("// setState API - Don't touch me", setStateAPI);
84
+ // 增加 API
85
+ const appAPIDTS = wedaAPIDTS.replace(/[\s\S]*\/\/ ============ App API Begin ============ \/\/([\s\S]*?)\/\/ ============ App API End ============ \/\/[\s\S]*/, '$1');
86
+ resultDts = resultDts.replace("// App API - Don't touch me", appAPIDTS);
87
+ const pageAPIDTS = wedaAPIDTS.replace(/[\s\S]*\/\/ ============ Page API Begin ============ \/\/([\s\S]*?)\/\/ ============ Page API End ============ \/\/[\s\S]*/, '$1');
88
+ resultDts = resultDts.replace("// Page API - Don't touch me", pageAPIDTS);
89
+ // 增加 Auth 信息
90
+ resultDts = resultDts.replace("// Auth 认证 - Don't touch me", wedaAuthDTS);
112
91
  return resultDts;
113
92
  }
114
93
  function main() {
@@ -118,11 +97,8 @@ function main() {
118
97
  if (watchArgv === '--watch') {
119
98
  console.log('Start watching mode');
120
99
  (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-framework.d.ts'), genWeDaAPPDTS);
121
- (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-app.d.ts'), genWeDaAPPDTS);
122
- (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-page.d.ts'), genWeDaAPPDTS);
100
+ (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-api.d.ts'), genWeDaAPPDTS);
123
101
  (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), genWeDaAPPDTS);
124
- (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-cloud.d.ts'), genWeDaAPPDTS);
125
- (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-utils.d.ts'), genWeDaAPPDTS);
126
102
  }
127
103
  });
128
104
  }
package/lib/utils/dts/index.d.ts CHANGED
@@ -31,17 +31,12 @@ export interface IOptions {
31
31
  }
32
32
  export declare enum IInputDataType {
33
33
  globalState = "globalState",
34
- wGlobalState = "wGlobalState",
35
34
  pageState = "pageState",
36
- wPageState = "wPageState",
37
35
  compState = "compState",
38
36
  pageParams = "pageParams",
39
- wPageParams = "wPageParams",
40
37
  forState = "forState",
41
38
  globalCommonCodes = "globalCommonCodes",
42
- wGlobalCommonCodes = "wGlobalCommonCodes",
43
39
  pageHandlerCodes = "pageHandlerCodes",
44
- wPageHandlerCodes = "wPageHandlerCodes",
45
40
  compHandlerCodes = "compHandlerCodes",
46
41
  compPropData = "compPropData",
47
42
  compPropEvents = "compPropEvents",
package/lib/utils/dts/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAG/D,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,iBAAiB,CAAA;IACpC,aAAa,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;QAAC,MAAM,CAAC,EAAE,cAAc,CAAA;KAAE,EAAE,CAAA;CACvF;AACD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB;AACD,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,EAAE,MAAM,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,QAAQ,EAAE,cAAc,CAAA;CACzB;AAED,MAAM,WAAW,QAAQ;IAEvB,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAE3B,aAAa,CAAC,EAAE,OAAO,CAAA;IAEvB,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B;AAED,oBAAY,cAAc;IACxB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,iBAAiB,sBAAsB;IACvC,gBAAgB,qBAAqB;IACrC,gBAAgB,qBAAqB;IACrC,YAAY,iBAAiB;IAC7B,cAAc,mBAAmB;IACjC,cAAc,mBAAmB;IACjC,WAAW,gBAAgB;IAC3B,aAAa,kBAAkB;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,EAAE,iBAAiB,CAAA;IAChD,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAA;IAC9C,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAA;IAC9C,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,EAAE,iBAAiB,CAAA;IAC/C,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,iBAAiB,CAAA;IAC7C,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,EAAE,YAAY,EAAE,CAAA;IACnD,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE,YAAY,EAAE,CAAA;IAClD,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,EAAE,YAAY,EAAE,CAAA;IAClD,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAA;IACjD,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAA;IAC1C,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,EAAE,wBAAwB,EAAE,CAAA;IAC5D,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAA;IACrD,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,EAAE,sBAAsB,EAAE,CAAA;CAC1D;AAkCD;;;GAGG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAa;IAEhC;;OAEG;WACU,SAAS,CAAC,SAAS,GAAE,UAAe,EAAE,OAAO,GAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAyB;IAIhH;;OAEG;WACU,gBAAgB,CAAC,SAAS,EAAE,iBAAiB,GAAG,YAAY,EAAE,GAAG,MAAM,EAAE,GAAG,wBAAwB,EAAE,GAAG,oBAAoB,EAAE,GAAG,sBAAsB,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,GAAE;QAAE,eAAe,EAAE,OAAO,CAAA;KAA+B;IAYrQ,MAAM,CAAC,MAAM,CAAC,OAAO,GAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAgF;CAanI;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,GAAE,UAAe,EAAE,OAAO,GAAE,QAA0G,GAAG,OAAO,CAAC,MAAM,CAAC,CAyCzM;AAgKD,eAAO,MAAM,UAAU,6yDA8DtB,CAAA;AAyDD;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO5D;AAID,eAAO,MAAM,mBAAmB,+tBAmB/B,CAAA;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,KAAA,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ5D"}
package/lib/utils/dts/index.js CHANGED
@@ -14,17 +14,12 @@ const auto_generated_1 = require("./auto-generated");
14
14
  var IInputDataType;
15
15
  (function (IInputDataType) {
16
16
  IInputDataType["globalState"] = "globalState";
17
- IInputDataType["wGlobalState"] = "wGlobalState";
18
17
  IInputDataType["pageState"] = "pageState";
19
- IInputDataType["wPageState"] = "wPageState";
20
18
  IInputDataType["compState"] = "compState";
21
19
  IInputDataType["pageParams"] = "pageParams";
22
- IInputDataType["wPageParams"] = "wPageParams";
23
20
  IInputDataType["forState"] = "forState";
24
21
  IInputDataType["globalCommonCodes"] = "globalCommonCodes";
25
- IInputDataType["wGlobalCommonCodes"] = "wGlobalCommonCodes";
26
22
  IInputDataType["pageHandlerCodes"] = "pageHandlerCodes";
27
- IInputDataType["wPageHandlerCodes"] = "wPageHandlerCodes";
28
23
  IInputDataType["compHandlerCodes"] = "compHandlerCodes";
29
24
  IInputDataType["compPropData"] = "compPropData";
30
25
  IInputDataType["compPropEvents"] = "compPropEvents";
@@ -49,17 +44,12 @@ const DtsPlaceholder = {
49
44
  };
50
45
  const DtsInnerSign = {
51
46
  [IInputDataType.globalState]: "Global State Inner",
52
- [IInputDataType.wGlobalState]: "wGlobal State Inner",
53
47
  [IInputDataType.pageState]: "Page State Inner",
54
- [IInputDataType.wPageState]: "wPage State Inner",
55
48
  [IInputDataType.compState]: "Comp State Inner",
56
49
  [IInputDataType.pageParams]: "Page Param Inner",
57
- [IInputDataType.wPageParams]: "wPage Param Inner",
58
50
  [IInputDataType.forState]: "Global For Inner",
59
51
  [IInputDataType.globalCommonCodes]: "Global Common Inner",
60
- [IInputDataType.wGlobalCommonCodes]: "wGlobal Common Inner",
61
52
  [IInputDataType.pageHandlerCodes]: "Page Handler Inner",
62
- [IInputDataType.wPageHandlerCodes]: "wPage Handler Inner",
63
53
  [IInputDataType.compHandlerCodes]: "Comp Handler Inner",
64
54
  [IInputDataType.compPropData]: "Comp Prop Data Inner",
65
55
  [IInputDataType.compPropEvents]: "Comp Prop Events Inner",
@@ -86,30 +76,13 @@ class WeDaDTS {
86
76
  static updateDTSPartial(inputData, itemType, options = { setEmptyIfError: false }) {
87
77
  return __awaiter(this, void 0, void 0, function* () {
88
78
  let dts = '';
89
- // 必须区分$w下的和$page、$app下的，否则replace Inner Begin和Inner End的时候会有问题
90
- const DTSMap = {
91
- [DtsInnerSign[IInputDataType.globalState]]: DtsInnerSign[IInputDataType.wGlobalState],
92
- [DtsInnerSign[IInputDataType.pageState]]: DtsInnerSign[IInputDataType.wPageState],
93
- [DtsInnerSign[IInputDataType.pageParams]]: DtsInnerSign[IInputDataType.wPageParams],
94
- [DtsInnerSign[IInputDataType.globalCommonCodes]]: DtsInnerSign[IInputDataType.wGlobalCommonCodes],
95
- [DtsInnerSign[IInputDataType.pageHandlerCodes]]: DtsInnerSign[IInputDataType.wPageHandlerCodes],
96
- };
97
- const reg = new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm');
98
79
  try {
99
80
  dts = yield _generateOneItemDTS(inputData, itemType);
100
- WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
101
- if (DTSMap[DtsInnerSign[itemType]]) {
102
- const reg = new RegExp(`^(\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} End)`, 'm');
103
- WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
104
- }
81
+ WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
105
82
  }
106
83
  catch (e) {
107
84
  if (options.setEmptyIfError) {
108
- WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
109
- if (DTSMap[DtsInnerSign[itemType]]) {
110
- const reg = new RegExp(`^(\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} End)`, 'm');
111
- WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
112
- }
85
+ WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
113
86
  }
114
87
  }
115
88
  });
@@ -142,7 +115,7 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
142
115
  // 防止某项错误导致全部都错误
143
116
  try {
144
117
  const dts = yield _generateOneItemDTS(inputData[key], key);
145
- resultDts = resultDts.replaceAll(placeholder, dts + placeholder);
118
+ resultDts = resultDts.replace(placeholder, dts + placeholder);
146
119
  }
147
120
  catch (e) {
148
121
  console.error(e);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/cals",
3
- "version": "0.5.12-aplph.1",
3
+ "version": "0.5.12",
4
4
  "description": "Common application specifications",
5
5
  "main": "lib/utils/index.js",
6
6
  "source": "src/utils/index.ts",
@@ -53,4 +53,4 @@
53
53
  "typescript": "^4.7.4",
54
54
  "typescript-json-schema": "^0.53.0"
55
55
  }
56
- }
56
+ }