0&&e-this._q[0].interval>=this._d;)this._o.onNext(this._q.shift().value)},e.prototype.error=function(t){this._o.onError(t)},e.prototype.completed=function(){for(var t=this._s.now();this._q.length>0&&t-this._q[0].interval>=this._d;)this._o.onNext(this._q.shift().value);this._o.onCompleted()},e}(o);u.skipLastWithTime=function(t,e){return D(e)||(e=f),new Z(this,t,e)};var et=function(t){function e(e,n,r){this.source=e,this._d=n,this._s=r,t.call(this)}return i(e,t),e.prototype.subscribeCore=function(t){return this.source.subscribe(new nt(t,this._d,this._s))},e}(h),nt=function(t){function e(e,n,r){this._o=e,this._d=n,this._s=r,this._q=[],t.call(this)}return i(e,t),e.prototype.next=function(t){var e=this._s.now();for(this._q.push({interval:e,value:t});this._q.length>0&&e-this._q[0].interval>=this._d;)this._q.shift()},e.prototype.error=function(t){this._o.onError(t)},e.prototype.completed=function(){for(var t=this._s.now();this._q.length>0;){var e=this._q.shift();t-e.interval<=this._d&&this._o.onNext(e.value)}this._o.onCompleted()},e}(o);u.takeLastWithTime=function(t,e){return D(e)||(e=f),new et(this,t,e)},u.takeLastBufferWithTime=function(t,e){var n=this;return D(e)||(e=f),new c((function(r){var i=[];return n.subscribe((function(n){var r=e.now();for(i.push({interval:r,value:n});i.length>0&&r-i[0].interval>=t;)i.shift()}),(function(t){r.onError(t)}),(function(){for(var n=e.now(),o=[];i.length>0;){var s=i.shift();n-s.interval<=t&&o.push(s.value)}r.onNext(o),r.onCompleted()}))}),n)};var rt=function(t){function e(e,n,r){this.source=e,this._d=n,this._s=r,t.call(this)}function n(t,e){e.onCompleted()}return i(e,t),e.prototype.subscribeCore=function(t){return new _(this._s.scheduleFuture(t,this._d,n),this.source.subscribe(t))},e}(h);u.takeWithTime=function(t,e){return D(e)||(e=f),new rt(this,t,e)};var it=function(t){function e(e,n,r){this.source=e,this._d=n,this._s=r,this._open=!1,t.call(this)}function n(t,e){e._open=!0}return i(e,t),e.prototype.subscribeCore=function(t){return new _(this._s.scheduleFuture(this,this._d,n),this.source.subscribe(new ot(t,this)))},e}(h),ot=function(t){function e(e,n){this._o=e,this._p=n,t.call(this)}return i(e,t),e.prototype.next=function(t){this._p._open&&this._o.onNext(t)},e.prototype.error=function(t){this._o.onError(t)},e.prototype.completed=function(){this._o.onCompleted()},e}(o);u.skipWithTime=function(t,e){return D(e)||(e=f),new it(this,t,e)};var st=function(t){function e(e,n,r){this.source=e,this._st=n,this._s=r,t.call(this)}function n(t,e){e._open=!0}return i(e,t),e.prototype.subscribeCore=function(t){return this._open=!1,new _(this._s.scheduleFuture(this,this._st,n),this.source.subscribe(new ut(t,this)))},e}(h),ut=function(t){function e(e,n){this._o=e,this._p=n,t.call(this)}return i(e,t),e.prototype.next=function(t){this._p._open&&this._o.onNext(t)},e.prototype.error=function(t){this._o.onError(t)},e.prototype.completed=function(){this._o.onCompleted()},e}(o);return u.skipUntilWithTime=function(t,e){return D(e)||(e=f),new st(this,t,e)},u.takeUntilWithTime=function(t,e){D(e)||(e=f);var n=this;return new c((function(r){return new _(e.scheduleFuture(r,t,(function(t,e){e.onCompleted()})),n.subscribe(r))}),n)},u.throttle=function(t,e){D(e)||(e=f);var n=+t||0;if(n<=0)throw new RangeError("windowDuration cannot be less or equal zero.");var r=this;return new c((function(t){var i=0;return r.subscribe((function(r){var o=e.now();(0===i||o-i>=n)&&(i=o,t.onNext(r))}),(function(e){t.onError(e)}),(function(){t.onCompleted()}))}),r)},n}))}).call(this,n(0)(t))},function(t,e){t.exports=require("events")},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});const r=n(2),i=n(20),o=n(21),s=n(22),u=["mermaid","mmd","mscgen","msgenny","xu"];let c=null,h=null,a=null;e.PreviewSeqDiagDocumentContentProvider=class{constructor(){this._currentSnippet=i.DefaultCodeSnippet.instance}setCurrentWebViewPanel(t){h=t}getExtensionPath(t){a=t}update(t){u.indexOf(r.window.activeTextEditor.document.languageId)>-1&&this.refresh()}provideTextDocumentContent(t,e){return c}refresh(){let t=r.window.activeTextEditor;if(!t)return c;switch(t.document.languageId){case"mermaid":case"mmd":this._currentSnippet=s.MermaidCodeSnippet.instance;break;case"mscgen":case"msgenny":case"xu":this._currentSnippet=o.MscgenCodeSnippet.instance;break;default:this._currentSnippet=i.DefaultCodeSnippet.instance}this._currentSnippet.createCodeSnippet(t.document.languageId,a).then(t=>{c=t,h&&h.webview&&(h.webview.html=t)}).catch()}}},function(t,e,n){"use strict";var r=this&&this.__awaiter||function(t,e,n,r){return new(n||(n=Promise))((function(i,o){function s(t){try{c(r.next(t))}catch(t){o(t)}}function u(t){try{c(r.throw(t))}catch(t){o(t)}}function c(t){t.done?i(t.value):new n((function(e){e(t.value)})).then(s,u)}c((r=r.apply(t,e||[])).next())}))};Object.defineProperty(e,"__esModule",{value:!0});const i=n(2),o=n(3);class s{constructor(){}static get instance(){return this._instance||(this._instance=new s),this._instance}createCodeSnippet(t,e){return r(this,void 0,void 0,(function*(){return this.extractSnippet(t,e)}))}extractSnippet(t,e){return r(this,void 0,void 0,(function*(){let n=i.window.activeTextEditor.document.getText();return this.previewSnippet(t,e,n)}))}errorSnippet(t){return r(this,void 0,void 0,(function*(){return o.Misc.getFormattedHtml("",t)}))}previewSnippet(t,e,n){return r(this,void 0,void 0,(function*(){return o.Misc.getFormattedHtml("\n ",`\n ${n}\n `)}))}}e.DefaultCodeSnippet=s},function(t,e,n){"use strict";var r=this&&this.__awaiter||function(t,e,n,r){return new(n||(n=Promise))((function(i,o){function s(t){try{c(r.next(t))}catch(t){o(t)}}function u(t){try{c(r.throw(t))}catch(t){o(t)}}function c(t){t.done?i(t.value):new n((function(e){e(t.value)})).then(s,u)}c((r=r.apply(t,e||[])).next())}))};Object.defineProperty(e,"__esModule",{value:!0});const i=n(2),o=n(3);var s,u;!function(t){t.Classic="classic",t.Cygne="cygne",t.Fountainpen="fountainpen",t.Lazy="lazy",t.Pegasse="pegasse"}(s||(s={})),function(t){t.Fixed="fixed",t.Stretch="stretch"}(u||(u={}));class c{}class h{constructor(){this._configMscgen=new c,this._configMscgen.fixedNamedStyle=s.Cygne,this._configMscgen.horizontalAlignment=u.Stretch;var t=i.workspace.getConfiguration("previewSeqDiag");if(t&&t.mscgen){switch(t.mscgen.fixedNamedStyle){case s.Classic:case s.Cygne:case s.Fountainpen:case s.Lazy:case s.Pegasse:this._configMscgen.fixedNamedStyle=t.mscgen.fixedNamedStyle}switch(t.mscgen.horizontalAlignment){case u.Fixed:this._configMscgen.horizontalAlignment=u.Fixed}}}static get instance(){return this._instance||(this._instance=new h),this._instance}createCodeSnippet(t,e){return r(this,void 0,void 0,(function*(){return this.extractSnippet(t,e)}))}extractSnippet(t,e){return r(this,void 0,void 0,(function*(){let n=i.window.activeTextEditor.document.getText();return this.previewSnippet(t,e,n)}))}errorSnippet(t){return r(this,void 0,void 0,(function*(){return o.Misc.getFormattedHtml("",t)}))}previewSnippet(t,e,n){return r(this,void 0,void 0,(function*(){return o.Misc.getFormattedHtml(`\n \r\n \r\n `\r\n + ((this._configMscgen.horizontalAlignment === Alignment.Stretch) ? `` : ``)\r\n ,\r\n `\r\n \r\n \r\n ${payLoad}\r\n \r\n
\r\n \r\n `);\r\n }\r\n}\r\n","'use strict';\r\n\r\nimport * as vscode from 'vscode';\r\nimport * as fs from 'fs';\r\nimport * as Path from 'path';\r\nimport { workspace, window, commands, ExtensionContext } from 'vscode';\r\nimport { CodeSnippetInterface } from './codeSnippetInterface';\r\nimport { Misc } from './misc';\r\n\r\n\r\ntype StyleName = \"dark\" | \"forest\" | \"neutral\";\r\nnamespace StyleName{\r\n export const Dark = \"dark\"\r\n export const Forest = \"forest\"\r\n export const Neutral = \"neutral\"\r\n}\r\n\r\nconst BackgroundColorDefault = \"#fafaf6\";\r\n\r\nclass ConfigMermaid\r\n{\r\n public fixedStyle: StyleName;\r\n public fixedBackgroundColor: string;\r\n}\r\n\r\n\r\nexport class MermaidCodeSnippet implements CodeSnippetInterface\r\n{\r\n private static _instance:MermaidCodeSnippet;\r\n\r\n private _configMermaid: ConfigMermaid = null;\r\n\r\n private constructor()\r\n { \r\n this._configMermaid = new ConfigMermaid();\r\n\r\n // defaults\r\n this._configMermaid.fixedStyle = StyleName.Forest;\r\n this._configMermaid.fixedBackgroundColor = BackgroundColorDefault;\r\n\r\n var config = vscode.workspace.getConfiguration('previewSeqDiag');\r\n if(!!config && !!config.mermaid)\r\n {\r\n // fixedStyle\r\n switch(config.mermaid.fixedStyle)\r\n {\r\n case StyleName.Dark:\r\n case StyleName.Forest:\r\n case StyleName.Neutral:\r\n this._configMermaid.fixedStyle = config.mscgen.fixedNamedStyle;\r\n break;\r\n\r\n default:\r\n break;\r\n }\r\n\r\n // fixedBackgroundColor\r\n if(config.mermaid.fixedBackgroundColor != null)\r\n this._configMermaid.fixedBackgroundColor = config.mermaid.fixedBackgroundColor;\r\n }\r\n }\r\n\r\n public static get instance():MermaidCodeSnippet\r\n {\r\n if (!this._instance)\r\n this._instance = new MermaidCodeSnippet();\r\n \r\n return this._instance;\r\n }\r\n \r\n public async createCodeSnippet(languageId: string, extentiponPath:string): Promise\r\n {\r\n return this.extractSnippet(languageId, extentiponPath);\r\n }\r\n\r\n private async extractSnippet(languageId: string, extentiponPath:string): Promise\r\n {\r\n let editor = vscode.window.activeTextEditor;\r\n let text = editor.document.getText();\r\n\r\n try {\r\n text = text.replace(/%%[ \\t]+import[ \\t]?:[ \\t]?(.+)/g, (match, subsequenceFile) => {\r\n let dirname = editor.document.uri.fsPath\r\n .toString()\r\n .split(Path.sep);\r\n dirname.pop();\r\n const fileName = dirname.join(Path.sep) + Path.sep + subsequenceFile.trim();\r\n const importSequence = fs\r\n .readFileSync(fileName, 'utf8')\r\n .replace(/sequenceDiagram/g, '');\r\n return importSequence;\r\n });\r\n }\r\n catch (err) {\r\n console.error(err);\r\n }\r\n\r\n return this.previewSnippet(languageId, extentiponPath, text);\r\n }\r\n\r\n private async errorSnippet(error: string): Promise\r\n {\r\n return Misc.getFormattedHtml(\"\",error);\r\n }\r\n\r\n private async previewSnippet(languageId: string, extentiponPath:string, payLoad: string): Promise\r\n {\r\n return Misc.getFormattedHtml(\r\n `\r\n \r\n \r\n `,\r\n `\r\n \r\n \r\n `);\r\n }\r\n}\r\n","module.exports = require(\"fs\");"],"sourceRoot":""}
\ No newline at end of file
diff --git a/package.json b/package.json
index a69da95..9ed643c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "previewseqdiag-vscode",
"displayName": "Preview Sequence Diagrams",
"description": "An extension for vscode specialized for the preview function of mermaid, mscgen and other.",
- "version": "0.2.1",
+ "version": "0.2.2",
"publisher": "arichika",
"author": "arichika.taniguchi @arichika",
"license": "GPL-3.0",
@@ -41,7 +41,7 @@
"onLanguage:msgenny",
"onLanguage:xu"
],
- "main": "./out/src/extension",
+ "main": "./dist/extension",
"contributes": {
"languages": [
{
@@ -153,7 +153,10 @@
}
},
"scripts": {
- "vscode:prepublish": "tsc -p ./",
+ "vscode:prepublish": "webpack --mode production",
+ "webpack": "webpack --mode development",
+ "webpack-dev": "webpack --mode development --watch",
+ "test-compile": "tsc -p ./",
"compile": "tsc -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install",
"test": "node ./node_modules/vscode/bin/test"
@@ -161,17 +164,20 @@
"dependencies": {
"d3": "^4.13.0",
"dagre-d3-renderer": "^0.5.8",
- "mermaid": "^8.0.0",
- "mscgenjs": "^3.0.0",
- "mscgenjs-inpage": "^2.0.0",
+ "mermaid": "^8.4.4",
+ "mscgenjs": "^4.0.2",
+ "mscgenjs-inpage": "^2.0.12",
"rx": "^4.1.0"
},
"devDependencies": {
- "@types/mocha": "^5.2.0",
- "@types/node": "^8.10.17",
+ "@types/mocha": "^5.2.7",
+ "@types/node": "^8.10.59",
"mocha": "^5.2.0",
- "typescript": "^2.8.3",
- "vscode": "^1.1.25"
+ "ts-loader": "^6.2.1",
+ "typescript": "^2.9.2",
+ "vscode": "^1.1.36",
+ "webpack": "^4.41.4",
+ "webpack-cli": "^3.3.10"
},
"extensionDependencies": [
"mscgenjs.vscode-mscgen"
diff --git a/previewseqdiag-vscode-0.2.2.vsix b/previewseqdiag-vscode-0.2.2.vsix
new file mode 100644
index 0000000..8076f27
Binary files /dev/null and b/previewseqdiag-vscode-0.2.2.vsix differ
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 0000000..a76643b
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,41 @@
+//@ts-check
+
+'use strict';
+
+const path = require('path');
+
+/**@type {import('webpack').Configuration}*/
+const config = {
+ target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
+
+ entry: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+ output: {
+ // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
+ path: path.resolve(__dirname, 'dist'),
+ filename: 'extension.js',
+ libraryTarget: 'commonjs2',
+ devtoolModuleFilenameTemplate: '../[resource-path]'
+ },
+ devtool: 'source-map',
+ externals: {
+ vscode: 'commonjs vscode' // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/
+ },
+ resolve: {
+ // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
+ extensions: ['.ts', '.js']
+ },
+ module: {
+ rules: [
+ {
+ test: /\.ts$/,
+ exclude: /node_modules/,
+ use: [
+ {
+ loader: 'ts-loader'
+ }
+ ]
+ }
+ ]
+ }
+};
+module.exports = config;
\ No newline at end of file
## Features
@@ -25,6 +25,14 @@ This is usefull to avoid multipicate the same code on many files.
[CHANGELOG.md](CHANGELOG.md)
+### 0.2.2
+
+* Change of link to official mermaid site.
+ * Thank you for PR, https://github.com/silenti0
+ * https://github.com/arichika/previewseqdiag-vscode/pull/16
+* Update dependencies to latest.
+ * `mermaid 8.4.4`, `mscgenjs 4.0.2`, `mscgenjs-inpage 2.0.12` .
+
### 0.2.1
* Update document. only...
@@ -91,9 +99,9 @@ e.g. add to User Settings,
result is.
-
+
-
+
----
@@ -104,6 +112,8 @@ result is.
* [searKing/preview-vscode](https://github.com/searKing/preview-vscode)
* [@XavierBoubert](https://github.com/XavierBoubert)
* Thanks [PR](https://github.com/arichika/previewseqdiag-vscode/pull/8) for Great Special feature
+* [@silenti0](https://github.com/silenti0)
+ * Thanks [PR](https://github.com/arichika/previewseqdiag-vscode/pull/16) for Updates
### mermaid
@@ -118,11 +128,11 @@ result is.
### samples
-MscGen, msc, cygne, with dark theme.
-
+MscGen, msc, cygne, with dark theme.
+
-Mermaid, graph.
-
+Mermaid, graph.
+
-Mermaid, gantt.
-
+Mermaid, gantt.
+
diff --git a/dist/extension.js b/dist/extension.js
new file mode 100644
index 0000000..b77d015
--- /dev/null
+++ b/dist/extension.js
@@ -0,0 +1,2 @@
+module.exports=function(t){var e={};function n(r){if(e[r])return e[r].exports;var i=e[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(r,i,function(e){return t[e]}.bind(null,i));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=7)}([function(t,e){t.exports=function(t){return t.webpackPolyfill||(t.deprecate=function(){},t.paths=[],t.children||(t.children=[]),Object.defineProperty(t,"loaded",{enumerable:!0,get:function(){return t.l}}),Object.defineProperty(t,"id",{enumerable:!0,get:function(){return t.i}}),t.webpackPolyfill=1),t}},function(t,e,n){(function(t){var r;(function(i){var o={function:!0,object:!0};function s(t){return t&&t.Object===Object?t:null}var u,c=o[typeof e]&&e&&!e.nodeType?e:null,h=o[typeof t]&&t&&!t.nodeType?t:null,a=s(c&&h&&"object"==typeof global&&global),l=s(o[typeof self]&&self),p=s(o[typeof window]&&window),f=h&&h.exports===c?c:null,d=s(o[typeof this]&&this),b=a||p!==(d&&d.window)&&p||l||d||Function("return this")(),v={internals:{},config:{Promise:b.Promise},helpers:{}},_=v.helpers.noop=function(){},y=v.helpers.identity=function(t){return t},w=v.helpers.defaultNow=Date.now,m=v.helpers.defaultComparer=function(t,e){return mt(t,e)},g=v.helpers.defaultSubComparer=function(t,e){return t>e?1:t