fix: ast cache issue with hmr

ccontrols · Dec 29, 2020 · ca7bc22 · ca7bc22
1 parent 7749541
commit ca7bc22
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -112,7 +112,7 @@
       "name": "jest instrument",
       "program": "${workspaceFolder}/node_modules/.bin/jest",
       "cwd": "${workspaceFolder}/core/instrument",
-      "args": ["extract-component"],
+      "args": ["mdx-story-source"],
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "disableOptimisticBPs": true,

diff --git a/core/instrument/src/index.ts b/core/instrument/src/index.ts
@@ -61,7 +61,7 @@ const parseSource = async (
   options: Required<InstrumentOptions>,
 ): Promise<ParseStorieReturnType | undefined> => {
   const source = await prettify(code, options.prettier, filePath);
-  const { ast } = parseFile(source, options.parser, source);
+  const { ast } = parseFile(filePath, options.parser, source);
 
   const store = traverseFn(ast, options, { source, filePath });
   if (!store) {
@@ -161,7 +161,7 @@ export const parseStories = async (
       filepath: filePath,
       ...otherMDXOptions,
     });
-    const { ast } = parseFile(filePath, mergedOptions.parser, code);
+    const { ast } = parseFile(filePath, mergedOptions.parser, code, false);
 
     if (transformMDX) {
       //second pass transform - inject any necessary attributes

diff --git a/core/instrument/src/misc/ast_store.ts b/core/instrument/src/misc/ast_store.ts
@@ -18,14 +18,19 @@ export const parseFile = (
   filePath: string,
   options?: parser.ParserOptions,
   sourceCode?: string,
+  cache: boolean = true,
 ): CacheProps => {
-  if (astCache[filePath]) {
-    return astCache[filePath];
-  }
   const source = sourceCode || fs.readFileSync(filePath, 'utf8');
+  if (!cache) {
+    return { ast: parser.parse(source, options), source };
+  }
+  const filekey = `${filePath}-${fs.statSync(filePath).mtime.toString()}`;
+  if (astCache[filekey]) {
+    return astCache[filekey];
+  }
   const ast = parser.parse(source, options);
-  astCache[filePath] = { ast, source };
-  return astCache[filePath];
+  astCache[filekey] = { ast, source };
+  return astCache[filekey];
 };
 
 export const parseImports = (

diff --git a/core/instrument/test/__snapshots__/mdx-story-source.test.ts.snap b/core/instrument/test/__snapshots__/mdx-story-source.test.ts.snap
@@ -5,8 +5,8 @@ Object {
   "components": Object {},
   "doc": Object {
     "componentsLookup": Object {},
-    "date": 2020-10-21T01:23:26.442Z,
-    "dateModified": 2020-10-21T01:23:26.442Z,
+    "date": 2020-12-29T05:27:27.469Z,
+    "dateModified": 2020-12-29T05:27:27.469Z,
     "title": "MDX",
   },
   "exports": Object {
@@ -92,8 +92,8 @@ Object {
   "components": Object {},
   "doc": Object {
     "componentsLookup": Object {},
-    "date": 2020-10-21T01:23:26.442Z,
-    "dateModified": 2020-10-21T01:23:26.442Z,
+    "date": 2020-12-29T05:27:27.468Z,
+    "dateModified": 2020-12-29T05:27:27.469Z,
     "title": "MDX",
   },
   "exports": Object {
@@ -231,8 +231,8 @@ Object {
   "components": Object {},
   "doc": Object {
     "componentsLookup": Object {},
-    "date": 2020-10-21T01:23:26.442Z,
-    "dateModified": 2020-10-21T01:23:26.442Z,
+    "date": 2020-12-29T05:27:27.469Z,
+    "dateModified": 2020-12-29T05:27:27.469Z,
     "title": "MDX",
   },
   "exports": Object {
@@ -448,8 +448,8 @@ Object {
   "components": Object {},
   "doc": Object {
     "componentsLookup": Object {},
-    "date": 2020-10-21T01:23:26.442Z,
-    "dateModified": 2020-10-21T01:23:26.442Z,
+    "date": 2020-12-29T05:27:27.469Z,
+    "dateModified": 2020-12-29T05:27:27.470Z,
     "title": "MDX",
   },
   "exports": Object {