@dcloudio/uni-app-x 0.5.16 → 0.6.0

package/options.d.ts

@@ -0,0 +1,9 @@
+import app from '@/App.uvue'
+
+type App = typeof app
+declare global {
+
+  export interface AppCreateVueAppComponentDefault extends App {
+
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-x",
-  "version": "0.5.16",
+  "version": "0.6.0",
   "description": "uni-app x types",
   "typings": "index.d.ts",
   "author": "DCloud",
@@ -11,9 +11,10 @@
     "build:types:plugin:api": "node ./scripts/build-types.js -t uts-plugin-api",
     "build:types:plugin:component": "node ./scripts/build-types.js -t uts-plugin-component",
     "build:types:plugin:modules": "node ./scripts/build-types.js -t uts-plugin-modules",
-    "build:types:plugin": "npm run build:types:plugin:api  && npm run build:types:plugin:component",
+    "build:types:plugin": "npm run build:types:plugin:api  && npm run build:types:plugin:component && npm run build:types:plugin:modules",
     "build:types:meta": "node ./scripts/build-meta.js",
-    "build:types": "npm run build:types:core && npm run build:types:plugin"
+    "build:types:native": "node ./scripts/build-native.js",
+    "build:types": "build:types:native && npm run build:types:core && npm run build:types:plugin"
   },
   "devDependencies": {
     "delete": "^1.1.0",

package/types/app.d.ts

@@ -1,4 +1,26 @@
 /// <reference path='./common.d.ts' />
+import { ComputedOptions, EditorCreateVueAppComponent, MethodOptions, OptionsData, ComponentInternalInstance, EditorVueAppComponent, EditorComponentPublicInstance, DefineApp } from '@vue/runtime-core'
+
+/**
+ * Construct a type with a set of properties K of type T
+ */
+type Record<K extends keyof any, T> = {
+  [P in K]: T;
+};
+/**
+ * From T, pick a set of properties whose keys are in the union K
+ */
+type Pick<T, K extends keyof T> = {
+  [P in K]: T[P];
+};
+/**
+ * Exclude from T those types that are assignable to U
+ */
+type Exclude<T, U> = T extends U ? never : T;
+/**
+ * Construct a type with the properties of T except for those in type K.
+ */
+type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;
 
 interface ReferrerInfo {
   /**
@@ -132,8 +154,8 @@ interface PageNotFoundOption {
    */
   isEntryPage: boolean;
 }
-
-interface AppInstance<T extends AnyObject = {}> {
+type GlobalData = Record<string, any | null>
+interface UniAppOptions<G extends GlobalData = GlobalData> {
   /**
    * 全局对象
    * 文档：[https://uniapp.dcloud.io/collocation/App?id=globaldata](https://uniapp.dcloud.io/collocation/App?id=globaldata)
@@ -199,7 +221,7 @@ interface AppInstance<T extends AnyObject = {}> {
    *  }
    *}
    */
-  globalData?: AnyObject;
+  globalData?: G;
   /**
    * 生命周期回调 监听应用初始化
    *
@@ -549,160 +571,6 @@ interface AppInstance<T extends AnyObject = {}> {
    *}
    */
   onPageNotFound?(options: PageNotFoundOption): void;
-  /**
-   * 未处理的 Promise 拒绝事件监听函数
-   *
-   * @tutorial [https://uniapp.dcloud.io/collocation/frame/lifecycle](https://uniapp.dcloud.io/collocation/frame/lifecycle)
-   * @uniPlatform {
-   *  "app": {
-   *    "android": {
-   *        "osVer": "5.0",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *      },
-   *      "ios": {
-   *          "osVer": "10.0",
-   *          "uniVer": "√",
-   *          "unixVer": "x"
-   *      }
-   *  },
-   *  "mp": {
-   *    "weixin": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "alipay": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "baidu": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "toutiao": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "lark": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "qq": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "kuaishou": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "jd": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "360": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    }
-   *  },
-   *  "quickapp": {
-   *      "uniVer": "√",
-   *      "unixVer": "x"
-   *  },
-   *  "web": {
-   *      "uniVer": "√",
-   *      "unixVer": "x"
-   *  }
-   *}
-   */
-
-    //   onUnhandledRejection?(options: UniNamespace.OnUnhandledRejectionCallbackResult): void;
-
-  /**
-   * 监听系统主题变化
-   *
-   * @tutorial [https://uniapp.dcloud.io/collocation/frame/lifecycle](https://uniapp.dcloud.io/collocation/frame/lifecycle)
-   * @uniPlatform {
-   *  "app": {
-   *    "android": {
-   *        "osVer": "5.0",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *      },
-   *      "ios": {
-   *          "osVer": "10.0",
-   *          "uniVer": "√",
-   *          "unixVer": "x"
-   *      }
-   *  },
-   *  "mp": {
-   *    "weixin": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "alipay": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "baidu": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "toutiao": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "lark": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "qq": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "kuaishou": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "jd": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    },
-   *    "360": {
-   *        "hostVer": "√",
-   *        "uniVer": "√",
-   *        "unixVer": "x"
-   *    }
-   *  },
-   *  "quickapp": {
-   *      "uniVer": "√",
-   *      "unixVer": "x"
-   *  },
-   *  "web": {
-   *      "uniVer": "√",
-   *      "unixVer": "x"
-   *  }
-   *}
-   */
-
-    //   onThemeChange?(options: UniNamespace.OnThemeChangeCallbackResult): void;
-
   /**
    * 监听 nvue 页面消息
    *
@@ -935,15 +803,40 @@ interface AppInstance<T extends AnyObject = {}> {
   onLastPageBackPress?(): void;
 }
 
-type AppConstructor = <T extends AnyObject & AppInstance>(
-  options: AppInstance<T> & T,
-) => void;
-
-
 /**
- * `getApp()` 函数用于获取当前应用实例，可通过应用实例调用 App.uvue methods 中定义的方法。
- * @tutorial https://uniapp.dcloud.net.cn/tutorial/page.html#getapp
+ * Obtain the return type of a function type
  */
-type GetApp = () => AppInstance;
+type ReturnType<T extends (...args: any) => any> = T extends (...args: any) => infer R ? R : any;
+
+type EditorComponentPublicInstanceX<D extends OptionsData, C extends ComputedOptions, M extends MethodOptions, G extends GlobalData> = EditorComponentPublicInstance<D, C, M> & {
+  globalData: G
+}
+
+type EditorVueAppComponentX<D extends OptionsData, C extends ComputedOptions, M extends MethodOptions, G extends GlobalData> = EditorVueAppComponent<D, C, M> & {
+  $: EditorComponentPublicInstanceX<D, C, M, G>
+}
+
+type EditorCreateVueAppComponentX<D extends OptionsData = OptionsData, C extends ComputedOptions = ComputedOptions, M extends MethodOptions = MethodOptions, G extends GlobalData = GlobalData> = Omit<EditorCreateVueAppComponent, 'create'> & {
+  // 仅用于编辑器提示，TODO 重写 create 方法实现
+  create: (instance: ComponentInternalInstance) => EditorVueAppComponentX<D, C, M, G>;
+}
 
-declare const getApp: GetApp;
+type AppInstance<T extends EditorCreateVueAppComponentX> = ReturnType<T['create']>['$']
+
+declare global {
+  export interface AppCreateVueAppComponentDefault { }
+  /**
+   * `getApp()` 函数用于获取当前应用实例，可通过应用实例调用 App.uvue methods 中定义的方法。
+   * @tutorial https://uniapp.dcloud.net.cn/tutorial/page.html#getapp
+   */
+  function getApp<T extends EditorCreateVueAppComponentX = AppCreateVueAppComponentDefault>(): AppInstance<T>
+}
+
+type DefineAppX<D extends OptionsData, C extends ComputedOptions, M extends MethodOptions, G extends GlobalData> = DefineApp<D, C, M> & UniAppOptions<G>
+
+declare module '@vue/runtime-core' {
+  interface AppCustomOptions extends UniAppOptions {
+
+  }
+  export function defineApp<D extends OptionsData = OptionsData, C extends ComputedOptions = ComputedOptions, M extends MethodOptions = MethodOptions, G extends GlobalData = GlobalData>(options: DefineAppX<D, C, M, G>): EditorCreateVueAppComponentX<D, C, M, G>
+}

package/types/index.d.ts

@@ -1,7 +1,6 @@
-/// <reference path='./native/index.d.ts' />
+/// <reference path='./native/global.d.ts' />
 /// <reference path='./vue/index.d.ts' />
 /// <reference path='./uni/index.d.ts' />
 /// <reference path='./uni-cloud/index.d.ts' />
 /// <reference path='./app.d.ts' />
 /// <reference path='./page.d.ts' />
-/// <reference path='./shims-vue.d.ts' />

package/types/native/AsyncApiResult.d.ts

@@ -2,6 +2,6 @@
  * @package io.dcloud.uniapp
  * @autodoc false
  */
-declare interface AsyncApiResult {
+export interface AsyncApiResult {
   errMsg: string
 }

package/types/native/CSSStyleDeclaration.d.ts

@@ -2,19 +2,22 @@
  * CSSStyleDeclaration表示一个CSS 声明块对象，它是一个 CSS 属性键值对的集合，暴露样式信息和各种与样式相关的方法和属性。
  * @package io.dcloud.uniapp.runtime
  */
-declare class CSSStyleDeclaration {
+export class CSSStyleDeclaration {
 
-/**
- * 对CSS指定样式设置一个新值，如有此样式已存在则更新。
- * @param name CSS样式名称
- * @param value 要设置的新CSS样式值
- */
-  setProperty(name: string|string.cssPropertyString, value: any|null): void
+  /**
+   * 对CSS指定样式设置一个新值，如有此样式已存在则更新。
+   * @param name CSS样式名称
+   * @param value 要设置的新CSS样式值
+   */
+  setProperty(name: string | string.cssPropertyString, value: any | null): void
 
-/**
- * 获取CSS指定的样式值，如果指定的样式不存在则返回null。
- * @param property 要获取的CSS样式名称
- */
-  getPropertyValue(property: string|string.cssPropertyString): any|null
+  /**
+   * 获取CSS指定的样式值，如果指定的样式不存在则返回null。
+   * @param property 要获取的CSS样式名称
+   */
+  getPropertyValue(property: string | string.cssPropertyString): any | null
+
+  removeProperty(property: string | string.cssPropertyString): any | null
 
+  getStyleMap(): Map<String, any | null>
 }

package/types/native/CustomEvent.d.ts

@@ -1,9 +1,9 @@
-/// <reference path="./Event.d.ts" />
+import { Event } from "./Event";
 
 /**
  * @package io.dcloud.uniapp.runtime
  */
-declare class CustomEventOptions<T>{
+export class CustomEventOptions<T>{
   detail: T
   constructor (detail: T)
 }
@@ -11,7 +11,7 @@ declare class CustomEventOptions<T>{
 /**
  * @package io.dcloud.uniapp.runtime
  */
-declare class CustomEvent<T> extends Event {
+export class CustomEvent<T> extends Event {
   get detail(): T
   constructor (type: string, options: CustomEventOptions<T>)
 }

package/types/native/DOMRect.d.ts

@@ -2,7 +2,7 @@
  * 一个 DOMRect 代表一个矩形。
  * @package io.dcloud.uniapp.runtime
  */
-declare class DOMRect {
+export class DOMRect {
 
   /**
    * 创建一个新的 DOMRect 对象
@@ -11,7 +11,7 @@ declare class DOMRect {
    * @param {number} [width=0] 矩形的宽
    * @param {number} [height=0] 矩形的高
    */
-  constructor(x?: number, y?: number, width?: number, height?: number);
+  constructor (x?: number, y?: number, width?: number, height?: number);
 
   /**
    * 矩形的宽