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

package/build/plugin/esbuild.cjs

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

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

@@ -27,8 +27,9 @@ function makeVirtualId(type, sourceFile) {
 	return `${VIRTUAL_PREFIX}:${type}:${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);
@@ -483,7 +484,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 filteredUsages = info ? dropAccessesInsideHocArgs(info, usages) : usages;
+				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);
@@ -509,5 +511,24 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 		}
 	};
 };
+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) && !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/{factory-Cdmba_F_.cjs → factory-CmOH3Kh6.cjs}

@@ -52,8 +52,9 @@ function makeVirtualId(type, sourceFile) {
 	return `${VIRTUAL_PREFIX}:${type}:${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);
@@ -508,7 +509,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 filteredUsages = info ? dropAccessesInsideHocArgs(info, usages) : usages;
+				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);
@@ -534,6 +536,25 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 		}
 	};
 };
+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) && !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
 Object.defineProperty(exports, "DEFAULT_HOCS", {
 	enumerable: true,

package/build/plugin/index.cjs

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_factory = require("./factory-Cdmba_F_.cjs");
+const require_factory = require("./factory-CmOH3Kh6.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-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory, t as DEFAULT_HOCS } from "./factory--H-amlua.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-Cdmba_F_.cjs");
+const require_factory = require("./factory-CmOH3Kh6.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-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory--H-amlua.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-Cdmba_F_.cjs");
+const require_factory = require("./factory-CmOH3Kh6.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-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory--H-amlua.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-Cdmba_F_.cjs");
+const require_factory = require("./factory-CmOH3Kh6.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-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory--H-amlua.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-Cdmba_F_.cjs");
+const require_factory = require("./factory-CmOH3Kh6.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-2tSt4Rte.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory--H-amlua.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.1",
+  "version": "0.10.0-alpha.3",
   "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",