@gravity-ui/data-source 0.10.0-alpha.0 → 0.10.0-alpha.10

package/build/plugin/{factory-2tSt4Rte.mjs → factory-C_-OCKcW.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 = [];
@@ -256,39 +319,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 +356,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,
@@ -369,9 +426,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`);
@@ -380,15 +439,15 @@ function transformDefinitionModule(s, filename, info) {
 	}
 }
 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}`);
+	for (const { usage } of usages) for (const access of usage.accesses) 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 +474,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 +499,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 +509,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 +574,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,13 +608,8 @@ 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);
@@ -505,9 +625,30 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 			}
 		},
 		watchChange(id) {
-			hocInfoCache.delete(stripQuery(id));
+			const key = stripQuery(id);
+			hocInfoCache.delete(key);
+			reExportsCache.delete(key);
 		}
 	};
 };
+function isInside(info, access) {
+	return info.argStart <= access.start && access.end <= info.argEnd;
+}
+function dropAccessesInsideHocArgs(info, usages) {
+	const result = [];
+	for (const usage of usages) {
+		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);
+			continue;
+		}
+		result.push({
+			...usage,
+			accesses
+		});
+	}
+	return result;
+}
 //#endregion
 export { dataSourceLazyUnpluginFactory as n, DEFAULT_HOCS as t };

package/build/plugin/index-Dv4gZVjD.d.cts

@@ -0,0 +1,23 @@
+import { UnpluginFactory } from "unplugin";
+import { JsxOptions } from "oxc-transform";
+//#region src/plugin/core/generate.d.ts
+interface GenerateOptions {
+  jsx?: JsxOptions;
+  target?: string | string[];
+}
+//#endregion
+//#region src/plugin/core/factory.d.ts
+interface DataSourceLazyHocPattern {
+  from: string;
+  name: string;
+}
+interface DataSourceLazyPluginOptions {
+  hocs?: DataSourceLazyHocPattern[];
+  include?: RegExp | RegExp[];
+  exclude?: RegExp | RegExp[];
+  generateOptions?: GenerateOptions;
+}
+declare const DEFAULT_HOCS: DataSourceLazyPluginOptions['hocs'];
+declare const dataSourceLazyUnpluginFactory: UnpluginFactory<DataSourceLazyPluginOptions | undefined>;
+//#endregion
+export { dataSourceLazyUnpluginFactory as i, DataSourceLazyHocPattern as n, DataSourceLazyPluginOptions as r, DEFAULT_HOCS as t };

package/build/plugin/index.cjs

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

package/build/plugin/index.d.cts

@@ -0,0 +1,7 @@
+import { i as dataSourceLazyUnpluginFactory, n as DataSourceLazyHocPattern, r as DataSourceLazyPluginOptions, t as DEFAULT_HOCS } from "./index-Dv4gZVjD.cjs";
+import * as _$unplugin from "unplugin";
+
+//#region src/plugin/index.d.ts
+declare const DataSourceLazyPlugin: _$unplugin.UnpluginInstance<DataSourceLazyPluginOptions | undefined, boolean>;
+//#endregion
+export { DEFAULT_HOCS, DataSourceLazyHocPattern, DataSourceLazyPlugin, DataSourceLazyPlugin as default, DataSourceLazyPluginOptions, dataSourceLazyUnpluginFactory };

package/build/plugin/index.mjs

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

package/build/plugin/rollup.cjs

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

package/build/plugin/rollup.d.cts

@@ -0,0 +1,5 @@
+import { r as DataSourceLazyPluginOptions } from "./index-Dv4gZVjD.cjs";
+
+//#region src/plugin/rollup.d.ts
+declare const _default: (options?: DataSourceLazyPluginOptions | undefined) => any;
+export = _default;

package/build/plugin/rollup.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-C_-OCKcW.mjs";
 import { createRollupPlugin } from "unplugin";
 //#region src/plugin/rollup.ts
 var rollup_default = createRollupPlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/rspack.cjs

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

package/build/plugin/rspack.d.cts

@@ -0,0 +1,6 @@
+import { r as DataSourceLazyPluginOptions } from "./index-Dv4gZVjD.cjs";
+import * as _$unplugin from "unplugin";
+
+//#region src/plugin/rspack.d.ts
+declare const _default: (options?: DataSourceLazyPluginOptions | undefined) => _$unplugin.RspackPluginInstance;
+export = _default;

package/build/plugin/rspack.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-C_-OCKcW.mjs";
 import { createRspackPlugin } from "unplugin";
 //#region src/plugin/rspack.ts
 var rspack_default = createRspackPlugin(dataSourceLazyUnpluginFactory);

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

@@ -1,11 +1,23 @@
 import type {ComponentType} from 'react';
 
 declare module '@gravity-ui/data-source' {
-    interface AsyncBoundaryComponent<TProps extends object> {
-        Lazy: ComponentType<TProps>;
+    interface AsyncComponent<TProps extends object = {}, TLoadingProps extends object = {}> {
+        Lazy: ComponentType<TProps & TLoadingProps>;
     }
 
-    interface QueryAsyncBoundaryComponent<TProps extends object> {
-        Lazy: ComponentType<TProps>;
+    interface AsyncBoundaryComponent<
+        TProps extends object = {},
+        TLoadingProps extends object = {},
+        TErrorProps extends object = {},
+    > {
+        Lazy: ComponentType<TProps & TLoadingProps & Omit<TErrorProps, keyof ErrorViewProps>>;
+    }
+
+    interface QueryAsyncBoundaryComponent<
+        TProps extends object = {},
+        TLoadingProps extends object = {},
+        TErrorProps extends object = {},
+    > {
+        Lazy: ComponentType<TProps & TLoadingProps & Omit<TErrorProps, keyof ErrorViewProps>>;
     }
 }

package/build/plugin/vite.cjs

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

package/build/plugin/vite.d.cts

@@ -0,0 +1,5 @@
+import { r as DataSourceLazyPluginOptions } from "./index-Dv4gZVjD.cjs";
+
+//#region src/plugin/vite.d.ts
+declare const _default: (options?: DataSourceLazyPluginOptions | undefined) => any;
+export = _default;

package/build/plugin/vite.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-C_-OCKcW.mjs";
 import { createVitePlugin } from "unplugin";
 //#region src/plugin/vite.ts
 var vite_default = createVitePlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/webpack.cjs

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

package/build/plugin/webpack.d.cts

@@ -0,0 +1,6 @@
+import { r as DataSourceLazyPluginOptions } from "./index-Dv4gZVjD.cjs";
+import * as _$webpack from "webpack";
+
+//#region src/plugin/webpack.d.ts
+declare const _default: (options?: DataSourceLazyPluginOptions | undefined) => _$webpack.WebpackPluginInstance;
+export = _default;

package/build/plugin/webpack.mjs

@@ -1,4 +1,4 @@
-import { n as dataSourceLazyUnpluginFactory } from "./factory-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-C_-OCKcW.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.0",
+  "version": "0.10.0-alpha.10",
   "description": "A wrapper around data fetching",
   "keywords": [
     "data-fetching",
@@ -24,9 +24,6 @@
     "yarn": "Please use npm instead of yarn to install dependencies",
     "pnpm": "Please use npm instead of pnpm to install dependencies"
   },
-  "main": "build/cjs/index.js",
-  "module": "build/esm/index.js",
-  "types": "build/esm/index.d.ts",
   "exports": {
     ".": {
       "types": "./build/esm/index.d.ts",
@@ -35,27 +32,33 @@
     },
     "./plugin": {
       "types": "./build/plugin/index.d.mts",
-      "default": "./build/plugin/index.mjs"
+      "import": "./build/plugin/index.mjs",
+      "require": "./build/plugin/index.cjs"
     },
     "./plugin-webpack": {
       "types": "./build/plugin/webpack.d.mts",
-      "default": "./build/plugin/webpack.mjs"
+      "import": "./build/plugin/webpack.mjs",
+      "require": "./build/plugin/webpack.cjs"
     },
     "./plugin-rspack": {
       "types": "./build/plugin/rspack.d.mts",
-      "default": "./build/plugin/rspack.mjs"
+      "import": "./build/plugin/rspack.mjs",
+      "require": "./build/plugin/rspack.cjs"
     },
     "./plugin-vite": {
       "types": "./build/plugin/vite.d.mts",
-      "default": "./build/plugin/vite.mjs"
+      "import": "./build/plugin/vite.mjs",
+      "require": "./build/plugin/vite.cjs"
     },
     "./plugin-rollup": {
       "types": "./build/plugin/rollup.d.mts",
-      "default": "./build/plugin/rollup.mjs"
+      "import": "./build/plugin/rollup.mjs",
+      "require": "./build/plugin/rollup.cjs"
     },
     "./plugin-esbuild": {
       "types": "./build/plugin/esbuild.d.mts",
-      "default": "./build/plugin/esbuild.mjs"
+      "import": "./build/plugin/esbuild.mjs",
+      "require": "./build/plugin/esbuild.cjs"
     },
     "./plugin-client": {
       "types": "./build/plugin/typings/client.d.ts"