🐛 Fix writeParam. Add e2e tests

Author: nkmr-jp

.gitignore

@@ -4,4 +4,6 @@ node_modules
 *.go
 *.json
 tmp
-.node-version
+.node-version
+tests/docs
+tests/jsonplaceholder.typicode.com

package.json

@@ -11,7 +11,8 @@
   "scripts": {
     "sync-version": "npm version from-git --no-git-tag-version && git add package.json && git commit -m \":bookmark: [skip ci] v$(cat package.json | jq -r .version)\"",
     "fetch": "cd vendor && curl -OL https://raw.githubusercontent.com/mholt/json-to-go/master/json-to-go.js",
-    "setup": "yarn install && yarn fetch && npm -f link && exec $SHELL -l"
+    "setup": "yarn install && yarn fetch && npm -f link && exec $SHELL -l",
+    "test": "jest"
   },
   "description": "Convert REST API's JSON payload to Golang struct.",
   "bin": {

src/buildPath.test.js

@@ -18,7 +18,7 @@ test('build path', () => {
   }
   const received = buildPath(
     new URL("https://api.github.com/users/github/repos"),
-    "./.api-to-go.test.yml"
+    "./src/.api-to-go.test.yml"
   )
   expect(received).toEqual(expected);
 });
@@ -32,7 +32,7 @@ test('build path without format setting', () => {
   }
   const received = buildPath(
     new URL("https://api.github.com/organizations"),
-    "./.api-to-go.test.yml"
+    "./src/.api-to-go.test.yml"
   )
   expect(received.path).toEqual(expected);
 });

src/run.js

@@ -32,20 +32,20 @@ function run(urlStr, body, options) {
       if (cfg?.["docs"] !== undefined) console.log(`Docs:    ${cfg?.["docs"].join(", ")}`)
       comment = buildComment(url, path, opts.method, res)
 
-      if (opts?.body) {
-        const paramStruct = jsonToGo(opts?.body, path.struct + "Param");
-        const paramContent = buildContent(
-          paramStruct.go, path, buildComment(url, path, opts.method), true
-        )
-        writeParam(JSON.stringify(JSON.parse(opts?.body), null, "\t"), path, paramContent)
-      }
-
       return res.json()
     })
     .then(json => {
       const struct = jsonToGo(JSON.stringify(json), path.struct);
       const content = buildContent(struct.go, path, comment)
       write(json, path, content)
+
+      if (opts?.body) {
+        const paramStruct = jsonToGo(opts?.body, path.struct + "Param");
+        const paramContent = buildContent(
+            paramStruct.go, path, buildComment(url, path, opts.method), true
+        )
+        writeParam(JSON.stringify(JSON.parse(opts?.body), null, "\t"), path, paramContent)
+      }
     }, () => {
       console.log()
       console.log("Response Body is empty.")

tests/.api-to-go.yml

@@ -0,0 +1,3 @@
+"jsonplaceholder.typicode.com":
+  docs:
+    - https://jsonplaceholder.typicode.com/

tests/api-to-go.bats

@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+
+load helper/helper
+
+setup() {
+  if [ "$BATS_TEST_NUMBER" -eq 1 ]; then
+      init_doc
+      rm -rf ./jsonplaceholder.typicode.com
+  fi
+
+  BASE_URL="https://jsonplaceholder.typicode.com"
+  API_TO_GO="node ../bin/api-to-go.js"
+  doc "## $BATS_TEST_DESCRIPTION"
+}
+
+teardown(){
+  write_doc_details "api-to-go"
+}
+
+@test "Command with valid URL should succeed" {
+  COMMAND="$API_TO_GO $BASE_URL/todos/1"
+  run eval "$COMMAND"
+  [ "$status" -eq 0 ]
+}
+
+@test "Command with URL and JSON body" {
+  DATA='{"title": "foo", "body": "bar", "userId": 1}'
+  COMMAND="$API_TO_GO $BASE_URL/posts '$DATA'"
+  run eval "$COMMAND"
+  [ "$status" -eq 0 ]
+}

tests/helper/doc_helper.bash

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+TEST_FILE=$(basename ${BATS_TEST_FILENAME})
+DOC_PATH="docs/$TEST_FILE.md"
+doc(){
+  echo "$1" >> "$DOC_PATH"
+}
+
+init_doc(){
+  rm -f "$DOC_PATH"
+  doc "Generated by $TEST_FILE . last modified $(date '+%Y/%m/%d %T')"
+}
+
+write_doc_details(){
+  doc
+  doc "Command:"
+  doc
+  doc "\`\`\`sh"
+  doc "$COMMAND"
+  doc "\`\`\`"
+  doc
+  doc "Output:"
+  doc
+  if jq -e . >/dev/null 2>&1 <<< "$output"; then
+    doc "\`\`\`sh"
+    doc "$(echo "$output" | jq)"
+    doc "\`\`\`"
+  else
+    doc "\`\`\`sh"
+    doc "$output"
+    doc "\`\`\`"
+  fi
+}

tests/helper/helper.bash

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+load helper/doc_helper
+
+setup() {
+  echo "--start--"
+}
+
+teardown() {
+  echo "command:"
+  echo "$COMMAND"
+  echo ""
+  echo "status:"
+  echo "$status"
+  echo ""
+  echo "output:"
+  if jq -e . >/dev/null 2>&1 <<< "$output"; then
+    echo "$output" | jq
+  else
+    echo "$output"
+  fi
+  echo "--end--"
+}