feat(uni-app-x web): 暴露UTSJSONObject、UniError到全局

packages/uni-h5/src/helpers/utils.ts

@@ -12,3 +12,15 @@ export function isInWindows(vm: ComponentPublicInstance) {
   }
   return false
 }
+
+export function getType(val: any): string {
+  return Object.prototype.toString.call(val).slice(8, -1).toLowerCase()
+}
+
+export function isPlainObject(val: any): boolean {
+  if (val == null || typeof val !== 'object') {
+    return false
+  }
+  const proto = Object.getPrototypeOf(val)
+  return proto === Object.prototype || proto === null
+}

packages/uni-h5/src/index.ts

+//#if _X_
+import { UniError } from './platform/uts/UniError'
+import { UTSJSONObject } from './platform/uts/UTSJSONObject'
+
+function getGlobal() {
+  // cross-platform
+  if (typeof globalThis !== 'undefined') {
+    return globalThis
+  }
+  // worker
+  if (typeof self !== 'undefined') {
+    return self
+  }
+  // browser
+  if (typeof window !== 'undefined') {
+    return window
+  }
+  // nodejs
+  if (typeof global !== 'undefined') {
+    return global
+  }
+  throw new Error('unable to locate global object')
+}
+
+const realGlobal = getGlobal()
+if (!realGlobal.globalThis) {
+  // @ts-ignore
+  realGlobal.globalThis = realGlobal
+}
+
+// @ts-ignore
+globalThis.UTSJSONObject = UTSJSONObject
+// @ts-ignore
+globalThis.UniError = UniError
+//#endif
+
 export {
   Button,
   Canvas,

packages/uni-h5/src/platform/uts/UTSJSONObject.ts

+import { getType, isPlainObject } from '../../helpers/utils'
+
+function initUTSJSONObjectProperties(obj: UTSJSONObject) {
+  const propertyList = [
+    '_resolveKeyPath',
+    '_getValue',
+    'toJSON',
+    'get',
+    'set',
+    'getAny',
+    'getString',
+    'getNumber',
+    'getBoolean',
+    'getJSON',
+    'getArray',
+    'toMap',
+    'forEach',
+  ]
+  const propertyDescriptorMap: PropertyDescriptorMap = {}
+  for (let i = 0; i < propertyList.length; i++) {
+    const property = propertyList[i]
+    propertyDescriptorMap[property] = {
+      enumerable: false,
+      value: obj[property as keyof UTSJSONObject],
+    }
+  }
+  Object.defineProperties(obj, propertyDescriptorMap)
+}
+export class UTSJSONObject {
+  [key: string]: any
+  constructor(content: Record<string, any> = {}) {
+    for (const key in content) {
+      if (Object.prototype.hasOwnProperty.call(content, key)) {
+        const value = content[key]
+        if (isPlainObject(value)) {
+          this[key] = new UTSJSONObject(value)
+        } else if (getType(value) === 'array') {
+          this[key] = value.map((item: any) => {
+            if (isPlainObject(item)) {
+              return new UTSJSONObject(item)
+            } else {
+              return item
+            }
+          })
+        } else {
+          this[key] = value
+        }
+      }
+    }
+    initUTSJSONObjectProperties(this)
+  }
+  private _resolveKeyPath(keyPath: string): string[] {
+    // 非法keyPath不抛出错误，直接返回空数组
+    let token = ''
+    const keyPathArr: string[] = []
+    let inOpenParentheses = false
+    for (let i = 0; i < keyPath.length; i++) {
+      const word = keyPath[i]
+      switch (word) {
+        case '.':
+          if (token.length > 0) {
+            keyPathArr.push(token)
+            token = ''
+          }
+          break
+        case '[': {
+          inOpenParentheses = true
+          if (token.length > 0) {
+            keyPathArr.push(token)
+            token = ''
+          }
+          break
+        }
+        case ']':
+          if (inOpenParentheses) {
+            if (token.length > 0) {
+              const tokenFirstChar = token[0]
+              const tokenLastChar = token[token.length - 1]
+              if (
+                (tokenFirstChar === '"' && tokenLastChar === '"') ||
+                (tokenFirstChar === "'" && tokenLastChar === "'") ||
+                (tokenFirstChar === '`' && tokenLastChar === '`')
+              ) {
+                if (token.length > 2) {
+                  token = token.slice(1, -1)
+                } else {
+                  return []
+                }
+              } else if (!/^\d+$/.test(token)) {
+                return []
+              }
+              keyPathArr.push(token)
+              token = ''
+            } else {
+              return []
+            }
+            inOpenParentheses = false
+          } else {
+            return []
+          }
+          break
+        default:
+          token += word
+          break
+      }
+      if (i === keyPath.length - 1) {
+        if (token.length > 0) {
+          keyPathArr.push(token)
+          token = ''
+        }
+      }
+    }
+    return keyPathArr
+  }
+  private _getValue(keyPath: string): any | null {
+    const keyPathArr = this._resolveKeyPath(keyPath)
+    if (keyPathArr.length === 0) {
+      return null
+    }
+    let value = this
+    for (let key of keyPathArr) {
+      if (value instanceof Object) {
+        value = value[key]
+      } else {
+        return null
+      }
+    }
+    return value
+  }
+  get(key: string): any | null {
+    return this._getValue(key)
+  }
+  set(key: string, value: any) {
+    this[key] = value
+  }
+  getAny(key: string): any | null {
+    return this._getValue(key)
+  }
+  getString(key: string): string | null {
+    const value = this._getValue(key)
+    if (typeof value === 'string') {
+      return value
+    } else {
+      return null
+    }
+  }
+  getNumber(key: string): number | null {
+    const value = this._getValue(key)
+    if (typeof value === 'number') {
+      return value
+    } else {
+      return null
+    }
+  }
+  getBoolean(key: string): boolean | null {
+    const boolean = this._getValue(key)
+    if (typeof boolean === 'boolean') {
+      return boolean
+    } else {
+      return null
+    }
+  }
+  getJSON(key: string): UTSJSONObject | null {
+    let value = this._getValue(key)
+    if (value instanceof Object) {
+      return new UTSJSONObject(value)
+    } else {
+      return null
+    }
+  }
+  getArray<T = any>(key: string): Array<T> | null {
+    let value = this._getValue(key)
+    if (value instanceof Array) {
+      return value as Array<T>
+    } else {
+      return null
+    }
+  }
+
+  toMap(): Map<string, any> {
+    let map = new Map<string, any>()
+    for (let key in this) {
+      map.set(key, this[key] as any)
+    }
+    return map
+  }
+
+  forEach(callback: (value: any, key: string) => void) {
+    for (let key in this) {
+      callback(this[key] as any, key)
+    }
+  }
+}

packages/uni-h5/src/platform/uts/UniError.ts

+export class UniError extends Error {
+  errSubject: string
+  errCode: number
+  errMsg: string
+  cause?: Error
+  data?: any
+  constructor(errSubject: string, errCode: number, errMsg: string) {
+    super(errMsg)
+    this.name = 'UniError'
+    this.errSubject = errSubject
+    this.errCode = errCode
+    this.errMsg = errMsg
+  }
+
+  toString(): string {
+    return this.errMsg
+  }
+
+  toJSON(): Record<string, any> {
+    return {
+      errSubject: this.errSubject,
+      errCode: this.errCode,
+      errMsg: this.errMsg,
+      data: this.data,
+      cause:
+        this.cause && typeof (this.cause as UniError).toJSON === 'function'
+          ? (this.cause as UniError).toJSON()
+          : this.cause,
+    }
+  }
+}

packages/uni-uts-v1/lib/javascript/lib/runtime/index.js

-/**
- * copy from @uts/shared
- */
-var IDENTIFIER;
-(function (IDENTIFIER) {
-    IDENTIFIER["UTSJSONObject"] = "UTSJSONObject";
-    IDENTIFIER["JSON"] = "JSON";
-    IDENTIFIER["UTS"] = "UTS";
-    IDENTIFIER["DEFINE_COMPONENT"] = "defineComponent";
-    IDENTIFIER["VUE"] = "vue";
-    IDENTIFIER["GLOBAL_THIS"] = "globalThis";
-    IDENTIFIER["UTS_TYPE"] = "UTSType";
-    IDENTIFIER["UTS_METADATA"] = "$UTSMetadata$";
-    IDENTIFIER["TEMP_UTS_METADATA"] = "$TempUTSMetadata$";
-    IDENTIFIER["JSON_FIELD"] = "JSON_FIELD";
-})(IDENTIFIER || (IDENTIFIER = {}));
-var UTS_CLASS_METADATA_KIND;
-(function (UTS_CLASS_METADATA_KIND) {
-    UTS_CLASS_METADATA_KIND[UTS_CLASS_METADATA_KIND["CLASS"] = 0] = "CLASS";
-    UTS_CLASS_METADATA_KIND[UTS_CLASS_METADATA_KIND["INTERFACE"] = 1] = "INTERFACE";
-    UTS_CLASS_METADATA_KIND[UTS_CLASS_METADATA_KIND["TYPE"] = 2] = "TYPE";
-})(UTS_CLASS_METADATA_KIND || (UTS_CLASS_METADATA_KIND = {}));
-
-function getType(val) {
-    return Object.prototype.toString.call(val).slice(8, -1).toLowerCase();
-}
-function isPlainObject(val) {
-    if (val == null || typeof val !== 'object') {
-        return false;
-    }
-    const proto = Object.getPrototypeOf(val);
-    return proto === Object.prototype || proto === null;
-}
-
-function initUTSJSONObjectProperties(obj) {
-    const propertyDescriptor = {
-        enumerable: false,
-    };
-    const propertyList = [
-        '_resolveKeyPath',
-        '_getValue',
-        'toJSON',
-        'get',
-        'set',
-        'getAny',
-        'getString',
-        'getNumber',
-        'getBoolean',
-        'getJSON',
-        'getArray',
-        'toMap',
-        'forEach',
-    ];
-    const propertyDescriptorMap = {};
-    for (let i = 0; i < propertyList.length; i++) {
-        const property = propertyList[i];
-        propertyDescriptorMap[property] = Object.assign(Object.assign({}, propertyDescriptor), { value: obj[property] });
-    }
-    Object.defineProperties(obj, propertyDescriptorMap);
-}
-class UTSJSONObject {
-    constructor(content = {}) {
-        for (const key in content) {
-            if (Object.prototype.hasOwnProperty.call(content, key)) {
-                const value = content[key];
-                if (isPlainObject(value)) {
-                    this[key] = new UTSJSONObject(value);
-                }
-                else if (getType(value) === 'array') {
-                    this[key] = value.map((item) => {
-                        if (isPlainObject(item)) {
-                            return new UTSJSONObject(item);
-                        }
-                        else {
-                            return item;
-                        }
-                    });
-                }
-                else {
-                    this[key] = value;
-                }
-            }
-        }
-        initUTSJSONObjectProperties(this);
-    }
-    _resolveKeyPath(keyPath) {
-        // 非法keyPath不抛出错误，直接返回空数组
-        let token = '';
-        const keyPathArr = [];
-        let inOpenParentheses = false;
-        for (let i = 0; i < keyPath.length; i++) {
-            const word = keyPath[i];
-            switch (word) {
-                case '.':
-                    if (token.length > 0) {
-                        keyPathArr.push(token);
-                        token = '';
-                    }
-                    break;
-                case '[': {
-                    inOpenParentheses = true;
-                    if (token.length > 0) {
-                        keyPathArr.push(token);
-                        token = '';
-                    }
-                    break;
-                }
-                case ']':
-                    if (inOpenParentheses) {
-                        if (token.length > 0) {
-                            const tokenFirstChar = token[0];
-                            const tokenLastChar = token[token.length - 1];
-                            if ((tokenFirstChar === '"' && tokenLastChar === '"') ||
-                                (tokenFirstChar === "'" && tokenLastChar === "'") ||
-                                (tokenFirstChar === '`' && tokenLastChar === '`')) {
-                                if (token.length > 2) {
-                                    token = token.slice(1, -1);
-                                }
-                                else {
-                                    return [];
-                                }
-                            }
-                            else if (!/^\d+$/.test(token)) {
-                                return [];
-                            }
-                            keyPathArr.push(token);
-                            token = '';
-                        }
-                        else {
-                            return [];
-                        }
-                        inOpenParentheses = false;
-                    }
-                    else {
-                        return [];
-                    }
-                    break;
-                default:
-                    token += word;
-                    break;
-            }
-            if (i === keyPath.length - 1) {
-                if (token.length > 0) {
-                    keyPathArr.push(token);
-                    token = '';
-                }
-            }
-        }
-        return keyPathArr;
-    }
-    _getValue(keyPath) {
-        const keyPathArr = this._resolveKeyPath(keyPath);
-        if (keyPathArr.length === 0) {
-            return null;
-        }
-        let value = this;
-        for (let key of keyPathArr) {
-            if (value instanceof Object) {
-                value = value[key];
-            }
-            else {
-                return null;
-            }
-        }
-        return value;
-    }
-    get(key) {
-        return this._getValue(key);
-    }
-    set(key, value) {
-        this[key] = value;
-    }
-    getAny(key) {
-        return this._getValue(key);
-    }
-    getString(key) {
-        const value = this._getValue(key);
-        if (typeof value === 'string') {
-            return value;
-        }
-        else {
-            return null;
-        }
-    }
-    getNumber(key) {
-        const value = this._getValue(key);
-        if (typeof value === 'number') {
-            return value;
-        }
-        else {
-            return null;
-        }
-    }
-    getBoolean(key) {
-        const boolean = this._getValue(key);
-        if (typeof boolean === 'boolean') {
-            return boolean;
-        }
-        else {
-            return null;
-        }
-    }
-    getJSON(key) {
-        let value = this._getValue(key);
-        if (value instanceof Object) {
-            return new UTSJSONObject(value);
-        }
-        else {
-            return null;
-        }
-    }
-    getArray(key) {
-        let value = this._getValue(key);
-        if (value instanceof Array) {
-            return value;
-        }
-        else {
-            return null;
-        }
-    }
-    toMap() {
-        let map = new Map();
-        for (let key in this) {
-            map.set(key, this[key]);
-        }
-        return map;
-    }
-    forEach(callback) {
-        for (let key in this) {
-            callback(this[key], key);
-        }
-    }
-}
-
-// @ts-nocheck
-function getGlobal() {
-    // cross-platform
-    if (typeof globalThis !== 'undefined') {
-        return globalThis;
-    }
-    // worker
-    if (typeof self !== 'undefined') {
-        return self;
-    }
-    // browser
-    if (typeof window !== 'undefined') {
-        return window;
-    }
-    // nodejs
-    if (typeof global !== 'undefined') {
-        return global;
-    }
-    throw new Error('unable to locate global object');
-}
-const realGlobal = getGlobal();
-if (!realGlobal.globalThis) {
-    realGlobal.globalThis = realGlobal;
-}
-globalThis.UTSJSONObject = UTSJSONObject;
-
 function arrayPop(array) {
     if (array.length === 0) {
         return null;
@@ -291,6 +31,33 @@ function arrayAt(array, index) {
     return array.at(index);
 }
 
+/**
+ * copy from @uts/shared
+ */
+var IDENTIFIER;
+(function (IDENTIFIER) {
+    IDENTIFIER["UTSJSONObject"] = "UTSJSONObject";
+    IDENTIFIER["JSON"] = "JSON";
+    IDENTIFIER["UTS"] = "UTS";
+    IDENTIFIER["DEFINE_COMPONENT"] = "defineComponent";
+    IDENTIFIER["VUE"] = "vue";
+    IDENTIFIER["GLOBAL_THIS"] = "globalThis";
+    IDENTIFIER["UTS_TYPE"] = "UTSType";
+    IDENTIFIER["UTS_METADATA"] = "$UTSMetadata$";
+    IDENTIFIER["TEMP_UTS_METADATA"] = "$TempUTSMetadata$";
+    IDENTIFIER["JSON_FIELD"] = "JSON_FIELD";
+})(IDENTIFIER || (IDENTIFIER = {}));
+var UTS_CLASS_METADATA_KIND;
+(function (UTS_CLASS_METADATA_KIND) {
+    UTS_CLASS_METADATA_KIND[UTS_CLASS_METADATA_KIND["CLASS"] = 0] = "CLASS";
+    UTS_CLASS_METADATA_KIND[UTS_CLASS_METADATA_KIND["INTERFACE"] = 1] = "INTERFACE";
+    UTS_CLASS_METADATA_KIND[UTS_CLASS_METADATA_KIND["TYPE"] = 2] = "TYPE";
+})(UTS_CLASS_METADATA_KIND || (UTS_CLASS_METADATA_KIND = {}));
+
+function getType(val) {
+    return Object.prototype.toString.call(val).slice(8, -1).toLowerCase();
+}
+
 // TODO 实现UTSError
 class UTSError extends Error {
     constructor(message) {