@happyvertical/smrt-core 0.40.31 → 0.40.32

package/dist/vite-plugin/index.js

@@ -1,10 +1,10 @@
-import { findCliApiCoherenceViolations, generateSvelteKitRoutes, methodNameToKebab, resolveApiActionRouteConfig, resolveApiActionSet, validateCliIncludeAgainstApi } from "./sveltekit-generator.js";
-import { buildWebCollectionDefinition, buildWebToolDescriptors, computeWebManifestHash, isCollectionManifestClass, selectWebCollectionEntries } from "./web-collections.js";
+import { findCliApiCoherenceViolations, generateSvelteKitRoutes, methodNameToKebab, resolveApiActionSet, validateCliIncludeAgainstApi } from "./sveltekit-generator.js";
+import { buildWebCollectionDefinition, buildWebToolDescriptors, computeWebManifestHash, selectWebCollectionEntries } from "./web-collections.js";
 import { buildDomainKnowledgeManifest } from "../knowledge.js";
 import { importWorkspaceModule } from "../utils/import-workspace-module.js";
 import { discoverSmrtPackages } from "../manifest/discover-smrt-packages.js";
-import { CLIENT_FETCH_RUNTIME } from "../generated-client-runtime.js";
-import { selectApiClientEntries } from "./api-client-entries.js";
+import { renderApiClientCrudType, renderApiClientCustomMethodParameters, selectApiClientEntries } from "./api-client-entries.js";
+import { GENERATED_CLIENT_BASE_METHODS, GENERATED_CLIENT_CRUD_METHODS, generateClientModule } from "./generated-client.js";
 import { importBuildAwareModule } from "./import-build-aware.js";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
@@ -592,125 +592,6 @@ export { setupRoutes as default };
 		return "export function setupRoutes(app, options = {}) { console.warn(\"Routes generation failed\"); }";
 	}
 }
-var GENERATED_CLIENT_CRUD_METHODS = /* @__PURE__ */ new Set([
-	"list",
-	"get",
-	"create",
-	"update",
-	"delete"
-]);
-var GENERATED_CLIENT_BASE_METHODS = /* @__PURE__ */ new Set([...GENERATED_CLIENT_CRUD_METHODS, "search"]);
-function generateClientModule(manifest, options = {}) {
-	return `
-// Auto-generated API client from SMRT objects
-// This file is generated automatically - do not edit
-
-${CLIENT_FETCH_RUNTIME}
-
-async function __smrtFetchActionResult(url, init) {
-  const body = await __smrtFetchJson(url, init);
-  return body &&
-    typeof body === 'object' &&
-    Object.prototype.hasOwnProperty.call(body, 'result')
-    ? body.result
-    : body;
-}
-
-function __smrtActionUrl(url, options, pathParamNames, includeQuery) {
-  const values = options && typeof options === 'object' ? options : {};
-  const pathParams = new Set(pathParamNames);
-  let resolvedUrl = url;
-  for (const name of pathParamNames) {
-    const value = values[name];
-    if (value === undefined || value === null) {
-      throw new Error('Missing generated client route parameter: ' + name);
-    }
-    resolvedUrl = resolvedUrl.replace(
-      '[' + name + ']',
-      encodeURIComponent(String(value)),
-    );
-  }
-
-  if (!includeQuery) return resolvedUrl;
-
-  const searchParams = new URLSearchParams();
-  for (const [name, value] of Object.entries(values)) {
-    if (pathParams.has(name) || value === undefined) continue;
-    if (Array.isArray(value)) {
-      for (const item of value) searchParams.append(name, String(item));
-      continue;
-    }
-    searchParams.append(
-      name,
-      value !== null && typeof value === 'object'
-        ? JSON.stringify(value)
-        : String(value),
-    );
-  }
-
-  const query = searchParams.toString();
-  return query ? resolvedUrl + '?' + query : resolvedUrl;
-}
-
-export function createClient(basePath = '/api/v1') {
-  return {${selectApiClientEntries(manifest).map(({ obj, clientKey }) => {
-		const { collection, methods = {} } = obj;
-		const exposedActions = resolveApiActionSet(obj);
-		const apiConfig = obj.decoratorConfig?.api;
-		const customMethods = Object.entries(methods).filter(([name, method]) => !GENERATED_CLIENT_CRUD_METHODS.has(name) && method.isPublic && exposedActions.has(name));
-		const customMethodImpls = customMethods.map(([methodName, method]) => {
-			const routeConfig = resolveApiActionRouteConfig(methodName, method, apiConfig, { kebabRoutes: options.kebabRoutes }, isCollectionManifestClass(manifest, obj) ? "collection" : method.isStatic ? "collection" : "item");
-			const urlSegment = routeConfig.pathSegments.join("/");
-			return `    ${methodName}: (${routeConfig.scope === "collection" ? "options" : "id, options"}) => __smrtFetchActionResult(${`__smrtActionUrl(${routeConfig.scope === "collection" ? `basePath + '/${collection}/${urlSegment}'` : `basePath + '/${collection}/' + id + '/${urlSegment}'`}, options, ${JSON.stringify(routeConfig.pathParamNames)}, ${routeConfig.method === "GET"})`}, ${routeConfig.method === "GET" ? `{
-      method: 'GET',
-      headers: { 'Accept': 'application/json' }
-    }` : `{
-      method: '${routeConfig.method}',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(options || {})
-    }`})`;
-		}).join(",\n");
-		return `
-  ${clientKey}: {
-    list: (params) => __smrtFetchJson(basePath + '/${collection}', {
-      method: 'GET',
-      headers: { 'Content-Type': 'application/json' }
-    }),
-
-    get: (id) => __smrtFetchJson(basePath + '/${collection}/' + id, {
-      method: 'GET',
-      headers: { 'Content-Type': 'application/json' }
-    }),
-
-    create: (data) => __smrtFetchJson(basePath + '/${collection}', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(data)
-    }),
-
-    update: (id, data) => __smrtFetchJson(basePath + '/${collection}/' + id, {
-      method: 'PUT',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(data)
-    }),
-
-    delete: (id) => __smrtFetchOk(basePath + '/${collection}/' + id, {
-      method: 'DELETE',
-      headers: { 'Content-Type': 'application/json' }
-    }),
-
-    search: (query) => __smrtFetchJson(basePath + '/${collection}/search?q=' + encodeURIComponent(query), {
-      method: 'GET',
-      headers: { 'Content-Type': 'application/json' }
-    })${customMethods.length > 0 ? `,\n${customMethodImpls}` : ""}
-  }`;
-	}).join(",")}
-  };
-}
-
-export { createClient as default };
-`;
-}
 /**
 * Generate the virtual web-collection definition module
 * (`@happyvertical/smrt-virt-web`, #1761).
@@ -932,37 +813,24 @@ ${Object.entries(obj.fields).map(([fieldName, field]) => {
     updated_at?: string;
   }`;
 		}).join("\n\n");
-		const apiClientInterface = selectApiClientEntries(manifest).map(({ obj, clientKey, dataInterfaceName }) => {
+		const apiClientInterface = selectApiClientEntries(manifest).map(({ obj, clientKey, dataInterfaceName, crudMethods, customMethods: exposedMethods }) => {
 			const { methods = {} } = obj;
-			const apiConfig = obj.decoratorConfig?.api;
 			const interfaceName = dataInterfaceName;
-			const exposedActions = resolveApiActionSet(obj);
-			const customMethods = Object.entries(methods).filter(([name, method]) => !GENERATED_CLIENT_CRUD_METHODS.has(name) && method.isPublic && exposedActions.has(name));
-			const customMethodSignatures = customMethods.map(([methodName, method]) => {
-				const routeConfig = resolveApiActionRouteConfig(methodName, method, apiConfig, {}, isCollectionManifestClass(manifest, obj) ? "collection" : method.isStatic ? "collection" : "item");
-				const params = method.parameters || [];
-				const pathParamNames = new Set(routeConfig.pathParamNames);
-				const hasSingleOptionsParameter = params.length === 1 && params[0]?.name === "options";
-				const requiredPathProperties = routeConfig.pathParamNames.map((name) => `${name}: string`).join("; ");
-				let optionsType;
-				if (hasSingleOptionsParameter) {
-					const directOptionsType = mapTypeScriptType(params[0].type);
-					optionsType = requiredPathProperties ? `${directOptionsType} & { ${requiredPathProperties} }` : directOptionsType;
-				} else {
-					const parameterNames = new Set(params.map((param) => param.name));
-					const properties = params.map((param) => `${param.name}${pathParamNames.has(param.name) ? "" : "?"}: ${mapTypeScriptType(param.type)}`);
-					for (const pathParamName of routeConfig.pathParamNames) if (!parameterNames.has(pathParamName)) properties.push(`${pathParamName}: string`);
-					optionsType = properties.length > 0 ? `{ ${properties.join("; ")} }` : "Record<string, never>";
-				}
-				const optionsParameter = `${routeConfig.pathParamNames.length > 0 ? "options" : "options?"}: ${optionsType}`;
-				return `      ${methodName}(${routeConfig.scope === "collection" ? optionsParameter : `id: string, ${optionsParameter}`}): Promise<any>;`;
+			const exposedActionNames = new Set(exposedMethods.map((method) => method.name));
+			const customMethods = Object.entries(methods).filter(([name, method]) => !GENERATED_CLIENT_CRUD_METHODS.has(name) && method.isPublic && exposedActionNames.has(name));
+			const customMethodSignatures = customMethods.map(([methodName]) => {
+				const exposedMethod = exposedMethods.find(({ name }) => name === methodName);
+				if (!exposedMethod) return "";
+				return `      ${methodName}(${renderApiClientCustomMethodParameters(exposedMethod, mapTypeScriptType)}): Promise<any>;`;
 			}).join("\n");
-			const overriddenBaseMethods = customMethods.map(([methodName]) => methodName).filter((methodName) => GENERATED_CLIENT_BASE_METHODS.has(methodName));
-			const crudOperationsType = overriddenBaseMethods.length > 0 ? `Omit<CrudOperations<${interfaceName}>, ${overriddenBaseMethods.map((methodName) => JSON.stringify(methodName)).join(" | ")}>` : `CrudOperations<${interfaceName}>`;
-			if (customMethods.length > 0) return `    ${clientKey}: ${crudOperationsType} & {\n${customMethodSignatures}\n    };`;
-			else return `    ${clientKey}: ${crudOperationsType};`;
+			const crudOperationsType = renderApiClientCrudType(interfaceName, crudMethods, customMethods.map(([methodName]) => methodName).filter((methodName) => GENERATED_CLIENT_BASE_METHODS.has(methodName)));
+			if (customMethods.length > 0) {
+				const intersection = crudOperationsType ? `${crudOperationsType} & ` : "";
+				return `    ${JSON.stringify(clientKey)}: ${intersection}{\n${customMethodSignatures}\n    };`;
+			}
+			return `    ${JSON.stringify(clientKey)}: ${crudOperationsType ?? "Record<string, never>"};`;
 		}).join("\n");
-		const webCollectionInterface = selectWebCollectionEntries(manifest).map(({ collection, obj }) => `    ${collection}: SmrtWebCollectionDefinition<import('@happyvertical/smrt-virt-types').${obj.className}Data>;`).join("\n");
+		const webCollectionInterface = selectWebCollectionEntries(manifest).map(({ collection, obj }) => `    ${JSON.stringify(collection)}: SmrtWebCollectionDefinition<import('@happyvertical/smrt-virt-types').${obj.className}Data>;`).join("\n");
 		Object.entries(manifest.objects).flatMap(([_name, obj]) => Object.entries(obj.methods).map(([methodName, method]) => ({
 			name: `${methodName}_${obj.collection}`,
 			description: `${method.name} operation on ${obj.collection}`,
@@ -1471,6 +1339,6 @@ export default {};`;
 	}
 }
 //#endregion
-export { findCliApiCoherenceViolations, generateInlineRegisterModule, generateSvelteKitRoutes, isRegisterShimModuleId, methodNameToKebab, resolveApiActionSet, smrtPlugin, validateCliIncludeAgainstApi };
+export { findCliApiCoherenceViolations, generateInlineRegisterModule, generateSvelteKitRoutes, generateTypeDeclarationFile, isRegisterShimModuleId, methodNameToKebab, resolveApiActionSet, smrtPlugin, validateCliIncludeAgainstApi };
 
 //# sourceMappingURL=index.js.map