Merge pull request #12584 from CesiumGS/prettier-scripts

Run prettier on `scripts`

Author: ggetz

.prettierignore

@@ -9,6 +9,7 @@
 !Apps/**/
 !Documentation/**/
 !packages/**/
+!scripts/**/
 !Specs/**/
 !Tools/**/
 

scripts/ContextCache.js

@@ -1,27 +1,27 @@
 class ContextCache {
-    constructor(context) {
-      this.context = context;
-      this.promise = Promise.resolve();
-      this.result = undefined;
-    }
-  
-    clear() {
-      this.result = undefined;
-    }
-  
-    async rebuild() {
-      const promise = (this.promise = this.context.rebuild());
-      const result = (this.result = await promise);
-      return result;
-    }
-  
-    isBuilt() {
-      return (
-        this.result &&
-        this.result.outputFiles &&
-        this.result.outputFiles.length > 0
-      );
-    }
+  constructor(context) {
+    this.context = context;
+    this.promise = Promise.resolve();
+    this.result = undefined;
   }
 
-  export default ContextCache;
+  clear() {
+    this.result = undefined;
+  }
+
+  async rebuild() {
+    const promise = (this.promise = this.context.rebuild());
+    const result = (this.result = await promise);
+    return result;
+  }
+
+  isBuilt() {
+    return (
+      this.result &&
+      this.result.outputFiles &&
+      this.result.outputFiles.length > 0
+    );
+  }
+}
+
+export default ContextCache;

scripts/build.js

@@ -4,7 +4,7 @@ import { readFile, writeFile } from "fs/promises";
 import { EOL } from "os";
 import path from "path";
 import { createRequire } from "module";
-import { finished } from 'stream/promises';
+import { finished } from "stream/promises";
 
 import esbuild from "esbuild";
 import { globby } from "globby";
@@ -27,11 +27,11 @@ if (/\.0$/.test(version)) {
 
 const copyrightHeaderTemplate = readFileSync(
   path.join("Source", "copyrightHeader.js"),
-  "utf8"
+  "utf8",
 );
 const combinedCopyrightHeader = copyrightHeaderTemplate.replace(
   "${version}",
-  version
+  version,
 );
 
 function escapeCharacters(token) {
@@ -294,7 +294,7 @@ export async function createCesiumJs() {
   for (const workspace of Object.keys(workspaceSourceFiles)) {
     const files = await globby(workspaceSourceFiles[workspace]);
     const declarations = files.map((file) =>
-      generateDeclaration(workspace, file)
+      generateDeclaration(workspace, file),
     );
     contents += declarations.join(`${EOL}`);
     contents += "\n";
@@ -468,7 +468,7 @@ export async function glslToJavaScript(minify, minifyStateFilePath, workspace) {
         `packages/${workspace}/`,
         "Source",
         "Shaders",
-        "Builtin"
+        "Builtin",
       );
       if (
         glslFile.indexOf(path.normalize(path.join(baseDir, "Functions"))) === 0
@@ -505,7 +505,7 @@ export async function glslToJavaScript(minify, minifyStateFilePath, workspace) {
 
       let copyrightComments = "";
       const extractedCopyrightComments = contents.match(
-        /\/\*\*(?:[^*\/]|\*(?!\/)|\n)*?@license(?:.|\n)*?\*\//gm
+        /\/\*\*(?:[^*\/]|\*(?!\/)|\n)*?@license(?:.|\n)*?\*\//gm,
       );
       if (extractedCopyrightComments) {
         copyrightComments = `${extractedCopyrightComments.join("\n")}\n`;
@@ -526,7 +526,7 @@ export async function glslToJavaScript(minify, minifyStateFilePath, workspace) {
 export default "${contents}";\n`;
 
       return writeFile(jsFile, contents);
-    })
+    }),
   );
 
   // delete any left over JS files from old shaders
@@ -538,7 +538,7 @@ export default "${contents}";\n`;
     for (let i = 0; i < builtins.length; i++) {
       const builtin = builtins[i];
       contents.imports.push(
-        `import czm_${builtin} from './${path}/${builtin}.js'`
+        `import czm_${builtin} from './${path}/${builtin}.js'`,
       );
       contents.builtinLookup.push(`czm_${builtin} : ` + `czm_${builtin}`);
     }
@@ -554,7 +554,7 @@ export default "${contents}";\n`;
   generateBuiltinContents(contents, builtinFunctions, "Functions");
 
   const fileContents = `//This file is automatically rebuilt by the Cesium build process.\n${contents.imports.join(
-    "\n"
+    "\n",
   )}\n\nexport default {\n    ${contents.builtinLookup.join(",\n    ")}\n};\n`;
 
   return writeFile(
@@ -563,9 +563,9 @@ export default "${contents}";\n`;
       "Source",
       "Shaders",
       "Builtin",
-      "CzmBuiltins.js"
+      "CzmBuiltins.js",
     ),
-    fileContents
+    fileContents,
   );
 }
 
@@ -600,7 +600,7 @@ const externalResolvePlugin = {
         return {
           contents,
         };
-      }
+      },
     );
   },
 };
@@ -634,7 +634,7 @@ export async function createGalleryList(noDevelopmentGallery) {
     newDemos = child_process
       .execSync(
         `git diff --name-only --diff-filter=A ${tagVersion} Apps/Sandcastle/gallery/*.html`,
-        { stdio: ["pipe", "pipe", "ignore"] }
+        { stdio: ["pipe", "pipe", "ignore"] },
       )
       .toString()
       .trim()
@@ -647,7 +647,7 @@ export async function createGalleryList(noDevelopmentGallery) {
   const files = await globby(fileList);
   files.forEach(function (file) {
     const demo = filePathToModuleId(
-      path.relative("Apps/Sandcastle/gallery", file)
+      path.relative("Apps/Sandcastle/gallery", file),
     );
 
     const demoObject = {
@@ -697,8 +697,7 @@ const has_new_gallery_demos = ${newDemos.length > 0 ? "true;" : "false;"}\n`;
     ],
     minify: true,
     banner: {
-      css:
-        "/* This file is automatically rebuilt by the Cesium build process. */\n",
+      css: "/* This file is automatically rebuilt by the Cesium build process. */\n",
     },
     outfile: path.join("Apps", "Sandcastle", "templates", "bucket.css"),
   });
@@ -745,7 +744,7 @@ export async function copyEngineAssets(destination) {
   await copyFiles(
     ["packages/engine/Source/Widget/**", "!packages/engine/Source/Widget/*.js"],
     path.join(destination, "Widgets/CesiumWidget"),
-    "packages/engine/Source/Widget"
+    "packages/engine/Source/Widget",
   );
 }
 
@@ -776,7 +775,7 @@ export async function createJsHintOptions() {
   const jshintrc = JSON.parse(
     await readFile(path.join("Apps", "Sandcastle", ".jshintrc"), {
       encoding: "utf8",
-    })
+    }),
   );
 
   const contents = `\
@@ -785,7 +784,7 @@ export async function createJsHintOptions() {
 
   await writeFile(
     path.join("Apps", "Sandcastle", "jsHintOptions.js"),
-    contents
+    contents,
   );
 
   return contents;
@@ -898,7 +897,7 @@ async function createSpecListForWorkspace(files, workspace, outputPath) {
   files.forEach(function (file) {
     contents += `import './${filePathToModuleId(file).replace(
       `packages/${workspace}/Specs/`,
-      ""
+      "",
     )}.js';\n`;
   });
 
@@ -1005,7 +1004,7 @@ export const buildEngine = async (options) => {
   await glslToJavaScript(
     minify,
     "packages/engine/Build/minifyShaders.state",
-    "engine"
+    "engine",
   );
 
   // Create index.js
@@ -1101,7 +1100,7 @@ export async function buildCesium(options) {
     JSON.stringify({
       type: "commonjs",
     }),
-    "utf8"
+    "utf8",
   );
 
   // Create Cesium.js
@@ -1179,14 +1178,14 @@ export async function buildCesium(options) {
   await copyFiles(
     ["packages/engine/Source/ThirdParty/**/*.js"],
     "Source/ThirdParty",
-    "packages/engine/Source/ThirdParty"
+    "packages/engine/Source/ThirdParty",
   );
 
   await copyWidgetsAssets("Source/Widgets");
   await copyFiles(
     ["packages/widgets/Source/**/*.css"],
     "Source/Widgets",
-    "packages/widgets/Source"
+    "packages/widgets/Source",
   );
 
   // WORKAROUND:

scripts/createRoute.js

@@ -2,71 +2,73 @@ import ContextCache from "./ContextCache.js";
 import path from "path";
 
 function formatTimeSinceInSeconds(start) {
-    return Math.ceil((performance.now() - start) / 100) / 10;
+  return Math.ceil((performance.now() - start) / 100) / 10;
 }
 
-function serveResult (result, fileName, res, next) {
-    let bundle, error;
-    try {
-      for (const out of result.outputFiles) {
-        if (path.basename(out.path) === fileName) {
-          bundle = out.text;
-        }
+function serveResult(result, fileName, res, next) {
+  let bundle, error;
+  try {
+    for (const out of result.outputFiles) {
+      if (path.basename(out.path) === fileName) {
+        bundle = out.text;
       }
-    } catch(e) {
-      error = e;
-    }
-  
-    if (!bundle) {
-      next(new Error(`Failed to generate bundle: ${fileName}`, {
-        cause: error
-      }));
-      return;
     }
-  
-    res.append("Cache-Control", "max-age=0");
-    res.append("Content-Type", "application/javascript");
-    res.send(bundle);
-  };
+  } catch (e) {
+    error = e;
+  }
+
+  if (!bundle) {
+    next(
+      new Error(`Failed to generate bundle: ${fileName}`, {
+        cause: error,
+      }),
+    );
+    return;
+  }
+
+  res.append("Cache-Control", "max-age=0");
+  res.append("Content-Type", "application/javascript");
+  res.send(bundle);
+}
 
 function createRoute(app, name, route, context, dependantCaches) {
-    const cache = new ContextCache(context);
-    app.get(route, async function (req, res, next) {
-      const fileName = path.basename(req.originalUrl);
+  const cache = new ContextCache(context);
+  app.get(route, async function (req, res, next) {
+    const fileName = path.basename(req.originalUrl);
 
-      // Multiple files may be requested at this path, calling this function in quick succession.
-      // Await the previous build before re-building again.
+    // Multiple files may be requested at this path, calling this function in quick succession.
+    // Await the previous build before re-building again.
+    try {
+      await cache.promise;
+    } catch {
+      // Error is reported upstream
+    }
+
+    if (!cache.isBuilt()) {
       try {
-        await cache.promise;
-      } catch {
-        // Error is reported upstream
-      }
-  
-      if (!cache.isBuilt()) {
-        try {
-          const start = performance.now();
-          if (dependantCaches) {
-            await Promise.all(
-              dependantCaches.map((dependantCache) => {
-                if (!dependantCache.isBuilt()) {
-                  return dependantCache.rebuild();
-                }
-              })
-            );
-          }
-          await cache.rebuild();
-          console.log(
-            `Built ${name} in ${formatTimeSinceInSeconds(start)} seconds.`
+        const start = performance.now();
+        if (dependantCaches) {
+          await Promise.all(
+            dependantCaches.map((dependantCache) => {
+              if (!dependantCache.isBuilt()) {
+                return dependantCache.rebuild();
+              }
+            }),
           );
-        } catch (e) {
-          next(e);
         }
+        await cache.rebuild();
+        console.log(
+          `Built ${name} in ${formatTimeSinceInSeconds(start)} seconds.`,
+        );
+      } catch (e) {
+        next(e);
       }
-  
-      return serveResult(cache.result, fileName, res, next);
-    });
-  
-    return cache;
-  }
+    }
+
+    return serveResult(cache.result, fileName, res, next);
+  });
+
+  return cache;
+}
 
-export default createRoute;
+export default createRoute;