@shopware/api-gen 1.3.2 → 1.3.3

package/README.md

@@ -316,8 +316,8 @@ await validateJson({
 
 Full changelog for stable version is available [here](https://github.com/shopware/frontends/blob/main/packages/api-gen/CHANGELOG.md)
 
-### Latest changes: 1.3.2
+### Latest changes: 1.3.3
 
 ### Patch Changes
 
-- [#1939](https://github.com/shopware/frontends/pull/1939) [`cb62cfb`](https://github.com/shopware/frontends/commit/cb62cfb541552ce4e0dc8a02a7a8bddb72ef4de1) Thanks [@patzick](https://github.com/patzick)! - Update typescript version to match openapi-typescript version, causing problems with generating proper schema.
+- [#1942](https://github.com/shopware/frontends/pull/1942) [`a344abb`](https://github.com/shopware/frontends/commit/a344abba579c91c4f775e7be27ed882ca420fdc2) Thanks [@patzick](https://github.com/patzick)! - Allow shared parameters to be available in schema resolver.

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { g as generate, l as loadSchema, v as validateJson } from './shared/api-gen.Bc8kWZ2Q.mjs';
+import { g as generate, l as loadSchema, v as validateJson } from './shared/api-gen.BZLmrTCs.mjs';
 import 'node:fs';
 import 'node:path';
 import 'openapi-typescript';
@@ -15,7 +15,7 @@ import 'crypto';
 import '@shopware/api-client';
 
 const name = "@shopware/api-gen";
-const version = "1.3.2";
+const version = "1.3.3";
 const description = "Shopware CLI for API client generation.";
 const author = "Shopware";
 const type = "module";

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { g as generate, l as loadSchema, v as validateJson } from './shared/api-gen.Bc8kWZ2Q.mjs';
+export { g as generate, l as loadSchema, v as validateJson } from './shared/api-gen.BZLmrTCs.mjs';
 import 'node:fs';
 import 'node:path';
 import 'openapi-typescript';

package/dist/shared/{api-gen.Bc8kWZ2Q.mjs → api-gen.BZLmrTCs.mjs}

@@ -9953,12 +9953,13 @@ ${error}
   );
 }
 
-async function generateFile(filepath, operationsMap, existingTypes, schemasMap, options) {
+async function generateFile(filepath, operationsMap, existingTypes, schemasMap, parametersMap, options) {
   const project = await prepareFileContent({
     filepath,
     operationsMap,
     existingTypes,
     componentsMap: schemasMap,
+    parametersMap,
     options
   });
   await project.save();
@@ -9968,6 +9969,7 @@ async function prepareFileContent({
   operationsMap,
   existingTypes,
   componentsMap,
+  parametersMap,
   options
 }) {
   const project = new Project({});
@@ -9980,6 +9982,7 @@ async function prepareFileContent({
   const defaultContentType = "application/json";
   const defaultAcceptType = "application/json";
   const sortedSchemaKeys = Object.keys(componentsMap).sort();
+  const sortedParametersKeys = Object.keys(parametersMap).sort();
   const sourceFile = project.createSourceFile(
     filepath,
     (writer) => {
@@ -9990,6 +9993,15 @@ async function prepareFileContent({
       }
       writer.write("export type components =").block(() => {
         writer.writeLine("schemas: Schemas;");
+        if (sortedParametersKeys.length) {
+          writer.writeLine("parameters:").block(() => {
+            for (const key of sortedParametersKeys) {
+              if (parametersMap[key]) {
+                writer.write(`${key}:`).write(parametersMap[key]);
+              }
+            }
+          });
+        }
       });
       writer.write("export type Schemas =").block(() => {
         for (const key of sortedSchemaKeys) {
@@ -10164,6 +10176,7 @@ function transformSchemaTypes(schema) {
   } = createVirtualFiles([{ name: "_openApi.d.ts", content: schema }]);
   const overridesMap = {};
   const componentsMap = {};
+  const parametersMap = {};
   const existingTypes = [];
   const skipTypeNames = ["operations", "Schemas", "components"];
   function traverseThroughFileNodes(node) {
@@ -10212,10 +10225,10 @@ function transformSchemaTypes(schema) {
   if (sourceFile) {
     traverseThroughFileNodes(sourceFile);
   }
-  return [overridesMap, componentsMap, existingTypes];
+  return [overridesMap, componentsMap, existingTypes, parametersMap];
 }
 
-async function processAstSchemaAndOverrides([opMap, opComponents, opExistingTypes], overridingSchema, type, options) {
+async function processAstSchemaAndOverrides([opMap, opComponents, opExistingTypes, opParameters], overridingSchema, type, options) {
   const {
     sourceFiles: [sourceFile, overridesSourceFile]
   } = createVirtualFiles([
@@ -10238,12 +10251,14 @@ async function processAstSchemaAndOverrides([opMap, opComponents, opExistingType
   );
   const componentsMap = defu(oComponetsMap, opComponents);
   const existingTypes = opExistingTypes;
+  const parametersMap = opParameters;
   const filePath = join("api-types", `${type}ApiTypes.d.ts`);
   await generateFile(
     filePath,
     operationsMap,
     existingTypes,
     componentsMap,
+    parametersMap,
     options
   );
 }
@@ -10256,6 +10271,7 @@ function transformOpenApiTypes(schema) {
   } = createVirtualFiles([{ name: "_openApi.d.ts", content: schema }]);
   const operationsMap = {};
   const componentsMap = {};
+  const parametersMap = {};
   const existingTypes = [];
   function traverseThroughFileNodes(node) {
     if (node.kind === ts.SyntaxKind.TypeAliasDeclaration) {
@@ -10471,6 +10487,26 @@ function transformOpenApiTypes(schema) {
             }
           }
         }
+        const allParameters = getDeepProperty({
+          type,
+          names: ["parameters"],
+          node,
+          typeChecker
+        });
+        if (allParameters) {
+          const parameterNames = getTypePropertyNames(allParameters);
+          for (const parameterName of parameterNames) {
+            const parameterCode = getDeepPropertyCode({
+              type: allParameters,
+              names: [parameterName],
+              node,
+              typeChecker
+            });
+            if (parameterCode) {
+              parametersMap[parameterName] = parameterCode;
+            }
+          }
+        }
       }
       const doNotMoveTypes = [
         "$defs",
@@ -10490,7 +10526,7 @@ function transformOpenApiTypes(schema) {
   if (sourceFile) {
     traverseThroughFileNodes(sourceFile);
   }
-  return [operationsMap, componentsMap, existingTypes];
+  return [operationsMap, componentsMap, existingTypes, parametersMap];
 }
 
 async function generate(args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware/api-gen",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Shopware CLI for API client generation.",
   "author": "Shopware",
   "type": "module",