Generate alltests.js on npm run serve_tests.

RELNOTES: n/a

PiperOrigin-RevId: 358844337

Author: kjin

.gitignore

@@ -10,14 +10,16 @@
 
 # python
 *.pyc
-
-# Generated deps.js
-closure/goog/deps.js
-
 node_modules/
 closure-deps/node_modules/
 package-lock.json
 
-# Closure Generated Unit Test
+# Closure Generated Unit Tests
 *_test.html
 
+# Generated alltests.js
+alltests.js
+
+# Generated deps.js
+closure/goog/deps.js
+

all_tests.html renamed to alltests.html

@@ -20,19 +20,21 @@
   },
   "homepage": "https://developers.google.com/closure/library/",
   "devDependencies": {
-    "generate_closure_unit_tests": "file:./closure/bin/generate_closure_unit_tests/",
     "google-closure-deps": "file:./closure-deps/",
     "http-server": "^0.12.1",
+    "parse5": "^6.0.1",
     "promise": "^7.0.4",
     "promises-aplus-tests": "^2.1.2",
     "protractor": "^7.0.0"
   },
   "scripts": {
-    "gen_deps_js": "node scripts/gen_deps_js > ./closure/goog/deps.js",
-    "gen_all_tests": "npx generate_closure_unit_tests --base=closure/goog/base.js --recursive ./closure/goog/ --overwrite",
+    "gen_deps_js": "node scripts/generate_deps_js > ./closure/goog/deps.js",
+    "gen_deps_js_with_tests": "node scripts/generate_deps_js --with_tests > ./closure/goog/deps.js",
+    "gen_alltests_js": "node scripts/generate_alltests_js > ./alltests.js",
+    "gen_test_htmls": "node scripts/generate_closure_unit_tests --base=closure/goog/base.js --recursive ./closure/goog/ ./third_party/closure/goog/ --overwrite",
     "prepare": "npm run gen_deps_js",
-    "preserve_tests": "npm run gen_all_tests",
-    "serve_tests": "npx http-server -o allTests.html",
-    "serve_demos": "npx http-server -o closure/goog/demos/index.html"
+    "preserve_tests": "npm run gen_deps_js_with_tests && npm run gen_test_htmls && npm run gen_alltests_js",
+    "serve_tests": "http-server -o alltests.html",
+    "serve_demos": "http-server -o closure/goog/demos/index.html"
   }
 }

alltests.js

@@ -45,7 +45,6 @@ java -Xmx1G -jar ../closure-compiler-1.0-SNAPSHOT.jar \
   --js='!**protractor_spec.js' \
   --js='!**protractor.conf.js' \
   --js='!**browser_capabilities.js' \
-  --js='!**generate_closure_unit_tests.js' \
   --js='!./doc/**.js' \
   --js='!**debug_loader_integration_tests/testdata/**' \
   --js_output_file="$(mktemp)"

closure/bin/generate_closure_unit_tests/package.json

@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright The Closure Library Authors.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview A utility to write alltests.js for Closure Library.
+ */
+
+const {promises: fs} = require('fs');
+
+const CLOSURE_PATH = 'closure/goog';
+const THIRD_PARTY_PATH = 'third_party/closure/goog';
+
+const HEADER = `
+/**
+ * @license
+ * Copyright The Closure Library Authors.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// This file has been auto-generated, please do not edit.
+// To regenerate, run \`npm run gen_alltests_js\` in the root directory of the
+// Closure Library git repository.
+`.trim();
+
+const FOOTER = `
+// If we're running in a nodejs context, export tests. Used when running tests
+// externally on Travis.
+if (typeof module !== 'undefined' && module.exports) {
+  module.exports = _allTests;
+}
+`.trim();
+
+/**
+ * Calls fs.readdir recursively on the given path and subdirectories.
+ * Returns only the list of files.
+ * @param {string} path The path to read.
+ * @return {!Array<string>} A list of files.
+ */
+async function readdirRecursive(path) {
+  const filesAndDirectories =
+      (await fs.readdir(path))
+          .map(fileOrDirectory => `${path}/${fileOrDirectory}`)
+          .sort();
+  const files = [];
+  for (const fileOrDirectory of filesAndDirectories) {
+    const fileStat = await fs.stat(fileOrDirectory);
+    if (fileStat.isDirectory()) {
+      files.push(...await readdirRecursive(fileOrDirectory));
+    } else {
+      files.push(fileOrDirectory);
+    }
+  }
+  return files;
+}
+
+/**
+ * Prints the generated alltests.js contents.
+ * @return {!Promise<number>} The exit code.
+ */
+async function main() {
+  try {
+    // Get a list of all *_test.html files.
+    const allTestHtmls = [
+      ...await readdirRecursive(CLOSURE_PATH),
+      ...await readdirRecursive(THIRD_PARTY_PATH),
+    ].filter(f => f.endsWith('_test.html'));
+    if (allTestHtmls.length === 0) {
+      throw new Error(
+          'No *_test.html files found. Did you run `npm run gen_test_htmls`?');
+    }
+
+    const output = [
+      HEADER, '', 'var _allTests = [', ...allTestHtmls.map(f => `  '${f}',`),
+      '];', '', FOOTER
+    ];
+    console.log(output.join('\n'));
+    return 0;
+  } catch (e) {
+    console.error(e);
+    return 1;
+  }
+}
+
+main().then(code => process.exit(code));

package.json

@@ -251,6 +251,8 @@ function createHtml(
   // Use parse5 to parse and reserialize the test dom. This generates any
   // optional tags (html, body, head) if missing. Meaning test doms can specify
   // these tags, if needed.
+  // TODO(user): Remove parse5 as a dependency, as this code can be
+  //                    written without it.
   return parse5.serialize(parse5.parse(`<!DOCTYPE html>
 <!-- DO NOT EDIT. This file auto-generated by generate_closure_unit_tests.js -->
 <!--

scripts/ci/compile_closure.sh

@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright The Closure Library Authors.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview A utility to write deps.js for Closure Library.
+ */
+
+const {closureMakeDeps} = require('google-closure-deps');
+
+const CLOSURE_PATH = 'closure/goog';
+const THIRD_PARTY_PATH = 'third_party/closure/goog';
+
+const HEADER = `
+// Copyright The Closure Library Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+// This file has been auto-generated, please do not edit.
+// To regenerate, run \`npm run gen_deps_js\` in the root directory of the
+// Closure Library git repository.
+
+// Disable Clang formatter for this file.
+// See http://goo.gl/SdiwZH
+// clang-format off
+`.trim();
+
+/**
+ * Flags to add to closureMakeDeps in order to exclude tests.
+ */
+const TEST_EXCLUSION_FLAGS = [
+  '--exclude',
+  '**/*_test.js',
+  '--exclude',
+  '**/tester.js',
+  '--exclude',
+  '**/*_test_vectors.js',
+  '--exclude',
+  '**/*_test_suite.js',
+  '--exclude',
+  '**/*_test_cases.js',
+  '--exclude',
+  '**/testdata/**/*.js',
+];
+
+/**
+ * Prints the generated deps.js contents.
+ * @param {!Array<string>} args Command-line arguments.
+ * @return {!Promise<number>} The exit code.
+ */
+async function main(args) {
+  try {
+    const genDepsWithTests = args.indexOf('--with_tests') != -1;
+    const {text, errors} = await closureMakeDeps.execute([
+      '--root',
+      CLOSURE_PATH,
+      '--root',
+      THIRD_PARTY_PATH,
+      ...genDepsWithTests ? [] : TEST_EXCLUSION_FLAGS,
+      '--exclude',
+      `${CLOSURE_PATH}/css`,
+      '--exclude',
+      `${CLOSURE_PATH}/demos`,
+      '--exclude',
+      `${CLOSURE_PATH}/deps.js`,
+      '--exclude',
+      `${CLOSURE_PATH}/transpile.js`,
+    ]);
+    // Print all encountered errors. Errors are not necessarily fatal.
+    for (const error of errors) {
+      console.error(error.toString());
+    }
+    if (text) {
+      console.log(`${HEADER}\n\n${text.trim()}`);
+      return 0;
+    } else {
+      // No text indicates that the errors were fatal.
+      return 1;
+    }
+  } catch (e) {
+    console.error(e);
+    return 1;
+  }
+}
+
+main(process.argv.slice(2)).then(code => process.exit(code));