@vladimirdev635/gql-codegen 0.0.92 → 0.0.94

package/actors/ts/graphql/generators/server/inputs.js

@@ -33,7 +33,10 @@ function generateZodInputField(scalarsMapping, field) {
     return invokeMethod(invokeMethod(expression, 'nullable', []), 'optional', []);
 }
 function isFieldLazy(spec) {
-    return spec.type._type === 'InputType';
+    switch (spec._type) {
+        case 'literal': return spec.type._type === 'InputType';
+        case 'array': return isFieldLazy(spec.type);
+    }
 }
 export function generateInputTypeDefinitionFields(scalarsMapping, fields) {
     return Object.entries(fields).map(([name, field]) => {

package/actors/ts/graphql/generators/server/objects.js

@@ -3,6 +3,7 @@ import { getScalarSpecFromMapping } from './scalars/mapping.js';
 import ts from 'typescript';
 import { generateSchemaName, generateZodInferTypeAlias } from './shared.js';
 import { assertUnreachable } from '../../../../../utils.js';
+import { invokeMethod } from '../../../shared.js';
 function generateZodObjectTypeSpec(scalarsMapping, type) {
     switch (type._type) {
         case 'Enum': {
@@ -50,7 +51,10 @@ export function generateZodObjectFieldSpec(scalarsMapping, field) {
             assertUnreachable(field.spec);
         }
     }
-    return expression;
+    if (!field.nullable) {
+        return expression;
+    }
+    return invokeMethod(invokeMethod(expression, 'nullable', []), 'optional', []);
 }
 const lazyTypes = [
     'ObjectType',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vladimirdev635/gql-codegen",
-    "version": "0.0.92",
+    "version": "0.0.94",
     "type": "module",
     "main": "./index.js",
     "types": "./index.d.ts",

package/schema/utils.js

@@ -100,10 +100,10 @@ function extractFieldFromNonCallableFieldSpec(spec) {
 ;
 function buildInputFieldSpec(spec) {
     switch (spec._type) {
-        case 'literal': return spec.type._type;
+        case 'literal': return spec.type.name;
         case 'array':
             return '[' + buildInputFieldSpec(spec.type) +
-                spec.nullable ? '' : '!' + ']';
+                (spec.nullable ? '' : '!') + ']';
     }
 }
 function buildInputField(field) {
@@ -117,11 +117,11 @@ function buildInputField(field) {
 ;
 function extractTypeFromObjectFieldSpec(spec) {
     switch (spec._type) {
-        case 'literal':
+        case 'literal': return spec.type;
         case 'array':
-            return spec.type;
+            return extractTypeFromObjectFieldSpec(spec.type);
         case 'callable':
-            return spec.returnType.type;
+            return extractTypeFromObjectFieldSpec(spec.returnType);
     }
 }
 function generateObjectFragmentSpecText(object, onlyField = null) {
@@ -157,28 +157,24 @@ function generateUnionFragmentSpecText(union) {
 }
 export function buildSelectionFromFieldSpec(spec) {
     const type = extractTypeFromObjectFieldSpec(spec);
-    if (type._type === 'array')
-        return buildSelectionFromFieldSpec(type.type);
-    if (type._type !== 'literal')
-        throw new Error('Unexpected condition');
-    switch (type.type._type) {
+    switch (type._type) {
         case 'Enum':
         case 'Scalar': return null;
         case 'ObjectType':
         case 'InterfaceType':
             return {
                 _type: 'ObjectFragmentSpec',
-                name: type.type.name,
+                name: type.name,
                 selections: [
-                    { _type: 'SpreadSelection', fragment: type.type.name }
+                    { _type: 'SpreadSelection', fragment: type.name }
                 ]
             };
         case 'Union':
             return {
                 _type: 'UnionFragmentSpec',
-                name: type.type.name,
+                name: type.name,
                 selections: [
-                    { _type: 'SpreadSelection', fragment: type.type.name }
+                    { _type: 'SpreadSelection', fragment: type.name }
                 ]
             };
     }