[Customization] Fix creation of subdirectories (Azure#27805)

dgetu · web-flow · commit 5b4eadfac62d · 2023-11-15T00:26:13.000Z
diff --git a/common/tools/dev-tool/src/commands/customization/apply.ts b/common/tools/dev-tool/src/commands/customization/apply.ts
@@ -44,6 +44,6 @@ export default leafCommand(commandInfo, async (options) => {
             from '${customDirectory}' 
             to '${sourceDirectory}'
             writing to ${targetDirectory}.`);
-  customize(sourceDirectory, customDirectory, targetDirectory);
+  await customize(sourceDirectory, customDirectory, targetDirectory);
   return true;
 });
diff --git a/common/tools/dev-tool/src/util/customization/classes.ts b/common/tools/dev-tool/src/util/customization/classes.ts
@@ -127,7 +127,7 @@ export function getConstructorAugmentationParameters(
     );
   }
 
-  for (const [_, augmentedParameter] of expectedAugmentationParams) {
+  for (const augmentedParameter of expectedAugmentationParams.values()) {
     if (!customConstructor.getBodyText()?.includes(augmentedParameter)) {
       throw new Error(`Custom constructor is missing parameter ${augmentedParameter}`);
     }
diff --git a/common/tools/dev-tool/src/util/customization/customize.ts b/common/tools/dev-tool/src/util/customization/customize.ts
@@ -37,7 +37,7 @@ export async function customize(originalDir: string, customDir: string, outDir:
   // Bring everything from original into the output
   await copy(originalDir, outDir);
 
-  if (!directoryExists(customDir)) {
+  if (!(await directoryExists(customDir))) {
     return;
   }
 
@@ -46,7 +46,7 @@ export async function customize(originalDir: string, customDir: string, outDir:
     _originalFolderName;
 
   // Bring files only present in custom into the output
-  copyFilesInCustom(originalDir, customDir, outDir);
+  await copyFilesInCustom(originalDir, customDir, outDir);
 
   const projectInfo = await resolveProject(process.cwd());
 
@@ -83,6 +83,7 @@ async function copyFilesInCustom(originalDir: string, customDir: string, outDir:
   for (const file of filesToCopy) {
     const sourcePath = file;
     const destPath = file.replace(customDir, outDir);
+    await ensureDir(path.dirname(destPath));
     await copyFile(sourcePath, destPath);
   }
 }
diff --git a/common/tools/dev-tool/src/util/customization/helpers/files.ts b/common/tools/dev-tool/src/util/customization/helpers/files.ts
@@ -22,5 +22,5 @@ export async function getFiles(dir: string): Promise<string[]> {
       return dirent.isDirectory() ? getFiles(res) : res;
     })
   );
-  return files.flat() as string[];
+  return files.flat();
 }
diff --git a/common/tools/dev-tool/src/util/customization/imports.ts b/common/tools/dev-tool/src/util/customization/imports.ts
@@ -5,7 +5,7 @@ import { ImportDeclaration } from "ts-morph";
 import { getCustomizationState } from "./state";
 import * as path from "path";
 
-export async function augmentImports(
+export function augmentImports(
   originalImports: Map<string, ImportDeclaration>,
   customImports: ImportDeclaration[]
 ) {
diff --git a/common/tools/dev-tool/src/util/customization/interfaces.ts b/common/tools/dev-tool/src/util/customization/interfaces.ts
@@ -101,8 +101,8 @@ function findCallSignature(
 ): CallSignatureDeclaration | undefined {
   function typeEquals(a: Type, b: Type) {
     // Need to handle cases where the type is imported
-    const aStr = a?.getText()?.replace(/import\(\".+\"\)\./, "");
-    const bStr = b?.getText()?.replace(/import\(\".+\"\)\./, "");
+    const aStr = a?.getText()?.replace(/import\(".+"\)\./, "");
+    const bStr = b?.getText()?.replace(/import\(".+"\)\./, "");
     return aStr && bStr && aStr === bStr;
   }
   return interfaceDeclaration.getCallSignature((signature) => {
diff --git a/dataplane.code-workspace b/dataplane.code-workspace
@@ -284,6 +284,9 @@
     },
     {
       "path": "sdk/core/core-http-compat"
+    },
+    {
+      "path": "sdk/openai/openai"
     }
   ],
   "settings": {

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ export function getConstructorAugmentationParameters(`
`127`	`127`	`);`
`128`	`128`	`}`
`129`	`129`
`130`		`- for (const [_, augmentedParameter] of expectedAugmentationParams) {`
	`130`	`+ for (const augmentedParameter of expectedAugmentationParams.values()) {`
`131`	`131`	`if (!customConstructor.getBodyText()?.includes(augmentedParameter)) {`
`132`	`132`	throw new Error(`Custom constructor is missing parameter ${augmentedParameter}`);
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ export async function customize(originalDir: string, customDir: string, outDir:`
`37`	`37`	`// Bring everything from original into the output`
`38`	`38`	`await copy(originalDir, outDir);`
`39`	`39`
`40`		`- if (!directoryExists(customDir)) {`
	`40`	`+ if (!(await directoryExists(customDir))) {`
`41`	`41`	`return;`
`42`	`42`	`}`
`43`	`43`
`@@ -46,7 +46,7 @@ export async function customize(originalDir: string, customDir: string, outDir:`
`46`	`46`	`_originalFolderName;`
`47`	`47`
`48`	`48`	`// Bring files only present in custom into the output`
`49`		`- copyFilesInCustom(originalDir, customDir, outDir);`
	`49`	`+ await copyFilesInCustom(originalDir, customDir, outDir);`
`50`	`50`
`51`	`51`	`const projectInfo = await resolveProject(process.cwd());`
`52`	`52`
`@@ -83,6 +83,7 @@ async function copyFilesInCustom(originalDir: string, customDir: string, outDir:`
`83`	`83`	`for (const file of filesToCopy) {`
`84`	`84`	`const sourcePath = file;`
`85`	`85`	`const destPath = file.replace(customDir, outDir);`
	`86`	`+ await ensureDir(path.dirname(destPath));`
`86`	`87`	`await copyFile(sourcePath, destPath);`
`87`	`88`	`}`
`88`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ export async function getFiles(dir: string): Promise<string[]> {`
`22`	`22`	`return dirent.isDirectory() ? getFiles(res) : res;`
`23`	`23`	`})`
`24`	`24`	`);`
`25`		`- return files.flat() as string[];`
	`25`	`+ return files.flat();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,9 @@`
`284`	`284`	`},`
`285`	`285`	`{`
`286`	`286`	`"path": "sdk/core/core-http-compat"`
	`287`	`+ },`
	`288`	`+ {`
	`289`	`+ "path": "sdk/openai/openai"`
`287`	`290`	`}`
`288`	`291`	`],`
`289`	`292`	`"settings": {`