@granite-js/react-native 0.1.32 → 0.1.33

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @granite-js/react-native
 
+## 0.1.33
+
+### Patch Changes
+
+- fdf55a6: fix(router): type infer incorrect undefined
+- Updated dependencies [fdf55a6]
+  - @granite-js/native@0.1.33
+  - @granite-js/image@0.1.33
+  - @granite-js/jest@0.1.33
+  - @granite-js/lottie@0.1.33
+  - @granite-js/style-utils@0.1.33
+  - @granite-js/cli@0.1.33
+  - @granite-js/mpack@0.1.33
+  - @granite-js/plugin-core@0.1.33
+
 ## 0.1.32
 
 ### Patch Changes

package/dist/router/createRoute.d.ts

@@ -48,13 +48,13 @@ export declare function createRoute<TSchema extends StandardSchemaV1<any, any>>(
     _path: keyof RegisterScreenInput;
     useNavigation: typeof useNavigation;
     useParams: () => InferOutput<TSchema>;
-    _inputType?: InferInput<TSchema>;
-    _outputType?: InferOutput<TSchema>;
+    _inputType: InferInput<TSchema>;
+    _outputType: InferOutput<TSchema>;
 };
 export declare function createRoute<T extends Readonly<object | undefined>>(path: keyof RegisterScreenInput, options: RouteOptions<T>): {
     _path: keyof RegisterScreenInput;
     useNavigation: typeof useNavigation;
     useParams: () => T;
-    _inputType?: T;
-    _outputType?: T;
+    _inputType: T;
+    _outputType: T;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/react-native",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "The Granite Framework",
   "bin": {
     "granite": "./bin/cli.js"
@@ -91,7 +91,7 @@
     "@babel/core": "7.28.5",
     "@babel/preset-env": "7.28.5",
     "@babel/preset-typescript": "7.28.5",
-    "@granite-js/native": "0.1.32",
+    "@granite-js/native": "0.1.33",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.1.0",
     "@types/babel__core": "^7",
@@ -118,13 +118,13 @@
     "react-native": "*"
   },
   "dependencies": {
-    "@granite-js/cli": "0.1.32",
-    "@granite-js/image": "0.1.32",
-    "@granite-js/jest": "0.1.32",
-    "@granite-js/lottie": "0.1.32",
-    "@granite-js/mpack": "0.1.32",
-    "@granite-js/plugin-core": "0.1.32",
-    "@granite-js/style-utils": "0.1.32",
+    "@granite-js/cli": "0.1.33",
+    "@granite-js/image": "0.1.33",
+    "@granite-js/jest": "0.1.33",
+    "@granite-js/lottie": "0.1.33",
+    "@granite-js/mpack": "0.1.33",
+    "@granite-js/plugin-core": "0.1.33",
+    "@granite-js/style-utils": "0.1.33",
     "@standard-schema/spec": "^1.0.0",
     "es-toolkit": "^1.39.8",
     "react-native-url-polyfill": "3.0.0"

package/src/router/createRoute.test-d.ts

@@ -77,6 +77,30 @@ describe('createRoute', () => {
     // @ts-expect-error Type error should occur since 'from' and 'strict: false' are conflicting options
     assertType(useParams({ from: '/test', strict: false }));
   });
+
+  it('should infer _inputType and _outputType without undefined for function pattern', () => {
+    type InputType = (typeof Route)['_inputType'];
+    type OutputType = (typeof Route)['_outputType'];
+
+    // _inputType should be inferred as the exact type, not a union with undefined
+    assertType<{
+      id: string;
+      name: string;
+    }>({} as InputType);
+
+    // _outputType should be inferred as the exact type, not a union with undefined
+    assertType<{
+      id: string;
+      name: string;
+    }>({} as OutputType);
+
+    // Verify that undefined is not part of the union
+    type InputHasUndefined = undefined extends InputType ? true : false;
+    type OutputHasUndefined = undefined extends OutputType ? true : false;
+
+    assertType<false>({} as InputHasUndefined);
+    assertType<false>({} as OutputHasUndefined);
+  });
 });
 
 describe('createRoute with StandardSchema', () => {
@@ -95,7 +119,56 @@ describe('createRoute with StandardSchema', () => {
     }>(RouteWithSchema.useParams());
   });
 
+  it('should infer _inputType and _outputType without undefined', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const RouteWithSchema = createRoute('/test-schema', {
+      component: () => null,
+      validateParams: z.object({
+        id: z.string(),
+        count: z.number(),
+      }),
+    });
+
+    type InputType = (typeof RouteWithSchema)['_inputType'];
+    type OutputType = (typeof RouteWithSchema)['_outputType'];
+    type UseParamsReturnType = ReturnType<(typeof RouteWithSchema)['useParams']>;
+
+    // _inputType should be inferred as the exact type, not a union with undefined
+    assertType<{
+      id: string;
+      count: number;
+    }>({} as InputType);
+
+    // _outputType should be inferred as the exact type, not a union with undefined
+    assertType<{
+      id: string;
+      count: number;
+    }>({} as OutputType);
+
+    // useParams should return the exact type, not a union with undefined
+    assertType<{
+      id: string;
+      count: number;
+    }>({} as UseParamsReturnType);
+
+    // Verify that undefined is not part of the union for all types
+    type InputHasUndefined = undefined extends InputType ? true : false;
+    type OutputHasUndefined = undefined extends OutputType ? true : false;
+    type UseParamsHasUndefined = undefined extends UseParamsReturnType ? true : false;
+
+    assertType<false>({} as InputHasUndefined);
+    assertType<false>({} as OutputHasUndefined);
+    assertType<false>({} as UseParamsHasUndefined);
+
+    // useNavigation should accept input type for navigate parameters
+    const navigation = useNavigation();
+
+    // Should accept exact input type
+    navigation.navigate('/test-schema', { id: 'test', count: 123 });
+  });
+
   it('should infer output type from transformation', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const RouteWithTransform = createRoute('/test-transform', {
       component: () => null,
       validateParams: z.object({
@@ -103,10 +176,35 @@ describe('createRoute with StandardSchema', () => {
       }),
     });
 
-    // Should be number (output), not string (input)
+    type InputType = (typeof RouteWithTransform)['_inputType'];
+    type OutputType = (typeof RouteWithTransform)['_outputType'];
+    type UseParamsReturnType = ReturnType<(typeof RouteWithTransform)['useParams']>;
+
+    // _inputType should be string (before transformation)
+    assertType<{
+      id: string;
+    }>({} as InputType);
+
+    // _outputType should be number (after transformation)
+    assertType<{
+      id: number;
+    }>({} as OutputType);
+
+    // useParams should return output type (number)
     assertType<{
       id: number;
-    }>(RouteWithTransform.useParams());
+    }>({} as UseParamsReturnType);
+
+    // useNavigation should accept input type (string)
+    const navigation = useNavigation();
+    navigation.navigate('/test-transform', { id: 'test-id' });
+
+    // Verify that input and output types are different
+    type InputIsString = InputType extends { id: string } ? true : false;
+    type OutputIsNumber = OutputType extends { id: number } ? true : false;
+
+    assertType<true>({} as InputIsString);
+    assertType<true>({} as OutputIsNumber);
   });
 
   it('should work with useParams hook', () => {

package/src/router/createRoute.ts

@@ -175,8 +175,8 @@ export function createRoute<TSchema extends StandardSchemaV1<any, any>>(
   _path: keyof RegisterScreenInput;
   useNavigation: typeof useNavigation;
   useParams: () => InferOutput<TSchema>;
-  _inputType?: InferInput<TSchema>;
-  _outputType?: InferOutput<TSchema>;
+  _inputType: InferInput<TSchema>;
+  _outputType: InferOutput<TSchema>;
 };
 
 // Overload 2: Function pattern
@@ -187,8 +187,8 @@ export function createRoute<T extends Readonly<object | undefined>>(
   _path: keyof RegisterScreenInput;
   useNavigation: typeof useNavigation;
   useParams: () => T;
-  _inputType?: T;
-  _outputType?: T;
+  _inputType: T;
+  _outputType: T;
 };
 
 // Implementation
@@ -205,5 +205,10 @@ export function createRoute(path: keyof RegisterScreenInput, options: RouteOptio
     _path,
     useNavigation,
     useParams: () => useParams({ from: _path as keyof RegisterScreen, strict: true }),
+
+    // These properties are only used for type inference in the generated router files
+    // The actual values are never accessed at runtime
+    _inputType: {},
+    _outputType: {},
   };
 }