chore: clean up dsl exports

Author: mrlubos

packages/openapi-ts/src/plugins/valibot/shared/pipesToAst.ts

@@ -1,7 +1,6 @@
 import type ts from 'typescript';
 
-import { CallTsDsl } from '~/ts-dsl';
-import { $ } from '~/ts-dsl';
+import { $, TsDsl } from '~/ts-dsl';
 
 import type { ValibotPlugin } from '../types';
 import { identifiers } from '../v1/constants';
@@ -10,11 +9,11 @@ export const pipesToAst = ({
   pipes,
   plugin,
 }: {
-  pipes: ReadonlyArray<ts.Expression | CallTsDsl>;
+  pipes: ReadonlyArray<ts.Expression | ReturnType<typeof $.call>>;
   plugin: ValibotPlugin['Instance'];
 }): ts.Expression => {
   if (pipes.length === 1) {
-    return pipes[0] instanceof CallTsDsl ? pipes[0].$render() : pipes[0]!;
+    return pipes[0] instanceof TsDsl ? pipes[0].$render() : pipes[0]!;
   }
 
   const v = plugin.referenceSymbol({

packages/openapi-ts/src/plugins/valibot/types.d.ts

@@ -3,7 +3,7 @@ import type ts from 'typescript';
 
 import type { IR } from '~/ir/types';
 import type { DefinePlugin, Plugin } from '~/plugins';
-import type { CallTsDsl, DollarTsDsl, ObjectTsDsl, TsDsl } from '~/ts-dsl';
+import type { $, DollarTsDsl, TsDsl } from '~/ts-dsl';
 import type { StringCase, StringName } from '~/types/case';
 import type { MaybeArray } from '~/types/utils';
 
@@ -332,7 +332,7 @@ type SharedResolverArgs = DollarTsDsl & {
    * resulting schema is constructed. Returning `undefined` from a resolver will
    * use the default generation behavior.
    */
-  pipes: Array<CallTsDsl>;
+  pipes: Array<ReturnType<typeof $.call>>;
   plugin: ValibotPlugin['Instance'];
 };
 
@@ -344,7 +344,7 @@ export type ObjectBaseResolverArgs = SharedResolverArgs & {
   /** Null = never */
   additional?: ts.Expression | null;
   schema: IR.SchemaObject;
-  shape: ObjectTsDsl;
+  shape: ReturnType<typeof $.object>;
 };
 
 export type ValidatorResolverArgs = SharedResolverArgs & {
@@ -378,7 +378,9 @@ type Resolvers = Plugin.Resolvers<{
      *
      * Returning `undefined` will execute the default resolver logic.
      */
-    base?: (args: ObjectBaseResolverArgs) => CallTsDsl | undefined;
+    base?: (
+      args: ObjectBaseResolverArgs,
+    ) => ReturnType<typeof $.call> | undefined;
   };
   /**
    * Resolvers for string schemas.

packages/openapi-ts/src/plugins/valibot/v1/toAst/boolean.ts

@@ -1,7 +1,6 @@
 import type ts from 'typescript';
 
 import type { SchemaWithType } from '~/plugins';
-import type { CallTsDsl } from '~/ts-dsl';
 import { $ } from '~/ts-dsl';
 
 import { pipesToAst } from '../../shared/pipesToAst';
@@ -14,7 +13,7 @@ export const booleanToAst = ({
 }: IrSchemaToAstOptions & {
   schema: SchemaWithType<'boolean'>;
 }): ts.Expression => {
-  const pipes: Array<CallTsDsl> = [];
+  const pipes: Array<ReturnType<typeof $.call>> = [];
 
   const v = plugin.referenceSymbol({
     category: 'external',

packages/openapi-ts/src/plugins/valibot/v1/toAst/object.ts

@@ -2,7 +2,7 @@ import type ts from 'typescript';
 
 import type { SchemaWithType } from '~/plugins';
 import { toRef } from '~/plugins/shared/utils/refs';
-import { $, type CallTsDsl } from '~/ts-dsl';
+import { $ } from '~/ts-dsl';
 
 import { pipesToAst } from '../../shared/pipesToAst';
 import type { Ast, IrSchemaToAstOptions } from '../../shared/types';
@@ -63,7 +63,7 @@ export const objectToAst = ({
   schema: SchemaWithType<'object'>;
 }): Omit<Ast, 'typeName'> => {
   const result: Partial<Omit<Ast, 'typeName'>> = {};
-  const pipes: Array<CallTsDsl> = [];
+  const pipes: Array<ReturnType<typeof $.call>> = [];
 
   // TODO: parser - handle constants
 

packages/openapi-ts/src/plugins/valibot/v1/toAst/string.ts

@@ -1,7 +1,6 @@
 import type ts from 'typescript';
 
 import type { SchemaWithType } from '~/plugins';
-import type { CallTsDsl } from '~/ts-dsl';
 import { $ } from '~/ts-dsl';
 
 import { pipesToAst } from '../../shared/pipesToAst';
@@ -54,7 +53,7 @@ export const stringToAst = ({
 }: IrSchemaToAstOptions & {
   schema: SchemaWithType<'string'>;
 }): ts.Expression => {
-  const pipes: Array<CallTsDsl> = [];
+  const pipes: Array<ReturnType<typeof $.call>> = [];
 
   const v = plugin.referenceSymbol({
     category: 'external',

packages/openapi-ts/src/plugins/zod/mini/toAst/boolean.ts

@@ -1,5 +1,4 @@
 import type { SchemaWithType } from '~/plugins';
-import type { CallTsDsl } from '~/ts-dsl';
 import { $ } from '~/ts-dsl';
 
 import { identifiers } from '../../constants';
@@ -12,7 +11,7 @@ export const booleanToAst = ({
   schema: SchemaWithType<'boolean'>;
 }): Omit<Ast, 'typeName'> => {
   const result: Partial<Omit<Ast, 'typeName'>> = {};
-  let chain: CallTsDsl;
+  let chain: ReturnType<typeof $.call>;
 
   const z = plugin.referenceSymbol({
     category: 'external',

packages/openapi-ts/src/plugins/zod/mini/toAst/object.ts

@@ -2,7 +2,6 @@ import type ts from 'typescript';
 
 import type { SchemaWithType } from '~/plugins';
 import { toRef } from '~/plugins/shared/utils/refs';
-import type { CallTsDsl } from '~/ts-dsl';
 import { $ } from '~/ts-dsl';
 
 import { identifiers } from '../../constants';
@@ -14,7 +13,7 @@ function defaultObjectBaseResolver({
   additional,
   plugin,
   shape,
-}: ObjectBaseResolverArgs): CallTsDsl {
+}: ObjectBaseResolverArgs): ReturnType<typeof $.call> {
   const z = plugin.referenceSymbol({
     category: 'external',
     resource: 'zod.z',

packages/openapi-ts/src/plugins/zod/mini/toAst/string.ts

@@ -1,5 +1,4 @@
 import type { SchemaWithType } from '~/plugins';
-import type { CallTsDsl } from '~/ts-dsl';
 import { $ } from '~/ts-dsl';
 
 import { identifiers } from '../../constants';
@@ -10,7 +9,7 @@ const defaultFormatResolver = ({
   chain,
   plugin,
   schema,
-}: FormatResolverArgs): CallTsDsl => {
+}: FormatResolverArgs): ReturnType<typeof $.call> => {
   const z = plugin.referenceSymbol({
     category: 'external',
     resource: 'zod.z',
@@ -62,7 +61,7 @@ export const stringToAst = ({
   schema: SchemaWithType<'string'>;
 }): Omit<Ast, 'typeName'> => {
   const result: Partial<Omit<Ast, 'typeName'>> = {};
-  let chain: CallTsDsl;
+  let chain: ReturnType<typeof $.call>;
 
   const z = plugin.referenceSymbol({
     category: 'external',
@@ -86,7 +85,7 @@ export const stringToAst = ({
     chain = resolver?.(args) ?? defaultFormatResolver(args);
   }
 
-  const checks: Array<CallTsDsl> = [];
+  const checks: Array<ReturnType<typeof $.call>> = [];
 
   if (schema.minLength === schema.maxLength && schema.minLength !== undefined) {
     checks.push(

packages/openapi-ts/src/plugins/zod/types.d.ts

@@ -3,7 +3,7 @@ import type ts from 'typescript';
 
 import type { IR } from '~/ir/types';
 import type { DefinePlugin, Plugin } from '~/plugins';
-import type { CallTsDsl, DollarTsDsl, ObjectTsDsl, TsDsl } from '~/ts-dsl';
+import type { $, DollarTsDsl, TsDsl } from '~/ts-dsl';
 import type { StringCase, StringName } from '~/types/case';
 import type { MaybeArray } from '~/types/utils';
 
@@ -757,7 +757,7 @@ type SharedResolverArgs = DollarTsDsl & {
    * This chain can be extended, transformed, or replaced entirely to customize
    * the resulting output of the resolver.
    */
-  chain?: CallTsDsl;
+  chain?: ReturnType<typeof $.call>;
   plugin: ZodPlugin['Instance'];
 };
 
@@ -769,7 +769,7 @@ export type ObjectBaseResolverArgs = SharedResolverArgs & {
   /** Null = never */
   additional?: ts.Expression | null;
   schema: IR.SchemaObject;
-  shape: ObjectTsDsl;
+  shape: ReturnType<typeof $.object>;
 };
 
 export type ValidatorResolverArgs = SharedResolverArgs & {
@@ -802,7 +802,9 @@ type Resolvers = Plugin.Resolvers<{
      *
      * Returning `undefined` will execute the default resolver logic.
      */
-    base?: (args: ObjectBaseResolverArgs) => CallTsDsl | undefined;
+    base?: (
+      args: ObjectBaseResolverArgs,
+    ) => ReturnType<typeof $.call> | undefined;
   };
   /**
    * Resolvers for string schemas.
@@ -824,7 +826,7 @@ type Resolvers = Plugin.Resolvers<{
      */
     formats?: Record<
       string,
-      (args: FormatResolverArgs) => CallTsDsl | undefined
+      (args: FormatResolverArgs) => ReturnType<typeof $.call> | undefined
     >;
   };
   /**

packages/openapi-ts/src/plugins/zod/v3/toAst/boolean.ts

@@ -1,7 +1,6 @@
 import type ts from 'typescript';
 
 import type { SchemaWithType } from '~/plugins';
-import type { CallTsDsl } from '~/ts-dsl';
 import { $ } from '~/ts-dsl';
 
 import { identifiers } from '../../constants';
@@ -13,7 +12,7 @@ export const booleanToAst = ({
 }: IrSchemaToAstOptions & {
   schema: SchemaWithType<'boolean'>;
 }): ts.CallExpression => {
-  let chain: CallTsDsl;
+  let chain: ReturnType<typeof $.call>;
 
   const z = plugin.referenceSymbol({
     category: 'external',