@statelyai/sdk 0.14.1 → 0.14.2

package/dist/sync.mjs

@@ -1,5 +1,5 @@
 import { createStatelyClient } from "./studio.mjs";
-import { d as xstateSourceToConfig, f as findStatelyPragmaAttachments, i as detectXStateSourceProfile, m as upsertStatelyPragma, p as getStatelyPragma, s as graphToXStateTS, t as INLINE_EXPRESSION_DIRECTIVE_FIELDS, u as serializeJS } from "./dist-C8jVuuHf.mjs";
+import { d as xstateSourceToConfig, f as findStatelyPragmaAttachments, i as detectXStateSourceProfile, m as upsertStatelyPragma, p as getStatelyPragma, s as graphToXStateTS, t as INLINE_EXPRESSION_DIRECTIVE_FIELDS, u as serializeJS } from "./dist-CO36Ks-i.mjs";
 import { fromStudioMachine, toStudioMachine } from "./graph.mjs";
 import * as ts$1 from "typescript";
 import ts from "typescript";
@@ -65,9 +65,35 @@ function createFileSourceDocumentResolver() {
 		resolveImport(fromDocument, specifier) {
 			const importedFileName = resolveImportPath(fromDocument.fileName, specifier);
 			return importedFileName ? readFileSnapshot(importedFileName) : null;
+		},
+		resolvePackageJson(fromDocument, packageName) {
+			let directory = path$1.dirname(path$1.resolve(fromDocument.fileName));
+			while (true) {
+				const packageJson = readFileSnapshot(path$1.join(directory, "package.json"));
+				if (packageJson && packageJsonDeclares(packageJson.text, packageName)) return packageJson;
+				const parent = path$1.dirname(directory);
+				if (parent === directory) return null;
+				directory = parent;
+			}
 		}
 	};
 }
+function packageJsonDeclares(text, packageName) {
+	try {
+		const manifest = JSON.parse(text);
+		return [
+			"dependencies",
+			"devDependencies",
+			"peerDependencies",
+			"optionalDependencies"
+		].some((field) => {
+			const dependencies = manifest[field];
+			return Boolean(dependencies && typeof dependencies === "object" && Object.prototype.hasOwnProperty.call(dependencies, packageName));
+		});
+	} catch {
+		return false;
+	}
+}
 function resolveImportPath(fromFileName, specifier) {
 	if (!specifier.startsWith(".")) return null;
 	const basePath = path$1.resolve(path$1.dirname(fromFileName), specifier);
@@ -121,20 +147,116 @@ function collectXStateSourceLocations(sourceText, document, options = {}) {
 	const states = [];
 	const statesObjectLocations = [];
 	collectStateLocations(root, [], states, statesObjectLocations, bindings, staticValues, root);
+	const packageProfile = detectXStatePackageProfile(options.resolver?.resolvePackageJson?.({
+		fileName: document.fileName,
+		uri
+	}, "xstate"));
 	const rootProfile = detectXStateSourceProfile(sourceText);
 	const referencedStateSymbols = new Set([...states, ...statesObjectLocations].map((state) => state.symbol).filter((symbol) => typeof symbol === "string"));
+	const resolvedTransitionFunctions = collectResolvedTransitionFunctions(root, bindings);
+	const inferredProfile = rootProfile === "xstate-v6-alpha" || resolvedTransitionFunctions.size > 0 || [...referencedStateSymbols].some((symbol) => detectXStateSourceProfile(bindings.get(symbol)?.sourceFile.text ?? "") === "xstate-v6-alpha") ? "xstate-v6-alpha" : rootProfile;
 	return {
 		version: 1,
-		profile: rootProfile === "xstate-v6-alpha" || [...referencedStateSymbols].some((symbol) => detectXStateSourceProfile(bindings.get(symbol)?.sourceFile.text ?? "") === "xstate-v6-alpha") ? "xstate-v6-alpha" : rootProfile,
+		profile: packageProfile ?? inferredProfile,
 		root: {
 			uri,
 			range: toSourceRange$1(sourceFile, root)
 		},
 		statesObject: statesObjectLocations[0],
 		states,
-		staticValues: collectStaticValueReferences(sourceFile, uri, root, staticValues)
+		staticValues: collectStaticValueReferences(sourceFile, uri, root, staticValues),
+		transitionFunctions: [...resolvedTransitionFunctions].flatMap(([symbol, resolved]) => resolved.binding.uri === uri ? [] : [{
+			symbol,
+			uri: resolved.binding.uri,
+			range: toSourceRange$1(resolved.binding.sourceFile, resolved.binding.node),
+			sourcePaths: resolved.sourcePaths
+		}])
 	};
 }
+function detectXStatePackageProfile(packageJson) {
+	if (!packageJson) return void 0;
+	let manifest;
+	try {
+		manifest = JSON.parse(packageJson.text);
+	} catch {
+		return;
+	}
+	const dependencyFields = [
+		"dependencies",
+		"devDependencies",
+		"peerDependencies",
+		"optionalDependencies"
+	];
+	let range;
+	for (const field of dependencyFields) {
+		const dependencies = manifest[field];
+		if (!dependencies || typeof dependencies !== "object") continue;
+		const value = dependencies.xstate;
+		if (typeof value === "string") {
+			range = value;
+			break;
+		}
+	}
+	if (!range) return void 0;
+	const clauseProfiles = range.replace(/^(?:workspace:|npm:xstate@)/, "").split("||").map((clause) => detectXStateRangeClauseProfile(clause.trim()));
+	const profiles = new Set(clauseProfiles);
+	if (profiles.size !== 1 || profiles.has(void 0)) return void 0;
+	return clauseProfiles[0];
+}
+function detectXStateRangeClauseProfile(clause) {
+	const normalizedClause = clause.replace(/([<>]=?)\s+/g, "$1");
+	let lowerRequiresV6 = false;
+	let upperRequiresV5 = false;
+	let directProfile;
+	for (const match of normalizedClause.matchAll(/(?:^|\s)([<>]=?|[~^])?v?(\d+)(?:\.(\d+|x|\*))?(?:\.(\d+|x|\*))?(?:-[0-9A-Za-z.-]+)?(?=\s|$)/g)) {
+		const operator = match[1] ?? "";
+		const major = Number(match[2]);
+		const minor = parseRangePart(match[3]);
+		const patch = parseRangePart(match[4]);
+		if (operator === ">" || operator === ">=") {
+			if (major >= 6) lowerRequiresV6 = true;
+			continue;
+		}
+		if (operator === "<") {
+			if (major < 6 || major === 6 && (minor ?? 0) === 0 && (patch ?? 0) === 0) upperRequiresV5 = true;
+			continue;
+		}
+		if (operator === "<=") {
+			if (major < 6) upperRequiresV5 = true;
+			continue;
+		}
+		const profile = major >= 6 ? "xstate-v6-alpha" : "xstate-v5";
+		if (directProfile && directProfile !== profile) return void 0;
+		directProfile = profile;
+	}
+	if (lowerRequiresV6 && upperRequiresV5) return void 0;
+	if (lowerRequiresV6) return "xstate-v6-alpha";
+	if (upperRequiresV5) return "xstate-v5";
+	return directProfile;
+}
+function parseRangePart(value) {
+	return value && /^\d+$/.test(value) ? Number(value) : void 0;
+}
+function collectImportedXStateTransitionSources(sourceText, document, options = {}) {
+	if (!options.resolver) return [];
+	const sourceFile = ts$1.createSourceFile(document.fileName, sourceText, ts$1.ScriptTarget.Latest, true, getScriptKind$2(document.fileName));
+	const uri = document.uri?.toString() ?? document.fileName;
+	sourceFileUris.set(sourceFile, uri);
+	const bindings = collectBindings(sourceFile, uri, document.fileName, options);
+	const root = findMachineConfigObjectLiteral(sourceFile, bindings);
+	if (!root) return [];
+	return [...collectResolvedTransitionFunctions(root, bindings)].flatMap(([localName, resolved]) => {
+		const { binding } = resolved;
+		if (binding.uri === uri) return [];
+		if (ts$1.isFunctionDeclaration(binding.node)) {
+			const name = binding.node.name;
+			if (!name) return [];
+			const suffix = binding.node.getText(binding.sourceFile).slice(name.getEnd() - binding.node.getStart(binding.sourceFile));
+			return [`${binding.node.modifiers?.some((modifier) => modifier.kind === ts$1.SyntaxKind.AsyncKeyword) ? "async " : ""}function ${localName}${suffix}`];
+		}
+		return [`const ${localName} = ${binding.node.getText(binding.sourceFile)};`];
+	});
+}
 function collectStaticValueBindings(sourceFile) {
 	const bindings = /* @__PURE__ */ new Map();
 	for (const statement of sourceFile.statements) {
@@ -180,9 +302,30 @@ function collectBindings(sourceFile, uri, fileName, options, cache = /* @__PURE_
 function collectTopLevelBindings(sourceFile, uri) {
 	const bindings = /* @__PURE__ */ new Map();
 	for (const statement of sourceFile.statements) {
+		if (ts$1.isFunctionDeclaration(statement) && statement.name) {
+			bindings.set(statement.name.text, {
+				kind: "transitionFunction",
+				node: statement,
+				sourceFile,
+				uri,
+				bindings
+			});
+			continue;
+		}
 		if (!ts$1.isVariableStatement(statement)) continue;
 		for (const declaration of statement.declarationList.declarations) {
 			if (!ts$1.isIdentifier(declaration.name) || !declaration.initializer) continue;
+			const initializer = unwrapExpression$1(declaration.initializer);
+			if (ts$1.isArrowFunction(initializer) || ts$1.isFunctionExpression(initializer)) {
+				bindings.set(declaration.name.text, {
+					kind: "transitionFunction",
+					node: initializer,
+					sourceFile,
+					uri,
+					bindings
+				});
+				continue;
+			}
 			const objectLiteral = unwrapObjectLiteralExpression(declaration.initializer);
 			if (objectLiteral) {
 				bindings.set(declaration.name.text, {
@@ -228,6 +371,62 @@ function addImportedBindings(bindings, sourceFile, uri, fileName, options, cache
 		}
 	}
 }
+function collectResolvedTransitionFunctions(root, bindings) {
+	const found = /* @__PURE__ */ new Map();
+	const visitExpression = (expression, sourcePath) => {
+		const current = unwrapExpression$1(expression);
+		if (ts$1.isIdentifier(current)) {
+			const binding = bindings.get(current.text);
+			if (binding?.kind === "transitionFunction") {
+				const resolved = found.get(current.text) ?? {
+					binding,
+					sourcePaths: []
+				};
+				if (!resolved.sourcePaths.some((existing) => existing.length === sourcePath.length && existing.every((segment, index) => segment === sourcePath[index]))) resolved.sourcePaths.push(sourcePath);
+				found.set(current.text, resolved);
+			}
+			return;
+		}
+		if (ts$1.isObjectLiteralExpression(current)) {
+			for (const property of current.properties) if (ts$1.isPropertyAssignment(property)) visitExpression(property.initializer, sourcePath);
+			else if (ts$1.isShorthandPropertyAssignment(property)) visitExpression(property.name, sourcePath);
+			else if (ts$1.isSpreadAssignment(property)) visitExpression(property.expression, sourcePath);
+			return;
+		}
+		if (ts$1.isArrayLiteralExpression(current)) {
+			for (const element of current.elements) if (ts$1.isExpression(element)) visitExpression(element, sourcePath);
+			return;
+		}
+		ts$1.forEachChild(current, (child) => {
+			if (ts$1.isExpression(child)) visitExpression(child, sourcePath);
+		});
+	};
+	const visitState = (state, sourcePath) => {
+		for (const propertyName of [
+			"on",
+			"after",
+			"always",
+			"onDone",
+			"onError",
+			"onSnapshot",
+			"onTimeout"
+		]) {
+			const property = state.properties.find((candidate) => ts$1.isPropertyAssignment(candidate) && getPropertyNameText$1(candidate.name) === propertyName);
+			if (property) visitExpression(property.initializer, sourcePath);
+		}
+		const states = state.properties.find((candidate) => ts$1.isPropertyAssignment(candidate) && getPropertyNameText$1(candidate.name) === "states");
+		const statesObject = states && unwrapObjectLiteralExpression(states.initializer);
+		if (!statesObject) return;
+		for (const property of statesObject.properties) {
+			if (!ts$1.isPropertyAssignment(property)) continue;
+			const child = unwrapObjectLiteralExpression(property.initializer);
+			const key = getPropertyNameText$1(property.name);
+			if (child && key) visitState(child, [...sourcePath, key]);
+		}
+	};
+	visitState(root, []);
+	return found;
+}
 function findMachineConfigObjectLiteral(sourceFile, bindings) {
 	let found = null;
 	const visit = (node) => {
@@ -276,7 +475,7 @@ function collectStateLocations(stateObject, parentPath, locations, statesObjectL
 function resolveStateProperty(property, bindings, staticValues, root) {
 	if (ts$1.isShorthandPropertyAssignment(property)) {
 		const binding = bindings.get(property.name.text);
-		if (!binding) return null;
+		if (!binding || binding.kind === "transitionFunction") return null;
 		return {
 			key: property.name.text,
 			kind: binding.kind,
@@ -306,7 +505,7 @@ function resolveStateProperty(property, bindings, staticValues, root) {
 	};
 	if (ts$1.isIdentifier(property.initializer)) {
 		const binding = bindings.get(property.initializer.text);
-		if (!binding) return null;
+		if (!binding || binding.kind === "transitionFunction") return null;
 		return {
 			key: resolvedKey.key,
 			kind: binding.kind,
@@ -584,10 +783,13 @@ function parseSourceToMachine(text, document, options = {}) {
 		...statesObjectReplacements,
 		...importReplacements
 	].filter(removeOverlappingRanges).sort(compareSourceRangesDescending));
-	if (sourceLocations.profile === "xstate-v6-alpha") return `import { createMachine } from "xstate";
+	if (sourceLocations.profile === "xstate-v6-alpha") {
+		const importedTransitionSources = collectImportedXStateTransitionSources(text, document, options);
+		return `import { createMachine } from "xstate";
 
-export const machine = createMachine(${serializeJS(xstateSourceToConfig(hydratedText, { profile: "xstate-v6-alpha" }), 0)});
+export const machine = createMachine(${serializeJS(xstateSourceToConfig(importedTransitionSources.length ? `${hydratedText}\n${importedTransitionSources.join("\n")}` : hydratedText, { profile: "xstate-v6-alpha" }), 0)});
 `;
+	}
 	return hydratedText;
 }
 function readHydratedStatesObject(uri, range, states, resolver) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statelyai/sdk",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "license": "MIT",
   "files": [
     "dist",
@@ -81,7 +81,7 @@
     "tsdown": "0.21.0-beta.2",
     "vitest": "^3.2.4",
     "ws": "^8.19.0",
-    "@statelyai/graph-tools": "0.0.6"
+    "@statelyai/graph-tools": "0.0.7"
   },
   "scripts": {
     "build": "tsdown",