More compact storage micro-optimization.

Author: cpojer

packages/jest-haste-map/src/__tests__/fastpath-test.js

@@ -23,12 +23,14 @@
  * original author: dead_horse <dead_horse@qq.com>
  * ported by: yaycmyk <evan@yaycmyk.com>
  */
+'use strict';
 
-jest.dontMock('../fastpath');
+jest.unmock('../fastpath');
 
-const fp = require('../fastpath');
+let fp;
 
 describe('fast-path', () => {
+
   const actualPlatform = process.platform;
   const invalidInputTests = [
     true,
@@ -62,6 +64,7 @@ describe('fast-path', () => {
     it('should resolve given paths', () => {
       process.platform = actualPlatform;
 
+      fp = require('../fastpath');
       expect(fp.basename(__filename)).toEqual('fastpath-test.js');
       expect(fp.basename(__filename, '.js')).toEqual('fastpath-test');
       expect(fp.basename('')).toEqual('');
@@ -75,6 +78,7 @@ describe('fast-path', () => {
     it('should handle backslashes properly (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       expect(fp.basename('\\dir\\basename.ext')).toEqual('basename.ext');
       expect(fp.basename('\\basename.ext')).toEqual('basename.ext');
       expect(fp.basename('basename.ext')).toEqual('basename.ext');
@@ -83,6 +87,7 @@ describe('fast-path', () => {
     });
 
     it('should handle backslashes properly (posix)', () => {
+      fp = require('../fastpath');
       expect(fp.basename('\\dir\\basename.ext')).toEqual('\\dir\\basename.ext');
       expect(fp.basename('\\basename.ext')).toEqual('\\basename.ext');
       expect(fp.basename('basename.ext')).toEqual('basename.ext');
@@ -91,6 +96,7 @@ describe('fast-path', () => {
     });
 
     it('should handle control characters (posix)', () => {
+      fp = require('../fastpath');
       // POSIX filenames may include control characters
       // c.f. http://www.dwheeler.com/essays/fixing-unix-linux-filenames.html
       const name = 'Icon' + String.fromCharCode(13);
@@ -102,6 +108,7 @@ describe('fast-path', () => {
     it('should extract the extension from a path', () => {
       process.platform = actualPlatform;
 
+      fp = require('../fastpath');
       expect(fp.extname(__filename)).toEqual('.js');
       expect(fp.extname('')).toEqual('');
       expect(fp.extname('/path/to/file')).toEqual('');
@@ -149,6 +156,7 @@ describe('fast-path', () => {
     it('should handle path backslashes (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       // On windows, backspace is a path separator.
       expect(fp.extname('.\\')).toEqual('');
       expect(fp.extname('..\\')).toEqual('');
@@ -161,6 +169,8 @@ describe('fast-path', () => {
     });
 
     it('should handle path backslashes (posix)', () => {
+      fp = require('../fastpath');
+
       // On unix, backspace is a valid name component like any other character.
       expect(fp.extname('.\\')).toEqual('');
       expect(fp.extname('..\\')).toEqual('.\\');
@@ -175,6 +185,8 @@ describe('fast-path', () => {
 
   describe('dirname', () => {
     it('should isolate the directory name from a path (posix)', () => {
+      fp = require('../fastpath');
+
       expect(fp.dirname('/a/b/')).toEqual('/a');
       expect(fp.dirname('/a/b')).toEqual('/a');
       expect(fp.dirname('/a')).toEqual('/');
@@ -186,6 +198,7 @@ describe('fast-path', () => {
     it('should isolate the directory name from a path (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       expect(fp.dirname('C:\\')).toEqual('C:\\');
       expect(fp.dirname('c:\\')).toEqual('c:\\');
       expect(fp.dirname('c:\\foo')).toEqual('c:\\');
@@ -314,6 +327,8 @@ describe('fast-path', () => {
     ]);
 
     it('should join the paths correctly (posix)', () => {
+      fp = require('../fastpath');
+
       posixJoinTests.forEach(test => {
         const actual = fp.join.apply(fp, test[0]);
         const expected = test[1];
@@ -329,6 +344,7 @@ describe('fast-path', () => {
     it('should join the paths correctly (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       win32JoinTests.forEach(test => {
         const actual = fp.join.apply(fp, test[0]);
         const expected = test[1].replace(/\//g, '\\');
@@ -342,14 +358,18 @@ describe('fast-path', () => {
     });
 
     it('should throw for invalid input', () => {
+      fp = require('../fastpath');
+
       invalidInputTests.forEach(test => {
-        expect(() => fp.jointest).toThrow();
+        expect(() => fp.join(test)).toThrow();
       });
     });
   });
 
   describe('normalize', () => {
     it('should return a valid path (posix)', () => {
+      fp = require('../fastpath');
+
       expect(fp.normalize('./fixtures///b/../b/c.js')).toEqual('fixtures/b/c.js');
       expect(fp.normalize('/foo/../../../bar')).toEqual('/bar');
       expect(fp.normalize('a//b//../b')).toEqual('a/b');
@@ -359,6 +379,8 @@ describe('fast-path', () => {
 
     it('should return a valid path (win32)', () => {
       process.platform = 'win32';
+
+      fp = require('../fastpath');
       expect(fp.normalize('./fixtures///b/../b/c.js')).toEqual('fixtures\\b\\c.js');
       expect(fp.normalize('/foo/../../../bar')).toEqual('\\bar');
       expect(fp.normalize('a//b//../b')).toEqual('a\\b');
@@ -394,13 +416,16 @@ describe('fast-path', () => {
     it('should resolve the current working directory', () => {
       process.platform = actualPlatform;
 
+      fp = require('../fastpath');
       const actual = fp.resolve('.');
       const expected = process.cwd();
 
       expect(actual).toEqual(expected, getErrorMessage('resolve', '.', expected, actual));
     });
 
     it('should resolve paths (posix)', () => {
+      fp = require('../fastpath');
+
       posixResolveTests.forEach(test => {
         const actual = fp.resolve.apply(fp, test[0]);
         const expected = test[1];
@@ -412,6 +437,7 @@ describe('fast-path', () => {
     it('should resolve paths (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       win32ResolveTests.forEach(test => {
         const actual = fp.resolve.apply(fp, test[0]);
         const expected = test[1];
@@ -421,14 +447,17 @@ describe('fast-path', () => {
     });
 
     it('should throw for invalid input', () => {
+      fp = require('../fastpath');
       invalidInputTests.forEach(test => {
-        expect(() => fp.resolvetest).toThrow();
+        expect(() => fp.resolve(test)).toThrow();
       });
     });
   });
 
   describe('isAbsolute', () => {
     it('should work (posix)', () => {
+      fp = require('../fastpath');
+
       expect(fp.isAbsolute('/home/foo')).toEqual(true);
       expect(fp.isAbsolute('/home/foo/..')).toEqual(true);
       expect(fp.isAbsolute('bar/')).toEqual(false);
@@ -437,6 +466,9 @@ describe('fast-path', () => {
 
     it('should work (win32)', () => {
       process.platform = 'win32';
+
+      fp = require('../fastpath');
+
       expect(fp.isAbsolute('//server/file')).toEqual(true);
       expect(fp.isAbsolute('\\\\server\\file')).toEqual(true);
       expect(fp.isAbsolute('C:/Users/')).toEqual(true);
@@ -473,6 +505,7 @@ describe('fast-path', () => {
     ];
 
     it('should work (posix)', () => {
+      fp = require('../fastpath');
       posixRelativeTests.forEach(test => {
         const actual = fp.relative(test[0], test[1]);
         const expected = test[2];
@@ -488,6 +521,7 @@ describe('fast-path', () => {
     it('should work (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       win32RelativeTests.forEach(test => {
         const actual = fp.relative(test[0], test[1]);
         const expected = test[2];
@@ -505,10 +539,12 @@ describe('fast-path', () => {
     it('should be a backslash (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       expect(fp.sep).toEqual('\\');
     });
 
     it('should be a forward slash (posix)', () => {
+      fp = require('../fastpath');
       expect(fp.sep).toEqual('/');
     });
   });
@@ -517,10 +553,12 @@ describe('fast-path', () => {
     it('should be a semicolon (win32)', () => {
       process.platform = 'win32';
 
+      fp = require('../fastpath');
       expect(fp.delimiter).toEqual(';');
     });
 
     it('should be a colon (posix)', () => {
+      fp = require('../fastpath');
       expect(fp.delimiter).toEqual(':');
     });
   });

packages/jest-haste-map/src/constants.js

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/*
+ * This file exports a set of constants that are used for Jest's haste map
+ * serialization. On very large repositories, the haste map cache becomes very
+ * large to the point where it is the largest overhead in starting up Jest.
+ *
+ * This constant key map allows to keep the map smaller without having to build
+ * a custom serialization library.
+ */
+module.exports = {
+  /* shared in file map and module map */
+  ID: 0,
+
+  /* file map attributes */
+  MTIME: 1,
+  VISITED: 2,
+  DEPENDENCIES: 3,
+
+  /* module map attributes */
+  PATH: 1,
+  TYPE: 2,
+
+  /* module types */
+  MODULE: 0,
+  PACKAGE: 1,
+
+  /* platforms */
+  GENERIC_PLATFORM: 'g',
+};

packages/jest-haste-map/src/crawlers/node.js

@@ -9,12 +9,14 @@
 
 'use strict';
 
+const H = require('../constants');
+
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const spawn = require('child_process').spawn;
 
-function find(roots, extensions, ignorePattern, callback) {
+function find(roots, extensions, ignore, callback) {
   const result = [];
   let activeCalls = 0;
 
@@ -28,7 +30,7 @@ function find(roots, extensions, ignorePattern, callback) {
       }
 
       names.forEach(file => {
-        if (ignorePattern.test(file)) {
+        if (ignore(file)) {
           return;
         }
         activeCalls++;
@@ -61,7 +63,7 @@ function find(roots, extensions, ignorePattern, callback) {
   roots.forEach(search);
 }
 
-function findNative(roots, extensions, ignorePattern, callback) {
+function findNative(roots, extensions, ignore, callback) {
   const args = [].concat(roots);
   args.push('-type', 'f');
   extensions.forEach((ext, index) => {
@@ -80,7 +82,7 @@ function findNative(roots, extensions, ignorePattern, callback) {
   child.stdout.on('close', code => {
     const lines = stdout.trim()
       .split('\n')
-      .filter(x => !ignorePattern.test(x));
+      .filter(x => !ignore(x));
     const result = [];
     let count = lines.length;
     lines.forEach(path => {
@@ -96,33 +98,28 @@ function findNative(roots, extensions, ignorePattern, callback) {
   });
 }
 
-module.exports = function nodeCrawl(roots, extensions, ignorePattern, data) {
+module.exports = function nodeCrawl(roots, extensions, ignore, data) {
   return new Promise(resolve => {
     const callback = list => {
       const files = Object.create(null);
       list.forEach(fileData => {
         const name = fileData[0];
         const mtime = fileData[1];
         const existingFile = data.files[name];
-        if (existingFile && existingFile.mtime === mtime) {
-          //console.log('exists', name);
+        if (existingFile && existingFile[H.MTIME] === mtime) {
           files[name] = existingFile;
         } else {
-          //console.log('add', name);
-          files[name] = {
-            mtime,
-            visited: false,
-          };
+          files[name] = [0, mtime, 0, []];
         }
       });
       data.files = files;
       resolve(data);
     };
 
     if (os.platform() == 'win32') {
-      find(roots, extensions, ignorePattern, callback);
+      find(roots, extensions, ignore, callback);
     } else {
-      findNative(roots, extensions, ignorePattern, callback);
+      findNative(roots, extensions, ignore, callback);
     }
   });
 };

packages/jest-haste-map/src/crawlers/watchman.js

@@ -9,6 +9,8 @@
 
 'use strict';
 
+const H = require('../constants');
+
 const denodeify = require('denodeify');
 const path = require('../fastpath');
 const watchman = require('fb-watchman');
@@ -29,7 +31,7 @@ function WatchmanError(error) {
 module.exports = function watchmanCrawl(
   roots,
   extensions,
-  ignorePattern,
+  ignore,
   data
 ) {
   const files = data.files;
@@ -78,18 +80,12 @@ module.exports = function watchmanCrawl(
           response.files.forEach(fileData => {
             const name = root + path.sep + fileData.name;
             if (!fileData.exists) {
-              //console.log('remove', name);
               delete files[name];
-            } else if (!ignorePattern.test(name)) {
-              //console.log('add', name);
+            } else if (!ignore(name)) {
               const mtime = fileData.mtime_ms.toNumber();
-              const isNew = !files[name] || files[name].mtime !== mtime;
+              const isNew = !files[name] || files[name][H.MTIME] !== mtime;
               if (isNew) {
-                files[name] = {
-                  id: null,
-                  mtime,
-                  visited: false,
-                };
+                files[name] = [0, mtime, 0, []];
               }
             }
           });