Remove part of QB type gen override

With my upstream change, the query builder correctly generates scalars
with our `scalarToLiteralMapping` additions.
Unfortunately, we still have to handle import fixes.

Author: CarsonF

src/core/edgedb/generator/query-builder.ts

@@ -22,7 +22,7 @@ export async function generateQueryBuilder({
     schemaDir: 'unused',
   });
   addJsExtensionDeepPathsOfEdgedbLibrary(qbDir);
-  changeCustomScalars(qbDir);
+  fixCustomScalarsImports(qbDir);
   updateEdgeQLRenderingForOurCustomScalars(qbDir);
   updateCastMapsForOurCustomScalars(qbDir);
   changeImplicitIDType(qbDir);
@@ -42,20 +42,11 @@ function addJsExtensionDeepPathsOfEdgedbLibrary(qbDir: Directory) {
   }
 }
 
-function changeCustomScalars(qbDir: Directory) {
-  // Change $uuid scalar type alias to use ID type instead of string
+function fixCustomScalarsImports(qbDir: Directory) {
   for (const scalars of groupBy(customScalars.values(), (s) => s.module)) {
     const moduleFile = qbDir.addSourceFileAtPath(
       `modules/${scalars[0]!.module}.ts`,
     );
-    for (const scalar of scalars) {
-      const typeAlias = moduleFile.getTypeAliasOrThrow(`$${scalar.type}`);
-      typeAlias
-        .getFirstChildByKindOrThrow(SyntaxKind.TypeReference)
-        .getFirstChildByKindOrThrow(SyntaxKind.SyntaxList)
-        .getLastChildOrThrow()
-        .replaceWithText(scalar.ts);
-    }
     addCustomScalarImports(moduleFile, scalars);
   }
 }

src/core/edgedb/generator/scalars.ts

@@ -8,7 +8,7 @@ export const customScalars = mapEntries(codecs, (codec) => [
 ]).asMap;
 
 export function setTsTypesFromOurScalarCodecs() {
-  // this is used for schema interfaces
+  // this is used for schema interfaces & query builder
   for (const { info } of codecs) {
     const fqName = `${info.module}::${info.type}`;
     scalarToLiteralMapping[fqName].type = info.ts;