@happyvertical/smrt-core 0.38.25 → 0.38.26

package/dist/manifest.json

@@ -1,8 +1,8 @@
 {
   "version": "1.0.0",
-  "timestamp": 1783646383847,
+  "timestamp": 1783688012207,
   "packageName": "@happyvertical/smrt-core",
-  "packageVersion": "0.38.25",
+  "packageVersion": "0.38.26",
   "objects": {
     "@happyvertical/smrt-core:SmrtClass": {
       "name": "smrtclass",

package/dist/smrt-knowledge.json

@@ -1,13 +1,13 @@
 {
   "schemaVersion": 1,
-  "generatedAt": "2026-07-10T01:19:41.827Z",
+  "generatedAt": "2026-07-10T12:53:30.253Z",
   "packageName": "@happyvertical/smrt-core",
-  "packageVersion": "0.38.25",
+  "packageVersion": "0.38.26",
   "sourceManifestPath": "dist/manifest.json",
   "agentDocPath": "AGENTS.md",
   "sourceHashes": {
-    "manifest": "aa2cf3eb5f80eb6b293c0295d389642133c141565c82441c91218de621c739f6",
-    "packageJson": "f264140cfb873ecdef0955f607995a879aed33484739988b61c0ebee16f85dd3",
+    "manifest": "ba1939aa15bc24f7b2c7afab6e67acbb659eb95950bfa192094f27e6ef910857",
+    "packageJson": "10ed64f544dff4a6dde408e676c2610865a5cdcd1507eb0b30fdaa9da2aeb422",
     "agents": "3d72a7c7113be59dd66046c50acc3e2759735fae5e9a0c6b30801d3e193b773d"
   },
   "exports": [

package/dist/vite-plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite-plugin/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EACV,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAiC,MAAM,MAAM,CAAC;AAIlE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAmB5D,YAAY,EACV,wBAAwB,EACxB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAalC,MAAM,WAAW,iBAAiB;IAChC,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,0BAA0B;IAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,kFAAkF;IAClF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4EAA4E;IAC5E,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wEAAwE;IACxE,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,8CAA8C;IAC9C,SAAS,CAAC,EAAE;QACV,yDAAyD;QACzD,OAAO,EAAE,OAAO,CAAC;QACjB,wEAAwE;QACxE,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,qEAAqE;QACrE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,mEAAmE;QACnE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,mDAAmD;QACnD,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;;;WAIG;QACH,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB;;;WAGG;QACH,YAAY,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;QACrC;;;;WAIG;QACH,WAAW,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,OAAO,CAAC;YAAC,cAAc,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC9D,CAAC;IACF,mEAAmE;IACnE,SAAS,CAAC,EAAE,qBAAqB,GAAG,KAAK,CAAC;IAC1C;;;;OAIG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AA+BD,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAG1D;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,CAaR;AAED,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAAG,MAAM,CAu5BlE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/vite-plugin/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EACV,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,MAAM,EAAiC,MAAM,MAAM,CAAC;AAIlE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAoB5D,YAAY,EACV,wBAAwB,EACxB,gBAAgB,GACjB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,EACnB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAalC,MAAM,WAAW,iBAAiB;IAChC,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,0BAA0B;IAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qBAAqB;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,kFAAkF;IAClF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4EAA4E;IAC5E,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wEAAwE;IACxE,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,8CAA8C;IAC9C,SAAS,CAAC,EAAE;QACV,yDAAyD;QACzD,OAAO,EAAE,OAAO,CAAC;QACjB,wEAAwE;QACxE,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,qEAAqE;QACrE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,mEAAmE;QACnE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,mDAAmD;QACnD,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;;;WAIG;QACH,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB;;;WAGG;QACH,YAAY,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;QACrC;;;;WAIG;QACH,WAAW,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,OAAO,CAAC;YAAC,cAAc,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC9D,CAAC;IACF,mEAAmE;IACnE,SAAS,CAAC,EAAE,qBAAqB,GAAG,KAAK,CAAC;IAC1C;;;;OAIG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AA+BD,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAG1D;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,CAaR;AAED,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,GAAG,MAAM,CAu5BlE"}

package/dist/vite-plugin/index.js

@@ -1,5 +1,5 @@
-import { findCliApiCoherenceViolations, generateSvelteKitRoutes, methodNameToKebab, resolveApiActionSet, validateCliIncludeAgainstApi } from "./sveltekit-generator.js";
-import { buildWebCollectionDefinition, buildWebToolDescriptors, computeWebManifestHash, selectWebCollectionEntries } from "./web-collections.js";
+import { findCliApiCoherenceViolations, generateSvelteKitRoutes, methodNameToKebab, resolveApiActionRouteConfig, resolveApiActionSet, validateCliIncludeAgainstApi } from "./sveltekit-generator.js";
+import { buildWebCollectionDefinition, buildWebToolDescriptors, computeWebManifestHash, isCollectionManifestClass, 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";
@@ -589,14 +589,54 @@ export { setupRoutes as default };
 function lowerFirst(value) {
 	return value ? value[0].toLowerCase() + value.slice(1) : value;
 }
-function uniqueApiClientEntries(objects) {
+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 findManifestObjectByName(manifest, name) {
+	return Object.entries(manifest.objects).find(([manifestKey, candidate]) => manifestKey === name || candidate.qualifiedName === name || candidate.className === name)?.[1];
+}
+function resolveCollectionItemObject(obj, manifest) {
+	const seen = /* @__PURE__ */ new Set();
+	let candidate = obj;
+	while (candidate) {
+		if (candidate.extendsTypeArg) {
+			const itemObject = findManifestObjectByName(manifest, candidate.extendsTypeArg);
+			if (itemObject) return itemObject;
+		}
+		if (candidate.className.endsWith("Collection")) {
+			const conventionalItem = findManifestObjectByName(manifest, candidate.className.slice(0, -10));
+			if (conventionalItem) return conventionalItem;
+		}
+		const parentName = candidate.extendsQualified || candidate.extends;
+		if (!parentName || seen.has(parentName)) return void 0;
+		seen.add(parentName);
+		candidate = findManifestObjectByName(manifest, parentName);
+	}
+}
+function resolveApiClientDataInterfaceName(obj, manifest) {
+	if (!isCollectionManifestClass(manifest, obj)) return `${obj.className}Data`;
+	return `${resolveCollectionItemObject(obj, manifest)?.className || obj.className}Data`;
+}
+function uniqueApiClientEntries(manifest) {
+	const canonicalCollectionOwners = /* @__PURE__ */ new Map();
+	const objects = Object.entries(manifest.objects);
+	for (const [, obj] of objects) {
+		const current = canonicalCollectionOwners.get(obj.collection);
+		if (!current || isCollectionManifestClass(manifest, current) && !isCollectionManifestClass(manifest, obj)) canonicalCollectionOwners.set(obj.collection, obj);
+	}
+	const reservedCanonicalKeys = new Set(canonicalCollectionOwners.keys());
 	const usedKeys = /* @__PURE__ */ new Set();
 	return objects.map(([objectName, obj]) => {
-		let clientKey = obj.collection;
-		if (usedKeys.has(clientKey)) clientKey = lowerFirst(obj.className);
+		const isCanonicalOwner = canonicalCollectionOwners.get(obj.collection) === obj;
+		let clientKey = isCanonicalOwner ? obj.collection : lowerFirst(obj.className);
 		const baseClientKey = clientKey;
 		let suffix = 2;
-		while (usedKeys.has(clientKey)) {
+		while (usedKeys.has(clientKey) || !isCanonicalOwner && reservedCanonicalKeys.has(clientKey)) {
 			clientKey = `${baseClientKey}${suffix}`;
 			suffix += 1;
 		}
@@ -615,28 +655,68 @@ function generateClientModule(manifest, options = {}) {
 
 ${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 {${uniqueApiClientEntries(Object.entries(manifest.objects)).map(({ obj, clientKey }) => {
+  return {${uniqueApiClientEntries(manifest).map(({ obj, clientKey }) => {
 		const { collection, methods = {} } = obj;
 		const exposedActions = resolveApiActionSet(obj);
 		const apiConfig = obj.decoratorConfig?.api;
-		const apiRoutes = apiConfig && typeof apiConfig === "object" ? apiConfig.routes ?? {} : {};
-		const customMethods = Object.entries(methods).filter(([name, method]) => method.isPublic && exposedActions.has(name));
-		const segmentFor = (methodName) => {
-			const overridePath = apiRoutes[methodName]?.path;
-			if (overridePath) {
-				const trimmed = overridePath.split("/").map((s) => s.trim()).filter(Boolean).join("/");
-				if (trimmed.length > 0) return trimmed;
-			}
-			return options.kebabRoutes ? methodNameToKebab(methodName) : methodName;
-		};
-		const customMethodImpls = customMethods.map(([methodName, _method]) => {
-			const urlSegment = segmentFor(methodName);
-			return `    ${methodName}: (id, options) => __smrtFetchJson(basePath + '/${collection}/' + id + '/${urlSegment}', {
-      method: 'POST',
+		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}: {
@@ -900,17 +980,35 @@ ${Object.entries(obj.fields).map(([fieldName, field]) => {
     updated_at?: string;
   }`;
 		}).join("\n\n");
-		const apiClientInterface = uniqueApiClientEntries(Object.entries(manifest.objects)).map(({ obj, clientKey }) => {
-			const { className, methods = {} } = obj;
-			const interfaceName = `${className}Data`;
+		const apiClientInterface = uniqueApiClientEntries(manifest).map(({ obj, clientKey }) => {
+			const { methods = {} } = obj;
+			const apiConfig = obj.decoratorConfig?.api;
+			const interfaceName = resolveApiClientDataInterfaceName(obj, manifest);
 			const exposedActions = resolveApiActionSet(obj);
-			const customMethods = Object.entries(methods).filter(([name, method]) => method.isPublic && exposedActions.has(name));
+			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 || [];
-				return `      ${methodName}(id: string${params.length > 0 ? `, options?: { ${params.map((p) => `${p.name}?: ${mapTypeScriptType(p.type)}`).join("; ")} }` : ""}): Promise<any>;`;
+				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>;`;
 			}).join("\n");
-			if (customMethods.length > 0) return `    ${clientKey}: CrudOperations<${interfaceName}> & {\n${customMethodSignatures}\n    };`;
-			else return `    ${clientKey}: CrudOperations<${interfaceName}>;`;
+			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};`;
 		}).join("\n");
 		const webCollectionInterface = selectWebCollectionEntries(manifest).map(({ collection, obj }) => `    ${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]) => ({
@@ -989,7 +1087,8 @@ declare module '@happyvertical/smrt-virt-routes' {
 // list/search, a bare object for get/create/update — with snake_case field
 // names (created_at, updated_at). These declarations match that shape (no
 // envelope, no camelCase). Fetchers reject on non-2xx with a SmrtClientError
-// (#1796). This is byte-identical to the prebuild declaration path.
+// (#1796). Shared CRUD wire types stay aligned with the prebuild declaration
+// path; Vite-only custom action declarations are layered onto them below.
 declare module '@happyvertical/smrt-virt-client' {
   /** Shape of a JSON error body carried by a rejected request (SmrtClientError.body). */
   export interface ApiError {