add license.

Author: yulongheli

LICENSE

@@ -0,0 +1,22 @@
+MIT LICENSE
+
+Copyright (c) 2018-present Alibaba Group Holding Limited. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,3 +1,18 @@
 # The diff algorithm of Patch.js
 
+## Installation
+
+```bash
+npm install patchjs-diff --save-dev
+```
+
+## API
+
+calcDiffData (oldString, newString)
+
+## Algorithm
+
+
+
+
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "patch-diff",
+  "name": "patchjs-diff",
   "description": "The diff algorithm of Patch.js",
   "version": "0.1.0",
   "author": {
@@ -10,6 +10,11 @@
     "patch",
     "patchjs"
   ],
+  "repository" : {
+    "type" : "git",
+    "url" : "https://github.com/patchjs/patchjs-diff.git"
+  },
+  "license": "MIT",
   "dependencies": {
     "babel-cli": "^6.24.0",
     "babel-core": "^6.24.0",
@@ -29,9 +34,6 @@
     "prepublish": "npm run build",
     "precommit": "npm run lint & npm run test"
   },
-  "publishConfig": {
-    "registry": "http://registry.npm.alibaba-inc.com"
-  },
   "devDependencies": {
     "co": "^4.6.0",
     "eslint": "^3.19.0",

src/index.js

@@ -14,8 +14,8 @@ export default function calcDiffData (localFileContent, fileContent) {
     return result;
   }
 
-  const oldMd5Map = checksum(localFileContent, CHUNK_SIZE);
-  const diffArray = roll(newFileContent, oldMd5Map, CHUNK_SIZE);
+  const localMd5Map = checksum(localFileContent, CHUNK_SIZE);
+  const diffArray = roll(fileContent, localMd5Map, CHUNK_SIZE);
   let arrayData = '';
   let lastItem = null;
   let matchedCount = 0;
@@ -56,7 +56,7 @@ export default function calcDiffData (localFileContent, fileContent) {
   return result;
 }
 
-function roll (content, oldMd5Map, chunkSize) {
+function roll (content, localMd5Map, chunkSize) {
   let diffDataArray = [];
   let buffer = '';
   let outBuffer = '';
@@ -71,7 +71,7 @@ function roll (content, oldMd5Map, chunkSize) {
     }
     buffer = content.substring(currentIndex, endIndex);
     const chunkMd5 = md5(buffer);
-    const matchedNo = findMatchedNo(chunkMd5, oldMd5Map, lastMatchNo);
+    const matchedNo = findMatchedNo(chunkMd5, localMd5Map, lastMatchNo);
 
     if (endIndex > len - 1) {
       if (outBuffer.length > 0 && outBuffer !== '') {
@@ -134,8 +134,8 @@ function checksum (content, chunkSize) {
   return md5Map;
 }
 
-function findMatchedNo (chunkMd5, oldMd5Map, lastMatchNo) {
-  let numArray = oldMd5Map[chunkMd5];
+function findMatchedNo (chunkMd5, localMd5Map, lastMatchNo) {
+  let numArray = localMd5Map[chunkMd5];
   if (!numArray) {
     return -1;
   } else {

test/index.js

@@ -2,8 +2,6 @@
 import expect from 'expect.js';
 import calcDiffData from '../src/index.js';
 import fs from 'fs';
-import urllib from 'urllib';
-import co from 'co';
 
 const testPath = __dirname;
 
@@ -22,29 +20,15 @@ function mergeCode (source, chunkSize, diffCodeArray) {
   return jsCode;
 }
 
-function request (url, callback) {
-  co(function * () {
-    const result = yield urllib.requestThunk(url);
-    let content = result.data.toString();
-    if (result.status === 200) {
-      callback(content);
-    } else {
-      callback(`Not Found: ${url}`);
-    }
-  }).catch((e) => {
-    callback(e);
-    console.error(e);
-  });
-}
-
 describe('index.js', () => {
-  it('calcDiffData (oldFileContent, newFileContent)', () => {
+  it('calcDiffData (localFileContent, fileContent)', () => {
     // same content
     expect(calcDiffData('var num = 0;', 'var num = 0;')).to.eql({
       l: 20,
       m: false,
       c: []
     });
+
     // replace content
     expect(calcDiffData('var num = 0;var str = "string1";', 'var num = 1;var str = "string2";')).to.eql({
       l: 20,
@@ -67,26 +51,6 @@ describe('index.js', () => {
     const source = fs.readFileSync(`${testPath}/data/antd-mobile.min.js`, {encoding: 'utf8'});
     const target = fs.readFileSync(`${testPath}/data/antd-mobile.min.change.js`, {encoding: 'utf8'});
     const diffResult = calcDiffData(source, target);
-    console.log(diffResult);
     expect(mergeCode(source, diffResult.l, diffResult.c)).to.eql(target);
-    // console.log(mergeCode(source, diffResult.l, diffResult.c));
-  });
-
-  it('mergeCDNCode ()', (done) => {
-    const urls = [
-      'http://alipay-rmsdeploy-assets-pre.cn-hangzhou.alipay.aliyun-inc.com/g/kbservcenter/kb-m-data/1.3.0/index.js',
-      'http://alipay-rmsdeploy-assets-pre.cn-hangzhou.alipay.aliyun-inc.com/g/kbservcenter/kb-m-data/1.3.1/index.js',
-      'http://alipay-rmsdeploy-assets-pre.cn-hangzhou.alipay.aliyun-inc.com/g/kbservcenter/kb-m-data/1.3.1/index-1.3.0.js'
-    ];
-
-    request(urls[0], (source) => {
-      request(urls[1], (target) => {
-        request(urls[2], (diffResult) => {
-          diffResult = JSON.parse(diffResult);
-          expect(mergeCode(source, diffResult.l, diffResult.c)).to.eql(target);
-          done();
-        });
-      });
-    });
   });
 });