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

package/build/plugin/esbuild.cjs

@@ -1,4 +1,4 @@
-const require_factory = require("./factory-CIwgQy1N.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-C-n_7Tjo.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-CIwgQy1N.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);
@@ -461,9 +469,9 @@ function transformDefinitionModule(s, filename, info) {
 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}`);
 	const newImports = [];
-	for (const { usage, hocSourceFile, hocExportedName } of usages) {
+	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], hocSourceFile)));
+		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();
@@ -605,7 +613,7 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 					if (!target) return null;
 					return {
 						usage,
-						hocSourceFile: target.file,
+						hocImportSource: toRelativeImportSource(id, target.file),
 						hocExportedName: target.info.exportedName
 					};
 				}))).filter((usage) => usage !== null);

package/build/plugin/{factory-C-n_7Tjo.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);
@@ -436,9 +444,9 @@ function transformDefinitionModule(s, filename, info) {
 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}`);
 	const newImports = [];
-	for (const { usage, hocSourceFile, hocExportedName } of usages) {
+	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], hocSourceFile)));
+		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();
@@ -580,7 +588,7 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 					if (!target) return null;
 					return {
 						usage,
-						hocSourceFile: target.file,
+						hocImportSource: toRelativeImportSource(id, target.file),
 						hocExportedName: target.info.exportedName
 					};
 				}))).filter((usage) => usage !== null);

package/build/plugin/index.cjs

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_factory = require("./factory-CIwgQy1N.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-C-n_7Tjo.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-CIwgQy1N.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-C-n_7Tjo.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-CIwgQy1N.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-C-n_7Tjo.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-CIwgQy1N.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-C-n_7Tjo.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-CIwgQy1N.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-C-n_7Tjo.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.6",
+  "version": "0.10.0-alpha.7",
   "description": "A wrapper around data fetching",
   "keywords": [
     "data-fetching",