Merge pull request #22 from fink-lang/fix-import-detection

fix(jest-wrapper): fix import detections
fink-lang · Oct 5, 2020 · 291a880 · 291a880
2 parents 93e4e97 + 7321060
commit 291a880
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/transform.fnk b/src/transform.fnk
@@ -3,6 +3,7 @@
 
 {parse} = import '@fink/larix'
 {generate} = import '@fink/loxia'
+{starts_with} = import '@fink/std-lib/str'
 {set_props, new} = import '@fink/js-interop/reflect'
 {SyntaxError} = import '@fink/js-interop/globals'
 
@@ -30,7 +31,7 @@ module_scope = fn scope:
 
 is_import_from_fink_jest = fn init:
   match init:
-   {callee: {name: 'require'}, arguments: [{value: '@fink/jest'}]}:
+   {callee: {name: 'require'}, arguments: [{value: starts_with ?, '@fink/jest/'}]}:
       true
     else:
       false

diff --git a/src/transform.test.fnk b/src/transform.test.fnk
@@ -30,7 +30,7 @@ describe process, fn:
   it 'transforms mock imported from @fink/jest as jest.mock', fn:
     {code, map} = process
       "
-        {it, mock, mock_fn, require_actual} = import '@fink/jest'
+        {it, mock, mock_fn, require_actual} = import '@fink/jest/test.fnk'
 
         mock './transform.fnk', fn: dict:
           foobar: mock_fn _

diff --git a/src/transform.test.fnk.snap b/src/transform.test.fnk.snap
@@ -203,7 +203,7 @@ Object {
   mock,
   mock_fn,
   require_actual
-} = require(\\"@fink/jest\\");
+} = require(\\"@fink/jest/test.js\\");
 
 /* istanbul ignore next */
 jest.mock(\`./transform.fnk\`, () => ({
@@ -217,13 +217,13 @@ const foo = mock => mock(\`not jest.mock\`);
 
 exports.foo = foo;",
   "map": Object {
-    "mappings": ";AAAC,EAAA,E;AAAI,EAAA,I;AAAM,EAAA,O;AAAS,EAAA;YAAyB,Y;;AAE7C;AAAA,UAAI,iBAAJ,EAAwB,OAAI;AAC1B,YAAQ,OADkB,EAAA;AAE1B;AAAO;AAAA,qBAAc,aAAd;AAFmB,CAAJ,CAAxB;;AAIA,MAAA,GAAG,GAAG,IAAA,IACJ,IAAI,CADN,eACM,CADN;;QAAA,G,GAAA,G",
+    "mappings": ";AAAC,EAAA,E;AAAI,EAAA,I;AAAM,EAAA,O;AAAS,EAAA;YAAyB,oB;;AAE7C;AAAA,UAAI,iBAAJ,EAAwB,OAAI;AAC1B,YAAQ,OADkB,EAAA;AAE1B;AAAO;AAAA,qBAAc,aAAd;AAFmB,CAAJ,CAAxB;;AAIA,MAAA,GAAG,GAAG,IAAA,IACJ,IAAI,CADN,eACM,CADN;;QAAA,G,GAAA,G",
     "names": Array [],
     "sources": Array [
       "/temp/src/foobar.fnk",
     ],
     "sourcesContent": Array [
-      "{it, mock, mock_fn, require_actual} = import '@fink/jest'
+      "{it, mock, mock_fn, require_actual} = import '@fink/jest/test.fnk'
 
 mock './transform.fnk', fn: dict:
   foobar: mock_fn _