CLI Output Update (#51)

hobbescodes · web-flow · commit 8c4f56e13d32 · 2025-12-28T14:28:24.000-06:00
diff --git a/.changeset/fix-import-paths.md b/.changeset/fix-import-paths.md
@@ -0,0 +1,5 @@
+---
+"tangrams": patch
+---
+
+Fix inconsistent relative import paths in generated output. Previously, some imports were generated as `./../schema` instead of `../schema`. This change introduces a `getRelativeImportPath` utility that properly normalizes all relative import paths, and makes all import path calculations dynamic (removing hardcoded `FUNCTIONS_IMPORT_PATH` constants) for consistency and future flexibility.
diff --git a/examples/start-full-stack/tangrams/api/db/collections.ts b/examples/start-full-stack/tangrams/api/db/collections.ts
@@ -5,7 +5,7 @@ import { createPet, createUser, deletePet, deleteUser, listPets, listUsers, upda
 
 import type { LoadSubsetOptions } from "@tanstack/db"
 import type { QueryClient } from "@tanstack/react-query"
-import type { ListUsersParams } from "./../schema"
+import type { ListUsersParams } from "../schema"
 
 /**
  * Translate TanStack DB predicates to User query parameters
diff --git a/examples/start-full-stack/tangrams/api/form/options.ts b/examples/start-full-stack/tangrams/api/form/options.ts
@@ -3,9 +3,9 @@
 
 import { formOptions } from "@tanstack/react-form"
 
-import { createPetRequestSchema, createUserRequestSchema, updatePetRequestSchema, updateUserRequestSchema } from "./../schema"
+import { createPetRequestSchema, createUserRequestSchema, updatePetRequestSchema, updateUserRequestSchema } from "../schema"
 
-import type { CreatePetRequest, CreateUserRequest, UpdatePetRequest, UpdateUserRequest } from "./../schema"
+import type { CreatePetRequest, CreateUserRequest, UpdatePetRequest, UpdateUserRequest } from "../schema"
 
 export const createPetFormOptions = formOptions({
   defaultValues: {} as CreatePetRequest,
diff --git a/examples/start-full-stack/tangrams/api/query/options.ts b/examples/start-full-stack/tangrams/api/query/options.ts
@@ -5,7 +5,7 @@ import { infiniteQueryOptions, mutationOptions, queryOptions } from "@tanstack/r
 
 import { createPet, createUser, deletePet, deleteUser, getPet, getUser, listPets, listUsers, updatePet, updateUser } from "../functions"
 
-import type { CreatePetRequest, CreateUserRequest, GetPetParams, GetUserParams, ListPetsParams, ListUsersParams, UpdatePetRequest, UpdateUserRequest } from "./../schema"
+import type { CreatePetRequest, CreateUserRequest, GetPetParams, GetUserParams, ListPetsParams, ListUsersParams, UpdatePetRequest, UpdateUserRequest } from "../schema"
 
 // Query Options (GET operations)
 
diff --git a/examples/start-graphql-db/tangrams/api/query/options.ts b/examples/start-graphql-db/tangrams/api/query/options.ts
@@ -5,7 +5,7 @@ import { mutationOptions, queryOptions } from "@tanstack/react-query"
 
 import { createPet, deletePet, getPetById, getPets, updatePet } from "../functions"
 
-import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "./../schema"
+import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "../schema"
 
 // Query Options
 export const getPetsQueryOptions = (variables?: GetPetsQueryVariables) =>
diff --git a/examples/start-graphql-form/tangrams/api/form/options.ts b/examples/start-graphql-form/tangrams/api/form/options.ts
@@ -3,9 +3,9 @@
 
 import { formOptions } from "@tanstack/react-form"
 
-import { createPetMutationVariablesSchema, deletePetMutationVariablesSchema, updatePetMutationVariablesSchema } from "./../schema"
+import { createPetMutationVariablesSchema, deletePetMutationVariablesSchema, updatePetMutationVariablesSchema } from "../schema"
 
-import type { CreatePetMutationVariables, DeletePetMutationVariables, UpdatePetMutationVariables } from "./../schema"
+import type { CreatePetMutationVariables, DeletePetMutationVariables, UpdatePetMutationVariables } from "../schema"
 
 export const createPetFormOptions = formOptions({
   defaultValues: {} as CreatePetMutationVariables,
diff --git a/examples/start-graphql-form/tangrams/api/query/options.ts b/examples/start-graphql-form/tangrams/api/query/options.ts
@@ -5,7 +5,7 @@ import { mutationOptions, queryOptions } from "@tanstack/react-query"
 
 import { createPet, deletePet, getPetById, getPets, updatePet } from "../functions"
 
-import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "./../schema"
+import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "../schema"
 
 // Query Options
 export const getPetsQueryOptions = (variables?: GetPetsQueryVariables) =>
diff --git a/examples/start-graphql-query/tangrams/api/query/options.ts b/examples/start-graphql-query/tangrams/api/query/options.ts
@@ -5,7 +5,7 @@ import { infiniteQueryOptions, mutationOptions, queryOptions } from "@tanstack/r
 
 import { createPet, deletePet, getPetById, getPets, getPetsConnection, updatePet } from "../functions"
 
-import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsConnectionQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "./../schema"
+import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsConnectionQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "../schema"
 
 // Query Options
 export const getPetsQueryOptions = (variables?: GetPetsQueryVariables) =>
diff --git a/examples/start-multi-source/tangrams/pets/form/options.ts b/examples/start-multi-source/tangrams/pets/form/options.ts
@@ -3,9 +3,9 @@
 
 import { formOptions } from "@tanstack/react-form"
 
-import { createPetMutationVariablesSchema, deletePetMutationVariablesSchema, updatePetMutationVariablesSchema } from "./../schema"
+import { createPetMutationVariablesSchema, deletePetMutationVariablesSchema, updatePetMutationVariablesSchema } from "../schema"
 
-import type { CreatePetMutationVariables, DeletePetMutationVariables, UpdatePetMutationVariables } from "./../schema"
+import type { CreatePetMutationVariables, DeletePetMutationVariables, UpdatePetMutationVariables } from "../schema"
 
 export const createPetFormOptions = formOptions({
   defaultValues: {} as CreatePetMutationVariables,
diff --git a/examples/start-multi-source/tangrams/pets/query/options.ts b/examples/start-multi-source/tangrams/pets/query/options.ts
@@ -5,7 +5,7 @@ import { mutationOptions, queryOptions } from "@tanstack/react-query"
 
 import { createPet, deletePet, getPetById, getPets, updatePet } from "../functions"
 
-import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "./../schema"
+import type { CreatePetMutationVariables, DeletePetMutationVariables, GetPetByIdQueryVariables, GetPetsQueryVariables, UpdatePetMutationVariables } from "../schema"
 
 // Query Options
 export const getPetsQueryOptions = (variables?: GetPetsQueryVariables) =>
diff --git a/examples/start-multi-source/tangrams/users/form/options.ts b/examples/start-multi-source/tangrams/users/form/options.ts
@@ -3,9 +3,9 @@
 
 import { formOptions } from "@tanstack/react-form"
 
-import { createUserRequestSchema, updateUserRequestSchema } from "./../schema"
+import { createUserRequestSchema, updateUserRequestSchema } from "../schema"
 
-import type { CreateUserRequest, UpdateUserRequest } from "./../schema"
+import type { CreateUserRequest, UpdateUserRequest } from "../schema"
 
 export const createUserFormOptions = formOptions({
   defaultValues: {} as CreateUserRequest,
diff --git a/examples/start-multi-source/tangrams/users/query/options.ts b/examples/start-multi-source/tangrams/users/query/options.ts
@@ -5,7 +5,7 @@ import { infiniteQueryOptions, mutationOptions, queryOptions } from "@tanstack/r
 
 import { createUser, deleteUser, getUser, listUsers, updateUser } from "../functions"
 
-import type { CreateUserRequest, GetUserParams, ListUsersParams, UpdateUserRequest } from "./../schema"
+import type { CreateUserRequest, GetUserParams, ListUsersParams, UpdateUserRequest } from "../schema"
 
 // Query Options (GET operations)
 
diff --git a/examples/start-openapi-db/tangrams/api/query/options.ts b/examples/start-openapi-db/tangrams/api/query/options.ts
@@ -5,7 +5,7 @@ import { infiniteQueryOptions, mutationOptions, queryOptions } from "@tanstack/r
 
 import { createPet, deletePet, getPet, listPets, updatePet } from "../functions"
 
-import type { CreatePetRequest, GetPetParams, ListPetsParams, UpdatePetRequest } from "./../schema"
+import type { CreatePetRequest, GetPetParams, ListPetsParams, UpdatePetRequest } from "../schema"
 
 // Query Options (GET operations)
 
diff --git a/examples/start-openapi-form/tangrams/api/form/options.ts b/examples/start-openapi-form/tangrams/api/form/options.ts
@@ -3,9 +3,9 @@
 
 import { formOptions } from "@tanstack/react-form"
 
-import { createPetRequestSchema, createUserRequestSchema, updatePetRequestSchema, updateUserRequestSchema } from "./../schema"
+import { createPetRequestSchema, createUserRequestSchema, updatePetRequestSchema, updateUserRequestSchema } from "../schema"
 
-import type { CreatePetRequest, CreateUserRequest, UpdatePetRequest, UpdateUserRequest } from "./../schema"
+import type { CreatePetRequest, CreateUserRequest, UpdatePetRequest, UpdateUserRequest } from "../schema"
 
 export const createPetFormOptions = formOptions({
   defaultValues: {} as CreatePetRequest,
diff --git a/examples/start-openapi-form/tangrams/api/query/options.ts b/examples/start-openapi-form/tangrams/api/query/options.ts
@@ -5,7 +5,7 @@ import { infiniteQueryOptions, mutationOptions, queryOptions } from "@tanstack/r
 
 import { createPet, createUser, deletePet, deleteUser, getPet, getUser, listPets, listUsers, updatePet, updateUser } from "../functions"
 
-import type { CreatePetRequest, CreateUserRequest, GetPetParams, GetUserParams, ListPetsParams, ListUsersParams, UpdatePetRequest, UpdateUserRequest } from "./../schema"
+import type { CreatePetRequest, CreateUserRequest, GetPetParams, GetUserParams, ListPetsParams, ListUsersParams, UpdatePetRequest, UpdateUserRequest } from "../schema"
 
 // Query Options (GET operations)
 
diff --git a/examples/start-openapi-query/tangrams/api/query/options.ts b/examples/start-openapi-query/tangrams/api/query/options.ts
@@ -5,7 +5,7 @@ import { infiniteQueryOptions, mutationOptions, queryOptions } from "@tanstack/r
 
 import { createPet, createUser, deletePet, deleteUser, getPet, getUser, listPets, listUsers, updatePet, updateUser } from "../functions"
 
-import type { CreatePetRequest, CreateUserRequest, GetPetParams, GetUserParams, ListPetsParams, ListUsersParams, UpdatePetRequest, UpdateUserRequest } from "./../schema"
+import type { CreatePetRequest, CreateUserRequest, GetPetParams, GetUserParams, ListPetsParams, ListUsersParams, UpdatePetRequest, UpdateUserRequest } from "../schema"
 
 // Query Options (GET operations)
 
diff --git a/packages/cli/src/adapters/graphql/collections.test.ts b/packages/cli/src/adapters/graphql/collections.test.ts
@@ -154,6 +154,7 @@ describe("GraphQL Collection Discovery", () => {
         connectionConfig,
         {
           typesImportPath: "./schema",
+          functionsImportPath: "../functions",
           sourceName: "api",
         },
       );
@@ -170,6 +171,7 @@ describe("GraphQL Collection Discovery", () => {
         connectionConfig,
         {
           typesImportPath: "./schema",
+          functionsImportPath: "../functions",
           sourceName: "api",
         },
       );
@@ -188,6 +190,7 @@ describe("GraphQL Collection Discovery", () => {
         connectionConfig,
         {
           typesImportPath: "./schema",
+          functionsImportPath: "../functions",
           sourceName: "api",
         },
       );
diff --git a/packages/cli/src/adapters/graphql/collections.ts b/packages/cli/src/adapters/graphql/collections.ts
@@ -45,9 +45,6 @@ import type {
   GraphQLAdapterSchema,
 } from "../types";
 
-/** Hardcoded import path for functions (always ../functions from db/) */
-const FUNCTIONS_IMPORT_PATH = "../functions";
-
 /**
  * Result of finding an array in a type
  */
@@ -627,7 +624,7 @@ export function generateGraphQLCollections(
 
   if (allFunctionImports.length > 0) {
     writer.blankLine();
-    writeImport(writer, FUNCTIONS_IMPORT_PATH, allFunctionImports);
+    writeImport(writer, options.functionsImportPath, allFunctionImports);
   }
 
   // Type imports (sorted alphabetically, always last with blank line)
diff --git a/packages/cli/src/adapters/graphql/graphql.test.ts b/packages/cli/src/adapters/graphql/graphql.test.ts
@@ -248,6 +248,7 @@ describe("GraphQL Adapter", () => {
 
       const result = graphqlAdapter.generateOperations(schema, testConfig, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test",
       });
 
@@ -282,6 +283,7 @@ describe("GraphQL Adapter", () => {
 
       const result = graphqlAdapter.generateOperations(schema, testConfig, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test",
       });
 
@@ -977,6 +979,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(config);
       const result = graphqlAdapter.generateCollections(schema, config, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test-api",
       });
 
@@ -989,6 +992,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(config);
       const result = graphqlAdapter.generateCollections(schema, config, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test-api",
       });
 
@@ -1002,6 +1006,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(config);
       const result = graphqlAdapter.generateCollections(schema, config, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test-api",
       });
 
@@ -1014,6 +1019,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(config);
       const result = graphqlAdapter.generateCollections(schema, config, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test-api",
       });
 
@@ -1025,6 +1031,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(config);
       const result = graphqlAdapter.generateCollections(schema, config, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test-api",
       });
 
@@ -1037,6 +1044,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(config);
       const result = graphqlAdapter.generateCollections(schema, config, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test-api",
       });
 
@@ -1050,6 +1058,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(config);
       const result = graphqlAdapter.generateCollections(schema, config, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "test-api",
       });
 
@@ -1141,6 +1150,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(hasuraConfig);
       const result = graphqlAdapter.generateCollections(schema, hasuraConfig, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "hasura-api",
         collectionOverrides: {
           Product: { syncMode: "on-demand" },
@@ -1166,6 +1176,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(hasuraConfig);
       const result = graphqlAdapter.generateCollections(schema, hasuraConfig, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "hasura-api",
         collectionOverrides: {
           Product: { syncMode: "on-demand" },
@@ -1182,6 +1193,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(hasuraConfig);
       const result = graphqlAdapter.generateCollections(schema, hasuraConfig, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "hasura-api",
         collectionOverrides: {
           Product: { syncMode: "on-demand", predicateMapping: "prisma" },
@@ -1198,6 +1210,7 @@ describe("GraphQL Collection Discovery", () => {
       const schema = await graphqlAdapter.loadSchema(hasuraConfig);
       const result = graphqlAdapter.generateCollections(schema, hasuraConfig, {
         typesImportPath: "./types",
+        functionsImportPath: "../functions",
         sourceName: "hasura-api",
       });
 
diff --git a/packages/cli/src/adapters/graphql/index.ts b/packages/cli/src/adapters/graphql/index.ts
@@ -132,6 +132,7 @@ class GraphQLAdapterImpl implements IGraphQLAdapter {
     const result = generateGraphQLOperations({
       documents: schema.documents,
       typesImportPath: options.typesImportPath,
+      functionsImportPath: options.functionsImportPath,
       sourceName: options.sourceName,
       schema: schema.schema,
       queryOverrides: options.queryOverrides,
diff --git a/packages/cli/src/adapters/openapi/collections.ts b/packages/cli/src/adapters/openapi/collections.ts
@@ -27,9 +27,6 @@ import type {
 } from "../types";
 import type { ParsedOperation } from "./schema";
 
-/** Hardcoded import path for functions (always ../functions from db/) */
-const FUNCTIONS_IMPORT_PATH = "../functions";
-
 /** Maximum depth to search for arrays in nested schemas */
 const MAX_ARRAY_SEARCH_DEPTH = 3;
 
@@ -559,7 +556,7 @@ export function generateOpenAPICollections(
 
   if (allFunctionImports.length > 0) {
     writer.blankLine();
-    writeImport(writer, FUNCTIONS_IMPORT_PATH, allFunctionImports);
+    writeImport(writer, options.functionsImportPath, allFunctionImports);
   }
 
   // Type imports (sorted alphabetically, always last with blank line)
diff --git a/packages/cli/src/adapters/openapi/openapi.test.ts b/packages/cli/src/adapters/openapi/openapi.test.ts
diff --git a/packages/cli/src/adapters/openapi/operations.ts b/packages/cli/src/adapters/openapi/operations.ts
diff --git a/packages/cli/src/adapters/types.ts b/packages/cli/src/adapters/types.ts
diff --git a/packages/cli/src/core/generator.ts b/packages/cli/src/core/generator.ts
diff --git a/packages/cli/src/generators/query-options.test.ts b/packages/cli/src/generators/query-options.test.ts
diff --git a/packages/cli/src/generators/query-options.ts b/packages/cli/src/generators/query-options.ts
diff --git a/packages/cli/src/test/runtime-validation.test.ts b/packages/cli/src/test/runtime-validation.test.ts
diff --git a/packages/cli/src/utils/paths.test.ts b/packages/cli/src/utils/paths.test.ts
diff --git a/packages/cli/src/utils/paths.ts b/packages/cli/src/utils/paths.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"tangrams": patch
 +---
++
 +Fix inconsistent relative import paths in generated output. Previously, some imports were generated as `./../schema` instead of `../schema`. This change introduces a `getRelativeImportPath` utility that properly normalizes all relative import paths, and makes all import path calculations dynamic (removing hardcoded `FUNCTIONS_IMPORT_PATH` constants) for consistency and future flexibility.