@team-supercharge/oasg 9.2.1 → 9.2.3

package/.gitlab-ci.yml

@@ -19,6 +19,16 @@ commitlint:
   extends: .jarvis-commitlint
   stage: lint
 
+test:
+  extends:
+    - .jarvis-on-merge-request
+    - .jarvis-pod-size-m
+  stage: lint
+  script:
+    - npm ci
+    - ./setup.sh
+    - npm test
+
 # release
 main-release:
   extends: .jarvis-main-release

package/.vscode/settings.json

@@ -1,5 +1,6 @@
 {
   "editor.tabSize": 2,
   "files.trimTrailingWhitespace": true,
-  "files.insertFinalNewline": true
+  "files.insertFinalNewline": true,
+  "cSpell.words": ["execa"]
 }

package/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [9.2.3](https://gitlab.com/team-supercharge/oasg/compare/v9.2.2...v9.2.3) (2023-05-05)
+
+
+### Bug Fixes
+
+* keep original sorting for merged input ([a8ae000](https://gitlab.com/team-supercharge/oasg/commit/a8ae000faf1f8cc69c6b2e55a089bae11841c309))
+
+
+### CI
+
+* add e2e tests ([cca550c](https://gitlab.com/team-supercharge/oasg/commit/cca550c06e7f15e65262ad5829efc45178368c48))
+
+
+### Testing
+
+* add e2e tests ([4e21e1a](https://gitlab.com/team-supercharge/oasg/commit/4e21e1a4b4aa462347e026adc9340e227726d9b2))
+* add merged e2e test ([603cceb](https://gitlab.com/team-supercharge/oasg/commit/603cceb0483a1492e07bdca20466e6b69079be19))
+* add more type to e2e ([cd506b1](https://gitlab.com/team-supercharge/oasg/commit/cd506b1a06d6a454899c70b90002ed9d174ec53f))
+
+### [9.2.2](https://gitlab.com/team-supercharge/oasg/compare/v9.2.1...v9.2.2) (2023-04-14)
+
+
+### Bug Fixes
+
+* **angular:** run the npm publish in the right folder ([be32f40](https://gitlab.com/team-supercharge/oasg/commit/be32f40fffbc3f6b080c98adcca809657165b4dc))
+* explicitly install deps to Docker-embedded oasg ([fb83ece](https://gitlab.com/team-supercharge/oasg/commit/fb83ecea2c8756dab942284f014fdcd695529719))
+
 ### [9.2.1](https://gitlab.com/team-supercharge/oasg/compare/v9.2.0...v9.2.1) (2023-04-13)
 
 

package/Dockerfile

@@ -2,6 +2,7 @@ FROM node:18.15.0
 
 WORKDIR /app
 COPY . .
+RUN npm ci
 RUN chmod +x setup.sh && ./setup.sh
 
 WORKDIR /

package/README.md

@@ -383,7 +383,7 @@ Common target parameters
 
 ```json
 {
-  "id": "client-react-native",
+  "id": "client-stubby",
   "type": "stubby",
   "source": "source-merged",
   "generateWithDocker": "true",

package/bin/merger.js

@@ -11,7 +11,7 @@ async function merge(source) {
     fs.mkdirSync('./out');
   }
 
-  const inputFiles = await glob(source.inputs);
+  const inputFiles = await getInputFilesWithGlob(source.inputs);
 
   if (inputFiles.length == 1) {
     return inputFiles[0];
@@ -29,6 +29,24 @@ async function merge(source) {
   return outFile;
 }
 
+/**
+ * Get input files with glob while keeping the order of the input files.
+ * @param {string[]} inputs The input for glob.
+ * @returns {Promise<string[]>} The matched files.
+ */
+async function getInputFilesWithGlob(inputs) {
+  /**
+   * @type {string[]} inputFiles
+   */
+  const inputFiles = [];
+  for (const input of inputs) {
+    const files = await glob(input);
+    inputFiles.push(...files);
+  }
+  const uniqueInputFiles = inputFiles.filter((value, index, self) => self.indexOf(value) === index);
+  return uniqueInputFiles;
+}
+
 async function mergeDocuments(documents) {
   let finalDoc = await SwaggerParser.parse(documents[0]);
   finalDoc = resolveExternalSpecifications(documents[0], finalDoc);

package/e2e/__tests__/config.json

@@ -0,0 +1,126 @@
+{
+  "sources": [
+    {
+      "id": "example-simple",
+      "type": "simple",
+      "input": "example.yaml"
+    },
+    {
+      "id": "example-merged",
+      "type": "merged",
+      "inputs": ["*.yaml"]
+    }
+  ],
+  "targets": [
+    {
+      "id": "android-simple",
+      "type": "android",
+      "source": "example-simple",
+      "packageName": "io.supercharge.oasg.example",
+      "projectName": "OASgExample",
+      "generator": "https://gitlab.supercharge.io/misc/openapi-generator-sc/-/package_files/348/download",
+      "generatorCustomArgs": "-penumPropertyNaming=original -penumPropertyNaming=original -pdateLibrary=java8-localdatetime -puseCoroutines=true -pmoshiCodeGen=true",
+      "formatter": "0.39.0",
+      "formatterCustomArgs": "--disabled_rules=no-wildcard-imports,max-line-length",
+      "repository": "https://gitlab.supercharge.io/api/v4/projects/1226/packages/maven"
+    },
+    {
+      "id": "angular-simple",
+      "type": "angular",
+      "source": "example-simple",
+      "repository": "https://registry.npmjs.org",
+      "packageName": "@test/example-source",
+      "generatorCustomArgs": "-pngVersion=12.0.0"
+    },
+    {
+      "id": "angular-merged",
+      "type": "angular",
+      "source": "example-merged",
+      "repository": "https://registry.npmjs.org",
+      "packageName": "@test/example-source",
+      "generatorCustomArgs": "-pngVersion=12.0.0"
+    },
+    {
+      "id": "swift-simple",
+      "type": "ios",
+      "source": "example-simple",
+      "generatorId": "swift5",
+      "projectName": "OASgExample",
+      "generator": "https://gitlab.supercharge.io/misc/openapi-generator-sc/-/package_files/348/download",
+      "repository": "git@gitlab.supercharge.io:example/openapi-generator-source.git",
+      "interfaceType": "Combine",
+      "generatorCustomArgs": "--model-name-suffix=ApiModel"
+    },
+    {
+      "id": "python-simple",
+      "type": "python",
+      "source": "example-simple",
+      "packageName": "oasg_example",
+      "repositoryUrl": "https://gitlab.supercharge.io/api/v4/projects/1226/packages/pypi"
+    },
+    {
+      "id": "contract-testing-simple",
+      "type": "contract-testing",
+      "source": "example-simple",
+      "packageName": "@example-project/api-test",
+      "repository": "https://gitlab.supercharge.io/api/v4/projects/1377/packages/npm/"
+    },
+    {
+      "id": "server-nestjs-simple",
+      "type": "nestjs",
+      "source": "example-simple",
+      "packageName": "@project/oasg-example-nestjs",
+      "repository": "https://gitlab.supercharge.io/api/v4/projects/1226/packages/npm/"
+    },
+    {
+      "id": "api-docs-simple",
+      "type": "openapi",
+      "source": "example-simple"
+    },
+    {
+      "id": "feign-simple",
+      "type": "feign",
+      "source": "example-simple",
+      "artifactId": "project-client",
+      "groupId": "com.project.client",
+      "basePackage": "com.project.client",
+      "mavenRepoUrl": "https://your-private-repo-url.com",
+      "generatorCustomArgs": "--model-name-suffix=Dto"
+    },
+    {
+      "id": "spring-kotlin-simple",
+      "type": "spring-kotlin",
+      "source": "example-simple",
+      "artifactId": "project-api",
+      "groupId": "com.project.api",
+      "basePackage": "com.project.api",
+      "mavenRepoUrl": "https://your-private-repo-url.com",
+      "generatorCustomArgs": "--model-name-suffix=Dto"
+    },
+    {
+      "id": "spring-simple",
+      "type": "spring",
+      "source": "example-simple",
+      "artifactId": "project-api",
+      "groupId": "com.project.api",
+      "basePackage": "com.project.api",
+      "mavenRepoUrl": "https://your-private-repo-url.com",
+      "generatorCustomArgs": "--model-name-suffix=Dto"
+    },
+    {
+      "id": "stubby-simple",
+      "type": "stubby",
+      "source": "example-simple",
+      "generateWithDocker": "true",
+      "repository": "registry.supercharge.io/misc/oasg-example",
+      "generator": "https://gitlab.supercharge.io/misc/openapi-generator-sc/-/package_files/225/download"
+    },
+    {
+      "id": "react-native-simple",
+      "type": "react-native",
+      "source": "example-simple",
+      "packageName": "@project/oasg-example-react-native",
+      "repository": "https://gitlab.supercharge.io/api/v4/projects/1226/packages/npm/"
+    }
+  ]
+}

package/e2e/__tests__/example.yaml

@@ -0,0 +1,722 @@
+swagger: "2.0"
+info:
+  description: "This is a sample server Petstore server.  You can find out more about     Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).      For this sample, you can use the api key `special-key` to test the authorization     filters."
+  version: "1.0.0"
+  title: "Swagger Petstore"
+  termsOfService: "http://swagger.io/terms/"
+  contact:
+    email: "apiteam@swagger.io"
+  license:
+    name: "Apache 2.0"
+    url: "http://www.apache.org/licenses/LICENSE-2.0.html"
+host: "petstore.swagger.io"
+basePath: "/v2"
+tags:
+- name: "pet"
+  description: "Everything about your Pets"
+  externalDocs:
+    description: "Find out more"
+    url: "http://swagger.io"
+- name: "store"
+  description: "Access to Petstore orders"
+- name: "user"
+  description: "Operations about user"
+  externalDocs:
+    description: "Find out more about our store"
+    url: "http://swagger.io"
+schemes:
+- "https"
+- "http"
+paths:
+  /pet:
+    post:
+      tags:
+      - "pet"
+      summary: "Add a new pet to the store"
+      description: "a"
+      operationId: "addPet"
+      consumes:
+      - "application/json"
+      - "application/xml"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "body"
+        description: "Pet object that needs to be added to the store"
+        required: true
+        schema:
+          $ref: "#/definitions/Pet"
+      responses:
+        "200":
+          description: Updated
+        "405":
+          description: "Invalid input"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+    put:
+      tags:
+      - "pet"
+      summary: "Update an existing pet"
+      description: "a"
+      operationId: "updatePet"
+      consumes:
+      - "application/json"
+      - "application/xml"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "body"
+        description: "Pet object that needs to be added to the store"
+        required: true
+        schema:
+          $ref: "#/definitions/Pet"
+      responses:
+        "200":
+          description: Updated
+        "400":
+          description: "Invalid ID supplied"
+        "404":
+          description: "Pet not found"
+        "405":
+          description: "Validation exception"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+  /pet/findByStatus:
+    get:
+      tags:
+      - "pet"
+      summary: "Finds Pets by status"
+      description: "Multiple status values can be provided with comma separated strings"
+      operationId: "findPetsByStatus"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "status"
+        in: "query"
+        description: "Status values that need to be considered for filter"
+        required: true
+        type: "array"
+        items:
+          type: "string"
+          enum:
+          - "available"
+          - "pending"
+          - "sold"
+          default: "available"
+        collectionFormat: "multi"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/Pet"
+        "400":
+          description: "Invalid status value"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+  /pet/findByTags:
+    get:
+      tags:
+      - "pet"
+      summary: "Finds Pets by tags"
+      description: "Muliple tags can be provided with comma separated strings. Use         tag1, tag2, tag3 for testing."
+      operationId: "findPetsByTags"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "tags"
+        in: "query"
+        description: "Tags to filter by"
+        required: true
+        type: "array"
+        items:
+          type: "string"
+        collectionFormat: "multi"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            type: "array"
+            items:
+              $ref: "#/definitions/Pet"
+        "400":
+          description: "Invalid tag value"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+      deprecated: true
+  /pet/{petId}:
+    get:
+      tags:
+      - "pet"
+      summary: "Find pet by ID"
+      description: "Returns a single pet"
+      operationId: "getPetById"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "petId"
+        in: "path"
+        description: "ID of pet to return"
+        required: true
+        type: "integer"
+        format: "int64"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/Pet"
+        "400":
+          description: "Invalid ID supplied"
+        "404":
+          description: "Pet not found"
+      security:
+      - api_key: []
+    post:
+      tags:
+      - "pet"
+      summary: "Updates a pet in the store with form data"
+      description: "a"
+      operationId: "updatePetWithForm"
+      consumes:
+      - "application/x-www-form-urlencoded"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "petId"
+        in: "path"
+        description: "ID of pet that needs to be updated"
+        required: true
+        type: "integer"
+        format: "int64"
+      - name: "name"
+        in: "formData"
+        description: "Updated name of the pet"
+        required: false
+        type: "string"
+      - name: "status"
+        in: "formData"
+        description: "Updated status of the pet"
+        required: false
+        type: "string"
+      responses:
+        "200":
+          description: Updated
+        "405":
+          description: "Invalid input"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+    delete:
+      tags:
+      - "pet"
+      summary: "Deletes a pet"
+      description: "a"
+      operationId: "deletePet"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "api_key"
+        in: "header"
+        required: false
+        type: "string"
+      - name: "petId"
+        in: "path"
+        description: "Pet id to delete"
+        required: true
+        type: "integer"
+        format: "int64"
+      responses:
+        "200":
+          description: Updated
+        "400":
+          description: "Invalid ID supplied"
+        "404":
+          description: "Pet not found"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+  /pet/{petId}/uploadImage:
+    post:
+      tags:
+      - "pet"
+      summary: "uploads an image"
+      description: "a"
+      operationId: "uploadFile"
+      consumes:
+      - "multipart/form-data"
+      produces:
+      - "application/json"
+      parameters:
+      - name: "petId"
+        in: "path"
+        description: "ID of pet to update"
+        required: true
+        type: "integer"
+        format: "int64"
+      - name: "additionalMetadata"
+        in: "formData"
+        description: "Additional data to pass to server"
+        required: false
+        type: "string"
+      - name: "file"
+        in: "formData"
+        description: "file to upload"
+        required: false
+        type: "file"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/ApiResponse"
+      security:
+      - petstore_auth:
+        - "write:pets"
+        - "read:pets"
+  /store/inventory:
+    get:
+      tags:
+      - "store"
+      summary: "Returns pet inventories by status"
+      description: "Returns a map of status codes to quantities"
+      operationId: "getInventory"
+      produces:
+      - "application/json"
+      parameters: []
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            type: "object"
+            additionalProperties:
+              type: "integer"
+              format: "int32"
+      security:
+      - api_key: []
+  /store/order:
+    post:
+      tags:
+      - "store"
+      summary: "Place an order for a pet"
+      description: "a"
+      operationId: "placeOrder"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "body"
+        description: "order placed for purchasing the pet"
+        required: true
+        schema:
+          $ref: "#/definitions/Order"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/Order"
+        "400":
+          description: "Invalid Order"
+  /store/order/{orderId}:
+    get:
+      tags:
+      - "store"
+      summary: "Find purchase order by ID"
+      description: "For valid response try integer IDs with value >= 1 and <= 10.         Other values will generated exceptions"
+      operationId: "getOrderById"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "orderId"
+        in: "path"
+        description: "ID of pet that needs to be fetched"
+        required: true
+        type: "integer"
+        maximum: 10.0
+        minimum: 1.0
+        format: "int64"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/Order"
+        "400":
+          description: "Invalid ID supplied"
+        "404":
+          description: "Order not found"
+    delete:
+      tags:
+      - "store"
+      summary: "Delete purchase order by ID"
+      description: "For valid response try integer IDs with positive integer value.         Negative or non-integer values will generate API errors"
+      operationId: "deleteOrder"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "orderId"
+        in: "path"
+        description: "ID of the order that needs to be deleted"
+        required: true
+        type: "integer"
+        minimum: 1.0
+        format: "int64"
+      responses:
+        "200":
+          description: Updated
+        "400":
+          description: "Invalid ID supplied"
+        "404":
+          description: "Order not found"
+  /user:
+    post:
+      tags:
+      - "user"
+      summary: "Create user"
+      description: "This can only be done by the logged in user."
+      operationId: "createUser"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "body"
+        description: "Created user object"
+        required: true
+        schema:
+          $ref: "#/definitions/User"
+      responses:
+        "200":
+          description: Updated
+        default:
+          description: "successful operation"
+  /user/createWithArray:
+    post:
+      tags:
+      - "user"
+      summary: "Creates list of users with given input array"
+      description: "a"
+      operationId: "createUsersWithArrayInput"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "body"
+        description: "List of user object"
+        required: true
+        schema:
+          type: "array"
+          items:
+            $ref: "#/definitions/User"
+      responses:
+        "200":
+          description: Updated
+        default:
+          description: "successful operation"
+  /user/createWithList:
+    post:
+      tags:
+      - "user"
+      summary: "Creates list of users with given input array"
+      description: "a"
+      operationId: "createUsersWithListInput"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - in: "body"
+        name: "body"
+        description: "List of user object"
+        required: true
+        schema:
+          type: "array"
+          items:
+            $ref: "#/definitions/User"
+      responses:
+        "200":
+          description: Updated
+        default:
+          description: "successful operation"
+  /user/login:
+    get:
+      tags:
+      - "user"
+      summary: "Logs user into the system"
+      description: "a"
+      operationId: "loginUser"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "username"
+        in: "query"
+        description: "The user name for login"
+        required: true
+        type: "string"
+      - name: "password"
+        in: "query"
+        description: "The password for login in clear text"
+        required: true
+        type: "string"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            type: "string"
+          headers:
+            X-Rate-Limit:
+              type: "integer"
+              format: "int32"
+              description: "calls per hour allowed by the user"
+            X-Expires-After:
+              type: "string"
+              format: "date-time"
+              description: "date in UTC when token expires"
+        "400":
+          description: "Invalid username/password supplied"
+  /user/logout:
+    get:
+      tags:
+      - "user"
+      summary: "Logs out current logged in user session"
+      description: "a"
+      operationId: "logoutUser"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters: []
+      responses:
+        "200":
+          description: Updated
+        default:
+          description: "successful operation"
+  /user/{username}:
+    get:
+      tags:
+      - "user"
+      summary: "Get user by user name"
+      description: "a"
+      operationId: "getUserByName"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "username"
+        in: "path"
+        description: "The name that needs to be fetched. Use user1 for testing. "
+        required: true
+        type: "string"
+      responses:
+        "200":
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/User"
+        "400":
+          description: "Invalid username supplied"
+        "404":
+          description: "User not found"
+    put:
+      tags:
+      - "user"
+      summary: "Updated user"
+      description: "This can only be done by the logged in user."
+      operationId: "updateUser"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "username"
+        in: "path"
+        description: "name that need to be updated"
+        required: true
+        type: "string"
+      - in: "body"
+        name: "body"
+        description: "Updated user object"
+        required: true
+        schema:
+          $ref: "#/definitions/User"
+      responses:
+        "200":
+          description: Updated
+        "400":
+          description: "Invalid user supplied"
+        "404":
+          description: "User not found"
+    delete:
+      tags:
+      - "user"
+      summary: "Delete user"
+      description: "This can only be done by the logged in user."
+      operationId: "deleteUser"
+      produces:
+      - "application/xml"
+      - "application/json"
+      parameters:
+      - name: "username"
+        in: "path"
+        description: "The name that needs to be deleted"
+        required: true
+        type: "string"
+      responses:
+        "200":
+          description: Updated
+        "400":
+          description: "Invalid username supplied"
+        "404":
+          description: "User not found"
+securityDefinitions:
+  petstore_auth:
+    type: "oauth2"
+    authorizationUrl: "http://petstore.swagger.io/oauth/dialog"
+    flow: "implicit"
+    scopes:
+      write:pets: "modify pets in your account"
+      read:pets: "read your pets"
+  api_key:
+    type: "apiKey"
+    name: "api_key"
+    in: "header"
+definitions:
+  Order:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      petId:
+        type: "integer"
+        format: "int64"
+      quantity:
+        type: "integer"
+        format: "int32"
+      shipDate:
+        type: "string"
+        format: "date-time"
+      status:
+        type: "string"
+        description: "Order Status"
+        enum:
+        - "placed"
+        - "approved"
+        - "delivered"
+      complete:
+        type: "boolean"
+        default: false
+    xml:
+      name: "Order"
+  Category:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Category"
+  User:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      username:
+        type: "string"
+      firstName:
+        type: "string"
+      lastName:
+        type: "string"
+      email:
+        type: "string"
+      password:
+        type: "string"
+      phone:
+        type: "string"
+      userStatus:
+        type: "integer"
+        format: "int32"
+        description: "User Status"
+    xml:
+      name: "User"
+  Tag:
+    type: "object"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      name:
+        type: "string"
+    xml:
+      name: "Tag"
+  Pet:
+    type: "object"
+    required:
+    - "name"
+    - "photoUrls"
+    properties:
+      id:
+        type: "integer"
+        format: "int64"
+      category:
+        $ref: "#/definitions/Category"
+      name:
+        type: "string"
+        example: "doggie"
+      photoUrls:
+        type: "array"
+        xml:
+          name: "photoUrl"
+          wrapped: true
+        items:
+          type: "string"
+      tags:
+        type: "array"
+        xml:
+          name: "tag"
+          wrapped: true
+        items:
+          $ref: "#/definitions/Tag"
+      status:
+        type: "string"
+        description: "pet status in the store"
+        enum:
+        - "available"
+        - "pending"
+        - "sold"
+    xml:
+      name: "Pet"
+  ApiResponse:
+    type: "object"
+    properties:
+      code:
+        type: "integer"
+        format: "int32"
+      type:
+        type: "string"
+      message:
+        type: "string"
+externalDocs:
+  description: "Find out more about Swagger"
+  url: "http://swagger.io"

package/e2e/e2e.spec.js

@@ -0,0 +1,105 @@
+const execa = require("execa");
+const { createTestProject, projectDir } = require("./setup.js");
+const { copy } = require("fs-extra");
+const path = require("path");
+
+describe("oasg", () => {
+  beforeAll(async () => {
+    await createTestProject();
+    await copy(
+      path.join(__dirname, "__tests__", "config.json"),
+      path.join(projectDir, "config.json")
+    );
+    await copy(
+      path.join(__dirname, "__tests__", "example.yaml"),
+      path.join(projectDir, "example.yaml")
+    );
+  }, 120000);
+
+
+  it("should lint", async () => {
+    await execa("npx", ["oasg", "lint"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+
+  it("should generate android-simple", async () => {
+    await execa("npx", ["oasg", "generate", "android-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it("should generate angular-simple", async () => {
+    await execa("npx", ["oasg", "generate", "angular-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it("should generate angular-merged", async () => {
+    await execa("npx", ["oasg", "generate", "angular-merged"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it("should generate swift-simple", async () => {
+    await execa("npx", ["oasg", "generate", "swift-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it.skip("should generate python-simple", async () => {
+    await execa("npx", ["oasg", "generate", "python-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it.skip("should generate contract-testing-simple", async () => {
+    await execa("npx", ["oasg", "generate", "contract-testing-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it.skip("should generate server-nestjs-simple", async () => {
+    await execa("npx", ["oasg", "generate", "server-nestjs-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it.skip("should generate api-docs-simple", async () => {
+    await execa("npx", ["oasg", "generate", "api-docs-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it.skip("should generate feign-simple", async () => {
+    await execa("npx", ["oasg", "generate", "feign-simple"], {
+      cwd: projectDir,
+    });
+  }, 180000);
+
+  it("should generate spring-kotlin-simple", async () => {
+    await execa("npx", ["oasg", "generate", "spring-kotlin-simple"], {
+      cwd: projectDir,
+    });
+  }, 240000);
+
+  it("should generate spring-simple", async () => {
+    await execa("npx", ["oasg", "generate", "spring-simple"], {
+      cwd: projectDir,
+    });
+  }, 240000);
+
+  it.skip("should generate stubby-simple", async () => {
+    await execa("npx", ["oasg", "generate", "stubby-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+  it("should generate react-native-simple", async () => {
+    await execa("npx", ["oasg", "generate", "react-native-simple"], {
+      cwd: projectDir,
+    });
+  }, 120000);
+
+});

package/e2e/setup.js

@@ -0,0 +1,21 @@
+const execa = require("execa");
+const fs = require("fs-extra");
+const path = require("path");
+
+const oasgDir = path.join(__dirname, "..");
+const projectDir = path.join(oasgDir, "tmp/test-project");
+
+
+module.exports = {
+  createTestProject: async () => {
+    await fs.remove(projectDir);
+    await fs.ensureDir(projectDir);
+    await execa("npm", ["init", "-y"], {
+      cwd: projectDir,
+    });
+    await execa("npm", ["install", `@team-supercharge/oasg@${oasgDir}`], {
+      cwd: projectDir,
+    });
+  },
+  projectDir,
+};

package/jest.config.js

@@ -0,0 +1,195 @@
+/*
+ * For a detailed explanation regarding each configuration property, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+module.exports = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/private/var/folders/v2/20bc64b97vb267khhr8dmqc00000gn/T/jest_dx",
+
+  // Automatically clear mock calls, instances, contexts and results before every test
+  // clearMocks: false,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  // collectCoverage: false,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  // coverageDirectory: undefined,
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // Indicates which provider should be used to instrument code for coverage
+  coverageProvider: "v8",
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // The default configuration for fake timers
+  // fakeTimers: {
+  //   "enableGlobally": false
+  // },
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  // moduleFileExtensions: [
+  //   "js",
+  //   "mjs",
+  //   "cjs",
+  //   "jsx",
+  //   "ts",
+  //   "tsx",
+  //   "json",
+  //   "node"
+  // ],
+
+  // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+  // moduleNameMapper: {},
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  // preset: undefined,
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state before every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state and implementation before every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  // rootDir: undefined,
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "<rootDir>"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // The number of seconds after which a test is considered as slow and reported as such in the results.
+  // slowTestThreshold: 5,
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  // testEnvironment: "jest-environment-node",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  // testMatch: [
+  //   "**/__tests__/**/*.[jt]s?(x)",
+  //   "**/?(*.)+(spec|test).[tj]s?(x)"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jest-circus/runner",
+
+  // A map from regular expressions to paths to transformers
+  // transform: undefined,
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/",
+  //   "\\.pnp\\.[^\\/]+$"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "9.2.1",
+  "version": "9.2.3",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",
-  "scripts": {},
+  "scripts": {
+    "test": "jest"
+  },
   "bin": {
     "oasg": "./bin/oasg"
   },
@@ -34,5 +36,10 @@
     "swagger-ui-express": "^4.1.4",
     "yamljs": "^0.3.0",
     "yargs": "^16.0.3"
+  },
+  "devDependencies": {
+    "execa": "^5.0.0",
+    "fs-extra": "^11.1.1",
+    "jest": "^29.5.0"
   }
 }

package/targets/angular/publish.sh

@@ -2,9 +2,6 @@
 
 source $(dirname "$0")/../common.sh
 
-cd out/$targetId
-# need to publish dist directory
+cd out/$targetId/dist
 npm publish \
-  dist \
   $(if [[ "$preRelease" == "true" ]]; then echo "--tag next"; fi)
-cd ../..