@effect/tsgo 0.0.20 → 0.1.1

package/README.md

@@ -1,6 +1,6 @@
 # Effect Language Service (TypeScript-Go)
 
-A wrapper around [TypeScript-Go](https://github.com/nicolo-ribaudo/TypeScript-Go) that builds the Effect Language Service, providing Effect-TS diagnostics and quick fixes. 
+A wrapper around [TypeScript-Go](https://github.com/nicolo-ribaudo/TypeScript-Go) that builds the Effect Language Service, providing Effect-TS diagnostics and quick fixes.
 This project targets **Effect V4** (codename: "smol") primarily and also Effect V3.
 
 ## Currently in Alpha
@@ -21,6 +21,9 @@ This will guide you through the installation process, which includes:
 3. Adjusting plugin options to your preference.
 4. Hinting at any additional editor configuration needed to ensure the LSP is active.
 
+> [!NOTE]
+> At the moment, you still need the standard native TypeScript install (`@typescript/native-preview`) alongside `@effect/tsgo`.
+
 ## Diagnostic Status
 
 Some diagnostics are off by default or have a default severity of suggestion, but you can always enable them or change their default severity in the plugin options.
@@ -58,7 +61,7 @@ Some diagnostics are off by default or have a default severity of suggestion, bu
     <tr><td><code>leakingRequirements</code></td><td>💡</td><td></td><td>Detects implementation services leaked in service methods</td><td>✓</td><td>✓</td></tr>
     <tr><td><code>multipleEffectProvide</code></td><td>⚠️</td><td>🔧</td><td>Warns against chaining Effect.provide calls which can cause service lifecycle issues</td><td>✓</td><td>✓</td></tr>
     <tr><td><code>returnEffectInGen</code></td><td>💡</td><td>🔧</td><td>Warns when returning an Effect in a generator causes nested Effect&lt;Effect&lt;...&gt;&gt;</td><td>✓</td><td>✓</td></tr>
-    <tr><td><code>runEffectInsideEffect</code></td><td>💡</td><td>🔧</td><td>Suggests using Runtime methods instead of Effect.run* inside Effect contexts</td><td>✓</td><td></td></tr>
+    <tr><td><code>runEffectInsideEffect</code></td><td>💡</td><td>🔧</td><td>Suggests using Runtime or Effect.run*With methods instead of Effect.run* inside Effect contexts</td><td>✓</td><td>✓</td></tr>
     <tr><td><code>schemaSyncInEffect</code></td><td>💡</td><td></td><td>Suggests using Effect-based Schema methods instead of sync methods inside Effect generators</td><td>✓</td><td></td></tr>
     <tr><td><code>scopeInLayerEffect</code></td><td>⚠️</td><td>🔧</td><td>Suggests using Layer.scoped instead of Layer.effect when Scope is in requirements</td><td>✓</td><td></td></tr>
     <tr><td><code>strictEffectProvide</code></td><td>➖</td><td></td><td>Warns when using Effect.provide with layers outside of application entry points</td><td>✓</td><td>✓</td></tr>

package/dist/effect-tsgo.js

@@ -3910,6 +3910,39 @@ const getFailure$1 = getFailure$2;
 */
 const getOrElse$1 = /* @__PURE__ */ dual(2, (self, onNone) => isNone(self) ? onNone() : self.value);
 /**
+* Returns the fallback `Option` if `self` is `None`; otherwise returns `self`.
+*
+* **When to use**
+*
+* - Chaining fallback `Option` computations
+* - Building priority chains of optional values
+*
+* **Behavior**
+*
+* - `Some` → returns `self` unchanged
+* - `None` → evaluates and returns `that()`
+* - `that` is lazily evaluated
+*
+* **Example** (Providing a fallback Option)
+*
+* ```ts
+* import { Option } from "effect"
+*
+* console.log(Option.none().pipe(Option.orElse(() => Option.some("b"))))
+* // Output: { _id: 'Option', _tag: 'Some', value: 'b' }
+*
+* console.log(Option.some("a").pipe(Option.orElse(() => Option.some("b"))))
+* // Output: { _id: 'Option', _tag: 'Some', value: 'a' }
+* ```
+*
+* @see {@link orElseSome} to wrap the fallback value in `Some` automatically
+* @see {@link firstSomeOf} to pick the first `Some` from a collection
+*
+* @category Error handling
+* @since 2.0.0
+*/
+const orElse = /* @__PURE__ */ dual(2, (self, that) => isNone(self) ? that() : self);
+/**
 * Converts a nullable value (`null` or `undefined`) into an `Option`.
 *
 * **When to use**
@@ -197344,14 +197377,16 @@ var FileReadError = class extends TaggedError("FileReadError") {
 //#endregion
 //#region package.json
 var name = "@effect/tsgo";
-var version = "0.0.20";
+var version = "0.1.1";
 
 //#endregion
 //#region src/setup/consts.ts
 const LSP_PACKAGE_NAME = name;
 const LSP_PLUGIN_NAME = "@effect/language-service";
+const NATIVE_PREVIEW_PACKAGE_NAME = "@typescript/native-preview";
 const PATCH_COMMAND = "effect-tsgo patch";
 const DEFAULT_LSP_VERSION = version;
+const DEFAULT_NATIVE_PREVIEW_VERSION = "latest";
 const TSCONFIG_SCHEMA_URL = "https://raw.githubusercontent.com/Effect-TS/tsgo/refs/heads/main/schema.json";
 
 //#endregion
@@ -197396,15 +197431,19 @@ const createAssessmentInput = (currentDir, tsconfigInput) => gen(function* () {
 const assessPackageJson = (input) => {
 	const sourceFile = import_typescript.parseJsonText(input.fileName, input.text);
 	const parsed = import_typescript.convertToObject(sourceFile, []);
-	let lspVersion = none$3();
-	if (LSP_PACKAGE_NAME in (parsed.devDependencies ?? {})) lspVersion = some({
-		dependencyType: "devDependencies",
-		version: parsed.devDependencies[LSP_PACKAGE_NAME]
-	});
-	else if (LSP_PACKAGE_NAME in (parsed.dependencies ?? {})) lspVersion = some({
-		dependencyType: "dependencies",
-		version: parsed.dependencies[LSP_PACKAGE_NAME]
-	});
+	const assessDependency = (packageName) => {
+		if (packageName in (parsed.devDependencies ?? {})) return some({
+			dependencyType: "devDependencies",
+			version: parsed.devDependencies[packageName]
+		});
+		if (packageName in (parsed.dependencies ?? {})) return some({
+			dependencyType: "dependencies",
+			version: parsed.dependencies[packageName]
+		});
+		return none$3();
+	};
+	const lspVersion = assessDependency(LSP_PACKAGE_NAME);
+	const nativePreviewVersion = assessDependency(NATIVE_PREVIEW_PACKAGE_NAME);
 	const prepareScript = "prepare" in (parsed.scripts ?? {}) ? some({
 		script: parsed.scripts.prepare,
 		hasPatch: parsed.scripts.prepare.toLowerCase().includes(PATCH_COMMAND)
@@ -197415,6 +197454,7 @@ const assessPackageJson = (input) => {
 		parsed,
 		text: input.text,
 		lspVersion,
+		nativePreviewVersion,
 		prepareScript
 	};
 };
@@ -197685,6 +197725,25 @@ function insertNodeAtEndOfList(tracker, sourceFile, nodeArray, newNode) {
 		tracker.insertNodeAt(sourceFile, lastElement.end, newNode, { prefix: ",\n" });
 	}
 }
+function findDependencyCollectionProperty(rootObj, dependencyType) {
+	return findPropertyInObject(rootObj, dependencyType);
+}
+function upsertDependency(tracker, sourceFile, rootObj, dependencyName, dependency) {
+	const depsProperty = findDependencyCollectionProperty(rootObj, dependency.dependencyType);
+	if (!depsProperty) {
+		const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(dependency.dependencyType), import_typescript.factory.createObjectLiteralExpression([import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(dependencyName), import_typescript.factory.createStringLiteral(dependency.version))], false));
+		insertNodeAtEndOfList(tracker, sourceFile, rootObj.properties, newDepsProp);
+		return;
+	}
+	if (!import_typescript.isObjectLiteralExpression(depsProperty.initializer)) return;
+	const existingProperty = findPropertyInObject(depsProperty.initializer, dependencyName);
+	if (!existingProperty) {
+		const newDepProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(dependencyName), import_typescript.factory.createStringLiteral(dependency.version));
+		insertNodeAtEndOfList(tracker, sourceFile, depsProperty.initializer.properties, newDepProp);
+		return;
+	}
+	if (import_typescript.isStringLiteral(existingProperty.initializer) && existingProperty.initializer.text !== dependency.version) tracker.replaceNode(sourceFile, existingProperty.initializer, import_typescript.factory.createStringLiteral(dependency.version));
+}
 function createDiagnosticSeverityObject(severities) {
 	const entries = Object.entries(severities).sort(([a], [b]) => a.localeCompare(b));
 	return import_typescript.factory.createObjectLiteralExpression(entries.map(([name, severity]) => import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(name), import_typescript.factory.createStringLiteral(severity))), true);
@@ -197734,6 +197793,14 @@ const computePackageJsonChanges = (current, target) => {
 	if (!rootObj) return emptyFileChangesResult();
 	const ctx = createTrackerContext();
 	const fileChange = tsInternal.textChanges.ChangeTracker.with(ctx, (tracker) => {
+		const shouldAddNativePreviewWithDependencyType = (dependencyType) => isSome(target.nativePreviewVersion) && isNone(current.nativePreviewVersion) && target.nativePreviewVersion.value.dependencyType === dependencyType;
+		const ensureNativePreviewDependency = () => {
+			if (isNone(target.nativePreviewVersion) || isSome(current.nativePreviewVersion)) return;
+			const targetNativePreview = target.nativePreviewVersion.value;
+			if (!findDependencyCollectionProperty(rootObj, targetNativePreview.dependencyType) && isSome(target.lspVersion) && target.lspVersion.value.dependencyType === targetNativePreview.dependencyType) return;
+			descriptions.push(`Add ${NATIVE_PREVIEW_PACKAGE_NAME}@${targetNativePreview.version} to ${targetNativePreview.dependencyType}`);
+			upsertDependency(tracker, current.sourceFile, rootObj, NATIVE_PREVIEW_PACKAGE_NAME, targetNativePreview);
+		};
 		if (isSome(target.lspVersion)) {
 			const targetDepType = target.lspVersion.value.dependencyType;
 			const targetVersion = target.lspVersion.value.version;
@@ -197747,12 +197814,16 @@ const computePackageJsonChanges = (current, target) => {
 						const lspProperty = findPropertyInObject(oldDepsProperty.initializer, LSP_PACKAGE_NAME);
 						if (lspProperty) deleteNodeFromList(tracker, current.sourceFile, oldDepsProperty.initializer.properties, lspProperty);
 					}
-					const newDepsProperty = findPropertyInObject(rootObj, targetDepType);
-					const newLspProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion));
+					const newDepsProperty = findDependencyCollectionProperty(rootObj, targetDepType);
 					if (!newDepsProperty) {
-						const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression([newLspProp], false));
+						const dependencyProperties = [import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion))];
+						if (shouldAddNativePreviewWithDependencyType(targetDepType)) {
+							const targetNativePreview = target.nativePreviewVersion.pipe(getOrUndefined);
+							if (targetNativePreview) dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(NATIVE_PREVIEW_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetNativePreview.version)));
+						}
+						const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression(dependencyProperties, false));
 						insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, newDepsProp);
-					} else if (import_typescript.isObjectLiteralExpression(newDepsProperty.initializer)) insertNodeAtEndOfList(tracker, current.sourceFile, newDepsProperty.initializer.properties, newLspProp);
+					} else if (import_typescript.isObjectLiteralExpression(newDepsProperty.initializer)) insertNodeAtEndOfList(tracker, current.sourceFile, newDepsProperty.initializer.properties, import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion)));
 				} else if (currentVersion !== targetVersion) {
 					descriptions.push(`Update ${LSP_PACKAGE_NAME} from ${currentVersion} to ${targetVersion}`);
 					const depsProperty = findPropertyInObject(rootObj, targetDepType);
@@ -197763,15 +197834,18 @@ const computePackageJsonChanges = (current, target) => {
 				}
 			} else {
 				descriptions.push(`Add ${LSP_PACKAGE_NAME}@${targetVersion} to ${targetDepType}`);
-				const depsProperty = findPropertyInObject(rootObj, targetDepType);
+				const depsProperty = findDependencyCollectionProperty(rootObj, targetDepType);
 				if (!depsProperty) {
-					const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression([import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion))], false));
+					const dependencyProperties = [import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion))];
+					if (shouldAddNativePreviewWithDependencyType(targetDepType)) {
+						const targetNativePreview = target.nativePreviewVersion.pipe(getOrUndefined);
+						if (targetNativePreview) dependencyProperties.push(import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(NATIVE_PREVIEW_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetNativePreview.version)));
+					}
+					const newDepsProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(targetDepType), import_typescript.factory.createObjectLiteralExpression(dependencyProperties, false));
 					insertNodeAtEndOfList(tracker, current.sourceFile, rootObj.properties, newDepsProp);
-				} else if (import_typescript.isObjectLiteralExpression(depsProperty.initializer)) {
-					const newLspProp = import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion));
-					insertNodeAtEndOfList(tracker, current.sourceFile, depsProperty.initializer.properties, newLspProp);
-				}
+				} else if (import_typescript.isObjectLiteralExpression(depsProperty.initializer)) insertNodeAtEndOfList(tracker, current.sourceFile, depsProperty.initializer.properties, import_typescript.factory.createPropertyAssignment(import_typescript.factory.createStringLiteral(LSP_PACKAGE_NAME), import_typescript.factory.createStringLiteral(targetVersion)));
 			}
+			ensureNativePreviewDependency();
 		} else if (isSome(current.lspVersion)) {
 			descriptions.push(`Remove ${LSP_PACKAGE_NAME} from dependencies`);
 			const currentDepType = current.lspVersion.value.dependencyType;
@@ -198594,17 +198668,21 @@ var rules = [
 	{
 		"name": "runEffectInsideEffect",
 		"group": "antipattern",
-		"description": "Suggests using Runtime methods instead of Effect.run* inside Effect contexts",
+		"description": "Suggests using Runtime or Effect.run*With methods instead of Effect.run* inside Effect contexts",
 		"defaultSeverity": "suggestion",
 		"fixable": true,
-		"supportedEffect": ["v3"],
-		"codes": [377024, 377025],
+		"supportedEffect": ["v3", "v4"],
+		"codes": [
+			377024,
+			377025,
+			377074
+		],
 		"preview": {
 			"sourceText": "import { Effect } from \"effect\"\n\nexport const preview = Effect.gen(function*() {\n  const run = () => Effect.runSync(Effect.succeed(1))\n  return run()\n})\n",
 			"diagnostics": [{
 				"start": 101,
 				"end": 115,
-				"text": "Using Effect.runSync inside an Effect is not recommended. The same runtime should generally be used instead to run child effects.\nConsider extracting the Runtime by using for example Effect.runtime and then use Runtime.runSync with the extracted runtime instead. effect(runEffectInsideEffect)"
+				"text": "Using Effect.runSync inside an Effect is not recommended. The same services should generally be used instead to run child effects.\nConsider extracting the current services by using for example Effect.services and then use Effect.runSyncWith with the extracted services instead. effect(runEffectInsideEffect)"
 			}]
 		}
 	},
@@ -199608,6 +199686,7 @@ function createRulePrompt(rules, initialSeverities) {
 const fromAssessment = (inputState) => ({
 	packageJson: {
 		lspVersion: inputState.packageJson.lspVersion,
+		nativePreviewVersion: inputState.packageJson.nativePreviewVersion,
 		prepareScript: map$9(inputState.packageJson.prepareScript, (_) => _.hasPatch).pipe(getOrElse$1(() => false))
 	},
 	tsconfig: { diagnosticSeverities: inputState.tsconfig.currentDiagnosticSeverities },
@@ -199779,6 +199858,7 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 	if (lspDependencyType === "no") return {
 		packageJson: {
 			lspVersion: none$3(),
+			nativePreviewVersion: assessment.packageJson.nativePreviewVersion,
 			prepareScript: false
 		},
 		tsconfig: { diagnosticSeverities: none$3() },
@@ -199836,6 +199916,10 @@ const gatherTargetState = (assessment, context) => gen(function* () {
 				dependencyType: lspDependencyType,
 				version: context.defaultLspVersion
 			}),
+			nativePreviewVersion: orElse(assessment.packageJson.nativePreviewVersion, () => some({
+				dependencyType: lspDependencyType,
+				version: DEFAULT_NATIVE_PREVIEW_VERSION
+			})),
 			prepareScript: true
 		},
 		tsconfig: { diagnosticSeverities },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/tsgo",
-  "version": "0.0.20",
+  "version": "0.1.1",
   "description": "Effect Language Service for TypeScript-Go — Effect-specific diagnostics and hover features.",
   "license": "MIT",
   "repository": {
@@ -22,13 +22,13 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "@effect/tsgo-win32-x64": "0.0.20",
-    "@effect/tsgo-win32-arm64": "0.0.20",
-    "@effect/tsgo-linux-x64": "0.0.20",
-    "@effect/tsgo-linux-arm64": "0.0.20",
-    "@effect/tsgo-linux-arm": "0.0.20",
-    "@effect/tsgo-darwin-x64": "0.0.20",
-    "@effect/tsgo-darwin-arm64": "0.0.20"
+    "@effect/tsgo-win32-x64": "0.1.1",
+    "@effect/tsgo-win32-arm64": "0.1.1",
+    "@effect/tsgo-linux-x64": "0.1.1",
+    "@effect/tsgo-linux-arm64": "0.1.1",
+    "@effect/tsgo-linux-arm": "0.1.1",
+    "@effect/tsgo-darwin-x64": "0.1.1",
+    "@effect/tsgo-darwin-arm64": "0.1.1"
   },
   "devDependencies": {
     "@effect/platform-node": "^4.0.0-beta.40",