Azure · jeremymeng · Dec 1, 2021 · Nov 25, 2021 · Nov 25, 2021 · Nov 25, 2021
@@ -25,7 +25,7 @@ export const baseCommandInfo = makeCommandInfo("dev-tool", "Azure SDK for JS dev
 /**
  * Default dev-tool subcommand
  */
-export const baseCommand = async (...args: string[]) => {
+export const baseCommand = async (...args: string[]): Promise<void> => {
   const status = await subCommand(baseCommandInfo, baseCommands)(...args);
 
   if (!status) {

@@ -87,30 +87,30 @@ function buildRunSamplesScript(
   const scriptContent = `#!/bin/sh
 
 function install_dependencies_helper() {
-  local samples_path=\$1;
+  local samples_path=$1;
   cd \${samples_path};
   ${compileCMD(`npm install ${artifactURL}`, printToScreen)}
   ${compileCMD(`npm install`, printToScreen)}
 }
 
 function install_packages() {
-  echo "Using node \$(node -v) to install dependencies";
+  echo "Using node $(node -v) to install dependencies";
   install_dependencies_helper ${samplesDir}/javascript
   install_dependencies_helper ${samplesDir}/typescript;
   cp ${envFilePath} ${samplesDir}/javascript/;
 }
 
 function run_samples() {
-  samples_path=\$1;
-  echo "Using node \$(node -v) to run samples in \${samples_path}";
+  samples_path=$1;
+  echo "Using node $(node -v) to run samples in \${samples_path}";
   cd "\${samples_path}";
   for SAMPLE in *.js; do
     node \${SAMPLE};
   done
 }
 
 function build_typescript() {
-  echo "Using node \$(node -v) to build the typescript samples";
+  echo "Using node $(node -v) to build the typescript samples";
   cd ${samplesDir}/typescript
   ${compileCMD(`npm run build`, printToScreen)}
   cp ${envFilePath} ${samplesDir}/typescript/dist/
@@ -273,7 +273,7 @@ export default leafCommand(commandInfo, async (options) => {
       options["node-versions"]
         ?.split(",")
         .concat(options["node-version"])
-        .filter((ver) => ver !== "" && parseInt(ver) !== NaN)
+        .filter((ver) => ver !== "" && !isNaN(parseInt(ver)))
     )
   ];
   const dockerContextDirectory: string =

@@ -66,7 +66,7 @@ async function enableLocalRun(
     // that can escape both linux and windows path separators
     const depth = relativeDir.length - relativeDir.split(path.sep).join("").length;
 
-    let relativePath = new Array(depth).fill("..").join("/");
+    const relativePath = new Array(depth).fill("..").join("/");
 
     outputContent = fileContents.replace(
       importRegex,
@@ -112,7 +112,7 @@ export default leafCommand(commandInfo, async (options) => {
   const jsDir = path.join(outputDir, "javascript");
   const jsFiles = findMatchingFiles(jsDir, (name, entry) => entry.isFile() && name.endsWith(".js"));
 
-  for await (const fileName of cat(tsFiles, jsFiles)) {
+  for await (const fileName of cat(tsFiles, jsFiles) as unknown as string) {
     await enableLocalRun(fileName, pkg.path, pkg.name, options["use-packages"]);
   }
 

@@ -81,12 +81,12 @@ function createPackageJson(info: SampleGenerationInfo, outputKind: OutputKind):
     },
     ...(outputKind === OutputKind.TypeScript
       ? {
-          // We only include these in TypeScript
-          scripts: {
-            build: "tsc",
-            prebuild: "rimraf dist/"
-          }
+        // We only include these in TypeScript
+        scripts: {
+          build: "tsc",
+          prebuild: "rimraf dist/"
         }
+      }
       : {}),
     repository: {
       type: "git",
@@ -122,7 +122,7 @@ function isDependency(moduleSpecifier: string): boolean {
 
   // This seems like a reasonable test for "is a relative path" as long as
   // absolute path imports are forbidden.
-  const isRelativePath = /^\.\.?[\/\\]/.test(moduleSpecifier);
+  const isRelativePath = /^\.\.?[/\\]/.test(moduleSpecifier);
   return !isRelativePath;
 }
 
@@ -326,7 +326,7 @@ async function makeSampleGenerationInfo(
     return undefined as never;
   }
 
-  const moduleInfos = await processSources(projectInfo, sampleSources, fail);
+  const moduleInfos = await processSources(projectInfo, sampleSources as string[], fail);
 
   const defaultDependencies: Record<string, string> = {
     // If we are a beta package, use "next", otherwise we will use "latest"
@@ -430,14 +430,14 @@ async function makeSampleGenerationInfo(
         }, defaultDependencies),
         ...(outputKind === OutputKind.TypeScript
           ? {
-              // In TypeScript samples, we include TypeScript and `rimraf`, because they're used
-              // in the package scripts.
-              devDependencies: {
-                ...typesDependencies,
-                typescript: devToolPackageJson.dependencies.typescript,
-                rimraf: "latest"
-              }
+            // In TypeScript samples, we include TypeScript and `rimraf`, because they're used
+            // in the package scripts.
+            devDependencies: {
+              ...typesDependencies,
+              typescript: devToolPackageJson.dependencies.typescript,
+              rimraf: "latest"
             }
+          }
           : {})
       };
     }
@@ -455,11 +455,11 @@ function createReadme(outputKind: OutputKind, info: SampleGenerationInfo): strin
     frontmatter: info.disableDocsMs
       ? undefined
       : {
-          page_type: "sample",
-          languages: [fullOutputKind],
-          products: info.productSlugs,
-          urlFragment: `${info.baseName}-${fullOutputKind}`
-        },
+        page_type: "sample",
+        languages: [fullOutputKind],
+        products: info.productSlugs,
+        urlFragment: `${info.baseName}-${fullOutputKind}`
+      },
     publicationDirectory: PUBLIC_SAMPLES_BASE + "/" + info.topLevelDirectory,
     useTypeScript: outputKind === OutputKind.TypeScript,
     ...info,

@@ -28,10 +28,10 @@ export const commandInfo = makeCommandInfo(
 async function runSingle(name: string, accumulatedErrors: Array<[string, string]>) {
   log("Running", name);
   try {
-    if (/.*[\\\/]samples(-dev)?[\\\/].*/.exec(name)) {
+    if (/.*[\\/]samples(-dev)?[\\/].*/.exec(name)) {
       // This is an un-prepared sample, so just require it and it will run.
       await import(name);
-    } else if (!/.*[\\\/]dist-samples[\\\/].*/.exec(name)) {
+    } else if (!/.*[\\/]dist-samples[\\/].*/.exec(name)) {
       // This is not an unprepared or a prepared sample
       log.error("Skipped. This file is not in any samples folder.");
     } else {
@@ -90,7 +90,7 @@ export default leafCommand(commandInfo, async (options) => {
           skips
         }
       )) {
-        await runSingle(fileName, errors);
+        await runSingle(fileName as string, errors);
       }
     } else {
       log.warn(`Sample ${sample} is neither a file nor a directory.`);

@@ -20,7 +20,7 @@ export const commandInfo = makeCommandInfo(
 );
 
 const prettierOptions: prettier.Options = {
-  ...(require("../../../../eslint-plugin-azure-sdk/prettier.json") as prettier.Options),
+  ...(import("../../../../eslint-plugin-azure-sdk/prettier.json") as prettier.Options),
   parser: "typescript"
 };
 

@@ -12,7 +12,7 @@ export const commandInfo = makeCommandInfo(
   {}
 );
 
-export default leafCommand(commandInfo, async (_options) => {
+export default leafCommand(commandInfo, async () => {
   await startProxyTool();
   return true;
 });
@@ -13,7 +13,7 @@ export const commandInfo = makeCommandInfo(
   {}
 );
 
-export default leafCommand(commandInfo, async (_options) => {
+export default leafCommand(commandInfo, async () => {
   const result = await checkWithTimeout(isProxyToolActive, 1000, 120000);
   return result;
 });
@@ -46,15 +46,15 @@ export function openTelemetryCommonJs(): Record<string, string[]> {
       // working around a limitation in the rollup common.js plugin - it's not able to resolve these modules so the named exports listed above will not get applied. We have to drill down to the actual path.
       `../../../common/temp/node_modules/.pnpm/@opentelemetry+api@${version}/node_modules/@opentelemetry/api/build/src/index.js`
     ] = [
-      "SpanKind",
-      "TraceFlags",
-      "getSpan",
-      "setSpan",
-      "StatusCode",
-      "CanonicalCode",
-      "getSpanContext",
-      "setSpanContext"
-    ];
+        "SpanKind",
+        "TraceFlags",
+        "getSpan",
+        "setSpan",
+        "StatusCode",
+        "CanonicalCode",
+        "getSpanContext",
+        "setSpanContext"
+      ];
   }
 
   return namedExports;
@@ -72,7 +72,7 @@ function ignoreNiseSinonEvalWarnings(warning: RollupWarning): boolean {
   return (
     warning.code === "EVAL" &&
     (warning.id?.includes("node_modules/nise") || warning.id?.includes("node_modules/sinon")) ===
-      true
+    true
   );
 }
 
@@ -103,7 +103,7 @@ function makeOnWarnForTesting(): (warning: RollupWarning, warn: WarningHandler)
 
 // #endregion
 
-export function makeBrowserTestConfig() {
+export function makeBrowserTestConfig(): RollupOptions {
   const config: RollupOptions = {
     input: {
       include: ["dist-esm/test/**/*.spec.js"],
@@ -151,7 +151,7 @@ const defaultConfigurationOptions: ConfigurationOptions = {
   disableBrowserBundle: false
 };
 
-export function makeConfig(pkg: PackageJson, options?: Partial<ConfigurationOptions>) {
+export function makeConfig(pkg: PackageJson, options?: Partial<ConfigurationOptions>): RollupOptions[] {
   options = {
     ...defaultConfigurationOptions,
     ...(options ?? {})

@@ -25,4 +25,4 @@ export interface CommandModule<Options extends CommandOptions> {
 /**
  * A map from command name to an async function that loads its module
  */
-export type CommandLoader = { [k: string]: () => Promise<CommandModule<{}>> };
+export type CommandLoader = { [k: string]: () => Promise<CommandModule<CommandOptions>> };
@@ -84,9 +84,8 @@ function resourceLinks(info: SampleReadmeConfiguration) {
 function resources(info: SampleReadmeConfiguration) {
   const resources = Object.entries(info.requiredResources ?? {});
 
-  const header = `You need [an Azure subscription][freesub] ${
-    resources.length > 0 ? "and the following Azure resources " : ""
-  }to run these sample programs${resources.length > 0 ? ":\n\n" : "."}`;
+  const header = `You need [an Azure subscription][freesub] ${resources.length > 0 ? "and the following Azure resources " : ""
+    }to run these sample programs${resources.length > 0 ? ":\n\n" : "."}`;
 
   return (
     header + resources.map(([name]) => `- [${name}][${resourceNameToLinkSlug(name)}]`).join("\n")
@@ -137,15 +136,14 @@ function exampleNodeInvocation(info: SampleReadmeConfiguration) {
     .map((envVar) => `${envVar}="<${envVar.replace(/_/g, " ").toLowerCase()}>"`)
     .join(" ");
 
-  return `${envVars} node ${
-    info.useTypeScript ? "dist/" : ""
-  }${firstModule.relativeSourcePath.replace(/\.ts$/, ".js")}`;
+  return `${envVars} node ${info.useTypeScript ? "dist/" : ""
+    }${firstModule.relativeSourcePath.replace(/\.ts$/, ".js")}`;
 }
 
 /**
  * Creates a README for a sample package from a SampleReadmeConfiguration.
  */
-export default (info: SampleReadmeConfiguration) => {
+export default (info: SampleReadmeConfiguration): string => {
   let stepCount = 1;
   const step = (content: string) => `${stepCount++}. ${content}`;
 
@@ -157,8 +155,7 @@ export default (info: SampleReadmeConfiguration) => {
 
 ${info.customSnippets?.header ?? ""}
 
-These sample programs show how to use the ${language} client libraries for ${
-      info.productName
+These sample programs show how to use the ${language} client libraries for ${info.productName
     } in some common scenarios.
 
 ${table(info)}
@@ -168,17 +165,17 @@ ${table(info)}
 The sample programs are compatible with [LTS versions of Node.js](https://nodejs.org/about/releases/).
 
 ${(() => {
-  if (info.useTypeScript) {
-    return [
-      "Before running the samples in Node, they must be compiled to JavaScript using the TypeScript compiler. For more information on TypeScript, see the [TypeScript documentation][typescript]. Install the TypeScript compiler using:",
-      "",
-      fence("bash", "npm install -g typescript"),
-      ""
-    ].join("\n");
-  } else {
-    return "";
-  }
-})()}\
+      if (info.useTypeScript) {
+        return [
+          "Before running the samples in Node, they must be compiled to JavaScript using the TypeScript compiler. For more information on TypeScript, see the [TypeScript documentation][typescript]. Install the TypeScript compiler using:",
+          "",
+          fence("bash", "npm install -g typescript"),
+          ""
+        ].join("\n");
+      } else {
+        return "";
+      }
+    })()}\
 ${resources(info)}
 
 ${info.customSnippets?.prerequisites ?? ""}
@@ -195,28 +192,28 @@ ${step("Install the dependencies using `npm`:")}
 
 ${fence("bash", "npm install")}
 ${(() => {
-  if (info.useTypeScript) {
-    return [step("Compile the samples:"), "", fence("bash", "npm run build"), ""].join("\n");
-  } else {
-    return "";
-  }
-})()}
+      if (info.useTypeScript) {
+        return [step("Compile the samples:"), "", fence("bash", "npm run build"), ""].join("\n");
+      } else {
+        return "";
+      }
+    })()}
 ${step(
-  "Edit the file `sample.env`, adding the correct credentials to access the Azure service and run the samples. Then rename the file from `sample.env` to just `.env`. The sample programs will read this file automatically."
-)}
+      "Edit the file `sample.env`, adding the correct credentials to access the Azure service and run the samples. Then rename the file from `sample.env` to just `.env`. The sample programs will read this file automatically."
+    )}
 
 ${step(
-  "Run whichever samples you like (note that some samples may require additional setup, see the table above):"
-)}
+      "Run whichever samples you like (note that some samples may require additional setup, see the table above):"
+    )}
 
 ${fence(
-  "bash",
-  `node ${(() => {
-    const firstSource = filterModules(info)[0].relativeSourcePath;
-    const filePath = info.useTypeScript ? "dist/" : "";
-    return filePath + firstSource.replace(/\.ts$/, ".js");
-  })()}`
-)}
+      "bash",
+      `node ${(() => {
+        const firstSource = filterModules(info)[0].relativeSourcePath;
+        const filePath = info.useTypeScript ? "dist/" : "";
+        return filePath + firstSource.replace(/\.ts$/, ".js");
+      })()}`
+    )}
 
 Alternatively, run a single sample with the correct environment variables set (setting up the \`.env\` file is not required if you do this), for example (cross-platform):
 

@@ -10,8 +10,8 @@ const log = createPrinter("check-with-timeout");
  */
 export async function checkWithTimeout(
   predicate: () => boolean | Promise<boolean>,
-  delayBetweenRetriesInMilliseconds: number = 1000,
-  maxWaitTimeInMilliseconds: number = 10000
+  delayBetweenRetriesInMilliseconds = 1000,
+  maxWaitTimeInMilliseconds = 10000
 ): Promise<boolean> {
   const maxTime = Date.now() + maxWaitTimeInMilliseconds;
   while (Date.now() < maxTime) {

@@ -57,7 +57,7 @@ export async function* findMatchingFiles(
   dir: string,
   matches: (name: string, entry: fs.Stats) => boolean,
   findOptions?: Partial<FindOptions>
-) {
+): AsyncGenerator {
   const q: FileInfo[] = [];
 
   const options: FindOptions = { ...defaultFindOptions, ...findOptions };

@@ -142,7 +142,7 @@ const removeJsTsExtensions = (name: string): string => name.replace(/\.[jt]s$/,
  * @param info - FileInfo of a sample file to be considered
  * @param skips - a list of strings that identify files to be skipped
  */
-export function shouldSkip(info: FileInfo, skips: string[]) {
+export function shouldSkip(info: FileInfo, skips: string[]): boolean {
   // Add a slash to the skip if necessary
   const addFirstSlash = (skip: string): string => (skip.startsWith("/") ? skip : "/" + skip);