.github/workflows/nodejs.yml

@@ -0,0 +1,30 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install --no-save
+    - run: npx lerna bootstrap
+    - run: npx lerna run lint
+    - run: npm test

README.md

@@ -1,7 +1,6 @@
 # <img src="https://recruit-tech.github.io/agreed/media/logo-with-text.svg" width="300" />
 
-[![Build Status](https://travis-ci.org/recruit-tech/agreed.svg?branch=master)](https://travis-ci.org/recruit-tech/agreed)
-
+![Node.js CI](https://github.com/recruit-tech/agreed/workflows/Node.js%20CI/badge.svg)
 
 agreed is Consumer Driven Contract tool with JSON mock server.
 

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "5.1.6"
+  "version": "5.1.7"
 }

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agreed/cli",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "description": "Agreed is a tool for Consumer Driven Contract with JSON mock server",
   "main": "index.js",
   "bin": {
@@ -31,10 +31,10 @@
     "plz-port": "1.0.0"
   },
   "dependencies": {
-    "@agreed/client": "^5.1.6",
-    "@agreed/server": "^5.1.6",
-    "@agreed/typed": "^5.1.6",
-    "@agreed/ui": "^5.1.6",
+    "@agreed/client": "^5.1.7",
+    "@agreed/server": "^5.1.7",
+    "@agreed/typed": "^5.1.7",
+    "@agreed/ui": "^5.1.7",
     "colo": "^1.0.0",
     "json5": "^2.0.0",
     "minimist": "^1.2.0"

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agreed/client",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "description": "agreed client, testing utilities",
   "main": "index.js",
   "bin": "bin/agreed-client.js",
@@ -20,12 +20,12 @@
   "author": "yosuke-furukawa",
   "license": "MIT",
   "dependencies": {
-    "@agreed/core": "^5.1.6",
+    "@agreed/core": "^5.1.7",
     "colo": "^1.0.0",
     "is-empty": "^1.0.0"
   },
   "devDependencies": {
-    "@agreed/server": "^5.1.6",
+    "@agreed/server": "^5.1.7",
     "eater": "4.0.3",
     "plz-port": "1.0.0"
   },

packages/core/lib/check/checker.js

@@ -80,7 +80,7 @@ class Checker {
     let valuesSimilarity = 1;
     if (pathToRegexpKeys.length !== 0) {
       let matched = 0;
-      Object.keys(paths).forEach(k => {
+      Object.keys(paths).forEach((k) => {
         if (paths[k] === values[k] + "") {
           matched++;
         }

packages/core/lib/check/completion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const pathToRegexp = require("path-to-regexp");
+const { pathToRegexp } = require("path-to-regexp");
 const path = require("path");
 const requireAgree = require("../require_hook/requireAgree");
 
@@ -130,7 +130,7 @@ function toLowerCaseKeys(obj) {
   const keys = Object.keys(obj);
   const result = {};
 
-  keys.forEach(key => {
+  keys.forEach((key) => {
     result[key.toLowerCase()] = obj[key];
   });
   return result;

packages/core/lib/check/defaultRequest.js

@@ -1,5 +1,5 @@
 module.exports = {
   method: "GET",
   body: "",
-  headers: {}
+  headers: {},
 };

packages/core/lib/check/defaultResponse.js

@@ -1,7 +1,7 @@
 module.exports = {
   status: 200,
   headers: {
-    "Content-Type": "application/json; charset=utf-8"
+    "Content-Type": "application/json; charset=utf-8",
   },
-  body: ""
+  body: "",
 };

packages/core/lib/check/diff.js

@@ -3,7 +3,7 @@
 const {
   hasTemplate,
   hasTemplateWithAnyString,
-  isRestArrayTemplate
+  isRestArrayTemplate,
 } = require("../template/hasTemplate");
 const toRegexp = require("../template/toRegexp");
 

packages/core/lib/check/extract.js

@@ -2,10 +2,10 @@
 
 const url = require("url");
 const qs = require("querystring");
-const pathToRegexp = require("path-to-regexp");
+const { pathToRegexp } = require("path-to-regexp");
 const format = require("../template/format");
 
-module.exports.incomingRequest = req => {
+module.exports.incomingRequest = (req) => {
   return new Promise((resolve, reject) => {
     const result = {};
 

packages/core/lib/check/isContentJSON.js

@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports = obj => {
+module.exports = (obj) => {
   const isContentJSON =
     obj.headers &&
     obj.headers["Content-Type"] &&

packages/core/lib/require_hook/hook.js

@@ -4,7 +4,7 @@ const fs = require("fs");
 const compile = require("./compile");
 
 module.exports = (parse, extensions) => {
-  extensions.forEach(ext => {
+  extensions.forEach((ext) => {
     delete require.extensions[ext];
     require.extensions[ext] = (module, file) => {
       const agree = parse(fs.readFileSync(file).toString("utf-8"));

packages/core/lib/require_hook/requireUncached.js

@@ -1,4 +1,4 @@
-module.exports = module => {
+module.exports = (module) => {
   delete require.cache[require.resolve(module)];
   return require(module);
 };

packages/core/lib/require_hook/typescript.js

@@ -8,7 +8,7 @@ const transpile = (src, options = {}) => {
   const res = ts.transpileModule(
     src,
     options || {
-      compilerOptions: { module: ts.ModuleKind.CommonJS }
+      compilerOptions: { module: ts.ModuleKind.CommonJS },
     }
   ).outputText;
   return res;
@@ -22,10 +22,10 @@ const takeCache = (options) => {
       return cache;
     }
     return {};
-  } catch(e) {
+  } catch (e) {
     return {};
   }
-}
+};
 
 const getCacheAgree = (file, cache, mtimeMs) => {
   if (cache && cache[file]) {
@@ -34,7 +34,7 @@ const getCacheAgree = (file, cache, mtimeMs) => {
     }
   }
   return {};
-}
+};
 
 const writeCacheOnExit = (options) => {
   if (options.typedCachePath) {
@@ -47,7 +47,7 @@ const writeCacheOnExit = (options) => {
       }
     });
   }
-}
+};
 
 module.exports = (options, hot) => {
   cache = takeCache(options);
@@ -73,7 +73,7 @@ module.exports = (options, hot) => {
         agree,
       };
     }
-    // TODO: need to embed cache hit or not 
+    // TODO: need to embed cache hit or not
     module._compile(agree, file);
     if (hot) {
       fs.watch(file, () => {

packages/core/lib/template/bind.js

@@ -6,15 +6,15 @@ module.exports = function bind(hasFormatObj, hasValueObj, result, original) {
   if (!result) result = {};
   if (!original) original = hasValueObj;
   if (typeof hasFormatObj === "object") {
-    Object.keys(hasFormatObj).forEach(key => {
+    Object.keys(hasFormatObj).forEach((key) => {
       if (hasTemplate(hasFormatObj[key])) {
         const formatName = hasFormatObj[key].replace(
           constants.TEMPLATE_REGEXP,
           "$2"
         );
         const formatParts = formatName.split(".");
         if (formatParts.length > 1) {
-          formatParts.forEach(part => {
+          formatParts.forEach((part) => {
             if (hasValueObj[part]) {
               result[part] = hasValueObj[part];
             } else if (original[part]) {

packages/core/lib/template/format.js

@@ -28,15 +28,15 @@ function format(template, args, funcs = {}) {
 
   if (!matches) return result;
 
-  matches.forEach(match => {
+  matches.forEach((match) => {
     var rawKey = match.replace(constants.TEMPLATE_REGEXP, "$2");
 
     // brackets notation like '{:array[:index]}'
     if (rawKey.indexOf("[:") >= 0) {
       const matches = rawKey.match(constants.TEMPLATE_BRACKETS_REGEXP_GLOBAL);
 
       matches &&
-        matches.forEach(match => {
+        matches.forEach((match) => {
           const key = match.replace(constants.TEMPLATE_BRACKETS_REGEXP, "$1");
           const value = "." + key.split(".").reduce((o, i) => o && o[i], args);
 
@@ -46,7 +46,7 @@ function format(template, args, funcs = {}) {
         });
     }
 
-    var value = rawKey.split(",").map(key => {
+    var value = rawKey.split(",").map((key) => {
       if (key && args[key]) {
         return args[key];
       }
@@ -98,7 +98,7 @@ function formatObject(obj, args, funcs) {
     return obj;
   }
 
-  Object.keys(obj).forEach(key => {
+  Object.keys(obj).forEach((key) => {
     const value = obj[key];
     result[key] = format(value, args, funcs);
   });
@@ -111,10 +111,10 @@ function formatArray(array, args, funcs) {
     return array;
   }
 
-  array.forEach(item => {
+  array.forEach((item) => {
     const formattedItem = format(item, args, funcs);
     if (formattedItem.__spread) {
-      formattedItem.forEach(item => {
+      formattedItem.forEach((item) => {
         result.push(item);
       });
     } else {

packages/core/lib/template/hasTemplate.js

@@ -2,19 +2,19 @@
 
 const constants = require("./constants");
 
-module.exports.hasTemplate = str => {
+module.exports.hasTemplate = (str) => {
   return typeof str === "string" && str.match(constants.TEMPLATE_REGEXP_GLOBAL);
 };
 
-module.exports.hasTemplateWithAnyString = str => {
+module.exports.hasTemplateWithAnyString = (str) => {
   if (typeof str !== "string") {
     return false;
   }
   const removed = str.replace(constants.TEMPLATE_REGEXP_GLOBAL, "");
   return removed.length > 0;
 };
 
-module.exports.isRestArrayTemplate = str => {
+module.exports.isRestArrayTemplate = (str) => {
   return (
     typeof str === "string" &&
     str.match(constants.TEMPLATE_REST_ARRAY_STRING_GLOBAL)

packages/core/lib/template/toRegexp.js

@@ -2,7 +2,7 @@
 
 const constants = require("./constants");
 
-module.exports = str => {
+module.exports = (str) => {
   var rawString = str.replace(constants.TEMPLATE_REGEXP_GLOBAL, ".*");
   rawString = "^" + rawString + "$";
   return new RegExp(rawString);