appflare 0.0.27 → 0.0.28

package/cli/generators/generate-api-client/extract-configuration.ts

@@ -0,0 +1,121 @@
+import ts from "typescript";
+import fs from "fs";
+
+export function extractClientConfig(configPath: string): string | null {
+	if (!fs.existsSync(configPath)) {
+		return null;
+	}
+
+	const sourceCode = fs.readFileSync(configPath, "utf-8");
+	const sourceFile = ts.createSourceFile(
+		"appflare.config.ts",
+		sourceCode,
+		ts.ScriptTarget.Latest,
+		true,
+	);
+
+	let clientOptionsNode: ts.Expression | undefined;
+
+	// 1. Find the default export
+	// 2. Find the 'auth' property in the object literal
+	// 3. Find the 'clientOptions' property in the 'auth' object literal
+
+	function findClientOptions(node: ts.Node) {
+		if (ts.isExportAssignment(node)) {
+			const expr = node.expression;
+			if (ts.isObjectLiteralExpression(expr)) {
+				const authProp = expr.properties.find(
+					(p) =>
+						ts.isPropertyAssignment(p) &&
+						ts.isIdentifier(p.name) &&
+						p.name.text === "auth",
+				) as ts.PropertyAssignment | undefined;
+
+				if (authProp && ts.isObjectLiteralExpression(authProp.initializer)) {
+					const clientOptionsProp = authProp.initializer.properties.find(
+						(p) =>
+							ts.isPropertyAssignment(p) &&
+							ts.isIdentifier(p.name) &&
+							p.name.text === "clientOptions",
+					) as ts.PropertyAssignment | undefined;
+
+					if (clientOptionsProp) {
+						clientOptionsNode = clientOptionsProp.initializer;
+					}
+				}
+			}
+		}
+		ts.forEachChild(node, findClientOptions);
+	}
+
+	findClientOptions(sourceFile);
+
+	if (!clientOptionsNode) {
+		return null;
+	}
+
+	const clientOptionsText = clientOptionsNode.getText(sourceFile);
+
+	// 4. Identify identifiers used in clientOptionsText to find necessary imports
+	const usedIdentifiers = new Set<string>();
+
+	function findIdentifiers(node: ts.Node) {
+		if (ts.isIdentifier(node)) {
+			usedIdentifiers.add(node.text);
+		}
+		ts.forEachChild(node, findIdentifiers);
+	}
+
+	findIdentifiers(clientOptionsNode);
+
+	// 5. Scan top-level imports to find matching named imports
+	const importsToKeep: string[] = [];
+
+	for (const statement of sourceFile.statements) {
+		if (ts.isImportDeclaration(statement)) {
+			const importClause = statement.importClause;
+			if (!importClause) continue;
+
+			const moduleSpecifier = statement.moduleSpecifier.getText(sourceFile);
+
+			// Check for named imports
+			if (
+				importClause.namedBindings &&
+				ts.isNamedImports(importClause.namedBindings)
+			) {
+				const keepElements: string[] = [];
+				for (const element of importClause.namedBindings.elements) {
+					if (usedIdentifiers.has(element.name.text)) {
+						keepElements.push(element.getText(sourceFile));
+					}
+				}
+				if (keepElements.length > 0) {
+					importsToKeep.push(
+						`import { ${keepElements.join(", ")} } from ${moduleSpecifier};`,
+					);
+				}
+			}
+
+			// Check for default import
+			if (importClause.name && usedIdentifiers.has(importClause.name.text)) {
+				importsToKeep.push(
+					`import ${importClause.name.text} from ${moduleSpecifier};`,
+				);
+			}
+
+			// Check for namespace import
+			if (
+				importClause.namedBindings &&
+				ts.isNamespaceImport(importClause.namedBindings)
+			) {
+				if (usedIdentifiers.has(importClause.namedBindings.name.text)) {
+					importsToKeep.push(
+						`import * as ${importClause.namedBindings.name.text} from ${moduleSpecifier};`,
+					);
+				}
+			}
+		}
+	}
+
+	return `${importsToKeep.join("\n")}\n\nexport const clientOptions = ${clientOptionsText};`;
+}

package/cli/generators/generate-api-client/index.ts

@@ -15,6 +15,7 @@ import {
 	generateInternalTypeLines,
 } from "./types";
 import { renderObjectKey } from "./utils";
+import { extractClientConfig } from "./extract-configuration";
 
 const HEADER_TEMPLATE = `/* eslint-disable */
 /**
@@ -833,7 +834,7 @@ export function generateApiClient(params: {
 	authBasePath?: string;
 	authEnabled?: boolean;
 	configPathAbs?: string;
-}): string {
+}): { apiTs: string; clientConfigTs: string | null } {
 	const { importLines, importAliasBySource } = generateImports(params);
 	const {
 		queriesByFile,
@@ -892,15 +893,17 @@ export function generateApiClient(params: {
 				buildUrl(baseUrl, authBasePath),
 		});`;
 
+	const clientConfigTs =
+		params.authEnabled && params.configPathAbs
+			? extractClientConfig(params.configPathAbs)
+			: null;
+
 	if (params.authEnabled && params.configPathAbs) {
-		const configImportPath = toImportPathFromGeneratedSrc(
-			params.outDirAbs,
-			params.configPathAbs,
-		);
-		configImport = `\nimport __appflareConfig from ${JSON.stringify(configImportPath)};`;
+		if (clientConfigTs) {
+			configImport = `\nimport { clientOptions } from "./client.config";`;
 
-		// Use a factory function pattern to properly infer the client type from clientOptions
-		authClientTypeDefinitions = `const __getAppflareAuthClientOptions = () => (__appflareConfig.auth?.clientOptions ?? {}) as const;
+			// Use a factory function pattern to properly infer the client type from clientOptions
+			authClientTypeDefinitions = `const __getAppflareAuthClientOptions = () => (clientOptions ?? {}) as const;
 type AppflareAuthClientOptions = ReturnType<typeof __getAppflareAuthClientOptions>;
 const __createTypedAuthClient = (baseURL: string) => createAuthClient({
 	...__getAppflareAuthClientOptions(),
@@ -908,37 +911,63 @@ const __createTypedAuthClient = (baseURL: string) => createAuthClient({
 });
 type AppflareAuthClient = ReturnType<typeof __createTypedAuthClient>;`;
 
-		authClientInit = `	const auth =  createAuthClient({
+			authClientInit = `	const auth =  createAuthClient({
 			...__getAppflareAuthClientOptions(),
 			...(options.auth ?? {}),
 			baseURL:
 				(options.auth as any)?.baseURL ??
 				buildUrl(baseUrl, authBasePath),
 		});`;
+		} else {
+			const configImportPath = toImportPathFromGeneratedSrc(
+				params.outDirAbs,
+				params.configPathAbs,
+			);
+			configImport = `\nimport __appflareConfig from ${JSON.stringify(configImportPath)};`;
+
+			// Use a factory function pattern to properly infer the client type from clientOptions
+			authClientTypeDefinitions = `const __getAppflareAuthClientOptions = () => (__appflareConfig.auth?.clientOptions ?? {}) as const;
+type AppflareAuthClientOptions = ReturnType<typeof __getAppflareAuthClientOptions>;
+const __createTypedAuthClient = (baseURL: string) => createAuthClient({
+	...__getAppflareAuthClientOptions(),
+	baseURL,
+});
+type AppflareAuthClient = ReturnType<typeof __createTypedAuthClient>;`;
+
+			authClientInit = `	const auth =  createAuthClient({
+			...__getAppflareAuthClientOptions(),
+			...(options.auth ?? {}),
+			baseURL:
+				(options.auth as any)?.baseURL ??
+				buildUrl(baseUrl, authBasePath),
+		});`;
+		}
 	}
 
 	const typeBlocks = generateTypeBlocks(params.handlers, importAliasBySource);
 
-	return (
-		HEADER_TEMPLATE.replace("{{configImport}}", configImport) +
-		importLines.join("\n") +
-		TYPE_DEFINITIONS_TEMPLATE +
-		typeBlocks.join("\n\n") +
-		INTERNAL_TEMPLATE.replace(
-			"{{internalQueriesTypeDef}}",
-			internalQueriesTypeDef,
-		)
-			.replace("{{internalMutationsTypeDef}}", internalMutationsTypeDef)
-			.replace("{{internalInit}}", internalInit)
-			.replace("{{internalQueriesMeta}}", internalQueriesMeta)
-			.replace("{{internalMutationsMeta}}", internalMutationsMeta) +
-		CLIENT_TYPES_TEMPLATE.replace("{{queriesTypeDef}}", queriesTypeDef)
-			.replace("{{mutationsTypeDef}}", mutationsTypeDef)
-			.replace("{{queriesInit}}", queriesInit)
-			.replace("{{mutationsInit}}", mutationsInit)
-			.replace("{{authBasePath}}", authBasePathLiteral)
-			.replace("{{authClientTypeDefinitions}}", authClientTypeDefinitions)
-			.replace("{{authClientInit}}", authClientInit) +
-		UTILITY_FUNCTIONS_TEMPLATE
-	);
+	return {
+		apiTs:
+			HEADER_TEMPLATE.replace("{{configImport}}", configImport) +
+			importLines.join("\n") +
+			TYPE_DEFINITIONS_TEMPLATE +
+			typeBlocks.join("\n\n") +
+			INTERNAL_TEMPLATE.replace(
+				"{{internalQueriesTypeDef}}",
+				internalQueriesTypeDef,
+			)
+				.replace("{{internalMutationsTypeDef}}", internalMutationsTypeDef)
+				.replace("{{internalInit}}", internalInit)
+				.replace("{{internalQueriesMeta}}", internalQueriesMeta)
+				.replace("{{internalMutationsMeta}}", internalMutationsMeta) +
+			CLIENT_TYPES_TEMPLATE.replace("{{queriesTypeDef}}", queriesTypeDef)
+				.replace("{{mutationsTypeDef}}", mutationsTypeDef)
+				.replace("{{queriesInit}}", queriesInit)
+				.replace("{{mutationsInit}}", mutationsInit)
+				.replace("{{authBasePath}}", authBasePathLiteral)
+				.replace("{{authClientTypeDefinitions}}", authClientTypeDefinitions)
+				.replace("{{authClientInit}}", authClientInit) +
+			UTILITY_FUNCTIONS_TEMPLATE,
+		clientConfigTs,
+	};
 }

package/cli/index.ts

@@ -219,7 +219,7 @@ export default schema;
 		configPathAbs,
 	});
 
-	const apiTs = generateApiClient({
+	const { apiTs, clientConfigTs } = generateApiClient({
 		handlers,
 		outDirAbs,
 		authBasePath:
@@ -230,6 +230,12 @@ export default schema;
 		configPathAbs,
 	});
 	await fs.writeFile(path.join(outDirAbs, "src", "api.ts"), apiTs);
+	if (clientConfigTs) {
+		await fs.writeFile(
+			path.join(outDirAbs, "src", "client.config.ts"),
+			clientConfigTs,
+		);
+	}
 
 	const serverTs = generateHonoServer({
 		handlers,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "appflare",
-	"version": "0.0.27",
+	"version": "0.0.28",
 	"bin": {
 		"appflare": "./cli/index.ts"
 	},