[Customization] Fix import edge cases in template-dpg (#27824)

Author: dgetu

common/tools/dev-tool/package.json

@@ -85,9 +85,9 @@
     "cross-env": "^7.0.3",
     "downlevel-dts": "~0.10.0",
     "eslint": "^8.54.0",
+    "karma": "^6.4.2",
     "mkdirp": "^3.0.1",
     "mocha": "^10.0.0",
-    "karma": "^6.4.2",
     "rimraf": "^5.0.5"
   }
 }

common/tools/dev-tool/src/commands/run/check-api.ts

@@ -123,8 +123,8 @@ export default leafCommand(commandInfo, async () => {
     if (!projectInfo.packageJson.typesVersions) return [defaultTypesFile];
 
     // Look for an entry with a key that our version of TS satisfies
-    const firstMatchingVersion = Object.entries(projectInfo.packageJson.typesVersions!).find(
-      ([v]) => semver.satisfies(tsVersion, v),
+    const firstMatchingVersion = Object.entries(projectInfo.packageJson.typesVersions).find(([v]) =>
+      semver.satisfies(tsVersion, v),
     );
 
     if (firstMatchingVersion === undefined) {

common/tools/dev-tool/src/commands/run/testBrowser.ts

@@ -12,7 +12,7 @@ export const commandInfo = makeCommandInfo(
 
 export default leafCommand(commandInfo, async (options) => {
   const karmaArgs = options["--"]?.length
-    ? options["--"]?.join(" ")
+    ? options["--"].join(" ")
     : `${(await isModuleProject()) ? "karma.conf.cjs" : ""} --single-run`;
   return runTestsWithProxyTool({
     command: `karma start ${karmaArgs}`,

common/tools/dev-tool/src/commands/run/testNodeJSInput.ts

@@ -32,7 +32,7 @@ export default leafCommand(commandInfo, async (options) => {
     opt.includes("**") && !opt.startsWith("'") && !opt.startsWith('"') ? `"${opt}"` : opt,
   );
   const mochaArgs = updatedArgs?.length
-    ? updatedArgs?.join(" ")
+    ? updatedArgs.join(" ")
     : '--timeout 5000000 "dist-esm/test/{,!(browser)/**/}/*.spec.js"';
   const command = {
     command: `c8 mocha ${defaultMochaArgs} ${mochaArgs}`,

common/tools/dev-tool/src/commands/run/testNodeTSInput.ts

@@ -31,7 +31,7 @@ export default leafCommand(commandInfo, async (options) => {
     opt.includes("**") && !opt.startsWith("'") && !opt.startsWith('"') ? `"${opt}"` : opt,
   );
   const mochaArgs = updatedArgs?.length
-    ? updatedArgs?.join(" ")
+    ? updatedArgs.join(" ")
     : '--timeout 1200000 --exclude "test/**/browser/*.spec.ts" "test/**/*.spec.ts"';
   const command = {
     command: isModuleProj

common/tools/dev-tool/src/commands/run/vendored.ts

@@ -34,7 +34,9 @@ function makeCommandExecutor(commandName: string): (...args: string[]) => Promis
       const command = spawn(commandPath, args, { stdio: "inherit" });
 
       // If the command exited 0, then we treat that as a success
-      command.on("exit", (code) => resolve(code === 0));
+      command.on("exit", (code) => {
+        resolve(code === 0);
+      });
       command.on("error", reject);
     });
 }

common/tools/dev-tool/src/config/rollup.base.config.ts

@@ -23,7 +23,7 @@ const { debug } = createPrinter("rollup.base.config");
 
 interface PackageJson {
   name: string;
-  module: string;
+  module?: string;
   dependencies: Record<string, string>;
   devDependencies: Record<string, string>;
 }

common/tools/dev-tool/src/framework/command.ts

@@ -87,8 +87,8 @@ export function subCommand<Info extends CommandInfo<CommandOptions>>(
       return true;
     }
 
-    const commandName = options.args[0];
-    const commandArgs = options.args.slice(1);
+    const commandName = options.args[0] as string | undefined;
+    const commandArgs = options.args.slice(1) as string[] | undefined;
 
     if (commandName === undefined) {
       log.error("No sub-command provided.");
@@ -98,12 +98,11 @@ export function subCommand<Info extends CommandInfo<CommandOptions>>(
 
     const extraArgs = options["--"];
 
-    const fullArgs =
-      extraArgs !== undefined && extraArgs.length > 0
-        ? [...commandArgs, "--", ...extraArgs]
-        : commandArgs;
+    const fullArgs = [commandArgs, extraArgs?.length && ["--", extraArgs]]
+      .flat(2)
+      .filter((arg): arg is string => typeof arg === "string");
 
-    log.debug(`$ ${commandName} ${fullArgs.join(" ") ?? ""}`);
+    log.debug(`$ ${commandName} ${fullArgs.join(" ")}`);
 
     if (Object.prototype.hasOwnProperty.call(commands, commandName)) {
       const commandModule = await commands[commandName]();

common/tools/dev-tool/src/framework/parseOptions.ts

@@ -112,12 +112,16 @@ export function parseOptions<Opts extends CommandOptions>(
 
   const result: ParsedOptions = { help: argMap.help, args: argMap._, "--": argMap["--"] };
 
-  function expectType<T>(key: string, value: T, expected: string): void {
+  function expectType<T extends string | boolean | Array<string | boolean> | undefined>(
+    key: string,
+    value: T,
+    expected: string,
+  ): void {
     if (Array.isArray(value)) {
       parseError(`Too many arguments for "${key}"`);
       throw new Error(`More than one value for "${key}" was given, but only one was expected`);
     } else if (typeof value !== expected && typeof value !== "undefined") {
-      parseError(`Bad argument: "${key}" = ${value}`);
+      parseError(`Bad argument: "${key}" = ${value.toString()}`);
       throw new Error(
         `Value of argument "${key}" was a ${typeof value} but a ${expected} was expected.`,
       );

common/tools/dev-tool/src/migrations/onboard/test-proxy-asset-sync.ts

@@ -32,9 +32,9 @@ export default createMigration(
 
     // Optional validation
     async validate(ctx) {
-      const assetsJson = JSON.parse(
-        (await readFile(path.join(ctx.project.path, "assets.json"))).toString("utf-8"),
-      ) as AssetsJson;
+      const assetsJson: Partial<AssetsJson> = await readFile(
+        path.join(ctx.project.path, "assets.json"),
+      ).then((buf) => JSON.parse(buf.toString("utf-8")));
 
       // Check that the assets.json file is well formed and that we didn't get a bad generation.
       if (