Merge pull request #61 from nicolas-chaulet/fix/service-shorthand

fix(parser): use shorthand object properties in service calls

Author: mrlubos

.eslintignore

@@ -1,5 +1,5 @@
 dist
+node_modules
 samples
-test/generated
 test/e2e/generated
-node_modules
+test/generated

.eslintrc.json

@@ -7,23 +7,25 @@
     ],
     "env": {
         "es6": true,
-        "node": true,
-        "jest": true
+        "jest": true,
+        "node": true
     },
     "plugins": ["simple-import-sort"],
     "rules": {
+        "@typescript-eslint/ban-ts-comment": 0,
+        "@typescript-eslint/ban-ts-ignore": 0,
+        "@typescript-eslint/explicit-function-return-type": 0,
+        "@typescript-eslint/explicit-module-boundary-types": 0,
         "@typescript-eslint/no-explicit-any": 0,
         "@typescript-eslint/no-inferrable-types": 0,
         "@typescript-eslint/no-non-null-assertion": 0,
         "@typescript-eslint/no-var-requires": 0,
-        "@typescript-eslint/ban-ts-ignore": 0,
-        "@typescript-eslint/ban-ts-comment": 0,
-        "@typescript-eslint/explicit-function-return-type": 0,
-        "@typescript-eslint/explicit-module-boundary-types": 0,
-        "sort-imports": "off",
+        "arrow-body-style": "error",
         "import/order": "off",
-        "simple-import-sort/imports": "error",
+        "object-shorthand": "error",
+        "prettier/prettier": ["error"],
         "simple-import-sort/exports": "error",
-        "prettier/prettier": ["error"]
+        "simple-import-sort/imports": "error",
+        "sort-imports": "off"
     }
 }

.prettierrc.json

@@ -1,8 +1,8 @@
 {
-    "semi": true,
-    "singleQuote": true,
-    "trailingComma": "es5",
     "arrowParens": "avoid",
     "printWidth": 120,
-    "tabWidth": 4
+    "semi": true,
+    "singleQuote": true,
+    "tabWidth": 4,
+    "trailingComma": "es5"
 }

README.md

@@ -71,13 +71,13 @@ $ openapi --help
 
 ## Formatting
 
-If you use Prettier, your client will be automatically formatted according to your configuration. To disable automatic formatting, run
+By default, your client will be automatically formatted according to your configuration. To disable automatic formatting, run
 
 ```sh
 openapi -i path/to/openapi.json -o src/client --no-autoformat
 ```
 
-To prevent your client from being processed by linters and similar tools, you should add your output path to the tool's ignore file (e.g. `.eslintignore`).
+You can also prevent your client from being processed by formatters and linters by adding your output path to the tool's ignore file (e.g. `.eslintignore`, `.prettierignore`).
 
 ## Contributing
 

package.json

@@ -42,22 +42,22 @@
         "types/index.d.ts"
     ],
     "scripts": {
-        "clean": "rimraf ./dist ./test/generated ./test/e2e/generated ./samples/generated ./coverage ./node_modules/.cache",
-        "build": "rollup --config --environment NODE_ENV:development",
         "build:watch": "rollup --config --environment NODE_ENV:development --watch",
+        "build": "rollup --config --environment NODE_ENV:development",
+        "clean": "rimraf ./dist ./test/generated ./test/e2e/generated ./samples/generated ./coverage ./node_modules/.cache",
+        "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b",
+        "docker": "docker build -t eeelenbaas/openapi-typescript-codegen .",
+        "eslint:fix": "eslint . --fix",
+        "eslint": "eslint .",
+        "prepare": "npm run clean && npm run release",
         "release": "rollup --config --environment NODE_ENV:production",
-        "validate": "tsc --project tsconfig.json --noEmit",
         "run": "node ./test/index.js",
-        "test": "jest --selectProjects UNIT",
-        "test:update": "jest --selectProjects UNIT --updateSnapshot",
-        "test:watch": "jest --selectProjects UNIT --watch",
         "test:coverage": "jest --selectProjects UNIT --coverage",
         "test:e2e": "jest --selectProjects E2E --runInBand --verbose",
-        "eslint": "eslint .",
-        "eslint:fix": "eslint . --fix",
-        "prepare": "npm run clean && npm run release",
-        "codecov": "codecov --token=66c30c23-8954-4892-bef9-fbaed0a2e42b",
-        "docker": "docker build -t eeelenbaas/openapi-typescript-codegen ."
+        "test:update": "jest --selectProjects UNIT --updateSnapshot",
+        "test:watch": "jest --selectProjects UNIT --watch",
+        "test": "jest --selectProjects UNIT",
+        "validate": "tsc --project tsconfig.json --noEmit"
     },
     "dependencies": {
         "@apidevtools/json-schema-ref-parser": "11.5.4",

rollup.config.mjs

@@ -30,6 +30,7 @@ const handlebarsPlugin = () => ({
                 knownHelpersOnly: true,
                 knownHelpers: {
                     camelCase: true,
+                    dataParameters: true,
                     debugThis: true,
                     enumKey: true,
                     enumName: true,

src/openApi/v2/parser/escapeName.spec.ts

@@ -1,8 +1,8 @@
 import type { Model } from '../../../client/interfaces/Model';
+import { escapeName } from '../../../utils/escapeName';
 import { getPattern } from '../../../utils/getPattern';
 import type { OpenApi } from '../interfaces/OpenApi';
 import type { OpenApiSchema } from '../interfaces/OpenApiSchema';
-import { escapeName } from './escapeName';
 import type { getModel } from './getModel';
 import { getType } from './getType';