mulink 1.1.9 → 1.2.1

package/dist/lib/{chunk-NC747MZJ.cjs → chunk-SOVBAUFP.cjs}

@@ -2708,6 +2708,61 @@ var SchemaGenerator = class {
     }
     return dependencies;
   }
+  extractDependenciesFromDefinition(definition, exportName) {
+    const dependencies = [];
+    const schemaRefRegex = /([A-Z][a-zA-Z0-9]*Schema)\b/g;
+    const matches = definition.matchAll(schemaRefRegex);
+    const selfBaseName = exportName.replace(/Schema$/, "");
+    for (const match of matches) {
+      const schemaName = match[1];
+      if (!schemaName) continue;
+      const baseName = schemaName.replace(/Schema$/, "");
+      if (baseName === selfBaseName) continue;
+      if (!dependencies.includes(baseName)) {
+        dependencies.push(baseName);
+      }
+    }
+    return dependencies;
+  }
+  orderDefinitionsByDependencies(definitions) {
+    const visited = /* @__PURE__ */ new Set();
+    const visiting = /* @__PURE__ */ new Set();
+    const result = [];
+    const definitionMap = /* @__PURE__ */ new Map();
+    for (const def of definitions) {
+      const baseName = def.exportName.replace(/Schema$/, "");
+      definitionMap.set(baseName, def);
+    }
+    const visit = /* @__PURE__ */ __name((exportName) => {
+      const baseName = exportName.replace(/Schema$/, "");
+      if (visiting.has(baseName)) {
+        console.warn(`Circular dependency detected for schema: ${exportName}`);
+        return;
+      }
+      if (visited.has(baseName)) {
+        return;
+      }
+      visiting.add(baseName);
+      const def = definitionMap.get(baseName);
+      if (def) {
+        for (const dep of def.dependencies) {
+          if (definitionMap.has(dep)) {
+            visit(`${dep}Schema`);
+          }
+        }
+        result.push(def);
+      }
+      visiting.delete(baseName);
+      visited.add(baseName);
+    }, "visit");
+    for (const def of definitions) {
+      const baseName = def.exportName.replace(/Schema$/, "");
+      if (!visited.has(baseName)) {
+        visit(def.exportName);
+      }
+    }
+    return result;
+  }
   extractDependenciesFromZodSchema(zodSchema, dependencies, visited = /* @__PURE__ */ new Set()) {
     if (!zodSchema?._def) return;
     const def = zodSchema._def;
@@ -2768,18 +2823,27 @@ var SchemaGenerator = class {
     const { schemas, endpoints } = context.schema;
     const imports = ['import { z } from "zod"'];
     const schemaExports = [];
-    const schemaDefinitions = [];
+    const allSchemaDefinitions = [];
     const orderedSchemas = this.orderSchemasByDependencies(schemas);
     for (const schema of orderedSchemas) {
       const { definition, exportName } = this.generateSchemaDefinition(schema);
-      schemaDefinitions.push(definition);
+      const dependencies = this.findSchemaDependencies(schema);
+      allSchemaDefinitions.push({ definition, exportName, dependencies });
       schemaExports.push(exportName);
     }
     for (const endpoint of endpoints) {
       const endpointSchemas = this.generateEndpointSchemas(endpoint);
-      schemaDefinitions.push(...endpointSchemas.definitions);
-      schemaExports.push(...endpointSchemas.exports);
+      for (let i = 0; i < endpointSchemas.definitions.length; i++) {
+        const definition = endpointSchemas.definitions[i];
+        const exportName = endpointSchemas.exports[i];
+        if (!definition || !exportName) continue;
+        const dependencies = this.extractDependenciesFromDefinition(definition, exportName);
+        allSchemaDefinitions.push({ definition, exportName, dependencies });
+        schemaExports.push(exportName);
+      }
     }
+    const orderedDefinitions = this.orderDefinitionsByDependencies(allSchemaDefinitions);
+    const schemaDefinitions = orderedDefinitions.map((item) => item.definition);
     const validationHelpers = this.generateValidationHelpers();
     const contentWithImports = [
       ...imports,
@@ -3778,7 +3842,7 @@ var HookGenerator = class {
     __name(this, "HookGenerator");
   }
   buildImportPath(relativePath) {
-    const outputDirectory = this.configuration.outputDir ?? "generated";
+    const outputDirectory = this.configuration.outputDir || "generated";
     const cleanPath = relativePath.startsWith("/") ? relativePath.slice(1) : relativePath;
     let importBasePath = outputDirectory;
     if (importBasePath.startsWith("src/")) {
@@ -3966,6 +4030,18 @@ ${Object.keys(endpointsByTag).map((tag) => `export * from './${toValidIdentifier
     const enabledCondition = pathParameters.length > 0 && pathParameters[0] ? `!!params?.path?.${pathParameters[0].name}` : "true";
     const pathParamsBuild = pathParameters.length > 0 ? `{ ${pathParameters.map((p) => `${p.name}: params.path.${p.name}`).join(", ")} }` : "{}";
     const queryParamsBuild = queryParameters.length > 0 ? `{ ${queryParameters.map((p) => `${p.name}: params?.query?.${p.name}`).join(", ")} }` : "{}";
+    const queryKeyParts = [`'${toActionName(endpoint.operationId || endpoint.id)}'`];
+    if (pathParameters.length > 0) {
+      queryKeyParts.push("params?.path");
+    } else {
+      queryKeyParts.push("null");
+    }
+    if (queryParameters.length > 0) {
+      queryKeyParts.push("params?.query");
+    }
+    const queryKeyString = `[${queryKeyParts.join(", ")}]`;
+    const hasAnyParams = pathParameters.length > 0 || queryParameters.length > 0;
+    const actionCallString = pathParameters.length > 0 && queryParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: ${queryParamsBuild} }` : pathParameters.length > 0 ? `{ path: ${pathParamsBuild} }` : queryParameters.length > 0 ? `{ query: ${queryParamsBuild} }` : "";
     if (hasSearchParams) {
       const queryParamsWithFallback = queryParameters.length > 0 ? `const queryParams = {
           ${queryParameters.map((param) => {
@@ -3977,7 +4053,8 @@ ${Object.keys(endpointsByTag).map((tag) => `export * from './${toValidIdentifier
           return `${param.name}: params?.query?.${param.name}`;
         }
       }).join(",\n          ")}
-        }` : "const queryParams = {}";
+        }` : "";
+      const actionCallForSearchParams = queryParameters.length > 0 ? pathParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: queryParams }` : "{ query: queryParams }" : pathParameters.length > 0 ? `{ path: ${pathParamsBuild} }` : hasAnyParams ? actionCallString : "";
       return `/**
  * Optimized query hook for ${endpoint.method} ${endpoint.path}
  * Features: URL state sync, infinite loading, optimistic updates
@@ -3990,11 +4067,11 @@ export function ${hookName}(params${pathParameters.length > 0 ? "" : "?"}: ${par
   const { initialData, ...restOptions } = options ?? {}
   
   return useQuery({
-    queryKey: ['${toActionName(endpoint.operationId || endpoint.id)}', ${pathParameters.length > 0 ? "params?.path" : "null"}, params?.query, searchParams],
+    queryKey: [${queryKeyString}, searchParams],
     queryFn: async ({ signal }: { signal?: AbortSignal }) => {
       try {
         ${queryParamsWithFallback}
-        const result = await resolveActionResult<${returnType}>(${actionName}(${pathParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: queryParams }` : "{ query: queryParams }"}))
+        const result = await resolveActionResult<${returnType}>(${actionName}(${actionCallForSearchParams}))
         return result
       } catch (error) {
         handleActionError(error)
@@ -4031,7 +4108,7 @@ export function ${hookName.replace("use", "useInfinite")}(params${pathParameters
   const { initialData, ...restOptions } = options ?? {}
 
   return useInfiniteQuery({
-    queryKey: ['${toActionName(endpoint.operationId || endpoint.id)}', ${pathParameters.length > 0 ? "params?.path" : "null"}, params?.query, 'infinite', searchParams],
+    queryKey: [${queryKeyString}, 'infinite', searchParams],
     initialPageParam: 1,
     queryFn: async ({ pageParam = 1, signal }: { pageParam?: number; signal?: AbortSignal }) => {
       try {
@@ -4048,7 +4125,7 @@ export function ${hookName.replace("use", "useInfinite")}(params${pathParameters
         }
       }).join(",\n          ")}
         }
-        const result = await resolveActionResult<${returnType}>(${actionName}(${pathParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: queryParams }` : "{ query: queryParams }"}))
+        const result = await resolveActionResult<${returnType}>(${actionName}(${queryParameters.length > 0 ? pathParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: queryParams }` : "{ query: queryParams }" : pathParameters.length > 0 ? `{ path: ${pathParamsBuild} }` : hasAnyParams ? actionCallString : ""}))
         return result
       } catch (error) {
         handleActionError(error)
@@ -4098,9 +4175,9 @@ export function ${hookName.replace("use", "useSuspense")}(params${pathParameters
   const { initialData, ...restOptions } = options ?? {}
 
   return useSuspenseQuery({
-    queryKey: ['${toActionName(endpoint.operationId || endpoint.id)}', ${pathParameters.length > 0 ? "params?.path" : "null"}, params?.query],
+    queryKey: ${queryKeyString},
     queryFn: async () => {
-      const result = await resolveActionResult<${returnType}>(${actionName}(${pathParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: ${queryParamsBuild} }` : `{ query: ${queryParamsBuild} }`}))
+      const result = await resolveActionResult<${returnType}>(${actionName}(${actionCallString}))
       return result
     },
     staleTime: ${staleTime},
@@ -4120,10 +4197,10 @@ export function ${hookName}(params${pathParameters.length > 0 ? "" : "?"}: ${par
   const { initialData, ...restOptions } = options ?? {}
 
   return useQuery({
-    queryKey: ['${toActionName(endpoint.operationId || endpoint.id)}', ${pathParameters.length > 0 ? "params?.path" : "null"}, params?.query],
+    queryKey: ${queryKeyString},
     queryFn: async ({ signal }: { signal?: AbortSignal }) => {
       try {
-        const result = await resolveActionResult<${returnType}>(${actionName}(${pathParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: ${queryParamsBuild} }` : `{ query: ${queryParamsBuild} }`}))
+        const result = await resolveActionResult<${returnType}>(${actionName}(${hasAnyParams ? actionCallString : ""}))
         return result
       } catch (error) {
         handleActionError(error)
@@ -4159,9 +4236,9 @@ export function ${hookName.replace("use", "useSuspense")}(params${pathParameters
   const { initialData, ...restOptions } = options ?? {}
 
   return useSuspenseQuery({
-    queryKey: ['${toActionName(endpoint.operationId || endpoint.id)}', ${pathParameters.length > 0 ? "params?.path" : "null"}, params?.query],
+    queryKey: ${queryKeyString},
     queryFn: async () => {
-      const result = await resolveActionResult<${returnType}>(${actionName}(${pathParameters.length > 0 ? `{ path: ${pathParamsBuild}, query: ${queryParamsBuild} }` : `{ query: ${queryParamsBuild} }`}))
+      const result = await resolveActionResult<${returnType}>(${actionName}(${actionCallString}))
       return result
     },
     staleTime: ${staleTime},
@@ -9994,5 +10071,5 @@ exports.VersionChecker = VersionChecker;
 exports.__name = __name;
 exports.checkAndNotifyUpdates = checkAndNotifyUpdates;
 exports.createBridgeVersionChecker = createBridgeVersionChecker;
-//# sourceMappingURL=chunk-NC747MZJ.cjs.map
-//# sourceMappingURL=chunk-NC747MZJ.cjs.map
+//# sourceMappingURL=chunk-SOVBAUFP.cjs.map
+//# sourceMappingURL=chunk-SOVBAUFP.cjs.map