@bitstack/ng-query-codegen-openapi 0.0.36 → 0.0.38-alpha.0

package/src/generators/rtk-query-generator.ts

@@ -81,21 +81,11 @@ export function generateRtkQueryFile(
   /**
    * ${info.summary}
    */
-  ${info.operationName}LazyQuery(): {
-    trigger: (args: IRestFulEndpointsQueryReturn<${info.argTypeName}>, options?: { skipCache?: boolean }) => Observable<${info.responseTypeName}>
-  } {
-    return {
-      trigger: (args, options = {}) => {
-        const { skipCache = true } = options;
-        if (!skipCache) {
-          const cachedResult = this.ntkQuery.getQueryCache<${info.responseTypeName}>([ECacheTagTypes.${info.queryKeyName}${!info.isVoidArg ? ', args.variables' : ''}]);
-          if (cachedResult) {
-            return cachedResult;
-          }
-        }
-        return this.apiService.${info.operationName}(args);
-      }
-    };
+  ${info.operationName}LazyQuery(): LazyQueryResult<${info.responseTypeName}, IRestFulEndpointsQueryReturn<${info.argTypeName}>> {
+    return this.ntkQuery.lazyQuery<${info.responseTypeName}, IRestFulEndpointsQueryReturn<${info.argTypeName}>(
+      ECacheTagTypes.${info.queryKeyName},
+      (args) => this.apiService.${info.operationName}(args),
+    );
   }`
     )
     .join('');
@@ -106,7 +96,7 @@ export function generateRtkQueryFile(
 import {Injectable, inject} from '@angular/core';
 import {Observable} from 'rxjs';
 import {HttpErrorResponse} from '@angular/common/http';
-import {NtkQueryService, MutationState, QueryState, MutationResponse} from '@core/ntk-query';
+import {NtkQueryService, MutationState, QueryState, MutationResponse, LazyQueryResult, LazyQueryTriggerOptions} from '@core/ntk-query';
 import {ECacheTagTypes} from '../tagTypes';
 import {${apiServiceName}} from './enhanceEndpoints';
 import {IRestFulEndpointsQueryReturn, RequestOptions} from '../common-types';

package/src/generators/types-generator.ts

@@ -294,6 +294,21 @@ function getTypeFromSchema(schema: any, schemaTypeMap: Record<string, string> =
     }
   }
 
+  // 處理 oneOf / anyOf -> 聯合類型 (A | B)
+  if (schema.oneOf || schema.anyOf) {
+    const variants: any[] = schema.oneOf || schema.anyOf;
+    const types = variants.map((s: any) => getTypeFromSchema(s, schemaTypeMap, indentLevel));
+    const baseType = types.join(' | ');
+    return schema.nullable ? `${baseType} | null` : baseType;
+  }
+
+  // 處理 allOf -> 交叉類型 (A & B)
+  if (schema.allOf) {
+    const types = schema.allOf.map((s: any) => getTypeFromSchema(s, schemaTypeMap, indentLevel));
+    const baseType = types.join(' & ');
+    return schema.nullable ? `(${baseType}) | null` : baseType;
+  }
+
   let baseType: string;
 
   switch (schema.type) {