@tamagui/language-service 3.0.0-beta.924.1 → 3.0.1

package/dist/esm/index.native.js

@@ -1,392 +1,7 @@
-import { isAbsolute, resolve } from "path";
-import { completionSortText, createStyleTooling } from "./core.native.js";
-import { resolveTamaguiHost } from "./host.native.js";
+export * from "./core.native.js"
 
-var completionSource = "@tamagui/language-service";
-var diagnosticCode = 78711;
-var defaultConfigPath = ".tamagui/tamagui.config.json";
-var flatStyledModules = /* @__PURE__ */ new Set([
-	"tamagui",
-	"tamagui/unstyled",
-	"@tamagui/core",
-	"@tamagui/ui",
-	"@tamagui/web"
-]);
-function loadTooling(info, configPath) {
-	var contents = info.serverHost.readFile(configPath);
-	if (contents === void 0) return null;
-	try {
-		return createStyleTooling(JSON.parse(contents));
-	} catch (e) {
-		return null;
-	}
-}
-function findStringLiteralAtPosition(typescript, sourceFile, position) {
-	var found = null;
-	var visit = function(node) {
-		if (position < node.getFullStart() || position > node.getEnd()) return;
-		if (typescript.isStringLiteralLike(node) && position >= node.getStart(sourceFile) + 1 && position <= node.getEnd() - 1) {
-			found = node;
-			return;
-		}
-		typescript.forEachChild(node, visit);
-	};
-	visit(sourceFile);
-	return found;
-}
-function importedBindings(typescript, sourceFile) {
-	var styled = /* @__PURE__ */ new Set();
-	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-	try {
-		for (var _iterator = sourceFile.statements[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-			var statement = _step.value;
-			var _statement_importClause;
-			if (!typescript.isImportDeclaration(statement) || !typescript.isStringLiteral(statement.moduleSpecifier)) {
-				continue;
-			}
-			var source = statement.moduleSpecifier.text;
-			if (!flatStyledModules.has(source)) continue;
-			var bindings = (_statement_importClause = statement.importClause) === null || _statement_importClause === void 0 ? void 0 : _statement_importClause.namedBindings;
-			if (!bindings) continue;
-			if (typescript.isNamespaceImport(bindings)) continue;
-			var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
-			try {
-				for (var _iterator1 = bindings.elements[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-					var element = _step1.value;
-					var _element_propertyName;
-					var imported = ((_element_propertyName = element.propertyName) === null || _element_propertyName === void 0 ? void 0 : _element_propertyName.text) || element.name.text;
-					if (imported === "styled") styled.add(element.name.text);
-				}
-			} catch (err) {
-				_didIteratorError1 = true;
-				_iteratorError1 = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-						_iterator1.return();
-					}
-				} finally {
-					if (_didIteratorError1) {
-						throw _iteratorError1;
-					}
-				}
-			}
-		}
-	} catch (err) {
-		_didIteratorError = true;
-		_iteratorError = err;
-	} finally {
-		try {
-			if (!_iteratorNormalCompletion && _iterator.return != null) {
-				_iterator.return();
-			}
-		} finally {
-			if (_didIteratorError) {
-				throw _iteratorError;
-			}
-		}
-	}
-	return { styled };
-}
-function propertyName(typescript, name) {
-	if (typescript.isIdentifier(name) || typescript.isStringLiteral(name)) {
-		return name.text;
-	}
-	return null;
-}
-function completionProperty(typescript, literal, tooling, checker, bindings) {
-	var parent = literal.parent;
-	if (typescript.isJsxExpression(parent)) parent = parent.parent;
-	if (typescript.isJsxAttribute(parent)) {
-		if (!typescript.isIdentifier(parent.name)) return null;
-		var property = parent.name.text;
-		if (!tooling.styleProps.has(property)) return null;
-		var opening = parent.parent.parent;
-		if (!typescript.isJsxOpeningLikeElement(opening)) return null;
-		var host = resolveTamaguiHost(checker, opening.tagName);
-		if (!(host === null || host === void 0 ? void 0 : host.accepts(property))) return null;
-		return { property };
-	}
-	if (!typescript.isPropertyAssignment(parent)) return null;
-	var property1 = propertyName(typescript, parent.name);
-	if (!property1 || !tooling.styleProps.has(property1)) return null;
-	var current = parent;
-	while (current.parent && !typescript.isCallExpression(current.parent)) {
-		current = current.parent;
-	}
-	if (!current.parent || !typescript.isCallExpression(current.parent)) return null;
-	var call = current.parent;
-	if (call.arguments[1] !== current || !typescript.isIdentifier(call.expression) || !bindings.styled.has(call.expression.text)) {
-		return null;
-	}
-	var component = call.arguments[0];
-	var host1 = component && resolveTamaguiHost(checker, component);
-	if (!(host1 === null || host1 === void 0 ? void 0 : host1.accepts(property1))) return null;
-	return { property: property1 };
-}
-function siteForLiteral(typescript, sourceFile, literal, tooling, checker, bindings) {
-	var site = completionProperty(typescript, literal, tooling, checker, bindings);
-	if (!site) return null;
-	var contentStart = literal.getStart(sourceFile) + 1;
-	var contentEnd = literal.getEnd() - 1;
-	var sourceInput = sourceFile.text.slice(contentStart, contentEnd);
-	if (literal.text !== sourceInput) return null;
-	return {
-		property: site.property,
-		value: literal.text,
-		contentStart,
-		literal
-	};
-}
-function collectLiteralSites(typescript, sourceFile, tooling, checker, bindings) {
-	var sites = [];
-	var visit = function(node) {
-		if (typescript.isStringLiteralLike(node)) {
-			var site = siteForLiteral(typescript, sourceFile, node, tooling, checker, bindings);
-			if (site) sites.push(site);
-			return;
-		}
-		typescript.forEachChild(node, visit);
-	};
-	visit(sourceFile);
-	return sites;
-}
-function copyLanguageService(service) {
-	var proxy = /* @__PURE__ */ Object.create(null);
-	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-	try {
-		for (var _iterator = Object.keys(service)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-			var key = _step.value;
-			var value = service[key];
-			proxy[key] = typeof value === "function" ? value.bind(service) : value;
-		}
-	} catch (err) {
-		_didIteratorError = true;
-		_iteratorError = err;
-	} finally {
-		try {
-			if (!_iteratorNormalCompletion && _iterator.return != null) {
-				_iterator.return();
-			}
-		} finally {
-			if (_didIteratorError) {
-				throw _iteratorError;
-			}
-		}
-	}
-	return proxy;
-}
-var init = function(param) {
-	var { typescript } = param;
-	return { create(info) {
-		var pluginConfig = info.config;
-		var configuredPath = (pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.configPath) || defaultConfigPath;
-		var configPath = isAbsolute(configuredPath) ? configuredPath : resolve(info.project.getCurrentDirectory(), configuredPath);
-		var tooling = loadTooling(info, configPath);
-		var watcher = info.serverHost.watchFile(configPath, function() {
-			tooling = loadTooling(info, configPath);
-		});
-		var proxy = copyLanguageService(info.languageService);
-		var baseCompletions = info.languageService.getCompletionsAtPosition.bind(info.languageService);
-		var baseDetails = info.languageService.getCompletionEntryDetails.bind(info.languageService);
-		var baseSemanticDiagnostics = info.languageService.getSemanticDiagnostics.bind(info.languageService);
-		var baseQuickInfo = info.languageService.getQuickInfoAtPosition.bind(info.languageService);
-		var baseDispose = info.languageService.dispose.bind(info.languageService);
-		var bindingsBySourceFile = /* @__PURE__ */ new WeakMap();
-		var fileContext = function(fileName) {
-			var program = info.languageService.getProgram();
-			var sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(fileName);
-			if (!program || !sourceFile) return null;
-			var bindings = bindingsBySourceFile.get(sourceFile);
-			if (!bindings) {
-				bindings = importedBindings(typescript, sourceFile);
-				bindingsBySourceFile.set(sourceFile, bindings);
-			}
-			return {
-				sourceFile,
-				checker: program.getTypeChecker(),
-				bindings
-			};
-		};
-		proxy.getCompletionsAtPosition = function(fileName, position, options, formattingSettings) {
-			var getBaseCompletions = function() {
-				return baseCompletions(fileName, position, options, formattingSettings);
-			};
-			if (!tooling) return getBaseCompletions();
-			var context = fileContext(fileName);
-			if (!context) return getBaseCompletions();
-			var { sourceFile, checker, bindings } = context;
-			var literal = findStringLiteralAtPosition(typescript, sourceFile, position);
-			if (!literal) return getBaseCompletions();
-			var site = siteForLiteral(typescript, sourceFile, literal, tooling, checker, bindings);
-			if (!site) return getBaseCompletions();
-			var cursorCompletions = tooling.completions(site.property, site.value, position - site.contentStart);
-			if (!cursorCompletions) return getBaseCompletions();
-			var replacementSpan = {
-				start: site.contentStart + cursorCompletions.replaceStart,
-				length: cursorCompletions.replaceLength
-			};
-			var entries = [];
-			var contextualType;
-			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-			try {
-				for (var _iterator = cursorCompletions.completions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-					var completion = _step.value;
-					var insertText = completion.insertText || completion.value;
-					var modifierKind = completion.kind === "modifier" ? tooling.modifierKind(completion.value) : void 0;
-					if (completion.kind === "keyword") {
-						contextualType || (contextualType = checker.getContextualType(literal));
-						if (!contextualType || !checker.isTypeAssignableTo(checker.getStringLiteralType(insertText), contextualType)) {
-							continue;
-						}
-					}
-					entries.push({
-						name: completion.value,
-						kind: typescript.ScriptElementKind.string,
-						kindModifiers: "",
-						sortText: completionSortText(completion, modifierKind),
-						insertText,
-						replacementSpan,
-						source: completionSource,
-						labelDetails: { description: modifierKind ? `Tamagui ${modifierKind} modifier` : completion.kind === "configured" ? "Tamagui configured value" : "Tamagui style keyword" }
-					});
-				}
-			} catch (err) {
-				_didIteratorError = true;
-				_iteratorError = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion && _iterator.return != null) {
-						_iterator.return();
-					}
-				} finally {
-					if (_didIteratorError) {
-						throw _iteratorError;
-					}
-				}
-			}
-			if (entries.length === 0) return getBaseCompletions();
-			return {
-				isGlobalCompletion: false,
-				isMemberCompletion: false,
-				isNewIdentifierLocation: true,
-				isIncomplete: true,
-				entries
-			};
-		};
-		proxy.getCompletionEntryDetails = function(fileName, position, entryName, formatOptions, source, preferences, data) {
-			if (source === completionSource) {
-				return {
-					name: entryName,
-					kind: typescript.ScriptElementKind.string,
-					kindModifiers: "",
-					displayParts: [{
-						text: entryName,
-						kind: "stringLiteral"
-					}],
-					documentation: [{
-						text: "Resolved from the active Tamagui config.",
-						kind: "text"
-					}],
-					tags: []
-				};
-			}
-			return baseDetails(fileName, position, entryName, formatOptions, source, preferences, data);
-		};
-		proxy.getSemanticDiagnostics = function(fileName) {
-			var diagnostics = [...baseSemanticDiagnostics(fileName)];
-			if (!tooling) return diagnostics;
-			var context = fileContext(fileName);
-			if (!context) return diagnostics;
-			var { sourceFile, checker, bindings } = context;
-			var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-			try {
-				for (var _iterator = collectLiteralSites(typescript, sourceFile, tooling, checker, bindings)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-					var site = _step.value;
-					var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
-					try {
-						for (var _iterator1 = tooling.diagnostics(site.property, site.value)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-							var diagnostic = _step1.value;
-							diagnostics.push({
-								file: sourceFile,
-								start: site.contentStart + diagnostic.start,
-								length: Math.max(1, diagnostic.end - diagnostic.start),
-								messageText: diagnostic.message,
-								category: typescript.DiagnosticCategory.Error,
-								code: diagnosticCode,
-								source: completionSource
-							});
-						}
-					} catch (err) {
-						_didIteratorError1 = true;
-						_iteratorError1 = err;
-					} finally {
-						try {
-							if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-								_iterator1.return();
-							}
-						} finally {
-							if (_didIteratorError1) {
-								throw _iteratorError1;
-							}
-						}
-					}
-				}
-			} catch (err) {
-				_didIteratorError = true;
-				_iteratorError = err;
-			} finally {
-				try {
-					if (!_iteratorNormalCompletion && _iterator.return != null) {
-						_iterator.return();
-					}
-				} finally {
-					if (_didIteratorError) {
-						throw _iteratorError;
-					}
-				}
-			}
-			return diagnostics;
-		};
-		proxy.getQuickInfoAtPosition = function(fileName, position) {
-			var getBaseQuickInfo = function() {
-				return baseQuickInfo(fileName, position);
-			};
-			if (!tooling) return getBaseQuickInfo();
-			var context = fileContext(fileName);
-			if (!context) return getBaseQuickInfo();
-			var { sourceFile, checker, bindings } = context;
-			var literal = findStringLiteralAtPosition(typescript, sourceFile, position);
-			if (!literal) return getBaseQuickInfo();
-			var site = siteForLiteral(typescript, sourceFile, literal, tooling, checker, bindings);
-			if (!site) return getBaseQuickInfo();
-			var hover = tooling.hover(site.property, site.value, position - site.contentStart);
-			if (!hover) return getBaseQuickInfo();
-			return {
-				kind: typescript.ScriptElementKind.string,
-				kindModifiers: "",
-				textSpan: {
-					start: site.contentStart + hover.start,
-					length: hover.end - hover.start
-				},
-				displayParts: [{
-					text: hover.text,
-					kind: "stringLiteral"
-				}],
-				documentation: [{
-					text: hover.markdown,
-					kind: "text"
-				}]
-			};
-		};
-		proxy.dispose = function() {
-			watcher.close();
-			baseDispose();
-		};
-		return proxy;
-	} };
-};
-var index_default = init;
+export * from "./document.native.js"
 
-export { index_default as default };
-//# sourceMappingURL=index.native.js.map
+export * from "./extract-estree.native.js"
+
+export * from "./extract-sucrase.native.js"

package/package.json

@@ -1,26 +1,20 @@
 {
   "name": "@tamagui/language-service",
-  "version": "3.0.0-beta.924.1",
+  "version": "3.0.1",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
   "source": "src/index.ts",
   "files": [
-    "index.cjs",
     "src",
     "types",
     "dist"
   ],
-  "main": "index.cjs",
+  "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
   "types": "types/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
-    "./host": {
-      "types": "./types/host.d.ts",
-      "import": "./dist/esm/host.mjs",
-      "default": "./dist/esm/host.mjs"
-    },
     "./core": {
       "types": "./types/core.d.ts",
       "import": "./dist/esm/core.mjs",
@@ -54,7 +48,7 @@
     ".": {
       "types": "./types/index.d.ts",
       "import": "./dist/esm/index.mjs",
-      "require": "./index.cjs",
+      "require": "./dist/cjs/index.cjs",
       "default": "./dist/esm/index.mjs"
     }
   },
@@ -67,22 +61,19 @@
     "test:web": "bun run build && vitest --run test"
   },
   "dependencies": {
-    "@tamagui/normalize-css-color": "3.0.0-beta.924.1",
-    "@tamagui/style-grammar": "3.0.0-beta.924.1",
+    "@tamagui/normalize-css-color": "3.0.1",
+    "@tamagui/style-grammar": "3.0.1",
     "sucrase": "3.35.1"
   },
-  "peerDependencies": {
-    "typescript": ">=5.7"
-  },
   "devDependencies": {
-    "@tamagui/build": "3.0.0-beta.924.1",
+    "@tamagui/build": "3.0.1",
     "oxc-parser": "^0.112.0",
-    "typescript": "~6.0.3",
     "vitest": "4.1.0"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tamagui/tamagui.git",
     "directory": "code/core/language-service"
-  }
+  },
+  "releaseSourceCommit": "c156b7cc55e5a6cc5883ebc8189720850ac32dbd"
 }

package/src/check.ts

@@ -4,8 +4,9 @@
 // value site with the sucrase tokenizer, and reports the same diagnostics the
 // editor plugin and eslint rule produce, formatted as readable code frames.
 
-import { readdirSync, readFileSync } from 'node:fs'
-import { join, relative } from 'node:path'
+import { existsSync, readdirSync, readFileSync } from 'node:fs'
+import { dirname, join, relative, resolve } from 'node:path'
+import { spawnSync } from 'node:child_process'
 // deep paths, spelled down to the file: sucrase publishes no `exports` map, and
 // a bare `sucrase/dist/parser` is a directory import that ESM cannot resolve
 import { parse } from 'sucrase/dist/parser/index.js'
@@ -31,6 +32,13 @@ const skippedDirectories = new Set([
   '.expo',
   '.tamagui',
 ])
+const projectMarkers = [
+  'tamagui.build.ts',
+  'tamagui.build.tsx',
+  'tamagui.build.js',
+  'tamagui.build.mjs',
+  'tamagui.build.cjs',
+]
 
 export interface CheckStyleFilesOptions {
   /** project root; file discovery and relative display paths anchor here */
@@ -39,6 +47,8 @@ export interface CheckStyleFilesOptions {
   configPath?: string
   /** explicit files to check instead of walking the root */
   files?: readonly string[]
+  /** validate clause payloads strictly against token and keyword vocabularies */
+  strict?: boolean
 }
 
 export interface CheckedFile {
@@ -52,6 +62,8 @@ export interface CheckStyleFilesResult {
   files: readonly CheckedFile[]
   checkedFileCount: number
   diagnosticCount: number
+  /** root-relative Tamagui projects omitted because they own another config */
+  skippedProjects: readonly string[]
 }
 
 export class MissingConfigArtifactError extends Error {
@@ -63,12 +75,24 @@ export class MissingConfigArtifactError extends Error {
   }
 }
 
-function walkSourceFiles(directory: string, results: string[]): void {
+function walkSourceFiles(
+  directory: string,
+  root: string,
+  results: string[],
+  skippedProjects: string[]
+): void {
   for (const entry of readdirSync(directory, { withFileTypes: true })) {
     if (entry.isDirectory()) {
-      if (!skippedDirectories.has(entry.name) && !entry.name.startsWith('.')) {
-        walkSourceFiles(join(directory, entry.name), results)
+      if (skippedDirectories.has(entry.name) || entry.name.startsWith('.')) continue
+      const child = join(directory, entry.name)
+      if (
+        projectMarkers.some((marker) => existsSync(join(child, marker))) ||
+        existsSync(join(child, '.tamagui', 'tamagui.config.json'))
+      ) {
+        skippedProjects.push(relative(root, child))
+        continue
       }
+      walkSourceFiles(child, root, results, skippedProjects)
       continue
     }
     if (sourceExtensions.test(entry.name)) results.push(join(directory, entry.name))
@@ -82,29 +106,97 @@ export function createProjectExtractor(
 }
 
 export function checkStyleFiles(options: CheckStyleFilesOptions): CheckStyleFilesResult {
-  const configPath =
-    options.configPath ?? join(options.root, '.tamagui', 'tamagui.config.json')
+  const root = resolve(options.root)
+  const configPath = options.configPath ?? join(root, '.tamagui', 'tamagui.config.json')
   let contents: string
   try {
     contents = readFileSync(configPath, 'utf8')
   } catch {
     throw new MissingConfigArtifactError(configPath)
   }
-  const tooling = createStyleTooling(JSON.parse(contents) as SerializedConfigFile)
+  const tooling = createStyleTooling(JSON.parse(contents) as SerializedConfigFile, {
+    strictPayloads: options.strict,
+  })
   if (!tooling) throw new MissingConfigArtifactError(configPath)
 
   const document = createDocumentStyleTooling(
     tooling,
-    createProjectExtractor((name) => tooling.isStyleProp(name))
+    createProjectExtractor((name) => tooling.isStyleProp(name)),
+    { strictPayloads: options.strict }
   )
 
   let files: string[]
+  const skippedProjects: string[] = []
   if (options.files) {
     files = [...options.files]
   } else {
     files = []
-    walkSourceFiles(options.root, files)
+    const insideGit = spawnSync('git', ['rev-parse', '--is-inside-work-tree'], {
+      cwd: root,
+      encoding: 'utf8',
+    })
+    if (insideGit.status === 0) {
+      const listed = spawnSync(
+        'git',
+        [
+          'ls-files',
+          '--cached',
+          '--others',
+          '--exclude-standard',
+          '-z',
+          '--',
+          '*.tsx',
+          '*.jsx',
+        ],
+        {
+          cwd: root,
+          encoding: 'utf8',
+          maxBuffer: 64 * 1024 * 1024,
+        }
+      )
+      if (listed.error) throw listed.error
+      if (listed.status !== 0) {
+        throw new Error(listed.stderr.trim() || 'git ls-files failed')
+      }
+      const skipped = new Set<string>()
+      const projectByDirectory = new Map<string, string | null>()
+      for (const relativeFile of listed.stdout.split('\0')) {
+        if (!relativeFile) continue
+        const file = join(root, relativeFile)
+        if (!existsSync(file)) continue
+        let directory = dirname(file)
+        let nestedProject: string | null = null
+        const visited: string[] = []
+        while (directory !== root) {
+          if (projectByDirectory.has(directory)) {
+            nestedProject = projectByDirectory.get(directory) ?? null
+            break
+          }
+          visited.push(directory)
+          if (
+            projectMarkers.some((marker) => existsSync(join(directory, marker))) ||
+            existsSync(join(directory, '.tamagui', 'tamagui.config.json'))
+          ) {
+            nestedProject = directory
+            break
+          }
+          directory = dirname(directory)
+        }
+        for (const visitedDirectory of visited) {
+          projectByDirectory.set(visitedDirectory, nestedProject)
+        }
+        if (nestedProject) {
+          skipped.add(relative(root, nestedProject))
+        } else {
+          files.push(file)
+        }
+      }
+      skippedProjects.push(...skipped)
+    } else {
+      walkSourceFiles(root, root, files, skippedProjects)
+    }
     files.sort()
+    skippedProjects.sort()
   }
 
   const checked: CheckedFile[] = []
@@ -118,7 +210,9 @@ export function checkStyleFiles(options: CheckStyleFilesOptions): CheckStyleFile
     }
     let diagnostics: readonly DocumentDiagnostic[]
     try {
-      diagnostics = document.diagnostics(source)
+      diagnostics = document.diagnostics(source, undefined, {
+        strictPayloads: options.strict,
+      })
     } catch {
       // a file sucrase cannot parse is a syntax error the real compiler will
       // report; the style checker stays quiet about it
@@ -126,10 +220,15 @@ export function checkStyleFiles(options: CheckStyleFilesOptions): CheckStyleFile
     }
     if (diagnostics.length === 0) continue
     diagnosticCount += diagnostics.length
-    checked.push({ file: relative(options.root, file), source, diagnostics })
+    checked.push({ file: relative(root, file), source, diagnostics })
   }
 
-  return { files: checked, checkedFileCount: files.length, diagnosticCount }
+  return {
+    files: checked,
+    checkedFileCount: files.length,
+    diagnosticCount,
+    skippedProjects,
+  }
 }
 
 const ansi = {
@@ -195,6 +294,12 @@ export function formatCheckResults(
     }
   }
 
+  if (result.skippedProjects.length > 0) {
+    output.push(
+      paint.dim(`Skipped nested Tamagui projects: ${result.skippedProjects.join(', ')}`)
+    )
+  }
+
   const summary =
     result.diagnosticCount === 0
       ? `${paint.bold('✓')} ${result.checkedFileCount} files, no flat value problems`