code translated to es6

yscoder · yscoder · commit 814672aa62c4 · 2017-04-12T22:38:27.000+08:00
diff --git a/README.md b/README.md
@@ -1,18 +1,18 @@
 # qiniu-upload-image
 
-一个VS Code插件，写Markdown时可以快捷上传本地图片获取七牛图床外链。
+一个 VS Code 插件，写 Markdown 时可以快捷上传本地图片获取七牛图床外链。
 
 ## Features
 
 ![priview](https://raw.githubusercontent.com/yscoder/vscode-qiniu-upload-image/master/features/preview.gif)
 
-> Tip: 只有在编辑Markdown时插件才可使用，启动快捷键 `Ctrl+Q`。
+> Tips: 只有在编辑 Markdown 时插件才可使用，启动快捷键 `Ctrl+Q`。
 
 ## Install
 
 `Ctrl+P` 输入命令：
 
-```
+```bash
 ext install qiniu-upload-image
 ```
 
@@ -32,8 +32,10 @@ ext install qiniu-upload-image
     // 七牛图片上传空间
     "qiniu.bucket": "ysblog",
 
-    // 七牛图片上传路径，参数化命名，暂时支持 ${fileName}、${date}、${dateTime}
-    // 如：${fileName}-${date} 生成格式为 picName-20160725.jpg
+    // 七牛图片上传路径，参数化命名，暂时支持 ${fileName}、${mdFileName}、${date}、${dateTime}
+    // 示例：
+    //   ${fileName}-${date} -> picName-20160725.jpg
+    //   ${mdFileName}-${dateTime} -> markdownName-20170412222810.jpg
     "qiniu.remotePath": "${fileName}",
 
     // 七牛图床域名
@@ -45,11 +47,4 @@ ext install qiniu-upload-image
 
 [https://github.com/yscoder/vscode-qiniu-upload-image](https://github.com/yscoder/vscode-qiniu-upload-image)
 
-
-
-## For more information
-
-* [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown)
-* [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/)
-
 **Enjoy!**
diff --git a/extension.js b/extension.js
@@ -1,69 +1,47 @@
-// The module 'vscode' contains the VS Code extensibility API
-// Import the module and reference it with the alias vscode in your code below
-var vscode = require('vscode');
-var path = require('path');
-var qnUpload = require('./lib/upload');
+const { window, commands, workspace } = require('vscode')
+const path = require('path')
+const qnUpload = require('./lib/upload')
 
 // this method is called when your extension is activated
-// your extension is activated the very first time the command is executed
-function activate(context) {
+exports.activate = context => {
 
-    // Use the console to output diagnostic information (console.log) and errors (console.error)
-    // This line of code will only be executed once when your extension is activated
-    //console.log('Congratulations, your extension "qiniu-upload-image" is now active!');
-    var window = vscode.window;
-    var config = vscode.workspace.getConfiguration('qiniu');
-    
+    console.log('qiniu-upload-image is active!')
 
-    if(!config.enable) return;
+    const config = workspace.getConfiguration('qiniu')
 
-    
-    // The command has been defined in the package.json file
-    // Now provide the implementation of the command with  registerCommand
-    // The commandId parameter must match the command field in package.json
-    var disposable = vscode.commands.registerCommand('extension.qiniu.upload', function () {
-        // The code you place here will be executed every time your command is executed
-        var editor = window.activeTextEditor;
-        var mdFilePath = editor.document.fileName;
-        var mdFileName = path.basename(mdFilePath, path.extname(mdFilePath));
+    if (!config.enable) return
+
+    const disposable = commands.registerCommand('extension.qiniu.upload', () => {
+
+        const editor = window.activeTextEditor
+        const mdFilePath = editor.document.fileName
+        const mdFileName = path.basename(mdFilePath, path.extname(mdFilePath))
 
         if (!editor) {
-            window.showErrorMessage("没有打开编辑窗口");
-            return;
+            window.showErrorMessage('没有打开编辑窗口')
+            return
         }
 
-        // Display a message box to the user
-        //vscode.window.showInformationMessage('插件就绪!');
         window.showInputBox({
             placeHolder: '输入一个本地图片地址'
-        }).then(function(path){
-
-            return qnUpload(config, path, mdFileName);
-
-        }, function(err){
-
-           window.showErrorMessage(err);
-
-        }).then(function(ret){
-
-            var img = '!['+ ret.name +']('+ ret.url +')';
-            editor.edit(function(textEditorEdit) {
-                textEditorEdit.insert(editor.selection.active, img);
+        }).then(path => qnUpload(config, path, mdFileName)
+            , err => {
+                window.showErrorMessage(err)
+            }
+            ).then(({ name, url }) => {
+                console.log('Upload success!')
+
+                const img = `![${name}](${url})`
+                editor.edit(textEditorEdit => {
+                    textEditorEdit.insert(editor.selection.active, img)
+                })
+            }, err => {
+                window.showErrorMessage(err)
             })
+    })
 
-        }, function(err){
-
-            window.showErrorMessage(err);
-
-        });
-        
-    });
-
-    context.subscriptions.push(disposable);
+    context.subscriptions.push(disposable)
 }
-exports.activate = activate;
 
 // this method is called when your extension is deactivated
-function deactivate() {
-}
-exports.deactivate = deactivate;
+exports.deactivate = () => { }
diff --git a/jsconfig.json b/jsconfig.json
@@ -1,10 +1,10 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
-        "target": "ES5",
+        "module": "es2015",
+        "target": "ES6",
         "noLib": true
     },
     "exclude": [
         "node_modules"
     ]
-}
+}
diff --git a/lib/upload.js b/lib/upload.js
@@ -1,84 +1,82 @@
-var qiniu = require('qiniu');
-var path = require('path');
-var url = require('url');
-var paramExp = /\${(\w+)}/g;
+const qiniu = require('qiniu')
+const path = require('path')
+const url = require('url')
+
+const PutPolicy = qiniu.rs.PutPolicy
+const PutExtra = qiniu.io.PutExtra
 
 // 上传策略函数
-function uptoken(bucket, key) {
-    var putPolicy = new qiniu.rs.PutPolicy(bucket + ':' + key);
-    return putPolicy.token();
-}
+const uptoken = (bucket, key) => new PutPolicy(`${bucket}:${key}`).token()
 
 // 默认参数
-function fileParam(file, mdFile){
-    var dt = new Date();
-    var y = dt.getFullYear();
-    var m = dt.getMonth() + 1;
-    var d = dt.getDate();
-    var h = dt.getHours();
-    var mm = dt.getMinutes();
-    var s = dt.getSeconds();
-    var ap = Array.prototype;
-
-    var date = y + '' + m + '' + d;
-    var ext = path.extname(file);
+const formatParam = (file, mdFileName) => {
+    const dt = new Date()
+    const y = dt.getFullYear()
+    const m = dt.getMonth() + 1
+    const d = dt.getDate()
+    const h = dt.getHours()
+    const mm = dt.getMinutes()
+    const s = dt.getSeconds()
+
+    const date = `${y}${m}${d}`
+    var ext = path.extname(file)
 
     return {
-        date: date,
-        dateTime: date + '' + h + '' + mm + '' + s,
+        date,
+        dateTime: `${date}${h}${mm}${s}`,
         fileName: path.basename(file, ext),
-        ext: ext,
-        mdFileName: mdFile
+        ext,
+        mdFileName
     }
 }
 
-module.exports = function(config, file, mdFile) {
-    qiniu.conf.ACCESS_KEY = config.access_key;
-    qiniu.conf.SECRET_KEY = config.secret_key;
+const formatString = (tplString, data) => {
+    const keys = Object.keys(data)
+    const values = keys.map(k => data[k])
 
-    //要上传的空间
-    var bucket = config.bucket;
+    return new Function(keys.join(','), 'return `' + tplString + '`').apply(null, values)
+}
 
-    var domain = config.domain;
+module.exports = ({
+    access_key,
+    secret_key,
+    bucket,
+    domain,
+    remotePath }, file, mdFile) => {
 
-    if (/^".+"$/.test(file)) {
-        file = file.substring(1, file.length - 1);
-    }
-    //要上传文件的本地路径
-    var localFile = file;
-    
-    var param = fileParam(file, mdFile);
-    
-    //上传到七牛后保存的文件名
-    var remotePath = (config.remotePath + '${ext}').replace(paramExp, function(exp, prop){
-        return param[prop] || '';
-    });
+    qiniu.conf.ACCESS_KEY = access_key
+    qiniu.conf.SECRET_KEY = secret_key
 
+    let localFile = file
+    if (/^".+"$/.test(localFile)) {
+        localFile = file.substring(1, file.length - 1)
+    }
 
+    // 预设参数值
+    const param = formatParam(localFile, mdFile)
+    //上传到七牛后保存的文件名
+    const saveFile = formatString(remotePath + '${ext}', param)
     //生成上传 Token
-    var token = uptoken(bucket, remotePath);
+    const token = uptoken(bucket, saveFile)
 
-    return new Promise(function(resolve, reject) {
+    return new Promise((resolve, reject) => {
 
-        var extra = new qiniu.io.PutExtra();
+        const extra = new PutExtra()
 
-        qiniu.io.putFile(token, remotePath, localFile, extra, function(err, ret) {
+        qiniu.io.putFile(token, saveFile, localFile, extra, (err, { key }) => {
 
-            if(!err) {
+            if (!err) {
                 // 上传成功， 处理返回值
                 resolve({
-                    name: path.basename(ret.key, param.ext),
-                    url: url.resolve(domain, remotePath)
-                });
-                     
+                    name: path.basename(key, param.ext),
+                    url: url.resolve(domain, saveFile)
+                })
             } else {
                 // 上传失败， 处理返回代码
-                reject(err);
+                reject(err)
             }
-
-        });
+        })
     })
-
 }
 
 
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "qiniu-upload-image",
     "displayName": "qiniu-upload-image",
     "description": "Picture upload generate markdown link format.",
-    "version": "0.0.7",
+    "version": "0.1.0",
     "publisher": "imys",
     "engines": {
         "vscode": "^1.0.0"
@@ -15,12 +15,14 @@
     ],
     "main": "./extension",
     "contributes": {
-        "keybindings": [{
-            "command": "extension.qiniu.upload",
-            "key": "ctrl+q",
-            "mac": "ctrl+q",
-            "when": "editorTextFocus && editorLangId == 'markdown'"
-        }],
+        "keybindings": [
+            {
+                "command": "extension.qiniu.upload",
+                "key": "ctrl+q",
+                "mac": "ctrl+q",
+                "when": "editorTextFocus && editorLangId == 'markdown'"
+            }
+        ],
         "configuration": {
             "type": "object",
             "title": "qiniu configuration",
@@ -62,7 +64,7 @@
         "postinstall": "node ./node_modules/vscode/bin/install"
     },
     "devDependencies": {
-        "vscode": "^0.11.0"
+        "vscode": "^1.1.0"
     },
     "dependencies": {
         "qiniu": "^6.1.11"
@@ -72,4 +74,4 @@
         "type": "git",
         "url": "git+https://github.com/yscoder/vscode-qiniu-upload-image.git"
     }
-}
+}
diff --git a/qiniu-upload-image-0.1.0.vsix b/qiniu-upload-image-0.1.0.vsix

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "module": "commonjs",`
`4`		`- "target": "ES5",`
	`3`	`+ "module": "es2015",`
	`4`	`+ "target": "ES6",`
`5`	`5`	`"noLib": true`
`6`	`6`	`},`
`7`	`7`	`"exclude": [`
`8`	`8`	`"node_modules"`
`9`	`9`	`]`
`10`		`-}`
	`10`	`+}`