@team-supercharge/oasg 17.1.0 → 18.0.0-temp-chore-fix-tanstack-query-version.2eaaff54

package/targets/ios/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/kmp/generate.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/kmp/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/kmp/templates/build.gradle.kts.mustache

@@ -1,18 +1,18 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
-    kotlin("multiplatform"){{^omitGradlePluginVersions}} version "2.1.21" // kotlin_version{{/omitGradlePluginVersions}}
-    kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "2.1.21" // kotlin_version{{/omitGradlePluginVersions}}
+    kotlin("multiplatform"){{^omitGradlePluginVersions}} version "2.2.20" // kotlin_version{{/omitGradlePluginVersions}}
+    kotlin("plugin.serialization"){{^omitGradlePluginVersions}} version "2.2.20" // kotlin_version{{/omitGradlePluginVersions}}
     id("maven-publish") // OASg added for publication
 }
 
 group = "{{groupId}}"
 version = "{{artifactVersion}}"
 
-val kotlin_version = "2.1.21"
+val kotlin_version = "2.2.20"
 val coroutines_version = "1.10.2"
-val serialization_version = "1.8.1"
-val ktor_version = "3.1.3"
+val serialization_version = "1.9.0"
+val ktor_version = "3.2.3"
 
 repositories {
     mavenCentral()
@@ -44,7 +44,7 @@ kotlin {
                 api("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
 
                 {{#kotlinx-datetime}}
-                api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
+                api("org.jetbrains.kotlinx:kotlinx-datetime:0.7.1")
                 {{/kotlinx-datetime}}
             }
         }
@@ -80,21 +80,25 @@ kotlin {
                 api("io.ktor:ktor-client-js:$ktor_version")
             }
         }
+
+        {{#kotlinx-datetime}}
+        all {
+            languageSettings {
+                optIn("kotlin.time.ExperimentalTime")
+            }
+        }
+        {{/kotlinx-datetime}}
     }
 }
 
 tasks {
-    register("iosTest") {
+    register<Exec>("iosTest") {
         val device = project.findProperty("device")?.toString() ?: "iPhone 8"
         dependsOn("linkDebugTestIosX64")
         group = JavaBasePlugin.VERIFICATION_GROUP
         description = "Execute unit tests on ${device} simulator"
-        doLast {
-            val binary = kotlin.targets.getByName<KotlinNativeTarget>("iosX64").binaries.getTest("DEBUG")
-            exec {
-                commandLine("xcrun", "simctl", "spawn", device, binary.outputFile)
-            }
-        }
+        val binary = kotlin.targets.getByName<KotlinNativeTarget>("iosX64").binaries.getTest("DEBUG")
+        commandLine("xcrun", "simctl", "spawn", device, binary.outputFile)
     }
     register("test") {
         dependsOn("allTests")

package/targets/kmp/templates/libraries/multiplatform/api.mustache

@@ -126,9 +126,11 @@ import kotlinx.serialization.encoding.*
 {{/hasBodyParam}}
 {{#isArray}}
 {{>serial_wrapper_response_list}}
+
 {{/isArray}}
 {{#isMap}}
 {{>serial_wrapper_response_map}}
+
 {{/isMap}}
 
     {{/operation}}

package/targets/msw/generate.sh

@@ -0,0 +1,25 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+rm -rf out/$targetId
+mkdir -p out/$targetId
+
+java -jar $binary generate \
+  -g $generatorId \
+  -i $openApiFile \
+  -t $templateDir \
+  -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
+  -p "npmVersion=$version,npmName=$packageName,npmRepository=$repository" \
+  --reserved-words-mappings delete=delete $generatorCustomArgs
+
+cd out/$targetId
+
+rm src/runtime.ts
+
+npx prettier --write src
+
+npm install
+npm run build
+cd ../..

package/targets/msw/generator-config.json

@@ -0,0 +1,28 @@
+{
+  "typescriptThreePlus": "true",
+  "supportsES6": "true",
+  "modelPropertyNaming": "original",
+  "withInterfaces": "true",
+  "fileNaming": "camelCase",
+  "stringEnums": "true",
+  "enumPropertyNaming": "UPPERCASE",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  },
+  "files": {
+    "prettierrc.mustache": {
+      "folder": ".",
+      "destinationFilename": ".prettierrc"
+    },
+    "config.mustache": {
+      "folder": "src",
+      "destinationFilename": "config.ts"
+    },
+    "utils.mustache": {
+      "folder": "src",
+      "destinationFilename": "utils.ts"
+    }
+  }
+}

package/targets/msw/templates/apis.index.mustache

@@ -0,0 +1,9 @@
+/* tslint:disable */
+/* eslint-disable */
+{{#apiInfo}}
+  {{#apis}}
+    {{#operations}}
+      export * from './{{ classFilename }}{{importFileExtension}}';
+    {{/operations}}
+  {{/apis}}
+{{/apiInfo}}

package/targets/msw/templates/apis.mustache

@@ -0,0 +1,178 @@
+/* tslint:disable */
+/* eslint-disable */
+import {
+  http,
+  type RequestHandler,
+  type ResponseResolverInfo,
+  type AsyncResponseResolverReturnType,
+  type HttpRequestResolverExtras,
+  type PathParams,
+} from 'msw';
+import { getMswSdkConfig } from '../config';
+import { delay, transformPathParams } from '../utils';
+{{#imports.0}}
+  import type {
+    {{#imports}}
+      {{className}},
+    {{/imports}}
+  } from '../models/index{{importFileExtension}}';
+{{/imports.0}}
+
+type {{#lambda.titlecase}}{{classname}}{{/lambda.titlecase}}Resolvers = {
+  {{#operations}}
+    {{#operation}}
+      {{nickname}}: (info: ResponseResolverInfo<
+        HttpRequestResolverExtras<
+          {{! Parameters }}
+          {{#hasPathParams}}
+            {
+              {{#allParams}}
+                {{#isPathParam}}
+                  {{paramName}}{{^required}}?{{/required}}: {{#isArray}}ReadonlyArray<{{/isArray}}string{{#isArray}}>{{/isArray}};
+                {{/isPathParam}}
+              {{/allParams}}
+            }
+          {{/hasPathParams}}
+          {{^hasPathParams}}
+            PathParams<never>
+          {{/hasPathParams}},
+        >
+        {{#hasQueryParams}}
+        & {
+          queryParams: {{#lambda.titlecase}}{{classname}}{{/lambda.titlecase}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}QueryParams;
+        }
+        {{/hasQueryParams}}
+        ,
+        {{! Request body }}
+        {{#hasBodyParam}}
+          {{#bodyParam}}
+            {{{dataType}}}
+          {{/bodyParam}}
+        {{/hasBodyParam}}
+        {{^hasBodyParam}}
+          undefined
+        {{/hasBodyParam}},
+      >) => AsyncResponseResolverReturnType<
+        {{! Response }}
+        {{#returnType}}
+          {{#isResponseFile}}
+            Blob
+          {{/isResponseFile}}
+          {{^isResponseFile}}
+            {{{returnType}}}
+          {{/isResponseFile}}
+        {{/returnType}}
+        {{^returnType}}
+          undefined
+        {{/returnType}}
+      >;
+    {{/operation}}
+  {{/operations}}
+};
+
+{{! Typed wrapper around query parameters }}
+{{#operations}}
+  {{#operation}}
+    {{#hasQueryParams}}
+      const get{{#lambda.titlecase}}{{classname}}{{/lambda.titlecase}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}QueryParams = (url: string) => {
+        const { searchParams } = new URL(url);
+
+        return {
+          {{#allParams}}
+            {{#isQueryParam}}
+              get {{paramName}}(): {{{dataType}}}{{^required}} | undefined{{/required}} {
+                {{#isArray}}
+                  const values = searchParams.getAll('{{paramName}}');
+                  return values as unknown as {{{dataType}}};
+                {{/isArray}}
+                {{^isArray}}
+                  const value = searchParams.get('{{paramName}}');
+
+                  {{!
+                    Mustache doesn't have if..else statements, so we have to be really tricky
+                    about supporting multiple data types here. We comment out each not relevant
+                    type transformations.
+                  }}
+                  {{^isDate}}//{{/isDate}}return value ? new Date(value) : undefined;
+                  {{^isInteger}}//{{/isInteger}}return value ? Number(value) : undefined;
+
+                  return value as unknown as {{{dataType}}};
+                {{/isArray}}
+              },
+            {{/isQueryParam}}
+          {{/allParams}}
+        };
+      };
+
+      export type {{#lambda.titlecase}}{{classname}}{{/lambda.titlecase}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}QueryParams = ReturnType<
+        typeof get{{#lambda.titlecase}}{{classname}}{{/lambda.titlecase}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}QueryParams
+      >;
+
+    {{/hasQueryParams}}
+  {{/operation}}
+{{/operations}}
+
+export function mock{{classname}}(resolvers: Partial<{{#lambda.titlecase}}{{classname}}{{/lambda.titlecase}}Resolvers>) {
+  const config = getMswSdkConfig();
+
+  const requestHandlers: RequestHandler[] = [];
+
+  {{#operations}}
+    {{#operation}}
+      const {{nickname}}Resolver = resolvers.{{nickname}};
+      if (typeof {{nickname}}Resolver !== 'undefined') {
+        requestHandlers.push(
+          http.{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}<
+            {{! Parameters }}
+            {{#hasPathParams}}
+              {
+                {{#allParams}}
+                  {{#isPathParam}}
+                    {{paramName}}{{^required}}?{{/required}}: {{#isArray}}ReadonlyArray<{{/isArray}}string{{#isArray}}>{{/isArray}};
+                  {{/isPathParam}}
+                {{/allParams}}
+              }
+            {{/hasPathParams}}
+            {{^hasPathParams}}
+              PathParams<never>
+            {{/hasPathParams}},
+        {{! Request body }}
+        {{#hasBodyParam}}
+          {{#bodyParam}}
+            {{{dataType}}}
+          {{/bodyParam}}
+        {{/hasBodyParam}}
+        {{^hasBodyParam}}
+          undefined
+        {{/hasBodyParam}},
+        {{! Response }}
+        {{#returnType}}
+          {{#isResponseFile}}
+            Blob
+          {{/isResponseFile}}
+          {{^isResponseFile}}
+            {{{returnType}}}
+          {{/isResponseFile}}
+        {{/returnType}}
+        {{^returnType}}
+          undefined
+        {{/returnType}}
+          >(`${config.baseUrl}${transformPathParams('{{path}}')}`, async (info) => {
+            await delay(config.delay);
+
+            {{#hasQueryParams}}
+              const queryParams = get{{#lambda.titlecase}}{{classname}}{{/lambda.titlecase}}{{#lambda.titlecase}}{{nickname}}{{/lambda.titlecase}}QueryParams(info.request.url);
+              return {{nickname}}Resolver({ ...info, queryParams });
+            {{/hasQueryParams}}
+            {{^hasQueryParams}}
+              return {{nickname}}Resolver(info);
+            {{/hasQueryParams}}
+          })
+        );
+      }
+
+    {{/operation}}
+  {{/operations}}
+
+  return requestHandlers;
+}

package/targets/msw/templates/config.mustache

@@ -0,0 +1,23 @@
+export type MswSdkConfig = {
+  baseUrl: string;
+  delay?: [number, number];
+}
+
+let config: MswSdkConfig | null = null;
+
+export const setMswSdkConfig = ({ baseUrl, ...newConfig }: MswSdkConfig): void => {
+  config = {
+    delay: [100, 400],
+    // Replace any trailing slash in the baseUrl as all the paths are constructed with a leading slash.
+    baseUrl: baseUrl.replace(/\/+$/, ''),
+    ...newConfig,
+  };
+};
+
+export const getMswSdkConfig = (): Readonly<MswSdkConfig> => {
+  if (config === null) {
+    throw new Error('MSW SDK is not configured. Please configure it before using the SDK.');
+  }
+
+  return Object.freeze(config);
+};

package/targets/msw/templates/index.mustache

@@ -0,0 +1,11 @@
+/* tslint:disable */
+/* eslint-disable */
+{{#apiInfo}}
+  {{#apis.0}}
+    export * from './apis/index{{importFileExtension}}';
+  {{/apis.0}}
+{{/apiInfo}}
+{{#models.0}}
+  export * from './models/index{{importFileExtension}}';
+{{/models.0}}
+export * from './config';

package/targets/msw/templates/modelEnum.mustache

@@ -0,0 +1 @@
+{{>modelEnumInterfaces}}

package/targets/msw/templates/modelGeneric.mustache

@@ -0,0 +1,7 @@
+{{#hasImports}}
+  {{#tsImports}}
+    import type { {{{classname}}} } from './{{filename}}{{importFileExtension}}';
+  {{/tsImports}}
+{{/hasImports}}
+
+{{>modelGenericInterfaces}}

package/targets/msw/templates/package.mustache

@@ -0,0 +1,35 @@
+{
+  "name": "{{npmName}}",
+  "version": "{{npmVersion}}",
+  "description": "OpenAPI client for {{npmName}}",
+  "author": "OpenAPI-Generator",
+  "repository": {
+    "type": "git",
+    "url": "https://{{gitHost}}/{{gitUserId}}/{{gitRepoId}}.git"
+  },
+{{#packageAsSourceOnlyLibrary}}
+  "main": "./index.ts",
+{{/packageAsSourceOnlyLibrary}}
+{{^packageAsSourceOnlyLibrary}}
+  "main": "./dist/index.js",
+  "typings": "./dist/index.d.ts",
+  "module": "./dist/esm/index.js",
+  "sideEffects": false,
+  "scripts": {
+    "build": "tsc && tsc -p tsconfig.esm.json"{{^sagasAndRecords}},
+    "prepare": "npm run build"{{/sagasAndRecords}}
+  },
+{{/packageAsSourceOnlyLibrary}}
+  "devDependencies": {
+    "typescript": "^5.9.3",
+    "prettier": "^3.7.4"
+  },
+  "peerDependencies": {
+    "msw": "^2.12.4"
+  }{{#npmRepository}},{{/npmRepository}}
+{{#npmRepository}}
+  "publishConfig": {
+    "registry": "{{npmRepository}}"
+  }
+{{/npmRepository}}
+}

package/targets/msw/templates/prettierrc.mustache

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true
+}

package/targets/msw/templates/tsconfig.mustache

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "declaration": true,
+    "target": "es2022",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "dist",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": ["es2022", "dom"],
+    "strictNullChecks": true
+  },
+  "exclude": [
+    "dist",
+    "node_modules"
+  ]
+}

package/targets/msw/templates/utils.mustache

@@ -0,0 +1,15 @@
+export async function delay(config?: [number, number]): Promise<void> {
+  if (!config) return;
+
+  const [minDelay, maxDelay] = config;
+  const delayTime =
+    minDelay === maxDelay
+      ? minDelay
+      : Math.floor(Math.random() * (maxDelay - minDelay) + minDelay);
+
+  return new Promise((resolve) => setTimeout(resolve, delayTime));
+}
+
+export function transformPathParams(path: string): string {
+  return path.replaceAll(/\{([^}]+)\}/g, ':$1');
+}

package/targets/nestjs/generate.sh

@@ -1,6 +1,7 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dependency-lock-utils.sh
 
 rm -rf out/$targetId
 mkdir -p out/$targetId
@@ -38,6 +39,37 @@ rm unescape-patterns.js
 node rewrite-path-parameters.js
 rm rewrite-path-parameters.js
 
-npm install
-npm run build
-cd ../..
+# Extract framework version for dependency locking
+# Priority: 1. generatorCustomArgs override, 2. generator-config.json default
+framework_version=""
+
+# First, check if ngVersion is overridden in generatorCustomArgs
+if [ -n "$generatorCustomArgs" ]; then
+    # Match patterns: -p ngVersion=X.X.X or -pngVersion=X.X.X
+    if [[ "$generatorCustomArgs" =~ -p[[:space:]]*ngVersion=([0-9]+\.[0-9]+\.[0-9]+) ]]; then
+        framework_version="${BASH_REMATCH[1]}"
+        echo "Using ngVersion from generatorCustomArgs: $framework_version"
+    fi
+fi
+
+# Fall back to generator-config.json if not found in generatorCustomArgs
+if [ -z "$framework_version" ] && command -v jq &> /dev/null; then
+    framework_version=$(jq -r '.ngVersion // empty' $(dirname "$0")/generator-config.json 2>/dev/null)
+    if [ -n "$framework_version" ]; then
+        echo "Using ngVersion from generator-config.json: $framework_version"
+    fi
+fi
+
+# Use dependency locking mechanism for build
+echo "Building NestJS target with dependency locking support..."
+
+install_cmd="npm install"
+build_cmd="npm run build"
+
+if build_with_dependency_locking "$targetId" "$framework_version" "out/$targetId" "$install_cmd" "$build_cmd" "$forceLock"; then
+  echo "NestJS target generation completed successfully!"
+else
+  echo "NestJS target generation failed!"
+  exit 1
+fi
+

package/targets/nestjs/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/nestjs/templates/api.service.mustache

@@ -32,20 +32,11 @@ export abstract class {{classname}} {
 // ||||||||||
   /**
   {{#summary}}
-   * {{.}}
-  {{/summary}}
-  {{#notes}}
-   * {{.}}
-  {{/notes}}
-  {{#allParams}}
-   * @param {{paramName}} {{description}}
-  {{/allParams}}
-  {{#isDeprecated}}
-   * @deprecated
-  {{/isDeprecated}}
-   */
-
-  {{#authMethods}}{{#-first}}
+   * {{.}}{{/summary}}{{#notes}}
+   * {{.}}{{/notes}}{{#allParams}}
+   * @param {{paramName}} {{description}}{{/allParams}}{{#isDeprecated}}
+   * @deprecated{{/isDeprecated}}
+   */{{#authMethods}}{{#-first}}
   @AuthSchemes([{{#authMethods}}SecurityScheme.{{name}}{{^-last}}, {{/-last}}{{/authMethods}}])
   @UseGuards(AuthGuard) {{/-first}}{{/authMethods}}
   //// @{{httpMethod}}('{{path}}'){{#isMultipart}}
@@ -55,6 +46,9 @@ export abstract class {{classname}} {
     return this.{{nickname}}({{#allParams.0}}{ params: { {{#allParams}}{{^isBodyParam}}{{^-first}}, {{/-first}}{{paramName}}{{/isBodyParam}}{{/allParams}} }{{#bodyParam}}, body: requestBody{{/bodyParam}} }, {{/allParams.0}}req, res);
   }
 
+  /**
+   * `{{path}}`
+   */
   abstract {{nickname}}({{#allParams.0}}context: {{operationIdCamelCase}}Context, {{/allParams.0}}req?: unknown, res?: unknown): Promise<{{#returnType}}{{#isResponseFile}}StreamableFile{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}{{^returnType}}void{{/returnType}}>;
 
   {{/operation}}

package/targets/plain-java/generate.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/plain-java/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python/generate.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python-fastapi/generate.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python-fastapi/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python-fastapi-raw-request/generate.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python-fastapi-raw-request/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python-legacy/generate.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/python-legacy/publish.sh

@@ -1,4 +1,4 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
 

package/targets/react/generate.sh

@@ -1,6 +1,7 @@
-#/bin/bash
+#!/bin/bash
 
 source $(dirname "$0")/../common.sh
+source $(dirname "$0")/../dependency-lock-utils.sh
 
 rm -rf out/$targetId
 mkdir -p out/$targetId
@@ -13,7 +14,18 @@ java -jar $binary generate \
   -c $(dirname "$0")/generator-config.json \
   -p "npmVersion=$version,npmName=$packageName,npmRepository=$repository" $generatorCustomArgs
 
-cd out/$targetId
-npm install
-npm run build
-cd ../..
+# No framework version for React target
+framework_version=""
+
+# Use dependency locking mechanism for build
+echo "Building React target with dependency locking support..."
+
+install_cmd="npm install"
+build_cmd="npm run build"
+
+if build_with_dependency_locking "$targetId" "$framework_version" "out/$targetId" "$install_cmd" "$build_cmd" "$forceLock"; then
+  echo "React target generation completed successfully!"
+else
+  echo "React target generation failed!"
+  exit 1
+fi