@stylexjs/babel-plugin 0.10.0 → 0.11.0

package/lib/index.js

@@ -685,118 +685,6 @@ function requireLib$1 () {
 
 var libExports = requireLib$1();
 
-function isArrayExpression(path, props) {
-  return path.isArrayExpression(props);
-}
-function isArrowFunctionExpression(path, props) {
-  return path.isArrowFunctionExpression(props);
-}
-function isBinaryExpression(path, props) {
-  return path.isBinaryExpression(props);
-}
-function isBooleanLiteral(path, props) {
-  return path.isBooleanLiteral(props);
-}
-function isCallExpression(path, props) {
-  return path.isCallExpression(props);
-}
-function isClass(path, props) {
-  return path.isClass(props);
-}
-function isConditionalExpression(path, props) {
-  return path.isConditionalExpression(props);
-}
-function isExportDefaultDeclaration(path, props) {
-  return path.isExportDefaultDeclaration(props);
-}
-function isExportNamedDeclaration(path, props) {
-  return path.isExportNamedDeclaration(props);
-}
-function isExpression(path, props) {
-  return path.isExpression(props);
-}
-function isExpressionStatement(path, props) {
-  return path.isExpressionStatement(props);
-}
-function isExpressionWrapper(path, props) {
-  return path.isExpressionWrapper(props);
-}
-function isFunction(path, props) {
-  return path.isFunction(props);
-}
-function isIdentifier(path, props) {
-  return path.isIdentifier(props);
-}
-function isImportDeclaration(path, props) {
-  return path.isImportDeclaration(props);
-}
-function isImportDefaultSpecifier(path, props) {
-  return path.isImportDefaultSpecifier(props);
-}
-function isImportNamespaceSpecifier(path, props) {
-  return path.isImportNamespaceSpecifier(props);
-}
-function isImportSpecifier(path, props) {
-  return path.isImportSpecifier(props);
-}
-function isLogicalExpression(path, props) {
-  return path.isLogicalExpression(props);
-}
-function isMemberExpression(path, props) {
-  return path.isMemberExpression(props);
-}
-function isNullLiteral(path, props) {
-  return path.isNullLiteral(props);
-}
-function isNumericLiteral(path, props) {
-  return path.isNumericLiteral(props);
-}
-function isObjectExpression(path, props) {
-  return path.isObjectExpression(props);
-}
-function isObjectMethod(path, props) {
-  return path.isObjectMethod(props);
-}
-function isObjectProperty(path, props) {
-  return path.isObjectProperty(props);
-}
-function isProgram(path, props) {
-  return path.isProgram(props);
-}
-function isSequenceExpression(path, props) {
-  return path.isSequenceExpression(props);
-}
-function isSpreadElement(path, props) {
-  return path.isSpreadElement(props);
-}
-function isStatement(path, props) {
-  return path.isStatement(props);
-}
-function isStringLiteral(path, props) {
-  return path.isStringLiteral(props);
-}
-function isTSAsExpression(path, props) {
-  return path.isTSAsExpression(props);
-}
-function isTaggedTemplateExpression(path, props) {
-  return path.isTaggedTemplateExpression(props);
-}
-function isTemplateLiteral(path, props) {
-  return path.isTemplateLiteral(props);
-}
-function isUnaryExpression(path, props) {
-  return path.isUnaryExpression(props);
-}
-function isVariableDeclaration(path, props) {
-  return path.isVariableDeclaration(props);
-}
-function isVariableDeclarator(path, props) {
-  return path.isVariableDeclarator(props);
-}
-function isReferencedIdentifier(path, props) {
-  return path.isReferencedIdentifier(props);
-}
-
 const CheckModuleResolution = unionOf3(object({
   type: literal('commonJS'),
   rootDir: unionOf(nullish(), string()),
@@ -844,6 +732,9 @@ class StateManager {
   setOptions(options) {
     const dev = logAndDefault(boolean(), options.dev ?? false, false, 'options.dev');
     const debug = logAndDefault(boolean(), options.debug ?? dev, false, 'options.debug');
+    const enableDebugClassNames = logAndDefault(boolean(), options.enableDebugClassNames ?? true, true, 'options.enableDebugClassNames');
+    const enableDebugDataProp = logAndDefault(boolean(), options.enableDebugDataProp ?? true, true, 'options.enableDebugDataProp');
+    const enableDevClassNames = logAndDefault(boolean(), options.enableDevClassNames ?? false, false, 'options.enableDevClassNames');
     const test = logAndDefault(boolean(), options.test ?? false, false, 'options.test');
     const configRuntimeInjection = logAndDefault(checkRuntimeInjection, options.runtimeInjection ?? dev, dev, 'options.runtimeInjection');
     const runtimeInjection = configRuntimeInjection === true ? DEFAULT_INJECT_PATH : configRuntimeInjection === false ? undefined : configRuntimeInjection;
@@ -865,18 +756,22 @@ class StateManager {
     }));
     const opts = {
       aliases,
-      dev,
-      debug,
-      test,
-      runtimeInjection,
       classNamePrefix,
-      importSources,
+      debug,
       definedStylexCSSVariables: {},
+      dev,
+      enableDebugClassNames,
+      enableDebugDataProp,
+      enableDevClassNames,
       genConditionalClasses,
-      useRemForFontSize,
+      importSources,
+      rewriteAliases: typeof options.rewriteAliases === 'boolean' ? options.rewriteAliases : false,
+      runtimeInjection,
       styleResolution,
+      test,
+      treeshakeCompensation,
       unstable_moduleResolution,
-      treeshakeCompensation
+      useRemForFontSize
     };
     return opts;
   }
@@ -925,7 +820,7 @@ class StateManager {
     let targetImportIndex = -1;
     for (let i = 0; i < bodyPath.length; i++) {
       const statement = bodyPath[i];
-      if (isImportDeclaration(statement)) {
+      if (statement.isImportDeclaration()) {
         targetImportIndex = i;
         if (statement.node.specifiers.find(s => s.type === 'ImportSpecifier' && s.local.type === 'Identifier' && s.local.name === identifier.name)) {
           break;
@@ -953,7 +848,7 @@ class StateManager {
     let targetImportIndex = -1;
     for (let i = 0; i < bodyPath.length; i++) {
       const statement = bodyPath[i];
-      if (isImportDeclaration(statement)) {
+      if (statement.isImportDeclaration()) {
         targetImportIndex = i;
         if (statement.node.specifiers.find(s => s.type === 'ImportDefaultSpecifier' && s.local.type === 'Identifier' && s.local.name === identifier.name)) {
           break;
@@ -971,6 +866,14 @@ class StateManager {
     lastImport.insertAfter(t__namespace.variableDeclaration('var', [t__namespace.variableDeclarator(importName, identifier)]));
     return importName;
   }
+  get opts() {
+    return {
+      ...this.options
+    };
+  }
+  get isDebug() {
+    return !!this.options.debug;
+  }
   get isDev() {
     return !!this.options.dev;
   }
@@ -1081,7 +984,7 @@ class StateManager {
       return;
     }
     const runtimeInjection = this.runtimeInjection;
-    const statementPath = path.parentPath != null && isProgram(path.parentPath) ? path : getProgramStatement(path);
+    const statementPath = path.parentPath != null && path.parentPath.isProgram() ? path : getProgramStatement(path);
     let injectName;
     if (this.injectImportInserted != null) {
       injectName = this.injectImportInserted;
@@ -1130,12 +1033,17 @@ function possibleAliasedPaths(importPath, aliases) {
   }
   return result;
 }
+const getPossibleFilePaths = filePath => {
+  const extension = path.extname(filePath);
+  const filePathHasCodeExtension = EXTENSIONS.includes(extension);
+  const filePathNoCodeExtension = filePathHasCodeExtension ? filePath.slice(0, -extension.length) : filePath;
+  return [filePath, ...EXTENSIONS.map(ext => filePathNoCodeExtension + ext)];
+};
 const filePathResolver = (relativeFilePath, sourceFilePath, aliases) => {
-  for (const ext of ['', ...EXTENSIONS]) {
-    const importPathStr = relativeFilePath + ext;
+  for (const importPathStr of getPossibleFilePaths(relativeFilePath)) {
     if (importPathStr.startsWith('.')) {
       try {
-        return importMetaResolve.moduleResolve(importPathStr, url.pathToFileURL(sourceFilePath)).pathname;
+        return url.fileURLToPath(importMetaResolve.moduleResolve(importPathStr, url.pathToFileURL(sourceFilePath)));
       } catch {
         continue;
       }
@@ -1143,7 +1051,7 @@ const filePathResolver = (relativeFilePath, sourceFilePath, aliases) => {
     const allAliases = possibleAliasedPaths(importPathStr, aliases);
     for (const possiblePath of allAliases) {
       try {
-        return importMetaResolve.moduleResolve(possiblePath, url.pathToFileURL(sourceFilePath)).pathname;
+        return url.fileURLToPath(importMetaResolve.moduleResolve(possiblePath, url.pathToFileURL(sourceFilePath)));
       } catch {
         continue;
       }
@@ -1159,10 +1067,10 @@ const addFileExtension = (importedFilePath, sourceFile) => {
   const fileExtension = path.extname(sourceFile);
   return importedFilePath + fileExtension;
 };
-const matchesFileSuffix = allowedSuffix => filename => filename.endsWith(`${allowedSuffix}.js`) || filename.endsWith(`${allowedSuffix}.ts`) || filename.endsWith(`${allowedSuffix}.tsx`) || filename.endsWith(`${allowedSuffix}.jsx`) || filename.endsWith(`${allowedSuffix}.mjs`) || filename.endsWith(`${allowedSuffix}.cjs`) || filename.endsWith(allowedSuffix);
+const matchesFileSuffix = allowedSuffix => filename => ['', ...EXTENSIONS].some(extension => filename.endsWith(`${allowedSuffix}${extension}`));
 const getProgramPath = path => {
   let programPath = path;
-  while (programPath != null && !isProgram(programPath)) {
+  while (programPath != null && !programPath.isProgram()) {
     if (programPath.parentPath) {
       programPath = programPath.parentPath;
     } else {
@@ -1173,11 +1081,21 @@ const getProgramPath = path => {
 };
 const getProgramStatement = path => {
   let programPath = path;
-  while (programPath.parentPath != null && !isProgram(programPath.parentPath) && programPath.parentPath != null) {
+  while (programPath.parentPath != null && !programPath.parentPath.isProgram() && programPath.parentPath != null) {
     programPath = programPath.parentPath;
   }
   return programPath;
 };
+function getRelativePath(from, to) {
+  const relativePath = path.relative(path.parse(from).dir, to);
+  return formatRelativePath(toPosixPath(relativePath));
+}
+function toPosixPath(filePath) {
+  return filePath.split(path.sep).join(path.posix.sep);
+}
+function formatRelativePath(filePath) {
+  return filePath.startsWith('.') ? filePath : './' + filePath;
+}
 
 function readImportDeclarations(path, state) {
   const {
@@ -1291,6 +1209,63 @@ function readRequires(path, state) {
   }
 }
 
+function getPackagePrefix(absolutePath) {
+  const nodeModulesIndex = absolutePath.indexOf('node_modules');
+  if (nodeModulesIndex !== -1) {
+    const packageName = absolutePath.substring(nodeModulesIndex + 'node_modules'.length + 1);
+    return packageName.split(path.sep)[0];
+  }
+  return undefined;
+}
+function getShortPath(relativePath) {
+  return relativePath.split(path.sep).slice(-2).join('/');
+}
+function createShortFilename(absolutePath, state) {
+  const isHaste = state.options.unstable_moduleResolution?.type === 'haste';
+  const relativePath = path.relative(process.cwd(), absolutePath);
+  const packagePrefix = getPackagePrefix(absolutePath);
+  if (packagePrefix) {
+    const shortPath = getShortPath(relativePath);
+    return `${packagePrefix}:${shortPath}`;
+  } else {
+    if (isHaste) {
+      return path.basename(absolutePath);
+    }
+    return getShortPath(relativePath);
+  }
+}
+function addSourceMapData(obj, babelPath, state) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const currentFile = babelPath.hub.file;
+    const sourceMap = currentFile.codeMap;
+    const styleNodePath = babelPath.get('arguments.0.properties').find(prop => prop.node.key.name === key);
+    if (!styleNodePath) {
+      console.warn(`Style node path not found for key: ${key}`);
+      continue;
+    }
+    const generatedLineNumber = styleNodePath.node.loc?.start.line;
+    let originalLineNumber = generatedLineNumber;
+    if (sourceMap && originalLineNumber) {
+      const originalPosition = sourceMap.originalPositionFor({
+        line: generatedLineNumber,
+        column: styleNodePath.node.loc?.start.column
+      });
+      if (originalPosition && originalPosition.line !== null) {
+        originalLineNumber = originalPosition.line;
+      } else {
+        console.warn(`Could not determine original line number for key: ${key}`);
+      }
+    }
+    const shortFilename = createShortFilename(currentFile.opts.filename || '', state);
+    result[key] = {
+      ...value,
+      $$css: shortFilename !== '' && originalLineNumber ? `${shortFilename}:${originalLineNumber}` : true
+    };
+  }
+  return result;
+}
+
 function namespaceToDevClassName(namespace, varName, filename) {
   const basename = path.basename(filename).split('.')[0];
   const className = `${basename}__${varName ? `${varName}.` : ''}${namespace}`;
@@ -1322,14 +1297,11 @@ function convertToTestStyles(obj, varName, state) {
 function convertObjectToAST(obj) {
   return t__namespace.objectExpression(Object.entries(obj).map(_ref => {
     let [key, value] = _ref;
-    return value instanceof shared.IncludedStyles ? t__namespace.spreadElement(value.astNode) : t__namespace.objectProperty(canBeIdentifier(key) ? t__namespace.identifier(key) : t__namespace.stringLiteral(key), typeof value === 'string' ? t__namespace.stringLiteral(value) : typeof value === 'number' ? t__namespace.numericLiteral(value) : typeof value === 'boolean' ? t__namespace.booleanLiteral(value) : value === null ? t__namespace.nullLiteral() : convertObjectToAST(value));
+    return t__namespace.objectProperty(canBeIdentifier(key) ? t__namespace.identifier(key) : t__namespace.stringLiteral(key), typeof value === 'string' ? t__namespace.stringLiteral(value) : typeof value === 'number' ? t__namespace.numericLiteral(value) : typeof value === 'boolean' ? t__namespace.booleanLiteral(value) : value === null ? t__namespace.nullLiteral() : convertObjectToAST(value));
   }));
 }
 function removeObjectsWithSpreads(obj) {
-  return Object.fromEntries(Object.entries(obj).filter(_ref2 => {
-    let [_key, value] = _ref2;
-    return Object.values(value).every(val => !(val instanceof shared.IncludedStyles));
-  }).filter(Boolean));
+  return Object.fromEntries(Object.entries(obj).filter(Boolean));
 }
 function canBeIdentifier(str) {
   return str.match(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/) != null;
@@ -1390,13 +1362,13 @@ function evaluateImportedFile(filePath, namedExport, state, bindingPath) {
   traverse(astNode, {
     ExportNamedDeclaration(path) {
       const declaration = path.get('declaration');
-      if (isVariableDeclaration(declaration)) {
+      if (declaration.isVariableDeclaration()) {
         const decls = declaration.get('declarations');
         const finder = decl => {
-          if (isVariableDeclarator(decl)) {
+          if (decl.isVariableDeclarator()) {
             const id = decl.get('id');
             const init = decl.get('init');
-            if (isIdentifier(id) && id.node.name === namedExport && init != null && isExpression(init)) {
+            if (id.isIdentifier() && id.node.name === namedExport && init != null && init.isExpression()) {
               result = evaluateCached(init, state);
             }
           }
@@ -1483,11 +1455,11 @@ function evaluateCached(path, state) {
 }
 function _evaluate(path, state) {
   if (!state.confident) return;
-  if (isArrowFunctionExpression(path)) {
+  if (path.isArrowFunctionExpression()) {
     const body = path.get('body');
     const params = path.get('params');
-    const identParams = params.filter(param => isIdentifier(param)).map(paramPath => paramPath.node.name);
-    if (isExpression(body) && identParams.length === params.length) {
+    const identParams = params.filter(param => param.isIdentifier()).map(paramPath => paramPath.node.name);
+    if (body.isExpression() && identParams.length === params.length) {
       const expr = body;
       return function () {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -1506,13 +1478,13 @@ function _evaluate(path, state) {
       };
     }
   }
-  if (isIdentifier(path)) {
+  if (path.isIdentifier()) {
     const name = path.node.name;
     if (Object.keys(state.functions?.identifiers ?? {}).includes(name)) {
       return state.functions.identifiers[name];
     }
   }
-  if (isTSAsExpression(path)) {
+  if (path.isTSAsExpression()) {
     const expr = path.get('expression');
     return evaluateCached(expr, state);
   }
@@ -1520,32 +1492,32 @@ function _evaluate(path, state) {
     const expr = path.get('expression');
     return evaluateCached(expr, state);
   }
-  if (isSequenceExpression(path)) {
+  if (path.isSequenceExpression()) {
     const exprs = path.get('expressions');
     return evaluateCached(exprs[exprs.length - 1], state);
   }
-  if (isStringLiteral(path) || isNumericLiteral(path) || isBooleanLiteral(path)) {
+  if (path.isStringLiteral() || path.isNumericLiteral() || path.isBooleanLiteral()) {
     return path.node.value;
   }
-  if (isNullLiteral(path)) {
+  if (path.isNullLiteral()) {
     return null;
   }
-  if (isTemplateLiteral(path)) {
+  if (path.isTemplateLiteral()) {
     return evaluateQuasis(path, path.node.quasis, state);
   }
-  const maybeTag = isTaggedTemplateExpression(path) && path.get('tag');
-  if (isTaggedTemplateExpression(path) && maybeTag && isMemberExpression(maybeTag)) {
+  const maybeTag = path.isTaggedTemplateExpression() && path.get('tag');
+  if (path.isTaggedTemplateExpression() && maybeTag && maybeTag.isMemberExpression()) {
     const tag = maybeTag;
     const object = tag.get('object');
-    if (isIdentifier(object)) {
+    if (object.isIdentifier()) {
       const name = object.node.name;
       const property = tag.get('property');
-      if (name === 'String' && !path.scope.hasBinding(name) && isIdentifier(property) && property.node.name === 'raw') {
+      if (name === 'String' && !path.scope.hasBinding(name) && property.isIdentifier() && property.node.name === 'raw') {
         return evaluateQuasis(path, path.node.quasi.quasis, state, true);
       }
     }
   }
-  if (isConditionalExpression(path)) {
+  if (path.isConditionalExpression()) {
     const testResult = evaluateCached(path.get('test'), state);
     if (!state.confident) return;
     if (testResult) {
@@ -1554,10 +1526,10 @@ function _evaluate(path, state) {
       return evaluateCached(path.get('alternate'), state);
     }
   }
-  if (isExpressionWrapper(path)) {
+  if (path.isExpressionWrapper()) {
     return evaluateCached(path.get('expression'), state);
   }
-  if (isMemberExpression(path) && !isCallExpression(path.parentPath, {
+  if (path.isMemberExpression() && !path.parentPath.isCallExpression({
     callee: path.node
   })) {
     const object = evaluateCached(path.get('object'), state);
@@ -1571,25 +1543,25 @@ function _evaluate(path, state) {
       if (!state.confident) {
         return;
       }
-    } else if (isIdentifier(propPath)) {
+    } else if (propPath.isIdentifier()) {
       property = propPath.node.name;
-    } else if (isStringLiteral(propPath)) {
+    } else if (propPath.isStringLiteral()) {
       property = propPath.node.value;
     } else {
       return deopt(propPath, state, UNEXPECTED_MEMBER_LOOKUP);
     }
     return object[property];
   }
-  if (isReferencedIdentifier(path)) {
+  if (path.isReferencedIdentifier()) {
     const binding = path.scope?.getBinding(path.node.name);
     const bindingPath = binding?.path;
-    if (binding && bindingPath && !isImportDefaultSpecifier(bindingPath) && !isImportNamespaceSpecifier(bindingPath) && isImportSpecifier(bindingPath)) {
+    if (binding && bindingPath && !bindingPath.isImportDefaultSpecifier() && !bindingPath.isImportNamespaceSpecifier() && bindingPath.isImportSpecifier()) {
       const importSpecifierPath = bindingPath;
       const importSpecifierNode = importSpecifierPath.node;
       const imported = importSpecifierNode.imported;
       const importedName = imported.type === 'Identifier' ? imported.name : imported.value;
       const importPath = binding.path.parentPath;
-      if (importPath && isImportDeclaration(importPath)) {
+      if (importPath && importPath.isImportDeclaration()) {
         const absPath = state.traversalState.importPathResolver(importPath.node.source.value);
         if (!absPath) {
           return deopt(binding.path, state, IMPORT_PATH_RESOLUTION_ERROR);
@@ -1607,7 +1579,7 @@ function _evaluate(path, state) {
         }
       }
     }
-    if (binding && bindingPath && isImportDefaultSpecifier(bindingPath)) {
+    if (binding && bindingPath && bindingPath.isImportDefaultSpecifier()) {
       deopt(binding.path, state, IMPORT_FILE_EVAL_ERROR);
     }
     if (binding && binding.constantViolations.length > 0) {
@@ -1634,14 +1606,14 @@ function _evaluate(path, state) {
       }
     }
   }
-  if (isUnaryExpression(path, {
+  if (path.isUnaryExpression({
     prefix: true
   })) {
     if (path.node.operator === 'void') {
       return undefined;
     }
     const argument = path.get('argument');
-    if (path.node.operator === 'typeof' && (isFunction(argument) || isClass(argument))) {
+    if (path.node.operator === 'typeof' && (argument.isFunction() || argument.isClass())) {
       return 'function';
     }
     const arg = evaluateCached(argument, state);
@@ -1663,7 +1635,7 @@ function _evaluate(path, state) {
         return deopt(path, state, UNSUPPORTED_OPERATOR(path.node.operator));
     }
   }
-  if (isArrayExpression(path)) {
+  if (path.isArrayExpression()) {
     const arrPath = path;
     const arr = [];
     const elems = arrPath.get('elements');
@@ -1678,14 +1650,14 @@ function _evaluate(path, state) {
     }
     return arr;
   }
-  if (isObjectExpression(path)) {
+  if (path.isObjectExpression()) {
     const obj = {};
     const props = path.get('properties');
     for (const prop of props) {
-      if (isObjectMethod(prop)) {
+      if (prop.isObjectMethod()) {
         return deopt(prop, state, OBJECT_METHOD);
       }
-      if (isSpreadElement(prop)) {
+      if (prop.isSpreadElement()) {
         const spreadExpression = evaluateCached(prop.get('argument'), state);
         if (!state.confident) {
           return deopt(prop, state, state.deoptReason ?? 'unknown error');
@@ -1693,7 +1665,7 @@ function _evaluate(path, state) {
         Object.assign(obj, spreadExpression);
         continue;
       }
-      if (isObjectProperty(prop)) {
+      if (prop.isObjectProperty()) {
         const keyPath = prop.get('key');
         let key;
         if (prop.node.computed) {
@@ -1708,7 +1680,7 @@ function _evaluate(path, state) {
             return;
           }
           key = value;
-        } else if (isIdentifier(keyPath)) {
+        } else if (keyPath.isIdentifier()) {
           key = keyPath.node.name;
         } else {
           key = keyPath.node.value;
@@ -1725,7 +1697,7 @@ function _evaluate(path, state) {
     }
     return obj;
   }
-  if (isLogicalExpression(path)) {
+  if (path.isLogicalExpression()) {
     const stateForLeft = {
       ...state,
       deoptPath: null,
@@ -1795,7 +1767,7 @@ function _evaluate(path, state) {
         path.node.operator;
     }
   }
-  if (isBinaryExpression(path)) {
+  if (path.isBinaryExpression()) {
     const left = evaluateCached(path.get('left'), state);
     if (!state.confident) return;
     const right = evaluateCached(path.get('right'), state);
@@ -1849,15 +1821,15 @@ function _evaluate(path, state) {
         return;
     }
   }
-  if (isCallExpression(path)) {
+  if (path.isCallExpression()) {
     const callee = path.get('callee');
     let context;
     let func;
-    if (isIdentifier(callee) && !path.scope.getBinding(callee.node.name) && isValidCallee(callee.node.name)) {
+    if (callee.isIdentifier() && !path.scope.getBinding(callee.node.name) && isValidCallee(callee.node.name)) {
       func = global[callee.node.name];
-    } else if (isIdentifier(callee) && state.functions.identifiers[callee.node.name]) {
+    } else if (callee.isIdentifier() && state.functions.identifiers[callee.node.name]) {
       func = state.functions.identifiers[callee.node.name];
-    } else if (isIdentifier(callee)) {
+    } else if (callee.isIdentifier()) {
       const maybeFunction = evaluateCached(callee, state);
       if (state.confident) {
         func = maybeFunction;
@@ -1865,10 +1837,10 @@ function _evaluate(path, state) {
         deopt(callee, state, NON_CONSTANT);
       }
     }
-    if (isMemberExpression(callee)) {
+    if (callee.isMemberExpression()) {
       const object = callee.get('object');
       const property = callee.get('property');
-      if (isIdentifier(object) && isIdentifier(property)) {
+      if (object.isIdentifier() && property.isIdentifier()) {
         if (isValidCallee(object.node.name) && !isInvalidMethod(property.node.name)) {
           context = global[object.node.name];
           func = context[property.node.name];
@@ -1877,11 +1849,11 @@ function _evaluate(path, state) {
           func = context[property.node.name];
         }
       }
-      if (isIdentifier(object) && isStringLiteral(property) && state.functions.memberExpressions[object.node.name] && state.functions.memberExpressions[object.node.name][property.node.value]) {
+      if (object.isIdentifier() && property.isStringLiteral() && state.functions.memberExpressions[object.node.name] && state.functions.memberExpressions[object.node.name][property.node.value]) {
         context = state.functions.memberExpressions[object.node.name];
         func = context[property.node.value];
       }
-      if ((isStringLiteral(object) || isNumericLiteral(object)) && isIdentifier(property)) {
+      if ((object.isStringLiteral() || object.isNumericLiteral()) && property.isIdentifier()) {
         const val = object.node.value;
         func = val[property.node.name];
         if (typeof val === 'string') {
@@ -1890,11 +1862,11 @@ function _evaluate(path, state) {
       }
       if (func == null) {
         const parsedObj = evaluate(object, state.traversalState, state.functions);
-        if (parsedObj.confident && isIdentifier(property)) {
+        if (parsedObj.confident && property.isIdentifier()) {
           func = parsedObj.value[property.node.name];
           context = parsedObj.value;
         }
-        if (parsedObj.confident && isStringLiteral(property)) {
+        if (parsedObj.confident && property.isStringLiteral()) {
           func = parsedObj.value[property.node.value];
           context = parsedObj.value;
         }
@@ -1921,7 +1893,7 @@ function evaluateQuasis(path, quasis, state) {
   let raw = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   let str = '';
   let i = 0;
-  const exprs = isTemplateLiteral(path) ? path.get('expressions') : isTaggedTemplateExpression(path) ? path.get('quasi').get('expressions') : [];
+  const exprs = path.isTemplateLiteral() ? path.get('expressions') : path.isTaggedTemplateExpression() ? path.get('quasi').get('expressions') : [];
   for (const elem of quasis) {
     if (!state.confident) break;
     str += raw ? elem.value.raw : elem.value.cooked;
@@ -2794,7 +2766,7 @@ function requireMessages () {
 	Object.defineProperty(messages, "__esModule", {
 	  value: true
 	});
-	messages.UNKNOWN_PROP_KEY = messages.UNKNOWN_NAMESPACE = messages.UNEXPECTED_ARGUMENT = messages.UNBOUND_STYLEX_CALL_VALUE = messages.ONLY_TOP_LEVEL_INCLUDES = messages.ONLY_TOP_LEVEL = messages.ONLY_NAMED_PARAMETERS_IN_DYNAMIC_STYLE_FUNCTIONS = messages.NO_PROJECT_ROOT_DIRECTORY = messages.NO_PARENT_PATH = messages.NO_CONDITIONAL_SHORTHAND = messages.NON_STATIC_VALUE = messages.NON_STATIC_KEYFRAME_VALUE = messages.NON_OBJECT_KEYFRAME = messages.NON_OBJECT_FOR_STYLEX_KEYFRAMES_CALL = messages.NON_OBJECT_FOR_STYLEX_CALL = messages.NON_EXPORT_NAMED_DECLARATION = messages.NON_CONTIGUOUS_VARS = messages.LOCAL_ONLY = messages.LINT_UNCLOSED_FUNCTION = messages.INVALID_SPREAD = messages.INVALID_PSEUDO_OR_AT_RULE = messages.INVALID_PSEUDO = messages.ILLEGAL_PROP_VALUE = messages.ILLEGAL_PROP_ARRAY_VALUE = messages.ILLEGAL_NESTED_PSEUDO = messages.ILLEGAL_NAMESPACE_VALUE = messages.ILLEGAL_NAMESPACE_TYPE = messages.ILLEGAL_ARG_LENGTH_FOR_KEYFRAMES = messages.ILLEGAL_ARGUMENT_LENGTH = messages.EXPECTED_FUNCTION_CALL = messages.ESCAPED_STYLEX_VALUE = messages.DUPLICATE_CONDITIONAL = messages.ANONYMOUS_THEME = void 0;
+	messages.UNKNOWN_PROP_KEY = messages.UNKNOWN_NAMESPACE = messages.UNEXPECTED_ARGUMENT = messages.UNBOUND_STYLEX_CALL_VALUE = messages.ONLY_TOP_LEVEL = messages.ONLY_NAMED_PARAMETERS_IN_DYNAMIC_STYLE_FUNCTIONS = messages.NO_PROJECT_ROOT_DIRECTORY = messages.NO_PARENT_PATH = messages.NO_CONDITIONAL_SHORTHAND = messages.NON_STATIC_VALUE = messages.NON_STATIC_KEYFRAME_VALUE = messages.NON_OBJECT_KEYFRAME = messages.NON_OBJECT_FOR_STYLEX_KEYFRAMES_CALL = messages.NON_OBJECT_FOR_STYLEX_CALL = messages.NON_EXPORT_NAMED_DECLARATION = messages.NON_CONTIGUOUS_VARS = messages.LOCAL_ONLY = messages.LINT_UNCLOSED_FUNCTION = messages.INVALID_SPREAD = messages.INVALID_PSEUDO_OR_AT_RULE = messages.INVALID_PSEUDO = messages.ILLEGAL_PROP_VALUE = messages.ILLEGAL_PROP_ARRAY_VALUE = messages.ILLEGAL_NESTED_PSEUDO = messages.ILLEGAL_NAMESPACE_VALUE = messages.ILLEGAL_NAMESPACE_TYPE = messages.ILLEGAL_ARG_LENGTH_FOR_KEYFRAMES = messages.ILLEGAL_ARGUMENT_LENGTH = messages.EXPECTED_FUNCTION_CALL = messages.ESCAPED_STYLEX_VALUE = messages.DUPLICATE_CONDITIONAL = messages.ANONYMOUS_THEME = void 0;
 	messages.ILLEGAL_ARGUMENT_LENGTH = 'stylex.create() should have 1 argument.';
 	messages.ILLEGAL_ARG_LENGTH_FOR_KEYFRAMES = 'stylex.keyframes() should have 1 argument.';
 	messages.NON_STATIC_VALUE = 'Only static values are allowed inside of a stylex.create() call.';
@@ -2821,7 +2793,6 @@ function requireMessages () {
 	messages.UNEXPECTED_ARGUMENT = 'Unexpected argument passed to the stylex() function.';
 	messages.EXPECTED_FUNCTION_CALL = 'Expected a simple function call but found something else.';
 	messages.NO_PARENT_PATH = 'Unexpected AST node without a parent path.';
-	messages.ONLY_TOP_LEVEL_INCLUDES = 'stylex.include() is only at the top level of a style definition object.';
 	messages.DUPLICATE_CONDITIONAL = 'The same pseudo selector or at-rule cannot be used more than once.';
 	messages.NO_PROJECT_ROOT_DIRECTORY = 'The project root directory `rootDir` is not configured.';
 	messages.NON_EXPORT_NAMED_DECLARATION = 'The return value of stylex.defineVars() must be bound to a named export.';
@@ -3004,13 +2975,13 @@ function evaluateStyleXCreateArg(path, traversalState) {
     identifiers: {},
     memberExpressions: {}
   };
-  if (!isObjectExpression(path)) {
+  if (!path.isObjectExpression()) {
     return evaluate(path, traversalState, functions);
   }
   const value = {};
   const fns = {};
   for (const prop of path.get('properties')) {
-    if (!isObjectProperty(prop)) {
+    if (!prop.isObjectProperty()) {
       return evaluate(path, traversalState, functions);
     }
     const objPropPath = prop;
@@ -3024,7 +2995,7 @@ function evaluateStyleXCreateArg(path, traversalState) {
     }
     const key = keyResult.value;
     const valPath = prop.get('value');
-    if (!isArrowFunctionExpression(valPath)) {
+    if (!valPath.isArrowFunctionExpression()) {
       const val = evaluate(valPath, traversalState, functions);
       if (!val.confident) {
         return val;
@@ -3035,9 +3006,9 @@ function evaluateStyleXCreateArg(path, traversalState) {
     const fnPath = valPath;
     const allParams = fnPath.get('params');
     validateDynamicStyleParams(fnPath, allParams);
-    const params = allParams.filter(param => isIdentifier(param)).map(param => param.node);
+    const params = allParams.filter(param => param.isIdentifier()).map(param => param.node);
     const fnBody = fnPath.get('body');
-    if (!isObjectExpression(fnBody)) {
+    if (!fnBody.isObjectExpression()) {
       return evaluate(path, traversalState, functions);
     }
     const fnObjectBody = fnBody;
@@ -3077,13 +3048,13 @@ function evaluatePartialObjectRecursively(path, traversalState) {
   const inlineStyles = {};
   const props = path.get('properties');
   for (const prop of props) {
-    if (isObjectMethod(prop)) {
+    if (prop.isObjectMethod()) {
       return {
         value: null,
         confident: false
       };
     }
-    if (isSpreadElement(prop)) {
+    if (prop.isSpreadElement()) {
       const result = evaluate(prop.get('argument'), traversalState, functions);
       if (!result.confident) {
         return result;
@@ -3091,7 +3062,7 @@ function evaluatePartialObjectRecursively(path, traversalState) {
       Object.assign(obj, result.value);
       continue;
     }
-    if (isObjectProperty(prop)) {
+    if (prop.isObjectProperty()) {
       const keyResult = evaluateObjKey(prop, traversalState, functions);
       if (!keyResult.confident) {
         return {
@@ -3105,7 +3076,7 @@ function evaluatePartialObjectRecursively(path, traversalState) {
         key = key.slice(4, -1);
       }
       const valuePath = prop.get('value');
-      if (isObjectExpression(valuePath)) {
+      if (valuePath.isObjectExpression()) {
         const result = evaluatePartialObjectRecursively(valuePath, traversalState, functions, [...keyPath, key]);
         if (!result.confident) {
           return {
@@ -3159,7 +3130,7 @@ function evaluateObjKey(prop, traversalState, functions) {
       };
     }
     key = result.value;
-  } else if (isIdentifier(keyPath)) {
+  } else if (keyPath.isIdentifier()) {
     key = keyPath.node.name;
   } else {
     key = keyPath.node.value;
@@ -3170,7 +3141,7 @@ function evaluateObjKey(prop, traversalState, functions) {
   };
 }
 function validateDynamicStyleParams(path, params) {
-  if (params.some(param => !isIdentifier(param))) {
+  if (params.some(param => !param.isIdentifier())) {
     throw path.buildCodeFrameError(shared.messages.ONLY_NAMED_PARAMETERS_IN_DYNAMIC_STYLE_FUNCTIONS, SyntaxError);
   }
 }
@@ -3749,12 +3720,6 @@ function transformStyleXCreate(path, state) {
     }
     const identifiers = {};
     const memberExpressions = {};
-    state.stylexIncludeImport.forEach(name => {
-      identifiers[name] = {
-        fn: shared.include,
-        takesPath: true
-      };
-    });
     state.stylexFirstThatWorksImport.forEach(name => {
       identifiers[name] = {
         fn: shared.firstThatWorks
@@ -3769,10 +3734,6 @@ function transformStyleXCreate(path, state) {
       if (memberExpressions[name] == null) {
         memberExpressions[name] = {};
       }
-      memberExpressions[name].include = {
-        fn: shared.include,
-        takesPath: true
-      };
       memberExpressions[name].firstThatWorks = {
         fn: shared.firstThatWorks
       };
@@ -3800,7 +3761,7 @@ function transformStyleXCreate(path, state) {
       dynamicFnsNames.forEach(fnsName => {
         injectedInheritStyles[fnsName] = {
           priority: 0,
-          ltr: `@property ${fnsName} { syntax: "*"; inherits: false; initial-value: "*";}`,
+          ltr: `@property ${fnsName} { syntax: "*"; inherits: false;}`,
           rtl: null
         };
       });
@@ -3812,21 +3773,27 @@ function transformStyleXCreate(path, state) {
       ...injectedInheritStyles
     };
     let varName = null;
-    if (isVariableDeclarator(path.parentPath)) {
+    if (path.parentPath.isVariableDeclarator()) {
       const idNode = path.parentPath.node.id;
       if (idNode.type === 'Identifier') {
         varName = idNode.name;
       }
     }
-    if (state.isTest) {
+    if (state.isDebug && state.opts.enableDebugDataProp) {
       compiledStyles = {
-        ...convertToTestStyles(compiledStyles, varName, state)
+        ...addSourceMapData(compiledStyles, path, state)
       };
-    } else if (state.isDev) {
+    }
+    if (state.isDev && state.opts.enableDevClassNames) {
       compiledStyles = {
         ...injectDevClassNames(compiledStyles, varName, state)
       };
     }
+    if (state.isTest) {
+      compiledStyles = {
+        ...convertToTestStyles(compiledStyles, varName, state)
+      };
+    }
     if (varName != null) {
       const stylesToRemember = removeObjectsWithSpreads(compiledStyles);
       state.styleMap.set(varName, stylesToRemember);
@@ -3939,11 +3906,11 @@ function transformStyleXCreate(path, state) {
   state.inStyleXCreate = false;
 }
 function validateStyleXCreate(path) {
-  if (path.parentPath == null || isExpressionStatement(path.parentPath)) {
+  if (path.parentPath == null || path.parentPath.isExpressionStatement()) {
     throw path.buildCodeFrameError(shared.messages.UNBOUND_STYLEX_CALL_VALUE, SyntaxError);
   }
   const nearestStatement = findNearestStatementAncestor(path);
-  if (!isProgram(nearestStatement.parentPath) && !isExportNamedDeclaration(nearestStatement.parentPath)) {
+  if (!nearestStatement.parentPath.isProgram() && !nearestStatement.parentPath.isExportNamedDeclaration()) {
     throw path.buildCodeFrameError(shared.messages.ONLY_TOP_LEVEL, SyntaxError);
   }
   if (path.node.arguments.length !== 1) {
@@ -3954,7 +3921,7 @@ function validateStyleXCreate(path) {
   }
 }
 function findNearestStatementAncestor(path) {
-  if (isStatement(path)) {
+  if (path.isStatement()) {
     return path;
   }
   if (path.parentPath == null) {
@@ -3994,7 +3961,7 @@ function transformStyleXDefineVars(callExpressionPath, state) {
   if (callExpressionNode.callee.type === 'Identifier' && state.stylexDefineVarsImport.has(callExpressionNode.callee.name) || callExpressionNode.callee.type === 'MemberExpression' && callExpressionNode.callee.property.name === 'defineVars' && callExpressionNode.callee.object.type === 'Identifier' && callExpressionNode.callee.property.type === 'Identifier' && state.stylexImport.has(callExpressionNode.callee.object.name)) {
     validateStyleXDefineVars(callExpressionPath);
     const variableDeclaratorPath = callExpressionPath.parentPath;
-    if (!isVariableDeclarator(variableDeclaratorPath)) {
+    if (!variableDeclaratorPath.isVariableDeclarator()) {
       return;
     }
     const variableDeclaratorNode = variableDeclaratorPath.node;
@@ -4094,11 +4061,11 @@ function transformStyleXCreateTheme(callExpressionPath, state) {
   if (callExpressionNode.callee.type === 'Identifier' && state.stylexCreateThemeImport.has(callExpressionNode.callee.name) || callExpressionNode.callee.type === 'MemberExpression' && callExpressionNode.callee.object.type === 'Identifier' && callExpressionNode.callee.property.type === 'Identifier' && callExpressionNode.callee.property.name === 'createTheme' && state.stylexImport.has(callExpressionNode.callee.object.name)) {
     validateStyleXCreateTheme(callExpressionPath);
     const variableDeclaratorPath = callExpressionPath.parentPath;
-    if (!isVariableDeclarator(variableDeclaratorPath)) {
+    if (!variableDeclaratorPath.isVariableDeclarator()) {
       return;
     }
     const id = variableDeclaratorPath.get('id');
-    if (!isIdentifier(id)) {
+    if (!id.isIdentifier()) {
       return;
     }
     const variableName = id.node.name;
@@ -4217,7 +4184,7 @@ function transformStyleXKeyframes(path, state) {
       throw path.buildCodeFrameError(shared.messages.NON_OBJECT_FOR_STYLEX_KEYFRAMES_CALL, SyntaxError);
     }
     const init = path.get('init');
-    if (init == null || !isCallExpression(init)) {
+    if (init == null || !init.isCallExpression()) {
       throw path.buildCodeFrameError(shared.messages.NON_STATIC_KEYFRAME_VALUE, SyntaxError);
     }
     const args = init.get('arguments');
@@ -4409,7 +4376,7 @@ function transformStyleXMerge(path, state) {
           state.styleVarsToKeep.add([objName, propName != null ? String(propName) : true, styleNonNullProps]);
         }
       }
-      if (isMemberExpression(argPath)) {
+      if (argPath.isMemberExpression()) {
         MemberExpression(argPath);
       } else {
         argPath.traverse({
@@ -4455,7 +4422,7 @@ function parseNullableStyle$2(node, state) {
 function makeStringExpression$2(values) {
   const conditions = values.filter(v => Array.isArray(v)).map(v => v[0]);
   if (conditions.length === 0) {
-    return t__namespace.stringLiteral(stylex(...values));
+    return t__namespace.stringLiteral(stylex.legacyMerge(...values));
   }
   const conditionPermutations = genConditionPermutations$2(conditions.length);
   const objEntries = conditionPermutations.map(permutation => {
@@ -4469,7 +4436,7 @@ function makeStringExpression$2(values) {
       }
     });
     const key = permutation.reduce((soFar, bool) => soFar << 1 | (bool ? 1 : 0), 0);
-    return t__namespace.objectProperty(t__namespace.numericLiteral(key), t__namespace.stringLiteral(stylex(...args)));
+    return t__namespace.objectProperty(t__namespace.numericLiteral(key), t__namespace.stringLiteral(stylex.legacyMerge(...args)));
   });
   const objExpressions = t__namespace.objectExpression(objEntries);
   const conditionsToKey = genBitwiseOrOfConditions$2(conditions);
@@ -4631,7 +4598,7 @@ function transformStylexProps(path, state) {
           state.styleVarsToKeep.add([objName, propName != null ? String(propName) : true, styleNonNullProps]);
         }
       }
-      if (isMemberExpression(argPath)) {
+      if (argPath.isMemberExpression()) {
         MemberExpression(argPath);
       } else {
         argPath.traverse({
@@ -4866,7 +4833,7 @@ function transformStylexAttrs(path, state) {
           state.styleVarsToKeep.add([objName, propName != null ? String(propName) : true, styleNonNullProps]);
         }
       }
-      if (isMemberExpression(argPath)) {
+      if (argPath.isMemberExpression()) {
         MemberExpression(argPath);
       } else {
         argPath.traverse({
@@ -4976,10 +4943,10 @@ function styleXTransform() {
         enter: (path, s) => {
           state = new StateManager(s);
           for (const block of path.get('body')) {
-            if (isImportDeclaration(block)) {
+            if (block.isImportDeclaration()) {
               readImportDeclarations(block, state);
             }
-            if (isVariableDeclaration(block)) {
+            if (block.isVariableDeclaration()) {
               for (const decl of block.get('declarations')) {
                 readRequires(decl, state);
               }
@@ -4988,14 +4955,36 @@ function styleXTransform() {
         },
         exit: path => {
           path.traverse({
+            ImportDeclaration(path) {
+              const filename = state.filename;
+              if (filename == null || !state.options.rewriteAliases) {
+                return;
+              }
+              const source = path.node.source.value;
+              const aliases = state.options.aliases;
+              const themeFileExtension = '.stylex';
+              if (!matchesFileSuffix(themeFileExtension)(source)) {
+                return;
+              }
+              const resolvedFilePath = filePathResolver(source, filename, aliases);
+              if (resolvedFilePath == null) {
+                return;
+              }
+              let relativeFilePath = getRelativePath(filename, resolvedFilePath);
+              const extension = EXTENSIONS.find(ext => relativeFilePath.endsWith(ext));
+              if (extension != null) {
+                relativeFilePath = relativeFilePath.slice(0, -extension.length);
+              }
+              path.node.source.value = relativeFilePath;
+            },
             Identifier(path) {
-              if (isReferencedIdentifier(path)) {
+              if (path.isReferencedIdentifier()) {
                 const {
                   name
                 } = path.node;
                 if (state.styleMap.has(name)) {
                   const parentPath = path.parentPath;
-                  if (isMemberExpression(parentPath)) {
+                  if (parentPath.isMemberExpression()) {
                     const {
                       property,
                       computed
@@ -5059,11 +5048,11 @@ function styleXTransform() {
               path.remove();
               return;
             }
-            if (isVariableDeclarator(path)) {
+            if (path.isVariableDeclarator()) {
               const init = path.get('init');
-              if (init != null && isObjectExpression(init)) {
+              if (init != null && init.isObjectExpression()) {
                 for (const prop of init.get('properties')) {
-                  if (isObjectProperty(prop)) {
+                  if (prop.isObjectProperty()) {
                     const key = prop.get('key').node;
                     const keyAsString = key.type === 'Identifier' ? key.name : key.type === 'StringLiteral' ? key.value : key.type === 'NumericLiteral' ? String(key.value) : null;
                     if (keyAsString != null) {
@@ -5080,9 +5069,9 @@ function styleXTransform() {
                         if (!allNullsToKeep.includes(true)) {
                           const nullsToKeep = new Set(allNullsToKeep.filter(x => x !== true).flat());
                           const styleObject = prop.get('value');
-                          if (isObjectExpression(styleObject)) {
+                          if (styleObject.isObjectExpression()) {
                             for (const styleProp of styleObject.get('properties')) {
-                              if (isObjectProperty(styleProp) && isNullLiteral(styleProp.get('value'))) {
+                              if (styleProp.isObjectProperty() && styleProp.get('value').isNullLiteral()) {
                                 const styleKey = styleProp.get('key').node;
                                 const styleKeyAsString = styleKey.type === 'Identifier' ? styleKey.name : styleKey.type === 'StringLiteral' ? styleKey.value : styleKey.type === 'NumericLiteral' ? String(styleKey.value) : null;
                                 if (styleKeyAsString != null && !nullsToKeep.has(styleKeyAsString)) {
@@ -5105,7 +5094,7 @@ function styleXTransform() {
         }
       },
       CallExpression(path) {
-        if (isVariableDeclarator(path.parentPath)) {
+        if (path.parentPath.isVariableDeclarator()) {
           transformStyleXKeyframes(path.parentPath, state);
         }
         transformStyleXDefineVars(path, state);
@@ -5120,10 +5109,10 @@ function stylexPluginWithOptions(options) {
 }
 styleXTransform.withOptions = stylexPluginWithOptions;
 function isExported(path) {
-  if (path == null || isProgram(path)) {
+  if (path == null || path.isProgram()) {
     return false;
   }
-  if (isExportNamedDeclaration(path) || isExportDefaultDeclaration(path)) {
+  if (path.isExportNamedDeclaration() || path.isExportDefaultDeclaration()) {
     return true;
   }
   return isExported(path.parentPath);