@hylid/call 3.2.6 → 3.3.0-alpha.1

package/lib/index.d.ts

@@ -6,6 +6,7 @@ import { webCall } from './webCall';
 import { notFound } from './notFound';
 import { Config } from './types';
 export declare function call<T extends keyof MPApi>(name: T | ({} & string), options?: PickMPArgs<T> | Common | Callback<PickMpReturns<T>>, config?: Config): any;
+export declare function createWebviewSrc(url: string): string;
 export { WebViewBridge } from './webviewBridge';
 export { mpCall, mpWebCall, webCall, notFound };
 export { promisify } from './promisify';

package/lib/index.js

@@ -12,6 +12,19 @@ export function call(name, options, config) {
     return notFound(options, config);
   }
 }
+export function createWebviewSrc(url) {
+  var app = my.getSystemInfoSync().app;
+  var hashIndex = url.indexOf('#');
+  var hash = '';
+  if (hashIndex !== -1) {
+    hash = url.slice(hashIndex);
+    url = url.slice(0, hashIndex);
+  }
+  var separator = url.includes('?') ? '&' : '?';
+  var newUrl = url + separator + '__app__=' + app + hash;
+  return newUrl;
+}
+;
 export { WebViewBridge } from "./webviewBridge";
 export { mpCall, mpWebCall, webCall, notFound };
 export { promisify } from "./promisify";

package/lib/mpCall.js

@@ -1,7 +1,7 @@
 export function mpCall(apiName, options, config) {
   var _a = (config || {}).type,
     type = _a === void 0 ? 'async' : _a;
-  if (type === 'sync') {
+  if (type === 'sync' || (config === null || config === void 0 ? void 0 : config.isSync)) {
     // @ts-ignore
     return my[apiName](options);
   }
@@ -19,4 +19,8 @@ export function mpCall(apiName, options, config) {
     // @ts-ignore
     my[apiName](options);
   }
+  if (type === 'attribute') {
+    // @ts-ignore
+    return my[apiName];
+  }
 }

package/lib/mpWebCall.js

@@ -56,7 +56,8 @@ export function mpWebCall(api, options, config) {
     api: api,
     serialId: serialId,
     options: options,
-    config: config
+    config: config,
+    isSync: config === null || config === void 0 ? void 0 : config.isSync
   };
   mpWebPostMessage(message);
 }

package/lib/types.d.ts

@@ -2,6 +2,10 @@ import { JsApiType, MPApi, PickMPArgs, PickMpReturns } from '@hylid/types';
 export declare type JsApi = keyof MPApi;
 export interface JsApiConfig {
     type?: JsApiType;
+    /**
+     * @deprecated 优先使用 type = "sync" 配置
+     */
+    isSync?: boolean;
 }
 export declare type Config = JsApiConfig;
 export interface MpWebMessageResult<T = any> {
@@ -16,6 +20,10 @@ export interface MpWebJsApiMessage {
     options: any;
     config?: JsApiConfig;
     result?: MpWebMessageResult;
+    /**
+     * @deprecated 优先使用 config.type = "sync" 配置
+     */
+    isSync?: boolean;
 }
 export interface MpWebBroadcastMessage {
     source: 'hylid';

package/lib/webviewBridge/index.js

@@ -103,7 +103,7 @@ var WebViewBridge = /** @class */function () {
         });
       });
     } else {
-      console.info("[hylid-call]: context \u5728\u5C0F\u7A0B\u5E8F\u4FA7\u672A\u4F20\u5165\uFF0Cbroadcast \u529F\u80FD\u3001\u9875\u9762\u76D1\u542C\u5C06\u65E0\u6CD5\u4F7F\u7528");
+      console.info("[hylid-call]: context is null, broadcast and pageEvent cannot be used");
     }
   }
   WebViewBridge.prototype.bindCtxEvent = function (event, callback) {

package/lib/webviewBridge/internal/getCurrentPages.d.ts

@@ -1 +1,3 @@
-export declare function _getCurrentPages(): any[];
+export declare function _getCurrentPages(): {
+    route: any;
+}[];

package/lib/webviewBridge/internal/getCurrentPages.js

@@ -1,3 +1,8 @@
 export function _getCurrentPages() {
-  return getCurrentPages();
+  var pages = getCurrentPages();
+  return pages.map(function (page) {
+    return {
+      route: page.route
+    };
+  });
 }

package/lib/webviewBridge/utils.js

@@ -180,7 +180,7 @@ export var getApiResult = function getApiResult(jsapi, data) {
     return __generator(this, function (_b) {
       api = data.api, options = data.options, config = data.config;
       _a = (config || {}).type, type = _a === void 0 ? 'async' : _a;
-      if (type === 'sync') {
+      if (type === 'sync' || data.isSync) {
         return [2 /*return*/, getSyncApi(api, jsapi, options)];
       }
       if (type === 'async') {

package/lib/webviewBridge/webview-bridge-component/index.axml

@@ -0,0 +1 @@
+<web-view id="{{id}}" src="{{webviewSrc}}" onMessage="onMessage" onError="onError" onLoad="onLoad" />

package/lib/webviewBridge/webview-bridge-component/index.d.ts

@@ -0,0 +1 @@
+

package/lib/webviewBridge/webview-bridge-component/index.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Component({
+  data: {
+    webviewSrc: ''
+  },
+  onInit: function onInit() {
+    this.setData({
+      webviewSrc: this.createWebviewSrc(this.props.src)
+    });
+  },
+  deriveDataFromProps: function deriveDataFromProps(nextProps) {
+    this.setData({
+      webviewSrc: this.createWebviewSrc(nextProps.src)
+    });
+  },
+  methods: {
+    createWebviewSrc: function createWebviewSrc(url) {
+      var app = my.getSystemInfoSync().app;
+      var hashIndex = url.indexOf('#');
+      var hash = '';
+      if (hashIndex !== -1) {
+        hash = url.slice(hashIndex);
+        url = url.slice(0, hashIndex);
+      }
+      var separator = url.includes('?') ? '&' : '?';
+      var newUrl = url + separator + '__app__=' + app + hash;
+      return newUrl;
+    },
+    onMessage: function onMessage(params) {
+      this.props.onMessage && this.props.onMessage(params);
+    },
+    onLoad: function onLoad(params) {
+      this.props.onLoad && this.props.onLoad(params);
+    },
+    onError: function onError(params) {
+      this.props.onError && this.props.onError(params);
+    }
+  }
+});

package/lib/webviewBridge/webview-bridge-component/index.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@hylid/call",
-  "version": "3.2.6",
+  "version": "3.3.0-alpha.1",
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
   "dependencies": {
-    "@hylid/env": "^3.2.6",
-    "@hylid/types": "^3.2.6"
+    "@hylid/env": "^3.3.0-alpha.1",
+    "@hylid/types": "^3.3.0-alpha.1"
   },
   "publishConfig": {
     "access": "public"