django-cfg 1.4.17__py3-none-any.whl → 1.4.19__py3-none-any.whl

django_cfg/modules/django_client/core/generator/typescript/generator.py

@@ -327,7 +327,7 @@ class TypeScriptGenerator(BaseGenerator):
 
         # Generate individual schema files
         for schema_name, schema in sorted(all_schemas.items()):
-            # Skip enum schemas (they use z.nativeEnum from enums.ts)
+            # Skip enum schemas (they use z.enum() with literal values)
             if schema.enum:
                 continue
 

django_cfg/modules/django_client/core/generator/typescript/models_generator.py

@@ -162,17 +162,22 @@ class ModelsGenerator:
                 if ts_type.endswith(" | null"):
                     ts_type = ts_type[:-7]  # Remove " | null"
         else:
-            # Get TypeScript type and remove | null suffix if present
+            # Get TypeScript type
             ts_type = schema.typescript_type
+            # Remove | null suffix to rebuild it properly based on schema.nullable
             if ts_type.endswith(" | null"):
                 ts_type = ts_type[:-7]  # Remove " | null"
 
         # Check if required
         is_required = name in required_fields
 
-        # Optional marker - use for both non-required AND nullable fields
-        # This converts Django's nullable=True to TypeScript's optional (undefined)
-        optional_marker = "" if is_required and not schema.nullable else "?"
+        # Handle nullable and optional separately
+        # - nullable: add | null to type
+        # - not required: add ? optional marker
+        if schema.nullable:
+            ts_type = f"{ts_type} | null"
+        
+        optional_marker = "" if is_required else "?"
 
         # Comment
         if schema.description:

django_cfg/modules/django_client/core/generator/typescript/operations_generator.py

@@ -98,7 +98,9 @@ class OperationsGenerator:
         # Return type
         primary_response = operation.primary_success_response
         if primary_response and primary_response.schema_name:
-            if operation.is_list_operation:
+            # Check if response is paginated (has 'results' field)
+            is_paginated = primary_response.schema_name.startswith('Paginated')
+            if operation.is_list_operation and not is_paginated:
                 return_type = f"Models.{primary_response.schema_name}[]"
             else:
                 return_type = f"Models.{primary_response.schema_name}"
@@ -242,8 +244,14 @@ class OperationsGenerator:
 
         # Handle response
         if operation.is_list_operation and primary_response:
-            # Extract results from paginated response
-            body_lines.append("return (response as any).results || [];")
+            # Check if response is paginated
+            is_paginated = primary_response.schema_name.startswith('Paginated')
+            if is_paginated:
+                # Return full paginated response object
+                body_lines.append("return response;")
+            else:
+                # Extract results from array response
+                body_lines.append("return (response as any).results || [];")
         elif return_type != "void":
             body_lines.append("return response;")
         else:

django_cfg/modules/django_client/core/generator/typescript/schemas_generator.py

@@ -3,7 +3,7 @@ Zod Schemas Generator - Generates Zod validation schemas from IR.
 
 This generator creates Zod schemas for runtime validation:
 - Object schemas (z.object)
-- Enum schemas (z.nativeEnum)
+- Enum schemas (z.enum)
 - Array schemas (z.array)
 - Type inference (z.infer<typeof Schema>)
 """
@@ -22,7 +22,7 @@ class SchemasGenerator:
     Features:
     - Runtime validation with Zod
     - Type inference from schemas
-    - Enum validation with z.nativeEnum()
+    - Enum validation with z.enum()
     - Nested object validation
     - Array and nullable types
     """
@@ -46,7 +46,7 @@ class SchemasGenerator:
             >>> generate_schema(User)
             export const UserSchema = z.object({
               id: z.number(),
-              email: z.string().email(),
+              email: z.email(),
               username: z.string().min(1).max(150),
             })
         """
@@ -92,20 +92,20 @@ class SchemasGenerator:
 
         Examples:
             id: z.number()
-            email: z.string().email()
+            email: z.email()
             username: z.string().min(1).max(150)
-            status: z.nativeEnum(Enums.StatusEnum)
-            created_at: z.string().datetime()
+            status: z.nativeEnum(Enums.StatusEnum)  # Reference to TypeScript enum
+            created_at: z.iso.datetime()
         """
         # Check if this field is an enum
         if schema.enum and schema.name:
-            # Use enum validation
+            # Use nativeEnum to reference TypeScript enum from enums.ts
             zod_type = f"z.nativeEnum(Enums.{self.base.sanitize_enum_name(schema.name)})"
         # Check if this field is a reference to an enum
         elif schema.ref and schema.ref in self.context.schemas:
             ref_schema = self.context.schemas[schema.ref]
             if ref_schema.enum:
-                # Reference to enum component
+                # Reference to enum component - use nativeEnum
                 zod_type = f"z.nativeEnum(Enums.{self.base.sanitize_enum_name(schema.ref)})"
             else:
                 # Reference to another schema
@@ -117,9 +117,13 @@ class SchemasGenerator:
         # Check if required
         is_required = name in required_fields
 
-        # Handle optional fields - use .optional() for both non-required AND nullable
-        # This converts Django's nullable=True to TypeScript's optional (undefined)
-        if not is_required or schema.nullable:
+        # Handle nullable and optional separately
+        # - nullable: field can be null (use .nullable())
+        # - not required: field can be undefined (use .optional())
+        if schema.nullable:
+            zod_type = f"{zod_type}.nullable()"
+        
+        if not is_required:
             zod_type = f"{zod_type}.optional()"
 
         return f"{name}: {zod_type}"
@@ -136,10 +140,10 @@ class SchemasGenerator:
 
         Examples:
             string -> z.string()
-            string (format: email) -> z.string().email()
-            string (format: date-time) -> z.string().datetime()
-            string (format: uri) -> z.string().url()
-            integer -> z.number().int()
+            string (format: email) -> z.email()
+            string (format: date-time) -> z.iso.datetime()
+            string (format: uri) -> z.url()
+            integer -> z.int()
             number -> z.number()
             boolean -> z.boolean()
             array -> z.array(...)
@@ -151,35 +155,36 @@ class SchemasGenerator:
         if schema_type == "string":
             base_type = "z.string()"
 
-            # Add format validation
+            # Add format validation - use new Zod v4 format APIs
             if schema_format == "email":
-                base_type = "z.string().email()"
+                base_type = "z.email()"
             elif schema_format in ("date-time", "datetime"):
-                base_type = "z.string().datetime()"
+                base_type = "z.iso.datetime()"
             elif schema_format == "date":
-                base_type = "z.string().date()"
+                base_type = "z.iso.date()"
             elif schema_format in ("uri", "url"):
-                base_type = "z.string().url()"
+                base_type = "z.url()"
             elif schema_format == "uuid":
-                base_type = "z.string().uuid()"
+                base_type = "z.uuid()"
 
-            # Add length constraints
-            if schema.min_length is not None:
-                base_type = f"{base_type}.min({schema.min_length})"
-            if schema.max_length is not None:
-                base_type = f"{base_type}.max({schema.max_length})"
+            # Add length constraints (only for plain strings, not formatted ones)
+            if base_type == "z.string()":
+                if schema.min_length is not None:
+                    base_type = f"{base_type}.min({schema.min_length})"
+                if schema.max_length is not None:
+                    base_type = f"{base_type}.max({schema.max_length})"
 
-            # Add pattern validation
-            if schema.pattern:
-                # Escape regex pattern for JS
-                escaped_pattern = schema.pattern.replace('\\', '\\\\')
-                base_type = f"{base_type}.regex(/{escaped_pattern}/)"
+                # Add pattern validation
+                if schema.pattern:
+                    # Escape regex pattern for JS
+                    escaped_pattern = schema.pattern.replace('\\', '\\\\')
+                    base_type = f"{base_type}.regex(/{escaped_pattern}/)"
 
             return base_type
 
         # Integer type
         elif schema_type == "integer":
-            base_type = "z.number().int()"
+            base_type = "z.int()"
 
             # Add range constraints
             if schema.minimum is not None:
@@ -246,7 +251,7 @@ class SchemasGenerator:
         return "\n".join(lines)
 
     def _generate_enum_schema(self, schema: IRSchemaObject) -> str:
-        """Generate z.nativeEnum() schema."""
+        """Generate z.nativeEnum() schema that references TypeScript enum."""
         enum_name = self.base.sanitize_enum_name(schema.name)
 
         lines = []
@@ -254,6 +259,8 @@ class SchemasGenerator:
         if schema.description:
             lines.append(f"/**\n * {schema.description}\n */")
 
+        # Use z.nativeEnum to reference TypeScript enum from enums.ts
+        # This ensures type compatibility with models.ts
         lines.append(f"export const {enum_name}Schema = z.nativeEnum(Enums.{enum_name})")
 
         return "\n".join(lines)

django_cfg/modules/django_client/core/generator/typescript/templates/hooks/hooks.ts.jinja

@@ -17,6 +17,7 @@
 import useSWR from 'swr'
 import { useSWRConfig } from 'swr'
 import * as Fetchers from '../fetchers/{{ tag_file }}'
+import type { API } from '../../index'
 {% if has_schemas %}
 {% for schema_name in schema_names %}
 import type { {{ schema_name }} } from '../schemas/{{ schema_name }}.schema'

django_cfg/modules/django_client/core/generator/typescript/templates/hooks/mutation_hook.ts.jinja

@@ -7,11 +7,11 @@
 export function {{ hook_name }}() {
   const { mutate } = useSWRConfig()
 
-  return async ({% if func_params %}{{ func_params }}{% endif %}): Promise<{{ response_type }}> => {
+  return async ({% if func_params %}{{ func_params }}, client?: API{% else %}client?: API{% endif %}): Promise<{{ response_type }}> => {
 {% if fetcher_params %}
-    const result = await Fetchers.{{ fetcher_name }}({{ fetcher_params }})
+    const result = await Fetchers.{{ fetcher_name }}({{ fetcher_params }}, client)
 {% else %}
-    const result = await Fetchers.{{ fetcher_name }}()
+    const result = await Fetchers.{{ fetcher_name }}(client)
 {% endif %}
 {% if revalidation_keys %}
     // Revalidate related queries

django_cfg/modules/django_client/core/generator/typescript/templates/hooks/query_hook.ts.jinja

@@ -6,16 +6,15 @@
  */
 export function {{ hook_name }}(
 {%- if func_params -%}
-{{ func_params }}
-{%- endif -%}
-) {
-  return useSWR<{{ response_type }}>(
-    {{ swr_key }},
-{%- if fetcher_params %}
-    () => Fetchers.{{ fetcher_name }}({{ fetcher_params }})
+{{ func_params }}, client?: API
 {%- else %}
-    () => Fetchers.{{ fetcher_name }}()
+client?: API
 {%- endif %}
-  )
+): ReturnType<typeof useSWR<{{ response_type }}>> {
+  return useSWR<{{ response_type }}>(
+    {{ swr_key }},
+{% if fetcher_params %}    () => Fetchers.{{ fetcher_name }}({{ fetcher_params }}, client)
+{% else %}    () => Fetchers.{{ fetcher_name }}(client)
+{% endif %}  )
 }
 

django_cfg/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.4.17"
+version = "1.4.19"
 description = "Django AI framework with built-in agents, type-safe Pydantic v2 configuration, and 8 enterprise apps. Replace settings.py, validate at startup, 90% less code. Production-ready AI workflows for Django."
 readme = "README.md"
 keywords = [ "django", "configuration", "pydantic", "settings", "type-safety", "pydantic-settings", "django-environ", "startup-validation", "ide-autocomplete", "ai-agents", "enterprise-django", "django-settings", "type-safe-config",]

{django_cfg-1.4.17.dist-info → django_cfg-1.4.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.4.17
+Version: 1.4.19
 Summary: Django AI framework with built-in agents, type-safe Pydantic v2 configuration, and 8 enterprise apps. Replace settings.py, validate at startup, 90% less code. Production-ready AI workflows for Django.
 Project-URL: Homepage, https://djangocfg.com
 Project-URL: Documentation, https://djangocfg.com

{django_cfg-1.4.17.dist-info → django_cfg-1.4.19.dist-info}/RECORD

@@ -762,12 +762,12 @@ django_cfg/modules/django_client/core/generator/typescript/__init__.py,sha256=eH
 django_cfg/modules/django_client/core/generator/typescript/client_generator.py,sha256=7ql-m59YVt6zGKfVBCxy1OR3CNy6C9lkaMEUqexiRvo,5878
 django_cfg/modules/django_client/core/generator/typescript/fetchers_generator.py,sha256=ZiSXMyT7HV28IK0AE8p2Sma2xwFrWnzSurBZEaWw_Z8,13791
 django_cfg/modules/django_client/core/generator/typescript/files_generator.py,sha256=faRdhVVf9GQ-0esVz94dsaQMB56zK3csyNkhEHL4al4,7044
-django_cfg/modules/django_client/core/generator/typescript/generator.py,sha256=_xuQC10SJ1ZKwA2_h3te4ZkSmH2jlnjUr__EJuBwNVE,16982
+django_cfg/modules/django_client/core/generator/typescript/generator.py,sha256=oBM7CKlsD7arzIt0dSeow7Ujuo6RWl6h5to221Q19Gc,16984
 django_cfg/modules/django_client/core/generator/typescript/hooks_generator.py,sha256=urnmej5isaPwnyo-kH_VVGP9kehcdeI2hR9mqHmVN4s,15133
-django_cfg/modules/django_client/core/generator/typescript/models_generator.py,sha256=2cBA-YzeBkGekoKz0pzT-Rt56MCvRTT-lSb44AAujfk,8787
+django_cfg/modules/django_client/core/generator/typescript/models_generator.py,sha256=i7I1PJPx4r6KLaLJDJUJ_euDnKWnRQSiNFosUkP1eoM,8870
 django_cfg/modules/django_client/core/generator/typescript/naming.py,sha256=uUh2XVmorQ8gzfdzZJB8KNPng6UI4axe3lEaFtTqYks,2592
-django_cfg/modules/django_client/core/generator/typescript/operations_generator.py,sha256=lY56TkDafI-CL6wv7GXWNpvDr7087W3oWRTC4bJLJ9k,13493
-django_cfg/modules/django_client/core/generator/typescript/schemas_generator.py,sha256=tmFZ8yFJ_Nk_iT7QGDDUVSFJhg8WTF79lYDOqQDzz8c,10877
+django_cfg/modules/django_client/core/generator/typescript/operations_generator.py,sha256=6S2xs04UTIC6dOAa9h2Yjhsp4CnPjmYRvRTAof9BHQY,13947
+django_cfg/modules/django_client/core/generator/typescript/schemas_generator.py,sha256=jM_3wzpQL3IgFGtDw4zWpCPYfiMfc1X1Yf6wEumamU4,11233
 django_cfg/modules/django_client/core/generator/typescript/templates/api_instance.ts.jinja,sha256=OPUjnz6Dk3kY97UFIRcgvxkEIKd6fUGqBzXJWOXKykE,2906
 django_cfg/modules/django_client/core/generator/typescript/templates/app_index.ts.jinja,sha256=gLsoYyEzKD6Gv64vsO9sQHMPiFMGdaB5XVufLHeRyvQ,62
 django_cfg/modules/django_client/core/generator/typescript/templates/client_file.ts.jinja,sha256=LHUt72fO2eRNAHYEscIYvqVR69GC6mxqjcgSlUzeCtc,251
@@ -784,10 +784,10 @@ django_cfg/modules/django_client/core/generator/typescript/templates/client/sub_
 django_cfg/modules/django_client/core/generator/typescript/templates/fetchers/fetchers.ts.jinja,sha256=HNeYh8LnTTmeKTQS7uup37Oq-_HwBPZH8qE1kneaJsg,1296
 django_cfg/modules/django_client/core/generator/typescript/templates/fetchers/function.ts.jinja,sha256=cR4Y4eJ1ENcON9BcfI-ttnJfKxv61efMW2oVDrmJga8,580
 django_cfg/modules/django_client/core/generator/typescript/templates/fetchers/index.ts.jinja,sha256=DoAVm8EoglJKtLrE917Fk7Na6rn5Bt9L1nI39o9AwzM,747
-django_cfg/modules/django_client/core/generator/typescript/templates/hooks/hooks.ts.jinja,sha256=VS9_Pl1IemR2mPA2df9h-5xXSE9suvttpSC1YPClagE,763
+django_cfg/modules/django_client/core/generator/typescript/templates/hooks/hooks.ts.jinja,sha256=_iyvJBEQviLLtZ5z1qXNUM976zXPW-v9DXFyHJdrpCQ,802
 django_cfg/modules/django_client/core/generator/typescript/templates/hooks/index.ts.jinja,sha256=c4Jru6DAKD-y8nzig1my0iE-BO3OwjSCENALbHvAp7E,694
-django_cfg/modules/django_client/core/generator/typescript/templates/hooks/mutation_hook.ts.jinja,sha256=iVB8hXAt0VEw5Y4OsWsPJJmpxflr5LLid3l7xASxvRU,647
-django_cfg/modules/django_client/core/generator/typescript/templates/hooks/query_hook.ts.jinja,sha256=hdNU62F_xL4m9Lz5gEkkw2tny9dHguvpDRK9dz7CRy0,432
+django_cfg/modules/django_client/core/generator/typescript/templates/hooks/mutation_hook.ts.jinja,sha256=pOeyEY9nkYKVARTN6P4dfEj_mg-CIuPd8rrxzfaCfF8,697
+django_cfg/modules/django_client/core/generator/typescript/templates/hooks/query_hook.ts.jinja,sha256=_Qit1DTZQTYIM_l6gmBkS2Fy7358EsGrUWr0iwCwyhw,526
 django_cfg/modules/django_client/core/generator/typescript/templates/models/app_models.ts.jinja,sha256=hRJ06Z-L4M5IEB23dd_rVgwSzSEGmqaSsKVrg5NasY0,122
 django_cfg/modules/django_client/core/generator/typescript/templates/models/enums.ts.jinja,sha256=8BguyHxV4r5JdJD9wYYgZrClysIdlkjf_Bp5toU81u8,49
 django_cfg/modules/django_client/core/generator/typescript/templates/models/models.ts.jinja,sha256=mycvqd12K2LsnN4mnwMdQ_SepiIWx6e9gDlUMAGOoBA,121
@@ -1100,9 +1100,9 @@ django_cfg/utils/version_check.py,sha256=jI4v3YMdQriUEeb_TvRl511sDghy6I75iKRDUaN
 django_cfg/CHANGELOG.md,sha256=jtT3EprqEJkqSUh7IraP73vQ8PmKUMdRtznQsEnqDZk,2052
 django_cfg/CONTRIBUTING.md,sha256=DU2kyQ6PU0Z24ob7O_OqKWEYHcZmJDgzw-lQCmu6uBg,3041
 django_cfg/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
-django_cfg/pyproject.toml,sha256=cS3SRfVShKr8ndIdMpiDOJiH3gFLLZ_5MdWAlCU3vpU,8210
-django_cfg-1.4.17.dist-info/METADATA,sha256=5kh9Jcmaml3LflWBK4tDei8CwFXViH-ZwapA6bumVBc,22533
-django_cfg-1.4.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-django_cfg-1.4.17.dist-info/entry_points.txt,sha256=Ucmde4Z2wEzgb4AggxxZ0zaYDb9HpyE5blM3uJ0_VNg,56
-django_cfg-1.4.17.dist-info/licenses/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
-django_cfg-1.4.17.dist-info/RECORD,,
+django_cfg/pyproject.toml,sha256=UGYbf8bxudDXVeR9helgvuKB60_CZ7DJKvSdZbGti3c,8210
+django_cfg-1.4.19.dist-info/METADATA,sha256=OSuPmdcBTsGy2UJfTMgA1aAzdpwoZmDKaW3bch5XKmM,22533
+django_cfg-1.4.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+django_cfg-1.4.19.dist-info/entry_points.txt,sha256=Ucmde4Z2wEzgb4AggxxZ0zaYDb9HpyE5blM3uJ0_VNg,56
+django_cfg-1.4.19.dist-info/licenses/LICENSE,sha256=xHuytiUkSZCRG3N11nk1X6q1_EGQtv6aL5O9cqNRhKE,1071
+django_cfg-1.4.19.dist-info/RECORD,,