From b23231e8d013a603bc73917a1ae7c8ff1caf83c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= <lihao.ylh@alibaba-inc.com>
Date: Mon, 10 May 2021 17:10:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E9=87=8C=E7=9A=84=20utils=20=E6=B3=A8=E5=85=A5?=
 =?UTF-8?q?=E6=9C=BA=E5=88=B6=20(vu-xxx=20&=20=E7=AE=80=E5=8D=95=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=20umd)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/src/builtin-simulator/host.ts    |  2 ++
 packages/plugin-designer/src/index.tsx        |  5 ++-
 .../react-simulator-renderer/src/renderer.ts  |  6 ++--
 .../src/utils/misc.ts                         | 26 ++++++++++++++
 packages/utils/src/build-components.ts        | 36 +++++++++++++++++++
 5 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 packages/react-simulator-renderer/src/utils/misc.ts

diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 6a8b48516..df4810566 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -14,6 +14,7 @@ import {
   isElement,
   isFormEvent,
   hasOwnProperty,
+  UtilsMetadata,
 } from '@ali/lowcode-utils';
 import {
   DragObjectType,
@@ -65,6 +66,7 @@ export interface BuiltinSimulatorProps {
   requestHandlersMap?: any;
   extraEnvironment?: Asset;
   library?: LibraryItem[];
+  utilsMetadata?: UtilsMetadata;
   simulatorUrl?: Asset;
   theme?: Asset;
   componentsAsset?: Asset;
diff --git a/packages/plugin-designer/src/index.tsx b/packages/plugin-designer/src/index.tsx
index f1319cc4a..15fdd5ac4 100644
--- a/packages/plugin-designer/src/index.tsx
+++ b/packages/plugin-designer/src/index.tsx
@@ -60,10 +60,11 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
       if (!this._mounted) {
         return;
       }
-      const { components, packages, extraEnvironment } = assets;
+      const { components, packages, extraEnvironment, utils } = assets;
       const state = {
         componentMetadatas: components || [],
         library: packages || [],
+        utilsMetadata: utils || [],
         extraEnvironment,
         renderEnv,
         device,
@@ -96,6 +97,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
     const { editor } = this.props;
     const {
       componentMetadatas,
+      utilsMetadata,
       library,
       extraEnvironment,
       renderEnv,
@@ -121,6 +123,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
         componentMetadatas={componentMetadatas}
         simulatorProps={{
           library,
+          utilsMetadata,
           extraEnvironment,
           renderEnv,
           device,
diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts
index 455342822..ede0b9131 100644
--- a/packages/react-simulator-renderer/src/renderer.ts
+++ b/packages/react-simulator-renderer/src/renderer.ts
@@ -15,7 +15,7 @@ import {
   compatibleLegaoSchema,
   isPlainObject,
   AssetLoader,
-
+  getProjectUtils,
 } from '@ali/lowcode-utils';
 
 import { RootSchema, ComponentSchema, TransformStage, NodeSchema } from '@ali/lowcode-types';
@@ -201,9 +201,6 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer {
       if (this._libraryMap !== host.libraryMap || this._componentsMap !== host.designer.componentsMap) {
         this._libraryMap = host.libraryMap || {};
         this._componentsMap = host.designer.componentsMap;
-        // 需要注意的是，autorun 依赖收集的是同步执行的代码，所以 await / promise / callback 里的变量不会被收集依赖
-        // 此例中，host.designer.componentsMap 是需要被收集依赖的，否则无法响应式
-        // await host.waitForCurrentDocument();
         this.buildComponents();
       }
 
@@ -276,6 +273,7 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer {
           currentLocale: this.locale,
           messages: {},
         },
+        ...getProjectUtils(this._libraryMap, host.get('utilsMetadata')),
       },
       constants: {},
       requestHandlersMap: this._requestHandlersMap,
diff --git a/packages/react-simulator-renderer/src/utils/misc.ts b/packages/react-simulator-renderer/src/utils/misc.ts
new file mode 100644
index 000000000..ea6f5147e
--- /dev/null
+++ b/packages/react-simulator-renderer/src/utils/misc.ts
@@ -0,0 +1,26 @@
+interface UtilsMetadata {
+  name: string;
+  npm: {
+    package: string;
+    version?: string;
+    exportName: string;
+    subName?: string;
+    destructuring?: boolean;
+    main?: string;
+  }
+}
+
+interface LibrayMap {
+  [key: string]: string;
+}
+
+export function getProjectUtils(librayMap: LibrayMap, utilsMetadata: UtilsMetadata[]) {
+  const projectUtils: { [packageName: string]: any } = {};
+  if (utilsMetadata) {
+    utilsMetadata.forEach(meta => {
+      if (librayMap[meta?.npm.package]) {
+        const lib = window[librayMap[meta?.npm.package]];
+      }
+    });
+  }
+}
\ No newline at end of file
diff --git a/packages/utils/src/build-components.ts b/packages/utils/src/build-components.ts
index 22bdba0a4..414033599 100644
--- a/packages/utils/src/build-components.ts
+++ b/packages/utils/src/build-components.ts
@@ -101,3 +101,39 @@ export function buildComponents(libraryMap: LibraryMap,
   });
   return components;
 }
+
+export interface UtilsMetadata {
+  name: string;
+  npm: {
+    package: string;
+    version?: string;
+    exportName: string;
+    subName?: string;
+    destructuring?: boolean;
+    main?: string;
+  }
+}
+
+interface LibrayMap {
+  [key: string]: string;
+}
+
+export function getProjectUtils(librayMap: LibrayMap, utilsMetadata: UtilsMetadata[]) {
+  const projectUtils: { [packageName: string]: any } = {};
+  if (utilsMetadata) {
+    utilsMetadata.forEach(meta => {
+      if (librayMap[meta?.npm?.package]) {
+        const lib = accessLibrary(librayMap[meta?.npm.package]);
+        if (lib.destructuring) {
+          Object.keys(lib).forEach(name => {
+            if (name === 'destructuring') return;
+            projectUtils[name] = lib[name];
+          });
+        } else {
+          projectUtils[meta?.npm?.exportName] = lib;
+        }
+      }
+    });
+  }
+  return projectUtils;
+}
\ No newline at end of file