fix(core): Fix credentials lazy-loading (no-changelog) (#6615)

packages/cli/src/CredentialTypes.ts

@@ -26,16 +26,13 @@ export class CredentialTypes implements ICredentialTypes {
 	 * Returns all parent types of the given credential type
 	 */
 	getParentTypes(typeName: string): string[] {
-		const credentialType = this.getByName(typeName);
+		const extendsArr = this.knownCredentials[typeName]?.extends ?? [];
-		if (credentialType?.extends === undefined) return [];
+		if (extendsArr.length) {
-
+			extendsArr.forEach((type) => {
-		const types: string[] = [];
+				extendsArr.push(...this.getParentTypes(type));
-		credentialType.extends.forEach((type: string) => {
+			});
-			types.push(type);
+		}
-			types.push(...this.getParentTypes(type));
+		return extendsArr;
-		});
-
-		return types;
 	}
 
 	private getCredential(type: string): LoadedClass<ICredentialType> {

packages/cli/src/LoadNodesAndCredentials.ts

@@ -331,7 +331,7 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 
 		for (const loader of Object.values(this.loaders)) {
 			// list of node & credential types that will be sent to the frontend
-			const { types, directory } = loader;
+			const { known, types, directory } = loader;
 			this.types.nodes = this.types.nodes.concat(types.nodes);
 			this.types.credentials = this.types.credentials.concat(types.credentials);
 
@@ -344,26 +344,30 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 				this.loaded.credentials[credentialTypeName] = loader.credentialTypes[credentialTypeName];
 			}
 
-			// Nodes and credentials that will be lazy loaded
+			for (const type in known.nodes) {
-			if (loader instanceof PackageDirectoryLoader) {
+				const { className, sourcePath } = known.nodes[type];
-				const { packageName, known } = loader;
+				this.known.nodes[type] = {
+					className,
+					sourcePath: path.join(directory, sourcePath),
+				};
+			}
 
-				for (const type in known.nodes) {
+			for (const type in known.credentials) {
-					const { className, sourcePath } = known.nodes[type];
+				const {
-					this.known.nodes[type] = {
+					className,
-						className,
+					sourcePath,
-						sourcePath: path.join(directory, sourcePath),
+					nodesToTestWith,
-					};
+					extends: extendsArr,
-				}
+				} = known.credentials[type];
-
+				this.known.credentials[type] = {
-				for (const type in known.credentials) {
+					className,
-					const { className, sourcePath, nodesToTestWith } = known.credentials[type];
+					sourcePath: path.join(directory, sourcePath),
-					this.known.credentials[type] = {
+					nodesToTestWith:
-						className,
+						loader instanceof PackageDirectoryLoader
-						sourcePath: path.join(directory, sourcePath),
+							? nodesToTestWith?.map((nodeName) => `${loader.packageName}.${nodeName}`)
-						nodesToTestWith: nodesToTestWith?.map((nodeName) => `${packageName}.${nodeName}`),
+							: undefined,
-					};
+					extends: extendsArr,
-				}
+				};
 			}
 		}
 	}

packages/core/bin/generate-known

@@ -38,6 +38,10 @@ const generate = async (kind) => {
 				else obj[name] = { className, sourcePath };
 			}
 
+			if (kind === 'credentials' && Array.isArray(instance.extends)) {
+				obj[name].extends = instance.extends;
+			}
+
 			if (kind === 'nodes') {
 				const { credentials } = instance.description;
 				if (credentials && credentials.length) {
@@ -53,6 +57,7 @@ const generate = async (kind) => {
 			}
 			return obj;
 		}, {});
+
 	LoggerProxy.info(`Detected ${Object.keys(data).length} ${kind}`);
 	await writeJSON(`known/${kind}.json`, data);
 	return data;

packages/core/src/DirectoryLoader.ts

@@ -167,6 +167,7 @@ export abstract class DirectoryLoader {
 		this.known.credentials[tempCredential.name] = {
 			className: credentialName,
 			sourcePath: filePath,
+			extends: tempCredential.extends,
 		};
 
 		this.credentialTypes[tempCredential.name] = {

packages/workflow/src/Interfaces.ts

@@ -1568,6 +1568,7 @@ export type LoadingDetails = {
 
 export type CredentialLoadingDetails = LoadingDetails & {
 	nodesToTestWith?: string[];
+	extends?: string[];
 };
 
 export type NodeLoadingDetails = LoadingDetails;
@@ -1983,11 +1984,11 @@ export interface IExecutionsSummary {
 	lastNodeExecuted?: string;
 	executionError?: ExecutionError;
 	nodeExecutionStatus?: {
-		[key: string]: IExceutionSummaryNodeExecutionResult;
+		[key: string]: IExecutionSummaryNodeExecutionResult;
 	};
 }
 
-export interface IExceutionSummaryNodeExecutionResult {
+export interface IExecutionSummaryNodeExecutionResult {
 	executionStatus: ExecutionStatus;
 	errors?: Array<{
 		name?: string;