@difizen/libro-cofine-editor-core 0.1.14 → 0.1.16

package/es/e2-editor.d.ts

@@ -11,6 +11,9 @@ export declare const IsDiff: unique symbol;
  * E2 Editor
  */
 export declare class E2Editor<T extends monaco.editor.IStandaloneCodeEditor | monaco.editor.IStandaloneDiffEditor> {
+    static createMonacoModel(value: string, language?: string, uri?: monaco.Uri): monaco.editor.ITextModel;
+    static createMonacoEditor(node: HTMLElement, options: Options): monaco.editor.IStandaloneCodeEditor;
+    static createMonacoDiffEditor(node: HTMLElement, options: Options): monaco.editor.IStandaloneDiffEditor;
     codeEditor: T;
     model: monaco.editor.ITextModel;
     modified: monaco.editor.ITextModel;

package/es/e2-editor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2-editor.d.ts","sourceRoot":"","sources":["../../src/e2-editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,eAAO,MAAM,UAAU,eAAuB,CAAC;AAC/C,eAAO,MAAM,aAAa,eAA0B,CAAC;AACrD,eAAO,MAAM,YAAY,eAAyB,CAAC;AACnD,eAAO,MAAM,MAAM,eAAmB,CAAC;AACvC;;GAEG;AAEH,qBACa,QAAQ,CACnB,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB;IAEnF,UAAU,EAAG,CAAC,CAAC;IACf,KAAK,EAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,EAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;IACpC,QAAQ,EAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,SAAS,EAAE,oBAAoB,CAA8B;IACvE,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,qBAAqB,EAAE,oBAAoB,CAAC;IAC5C,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,gBAAgB,CAAC;gBAEV,IAAI,EAAE,WAAW,EACd,OAAO,EAAE,OAAO,EACT,qBAAqB,EAAE,oBAAoB,EAClD,aAAa,EAAE,aAAa,EACnC,MAAM,EAAE,OAAO,EACT,YAAY,CAAC,EAAE,gBAAgB;IA8GvD,SAAS,CAAC,iCAAiC,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS;IAMxE,SAAS,CAAC,gCAAgC;CAK3C"}
+{"version":3,"file":"e2-editor.d.ts","sourceRoot":"","sources":["../../src/e2-editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,eAAO,MAAM,UAAU,eAAuB,CAAC;AAC/C,eAAO,MAAM,aAAa,eAA0B,CAAC;AACrD,eAAO,MAAM,YAAY,eAAyB,CAAC;AACnD,eAAO,MAAM,MAAM,eAAmB,CAAC;AACvC;;GAEG;AAEH,qBACa,QAAQ,CACnB,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB;IAEnF,MAAM,CAAC,iBAAiB,CACtB,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,MAAM,EACjB,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,GACf,MAAM,CAAC,MAAM,CAAC,UAAU;IAI3B,MAAM,CAAC,kBAAkB,CACvB,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,CAAC,qBAAqB;IAItC,MAAM,CAAC,sBAAsB,CAC3B,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,CAAC,qBAAqB;IAGtC,UAAU,EAAG,CAAC,CAAC;IACf,KAAK,EAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,EAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;IACpC,QAAQ,EAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,SAAS,EAAE,oBAAoB,CAA8B;IACvE,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,qBAAqB,EAAE,oBAAoB,CAAC;IAC5C,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,gBAAgB,CAAC;gBAEV,IAAI,EAAE,WAAW,EACd,OAAO,EAAE,OAAO,EACT,qBAAqB,EAAE,oBAAoB,EAClD,aAAa,EAAE,aAAa,EACnC,MAAM,EAAE,OAAO,EACT,YAAY,CAAC,EAAE,gBAAgB;IA8GvD,SAAS,CAAC,iCAAiC,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS;IAMxE,SAAS,CAAC,gCAAgC;CAK3C"}

package/es/e2-editor.js

@@ -36,7 +36,8 @@ export var E2Editor = (_dec = singleton(), _dec(_class = /*#__PURE__*/function (
     if (MonacoEnvironment.lazy) {
       // 资源懒加载场景
       if (!isDiff) {
-        this.model = monaco.editor.createModel(options.value || '', options.language, options.uri);
+        var _options$model;
+        this.model = (_options$model = options.model) !== null && _options$model !== void 0 ? _options$model : monaco.editor.createModel(options.value || '', options.language, options.uri);
         var language = this.model.getLanguageId();
         this.codeEditor = monaco.editor.create(node, _objectSpread(_objectSpread({}, options), {}, {
           model: this.model
@@ -82,7 +83,8 @@ export var E2Editor = (_dec = singleton(), _dec(_class = /*#__PURE__*/function (
       // create前钩子函数调用
       this.handleEditorLanguageFeatureBefore(options.language);
       if (!isDiff) {
-        this.model = monaco.editor.createModel(options.value || '', options.language);
+        var _options$model2;
+        this.model = (_options$model2 = options.model) !== null && _options$model2 !== void 0 ? _options$model2 : monaco.editor.createModel(options.value || '', options.language, options.uri);
         this.codeEditor = monaco.editor.create(node, _objectSpread(_objectSpread({}, options), {}, {
           model: this.model
         }));
@@ -126,6 +128,21 @@ export var E2Editor = (_dec = singleton(), _dec(_class = /*#__PURE__*/function (
         this.editorHandlerRegistry.handleAfter(this.language, this.codeEditor);
       }
     }
+  }], [{
+    key: "createMonacoModel",
+    value: function createMonacoModel(value, language, uri) {
+      return monaco.editor.createModel(value, language, uri);
+    }
+  }, {
+    key: "createMonacoEditor",
+    value: function createMonacoEditor(node, options) {
+      return monaco.editor.create(node, options);
+    }
+  }, {
+    key: "createMonacoDiffEditor",
+    value: function createMonacoDiffEditor(node, options) {
+      return monaco.editor.createDiffEditor(node, options);
+    }
   }]);
   return E2Editor;
 }()) || _class);

package/es/monaco-environment.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _class;
+var _MonacoEnvironment;
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -256,19 +256,19 @@ export var MonacoEnvironment = /*#__PURE__*/function () {
   }]);
   return MonacoEnvironment;
 }();
-_class = MonacoEnvironment;
+_MonacoEnvironment = MonacoEnvironment;
 MonacoEnvironment.loaders = [];
 MonacoEnvironment.preLoaders = [];
 MonacoEnvironment.moduleLoadStart = false;
 MonacoEnvironment.moduleInitDeferred = new Deferred();
 MonacoEnvironment.lazy = false;
 MonacoEnvironment.setContainer = function (container) {
-  _class.container = container;
+  _MonacoEnvironment.container = container;
   if (!container.isBound(MonacoEnvironmentBound)) {
     container.register(MonacoEnvironmentBound, {
       useValue: true
     });
-    _class.container.register(MonacoLoaderConfig, {
+    _MonacoEnvironment.container.register(MonacoLoaderConfig, {
       useValue: DefaultLoaderConfig
     });
     container.register(MonacoLoader);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-cofine-editor-core",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "",
   "keywords": [
     "libro",
@@ -33,9 +33,9 @@
     "src"
   ],
   "dependencies": {
-    "@difizen/libro-cofine-editor-contribution": "^0.1.14",
+    "@difizen/libro-cofine-editor-contribution": "^0.1.16",
     "@difizen/mana-app": "latest",
-    "@difizen/monaco-editor-core": "latest",
+    "@difizen/monaco-editor-core": "0.39.4",
     "debug": "^4.3.2",
     "reflect-metadata": "^0.1.13"
   },

package/src/e2-editor.ts

@@ -19,6 +19,27 @@ export const IsDiff = Symbol('IsDiff');
 export class E2Editor<
   T extends monaco.editor.IStandaloneCodeEditor | monaco.editor.IStandaloneDiffEditor,
 > {
+  static createMonacoModel(
+    value: string,
+    language?: string,
+    uri?: monaco.Uri,
+  ): monaco.editor.ITextModel {
+    return monaco.editor.createModel(value, language, uri);
+  }
+
+  static createMonacoEditor(
+    node: HTMLElement,
+    options: Options,
+  ): monaco.editor.IStandaloneCodeEditor {
+    return monaco.editor.create(node, options);
+  }
+
+  static createMonacoDiffEditor(
+    node: HTMLElement,
+    options: Options,
+  ): monaco.editor.IStandaloneDiffEditor {
+    return monaco.editor.createDiffEditor(node, options);
+  }
   codeEditor!: T;
   model!: monaco.editor.ITextModel;
   modified!: monaco.editor.ITextModel;
@@ -49,11 +70,9 @@ export class E2Editor<
     if (MonacoEnvironment.lazy) {
       // 资源懒加载场景
       if (!isDiff) {
-        this.model = monaco.editor.createModel(
-          options.value || '',
-          options.language,
-          options.uri,
-        );
+        this.model =
+          options.model ??
+          monaco.editor.createModel(options.value || '', options.language, options.uri);
         const language = this.model.getLanguageId();
         (this as E2Editor<monaco.editor.IStandaloneCodeEditor>).codeEditor =
           monaco.editor.create(node, { ...options, model: this.model });
@@ -112,7 +131,9 @@ export class E2Editor<
       this.handleEditorLanguageFeatureBefore(options.language);
 
       if (!isDiff) {
-        this.model = monaco.editor.createModel(options.value || '', options.language);
+        this.model =
+          options.model ??
+          monaco.editor.createModel(options.value || '', options.language, options.uri);
         (this as E2Editor<monaco.editor.IStandaloneCodeEditor>).codeEditor =
           monaco.editor.create(node, { ...options, model: this.model });
         this.toDispose.push(