From 148cbad1161345cac578f76ed5c4889c39707a93 Mon Sep 17 00:00:00 2001
From: nllwrq <wangfei2017@xinhua.org>
Date: Fri, 19 Oct 2018 10:07:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=B9=E9=85=8Dvue?=
 =?UTF-8?q?=E4=B8=AD=E5=A4=96=E9=93=BE=E7=9A=84js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.js | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 0945e30..e3a92b5 100644
--- a/index.js
+++ b/index.js
@@ -10,19 +10,36 @@ const log = require('./util').log;
 // cache parsed md
 const markdownCodes = {};
 
+//通过vue文件中的src获取js里面内容，从而解决js外链的写法
+const getScriptContentBySrc = (vueSrc, jsSrc) => {
+  var vuefull = vueSrc.split('\\');
+  vuefull.pop();
+  vueSrc = vuefull.join('\\');
+
+  const jsFullSrc = path.join(vueSrc, jsSrc);
+  return fs.readFileSync(jsFullSrc, 'utf-8');
+}
 // handlers
 exports.handlers = {
-  beforeParse (e) {
+  beforeParse(e) {
     if (/\.vue$/.test(e.filename)) {
       log(`parse file begin: ${e.filename}`);
 
       // extract script
+      let code = '',
+        fileContent = '';
       const parsedComponent = compiler.parseComponent(e.source);
-      const code = parsedComponent.script ? parsedComponent.script.content : '';
-
+      // 判断是否为外链的js
+      if (parsedComponent.script.src) {
+        code = getScriptContentBySrc(e.filename, parsedComponent.script.src);
+        fileContent = e.source.replace(/<script(([\s\S])*)?>(([\s\S])*)?<\/script>/g, `<script>${code}<\/script>`);
+      } else {
+        code = parsedComponent.script ? parsedComponent.script.content : '';
+        fileContent = e.source
+      }
       // extract SFC info
       const options = Object.assign({}, config, {
-        filecontent: e.source
+        filecontent: fileContent
       });
 
       try {
@@ -42,6 +59,7 @@ exports.handlers = {
 
         // extract data
         const result = md.stdout.toString();
+        
         const matches = result.match(/JSDOC_VUEDOC_BEGIN([\s\S]*?)JSDOC_VUEDOC_END/);
 
         // cache md content
@@ -49,7 +67,7 @@ exports.handlers = {
         if (matches) {
           markdownCodes[e.filename] = matches[1].trim();
         }
-      } catch(e) {
+      } catch (e) {
         log(`parse SFC info error: ${e.filename}`);
         log(e);
       }
@@ -76,7 +94,7 @@ exports.defineTags = function (dictionary) {
 
   dictionary.defineTag(tag, {
     mustHaveValue: false,
-    onTagged (doclet, tag) {
+    onTagged(doclet, tag) {
       const componentName = doclet.meta.filename.split('.').slice(0, -1).join('.');
 
       doclet.scope = 'vue';

From 124f330be0c95b5f8b447db11d6f49ec97a284d8 Mon Sep 17 00:00:00 2001
From: nllwrq <wangfei2017@xinhua.org>
Date: Fri, 19 Oct 2018 10:34:02 +0800
Subject: [PATCH 2/4] 1.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0f57904..87c42f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsdoc-vuedoc",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A jsdoc3 plugin use `@vuedoc/md`",
   "main": "index.js",
   "scripts": {

From e070dff45a4fcc5373b4738b61ae7f9bdbe7ce6c Mon Sep 17 00:00:00 2001
From: nllwrq <wangfei2017@xinhua.org>
Date: Fri, 19 Oct 2018 10:55:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 87c42f9..71f925b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "jsdoc-vuedoc",
-  "version": "1.2.1",
+  "name": "xh-jsdoc-vuedoc",
+  "version": "1.2.0",
   "description": "A jsdoc3 plugin use `@vuedoc/md`",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/ccqgithub/jsdoc-vuedoc#readme",
   "dependencies": {
-    "@vuedoc/md": "^1.4.1",
+    "@xh-vuedoc/md": "^1.4.1",
     "vue-template-compiler": "^2.5.17"
   }
 }

From 79492a3c2a65022e7bf47eef7a88098b825c38b5 Mon Sep 17 00:00:00 2001
From: nllwrq <wangfei2017@xinhua.org>
Date: Fri, 19 Oct 2018 14:17:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=88=B0=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 71f925b..0f57904 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "xh-jsdoc-vuedoc",
+  "name": "jsdoc-vuedoc",
   "version": "1.2.0",
   "description": "A jsdoc3 plugin use `@vuedoc/md`",
   "main": "index.js",
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/ccqgithub/jsdoc-vuedoc#readme",
   "dependencies": {
-    "@xh-vuedoc/md": "^1.4.1",
+    "@vuedoc/md": "^1.4.1",
     "vue-template-compiler": "^2.5.17"
   }
 }