refactor(platform): move "load monaco" to utils

yyc-git · yyc-git · commit d46dff9f008c · 2024-02-18T15:40:54.000+08:00
diff --git a/contributes/meta3d-ui-control-codeedit/src/Main.ts b/contributes/meta3d-ui-control-codeedit/src/Main.ts
@@ -5,6 +5,7 @@ import { getBeforeRenderEventName } from "meta3d-editor-event-utils/src/Main"
 import { service as editorWholeService } from "meta3d-editor-whole-protocol/src/service/ServiceType"
 import { eventName as selectInspectorNodeEventName } from "meta3d-action-select-inspector-node-protocol/src/EventType"
 import { getRestoreEditorValueEventName } from "meta3d-editor-event-utils/src/Main"
+import { getMonaco } from "meta3d-monaco-utils"
 
 let _bindHiddenContainerEvent = (meta3dState: meta3dState, api: api, container: HTMLElement) => {
     let { onCustomGlobalEvent3 } = api.nullable.getExn(api.getPackageService<service>(meta3dState, "meta3d-editor-whole-protocol")).event(meta3dState)
@@ -111,7 +112,7 @@ export let getContribute: getContributeMeta3D<uiControlContribute<inputFunc, spe
 
 
                 if (api.nullable.isNullable(editor)) {
-                    let monaco = (globalThis as any)["meta3d_monaco" as any]
+                    let monaco = getMonaco()
 
                     editor = monaco.editor.create(container, {
                         model: monaco.editor.createModel(code, "typescript"),
diff --git a/doc/1.3.0.org b/doc/1.3.0.org
@@ -737,11 +737,16 @@ TODO update:
 
 
 
-* TODO perf(editor): solve "memory will increase when run editor"
+# * TODO perf(editor): solve "memory will increase when run editor"
 
-TODO fix: run editor will increase
+# # TODO refresh platform
+# #     TODO components' arrayBuffer
 
-TODO fix: editor loop will increase
+
+
+# TODO run editor will increase
+
+# TODO editor loop will increase
 
 
 * TODO perf(editor): optimize editor loading
diff --git a/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/lib/bs/.compiler.log b/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/lib/bs/.compiler.log
@@ -1,2 +1,2 @@
-#Start(1708222798236)
-#Done(1708222798297)
+#Start(1708241723555)
+#Done(1708241723599)
diff --git a/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/lib/bs/.ninja_log b/packages/engine-whole/protocols/extension_protocols/meta3d-engine-whole-protocol/lib/bs/.ninja_log
@@ -1,8 +1,8 @@
 # ninja log v6
-0	24	1708222798258013436	src/service/ServiceType.ast	785165cefc5839bb
-1	26	1708222798258088442	Meta3dEngineWholeProtocol.cmi	5f7f0af9dc9a4eae
-24	34	1708222798270568541	src/service/ServiceType.d	c1e4bb8db3eac460
-34	61	1708222798296122726	src/service/ServiceType-Meta3dEngineWholeProtocol.cmj	54975c454ef0149
-34	61	1708222798296122726	src/service/ServiceType-Meta3dEngineWholeProtocol.cmi	54975c454ef0149
-34	61	1708222798296122726	../es6_global/src/service/ServiceType.bs.js	54975c454ef0149
-34	61	1708222798296122726	../js/src/service/ServiceType.bs.js	54975c454ef0149
+0	14	1708241723569719336	src/service/ServiceType.ast	785165cefc5839bb
+1	15	1708241723569830790	Meta3dEngineWholeProtocol.cmi	5f7f0af9dc9a4eae
+14	23	1708241723578846241	src/service/ServiceType.d	c1e4bb8db3eac460
+23	43	1708241723598955736	src/service/ServiceType-Meta3dEngineWholeProtocol.cmj	d2945c04508d17d8
+23	43	1708241723598955736	src/service/ServiceType-Meta3dEngineWholeProtocol.cmi	d2945c04508d17d8
+23	43	1708241723598955736	../es6_global/src/service/ServiceType.bs.js	d2945c04508d17d8
+23	43	1708241723598955736	../js/src/service/ServiceType.bs.js	d2945c04508d17d8
diff --git a/platform/frontend/bsconfig.json b/platform/frontend/bsconfig.json
@@ -40,7 +40,8 @@
     "meta3d-engine-whole-protocol",
     "meta3d-ui-protocol",
     "meta3d-event-data-utils",
-    "meta3d-file-utils"
+    "meta3d-file-utils",
+    "meta3d-monaco-utils"
   ],
   "refmt": 3,
   "namespace": true,
diff --git a/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/code_edit/CodeEdit.res b/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/code_edit/CodeEdit.res
@@ -113,9 +113,9 @@ let make = (~service: service, ~code, ~getNewCodeFunc) => {
 
   service.react.useEffect1(. () => {
     MessageUtils.showCatchedErrorMessage(() => {
-      switch MonaoUtils.getMonaco()->Meta3dCommonlib.OptionSt.fromNullable {
+      switch Meta3dMonacoUtils.Main.getMonaco()->Meta3dCommonlib.OptionSt.fromNullable {
       | None =>
-        MonaoUtils.deferLoad()->Js.Promise.then_(
+        Meta3dMonacoUtils.Main.deferLoad()->Js.Promise.then_(
           value => {
             value->Js.Promise.resolve
           },
diff --git a/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/run_element_visual/components/RunElementVisual.res b/platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/run_element_visual/components/RunElementVisual.res
@@ -125,14 +125,18 @@ let make = (~service: AssembleSpaceType.service) => {
 
   service.react.useEffect1(. () => {
     MessageUtils.showCatchedErrorMessage(() => {
-      MonaoUtils.deferLoad()
-      ->Js.Promise.catch(
-        e => {
-          service.console.errorWithExn(. e->Error.promiseErrorToExn, None)->Obj.magic
-        },
-        _,
-      )
-      ->ignore
+      switch Meta3dMonacoUtils.Main.getMonaco() {
+      | None =>
+        Meta3dMonacoUtils.Main.deferLoad()
+        ->Js.Promise.catch(
+          e => {
+            service.console.errorWithExn(. e->Error.promiseErrorToExn, None)->Obj.magic
+          },
+          _,
+        )
+        ->ignore
+      | Some(_) => ()
+      }
     }, 5->Some)
 
     None
diff --git a/platform/frontend/src/external_layer/ui/app/enter_app/components/EnterApp.res b/platform/frontend/src/external_layer/ui/app/enter_app/components/EnterApp.res
@@ -24,14 +24,18 @@ let make = (~service: FrontendType.service) => {
 
   React.useEffect1(() => {
     MessageUtils.showCatchedErrorMessage(() => {
-      MonaoUtils.deferLoad()
-      ->Js.Promise.catch(
-        e => {
-          service.console.errorWithExn(. e->Error.promiseErrorToExn, None)->Obj.magic
-        },
-        _,
-      )
-      ->ignore
+      switch Meta3dMonacoUtils.Main.getMonaco() {
+      | None =>
+        Meta3dMonacoUtils.Main.deferLoad()
+        ->Js.Promise.catch(
+          e => {
+            service.console.errorWithExn(. e->Error.promiseErrorToExn, None)->Obj.magic
+          },
+          _,
+        )
+        ->ignore
+      | Some(_) => ()
+      }
     }, 5->Some)
 
     None
diff --git a/utils/meta3d-monaco-utils/.gitignore b/utils/meta3d-monaco-utils/.gitignore
@@ -0,0 +1,33 @@
+.DS_Store
+.merlin
+.idea/
+.vscode/
+jest_0/
+reference/
+node_modules/
+mine/
+dist/
+lib/bs/
+.bs.js
+.gen.tsx
+lib/js/
+lib/es6_global/
+
+lib/bs/
+.bs.js
+.gen.tsx
+
+lib/js/
+lib/es6_global/test/
+lib/es6_global/test/
+
+coverage
+
+dist/
+
+npm-debug
+
+.bsb.lock
+
+yarn.lock
+
diff --git a/utils/meta3d-monaco-utils/.npmignore b/utils/meta3d-monaco-utils/.npmignore
@@ -0,0 +1,32 @@
+.DS_Store
+.merlin
+.idea/
+.vscode/
+jest_0/
+reference/
+node_modules/
+mine/
+
+test/
+
+.github/
+
+donate/
+
+lib/bs/
+.bs.js
+.gen.tsx
+
+lib/js/
+lib/es6_global/test/
+
+coverage
+
+dist/
+
+npm-debug
+
+.bsb.lock
+
+yarn.lock
+
diff --git a/utils/meta3d-monaco-utils/bsconfig.json b/utils/meta3d-monaco-utils/bsconfig.json
@@ -0,0 +1,28 @@
+{
+  "name": "meta3d-monaco-utils",
+  "sources": [
+    {
+      "dir": "src",
+      "subdirs": true
+    }
+  ],
+  "bsc-flags": [
+    "-bs-no-version-header",
+    "-bs-super-errors"
+  ],
+  "bs-dev-dependencies": [
+  ],
+  "refmt": 3,
+  "bs-dependencies": [
+  ],
+  "package-specs": [
+    "commonjs",
+    "es6-global"
+  ],
+  "suffix": ".bs.js",
+  "namespace": true,
+  "warnings": {
+    "number": "-0-1-2-3-4-7-8-9-10-11-12-13-14-15-16-17-18-19-20-21-22-23-24-25-26-27-28-29-30-31-32-33-34-35-36-37-38-39-40-41-42-43-44-45-46-47-48-49-50-51-52-53-54-55-56-57-58-59-60-61-62-K",
+    "error": "+5+6"
+  }
+}
diff --git a/utils/meta3d-monaco-utils/package.json b/utils/meta3d-monaco-utils/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "meta3d-monaco-utils",
+  "version": "1.2.0",
+  "main": "lib/js/src/Main.bs.js",
+  "types": "src/Main.d.ts",
+  "scripts": {
+    "watch": "rescript clean && rescript build -w",
+    "buildAll:ci": "rescript clean && rescript build"
+  },
+  "keywords": [],
+  "devDependencies": {
+    "@babel/core": "^7.10.4",
+    "@babel/preset-env": "^7.10.4",
+    "babel-jest": "^26.1.0",
+    "cz-conventional-changelog": "^3.2.0",
+    "cz-customizable": "^5.2.0",
+    "gentype": "^3.48.0"
+  },
+  "dependencies": {
+    "rescript": "^10.0.1"
+  }
+}
diff --git a/utils/meta3d-monaco-utils/src/Main.d.ts b/utils/meta3d-monaco-utils/src/Main.d.ts
@@ -0,0 +1,3 @@
+export type monaco = any
+
+export function getMonaco(): monaco
diff --git a/utils/meta3d-monaco-utils/src/Main.res b/utils/meta3d-monaco-utils/src/Main.res
