@rainbow-o23/n3 1.0.54 → 1.0.55

package/index.cjs

@@ -1324,7 +1324,7 @@ class FetchPipelineStep extends AbstractFragmentaryPipelineStep {
         this._bodyGenerateSnippet = options.bodyGenerate;
         this._bodyGenerateFunc = Utils.createAsyncFunction(this.getBodyGenerateSnippet(), {
             createDefault: () => async ($factor, _$request, _$helpers, _$) => {
-                return ($factor == null || (typeof $factor === 'string' && $factor.length === 0)) ? (void 0) : JSON.stringify($factor);
+                return (($factor == null || (typeof $factor === 'string' && $factor.length === 0)) ? (void 0) : JSON.stringify($factor));
             },
             getVariableNames: () => this.getBodyGenerateVariableNames(),
             error: (e) => {

package/index.js

@@ -1322,7 +1322,7 @@ class FetchPipelineStep extends AbstractFragmentaryPipelineStep {
         this._bodyGenerateSnippet = options.bodyGenerate;
         this._bodyGenerateFunc = Utils.createAsyncFunction(this.getBodyGenerateSnippet(), {
             createDefault: () => async ($factor, _$request, _$helpers, _$) => {
-                return ($factor == null || (typeof $factor === 'string' && $factor.length === 0)) ? (void 0) : JSON.stringify($factor);
+                return (($factor == null || (typeof $factor === 'string' && $factor.length === 0)) ? (void 0) : JSON.stringify($factor));
             },
             getVariableNames: () => this.getBodyGenerateVariableNames(),
             error: (e) => {

package/lib/http/fetch-step.d.ts

@@ -1,7 +1,7 @@
 import { PipelineStepData, PipelineStepPayload } from '@rainbow-o23/n1';
 import { AbstractFragmentaryPipelineStep, FragmentaryPipelineStepOptions, ScriptFuncOrBody } from '../step';
 import { HttpErrorCode, HttpGenerateBody, HttpGenerateHeaders, HttpGenerateResponse, HttpGenerateUrl, HttpHandleError } from './types';
-export interface FetchPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out> extends FragmentaryPipelineStepOptions<In, Out, InFragment, OutFragment> {
+export interface FetchPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out, BodyData = any> extends FragmentaryPipelineStepOptions<In, Out, InFragment, OutFragment> {
     endpointSystemCode: string;
     endpointName: string;
     urlGenerate?: ScriptFuncOrBody<HttpGenerateUrl<In, InFragment>>;
@@ -9,13 +9,13 @@ export interface FetchPipelineStepOptions<In = PipelineStepPayload, Out = Pipeli
     timeout?: number;
     headersGenerate?: ScriptFuncOrBody<HttpGenerateHeaders<In, InFragment>>;
     bodyUsed?: boolean;
-    bodyGenerate?: ScriptFuncOrBody<HttpGenerateBody<In, InFragment>>;
-    responseGenerate?: ScriptFuncOrBody<HttpGenerateResponse<In, InFragment>>;
+    bodyGenerate?: ScriptFuncOrBody<HttpGenerateBody<In, InFragment, BodyData>>;
+    responseGenerate?: ScriptFuncOrBody<HttpGenerateResponse<In, InFragment, OutFragment>>;
     responseErrorHandles?: ScriptFuncOrBody<HttpHandleError<In, InFragment, OutFragment>> | {
         [key: HttpErrorCode]: ScriptFuncOrBody<HttpHandleError<In, InFragment, OutFragment>>;
     };
 }
-export declare class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out> extends AbstractFragmentaryPipelineStep<In, Out, InFragment, OutFragment> {
+export declare class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out, BodyData = any> extends AbstractFragmentaryPipelineStep<In, Out, InFragment, OutFragment> {
     private readonly _endpointSystemCode;
     private readonly _endpointName;
     private readonly _endpointUrl;
@@ -47,9 +47,9 @@ export declare class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineS
     getHeadersGenerateSnippet(): ScriptFuncOrBody<HttpGenerateHeaders<In, InFragment>>;
     protected getHeadersGenerateVariableNames(): Array<string>;
     protected isBodyUsed(): boolean | undefined;
-    getBodyGenerateSnippet(): ScriptFuncOrBody<HttpGenerateBody<In, InFragment>>;
+    getBodyGenerateSnippet(): ScriptFuncOrBody<HttpGenerateBody<In, InFragment, BodyData>>;
     protected getBodyGenerateVariableNames(): Array<string>;
-    getResponseGenerateSnippet(): ScriptFuncOrBody<HttpGenerateResponse<In, InFragment>>;
+    getResponseGenerateSnippet(): ScriptFuncOrBody<HttpGenerateResponse<In, InFragment, OutFragment>>;
     protected getResponseGenerateVariableName(): Array<string>;
     protected getErrorHandlerVariableName(): Array<string>;
     protected doPerform(data: InFragment, request: PipelineStepData<In>): Promise<OutFragment>;

package/lib/http/types.d.ts

@@ -2,8 +2,8 @@ import { PipelineStepData, PipelineStepHelpers, Undefinable } from '@rainbow-o23
 import { Response } from 'node-fetch';
 export type HttpGenerateUrl<In, InFragment> = ($endpointUrl: string, $factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<string>;
 export type HttpGenerateHeaders<In, InFragment> = ($factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<Undefinable<Record<string, string>>>;
-export type HttpGenerateBody<In, InFragment> = ($factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<any>;
-export type HttpGenerateResponse<In, InFragment> = ($response: Response, $factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<any>;
+export type HttpGenerateBody<In, InFragment, BodyData> = ($factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<BodyData>;
+export type HttpGenerateResponse<In, InFragment, OutFragment> = ($response: Response, $factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<OutFragment>;
 export type HttpUnpredictedErrorCode = `0${number}`;
 export declare const HttpUnknownErrorCode: HttpUnpredictedErrorCode;
 export type HttpClientErrorCode = `4${number}`;

package/lib/typeorm-step/typeorm-load-many-by-sql-use-cursor-step.d.ts

@@ -3,20 +3,20 @@ import { ScriptFuncOrBody } from '../step';
 import { AbstractTypeOrmBySQLPipelineStep, TypeOrmBySQLPipelineStepOptions } from './abstract-typeorm-by-sql-step';
 import { TypeOrmLoadBasis } from './abstract-typeorm-load-by-sql-step';
 export type StreamToSubSteps = any;
-export type StreamToFunc<In> = ($factor: Array<any>, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<StreamToSubSteps>;
-export interface TypeOrmLoadManyBySQLUseCursorPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = TypeOrmLoadBasis, OutFragment = Out> extends TypeOrmBySQLPipelineStepOptions<In, Out, InFragment, OutFragment> {
+export type StreamToFunc<In, Item> = ($factor: Array<Item>, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<StreamToSubSteps>;
+export interface TypeOrmLoadManyBySQLUseCursorPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = TypeOrmLoadBasis, OutFragment = Out, Item = any> extends TypeOrmBySQLPipelineStepOptions<In, Out, InFragment, OutFragment> {
     fetchSize?: number;
-    streamTo?: ScriptFuncOrBody<StreamToFunc<In>>;
+    streamTo?: ScriptFuncOrBody<StreamToFunc<In, Item>>;
     steps?: Array<PipelineStepBuilder>;
 }
-export declare class TypeOrmLoadManyBySQLUseCursorPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = Undefinable<TypeOrmLoadBasis>, OutFragment = Out> extends AbstractTypeOrmBySQLPipelineStep<In, Out, Undefinable<TypeOrmLoadBasis>, OutFragment> {
+export declare class TypeOrmLoadManyBySQLUseCursorPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = Undefinable<TypeOrmLoadBasis>, OutFragment = Out, Item = any> extends AbstractTypeOrmBySQLPipelineStep<In, Out, Undefinable<TypeOrmLoadBasis>, OutFragment> {
     private readonly _fetchSize;
     private readonly _streamToSnippet;
     private readonly _streamToFunc;
     private readonly _stepBuilders;
     constructor(options: TypeOrmLoadManyBySQLUseCursorPipelineStepOptions<In, Out, InFragment, OutFragment>);
     protected getFetchSize(): number;
-    getStreamToSnippet(): ScriptFuncOrBody<StreamToFunc<In>>;
+    getStreamToSnippet(): ScriptFuncOrBody<StreamToFunc<In, Item>>;
     protected generateVariableNames(): Array<string>;
     protected getStepBuilders(): Array<PipelineStepBuilder>;
     protected doPerform(basis: Undefinable<TypeOrmLoadBasis>, request: PipelineStepData<In>): Promise<Undefinable<OutFragment>>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rainbow-o23/n3",
-	"version": "1.0.54",
+	"version": "1.0.55",
 	"description": "o23 pipelines",
 	"main": "index.cjs",
 	"module": "index.js",
@@ -21,7 +21,7 @@
 		"url": "https://github.com/InsureMO/rainbow-o23/issues"
 	},
 	"dependencies": {
-		"@rainbow-o23/n1": "1.0.54",
+		"@rainbow-o23/n1": "1.0.55",
 		"node-fetch": "2.6.7",
 		"typeorm": "^0.3.20",
 		"typescript": "5.5.4"

package/src/lib/http/fetch-step.ts

@@ -14,7 +14,8 @@ import {
 	HttpUnknownErrorCode
 } from './types';
 
-export interface FetchPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out>
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export interface FetchPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out, BodyData = any>
 	extends FragmentaryPipelineStepOptions<In, Out, InFragment, OutFragment> {
 	endpointSystemCode: string;
 	endpointName: string;
@@ -24,13 +25,14 @@ export interface FetchPipelineStepOptions<In = PipelineStepPayload, Out = Pipeli
 	timeout?: number;
 	headersGenerate?: ScriptFuncOrBody<HttpGenerateHeaders<In, InFragment>>;
 	bodyUsed?: boolean;
-	bodyGenerate?: ScriptFuncOrBody<HttpGenerateBody<In, InFragment>>;
-	responseGenerate?: ScriptFuncOrBody<HttpGenerateResponse<In, InFragment>>;
+	bodyGenerate?: ScriptFuncOrBody<HttpGenerateBody<In, InFragment, BodyData>>;
+	responseGenerate?: ScriptFuncOrBody<HttpGenerateResponse<In, InFragment, OutFragment>>;
 	responseErrorHandles?: ScriptFuncOrBody<HttpHandleError<In, InFragment, OutFragment>>
 		| { [key: HttpErrorCode]: ScriptFuncOrBody<HttpHandleError<In, InFragment, OutFragment>>; };
 }
 
-export class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out>
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = In, OutFragment = Out, BodyData = any>
 	extends AbstractFragmentaryPipelineStep<In, Out, InFragment, OutFragment> {
 	private readonly _endpointSystemCode: string;
 	private readonly _endpointName: string;
@@ -43,10 +45,10 @@ export class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPaylo
 	private readonly _headersGenerateSnippet: ScriptFuncOrBody<HttpGenerateHeaders<In, InFragment>>;
 	private readonly _headersGenerateFunc: HttpGenerateHeaders<In, InFragment>;
 	private readonly _bodyUsed: boolean;
-	private readonly _bodyGenerateSnippet: ScriptFuncOrBody<HttpGenerateBody<In, InFragment>>;
-	private readonly _bodyGenerateFunc: HttpGenerateBody<In, InFragment>;
-	private readonly _responseGenerateSnippet: ScriptFuncOrBody<HttpGenerateResponse<In, InFragment>>;
-	private readonly _responseGenerateFunc: HttpGenerateResponse<In, InFragment>;
+	private readonly _bodyGenerateSnippet: ScriptFuncOrBody<HttpGenerateBody<In, InFragment, BodyData>>;
+	private readonly _bodyGenerateFunc: HttpGenerateBody<In, InFragment, BodyData>;
+	private readonly _responseGenerateSnippet: ScriptFuncOrBody<HttpGenerateResponse<In, InFragment, OutFragment>>;
+	private readonly _responseGenerateFunc: HttpGenerateResponse<In, InFragment, OutFragment>;
 	private readonly _responseErrorHandleFunc: HttpHandleError<In, InFragment, OutFragment>;
 
 	public constructor(options: FetchPipelineStepOptions<In, Out, InFragment, OutFragment>) {
@@ -91,7 +93,7 @@ export class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPaylo
 		this._bodyGenerateFunc = Utils.createAsyncFunction(this.getBodyGenerateSnippet(), {
 			// eslint-disable-next-line @typescript-eslint/no-unused-vars
 			createDefault: () => async ($factor: InFragment, _$request: PipelineStepData<In>, _$helpers: PipelineStepHelpers, _$: PipelineStepHelpers) => {
-				return ($factor == null || (typeof $factor === 'string' && $factor.length === 0)) ? (void 0) : JSON.stringify($factor);
+				return (($factor == null || (typeof $factor === 'string' && $factor.length === 0)) ? (void 0) : JSON.stringify($factor)) as BodyData;
 			},
 			getVariableNames: () => this.getBodyGenerateVariableNames(),
 			error: (e: Error) => {
@@ -224,7 +226,7 @@ export class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPaylo
 		return this._bodyUsed;
 	}
 
-	public getBodyGenerateSnippet(): ScriptFuncOrBody<HttpGenerateBody<In, InFragment>> {
+	public getBodyGenerateSnippet(): ScriptFuncOrBody<HttpGenerateBody<In, InFragment, BodyData>> {
 		return this._bodyGenerateSnippet;
 	}
 
@@ -235,7 +237,7 @@ export class FetchPipelineStep<In = PipelineStepPayload, Out = PipelineStepPaylo
 		return ['$factor', '$request', ...this.getHelpersVariableNames()];
 	}
 
-	public getResponseGenerateSnippet(): ScriptFuncOrBody<HttpGenerateResponse<In, InFragment>> {
+	public getResponseGenerateSnippet(): ScriptFuncOrBody<HttpGenerateResponse<In, InFragment, OutFragment>> {
 		return this._responseGenerateSnippet;
 	}
 

package/src/lib/http/types.ts

@@ -1,14 +1,10 @@
 import {PipelineStepData, PipelineStepHelpers, Undefinable} from '@rainbow-o23/n1';
 import {Response} from 'node-fetch';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type HttpGenerateUrl<In, InFragment> = ($endpointUrl: string, $factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<string>;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type HttpGenerateHeaders<In, InFragment> = ($factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<Undefinable<Record<string, string>>>;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type HttpGenerateBody<In, InFragment> = ($factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<any>;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type HttpGenerateResponse<In, InFragment> = ($response: Response, $factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<any>;
+export type HttpGenerateBody<In, InFragment, BodyData> = ($factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<BodyData>;
+export type HttpGenerateResponse<In, InFragment, OutFragment> = ($response: Response, $factor: InFragment, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<OutFragment>;
 
 export type HttpUnpredictedErrorCode = `0${number}`;
 export const HttpUnknownErrorCode: HttpUnpredictedErrorCode = '000';

package/src/lib/typeorm-step/typeorm-load-many-by-sql-use-cursor-step.ts

@@ -14,20 +14,22 @@ import {TypeOrmLoadBasis} from './abstract-typeorm-load-by-sql-step';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type StreamToSubSteps = any;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type StreamToFunc<In> = ($factor: Array<any>, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<StreamToSubSteps>;
+export type StreamToFunc<In, Item> = ($factor: Array<Item>, $request: PipelineStepData<In>, $helpers: PipelineStepHelpers, $: PipelineStepHelpers) => Promise<StreamToSubSteps>;
 
-export interface TypeOrmLoadManyBySQLUseCursorPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = TypeOrmLoadBasis, OutFragment = Out>
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export interface TypeOrmLoadManyBySQLUseCursorPipelineStepOptions<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = TypeOrmLoadBasis, OutFragment = Out, Item = any>
 	extends TypeOrmBySQLPipelineStepOptions<In, Out, InFragment, OutFragment> {
 	fetchSize?: number;
-	streamTo?: ScriptFuncOrBody<StreamToFunc<In>>;
+	streamTo?: ScriptFuncOrBody<StreamToFunc<In, Item>>;
 	steps?: Array<PipelineStepBuilder>;
 }
 
-export class TypeOrmLoadManyBySQLUseCursorPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = Undefinable<TypeOrmLoadBasis>, OutFragment = Out>
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export class TypeOrmLoadManyBySQLUseCursorPipelineStep<In = PipelineStepPayload, Out = PipelineStepPayload, InFragment = Undefinable<TypeOrmLoadBasis>, OutFragment = Out, Item = any>
 	extends AbstractTypeOrmBySQLPipelineStep<In, Out, Undefinable<TypeOrmLoadBasis>, OutFragment> {
 	private readonly _fetchSize: number;
-	private readonly _streamToSnippet: ScriptFuncOrBody<StreamToFunc<In>>;
-	private readonly _streamToFunc: StreamToFunc<In>;
+	private readonly _streamToSnippet: ScriptFuncOrBody<StreamToFunc<In, Item>>;
+	private readonly _streamToFunc: StreamToFunc<In, Item>;
 	private readonly _stepBuilders: Array<PipelineStepBuilder>;
 
 	public constructor(options: TypeOrmLoadManyBySQLUseCursorPipelineStepOptions<In, Out, InFragment, OutFragment>) {
@@ -51,7 +53,7 @@ export class TypeOrmLoadManyBySQLUseCursorPipelineStep<In = PipelineStepPayload,
 		return this._fetchSize;
 	}
 
-	public getStreamToSnippet(): ScriptFuncOrBody<StreamToFunc<In>> {
+	public getStreamToSnippet(): ScriptFuncOrBody<StreamToFunc<In, Item>> {
 		return this._streamToSnippet;
 	}