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

package/build/plugin/esbuild.cjs

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

package/build/plugin/{factory-Ds3_-8kv.mjs → factory-Dwr-yuOT.mjs}

@@ -102,7 +102,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;
@@ -128,12 +128,12 @@ 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
 			};
 		}
 	}
@@ -318,15 +318,13 @@ 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 generateAuxModule(sourceFile, exportedName, info, type, options = {}) {
 	const suffix = COMPANION_TYPES[type];
 	const cleanSourceFile = stripQuery(sourceFile);
 	const code = [
-		renderImports(auxInfo.imports),
+		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);
@@ -336,21 +334,19 @@ function generateLazyModule(sourceFile, info, options = {}) {
 	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,
@@ -431,9 +427,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`);
@@ -477,13 +475,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 = {}) => {
@@ -537,12 +542,13 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 				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;
+					return generateAuxModule(parsedId.sourceFile, info.exportedName, auxInfo, parsedId.type, options.generateOptions);
 				}
+				if (parsedId.type === "lazy") return generateLazyModule(parsedId.sourceFile, info, options.generateOptions);
+				return assertNever(parsedId.type);
 			}
 		},
 		transform: {
@@ -619,7 +625,7 @@ function isInside(info, access) {
 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)));
+		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);

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

@@ -127,7 +127,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;
@@ -153,12 +153,12 @@ 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
 			};
 		}
 	}
@@ -343,15 +343,13 @@ 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 generateAuxModule(sourceFile, exportedName, info, type, options = {}) {
 	const suffix = COMPANION_TYPES[type];
 	const cleanSourceFile = stripQuery(sourceFile);
 	const code = [
-		renderImports(auxInfo.imports),
+		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);
@@ -361,21 +359,19 @@ function generateLazyModule(sourceFile, info, options = {}) {
 	const name = info.exportedName;
 	const cleanSourceFile = stripQuery(sourceFile);
 	const base = `./${node_path.default.basename(cleanSourceFile, node_path.default.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,
@@ -456,9 +452,11 @@ function transformDefinitionModule(s, filename, info) {
 	const name = info.exportedName;
 	const cleanFilename = stripQuery(filename);
 	const localSource = `./${node_path.default.basename(cleanFilename, node_path.default.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`);
@@ -502,13 +500,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 = {}) => {
@@ -562,12 +567,13 @@ const dataSourceLazyUnpluginFactory = (options = {}) => {
 				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;
+					return generateAuxModule(parsedId.sourceFile, info.exportedName, auxInfo, parsedId.type, options.generateOptions);
 				}
+				if (parsedId.type === "lazy") return generateLazyModule(parsedId.sourceFile, info, options.generateOptions);
+				return assertNever(parsedId.type);
 			}
 		},
 		transform: {
@@ -644,7 +650,7 @@ function isInside(info, access) {
 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)));
+		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);

package/build/plugin/index.cjs

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