Null check tweaks.

Author: jdalton

esm.js

@@ -164,6 +164,12 @@ if (cachePath !== "") {
   let cache = dir.get(cachePath)
 
   if (cache === void 0) {
+    let scriptData = cachedData
+
+    if (scriptData === void 0) {
+      scriptData = null
+    }
+
     cache = {
       buffer: cachedData,
       compile: new Map([
@@ -174,7 +180,7 @@ if (cachePath !== "") {
           filename: null,
           firstAwaitOutsideFunction: null,
           mtime: -1,
-          scriptData: cachedData || null,
+          scriptData,
           sourceType: 1,
           transforms: 0,
           yieldIndex: -1

src/acorn/parser/numeric-separator.js

@@ -24,7 +24,7 @@ function init() {
 
   function readInt(radix, length) {
     const start = this.pos
-    const hasLength = length != null
+    const hasLength = typeof length === "number"
     const end = hasLength ? length : Infinity
 
     let i = -1
@@ -57,9 +57,11 @@ function init() {
       total = (total * radix) + value
     }
 
-    if (this.pos === start ||
+    const { pos } = this
+
+    if (pos === start ||
         (hasLength &&
-         this.pos - start !== length)) {
+         pos - start !== length)) {
       return null
     }
 

src/caching-compiler.js

@@ -211,27 +211,43 @@ function init() {
       const metas = cache.meta
 
       scripts.forEach((script, cacheName) => {
-        const compileData = compileDatas.get(cacheName)
-        const cachedData = compileData != null ? compileData.scriptData : null
+        let compileData = compileDatas.get(cacheName)
 
-        let scriptData
-        let changed = false
+        if (compileData === void 0) {
+          compileData = null
+        }
+
+        let cachedData
+
+        if (compileData !== null) {
+          cachedData = compileData.scriptData
 
-        if (cachedData === null) {
-          scriptData = useCreateCachedData
-            ? script.createCachedData()
-            : script.cachedData
+          if (cachedData === null) {
+            cachedData = void 0
+          }
         }
 
-        if (scriptData &&
+        let changed = false
+        let scriptData = null
+
+        if (cachedData === void 0) {
+          if (useCreateCachedData &&
+              typeof script.createCachedData === "function") {
+            scriptData = script.createCachedData()
+          } else if (script.cachedDataProduced) {
+            scriptData = script.cachedData
+          }
+        }
+
+        if (scriptData !== null &&
             scriptData.length) {
           changed = true
         }
 
-        if (compileData) {
-          if (scriptData) {
+        if (compileData !== null) {
+          if (scriptData !== null) {
             compileData.scriptData = scriptData
-          } else if (cachedData &&
+          } else if (cachedData !== void 0 &&
                      script.cachedDataRejected) {
             changed = true
 
@@ -275,9 +291,13 @@ function init() {
 
         meta = [-1, -1]
 
-        const compileData = compileDatas.get(cacheName)
+        let compileData = compileDatas.get(cacheName)
+
+        if (compileData === void 0) {
+          compileData = null
+        }
 
-        if (compileData != null) {
+        if (compileData !== null) {
           const {
             filename,
             firstAwaitOutsideFunction,
@@ -331,20 +351,28 @@ function init() {
         let scriptData = scriptDatas.get(cacheName)
 
         if (scriptData === void 0) {
-          const compileData = compileDatas.get(cacheName)
+          let compileData = compileDatas.get(cacheName)
+
+          if (compileData === void 0) {
+            compileData = null
+          }
+
           const [offsetStart, offsetEnd] = meta
 
-          if (compileData != null) {
+          scriptData = null
+
+          if (compileData !== null) {
             scriptData = compileData.scriptData
           } else if (offsetStart !== -1 &&
                      offsetEnd !== -1) {
             scriptData = GenericBuffer.slice(buffer, offsetStart, offsetEnd)
           }
         }
 
-        if (scriptData) {
+        if (scriptData !== null) {
           meta[0] = offset
-          meta[1] = offset += scriptData.length
+          offset += scriptData.length
+          meta[1] = offset
           buffers.push(scriptData)
         }
 

src/module/internal/compile.js

@@ -94,9 +94,9 @@ function compile(caller, entry, content, filename, fallback) {
       const { cacheName } = entry
       const { cjs } = options
 
-      const scriptData = compileData
-        ? compileData.scriptData
-        : null
+      const scriptData = compileData === null
+        ? null
+        : compileData.scriptData
 
       compileData = tryCompile(caller, entry, content, {
         cacheName,