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

package/build/plugin/esbuild.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-B49Ym3ij.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-C_-OCKcW.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-C_-OCKcW.mjs → factory-BdwLvQEp.mjs}

@@ -272,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) => {
@@ -422,7 +425,7 @@ 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))}`;
@@ -433,13 +436,23 @@ function transformDefinitionModule(s, filename, info) {
 	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 { usage } of usages) for (const access of usage.accesses) s.overwrite(access.start, access.end, `${usage.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 { usage, hocImportSource, hocExportedName } of usages) {
 		const propsUsed = new Set(usage.accesses.map((access) => access.prop));
@@ -612,8 +625,8 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 				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(),
@@ -631,13 +644,10 @@ 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) && !(info.error && isInside(info.error, access)) && !(info.content.kind === "inline" && isInside(info.content, access)));
+		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);

package/build/plugin/{factory-B49Ym3ij.cjs → factory-TMKD3PiJ.cjs}

@@ -297,6 +297,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) => {
@@ -447,7 +450,7 @@ 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 = `./${node_path.default.basename(cleanFilename, node_path.default.extname(cleanFilename))}`;
@@ -458,13 +461,23 @@ function transformDefinitionModule(s, filename, info) {
 	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 { usage } of usages) for (const access of usage.accesses) s.overwrite(access.start, access.end, `${usage.spec.localName}${access.prop}`);
+function renderInlineContent(content, usages) {
+	const s = new magic_string.default(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 { usage, hocImportSource, hocExportedName } of usages) {
 		const propsUsed = new Set(usage.accesses.map((access) => access.prop));
@@ -637,8 +650,8 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 				const verifiedUsages = await verifyUsages(this, filteredUsages, id);
 				if (!info && verifiedUsages.length === 0) return null;
 				const s = new magic_string.default(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(),
@@ -656,13 +669,10 @@ 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) && !(info.error && isInside(info.error, access)) && !(info.content.kind === "inline" && isInside(info.content, access)));
+		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);

package/build/plugin/index.cjs

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_factory = require("./factory-B49Ym3ij.cjs");
+const require_factory = require("./factory-TMKD3PiJ.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-C_-OCKcW.mjs";
+import { n as dataSourceLazyUnpluginFactory, t as DEFAULT_HOCS } from "./factory-BdwLvQEp.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-B49Ym3ij.cjs");
+const require_factory = require("./factory-TMKD3PiJ.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-C_-OCKcW.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BdwLvQEp.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-B49Ym3ij.cjs");
+const require_factory = require("./factory-TMKD3PiJ.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-C_-OCKcW.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BdwLvQEp.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-B49Ym3ij.cjs");
+const require_factory = require("./factory-TMKD3PiJ.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-C_-OCKcW.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BdwLvQEp.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-B49Ym3ij.cjs");
+const require_factory = require("./factory-TMKD3PiJ.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-C_-OCKcW.mjs";
+import { n as dataSourceLazyUnpluginFactory } from "./factory-BdwLvQEp.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.10",
+  "version": "0.10.0-alpha.11",
   "description": "A wrapper around data fetching",
   "keywords": [
     "data-fetching",