Merge branch 'master' into CancellablePromise

Author: mstosio

.circleci/config.yml

@@ -1,31 +1,32 @@
 version: 2
 jobs:
   build:
-    working_directory: ~/repo
     docker:
       - image: cimg/node:lts-browsers
+    resource_class: large
+    working_directory: ~/repo
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "package.json" }}
+            - v1-dependencies-{{ checksum "package-lock.json" }}
             - v1-dependencies-
       - run:
           name: Install dependencies
           command: npm install
       - save_cache:
-          key: v1-dependencies-{{ checksum "package.json" }}
+          key: v1-dependencies-{{ checksum "package-lock.json" }}
           paths:
             - node_modules
       - run:
           name: Build library
           command: npm run release
       - run:
           name: Run unit tests
-          command: npm run test:coverage
-      - run:
-          name: Run e2e tests
-          command: npm run test:e2e
+          command: npm run test
+#      - run:
+#          name: Run e2e tests
+#          command: npm run test:e2e
       - run:
          name: Submit to Codecov
          command: npm run codecov

.github/dependabot.yml

@@ -3,9 +3,20 @@ updates:
 - package-ecosystem: npm
   directory: "/"
   schedule:
-    interval: monthly
-    time: "04:00"
-  open-pull-requests-limit: 10
+    interval: "daily"
   ignore:
     - dependency-name: "@types/node-fetch"
     - dependency-name: "node-fetch"
+    - dependency-name: "camelcase"
+    - dependency-name: "@angular-devkit/build-angular"
+    - dependency-name: "@angular/animations"
+    - dependency-name: "@angular/cli"
+    - dependency-name: "@angular/common"
+    - dependency-name: "@angular/compiler"
+    - dependency-name: "@angular/compiler-cli"
+    - dependency-name: "@angular/core"
+    - dependency-name: "@angular/forms"
+    - dependency-name: "@angular/platform-browser"
+    - dependency-name: "@angular/platform-browser-dynamic"
+    - dependency-name: "@angular/router"
+    - dependency-name: "typescript"

.github/workflows/auto-merge.yml

@@ -0,0 +1,29 @@
+name: auto-merge
+
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Fetch Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Approve PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Merge PR
+        if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.licrc

@@ -0,0 +1,20 @@
+[licenses]
+accepted = [
+  "MIT",
+  "BSD",
+  "0BSD",
+  "BSD-2-Clause",
+  "BSD-3-Clause",
+  "Apache-2.0",
+  "CC-BY-3.0",
+  "CC-BY-4.0",
+  "CC0-1.0",
+  "ISC"
+]
+
+[dependencies]
+ignored = []
+
+[behavior]
+run_only_on_dependency_modification = true
+do_not_block_pr = true

CHANGELOG.md

@@ -1,6 +1,42 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.23.0] - 2022-06-02
+### Fixed
+- Upgraded dependencies
+- Added blank line at the end of generated files
+- Added support for Node.js v12
+### Added
+- Added `request` property inside `ApiError`
+- Added support for `@depricated` inside models and operations
+
+## [0.22.0] - 2022-04-26
+### Fixed
+- Upgraded dependencies
+- Fixed issue with `null` value inside comments for OpenAPI v2 enums
+- Fixed issue with compatibility for latest version of Axios (0.27.x)
+### Removed
+- Removed deprecated enum model generation
+
+## [0.21.0] - 2022-04-06
+### Fixed
+- Return `undefined` to match `noImplicitReturns` rule
+- Made `BaseHttpRequest` class abstract
+- Removed private fields using `#` inside `CancelablePromise`
+- Removed unneeded import `AbortController` from `node-fetch` client
+- Filter out wrong enum values
+
+## [0.20.1] - 2022-02-25
+### Fixed
+- Support enums with single quotes in names for V2
+
+## [0.20.0] - 2022-02-25
+### Fixed
+- Updated dependencies
+- Support enums with single quotes in names for V3
+- Generating better names when `operationId` is not given (breaking change)
+- Fixed issue where `x-enum` flags where breaking due to non-string values
+
 ## [0.19.0] - 2022-02-02
 ### Added
 - Support for Angular client with `--name` option

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Ferdi Koomen
+Copyright (c) Ferdi Koomen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -48,7 +48,8 @@ $ openapi --help
     --exportModels <value>    Write models to disk (default: true)
     --exportSchemas <value>   Write schemas to disk (default: false)
     --indent <value>          Indentation options [4, 2, tab] (default: "4")
-    --postfix <value>         Service name postfix (default: "Service")
+    --postfixServices         Service name postfix (default: "Service")
+    --postfixModels           Model name postfix
     --request <value>         Path to custom request file
     -h, --help                display help for command
 
@@ -69,6 +70,8 @@ Documentation
 - [Nullable props (OpenAPI v2)](docs/nullable-props.md)
 - [Authorization](docs/authorization.md)
 - [External references](docs/external-references.md)
+- [Canceling requests](docs/canceling-requests.md)
+- [Custom request file](docs/custom-request-file.md)
 
 Support
 ===

babel.config.json

@@ -4,7 +4,7 @@
             "@babel/preset-env",
             {
                 "targets": {
-                    "node": true
+                    "node": "12"
                 }
             }
         ],

bin/index.js

@@ -21,7 +21,9 @@ const params = program
     .option('--exportModels <value>', 'Write models to disk', true)
     .option('--exportSchemas <value>', 'Write schemas to disk', false)
     .option('--indent <value>', 'Indentation options [4, 2, tabs]', '4')
-    .option('--postfix <value>', 'Service name postfix', 'Service')
+    .option('--postfix <value>', 'Deprecated: Use --postfixServices instead. Service name postfix', 'Service')
+    .option('--postfixServices <value>', 'Service name postfix', 'Service')
+    .option('--postfixModels <value>', 'Model name postfix')
     .option('--request <value>', 'Path to custom request file')
     .parse(process.argv)
     .opts();
@@ -41,7 +43,8 @@ if (OpenAPI) {
         exportModels: JSON.parse(params.exportModels) === true,
         exportSchemas: JSON.parse(params.exportSchemas) === true,
         indent: params.indent,
-        postfix: params.postfix,
+        postfixServices: params.postfixServices ?? params.postfix,
+        postfixModels: params.postfixModels,
         request: params.request,
     })
         .then(() => {

bin/index.spec.js

@@ -34,8 +34,10 @@ describe('bin', () => {
             'true',
             '--indent',
             '4',
-            '--postfix',
+            '--postfixServices',
             'Service',
+            '--postfixModels',
+            'Dto',
         ]);
         expect(result.stdout.toString()).toBe('');
         expect(result.stderr.toString()).toBe('');
@@ -67,4 +69,18 @@ describe('bin', () => {
         expect(result.stdout.toString()).toContain(`-o, --output <value>`);
         expect(result.stderr.toString()).toBe('');
     });
+
+    it('should still support the deprecated --postfix parameter', () => {
+        const result = crossSpawn.sync('node', [
+            './bin/index.js',
+            '--input',
+            './test/spec/v3.json',
+            '--output',
+            './test/generated/bin',
+            '--postfix',
+            'Service',
+        ]);
+        expect(result.stdout.toString()).toBe('');
+        expect(result.stderr.toString()).toBe('');
+    });
 });