@suspensive/codemods 3.21.1 → 4.0.0-next.1

package/dist/bin/codemods.cjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
-const require_transformRunner = require("./transformRunner-CuvDQucY.cjs");
+const require_transformRunner = require("./transformRunner-Bm8Ge6Vu.cjs");
 let _commander_js_extra_typings = require("@commander-js/extra-typings");
 //#region package.json
 var name = "@suspensive/codemods";
-var version = "3.21.1";
+var version = "4.0.0-next.1";
 var description = "Codemods for @suspensive.";
 //#endregion
 //#region src/bin/codemods.ts

package/dist/bin/{transformRunner-CuvDQucY.cjs → transformRunner-Bm8Ge6Vu.cjs}

@@ -27,6 +27,10 @@ let prompts = require("prompts");
 prompts = __toESM(prompts, 1);
 //#region src/bin/transformRunner.ts
 const TRANSFORMER_INQUIRER_CHOICES = [
+	{
+		title: "migrate-to-v4",
+		description: "Migrates Suspensive v3 APIs to v4"
+	},
 	{
 		title: "tanstack-query-import",
 		description: "Migrate imports to @tanstack/react-query in @suspensive/react-query"

package/dist/bin/transformRunner.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_transformRunner = require("./transformRunner-CuvDQucY.cjs");
+const require_transformRunner = require("./transformRunner-Bm8Ge6Vu.cjs");
 exports.jscodeshiftExecutable = require_transformRunner.jscodeshiftExecutable;
 exports.transformRunner = require_transformRunner.transformRunner;
 exports.transformerDirectory = require_transformRunner.transformerDirectory;

package/dist/bin/transformRunner.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"transformRunner.d.cts","names":[],"sources":["../../src/bin/transformRunner.ts"],"mappings":";cA2Ba,qBAAA;AAAA,cACA,oBAAA;AAAA,iBAES,eAAA,CAAgB,SAAA,WAAoB,IAAA,WAAe,OAAA;EAAY,GAAA;EAAe,KAAA;AAAA,IAAiB,OAAA"}
+{"version":3,"file":"transformRunner.d.cts","names":[],"sources":["../../src/bin/transformRunner.ts"],"mappings":";cA+Ba,qBAAA;AAAA,cACA,oBAAA;AAAA,iBAES,eAAA,CAAgB,SAAA,WAAoB,IAAA,WAAe,OAAA;EAAY,GAAA;EAAe,KAAA;AAAA,IAAiB,OAAA"}

package/dist/transforms/{createParserFromPath-B3qLmOmq.cjs → createParserFromPath-7qRmKnCS.cjs}

@@ -35,6 +35,12 @@ function createParserFromPath(filePath) {
 	return /\.[mc]?ts$/.test(filePath) ? jscodeshift.default.withParser("ts") : jscodeshift.default.withParser("tsx");
 }
 //#endregion
+Object.defineProperty(exports, "__toESM", {
+	enumerable: true,
+	get: function() {
+		return __toESM;
+	}
+});
 Object.defineProperty(exports, "createParserFromPath", {
 	enumerable: true,
 	get: function() {

package/dist/transforms/migrate-query-client-consumer-props.cjs

@@ -1,4 +1,4 @@
-const require_createParserFromPath = require("./createParserFromPath-B3qLmOmq.cjs");
+const require_createParserFromPath = require("./createParserFromPath-7qRmKnCS.cjs");
 //#region src/transforms/migrate-query-client-consumer-props.ts
 function transform(file) {
 	const j = require_createParserFromPath.createParserFromPath(file.path);

package/dist/transforms/migrate-query-client-consumer-props.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-query-client-consumer-props.d.cts","names":[],"sources":["../../src/transforms/migrate-query-client-consumer-props.ts"],"mappings":";;;iBAGwB,SAAA,CAAU,IAAA,EAAM,QAAA;AAAA"}
+{"version":3,"file":"migrate-query-client-consumer-props.d.cts","names":[],"sources":["../../src/transforms/migrate-query-client-consumer-props.ts"],"mappings":";;;iBAGwB,SAAA,CAAU,IAAc,EAAR,QAAQ;AAAA"}

package/dist/transforms/migrate-to-v4.cjs

@@ -0,0 +1,156 @@
+const require_createParserFromPath = require("./createParserFromPath-7qRmKnCS.cjs");
+let node_fs = require("node:fs");
+let node_path = require("node:path");
+//#region src/transforms/utils/detectTanStackVersion.ts
+const DEFAULT_VERSION = 5;
+let cachedVersion;
+function detectTanStackVersion(startDir = process.cwd()) {
+	const override = Number(process.env.SUSPENSIVE_RQ_TARGET);
+	if (!isNaN(override)) return override;
+	if (cachedVersion !== void 0) return cachedVersion;
+	const range = findTanStackRange(startDir);
+	if (range === void 0) {
+		console.warn(`Could not detect @tanstack/react-query version from package.json. Defaulting to v${DEFAULT_VERSION}.`);
+		cachedVersion = DEFAULT_VERSION;
+		return cachedVersion;
+	}
+	const major = parseMajor(range);
+	if (major === void 0) {
+		console.warn(`Could not parse major version from @tanstack/react-query range "${range}". Defaulting to v${DEFAULT_VERSION}.`);
+		cachedVersion = DEFAULT_VERSION;
+		return cachedVersion;
+	}
+	cachedVersion = major;
+	return cachedVersion;
+}
+function findTanStackRange(startDir) {
+	let current = startDir;
+	let parent = (0, node_path.dirname)(current);
+	while (parent !== current) {
+		const pkgPath = (0, node_path.join)(current, "package.json");
+		if ((0, node_fs.existsSync)(pkgPath)) try {
+			const raw = (0, node_fs.readFileSync)(pkgPath, "utf8");
+			const pkg = JSON.parse(raw);
+			const range = pkg.dependencies?.["@tanstack/react-query"] ?? pkg.devDependencies?.["@tanstack/react-query"] ?? pkg.peerDependencies?.["@tanstack/react-query"];
+			if (range) return range;
+		} catch {}
+		current = parent;
+		parent = (0, node_path.dirname)(current);
+	}
+}
+function parseMajor(range) {
+	const match = /(\d+)/.exec(range);
+	if (!match) return;
+	const n = Number(match[1]);
+	if (Number.isInteger(n)) return n;
+}
+//#endregion
+//#region src/transforms/migrate-to-v4.ts
+const UNVERSIONED_SOURCE = "@suspensive/react-query";
+const SOURCE_PATTERN = /^@suspensive\/react-query(-\d+)?$/;
+const TANSTACK_TARGET = "@tanstack/react-query";
+const TANSTACK_APIS = [
+	"useSuspenseQuery",
+	"UseSuspenseQueryResult",
+	"UseSuspenseQueryOptions",
+	"useSuspenseQueries",
+	"SuspenseQueriesResults",
+	"SuspenseQueriesOptions",
+	"useSuspenseInfiniteQuery",
+	"UseSuspenseInfiniteQueryResult",
+	"UseSuspenseInfiniteQueryOptions",
+	"usePrefetchQuery",
+	"usePrefetchInfiniteQuery",
+	"queryOptions",
+	"infiniteQueryOptions",
+	"mutationOptions"
+];
+const DEPRECATED_REMOVED = [
+	"SelectedInfiniteOptions",
+	"UnSelectedInfiniteOptions",
+	"SelectedQueryOptions",
+	"UnSelectedQueryOptions"
+];
+function transform(file) {
+	const j = require_createParserFromPath.createParserFromPath(file.path);
+	const root = j(file.source);
+	const versionedTarget = `@suspensive/react-query-${detectTanStackVersion()}`;
+	const resolveSuspensiveTarget = (currentSource) => currentSource === UNVERSIONED_SOURCE ? versionedTarget : currentSource;
+	root.find(j.ImportDeclaration, { source: { value: (v) => SOURCE_PATTERN.test(v) } }).forEach((path) => {
+		const specifiers = path.node.specifiers ?? [];
+		const importKind = path.node.importKind;
+		const currentSource = path.node.source.value;
+		const suspensiveTarget = resolveSuspensiveTarget(currentSource);
+		if (specifiers.length === 0) {
+			if (currentSource !== suspensiveTarget) path.node.source = j.stringLiteral(suspensiveTarget);
+			return;
+		}
+		if (specifiers.some((s) => s.type === "ImportNamespaceSpecifier" || s.type === "ImportDefaultSpecifier")) {
+			if (currentSource !== suspensiveTarget) path.node.source = j.stringLiteral(suspensiveTarget);
+			return;
+		}
+		const tanstackSpecifiers = [];
+		const suspensiveSpecifiers = [];
+		for (const spec of specifiers) {
+			if (spec.type !== "ImportSpecifier") continue;
+			const name = spec.imported.name;
+			if (DEPRECATED_REMOVED.includes(name)) continue;
+			if (TANSTACK_APIS.includes(name)) tanstackSpecifiers.push(spec);
+			else suspensiveSpecifiers.push(spec);
+		}
+		if (tanstackSpecifiers.length === 0 && suspensiveSpecifiers.length === specifiers.length) {
+			if (currentSource !== suspensiveTarget) path.node.source = j.stringLiteral(suspensiveTarget);
+			return;
+		}
+		if (tanstackSpecifiers.length > 0) {
+			const tanstackDecl = j.importDeclaration(tanstackSpecifiers, j.stringLiteral(TANSTACK_TARGET));
+			if (importKind === "type") tanstackDecl.importKind = "type";
+			path.insertBefore(tanstackDecl);
+		}
+		if (suspensiveSpecifiers.length > 0) {
+			const suspensiveDecl = j.importDeclaration(suspensiveSpecifiers, j.stringLiteral(suspensiveTarget));
+			if (importKind === "type") suspensiveDecl.importKind = "type";
+			path.insertBefore(suspensiveDecl);
+		}
+		j(path).remove();
+	});
+	root.find(j.ExportNamedDeclaration, { source: { value: (v) => SOURCE_PATTERN.test(v) } }).forEach((path) => {
+		const specifiers = path.node.specifiers;
+		const currentSource = path.node.source?.value;
+		if (!currentSource) return;
+		const suspensiveTarget = resolveSuspensiveTarget(currentSource);
+		if (!specifiers || specifiers.length === 0) {
+			if (currentSource !== suspensiveTarget) path.node.source = j.stringLiteral(suspensiveTarget);
+			return;
+		}
+		const tanstackSpecifiers = [];
+		const suspensiveSpecifiers = [];
+		for (const spec of specifiers) {
+			const localName = spec.local?.name ?? "";
+			if (DEPRECATED_REMOVED.includes(localName)) continue;
+			if (TANSTACK_APIS.includes(localName)) tanstackSpecifiers.push(spec);
+			else suspensiveSpecifiers.push(spec);
+		}
+		if (tanstackSpecifiers.length === 0 && suspensiveSpecifiers.length === specifiers.length) {
+			if (currentSource !== suspensiveTarget) path.node.source = j.stringLiteral(suspensiveTarget);
+			return;
+		}
+		if (tanstackSpecifiers.length > 0) {
+			const tanstackDecl = j.exportNamedDeclaration(null, tanstackSpecifiers, j.stringLiteral(TANSTACK_TARGET));
+			path.insertBefore(tanstackDecl);
+		}
+		if (suspensiveSpecifiers.length > 0) {
+			const suspensiveDecl = j.exportNamedDeclaration(null, suspensiveSpecifiers, j.stringLiteral(suspensiveTarget));
+			path.insertBefore(suspensiveDecl);
+		}
+		j(path).remove();
+	});
+	root.find(j.ExportAllDeclaration, { source: { value: (v) => SOURCE_PATTERN.test(v) } }).forEach((path) => {
+		const currentSource = path.node.source.value;
+		const suspensiveTarget = resolveSuspensiveTarget(currentSource);
+		if (currentSource !== suspensiveTarget) path.node.source = j.stringLiteral(suspensiveTarget);
+	});
+	return root.toSource();
+}
+//#endregion
+module.exports = transform;

package/dist/transforms/migrate-to-v4.d.cts

@@ -0,0 +1,6 @@
+import { FileInfo } from "jscodeshift";
+
+//#region src/transforms/migrate-to-v4.d.ts
+declare function transform(file: FileInfo): string;
+export = transform;
+//# sourceMappingURL=migrate-to-v4.d.cts.map

package/dist/transforms/migrate-to-v4.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-to-v4.d.cts","names":[],"sources":["../../src/transforms/migrate-to-v4.ts"],"mappings":";;;iBAgCwB,SAAA,CAAU,IAAc,EAAR,QAAQ;AAAA"}

package/dist/transforms/migrate-with-api.cjs

@@ -1,4 +1,4 @@
-const require_createParserFromPath = require("./createParserFromPath-B3qLmOmq.cjs");
+const require_createParserFromPath = require("./createParserFromPath-7qRmKnCS.cjs");
 //#region src/transforms/migrate-with-api.ts
 function transformer(file) {
 	const j = require_createParserFromPath.createParserFromPath(file.path);

package/dist/transforms/migrate-with-api.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-with-api.d.cts","names":[],"sources":["../../src/transforms/migrate-with-api.ts"],"mappings":";;;iBAGwB,WAAA,CAAY,IAAA,EAAM,QAAA;AAAA"}
+{"version":3,"file":"migrate-with-api.d.cts","names":[],"sources":["../../src/transforms/migrate-with-api.ts"],"mappings":";;;iBAGwB,WAAA,CAAY,IAAc,EAAR,QAAQ;AAAA"}

package/dist/transforms/remove-networkmode.cjs

@@ -1,4 +1,4 @@
-const require_createParserFromPath = require("./createParserFromPath-B3qLmOmq.cjs");
+const require_createParserFromPath = require("./createParserFromPath-7qRmKnCS.cjs");
 //#region src/transforms/remove-networkmode.ts
 const TARGET_FUNCTIONS = new Set([
 	"queryOptions",

package/dist/transforms/remove-networkmode.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-networkmode.d.cts","names":[],"sources":["../../src/transforms/remove-networkmode.ts"],"mappings":";;;iBAYwB,SAAA,CAAU,IAAA,EAAM,QAAA;AAAA"}
+{"version":3,"file":"remove-networkmode.d.cts","names":[],"sources":["../../src/transforms/remove-networkmode.ts"],"mappings":";;;iBAYwB,SAAA,CAAU,IAAc,EAAR,QAAQ;AAAA"}

package/dist/transforms/tanstack-query-import.cjs

@@ -1,6 +1,6 @@
-const require_createParserFromPath = require("./createParserFromPath-B3qLmOmq.cjs");
+const require_createParserFromPath = require("./createParserFromPath-7qRmKnCS.cjs");
 //#region src/transforms/tanstack-query-import.ts
-const IMPORT_TO_CHANGE = [
+const TANSTACK_APIS = [
 	"useSuspenseQuery",
 	"UseSuspenseQueryResult",
 	"UseSuspenseQueryOptions",
@@ -11,8 +11,10 @@ const IMPORT_TO_CHANGE = [
 	"UseSuspenseInfiniteQueryResult",
 	"UseSuspenseInfiniteQueryOptions",
 	"usePrefetchQuery",
+	"usePrefetchInfiniteQuery",
 	"queryOptions",
-	"infiniteQueryOptions"
+	"infiniteQueryOptions",
+	"mutationOptions"
 ];
 const REMOVE_DEPRECATED_IMPORTS = [
 	"SelectedInfiniteOptions",
@@ -20,39 +22,55 @@ const REMOVE_DEPRECATED_IMPORTS = [
 	"SelectedQueryOptions",
 	"UnSelectedQueryOptions"
 ];
+const SUSPENSIVE_SOURCE_PATTERN = /^@suspensive\/react-query(-\d+)?$/;
+function getClassificationName(specifier) {
+	return specifier.imported.name;
+}
 function transform(file) {
 	const j = require_createParserFromPath.createParserFromPath(file.path);
 	const root = j(file.source);
-	root.find(j.ImportDeclaration, { source: { value: (v) => /^@suspensive\/react-query(-\d+)?$/.test(v) } }).forEach((path) => {
+	root.find(j.ImportDeclaration, { source: { value: (v) => SUSPENSIVE_SOURCE_PATTERN.test(v) } }).forEach((path) => {
 		const importSpecifiers = path.node.specifiers || [];
-		const importNamesToChange = importSpecifiers.filter((specifier) => IMPORT_TO_CHANGE.includes(specifier.local?.name ?? ""));
-		const importsNamesRemained = importSpecifiers.filter((specifier) => !IMPORT_TO_CHANGE.includes(specifier.local?.name ?? "") && !REMOVE_DEPRECATED_IMPORTS.includes(specifier.local?.name ?? ""));
+		const importKind = path.node.importKind;
+		const importNamesToChange = [];
+		const importsNamesRemained = [];
+		for (const specifier of importSpecifiers) {
+			if (specifier.type !== "ImportSpecifier") {
+				importsNamesRemained.push(specifier);
+				continue;
+			}
+			const name = getClassificationName(specifier);
+			if (TANSTACK_APIS.includes(name)) importNamesToChange.push(specifier);
+			else if (!REMOVE_DEPRECATED_IMPORTS.includes(name)) importsNamesRemained.push(specifier);
+		}
 		if (importNamesToChange.length > 0) {
 			const newImportStatement = j.importDeclaration(importNamesToChange, j.stringLiteral("@tanstack/react-query"));
+			if (importKind === "type") newImportStatement.importKind = "type";
 			path.insertBefore(newImportStatement);
 		}
 		if (importsNamesRemained.length > 0) {
-			const remainingSpecifiers = importSpecifiers.filter((specifier) => !IMPORT_TO_CHANGE.includes(specifier.local?.name ?? ""));
-			const suspensiveRemainImportsStatement = j.importDeclaration(remainingSpecifiers, j.stringLiteral(path.node.source.value || "@suspensive/react-query"));
+			const suspensiveRemainImportsStatement = j.importDeclaration(importsNamesRemained, j.stringLiteral(path.node.source.value || "@suspensive/react-query"));
+			if (importKind === "type") suspensiveRemainImportsStatement.importKind = "type";
 			path.insertBefore(suspensiveRemainImportsStatement);
 		}
 		j(path).remove();
 	});
 	root.find(j.ExportNamedDeclaration).forEach((path) => {
-		if (path.node.specifiers) {
-			const exportSpecifiers = path.node.specifiers;
-			const exportNamesToChange = exportSpecifiers.filter((specifier) => IMPORT_TO_CHANGE.includes(specifier.local?.name ?? ""));
-			const exportNamesRemained = exportSpecifiers.filter((specifier) => !IMPORT_TO_CHANGE.includes(specifier.local?.name ?? "") && !REMOVE_DEPRECATED_IMPORTS.includes(specifier.local?.name ?? ""));
-			if (exportNamesToChange.length > 0) {
-				const newExportStatement = j.exportNamedDeclaration(null, exportNamesToChange);
-				path.insertBefore(newExportStatement);
-			}
-			if (exportNamesRemained.length > 0) {
-				const remainingExportStatement = j.exportNamedDeclaration(null, exportNamesRemained);
-				path.insertBefore(remainingExportStatement);
-			}
-			j(path).remove();
+		if (!path.node.specifiers) return;
+		const exportSpecifiers = path.node.specifiers;
+		const originalSource = path.node.source;
+		const exportNamesToChange = exportSpecifiers.filter((specifier) => TANSTACK_APIS.includes(specifier.local?.name ?? ""));
+		const exportNamesRemained = exportSpecifiers.filter((specifier) => !TANSTACK_APIS.includes(specifier.local?.name ?? "") && !REMOVE_DEPRECATED_IMPORTS.includes(specifier.local?.name ?? ""));
+		if (exportNamesToChange.length > 0) {
+			const targetSource = originalSource && SUSPENSIVE_SOURCE_PATTERN.test(originalSource.value) ? j.stringLiteral("@tanstack/react-query") : originalSource;
+			const newExportStatement = j.exportNamedDeclaration(null, exportNamesToChange, targetSource);
+			path.insertBefore(newExportStatement);
+		}
+		if (exportNamesRemained.length > 0) {
+			const remainingExportStatement = j.exportNamedDeclaration(null, exportNamesRemained, originalSource);
+			path.insertBefore(remainingExportStatement);
 		}
+		j(path).remove();
 	});
 	REMOVE_DEPRECATED_IMPORTS.forEach((deprecatedType) => {
 		root.find(j.TSTypeReference, { typeName: { name: deprecatedType } }).remove();

package/dist/transforms/tanstack-query-import.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"tanstack-query-import.d.cts","names":[],"sources":["../../src/transforms/tanstack-query-import.ts"],"mappings":";;;iBAyBwB,SAAA,CAAU,IAAA,EAAM,QAAA;AAAA"}
+{"version":3,"file":"tanstack-query-import.d.cts","names":[],"sources":["../../src/transforms/tanstack-query-import.ts"],"mappings":";;;iBAiCwB,SAAA,CAAU,IAAc,EAAR,QAAQ;AAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/codemods",
-  "version": "3.21.1",
+  "version": "4.0.0-next.1",
   "description": "Codemods for @suspensive.",
   "keywords": [
     "suspensive",