@grafana/openapi-to-k6 0.1.2 → 0.2.1

package/examples/query_params_schema/tags/exampleAPI.schemas.ts

@@ -0,0 +1,37 @@
+/**
+ * Automatically generated by @grafana/openapi-to-k6: 0.2.0
+ * Do not edit manually.
+ * Example API
+ * API with all formats of query parameters
+ * OpenAPI spec version: 1.0.0
+ */
+export type GetExampleData200 = {
+  age?: number
+  date?: string
+  isActive?: boolean
+  name?: string
+  tags?: string[]
+}
+
+export type GetExampleDataParams = {
+  /**
+   * A string parameter
+   */
+  name: string
+  /**
+   * An integer parameter
+   */
+  age?: number
+  /**
+   * A boolean parameter
+   */
+  isActive?: boolean
+  /**
+   * An array of strings parameter
+   */
+  tags?: string[]
+  /**
+   * A date parameter in YYYY-MM-DD format
+   */
+  date?: string
+}

package/examples/query_params_schema/tags/k6-script.sample.ts

@@ -0,0 +1,11 @@
+import { ExampleAPIClient } from './exampleAPI.ts'
+
+const baseUrl = '<BASE_URL>'
+const client = new ExampleAPIClient({ baseUrl })
+
+export default function () {
+  /**
+   * Get example data
+   */
+  const getExampleDataResponseData = client.getExampleData(params)
+}

package/examples/simple_post_request_schema/{exampleAPI.ts → single/exampleAPI.ts}

@@ -1,5 +1,5 @@
 /**
- * Automatically generated by @grafana/openapi-to-k6: 0.1.2
+ * Automatically generated by @grafana/openapi-to-k6: 0.2.0
  * Do not edit manually.
  * Example API
  * API with all formats of data in the POST request body
@@ -7,7 +7,7 @@
  */
 import { URL } from 'https://jslib.k6.io/url/1.0.0/index.js'
 import http from 'k6/http'
-import type { Params, Response, ResponseBody } from 'k6/http'
+import type { Params, Response } from 'k6/http'
 export type CreateExampleData201Meta = {
   createdBy?: string
   updatedBy?: string
@@ -49,28 +49,35 @@ export type CreateExampleDataBody = {
   tags?: string[]
 }
 
-export type CreateExampleAPIOptions = {
-  baseUrl: string
-  commonRequestParameters?: Params
-}
-
 /**
  * This is the base client to use for interacting with the API.
  */
-export const createExampleAPI = (clientOptions: CreateExampleAPIOptions) => {
-  const cleanBaseUrl = clientOptions.baseUrl.replace(/\/+$/, '')
+export class ExampleAPIClient {
+  private cleanBaseUrl: string
+  private commonRequestParameters: Params
+
+  constructor(clientOptions: {
+    baseUrl: string
+    commonRequestParameters?: Params
+  }) {
+    this.cleanBaseUrl = clientOptions.baseUrl.replace(/\/+$/, '')
+  }
+
   /**
    * This endpoint demonstrates the use of various data formats in the input body
    * @summary Create example data
    */
-  const createExampleData = (
+  createExampleData(
     createExampleDataBody: CreateExampleDataBody,
     requestParameters?: Params
-  ): CreateExampleDataResponse => {
-    const url = new URL(cleanBaseUrl + `/example`)
-    const mergedRequestParameters = _mergeRequestParameters(
+  ): {
+    response: Response
+    data: CreateExampleData201
+  } {
+    const url = new URL(this.cleanBaseUrl + `/example`)
+    const mergedRequestParameters = this._mergeRequestParameters(
       requestParameters || {},
-      clientOptions.commonRequestParameters
+      this.commonRequestParameters
     )
     const response = http.request(
       'POST',
@@ -88,7 +95,7 @@ export const createExampleAPI = (clientOptions: CreateExampleAPIOptions) => {
 
     try {
       data = response.json()
-    } catch (error) {
+    } catch {
       data = response.body
     }
     return {
@@ -97,39 +104,32 @@ export const createExampleAPI = (clientOptions: CreateExampleAPIOptions) => {
     }
   }
 
-  return { createExampleData }
-}
-
-export type CreateExampleDataResponse = {
-  response: Response
-  data: CreateExampleData201 | ResponseBody
-}
-
-/**
- * Merges the provided request parameters with default parameters for the client.
- *
- * @param {Params} requestParameters - The parameters provided specifically for the request
- * @param {Params} commonRequestParameters - Common parameters for all requests
- * @returns {Params} - The merged parameters
- */
-const _mergeRequestParameters = (
-  requestParameters?: Params,
-  commonRequestParameters?: Params
-): Params => {
-  return {
-    ...commonRequestParameters, // Default to common parameters
-    ...requestParameters, // Override with request-specific parameters
-    headers: {
-      ...(commonRequestParameters?.headers || {}), // Ensure headers are defined
-      ...(requestParameters?.headers || {}),
-    },
-    cookies: {
-      ...(commonRequestParameters?.cookies || {}), // Ensure cookies are defined
-      ...(requestParameters?.cookies || {}),
-    },
-    tags: {
-      ...(commonRequestParameters?.tags || {}), // Ensure tags are defined
-      ...(requestParameters?.tags || {}),
-    },
+  /**
+   * Merges the provided request parameters with default parameters for the client.
+   *
+   * @param {Params} requestParameters - The parameters provided specifically for the request
+   * @param {Params} commonRequestParameters - Common parameters for all requests
+   * @returns {Params} - The merged parameters
+   */
+  private _mergeRequestParameters(
+    requestParameters?: Params,
+    commonRequestParameters?: Params
+  ): Params {
+    return {
+      ...commonRequestParameters, // Default to common parameters
+      ...requestParameters, // Override with request-specific parameters
+      headers: {
+        ...(commonRequestParameters?.headers || {}), // Ensure headers are defined
+        ...(requestParameters?.headers || {}),
+      },
+      cookies: {
+        ...(commonRequestParameters?.cookies || {}), // Ensure cookies are defined
+        ...(requestParameters?.cookies || {}),
+      },
+      tags: {
+        ...(commonRequestParameters?.tags || {}), // Ensure tags are defined
+        ...(requestParameters?.tags || {}),
+      },
+    }
   }
 }

package/examples/simple_post_request_schema/{k6-script.sample.ts → single/k6-script.sample.ts}

@@ -1,7 +1,7 @@
-import { createExampleAPI } from './exampleAPI.ts'
+import { ExampleAPIClient } from './exampleAPI.ts'
 
 const baseUrl = '<BASE_URL>'
-const client = createExampleAPI({ baseUrl })
+const client = new ExampleAPIClient({ baseUrl })
 
 export default function () {
   /**

package/examples/simple_post_request_schema/split/exampleAPI.schemas.ts

@@ -0,0 +1,47 @@
+/**
+ * Automatically generated by @grafana/openapi-to-k6: 0.2.0
+ * Do not edit manually.
+ * Example API
+ * API with all formats of data in the POST request body
+ * OpenAPI spec version: 1.0.0
+ */
+export type CreateExampleData201Meta = {
+  createdBy?: string
+  updatedBy?: string
+}
+
+export type CreateExampleData201 = {
+  age?: number
+  date?: string
+  /** The unique ID of the created resource */
+  id?: string
+  isActive?: boolean
+  meta?: CreateExampleData201Meta
+  name?: string
+  tags?: string[]
+}
+
+/**
+ * An object parameter containing metadata
+ */
+export type CreateExampleDataBodyMeta = {
+  /** A string parameter for the creator's name */
+  createdBy?: string
+  /** A string parameter for the updater's name */
+  updatedBy?: string
+}
+
+export type CreateExampleDataBody = {
+  /** An integer parameter */
+  age: number
+  /** A date parameter in YYYY-MM-DD format */
+  date?: string
+  /** A boolean parameter */
+  isActive: boolean
+  /** An object parameter containing metadata */
+  meta?: CreateExampleDataBodyMeta
+  /** A string parameter */
+  name: string
+  /** An array of strings */
+  tags?: string[]
+}

package/examples/simple_post_request_schema/split/exampleAPI.ts

@@ -0,0 +1,99 @@
+/**
+ * Automatically generated by @grafana/openapi-to-k6: 0.2.0
+ * Do not edit manually.
+ * Example API
+ * API with all formats of data in the POST request body
+ * OpenAPI spec version: 1.0.0
+ */
+import { URL } from 'https://jslib.k6.io/url/1.0.0/index.js'
+import http from 'k6/http'
+import type { Params, Response } from 'k6/http'
+import type {
+  CreateExampleData201,
+  CreateExampleDataBody,
+} from './exampleAPI.schemas'
+
+/**
+ * This is the base client to use for interacting with the API.
+ */
+export class ExampleAPIClient {
+  private cleanBaseUrl: string
+  private commonRequestParameters: Params
+
+  constructor(clientOptions: {
+    baseUrl: string
+    commonRequestParameters?: Params
+  }) {
+    this.cleanBaseUrl = clientOptions.baseUrl.replace(/\/+$/, '')
+  }
+
+  /**
+   * This endpoint demonstrates the use of various data formats in the input body
+   * @summary Create example data
+   */
+  createExampleData(
+    createExampleDataBody: CreateExampleDataBody,
+    requestParameters?: Params
+  ): {
+    response: Response
+    data: CreateExampleData201
+  } {
+    const url = new URL(this.cleanBaseUrl + `/example`)
+    const mergedRequestParameters = this._mergeRequestParameters(
+      requestParameters || {},
+      this.commonRequestParameters
+    )
+    const response = http.request(
+      'POST',
+      url.toString(),
+      JSON.stringify(createExampleDataBody),
+      {
+        ...mergedRequestParameters,
+        headers: {
+          'Content-Type': 'application/json',
+          ...mergedRequestParameters?.headers,
+        },
+      }
+    )
+    let data
+
+    try {
+      data = response.json()
+    } catch {
+      data = response.body
+    }
+    return {
+      response,
+      data,
+    }
+  }
+
+  /**
+   * Merges the provided request parameters with default parameters for the client.
+   *
+   * @param {Params} requestParameters - The parameters provided specifically for the request
+   * @param {Params} commonRequestParameters - Common parameters for all requests
+   * @returns {Params} - The merged parameters
+   */
+  private _mergeRequestParameters(
+    requestParameters?: Params,
+    commonRequestParameters?: Params
+  ): Params {
+    return {
+      ...commonRequestParameters, // Default to common parameters
+      ...requestParameters, // Override with request-specific parameters
+      headers: {
+        ...(commonRequestParameters?.headers || {}), // Ensure headers are defined
+        ...(requestParameters?.headers || {}),
+      },
+      cookies: {
+        ...(commonRequestParameters?.cookies || {}), // Ensure cookies are defined
+        ...(requestParameters?.cookies || {}),
+      },
+      tags: {
+        ...(commonRequestParameters?.tags || {}), // Ensure tags are defined
+        ...(requestParameters?.tags || {}),
+      },
+    }
+  }
+}

package/examples/simple_post_request_schema/split/k6-script.sample.ts

@@ -0,0 +1,13 @@
+import { ExampleAPIClient } from './exampleAPI.ts'
+
+const baseUrl = '<BASE_URL>'
+const client = new ExampleAPIClient({ baseUrl })
+
+export default function () {
+  /**
+   * Create example data
+   */
+  const createExampleDataResponseData = client.createExampleData(
+    createExampleDataBody
+  )
+}

package/examples/simple_post_request_schema/tags/default.ts

@@ -0,0 +1,99 @@
+/**
+ * Automatically generated by @grafana/openapi-to-k6: 0.2.0
+ * Do not edit manually.
+ * Example API
+ * API with all formats of data in the POST request body
+ * OpenAPI spec version: 1.0.0
+ */
+import { URL } from 'https://jslib.k6.io/url/1.0.0/index.js'
+import http from 'k6/http'
+import type { Params, Response } from 'k6/http'
+import type {
+  CreateExampleData201,
+  CreateExampleDataBody,
+} from './exampleAPI.schemas'
+
+/**
+ * This is the base client to use for interacting with the API.
+ */
+export class DefaultClient {
+  private cleanBaseUrl: string
+  private commonRequestParameters: Params
+
+  constructor(clientOptions: {
+    baseUrl: string
+    commonRequestParameters?: Params
+  }) {
+    this.cleanBaseUrl = clientOptions.baseUrl.replace(/\/+$/, '')
+  }
+
+  /**
+   * This endpoint demonstrates the use of various data formats in the input body
+   * @summary Create example data
+   */
+  createExampleData(
+    createExampleDataBody: CreateExampleDataBody,
+    requestParameters?: Params
+  ): {
+    response: Response
+    data: CreateExampleData201
+  } {
+    const url = new URL(this.cleanBaseUrl + `/example`)
+    const mergedRequestParameters = this._mergeRequestParameters(
+      requestParameters || {},
+      this.commonRequestParameters
+    )
+    const response = http.request(
+      'POST',
+      url.toString(),
+      JSON.stringify(createExampleDataBody),
+      {
+        ...mergedRequestParameters,
+        headers: {
+          'Content-Type': 'application/json',
+          ...mergedRequestParameters?.headers,
+        },
+      }
+    )
+    let data
+
+    try {
+      data = response.json()
+    } catch {
+      data = response.body
+    }
+    return {
+      response,
+      data,
+    }
+  }
+
+  /**
+   * Merges the provided request parameters with default parameters for the client.
+   *
+   * @param {Params} requestParameters - The parameters provided specifically for the request
+   * @param {Params} commonRequestParameters - Common parameters for all requests
+   * @returns {Params} - The merged parameters
+   */
+  private _mergeRequestParameters(
+    requestParameters?: Params,
+    commonRequestParameters?: Params
+  ): Params {
+    return {
+      ...commonRequestParameters, // Default to common parameters
+      ...requestParameters, // Override with request-specific parameters
+      headers: {
+        ...(commonRequestParameters?.headers || {}), // Ensure headers are defined
+        ...(requestParameters?.headers || {}),
+      },
+      cookies: {
+        ...(commonRequestParameters?.cookies || {}), // Ensure cookies are defined
+        ...(requestParameters?.cookies || {}),
+      },
+      tags: {
+        ...(commonRequestParameters?.tags || {}), // Ensure tags are defined
+        ...(requestParameters?.tags || {}),
+      },
+    }
+  }
+}

package/examples/simple_post_request_schema/tags/exampleAPI.schemas.ts

@@ -0,0 +1,47 @@
+/**
+ * Automatically generated by @grafana/openapi-to-k6: 0.2.0
+ * Do not edit manually.
+ * Example API
+ * API with all formats of data in the POST request body
+ * OpenAPI spec version: 1.0.0
+ */
+export type CreateExampleData201Meta = {
+  createdBy?: string
+  updatedBy?: string
+}
+
+export type CreateExampleData201 = {
+  age?: number
+  date?: string
+  /** The unique ID of the created resource */
+  id?: string
+  isActive?: boolean
+  meta?: CreateExampleData201Meta
+  name?: string
+  tags?: string[]
+}
+
+/**
+ * An object parameter containing metadata
+ */
+export type CreateExampleDataBodyMeta = {
+  /** A string parameter for the creator's name */
+  createdBy?: string
+  /** A string parameter for the updater's name */
+  updatedBy?: string
+}
+
+export type CreateExampleDataBody = {
+  /** An integer parameter */
+  age: number
+  /** A date parameter in YYYY-MM-DD format */
+  date?: string
+  /** A boolean parameter */
+  isActive: boolean
+  /** An object parameter containing metadata */
+  meta?: CreateExampleDataBodyMeta
+  /** A string parameter */
+  name: string
+  /** An array of strings */
+  tags?: string[]
+}

package/examples/simple_post_request_schema/tags/k6-script.sample.ts

@@ -0,0 +1,13 @@
+import { ExampleAPIClient } from './exampleAPI.ts'
+
+const baseUrl = '<BASE_URL>'
+const client = new ExampleAPIClient({ baseUrl })
+
+export default function () {
+  /**
+   * Create example data
+   */
+  const createExampleDataResponseData = client.createExampleData(
+    createExampleDataBody
+  )
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/openapi-to-k6",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "A CLI tool to generate helper modules for K6 from OpenAPI schema",
   "main": "dist/cli.js",
   "bin": {
@@ -13,7 +13,7 @@
     "lint": "eslint --ext .ts,.tsx .",
     "lint:fix": "eslint --ext .ts,.tsx . --fix",
     "format": "prettier --ignore-unknown --write \"./**/*\"",
-    "update-examples": "for dir in ./examples/*/; do (npm run dev -- \"$dir/schema.json\" \"$dir\"); done",
+    "update-examples": "for dir in ./examples/*/; do (npm run dev -- \"$dir/schema.json\" \"$dir/single/\" -m single --include-sample-script && npm run dev -- \"$dir/schema.json\" \"$dir/split/\" -m split --include-sample-script && npm run dev -- \"$dir/schema.json\" \"$dir/tags/\" -m tags --include-sample-script); done",
     "prepare": "husky"
   },
   "author": "",

package/src/analytics.ts

@@ -26,7 +26,8 @@ function getAnonymousUserId(): string {
  * @returns
  */
 export function generateDefaultAnalyticsData(
-  packageDetails: PackageDetails
+  packageDetails: PackageDetails,
+  isSampleK6ScriptGenerated: boolean
 ): AnalyticsData {
   const defaultAnalyticsData: AnalyticsData = {
     generatedRequestsCount: {
@@ -37,6 +38,7 @@ export function generateDefaultAnalyticsData(
       delete: 0,
       head: 0,
     },
+    isSampleK6ScriptGenerated,
     openApiSpecVersion: '',
     toolVersion: packageDetails.version,
     anonymousUserId: getAnonymousUserId(),

package/src/cli.ts

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 
 import chalk from 'chalk'
-import { Command } from 'commander'
+import { Command, InvalidArgumentError } from 'commander'
 import { generateDefaultAnalyticsData, reportUsageAnalytics } from './analytics'
+import { Mode } from './constants'
 import generateK6SDK from './generator'
 import { getPackageDetails } from './helper'
 import { logger } from './logger'
@@ -11,11 +12,27 @@ import { AnalyticsData, GenerateK6SDKOptions } from './type'
 const program = new Command()
 const packageDetails = getPackageDetails()
 
+/**
+ * Validate that the mode argument is one of the supported modes.
+ *
+ * @param {string} value - The mode value to validate
+ * @return {Mode} - The validated mode value
+ */
+function validateMode(value: string): Mode {
+  if (!Object.values(Mode).includes(value as Mode)) {
+    throw new InvalidArgumentError(
+      `Supported modes: ${Object.values(Mode).join(', ')}`
+    )
+  }
+  return value as Mode
+}
+
 async function generateSDK({
   openApiPath,
   outputDir,
   shouldGenerateSampleK6Script,
   analyticsData,
+  mode,
 }: GenerateK6SDKOptions) {
   logger.logMessage('Generating TypeScript client for k6...\n')
   logger.logMessage(`OpenAPI schema: ${openApiPath}`)
@@ -26,6 +43,7 @@ async function generateSDK({
     outputDir,
     shouldGenerateSampleK6Script,
     analyticsData,
+    mode,
   })
 
   if (shouldGenerateSampleK6Script) {
@@ -44,8 +62,14 @@ program
   .version(packageDetails.version)
   .argument('<openApiPath>', 'Path or URL for the OpenAPI schema file')
   .argument('<outputDir>', 'Directory where the SDK should be generated')
+  .option(
+    '-m, --mode <string>',
+    `mode to use for generating the client. Valid values - ${Object.values(Mode).join(', ')}`,
+    validateMode,
+    Mode.SINGLE
+  )
   .option('-v, --verbose', 'enable verbose mode to show debug logs')
-  .option('--no-sample-script', 'disable generating sample k6 script')
+  .option('--include-sample-script', 'generate a sample k6 script')
   .option('--disable-analytics', 'disable anonymous usage data collection')
   .action(
     async (
@@ -53,16 +77,14 @@ program
       outputDir,
       options: {
         verbose?: boolean
+        mode: Mode
         disableAnalytics?: boolean
-        disableSampleScript?: boolean
+        includeSampleScript?: boolean
       }
     ) => {
       let analyticsData: AnalyticsData | undefined
       const shouldDisableAnalytics =
         options.disableAnalytics || process.env.DISABLE_ANALYTICS === 'true'
-      const shouldDisableSampleScript =
-        options.disableSampleScript ||
-        process.env.DISABLE_SAMPLE_SCRIPT === 'true'
 
       if (options.verbose) {
         logger.setVerbose(true)
@@ -73,7 +95,10 @@ program
         logger.debug('Anonymous usage data collection disabled')
       } else {
         logger.debug('Anonymous usage data collection enabled')
-        analyticsData = generateDefaultAnalyticsData(packageDetails)
+        analyticsData = generateDefaultAnalyticsData(
+          packageDetails,
+          !!options.includeSampleScript
+        )
       }
 
       logger.debug(`
@@ -84,8 +109,9 @@ program
         await generateSDK({
           openApiPath,
           outputDir,
-          shouldGenerateSampleK6Script: !shouldDisableSampleScript,
+          shouldGenerateSampleK6Script: !!options.includeSampleScript,
           analyticsData,
+          mode: options.mode,
         })
       } catch (error) {
         logger.error('Failed to generate SDK:')

package/src/constants.ts

@@ -5,7 +5,7 @@ export const K6_SCRIPT_TEMPLATE = `
 import { {{clientFunctionName}} } from '{{clientPath}}'
 
 const baseUrl = '<BASE_URL>';
-const client = {{clientFunctionName}}({ baseUrl })
+const client = new {{clientFunctionName}}({ baseUrl })
 
 export default function () {
     {{#each clientFunctionsList}}
@@ -17,3 +17,9 @@ export default function () {
     {{/each}}
 }
 `
+
+export enum Mode {
+  SINGLE = 'single',
+  SPLIT = 'split',
+  TAGS = 'tags',
+}