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

package/build/plugin/esbuild.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-CmOH3Kh6.cjs");
+const require_factory = require("./factory-Dq6kUGl-.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--H-amlua.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.mjs";
 import { createEsbuildPlugin } from "unplugin";
 //#region src/plugin/esbuild.ts
 var esbuild_default = createEsbuildPlugin(dataSourceLazyUnpluginFactory);

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

@@ -82,6 +82,14 @@ function parseCompanionId(id) {
 function isRelativeId(id) {
 	return id[0] === ".";
 }
+function toRelativeImportSource(fromFile, toFile) {
+	const fromDir = node_path.default.dirname(stripQuery(fromFile));
+	let rel = node_path.default.relative(fromDir, toFile);
+	if (node_path.default.sep !== "/") rel = rel.split(node_path.default.sep).join("/");
+	if (!rel.startsWith(".")) rel = `./${rel}`;
+	const ext = node_path.default.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);
@@ -156,6 +164,59 @@ function extractHocInfo(hocsSet, filename, source) {
 	}
 	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 = [];
@@ -406,15 +467,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());
@@ -459,6 +520,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);
@@ -468,6 +530,14 @@ 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 ?? node_fs.default.readFileSync(key, "utf-8"));
+		reExportsCache.set(key, reExports);
+		return reExports;
+	};
 	return {
 		name: "data-source-lazy",
 		enforce: "pre",
@@ -510,12 +580,42 @@ 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 usageInfo = getHocInfo(resolvedSourceFile);
-					if (!usageInfo || usageInfo.exportedName !== usage.spec.importedName) return null;
-					return usage;
+					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);
 				if (!info && verifiedUsages.length === 0) return null;
 				const s = new magic_string.default(code);
@@ -532,7 +632,9 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 			}
 		},
 		watchChange(id) {
-			hocInfoCache.delete(stripQuery(id));
+			const key = stripQuery(id);
+			hocInfoCache.delete(key);
+			reExportsCache.delete(key);
 		}
 	};
 };

package/build/plugin/{factory--H-amlua.mjs → factory-Ds3_-8kv.mjs}

@@ -57,6 +57,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);
@@ -131,6 +139,59 @@ function extractHocInfo(hocsSet, filename, source) {
 	}
 	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 = [];
@@ -381,15 +442,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());
@@ -434,6 +495,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);
@@ -443,6 +505,14 @@ 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;
+	};
 	return {
 		name: "data-source-lazy",
 		enforce: "pre",
@@ -485,12 +555,42 @@ 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 usageInfo = getHocInfo(resolvedSourceFile);
-					if (!usageInfo || usageInfo.exportedName !== usage.spec.importedName) return null;
-					return usage;
+					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);
 				if (!info && verifiedUsages.length === 0) return null;
 				const s = new MagicString(code);
@@ -507,7 +607,9 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 			}
 		},
 		watchChange(id) {
-			hocInfoCache.delete(stripQuery(id));
+			const key = stripQuery(id);
+			hocInfoCache.delete(key);
+			reExportsCache.delete(key);
 		}
 	};
 };

package/build/plugin/index.cjs

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_factory = require("./factory-CmOH3Kh6.cjs");
+const require_factory = require("./factory-Dq6kUGl-.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--H-amlua.mjs";
+import { n as dataSourceLazyUnpluginFactory, t as DEFAULT_HOCS } from "./factory-Ds3_-8kv.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-CmOH3Kh6.cjs");
+const require_factory = require("./factory-Dq6kUGl-.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--H-amlua.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.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-CmOH3Kh6.cjs");
+const require_factory = require("./factory-Dq6kUGl-.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--H-amlua.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.mjs";
 import { createRspackPlugin } from "unplugin";
 //#region src/plugin/rspack.ts
 var rspack_default = createRspackPlugin(dataSourceLazyUnpluginFactory);

package/build/plugin/vite.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-CmOH3Kh6.cjs");
+const require_factory = require("./factory-Dq6kUGl-.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--H-amlua.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.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-CmOH3Kh6.cjs");
+const require_factory = require("./factory-Dq6kUGl-.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--H-amlua.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-Ds3_-8kv.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.5",
+  "version": "0.10.0-alpha.7",
   "description": "A wrapper around data fetching",
   "keywords": [
     "data-fetching",