Make v8 version part of the key

spec/fixtures/native-cache/file-4.js

@@ -0,0 +1 @@
+module.exports = function () { return "file-4" }

spec/native-compile-cache-spec.coffee

@@ -1,5 +1,6 @@
 fs = require 'fs'
 path = require 'path'
+Module = require 'module'
 
 describe "NativeCompileCache", ->
   nativeCompileCache = require '../src/native-compile-cache'
@@ -8,21 +9,10 @@ describe "NativeCompileCache", ->
   beforeEach ->
     cachedFiles = []
     fakeCacheStore = jasmine.createSpyObj("cache store", ["set", "get", "has", "delete"])
-    nativeCompileCache.setCacheStore(fakeCacheStore)
-    nativeCompileCache.install()
-
-    fs.writeFileSync path.resolve('./spec/fixtures/native-cache/file-4'), """
-    module.exports = function () { return "file-4" }
-    """
-
-  afterEach ->
-    fs.unlinkSync path.resolve('./spec/fixtures/native-cache/file-4')
-
-  it "writes and reads from the cache storage when requiring files", ->
     fakeCacheStore.has.andCallFake (cacheKey, invalidationKey) ->
       fakeCacheStore.get(cacheKey, invalidationKey)?
     fakeCacheStore.get.andCallFake (cacheKey, invalidationKey) ->
-      for entry in cachedFiles
+      for entry in cachedFiles by -1
         continue if entry.cacheKey isnt cacheKey
         continue if entry.invalidationKey isnt invalidationKey
         return entry.cacheBuffer
@@ -30,11 +20,15 @@ describe "NativeCompileCache", ->
     fakeCacheStore.set.andCallFake (cacheKey, invalidationKey, cacheBuffer) ->
       cachedFiles.push({cacheKey, invalidationKey, cacheBuffer})
 
+    nativeCompileCache.setCacheStore(fakeCacheStore)
+    nativeCompileCache.setV8Version("a-v8-version")
+    nativeCompileCache.install()
+
+  it "writes and reads from the cache storage when requiring files", ->
     fn1 = require('./fixtures/native-cache/file-1')
     fn2 = require('./fixtures/native-cache/file-2')
-    fn4 = require('./fixtures/native-cache/file-4')
 
-    expect(cachedFiles.length).toBe(3)
+    expect(cachedFiles.length).toBe(2)
 
     expect(cachedFiles[0].cacheKey).toBe(require.resolve('./fixtures/native-cache/file-1'))
     expect(cachedFiles[0].cacheBuffer).toBeInstanceOf(Uint8Array)
@@ -46,26 +40,59 @@ describe "NativeCompileCache", ->
     expect(cachedFiles[1].cacheBuffer.length).toBeGreaterThan(0)
     expect(fn2()).toBe(2)
 
-    expect(cachedFiles[2].cacheKey).toBe(require.resolve('./fixtures/native-cache/file-4'))
-    expect(cachedFiles[2].cacheBuffer).toBeInstanceOf(Uint8Array)
-    expect(cachedFiles[2].cacheBuffer.length).toBeGreaterThan(0)
-    expect(fn4()).toBe("file-4")
-
-    fs.appendFileSync(require.resolve('./fixtures/native-cache/file-4'), "\n")
-    delete require('module')._cache[require.resolve('./fixtures/native-cache/file-1')]
-    delete require('module')._cache[require.resolve('./fixtures/native-cache/file-4')]
+    delete Module._cache[require.resolve('./fixtures/native-cache/file-1')]
     fn1 = require('./fixtures/native-cache/file-1')
-    fn4 = require('./fixtures/native-cache/file-4')
-
-    # file content has changed, ensure we create a new cache entry
-    expect(cachedFiles.length).toBe(4)
-    expect(cachedFiles[3].cacheKey).toBe(require.resolve('./fixtures/native-cache/file-4'))
-    expect(cachedFiles[3].invalidationKey).not.toBe(cachedFiles[2].invalidationKey)
-    expect(cachedFiles[3].cacheBuffer).toBeInstanceOf(Uint8Array)
-    expect(cachedFiles[3].cacheBuffer.length).toBeGreaterThan(0)
-
+    expect(cachedFiles.length).toBe(2)
     expect(fn1()).toBe(1)
-    expect(fn4()).toBe("file-4")
+
+  describe "when v8 version changes", ->
+    it "updates the cache of previously required files", ->
+      nativeCompileCache.setV8Version("version-1")
+      fn4 = require('./fixtures/native-cache/file-4')
+
+      expect(cachedFiles.length).toBe(1)
+      expect(cachedFiles[0].cacheKey).toBe(require.resolve('./fixtures/native-cache/file-4'))
+      expect(cachedFiles[0].cacheBuffer).toBeInstanceOf(Uint8Array)
+      expect(cachedFiles[0].cacheBuffer.length).toBeGreaterThan(0)
+      expect(fn4()).toBe("file-4")
+
+      nativeCompileCache.setV8Version("version-2")
+      delete Module._cache[require.resolve('./fixtures/native-cache/file-4')]
+      fn4 = require('./fixtures/native-cache/file-4')
+
+      expect(cachedFiles.length).toBe(2)
+      expect(cachedFiles[1].cacheKey).toBe(require.resolve('./fixtures/native-cache/file-4'))
+      expect(cachedFiles[1].invalidationKey).not.toBe(cachedFiles[0].invalidationKey)
+      expect(cachedFiles[1].cacheBuffer).toBeInstanceOf(Uint8Array)
+      expect(cachedFiles[1].cacheBuffer.length).toBeGreaterThan(0)
+
+  describe "when a previously required and cached file changes", ->
+    beforeEach ->
+      fs.writeFileSync path.resolve('./spec/fixtures/native-cache/file-5'), """
+      module.exports = function () { return "file-5" }
+      """
+
+    afterEach ->
+      fs.unlinkSync path.resolve('./spec/fixtures/native-cache/file-5')
+
+    it "removes it from the store and re-inserts it with the new cache", ->
+      fn5 = require('./fixtures/native-cache/file-5')
+
+      expect(cachedFiles.length).toBe(1)
+      expect(cachedFiles[0].cacheKey).toBe(require.resolve('./fixtures/native-cache/file-5'))
+      expect(cachedFiles[0].cacheBuffer).toBeInstanceOf(Uint8Array)
+      expect(cachedFiles[0].cacheBuffer.length).toBeGreaterThan(0)
+      expect(fn5()).toBe("file-5")
+
+      delete Module._cache[require.resolve('./fixtures/native-cache/file-5')]
+      fs.appendFileSync(require.resolve('./fixtures/native-cache/file-5'), "\n\n")
+      fn5 = require('./fixtures/native-cache/file-5')
+
+      expect(cachedFiles.length).toBe(2)
+      expect(cachedFiles[1].cacheKey).toBe(require.resolve('./fixtures/native-cache/file-5'))
+      expect(cachedFiles[1].invalidationKey).not.toBe(cachedFiles[0].invalidationKey)
+      expect(cachedFiles[1].cacheBuffer).toBeInstanceOf(Uint8Array)
+      expect(cachedFiles[1].cacheBuffer.length).toBeGreaterThan(0)
 
   it "deletes previously cached code when the cache is an invalid file", ->
     fakeCacheStore.has.andReturn(true)