refactor: simplify schema type

Author: jasonkuhrt

package.json

@@ -33,11 +33,6 @@
         "default": "./build/entrypoints/schema.js"
       }
     },
-    "./schema/scalars": {
-      "import": {
-        "default": "./build/entrypoints/scalars.js"
-      }
-    },
     "./utilities-for-generated": {
       "import": {
         "default": "./build/entrypoints/utilities-for-generated.js"

src/entrypoints/_Graffle.ts

@@ -1,2 +1,2 @@
 export * from '../layers/6_client/client.js'
-export * as Scalars from './scalars.js'
+export * as Scalars from './_Scalars.js'

src/entrypoints/_Scalars.ts

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

src/entrypoints/scalars.ts

@@ -1,3 +1,3 @@
-export * from '../layers/1_Schema/__.js'
 export { Select } from '../layers/2_Select/__.js'
 export { InferResult } from '../layers/3_InferResult/__.js'
+export * from '../types/Schema/__.js'

src/entrypoints/schema.ts

@@ -1,6 +1,5 @@
 export { type Simplify } from 'type-fest'
 export { type Schema as SchemaIndexBase } from '../generator/generators/Schema.js'
-export { SchemaKit } from '../layers/1_Schema/__.js'
 export * from '../layers/2_Select/__.js'
 export { type ClientContext } from '../layers/6_client/fluent.js'
 export type {
@@ -13,4 +12,5 @@ export type { Config } from '../layers/6_client/Settings/Config.js'
 export { type Exact, type ExactNonEmpty, type UnionExpanded } from '../lib/prelude.js'
 export { TypeFunction } from '../lib/type-function/__.js'
 export { type GlobalRegistry } from '../types/GlobalRegistry/GlobalRegistry.js'
+export { SchemaKit } from '../types/Schema/__.js'
 export { type SchemaDrivenDataMap } from '../types/SchemaDrivenDataMap/__.js'

src/entrypoints/utilities-for-generated.ts

@@ -1,6 +1,5 @@
 import { Kind } from 'graphql'
 import { SchemaKit } from '../../entrypoints/schema.js'
-import { applyCodec } from '../../layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
 import type { RegisteredScalars } from '../../layers/6_client/fluent.js'
 import type { Grafaid } from '../../lib/grafaid/__.js'
 import { SchemaDrivenDataMap } from '../../types/SchemaDrivenDataMap/__.js'
@@ -60,10 +59,10 @@ const decodeResultData_ = (input: {
     const sddmNode = sddmOutputField.nt
 
     if (SchemaDrivenDataMap.isScalar(sddmNode)) {
-      data[k] = applyCodec(sddmNode.codec.decode, v)
+      data[k] = SchemaKit.Scalar.applyCodec(sddmNode.codec.decode, v)
     } else if (SchemaDrivenDataMap.isCustomScalarName(sddmNode)) {
       const scalar = SchemaKit.Scalar.lookupCustomScalarOrFallbackToString(scalars, sddmNode)
-      data[k] = applyCodec(scalar.codec.decode, v)
+      data[k] = SchemaKit.Scalar.applyCodec(scalar.codec.decode, v)
     } else if (SchemaDrivenDataMap.isOutputObject(sddmNode)) {
       decodeResultData_({
         data: v,

src/extensions/CustomScalars/decode.ts

@@ -1,5 +1,4 @@
 import { SchemaKit } from '../../entrypoints/schema.js'
-import { applyCodec } from '../../layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
 import type { RegisteredScalars } from '../../layers/6_client/fluent.js'
 import { Grafaid } from '../../lib/grafaid/__.js'
 import { SchemaDrivenDataMap } from '../../types/SchemaDrivenDataMap/__.js'
@@ -57,12 +56,12 @@ const encodeInputFieldLike = (
 
   if (SchemaDrivenDataMap.isCustomScalarName(sddmNode)) {
     const scalar = SchemaKit.Scalar.lookupCustomScalarOrFallbackToString(scalars, sddmNode)
-    args[argName] = applyCodec(scalar.codec.encode, argValue)
+    args[argName] = SchemaKit.Scalar.applyCodec(scalar.codec.encode, argValue)
     return
   }
 
   if (SchemaDrivenDataMap.isScalar(sddmNode)) {
-    args[argName] = applyCodec(sddmNode.codec.encode, argValue)
+    args[argName] = SchemaKit.Scalar.applyCodec(sddmNode.codec.encode, argValue)
     return
   }
 

src/extensions/CustomScalars/encode.ts

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

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

@@ -1,6 +1,6 @@
 import type * as $$Utilities from '../../../../../../entrypoints/utilities-for-generated.js'
 
-export * from '../../../../../../layers/1_Schema/Hybrid/types/Scalar/Scalar.js'
+export * from '../../../../../../types/Schema/types/Scalar/scalars.js'
 
 //
 //