refactor: schema standard types

src/entrypoints/_Scalars.ts

@@ -1 +1 @@
-export { create } from '../types/Schema/types/Scalar/_.js'
+export { create } from '../types/Schema/nodes/Scalar/_.js'

src/entrypoints/generator-helpers/standardScalarTypes.ts

@@ -1 +1 @@
-export * from '../../types/Schema/types/Scalar/standardScalarTypes.js'
+export * from '../../types/Schema/StandardTypes/scalar.js'

src/entrypoints/utilities-for-generated.ts

@@ -12,5 +12,5 @@ export { type Exact, type ExactNonEmpty, type UnionExpanded } from '../lib/prelu
 export { TypeFunction } from '../lib/type-function/__.js'
 export { type GlobalRegistry } from '../types/GlobalRegistry/GlobalRegistry.js'
 export { Schema } from '../types/Schema/__.js'
-export * from '../types/Schema/types/Scalar/standardScalarTypes.js'
+export * from '../types/Schema/StandardTypes/scalar.js'
 export { type SchemaDrivenDataMap } from '../types/SchemaDrivenDataMap/__.js'

src/extensions/SchemaErrors/tests/fixture/graffle.config.ts

@@ -12,7 +12,7 @@ export default Generator
     libraryPaths: {
       client: `../../../../entrypoints/client.ts`,
       schema: `../../../../entrypoints/schema.ts`,
-      scalars: `../../../../types/Schema/types/Scalar/standardScalarTypes.ts`,
+      scalars: `../../../../types/Schema/StandardTypes/scalar.ts`,
       utilitiesForGenerated: `../../../../entrypoints/utilities-for-generated.ts`,
     },
   })

src/extensions/SchemaErrors/tests/fixture/graffle/modules/Scalar.ts

@@ -1,6 +1,6 @@
 import type * as $$Utilities from '../../../../../../entrypoints/utilities-for-generated.js'
 
-export * from '../../../../../../types/Schema/types/Scalar/standardScalarTypes.js'
+export * from '../../../../../../types/Schema/StandardTypes/scalar.js'
 
 //
 //

src/extensions/SchemaErrors/tests/fixture/graffle/modules/Schema.ts

@@ -20,12 +20,12 @@ export namespace Schema {
   //
   //
 
-  export type Mutation = $.ObjectMutation<{
+  export type Mutation = $.StandardTypes.Mutation<{
     id: $.Field<'id', $.Nullable<$Scalar.ID>, null>
     idNonNull: $.Field<'idNonNull', $Scalar.ID, null>
   }>
 
-  export type Query = $.ObjectQuery<{
+  export type Query = $.StandardTypes.Query<{
     InputObjectNested: $.Field<
       'InputObjectNested',
       $.Nullable<$Scalar.ID>,

src/generator/generators/Schema.ts

@@ -240,7 +240,7 @@ const concreteRenderers = defineConcreteRenderers({
   GraphQLObjectType: (config, node) => {
     const maybeRootTypeName = (Grafaid.Schema.RootTypeName as Record<string, Grafaid.Schema.RootTypeName>)[node.name]
     const type = maybeRootTypeName
-      ? `$.Object${maybeRootTypeName}<${renderOutputFields(config, node)}>`
+      ? `$.StandardTypes.${maybeRootTypeName}<${renderOutputFields(config, node)}>`
       : `$.OutputObject<${Code.string(node.name)}, ${renderOutputFields(config, node)}>`
     const doc = getDocumentation(config, node)
     const source = Code.export$(Code.type(node.name, type))

src/layers/3_InferResult/Object.ts

@@ -29,7 +29,7 @@ type SelectionNonSelectAlias<$SelectionSet , $Schema extends Schema, $SchemaNode
 
 // dprint-ignore
 export namespace Errors {
-  export type UnknownFieldName<$FieldName extends string, $Object extends Schema.RootType | Schema.OutputObject> =
+  export type UnknownFieldName<$FieldName extends string, $Object extends Schema.StandardTypes.RootType | Schema.OutputObject> =
     TSErrorDescriptive<'Object', `field "${$FieldName}" does not exist on object "${$Object['fields']['__typename']['type']['type']}"`>
 }
 

src/layers/3_InferResult/root.ts

@@ -6,7 +6,7 @@ import type { Object } from './Object.js'
 export type RootViaObject<
   $SelectionSet,
   $Schema extends Schema,
-  $RootType extends Schema.RootType,
+  $RootType extends Schema.StandardTypes.RootType,
 > = Root<
   $SelectionSet,
   $Schema,

src/types/Schema/StandardTypes/_.ts

@@ -0,0 +1,2 @@
+export * from './object.js'
+export * from './scalar.js'

src/types/Schema/StandardTypes/__.ts

@@ -0,0 +1 @@
+export * as StandardTypes from './_.js'

src/types/Schema/typeTypes.ts → src/types/Schema/StandardTypes/object.ts

@@ -1,16 +1,16 @@
-import type { Grafaid } from '../../lib/grafaid/__.js'
-import type { OutputObject, SomeFields } from './_.js'
+import type { Grafaid } from '../../../lib/grafaid/__.js'
+import type { OutputObject, SomeFields } from '../_.js'
 
-export interface ObjectQuery<
+export interface Query<
   $Fields extends SomeFields = SomeFields,
 > extends OutputObject<Grafaid.Schema.RootTypeNameQuery, $Fields> {}
 
-export interface ObjectMutation<
+export interface Mutation<
   $Fields extends SomeFields = SomeFields,
 > extends OutputObject<Grafaid.Schema.RootTypeNameMutation, $Fields> {}
 
-export interface ObjectSubscription<
+export interface Subscription<
   $Fields extends SomeFields = SomeFields,
 > extends OutputObject<Grafaid.Schema.RootTypeNameSubscription, $Fields> {}
 
-export type RootType = ObjectQuery | ObjectMutation | ObjectSubscription
+export type RootType = Query | Mutation | Subscription

src/types/Schema/types/Scalar/standardScalarTypes.ts → src/types/Schema/StandardTypes/scalar.ts

@@ -1,5 +1,20 @@
-import { create } from './create.js'
-import { JavaScriptScalarCodecs } from './JavaScriptScalarCodecs.js'
+import { createCodec } from '../nodes/Scalar/codec.js'
+import { create } from '../nodes/Scalar/create.js'
+
+export const JavaScriptScalarCodecs = {
+  String: createCodec({
+    encode: (value: string) => value,
+    decode: (value: string) => value,
+  }),
+  Number: createCodec({
+    encode: (value: number) => value,
+    decode: (value: number) => value,
+  }),
+  Boolean: createCodec({
+    encode: (value: boolean) => value,
+    decode: (value: boolean) => value,
+  }),
+}
 
 export const String = create(`String`, JavaScriptScalarCodecs.String)
 

src/types/Schema/_.ts

@@ -1,17 +1,17 @@
 export * as Directives from './Directive.js'
 export * from './helpers.js'
 export * from './Named/__.js'
+export * from './nodes/__typename.js'
+export * from './nodes/Args.js'
+export * from './nodes/Enum.js'
+export * from './nodes/InputField.js'
+export * from './nodes/InputObject.js'
+export * from './nodes/Interface.js'
+export * from './nodes/List.js'
+export * from './nodes/Nullable.js'
+export * from './nodes/OutputField.js'
+export { type OutputObject } from './nodes/OutputObject.js'
+export * from './nodes/Scalar/Scalar.js'
+export * from './nodes/Union.js'
+export * from './StandardTypes/__.js'
 export * from './typeGroups.js'
-export * from './types/__typename.js'
-export * from './types/Args.js'
-export * from './types/Enum.js'
-export * from './types/InputField.js'
-export * from './types/InputObject.js'
-export * from './types/Interface.js'
-export * from './types/List.js'
-export * from './types/Nullable.js'
-export * from './types/OutputField.js'
-export { type OutputObject } from './types/OutputObject.js'
-export * from './types/Scalar/Scalar.js'
-export * from './types/Union.js'
-export * from './typeTypes.js'

src/types/Schema/__.ts

@@ -1,12 +1,12 @@
 export * as Schema from './_.js'
 
 import type { GlobalRegistry } from '../GlobalRegistry/GlobalRegistry.js'
-import type { Enum } from './types/Enum.js'
-import type { Interface } from './types/Interface.js'
-import type { OutputObject } from './types/OutputObject.js'
-import type { Scalar } from './types/Scalar/Scalar.js'
-import type { Union } from './types/Union.js'
-import type { ObjectMutation, ObjectQuery, ObjectSubscription, RootType } from './typeTypes.js'
+import type { Enum } from './nodes/Enum.js'
+import type { Interface } from './nodes/Interface.js'
+import type { OutputObject } from './nodes/OutputObject.js'
+import type { Scalar } from './nodes/Scalar/Scalar.js'
+import type { Union } from './nodes/Union.js'
+import type { Mutation, Query, RootType, Subscription } from './StandardTypes/object.js'
 
 /**
  * A generic schema type. Any particular schema will be a subtype of this, with
@@ -20,15 +20,15 @@ export interface Schema<
   RootTypesPresent: ('Query' | 'Mutation' | 'Subscription')[]
   RootUnion: RootType
   Root: {
-    Query: null | ObjectQuery
-    Mutation: null | ObjectMutation
-    Subscription: null | ObjectSubscription
+    Query: null | Query
+    Mutation: null | Mutation
+    Subscription: null | Subscription
   }
   allTypes: Record<
     string,
     | Enum
-    | ObjectQuery
-    | ObjectMutation
+    | Query
+    | Mutation
     | OutputObject
     | Union
     | Interface

src/types/Schema/directives/Include.ts

@@ -1,5 +1,5 @@
 import type { Directive } from '../Directive.js'
-import { Scalar } from '../types/Scalar/Scalar.js'
+import { Scalar } from '../nodes/Scalar/Scalar.js'
 
 export const IncludeDirective: Directive = {
   name: `include`,

src/types/Schema/directives/Skip.ts

@@ -1,5 +1,5 @@
 import type { Directive } from '../Directive.js'
-import { Scalar } from '../types/Scalar/Scalar.js'
+import { Scalar } from '../nodes/Scalar/Scalar.js'
 
 export const SkipDirective: Directive = {
   name: `skip`,

src/types/Schema/helpers.ts

@@ -1,8 +1,8 @@
 import type { TSErrorDescriptive } from '../../lib/ts-error.js'
+import type { __typename } from './nodes/__typename.js'
+import type { List } from './nodes/List.js'
+import type { Nullable } from './nodes/Nullable.js'
 import type { NamedTypes } from './typeGroups.js'
-import type { __typename } from './types/__typename.js'
-import type { List } from './types/List.js'
-import type { Nullable } from './types/Nullable.js'
 
 // todo extends any because of infinite depth issue in generated schema types
 // dprint-ignore

src/types/Schema/nodes/Scalar/_.ts

@@ -0,0 +1,4 @@
+export * from '../../StandardTypes/scalar.js'
+export * from '../ScalarCodecless.js'
+export * from './create.js'
+export * from './helpers.js'

src/types/Schema/types/Scalar/helpers.ts → src/types/Schema/nodes/Scalar/helpers.ts

@@ -1,6 +1,6 @@
+import { String } from '../../StandardTypes/scalar.js'
 import type { Mapper } from './codec.js'
 import type { Scalar } from './Scalar.js'
-import { String } from './standardScalarTypes.js'
 
 export type GetEncoded<$Scalar> = $Scalar extends Scalar<infer _, infer _, infer $Encoded> ? $Encoded : never
 

src/types/Schema/typeGroups.ts

@@ -1,12 +1,12 @@
 import type { InputObject } from './_.js'
-import type { __typename } from './types/__typename.js'
-import type { Enum } from './types/Enum.js'
-import type { Interface } from './types/Interface.js'
-import type { List } from './types/List.js'
-import type { Nullable } from './types/Nullable.js'
-import type { OutputObject } from './types/OutputObject.js'
-import type { Scalar } from './types/Scalar/Scalar.js'
-import type { Union } from './types/Union.js'
+import type { __typename } from './nodes/__typename.js'
+import type { Enum } from './nodes/Enum.js'
+import type { Interface } from './nodes/Interface.js'
+import type { List } from './nodes/List.js'
+import type { Nullable } from './nodes/Nullable.js'
+import type { OutputObject } from './nodes/OutputObject.js'
+import type { Scalar } from './nodes/Scalar/Scalar.js'
+import type { Union } from './nodes/Union.js'
 
 export type NamedTypes = NamedInputTypes | NamedOutputTypes
 

tests/_/schemas/generate.ts

@@ -25,7 +25,7 @@ const generate = async (
     libraryPaths: {
       client: `../../../src/entrypoints/client.ts`,
       schema: `../../../src/entrypoints/schema.ts`,
-      scalars: `../../../src/types/Schema/types/Scalar/standardScalarTypes.ts`,
+      scalars: `../../../src/types/Schema/StandardTypes/scalar.ts`,
       utilitiesForGenerated: `../../../src/entrypoints/utilities-for-generated.ts`,
     },
     ...input.input,

tests/_/schemas/kitchen-sink/graffle/modules/Scalar.ts

@@ -1,6 +1,6 @@
 import type * as $$Utilities from '../../../../../../src/entrypoints/utilities-for-generated.js'
 
-export * from '../../../../../../src/types/Schema/types/Scalar/standardScalarTypes.js'
+export * from '../../../../../../src/types/Schema/StandardTypes/scalar.js'
 
 //
 //

tests/_/schemas/kitchen-sink/graffle/modules/Schema.ts

@@ -20,12 +20,12 @@ export namespace Schema {
   //
   //
 
-  export type Mutation = $.ObjectMutation<{
+  export type Mutation = $.StandardTypes.Mutation<{
     id: $.Field<'id', $.Nullable<$Scalar.ID>, null>
     idNonNull: $.Field<'idNonNull', $Scalar.ID, null>
   }>
 
-  export type Query = $.ObjectQuery<{
+  export type Query = $.StandardTypes.Query<{
     InputObjectNested: $.Field<
       'InputObjectNested',
       $.Nullable<$Scalar.ID>,

tests/_/schemas/mutation-only/graffle/modules/Scalar.ts

@@ -1,3 +1,3 @@
 import type * as $$Utilities from '../../../../../../src/entrypoints/utilities-for-generated.js'
 
-export * from '../../../../../../src/types/Schema/types/Scalar/standardScalarTypes.js'
+export * from '../../../../../../src/types/Schema/StandardTypes/scalar.js'

tests/_/schemas/mutation-only/graffle/modules/Schema.ts

@@ -20,7 +20,7 @@ export namespace Schema {
   //
   //
 
-  export type Mutation = $.ObjectMutation<{
+  export type Mutation = $.StandardTypes.Mutation<{
     id: $.Field<'id', $.Nullable<$Scalar.ID>, null>
     idNonNull: $.Field<'idNonNull', $Scalar.ID, null>
   }>

tests/_/schemas/pokemon/graffle/modules/Scalar.ts

@@ -1,3 +1,3 @@
 import type * as $$Utilities from '../../../../../../src/entrypoints/utilities-for-generated.js'
 
-export * from '../../../../../../src/types/Schema/types/Scalar/standardScalarTypes.js'
+export * from '../../../../../../src/types/Schema/StandardTypes/scalar.js'

tests/_/schemas/pokemon/graffle/modules/Schema.ts

@@ -20,7 +20,7 @@ export namespace Schema {
   //
   //
 
-  export type Mutation = $.ObjectMutation<{
+  export type Mutation = $.StandardTypes.Mutation<{
     addPokemon: $.Field<
       'addPokemon',
       $.Nullable<Pokemon>,
@@ -34,7 +34,7 @@ export namespace Schema {
     >
   }>
 
-  export type Query = $.ObjectQuery<{
+  export type Query = $.StandardTypes.Query<{
     battles: $.Field<'battles', $.List<Battle>, null>
     beings: $.Field<'beings', $.List<Being>, null>
     pokemon: $.Field<'pokemon', $.Nullable<$.List<Pokemon>>, null>

tests/_/schemas/query-only/graffle/modules/Scalar.ts

@@ -1,3 +1,3 @@
 import type * as $$Utilities from '../../../../../../src/entrypoints/utilities-for-generated.js'
 
-export * from '../../../../../../src/types/Schema/types/Scalar/standardScalarTypes.js'
+export * from '../../../../../../src/types/Schema/StandardTypes/scalar.js'

tests/_/schemas/query-only/graffle/modules/Schema.ts

@@ -20,7 +20,7 @@ export namespace Schema {
   //
   //
 
-  export type Query = $.ObjectQuery<{
+  export type Query = $.StandardTypes.Query<{
     id: $.Field<'id', $.Nullable<$Scalar.ID>, null>
     idNonNull: $.Field<'idNonNull', $Scalar.ID, null>
   }>