move ResolvedCodecType into the public API

Author: freeatnet

packages/gel/src/reflection/analyzeQuery.ts

@@ -23,9 +23,14 @@ type QueryType = {
   imports: Set<string>;
 };
 
+export type AnalyzeQueryOptions = {
+  useResolvedCodecType?: boolean;
+};
+
 export async function analyzeQuery(
   client: Client,
   query: string,
+  { useResolvedCodecType = false }: AnalyzeQueryOptions = {},
 ): Promise<QueryType> {
   const {
     cardinality,
@@ -34,11 +39,18 @@ export async function analyzeQuery(
     out: outCodec,
   } = await client.describe(query);
 
+  const generators: CodecGeneratorMap = useResolvedCodecType
+    ? new Map([...defaultCodecGenerators, resolvedCodecTypeScalarTypeGenerator])
+    : defaultCodecGenerators;
+
   const args = generateTSTypeFromCodec(inCodec, Cardinality.One, {
     optionalNulls: true,
     readonly: true,
+    generators,
+  });
+  const result = generateTSTypeFromCodec(outCodec, cardinality, {
+    generators,
   });
-  const result = generateTSTypeFromCodec(outCodec, cardinality);
 
   const imports = args.imports.merge(result.imports);
   return {
@@ -160,6 +172,21 @@ const getSortPriority = (field: FieldDef) => {
   return 8;
 };
 
+const resolvedCodecTypeScalarTypeGenerator = genDef(
+  ScalarCodec,
+  (codec, ctx) => {
+    if (codec.tsModule) {
+      ctx.imports.add(codec.tsModule, codec.tsType);
+    }
+    const isCustomScalar = !codec.typeName.startsWith("std::");
+    if (isCustomScalar) {
+      ctx.imports.add("gel", "ResolvedCodecType");
+      return `ResolvedCodecType<"${codec.typeName}", ${codec.tsType}>`;
+    }
+    return codec.tsType;
+  },
+);
+
 export const defaultCodecGenerators: CodecGeneratorMap = new Map([
   genDef(NullCodec, () => "null"),
   genDef(EnumCodec, (codec) => {

packages/generate/src/queries.ts

@@ -1,13 +1,6 @@
 import path from "node:path";
 import { promises as fs } from "node:fs";
-import {
-  $,
-  _CodecsRegistry,
-  _ScalarCodec,
-  systemUtils,
-  type Client,
-  type Executor,
-} from "gel";
+import { $, systemUtils, type Client, type Executor } from "gel";
 import { type CommandOptions } from "./commandutil";
 import { headerComment } from "./genutil";
 import type { Target } from "./genutil";
@@ -73,7 +66,7 @@ currently supported.`);
 
         try {
           const query = await readFileUtf8(p);
-          const types = await analyzeQuery(client, query, {
+          const types = await $.analyzeQuery(client, query, {
             useResolvedCodecType: params.options.useResolvedCodecType,
           });
           console.log(`   ${prettyPath}`);
@@ -129,7 +122,7 @@ currently supported.`);
     try {
       const query = await readFileUtf8(p);
       if (!query) return;
-      const types = await analyzeQuery(client, query, {
+      const types = await $.analyzeQuery(client, query, {
         useResolvedCodecType: params.options.useResolvedCodecType,
       });
       const files = generateFiles({
@@ -364,56 +357,3 @@ export class ImportMap extends Map<string, Set<string>> {
     return out;
   }
 }
-
-const resolvedCodecTypeScalarTypeGenerator = $.defineCodecGeneratorTuple(
-  _ScalarCodec,
-  (codec, ctx) => {
-    if (codec.tsModule) {
-      ctx.imports.add(codec.tsModule, codec.tsType);
-    }
-    const isCustomScalar = !codec.typeName.startsWith("std::");
-    if (isCustomScalar) {
-      ctx.imports.add("gel", "ResolvedCodecType");
-      return `ResolvedCodecType<"${codec.typeName}", ${codec.tsType}>`;
-    }
-    return codec.tsType;
-  },
-);
-
-async function analyzeQuery(
-  client: Client,
-  query: string,
-  { useResolvedCodecType }: { useResolvedCodecType?: boolean } = {},
-): ReturnType<typeof $.analyzeQuery> {
-  const {
-    cardinality,
-    capabilities,
-    in: inCodec,
-    out: outCodec,
-  } = await client.describe(query);
-
-  const generators = new Map([
-    ...$.defaultCodecGenerators.entries(),
-    ...(useResolvedCodecType ? [resolvedCodecTypeScalarTypeGenerator] : []),
-  ]);
-
-  const args = $.generateTSTypeFromCodec(inCodec, $.Cardinality.One, {
-    optionalNulls: true,
-    readonly: true,
-    generators: generators,
-  });
-  const result = $.generateTSTypeFromCodec(outCodec, cardinality, {
-    generators: generators,
-  });
-
-  const imports = args.imports.merge(result.imports);
-  return {
-    result: result.type,
-    args: args.type,
-    cardinality,
-    capabilities,
-    query,
-    importMap: imports,
-    imports: imports.get("gel") ?? new Set(),
-  };
-}