@raketa-cloud/admin 1.8.8 → 1.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "main": "src/index.js",
   "files": [
     "src/",

package/src/HonoAdapter.js

@@ -65,11 +65,19 @@ function putIn(result, key, value) {
 const sanitizePath = (filePath) =>
   path.normalize(path.join("/", ...filePath.split("/")));
 
+function packageFallbackPaths(views, suffix) {
+  const rest = views.split("/").slice(1);
+  return ["resources", "resource_revisions"].map((base) =>
+    sanitizePath(`${currentPath}/views/${[base, ...rest].join("/")}/${suffix}`),
+  );
+}
+
 // Find template path, preferring an app override over the package template
 function getPartialPath(partialPath, views) {
   const paths = [
     sanitizePath(`${process.cwd()}/src/views/${views}/${partialPath}`),
     sanitizePath(`${currentPath}/views/${views}/${partialPath}`),
+    ...packageFallbackPaths(views, partialPath),
   ].filter(Boolean);
 
   // Return first existing path
@@ -78,7 +86,7 @@ function getPartialPath(partialPath, views) {
   if (existingPath) return existingPath;
 
   throw new Error(
-    `Template not found: "${partialPath}"\nSearched in:\n${paths.join("\n")}`
+    `Template not found: "${partialPath}"\nSearched in:\n${paths.join("\n")}`,
   );
 }
 
@@ -136,10 +144,16 @@ export default class HonoAdapter {
   }
 
   getActionPath(views, action) {
-    const packagePath = `${currentPath}/views/${views}/${action}.ejs`;
     const appPath = `${process.cwd()}/src/views/${views}/${action}.ejs`;
+    if (existsSync(appPath)) return appPath;
 
-    return existsSync(appPath) ? appPath : packagePath;
+    const packagePath = `${currentPath}/views/${views}/${action}.ejs`;
+    if (existsSync(packagePath)) return packagePath;
+
+    const fallback = packageFallbackPaths(views, `${action}.ejs`).find(
+      existsSync,
+    );
+    return fallback ?? packagePath;
   }
 
   getHelpers(viewHelpersConfig) {
@@ -180,7 +194,7 @@ export default class HonoAdapter {
             ...assigns,
             ...localAssigns,
           },
-          { filename: partialPath }
+          { filename: partialPath },
         );
 
         return rendered;
@@ -210,7 +224,7 @@ export default class HonoAdapter {
           ...renderAssigns,
           render_partial: renderPartialHelper,
         },
-        { filename: fullTemplatePath }
+        { filename: fullTemplatePath },
       );
 
       const fullPage = this.renderLayout(renderAssigns, rendered);
@@ -276,7 +290,7 @@ export default class HonoAdapter {
 
   async createAction(
     [verb, path, resource, views, action, handler],
-    resourceConfig
+    resourceConfig,
   ) {
     const { i18n } = this.globalConfig;
 
@@ -290,7 +304,7 @@ export default class HonoAdapter {
           next,
           verb,
           resource,
-          action
+          action,
         );
 
         // Set context properties
@@ -324,7 +338,7 @@ export default class HonoAdapter {
         };
 
         ctx.logger.info(
-          `${ctx.method} "${ctx.rawPath}" -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`
+          `${ctx.method} "${ctx.rawPath}" -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`,
         );
 
         const assigns = {
@@ -369,7 +383,7 @@ export default class HonoAdapter {
 
             Object.assign(
               assigns.afterFilterAssigns,
-              afterResult.assigns || {}
+              afterResult.assigns || {},
             );
           }
         }
@@ -390,7 +404,7 @@ export default class HonoAdapter {
             action,
             assigns: fullAssigns,
           },
-          this.globalConfig?.helpers || {}
+          this.globalConfig?.helpers || {},
         );
 
         return routerCtx.html(rendered);
@@ -401,7 +415,7 @@ export default class HonoAdapter {
   // Single method to handle all route types
   routeCollection(mapping, resourceConfig) {
     mapping.forEach((handlerMap) =>
-      this.createAction(handlerMap, resourceConfig)
+      this.createAction(handlerMap, resourceConfig),
     );
   }
 
@@ -423,7 +437,7 @@ export default class HonoAdapter {
   applyHeaders(headers, router) {
     if (!headers) return;
     Object.entries(headers).forEach(([key, value]) =>
-      router.header(key, value)
+      router.header(key, value),
     );
   }