Fix getting env variables from import.meta.env.SOME_KEY (#400)

* Fix getting env variables from import.meta.env.SOME_KEY * remove double comment * tighten the check using AST tests --------- Co-authored-by: Mateusz Burzyński <[email protected]>
statelyai · Nov 14, 2023 · bcaeedc · bcaeedc
1 parent ca05e2d
commit bcaeedc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changeset/nervous-vans-appear.md b/.changeset/nervous-vans-appear.md
@@ -0,0 +1,5 @@
+---
+'@xstate/cli': patch
+---
+
+Fix getting env variables from import.meta.env.SOME_KEY
diff --git a/packages/machine-extractor/src/sky/skyConfigNode.ts b/packages/machine-extractor/src/sky/skyConfigNode.ts
@@ -33,10 +33,13 @@ const StringLiteralOrEnvKey = unionType([
             throw new Error("Couldn't find API key in any of the env files");
           }
 
-          // Let's find the last part of the expression (identifier), e.g. `API_KEY` in `process.env.API_KEY`
+          // Let's find the env key, e.g. `API_KEY` in `process.env.API_KEY` or in `import.meta.env.API_KEY`
           const envVariableName =
-            (t.isMetaProperty(node.object) ||
-              t.buildMatchMemberExpression('process.env')(node.object)) &&
+            (t.buildMatchMemberExpression('process.env')(node.object) ||
+              (t.isMemberExpression(node.object) &&
+                t.isMetaProperty(node.object.object) &&
+                t.isIdentifier(node.object.property) &&
+                node.object.property.name === 'env')) &&
             t.isIdentifier(node.property)
               ? node.property.name
               : null;