@gravity-ui/data-source 0.10.0-alpha.7 → 0.10.0-alpha.9

package/build/plugin/esbuild.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-Dq6kUGl-.cjs");
+const require_factory = require("./factory-amr4dgO8.cjs");
 //#region src/plugin/esbuild.ts
 var esbuild_default = (0, require("unplugin").createEsbuildPlugin)(require_factory.dataSourceLazyUnpluginFactory);
 //#endregion

package/build/plugin/esbuild.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BxKix--T.mjs";
 import { createEsbuildPlugin } from "unplugin";
 //#region src/plugin/esbuild.ts
 var esbuild_default = createEsbuildPlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/{factory-Ds3_-8kv.mjs → factory-BxKix--T.mjs}

@@ -102,7 +102,7 @@ function extractHocInfo(hocsSet, filename, source) {
 	for (const node of program.body) {
 		if (node.type !== "ExportNamedDeclaration" || node.exportKind === "type" || node.declaration?.type !== "VariableDeclaration") continue;
 		for (const decl of node.declaration.declarations) {
-			if (decl.id.type !== "Identifier" || !decl.init || decl.init.type !== "CallExpression" || decl.init.callee.type !== "Identifier" || decl.init.arguments.length !== 3) continue;
+			if (decl.id.type !== "Identifier" || !decl.init || decl.init.type !== "CallExpression" || decl.init.callee.type !== "Identifier" || decl.init.arguments.length < 2) continue;
 			const hocEntry = trackedHocs.get(decl.init.callee.name);
 			if (!hocEntry) continue;
 			const [contentArg, loadingArg, errorArg] = decl.init.arguments;
@@ -128,12 +128,12 @@ function extractHocInfo(hocsSet, filename, source) {
 					argEnd: loadingArg.end,
 					imports: filterNeededImports(importDecls, collectIdentifiers(loadingArg))
 				},
-				error: {
+				error: errorArg ? {
 					argSource: source.slice(errorArg.start, errorArg.end),
 					argStart: errorArg.start,
 					argEnd: errorArg.end,
 					imports: filterNeededImports(importDecls, collectIdentifiers(errorArg))
-				}
+				} : null
 			};
 		}
 	}
@@ -318,39 +318,49 @@ function parseProgram(filename, source) {
 }
 //#endregion
 //#region src/plugin/core/generate.ts
-function generateAuxModule(sourceFile, info, type, options = {}) {
-	const auxInfo = info[type];
-	const name = info.exportedName;
+function assembleAuxModuleSource(exportedName, info, type) {
 	const suffix = COMPANION_TYPES[type];
-	const cleanSourceFile = stripQuery(sourceFile);
-	const code = [
-		renderImports(auxInfo.imports),
+	return [
+		renderImports(info.imports),
 		"",
-		`export const ${name}${suffix} = ${auxInfo.argSource};`,
+		`export const ${exportedName}${suffix} = ${info.argSource};`,
 		""
 	].join("\n").trimStart();
-	return transformJsx(makeCompanionId(type, cleanSourceFile), code, options);
+}
+function compileAuxJsx(filename, code, options = {}) {
+	const result = transformSync(filename, code, {
+		lang: "tsx",
+		jsx: options.jsx,
+		target: options.target,
+		sourcemap: true
+	});
+	if (result.errors.length > 0) {
+		const error = result.errors[0];
+		throw new Error(error.codeframe ?? error.message);
+	}
+	return {
+		code: result.code,
+		map: JSON.stringify(result.map)
+	};
 }
 function generateLazyModule(sourceFile, info, options = {}) {
 	const importSource = options.jsx?.importSource ?? "react";
 	const name = info.exportedName;
 	const cleanSourceFile = stripQuery(sourceFile);
 	const base = `./${path.basename(cleanSourceFile, path.extname(cleanSourceFile))}`;
-	const code = [
+	const hocBinding = info.hocImportedName === "default" ? info.hocLocalName : info.hocImportedName;
+	const lines = [
 		`import {lazy} from '${importSource}';`,
 		"",
 		info.hocImportedName === "default" ? `import ${info.hocLocalName} from '${info.hocImportSource}';` : `import {${info.hocImportedName}} from '${info.hocImportSource}';`,
 		"",
-		`import {${name}Loading} from '${base}.Loading';`,
-		`import {${name}Error} from '${base}.Error';`,
-		``,
-		`export const ${name}Lazy = ${info.hocImportedName === "default" ? info.hocLocalName : info.hocImportedName}(`,
-		`    lazy(() => import('${base}').then((m) => ({default: m.${name}Content}))),`,
-		`    ${name}Loading,`,
-		`    ${name}Error,`,
-		`);`,
-		``
-	].join("\n");
+		`import {${name}Loading} from '${base}.Loading';`
+	];
+	if (info.error) lines.push(`import {${name}Error} from '${base}.Error';`);
+	lines.push("", `export const ${name}Lazy = ${hocBinding}(`, `    lazy(() => import('${base}').then((m) => ({default: m.${name}Content}))),`, `    ${name}Loading,`);
+	if (info.error) lines.push(`    ${name}Error,`);
+	lines.push(`);`, ``);
+	const code = lines.join("\n");
 	const filename = makeCompanionId("lazy", cleanSourceFile);
 	return {
 		code,
@@ -361,22 +371,6 @@ function generateLazyModule(sourceFile, info, options = {}) {
 		}).toString()
 	};
 }
-function transformJsx(filename, code, options) {
-	const result = transformSync(filename, code, {
-		lang: "tsx",
-		jsx: options.jsx,
-		target: options.target,
-		sourcemap: true
-	});
-	if (result.errors.length > 0) {
-		const error = result.errors[0];
-		throw new Error(error.codeframe ?? error.message);
-	}
-	return {
-		code: result.code,
-		map: JSON.stringify(result.map)
-	};
-}
 function renderImport(decl) {
 	const parts = [];
 	const named = [];
@@ -431,9 +425,11 @@ function transformDefinitionModule(s, filename, info) {
 	const name = info.exportedName;
 	const cleanFilename = stripQuery(filename);
 	const localSource = `./${path.basename(cleanFilename, path.extname(cleanFilename))}`;
-	s.prepend(`${renderNamedImport(`${name}Loading`, `${name}Loading`, makeCompanionId("loading", localSource))}\n${renderNamedImport(`${name}Error`, `${name}Error`, makeCompanionId("error", localSource))}\n`);
+	const prependImports = [renderNamedImport(`${name}Loading`, `${name}Loading`, makeCompanionId("loading", localSource))];
+	if (info.error) prependImports.push(renderNamedImport(`${name}Error`, `${name}Error`, makeCompanionId("error", localSource)));
+	s.prepend(prependImports.join("\n") + "\n");
 	s.overwrite(info.loading.argStart, info.loading.argEnd, `${name}Loading`);
-	s.overwrite(info.error.argStart, info.error.argEnd, `${name}Error`);
+	if (info.error) s.overwrite(info.error.argStart, info.error.argEnd, `${name}Error`);
 	if (info.content.kind === "identifier") s.append(`\nexport {${info.content.name} as ${name}Content};\n`);
 	else {
 		s.appendLeft(info.hocExportStart, `const ${name}Content = ${info.content.argSource};\n\n`);
@@ -477,13 +473,20 @@ function renderNamedImport(local, imported, source) {
 }
 //#endregion
 //#region src/plugin/core/factory.ts
-const DEFAULT_HOCS = [{
-	from: "@gravity-ui/data-source",
-	name: "withAsyncBoundary"
-}, {
-	from: "@gravity-ui/data-source",
-	name: "withQueryAsyncBoundary"
-}];
+const DEFAULT_HOCS = [
+	{
+		from: "@gravity-ui/data-source",
+		name: "withAsync"
+	},
+	{
+		from: "@gravity-ui/data-source",
+		name: "withAsyncBoundary"
+	},
+	{
+		from: "@gravity-ui/data-source",
+		name: "withQueryAsyncBoundary"
+	}
+];
 const DEFAULT_INCLUDE = /\.(tsx?|jsx?)$/;
 const VIRTUAL_EXCLUDE = new RegExp(`${VIRTUAL_PREFIX}|${encodeURIComponent(VIRTUAL_PREFIX)}`);
 const dataSourceLazyUnpluginFactory = (options = {}) => {
@@ -513,6 +516,45 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 		reExportsCache.set(key, reExports);
 		return reExports;
 	};
+	const resolveHocSourceFile = async (ctx, file, importedName, visited = /* @__PURE__ */ new Set()) => {
+		const visitKey = `${file}\0${importedName}`;
+		if (visited.has(visitKey)) return null;
+		visited.add(visitKey);
+		const directInfo = getHocInfo(file);
+		if (directInfo && directInfo.exportedName === importedName) return {
+			file,
+			info: directInfo
+		};
+		const reExports = getReExports(file);
+		const named = reExports.named.get(importedName);
+		if (named) {
+			const resolved = await resolveSourceFile(ctx, named.source, file);
+			if (resolved) {
+				const next = await resolveHocSourceFile(ctx, resolved, named.importedName, visited);
+				if (next) return next;
+			}
+		}
+		for (const starSource of reExports.stars) {
+			const resolved = await resolveSourceFile(ctx, starSource, file);
+			if (!resolved) continue;
+			const next = await resolveHocSourceFile(ctx, resolved, importedName, visited);
+			if (next) return next;
+		}
+		return null;
+	};
+	const validateUsages = async (ctx, usages, importerId) => {
+		return (await Promise.all(usages.map(async (usage) => {
+			const resolvedSourceFile = await resolveSourceFile(ctx, usage.decl.source, importerId);
+			if (!resolvedSourceFile) return null;
+			const target = await resolveHocSourceFile(ctx, resolvedSourceFile, usage.spec.importedName);
+			if (!target) return null;
+			return {
+				usage,
+				hocImportSource: toRelativeImportSource(importerId, target.file),
+				hocExportedName: target.info.exportedName
+			};
+		}))).filter((usage) => usage !== null);
+	};
 	return {
 		name: "data-source-lazy",
 		enforce: "pre",
@@ -531,18 +573,30 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 		},
 		load: {
 			filter: { id: new RegExp(VIRTUAL_PREFIX) },
-			handler(id) {
+			async handler(id) {
 				const parsedId = parseVirtualId(id);
 				if (!parsedId) return null;
 				this.addWatchFile(parsedId.sourceFile);
 				const info = getHocInfo(parsedId.sourceFile);
 				if (!info) return null;
-				switch (parsedId.type) {
-					case "loading":
-					case "error": return generateAuxModule(parsedId.sourceFile, info, parsedId.type, options.generateOptions);
-					case "lazy": return generateLazyModule(parsedId.sourceFile, info, options.generateOptions);
-					default: return assertNever(parsedId.type);
+				if (parsedId.type === "loading" || parsedId.type === "error") {
+					const auxInfo = info[parsedId.type];
+					if (!auxInfo) return null;
+					const cleanSourceFile = stripQuery(parsedId.sourceFile);
+					const auxFilename = makeCompanionId(parsedId.type, cleanSourceFile);
+					const assembled = assembleAuxModuleSource(info.exportedName, auxInfo, parsedId.type);
+					const usages = extractUsages(auxFilename, assembled);
+					const verifiedUsages = await validateUsages(this, usages, parsedId.sourceFile);
+					let auxCode = assembled;
+					if (verifiedUsages.length > 0) {
+						const s = new MagicString(assembled);
+						transformUsages(s, verifiedUsages);
+						auxCode = s.toString();
+					}
+					return compileAuxJsx(auxFilename, auxCode, options.generateOptions);
 				}
+				if (parsedId.type === "lazy") return generateLazyModule(parsedId.sourceFile, info, options.generateOptions);
+				return assertNever(parsedId.type);
 			}
 		},
 		transform: {
@@ -555,43 +609,7 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 				const usages = extractUsages(id, code);
 				if (!info && usages.length === 0) return null;
 				const filteredUsages = info ? dropAccessesInsideHocArgs(info, usages) : usages;
-				const resolveHocSourceFile = async (file, importedName, visited = /* @__PURE__ */ new Set()) => {
-					const visitKey = `${file}\0${importedName}`;
-					if (visited.has(visitKey)) return null;
-					visited.add(visitKey);
-					const directInfo = getHocInfo(file);
-					if (directInfo && directInfo.exportedName === importedName) return {
-						file,
-						info: directInfo
-					};
-					const reExports = getReExports(file);
-					const named = reExports.named.get(importedName);
-					if (named) {
-						const resolved = await resolveSourceFile(this, named.source, file);
-						if (resolved) {
-							const next = await resolveHocSourceFile(resolved, named.importedName, visited);
-							if (next) return next;
-						}
-					}
-					for (const starSource of reExports.stars) {
-						const resolved = await resolveSourceFile(this, starSource, file);
-						if (!resolved) continue;
-						const next = await resolveHocSourceFile(resolved, importedName, visited);
-						if (next) return next;
-					}
-					return null;
-				};
-				const verifiedUsages = (await Promise.all(filteredUsages.map(async (usage) => {
-					const resolvedSourceFile = await resolveSourceFile(this, usage.decl.source, id);
-					if (!resolvedSourceFile) return null;
-					const target = await resolveHocSourceFile(resolvedSourceFile, usage.spec.importedName);
-					if (!target) return null;
-					return {
-						usage,
-						hocImportSource: toRelativeImportSource(id, target.file),
-						hocExportedName: target.info.exportedName
-					};
-				}))).filter((usage) => usage !== null);
+				const verifiedUsages = await validateUsages(this, filteredUsages, id);
 				if (!info && verifiedUsages.length === 0) return null;
 				const s = new MagicString(code);
 				if (info) transformDefinitionModule(s, id, info);
@@ -619,7 +637,7 @@ function isInside(info, access) {
 function dropAccessesInsideHocArgs(info, usages) {
 	const result = [];
 	for (const usage of usages) {
-		const accesses = usage.accesses.filter((access) => !isInside(info.loading, access) && !isInside(info.error, access) && !(info.content.kind === "inline" && isInside(info.content, access)));
+		const accesses = usage.accesses.filter((access) => !isInside(info.loading, access) && !(info.error && isInside(info.error, access)) && !(info.content.kind === "inline" && isInside(info.content, access)));
 		if (accesses.length === 0) continue;
 		if (accesses.length === usage.accesses.length) {
 			result.push(usage);

package/build/plugin/{factory-Dq6kUGl-.cjs → factory-amr4dgO8.cjs}

@@ -127,7 +127,7 @@ function extractHocInfo(hocsSet, filename, source) {
 	for (const node of program.body) {
 		if (node.type !== "ExportNamedDeclaration" || node.exportKind === "type" || node.declaration?.type !== "VariableDeclaration") continue;
 		for (const decl of node.declaration.declarations) {
-			if (decl.id.type !== "Identifier" || !decl.init || decl.init.type !== "CallExpression" || decl.init.callee.type !== "Identifier" || decl.init.arguments.length !== 3) continue;
+			if (decl.id.type !== "Identifier" || !decl.init || decl.init.type !== "CallExpression" || decl.init.callee.type !== "Identifier" || decl.init.arguments.length < 2) continue;
 			const hocEntry = trackedHocs.get(decl.init.callee.name);
 			if (!hocEntry) continue;
 			const [contentArg, loadingArg, errorArg] = decl.init.arguments;
@@ -153,12 +153,12 @@ function extractHocInfo(hocsSet, filename, source) {
 					argEnd: loadingArg.end,
 					imports: filterNeededImports(importDecls, collectIdentifiers(loadingArg))
 				},
-				error: {
+				error: errorArg ? {
 					argSource: source.slice(errorArg.start, errorArg.end),
 					argStart: errorArg.start,
 					argEnd: errorArg.end,
 					imports: filterNeededImports(importDecls, collectIdentifiers(errorArg))
-				}
+				} : null
 			};
 		}
 	}
@@ -343,39 +343,49 @@ function parseProgram(filename, source) {
 }
 //#endregion
 //#region src/plugin/core/generate.ts
-function generateAuxModule(sourceFile, info, type, options = {}) {
-	const auxInfo = info[type];
-	const name = info.exportedName;
+function assembleAuxModuleSource(exportedName, info, type) {
 	const suffix = COMPANION_TYPES[type];
-	const cleanSourceFile = stripQuery(sourceFile);
-	const code = [
-		renderImports(auxInfo.imports),
+	return [
+		renderImports(info.imports),
 		"",
-		`export const ${name}${suffix} = ${auxInfo.argSource};`,
+		`export const ${exportedName}${suffix} = ${info.argSource};`,
 		""
 	].join("\n").trimStart();
-	return transformJsx(makeCompanionId(type, cleanSourceFile), code, options);
+}
+function compileAuxJsx(filename, code, options = {}) {
+	const result = (0, oxc_transform.transformSync)(filename, code, {
+		lang: "tsx",
+		jsx: options.jsx,
+		target: options.target,
+		sourcemap: true
+	});
+	if (result.errors.length > 0) {
+		const error = result.errors[0];
+		throw new Error(error.codeframe ?? error.message);
+	}
+	return {
+		code: result.code,
+		map: JSON.stringify(result.map)
+	};
 }
 function generateLazyModule(sourceFile, info, options = {}) {
 	const importSource = options.jsx?.importSource ?? "react";
 	const name = info.exportedName;
 	const cleanSourceFile = stripQuery(sourceFile);
 	const base = `./${node_path.default.basename(cleanSourceFile, node_path.default.extname(cleanSourceFile))}`;
-	const code = [
+	const hocBinding = info.hocImportedName === "default" ? info.hocLocalName : info.hocImportedName;
+	const lines = [
 		`import {lazy} from '${importSource}';`,
 		"",
 		info.hocImportedName === "default" ? `import ${info.hocLocalName} from '${info.hocImportSource}';` : `import {${info.hocImportedName}} from '${info.hocImportSource}';`,
 		"",
-		`import {${name}Loading} from '${base}.Loading';`,
-		`import {${name}Error} from '${base}.Error';`,
-		``,
-		`export const ${name}Lazy = ${info.hocImportedName === "default" ? info.hocLocalName : info.hocImportedName}(`,
-		`    lazy(() => import('${base}').then((m) => ({default: m.${name}Content}))),`,
-		`    ${name}Loading,`,
-		`    ${name}Error,`,
-		`);`,
-		``
-	].join("\n");
+		`import {${name}Loading} from '${base}.Loading';`
+	];
+	if (info.error) lines.push(`import {${name}Error} from '${base}.Error';`);
+	lines.push("", `export const ${name}Lazy = ${hocBinding}(`, `    lazy(() => import('${base}').then((m) => ({default: m.${name}Content}))),`, `    ${name}Loading,`);
+	if (info.error) lines.push(`    ${name}Error,`);
+	lines.push(`);`, ``);
+	const code = lines.join("\n");
 	const filename = makeCompanionId("lazy", cleanSourceFile);
 	return {
 		code,
@@ -386,22 +396,6 @@ function generateLazyModule(sourceFile, info, options = {}) {
 		}).toString()
 	};
 }
-function transformJsx(filename, code, options) {
-	const result = (0, oxc_transform.transformSync)(filename, code, {
-		lang: "tsx",
-		jsx: options.jsx,
-		target: options.target,
-		sourcemap: true
-	});
-	if (result.errors.length > 0) {
-		const error = result.errors[0];
-		throw new Error(error.codeframe ?? error.message);
-	}
-	return {
-		code: result.code,
-		map: JSON.stringify(result.map)
-	};
-}
 function renderImport(decl) {
 	const parts = [];
 	const named = [];
@@ -456,9 +450,11 @@ function transformDefinitionModule(s, filename, info) {
 	const name = info.exportedName;
 	const cleanFilename = stripQuery(filename);
 	const localSource = `./${node_path.default.basename(cleanFilename, node_path.default.extname(cleanFilename))}`;
-	s.prepend(`${renderNamedImport(`${name}Loading`, `${name}Loading`, makeCompanionId("loading", localSource))}\n${renderNamedImport(`${name}Error`, `${name}Error`, makeCompanionId("error", localSource))}\n`);
+	const prependImports = [renderNamedImport(`${name}Loading`, `${name}Loading`, makeCompanionId("loading", localSource))];
+	if (info.error) prependImports.push(renderNamedImport(`${name}Error`, `${name}Error`, makeCompanionId("error", localSource)));
+	s.prepend(prependImports.join("\n") + "\n");
 	s.overwrite(info.loading.argStart, info.loading.argEnd, `${name}Loading`);
-	s.overwrite(info.error.argStart, info.error.argEnd, `${name}Error`);
+	if (info.error) s.overwrite(info.error.argStart, info.error.argEnd, `${name}Error`);
 	if (info.content.kind === "identifier") s.append(`\nexport {${info.content.name} as ${name}Content};\n`);
 	else {
 		s.appendLeft(info.hocExportStart, `const ${name}Content = ${info.content.argSource};\n\n`);
@@ -502,13 +498,20 @@ function renderNamedImport(local, imported, source) {
 }
 //#endregion
 //#region src/plugin/core/factory.ts
-const DEFAULT_HOCS = [{
-	from: "@gravity-ui/data-source",
-	name: "withAsyncBoundary"
-}, {
-	from: "@gravity-ui/data-source",
-	name: "withQueryAsyncBoundary"
-}];
+const DEFAULT_HOCS = [
+	{
+		from: "@gravity-ui/data-source",
+		name: "withAsync"
+	},
+	{
+		from: "@gravity-ui/data-source",
+		name: "withAsyncBoundary"
+	},
+	{
+		from: "@gravity-ui/data-source",
+		name: "withQueryAsyncBoundary"
+	}
+];
 const DEFAULT_INCLUDE = /\.(tsx?|jsx?)$/;
 const VIRTUAL_EXCLUDE = new RegExp(`${VIRTUAL_PREFIX}|${encodeURIComponent(VIRTUAL_PREFIX)}`);
 const dataSourceLazyUnpluginFactory = (options = {}) => {
@@ -538,6 +541,45 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 		reExportsCache.set(key, reExports);
 		return reExports;
 	};
+	const resolveHocSourceFile = async (ctx, file, importedName, visited = /* @__PURE__ */ new Set()) => {
+		const visitKey = `${file}\0${importedName}`;
+		if (visited.has(visitKey)) return null;
+		visited.add(visitKey);
+		const directInfo = getHocInfo(file);
+		if (directInfo && directInfo.exportedName === importedName) return {
+			file,
+			info: directInfo
+		};
+		const reExports = getReExports(file);
+		const named = reExports.named.get(importedName);
+		if (named) {
+			const resolved = await resolveSourceFile(ctx, named.source, file);
+			if (resolved) {
+				const next = await resolveHocSourceFile(ctx, resolved, named.importedName, visited);
+				if (next) return next;
+			}
+		}
+		for (const starSource of reExports.stars) {
+			const resolved = await resolveSourceFile(ctx, starSource, file);
+			if (!resolved) continue;
+			const next = await resolveHocSourceFile(ctx, resolved, importedName, visited);
+			if (next) return next;
+		}
+		return null;
+	};
+	const validateUsages = async (ctx, usages, importerId) => {
+		return (await Promise.all(usages.map(async (usage) => {
+			const resolvedSourceFile = await resolveSourceFile(ctx, usage.decl.source, importerId);
+			if (!resolvedSourceFile) return null;
+			const target = await resolveHocSourceFile(ctx, resolvedSourceFile, usage.spec.importedName);
+			if (!target) return null;
+			return {
+				usage,
+				hocImportSource: toRelativeImportSource(importerId, target.file),
+				hocExportedName: target.info.exportedName
+			};
+		}))).filter((usage) => usage !== null);
+	};
 	return {
 		name: "data-source-lazy",
 		enforce: "pre",
@@ -556,18 +598,30 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 		},
 		load: {
 			filter: { id: new RegExp(VIRTUAL_PREFIX) },
-			handler(id) {
+			async handler(id) {
 				const parsedId = parseVirtualId(id);
 				if (!parsedId) return null;
 				this.addWatchFile(parsedId.sourceFile);
 				const info = getHocInfo(parsedId.sourceFile);
 				if (!info) return null;
-				switch (parsedId.type) {
-					case "loading":
-					case "error": return generateAuxModule(parsedId.sourceFile, info, parsedId.type, options.generateOptions);
-					case "lazy": return generateLazyModule(parsedId.sourceFile, info, options.generateOptions);
-					default: return assertNever(parsedId.type);
+				if (parsedId.type === "loading" || parsedId.type === "error") {
+					const auxInfo = info[parsedId.type];
+					if (!auxInfo) return null;
+					const cleanSourceFile = stripQuery(parsedId.sourceFile);
+					const auxFilename = makeCompanionId(parsedId.type, cleanSourceFile);
+					const assembled = assembleAuxModuleSource(info.exportedName, auxInfo, parsedId.type);
+					const usages = extractUsages(auxFilename, assembled);
+					const verifiedUsages = await validateUsages(this, usages, parsedId.sourceFile);
+					let auxCode = assembled;
+					if (verifiedUsages.length > 0) {
+						const s = new magic_string.default(assembled);
+						transformUsages(s, verifiedUsages);
+						auxCode = s.toString();
+					}
+					return compileAuxJsx(auxFilename, auxCode, options.generateOptions);
 				}
+				if (parsedId.type === "lazy") return generateLazyModule(parsedId.sourceFile, info, options.generateOptions);
+				return assertNever(parsedId.type);
 			}
 		},
 		transform: {
@@ -580,43 +634,7 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 				const usages = extractUsages(id, code);
 				if (!info && usages.length === 0) return null;
 				const filteredUsages = info ? dropAccessesInsideHocArgs(info, usages) : usages;
-				const resolveHocSourceFile = async (file, importedName, visited = /* @__PURE__ */ new Set()) => {
-					const visitKey = `${file}\0${importedName}`;
-					if (visited.has(visitKey)) return null;
-					visited.add(visitKey);
-					const directInfo = getHocInfo(file);
-					if (directInfo && directInfo.exportedName === importedName) return {
-						file,
-						info: directInfo
-					};
-					const reExports = getReExports(file);
-					const named = reExports.named.get(importedName);
-					if (named) {
-						const resolved = await resolveSourceFile(this, named.source, file);
-						if (resolved) {
-							const next = await resolveHocSourceFile(resolved, named.importedName, visited);
-							if (next) return next;
-						}
-					}
-					for (const starSource of reExports.stars) {
-						const resolved = await resolveSourceFile(this, starSource, file);
-						if (!resolved) continue;
-						const next = await resolveHocSourceFile(resolved, importedName, visited);
-						if (next) return next;
-					}
-					return null;
-				};
-				const verifiedUsages = (await Promise.all(filteredUsages.map(async (usage) => {
-					const resolvedSourceFile = await resolveSourceFile(this, usage.decl.source, id);
-					if (!resolvedSourceFile) return null;
-					const target = await resolveHocSourceFile(resolvedSourceFile, usage.spec.importedName);
-					if (!target) return null;
-					return {
-						usage,
-						hocImportSource: toRelativeImportSource(id, target.file),
-						hocExportedName: target.info.exportedName
-					};
-				}))).filter((usage) => usage !== null);
+				const verifiedUsages = await validateUsages(this, filteredUsages, id);
 				if (!info && verifiedUsages.length === 0) return null;
 				const s = new magic_string.default(code);
 				if (info) transformDefinitionModule(s, id, info);
@@ -644,7 +662,7 @@ function isInside(info, access) {
 function dropAccessesInsideHocArgs(info, usages) {
 	const result = [];
 	for (const usage of usages) {
-		const accesses = usage.accesses.filter((access) => !isInside(info.loading, access) && !isInside(info.error, access) && !(info.content.kind === "inline" && isInside(info.content, access)));
+		const accesses = usage.accesses.filter((access) => !isInside(info.loading, access) && !(info.error && isInside(info.error, access)) && !(info.content.kind === "inline" && isInside(info.content, access)));
 		if (accesses.length === 0) continue;
 		if (accesses.length === usage.accesses.length) {
 			result.push(usage);

package/build/plugin/index.cjs

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_factory = require("./factory-Dq6kUGl-.cjs");
+const require_factory = require("./factory-amr4dgO8.cjs");
 //#region src/plugin/index.ts
 const DataSourceLazyPlugin = /* @__PURE__ */ (0, require("unplugin").createUnplugin)(require_factory.dataSourceLazyUnpluginFactory);
 //#endregion

package/build/plugin/index.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory, t as DEFAULT_HOCS } from "./factory-Ds3_-8kv.mjs";
+import { n as dataSourceLazyUnpluginFactory, t as DEFAULT_HOCS } from "./factory-BxKix--T.mjs";
 import { createUnplugin } from "unplugin";
 //#region src/plugin/index.ts
 const DataSourceLazyPlugin = /* @__PURE__ */ createUnplugin(dataSourceLazyUnpluginFactory);

package/build/plugin/rollup.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-Dq6kUGl-.cjs");
+const require_factory = require("./factory-amr4dgO8.cjs");
 //#region src/plugin/rollup.ts
 var rollup_default = (0, require("unplugin").createRollupPlugin)(require_factory.dataSourceLazyUnpluginFactory);
 //#endregion

package/build/plugin/rollup.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BxKix--T.mjs";
 import { createRollupPlugin } from "unplugin";
 //#region src/plugin/rollup.ts
 var rollup_default = createRollupPlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/rspack.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-Dq6kUGl-.cjs");
+const require_factory = require("./factory-amr4dgO8.cjs");
 //#region src/plugin/rspack.ts
 var rspack_default = (0, require("unplugin").createRspackPlugin)(require_factory.dataSourceLazyUnpluginFactory);
 //#endregion

package/build/plugin/rspack.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BxKix--T.mjs";
 import { createRspackPlugin } from "unplugin";
 //#region src/plugin/rspack.ts
 var rspack_default = createRspackPlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/typings/client.d.ts

@@ -1,6 +1,10 @@
 import type {ComponentType} from 'react';
 
 declare module '@gravity-ui/data-source' {
+    export interface AsyncComponent<TProps extends object = {}, TLoadingProps extends object = {}> {
+        Lazy: ComponentType<TProps & TLoadingProps>;
+    }
+
     interface AsyncBoundaryComponent<
         TProps extends object = {},
         TLoadingProps extends object = {},

package/build/plugin/vite.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-Dq6kUGl-.cjs");
+const require_factory = require("./factory-amr4dgO8.cjs");
 //#region src/plugin/vite.ts
 var vite_default = (0, require("unplugin").createVitePlugin)(require_factory.dataSourceLazyUnpluginFactory);
 //#endregion

package/build/plugin/vite.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BxKix--T.mjs";
 import { createVitePlugin } from "unplugin";
 //#region src/plugin/vite.ts
 var vite_default = createVitePlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/webpack.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-Dq6kUGl-.cjs");
+const require_factory = require("./factory-amr4dgO8.cjs");
 //#region src/plugin/webpack.ts
 var webpack_default = (0, require("unplugin").createWebpackPlugin)(require_factory.dataSourceLazyUnpluginFactory);
 //#endregion

package/build/plugin/webpack.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BxKix--T.mjs";
 import { createWebpackPlugin } from "unplugin";
 //#region src/plugin/webpack.ts
 var webpack_default = createWebpackPlugin(dataSourceLazyUnpluginFactory);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/data-source",
-  "version": "0.10.0-alpha.7",
+  "version": "0.10.0-alpha.9",
   "description": "A wrapper around data fetching",
   "keywords": [
     "data-fetching",