@gravity-ui/data-source 0.10.0-alpha.1 → 0.10.0-alpha.11

package/build/esm/react-query/components/QueryAsyncBoundary/types.d.ts

@@ -1,8 +1,9 @@
-import type { AsyncBoundaryProps } from '../../../react';
+import type { ComponentType } from 'react';
+import type { AsyncBoundaryProps, ErrorViewProps } from '../../../react';
 export interface QueryAsyncBoundaryProps extends AsyncBoundaryProps {
 }
-export interface QueryAsyncBoundaryComponent<TProps extends object> extends React.FC<TProps> {
+export interface QueryAsyncBoundaryComponent<TProps extends object = {}, TLoadingProps extends object = {}, TErrorProps extends object = {}> extends React.FC<TProps & TLoadingProps & Omit<TErrorProps, keyof ErrorViewProps>> {
     Content: React.ComponentType<TProps>;
-    Loading: QueryAsyncBoundaryProps['LoadingView'];
-    Error: QueryAsyncBoundaryProps['ErrorView'];
+    Loading: ComponentType<TLoadingProps & Partial<TProps>>;
+    Error: ComponentType<ErrorViewProps & TErrorProps & Partial<TProps>>;
 }

package/build/esm/react-query/components/QueryAsyncBoundary/types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type {AsyncBoundaryProps} from '../../../react';\n\nexport interface QueryAsyncBoundaryProps extends AsyncBoundaryProps {}\n\nexport interface QueryAsyncBoundaryComponent<TProps extends object> extends React.FC<TProps> {\n    Content: React.ComponentType<TProps>;\n    Loading: QueryAsyncBoundaryProps['LoadingView'];\n    Error: QueryAsyncBoundaryProps['ErrorView'];\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type {ComponentType} from 'react';\n\nimport type {AsyncBoundaryProps, ErrorViewProps} from '../../../react';\n\nexport interface QueryAsyncBoundaryProps extends AsyncBoundaryProps {}\n\nexport interface QueryAsyncBoundaryComponent<\n    TProps extends object = {},\n    TLoadingProps extends object = {},\n    TErrorProps extends object = {},\n> extends React.FC<TProps & TLoadingProps & Omit<TErrorProps, keyof ErrorViewProps>> {\n    Content: React.ComponentType<TProps>;\n    Loading: ComponentType<TLoadingProps & Partial<TProps>>;\n    Error: ComponentType<ErrorViewProps & TErrorProps & Partial<TProps>>;\n}\n"],"mappings":"","ignoreList":[]}

package/build/esm/react-query/components/QueryAsyncBoundary/withQueryAsyncBoundary.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-import type { QueryAsyncBoundaryComponent, QueryAsyncBoundaryProps } from './types';
-export declare const withQueryAsyncBoundary: <TProps extends object>(Component: React.ComponentType<TProps>, LoadingView: QueryAsyncBoundaryProps["LoadingView"], ErrorView: QueryAsyncBoundaryProps["ErrorView"]) => QueryAsyncBoundaryComponent<TProps>;
+import type { ErrorViewProps } from '../../../react';
+import type { QueryAsyncBoundaryComponent } from './types';
+export declare const withQueryAsyncBoundary: <TProps extends object = {}, TLoadingProps extends object = {}, TErrorProps extends object = {}>(Component: React.ComponentType<TProps>, LoadingView: React.ComponentType<TLoadingProps & Partial<TProps>>, ErrorView: React.ComponentType<ErrorViewProps & TErrorProps & Partial<TProps>>) => QueryAsyncBoundaryComponent<TProps, TLoadingProps, TErrorProps>;

package/build/esm/react-query/components/QueryAsyncBoundary/withQueryAsyncBoundary.js

@@ -2,18 +2,22 @@ import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import React from 'react';
 import { QueryAsyncBoundary } from './QueryAsyncBoundary';
 import { jsx as _jsx } from "react/jsx-runtime";
-export var withQueryAsyncBoundary = function withQueryAsyncBoundary(Component, LoadingView, ErrorView) {
+export var withQueryAsyncBoundary = function withQueryAsyncBoundary(Component, _LoadingView, _ErrorView) {
   var WrappedComponent = function WrappedComponent(props) {
     return /*#__PURE__*/_jsx(QueryAsyncBoundary, {
-      LoadingView: LoadingView,
-      ErrorView: ErrorView,
+      LoadingView: function LoadingView() {
+        return /*#__PURE__*/_jsx(_LoadingView, _objectSpread({}, props));
+      },
+      ErrorView: function ErrorView(errorProps) {
+        return /*#__PURE__*/_jsx(_ErrorView, _objectSpread(_objectSpread({}, props), errorProps));
+      },
       children: /*#__PURE__*/_jsx(Component, _objectSpread({}, props))
     });
   };
   WrappedComponent.displayName = "WithQueryAsyncBoundary(".concat(Component.displayName || Component.name, ")");
   WrappedComponent.Content = Component;
-  WrappedComponent.Loading = LoadingView;
-  WrappedComponent.Error = ErrorView;
+  WrappedComponent.Loading = _LoadingView;
+  WrappedComponent.Error = _ErrorView;
   return WrappedComponent;
 };
 // #sourceMappingURL=withQueryAsyncBoundary.js.map

package/build/esm/react-query/components/QueryAsyncBoundary/withQueryAsyncBoundary.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","QueryAsyncBoundary","jsx","_jsx","withQueryAsyncBoundary","Component","LoadingView","ErrorView","WrappedComponent","props","children","_objectSpread","displayName","concat","name","Content","Loading","Error"],"sources":["withQueryAsyncBoundary.tsx"],"sourcesContent":["import React from 'react';\n\nimport {QueryAsyncBoundary} from './QueryAsyncBoundary';\nimport type {QueryAsyncBoundaryComponent, QueryAsyncBoundaryProps} from './types';\n\nexport const withQueryAsyncBoundary = <TProps extends object>(\n    Component: React.ComponentType<TProps>,\n    LoadingView: QueryAsyncBoundaryProps['LoadingView'],\n    ErrorView: QueryAsyncBoundaryProps['ErrorView'],\n) => {\n    const WrappedComponent = ((props: TProps) => (\n        <QueryAsyncBoundary LoadingView={LoadingView} ErrorView={ErrorView}>\n            <Component {...props} />\n        </QueryAsyncBoundary>\n    )) as QueryAsyncBoundaryComponent<TProps>;\n\n    WrappedComponent.displayName = `WithQueryAsyncBoundary(${\n        Component.displayName || Component.name\n    })`;\n\n    WrappedComponent.Content = Component;\n    WrappedComponent.Loading = LoadingView;\n    WrappedComponent.Error = ErrorView;\n\n    return WrappedComponent;\n};\n"],"mappings":";AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SAAQC,kBAAkB,QAAO,sBAAsB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGxD,OAAO,IAAMC,sBAAsB,GAAG,SAAzBA,sBAAsBA,CAC/BC,SAAsC,EACtCC,WAAmD,EACnDC,SAA+C,EAC9C;EACD,IAAMC,gBAAgB,GAAI,SAApBA,gBAAgBA,CAAKC,KAAa;IAAA,oBACpCN,IAAA,CAACF,kBAAkB;MAACK,WAAW,EAAEA,WAAY;MAACC,SAAS,EAAEA,SAAU;MAAAG,QAAA,eAC/DP,IAAA,CAACE,SAAS,EAAAM,aAAA,KAAKF,KAAK,CAAG;IAAC,CACR,CAAC;EAAA,CACgB;EAEzCD,gBAAgB,CAACI,WAAW,6BAAAC,MAAA,CACxBR,SAAS,CAACO,WAAW,IAAIP,SAAS,CAACS,IAAI,MACxC;EAEHN,gBAAgB,CAACO,OAAO,GAAGV,SAAS;EACpCG,gBAAgB,CAACQ,OAAO,GAAGV,WAAW;EACtCE,gBAAgB,CAACS,KAAK,GAAGV,SAAS;EAElC,OAAOC,gBAAgB;AAC3B,CAAC","ignoreList":[]}
+{"version":3,"names":["React","QueryAsyncBoundary","jsx","_jsx","withQueryAsyncBoundary","Component","LoadingView","ErrorView","WrappedComponent","props","_LoadingView","_objectSpread","errorProps","_ErrorView","children","displayName","concat","name","Content","Loading","Error"],"sources":["withQueryAsyncBoundary.tsx"],"sourcesContent":["import React from 'react';\n\nimport type {ErrorViewProps} from '../../../react';\n\nimport {QueryAsyncBoundary} from './QueryAsyncBoundary';\nimport type {QueryAsyncBoundaryComponent} from './types';\n\nexport const withQueryAsyncBoundary = <\n    TProps extends object = {},\n    TLoadingProps extends object = {},\n    TErrorProps extends object = {},\n>(\n    Component: React.ComponentType<TProps>,\n    LoadingView: React.ComponentType<TLoadingProps & Partial<TProps>>,\n    ErrorView: React.ComponentType<ErrorViewProps & TErrorProps & Partial<TProps>>,\n) => {\n    const WrappedComponent = ((props: TProps & TLoadingProps & TErrorProps) => (\n        <QueryAsyncBoundary\n            LoadingView={() => <LoadingView {...props} />}\n            ErrorView={(errorProps) => <ErrorView {...props} {...errorProps} />}\n        >\n            <Component {...props} />\n        </QueryAsyncBoundary>\n    )) as QueryAsyncBoundaryComponent<TProps, TLoadingProps, TErrorProps>;\n\n    WrappedComponent.displayName = `WithQueryAsyncBoundary(${\n        Component.displayName || Component.name\n    })`;\n\n    WrappedComponent.Content = Component;\n    WrappedComponent.Loading = LoadingView;\n    WrappedComponent.Error = ErrorView;\n\n    return WrappedComponent;\n};\n"],"mappings":";AAAA,OAAOA,KAAK,MAAM,OAAO;AAIzB,SAAQC,kBAAkB,QAAO,sBAAsB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGxD,OAAO,IAAMC,sBAAsB,GAAG,SAAzBA,sBAAsBA,CAK/BC,SAAsC,EACtCC,YAAiE,EACjEC,UAA8E,EAC7E;EACD,IAAMC,gBAAgB,GAAI,SAApBA,gBAAgBA,CAAKC,KAA2C;IAAA,oBAClEN,IAAA,CAACF,kBAAkB;MACfK,WAAW,EAAE,SAAbA,WAAWA,CAAA;QAAA,oBAAQH,IAAA,CAACO,YAAW,EAAAC,aAAA,KAAKF,KAAK,CAAG,CAAC;MAAA,CAAC;MAC9CF,SAAS,EAAE,SAAXA,SAASA,CAAGK,UAAU;QAAA,oBAAKT,IAAA,CAACU,UAAS,EAAAF,aAAA,CAAAA,aAAA,KAAKF,KAAK,GAAMG,UAAU,CAAG,CAAC;MAAA,CAAC;MAAAE,QAAA,eAEpEX,IAAA,CAACE,SAAS,EAAAM,aAAA,KAAKF,KAAK,CAAG;IAAC,CACR,CAAC;EAAA,CAC4C;EAErED,gBAAgB,CAACO,WAAW,6BAAAC,MAAA,CACxBX,SAAS,CAACU,WAAW,IAAIV,SAAS,CAACY,IAAI,MACxC;EAEHT,gBAAgB,CAACU,OAAO,GAAGb,SAAS;EACpCG,gBAAgB,CAACW,OAAO,GAAGb,YAAW;EACtCE,gBAAgB,CAACY,KAAK,GAAGb,UAAS;EAElC,OAAOC,gBAAgB;AAC3B,CAAC","ignoreList":[]}

package/build/plugin/esbuild.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-Cdmba_F_.cjs");
+const require_factory = require("./factory-TMKD3PiJ.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-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BdwLvQEp.mjs";
 import { createEsbuildPlugin } from "unplugin";
 //#region src/plugin/esbuild.ts
 var esbuild_default = createEsbuildPlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/{factory-2tSt4Rte.mjs → factory-BdwLvQEp.mjs}

@@ -24,11 +24,12 @@ function isCompanionSuffix(suffix) {
 	return COMPANION_SUFFIXES_SET.has(suffix);
 }
 function makeVirtualId(type, sourceFile) {
-	return `${VIRTUAL_PREFIX}:${type}:${sourceFile}`;
+	return `${VIRTUAL_PREFIX}:${type}:${stripQuery(sourceFile)}`;
 }
 function parseVirtualId(id) {
-	if (id.indexOf("\0dsl-plugin") !== 0) return null;
-	const rest = id.slice(12);
+	const prefixIndex = id.indexOf(VIRTUAL_PREFIX);
+	if (prefixIndex === -1) return null;
+	const rest = id.slice(prefixIndex + 11 + 1);
 	const colonIndex = rest.indexOf(":");
 	if (colonIndex === -1) return null;
 	const type = rest.slice(0, colonIndex);
@@ -40,8 +41,9 @@ function parseVirtualId(id) {
 }
 function makeCompanionId(type, sourceFile) {
 	const suffix = COMPANION_TYPES[type];
-	const ext = path.extname(sourceFile);
-	return `${ext ? sourceFile.slice(0, -ext.length) : sourceFile}.${suffix}${ext}`;
+	const cleanSourceFile = stripQuery(sourceFile);
+	const ext = path.extname(cleanSourceFile);
+	return `${ext ? cleanSourceFile.slice(0, -ext.length) : cleanSourceFile}.${suffix}${ext}`;
 }
 function parseCompanionId(id) {
 	const suffixIndex = id.lastIndexOf(".");
@@ -56,6 +58,14 @@ function parseCompanionId(id) {
 function isRelativeId(id) {
 	return id[0] === ".";
 }
+function toRelativeImportSource(fromFile, toFile) {
+	const fromDir = path.dirname(stripQuery(fromFile));
+	let rel = path.relative(fromDir, toFile);
+	if (path.sep !== "/") rel = rel.split(path.sep).join("/");
+	if (!rel.startsWith(".")) rel = `./${rel}`;
+	const ext = path.extname(rel);
+	return ext ? rel.slice(0, -ext.length) : rel;
+}
 function stripQuery(id) {
 	const queryIndex = id.indexOf("?");
 	return queryIndex === -1 ? id : id.slice(0, queryIndex);
@@ -93,7 +103,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;
@@ -119,17 +129,70 @@ 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
 			};
 		}
 	}
 	return null;
 }
+function extractReExports(filename, source) {
+	const named = /* @__PURE__ */ new Map();
+	const stars = [];
+	const program = parseProgram(filename, source);
+	if (!program) return {
+		named,
+		stars
+	};
+	const localImports = /* @__PURE__ */ new Map();
+	for (const node of program.body) {
+		if (node.type !== "ImportDeclaration" || node.importKind === "type") continue;
+		for (const spec of node.specifiers) {
+			if (spec.type !== "ImportSpecifier" || spec.importKind === "type") continue;
+			const importedName = spec.imported.type === "Literal" ? spec.imported.value : spec.imported.name;
+			localImports.set(spec.local.name, {
+				source: node.source.value,
+				importedName
+			});
+		}
+	}
+	for (const node of program.body) {
+		if (node.type === "ExportAllDeclaration" && node.exportKind !== "type" && !node.exported) {
+			stars.push(node.source.value);
+			continue;
+		}
+		if (node.type !== "ExportNamedDeclaration" || node.exportKind === "type") continue;
+		if (node.source) {
+			const src = node.source.value;
+			for (const spec of node.specifiers) {
+				if (spec.exportKind === "type") continue;
+				const localName = spec.local.type === "Literal" ? spec.local.value : spec.local.name;
+				const exportedName = spec.exported.type === "Literal" ? spec.exported.value : spec.exported.name;
+				named.set(exportedName, {
+					source: src,
+					importedName: localName
+				});
+			}
+			continue;
+		}
+		if (node.declaration) continue;
+		for (const spec of node.specifiers) {
+			if (spec.exportKind === "type" || spec.local.type === "Literal") continue;
+			const target = localImports.get(spec.local.name);
+			if (!target) continue;
+			const exportedName = spec.exported.type === "Literal" ? spec.exported.value : spec.exported.name;
+			named.set(exportedName, target);
+		}
+	}
+	return {
+		named,
+		stars
+	};
+}
 const COMPANION_PROPS_RE = new RegExp(`\\.(${Object.values(COMPANION_TYPES).join("|")})\\b`);
 function extractUsages(filename, source) {
 	const result = [];
@@ -209,6 +272,9 @@ function extractUsages(filename, source) {
 	}
 	return result;
 }
+function isAccessInsideArg(arg, access) {
+	return arg.argStart <= access.start && access.end <= arg.argEnd;
+}
 function collectIdentifiers(node) {
 	const result = /* @__PURE__ */ new Set();
 	walk(node, (current) => {
@@ -256,39 +322,33 @@ 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 generateAuxModuleCode(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 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,
@@ -299,7 +359,7 @@ function generateLazyModule(sourceFile, info, options = {}) {
 		}).toString()
 	};
 }
-function transformJsx(filename, code, options) {
+function transformJsx(filename, code, options = {}) {
 	const result = transformSync(filename, code, {
 		lang: "tsx",
 		jsx: options.jsx,
@@ -365,30 +425,42 @@ function resolveWithCompiler(compiler, directory, request) {
 }
 //#endregion
 //#region src/plugin/core/transform.ts
-function transformDefinitionModule(s, filename, info) {
+function transformDefinitionModule(s, filename, info, verifiedUsages) {
 	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`);
+		const contentSource = verifiedUsages.length > 0 ? renderInlineContent(info.content, verifiedUsages) : info.content.argSource;
+		s.appendLeft(info.hocExportStart, `const ${name}Content = ${contentSource};\n\n`);
 		s.overwrite(info.content.argStart, info.content.argEnd, `${name}Content`);
 		s.append(`\nexport {${name}Content};\n`);
 	}
 }
-function transformUsages(s, usages) {
-	for (const { spec, accesses } of usages) for (const access of accesses) s.overwrite(access.start, access.end, `${spec.localName}${access.prop}`);
+function renderInlineContent(content, usages) {
+	const s = new MagicString(content.argSource);
+	for (const { usage } of usages) for (const access of usage.accesses) if (isAccessInsideArg(content, access)) s.overwrite(access.start - content.argStart, access.end - content.argStart, `${usage.spec.localName}${access.prop}`);
+	return s.toString();
+}
+function transformUsages(s, usages, info) {
+	const inlineContent = info?.content.kind === "inline" ? info.content : null;
+	for (const { usage } of usages) for (const access of usage.accesses) {
+		if (inlineContent && isAccessInsideArg(inlineContent, access)) continue;
+		s.overwrite(access.start, access.end, `${usage.spec.localName}${access.prop}`);
+	}
 	const newImports = [];
-	for (const { decl, spec, accesses } of usages) {
-		const propsUsed = new Set(accesses.map((access) => access.prop));
-		for (const prop of propsUsed) newImports.push(renderNamedImport(`${spec.localName}${prop}`, `${spec.importedName}${prop}`, makeCompanionId(COMPANION_TYPE_BY_SUFFIX[prop], decl.source)));
+	for (const { usage, hocImportSource, hocExportedName } of usages) {
+		const propsUsed = new Set(usage.accesses.map((access) => access.prop));
+		for (const prop of propsUsed) newImports.push(renderNamedImport(`${usage.spec.localName}${prop}`, `${hocExportedName}${prop}`, makeCompanionId(COMPANION_TYPE_BY_SUFFIX[prop], hocImportSource)));
 	}
 	if (newImports.length > 0) s.prepend(newImports.join("\n") + "\n");
 	const localsByDecl = /* @__PURE__ */ new Map();
-	for (const usage of usages) {
+	for (const { usage } of usages) {
 		if (usage.hasOtherUsages) continue;
 		let locals = localsByDecl.get(usage.decl);
 		if (!locals) localsByDecl.set(usage.decl, locals = /* @__PURE__ */ new Set());
@@ -415,13 +487,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 = {}) => {
@@ -433,6 +512,7 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 	const hocsSet = new Set(hocPatterns.map((pattern) => getHocString(pattern.from, pattern.name)));
 	const hocsRegexp = new RegExp(Array.from(new Set(hocPatterns.map((pattern) => pattern.name))).map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"));
 	const hocInfoCache = /* @__PURE__ */ new Map();
+	const reExportsCache = /* @__PURE__ */ new Map();
 	const getHocInfo = (sourceFile, source) => {
 		const key = stripQuery(sourceFile);
 		const cachedInfo = hocInfoCache.get(key);
@@ -442,6 +522,53 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 		hocInfoCache.set(key, info);
 		return info;
 	};
+	const getReExports = (sourceFile, source) => {
+		const key = stripQuery(sourceFile);
+		const cachedReExports = reExportsCache.get(key);
+		if (cachedReExports) return cachedReExports;
+		const reExports = extractReExports(key, source ?? fs.readFileSync(key, "utf-8"));
+		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 verifyUsages = 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",
@@ -460,18 +587,29 @@ 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 filename = makeCompanionId(parsedId.type, parsedId.sourceFile);
+					const code = generateAuxModuleCode(info.exportedName, auxInfo, parsedId.type);
+					const usages = extractUsages(filename, code);
+					const verifiedUsages = await verifyUsages(this, usages, parsedId.sourceFile);
+					let resultCode = code;
+					if (verifiedUsages.length > 0) {
+						const s = new MagicString(code);
+						transformUsages(s, verifiedUsages);
+						resultCode = s.toString();
+					}
+					return transformJsx(filename, resultCode, options.generateOptions);
 				}
+				if (parsedId.type === "lazy") return generateLazyModule(parsedId.sourceFile, info, options.generateOptions);
+				return assertNever(parsedId.type);
 			}
 		},
 		transform: {
@@ -483,17 +621,12 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 				const info = getHocInfo(id, code);
 				const usages = extractUsages(id, code);
 				if (!info && usages.length === 0) return null;
-				const verifiedUsages = (await Promise.all(usages.map(async (usage) => {
-					const resolvedSourceFile = await resolveSourceFile(this, usage.decl.source, id);
-					if (!resolvedSourceFile) return null;
-					const usageInfo = getHocInfo(resolvedSourceFile);
-					if (!usageInfo || usageInfo.exportedName !== usage.spec.importedName) return null;
-					return usage;
-				}))).filter((usage) => usage !== null);
+				const filteredUsages = info ? dropAccessesInsideHocArgs(info, usages) : usages;
+				const verifiedUsages = await verifyUsages(this, filteredUsages, id);
 				if (!info && verifiedUsages.length === 0) return null;
 				const s = new MagicString(code);
-				if (info) transformDefinitionModule(s, id, info);
-				if (verifiedUsages.length > 0) transformUsages(s, verifiedUsages);
+				if (info) transformDefinitionModule(s, id, info, verifiedUsages);
+				if (verifiedUsages.length > 0) transformUsages(s, verifiedUsages, info);
 				if (!s.hasChanged()) return null;
 				return {
 					code: s.toString(),
@@ -505,9 +638,27 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 			}
 		},
 		watchChange(id) {
-			hocInfoCache.delete(stripQuery(id));
+			const key = stripQuery(id);
+			hocInfoCache.delete(key);
+			reExportsCache.delete(key);
 		}
 	};
 };
+function dropAccessesInsideHocArgs(info, usages) {
+	const result = [];
+	for (const usage of usages) {
+		const accesses = usage.accesses.filter((access) => !isAccessInsideArg(info.loading, access) && !(info.error && isAccessInsideArg(info.error, access)));
+		if (accesses.length === 0) continue;
+		if (accesses.length === usage.accesses.length) {
+			result.push(usage);
+			continue;
+		}
+		result.push({
+			...usage,
+			accesses
+		});
+	}
+	return result;
+}
 //#endregion
 export { dataSourceLazyUnpluginFactory as n, DEFAULT_HOCS as t };