@hybridly/vite 0.0.1-alpha.11 → 0.0.1-alpha.13

package/dist/index.cjs

@@ -27,14 +27,26 @@ const debug = {
   layout: makeDebugger__default(LAYOUT_PLUGIN_NAME)
 };
 
-const TEMPLATE_LAYOUT_REGEX = /<template +layout(?: *= *['"]((?:[\w\/-_,](?:,\ )?)+)['"] *)?>/;
+const TEMPLATE_LAYOUT_REGEX = /<template +layout(?: *= *['"]((?:[\w\/\-_,:](?:,\ )?)+)['"] *)?>/;
 const TYPESCRIPT_REGEX = /lang=['"]ts['"]/;
 const layout = (options = {}) => {
   const defaultLayoutName = options?.defaultLayoutName?.replace(".vue", "") ?? "default";
-  const base = options?.directory ?? path__default.resolve(process.cwd(), "resources", "views", "layouts");
+  const layoutsDirectory = options?.directory ?? path__default.resolve(process.cwd(), "resources", "views", "layouts");
   const templateRegExp = options?.templateRegExp ?? TEMPLATE_LAYOUT_REGEX;
-  const getLayoutPath = options?.resolve ?? ((layoutName) => vite.normalizePath(path__default.resolve(base, `${layoutName}.vue`)).replaceAll("\\", "/"));
-  debug.layout("Registered layout path:", base);
+  const resolveLayoutPath = (layoutName) => {
+    const [domain, layout] = layoutName.includes(":") ? layoutName.split(":") : [void 0, layoutName];
+    const resolve = options?.resolve ?? ((layout2, domain2) => {
+      if (!domain2) {
+        return path__default.resolve(layoutsDirectory, `${layout2}.vue`);
+      }
+      return path__default.resolve(process.cwd(), "resources", "domains", domain2, "layouts", `${layout2}.vue`);
+    });
+    return vite.normalizePath(resolve(layout, domain)).replaceAll("\\", "/");
+  };
+  debug.layout("Resolved options:", {
+    defaultLayoutName,
+    layoutsDirectory
+  });
   return {
     name: LAYOUT_PLUGIN_NAME,
     transform: (code, id) => {
@@ -48,7 +60,7 @@ const layout = (options = {}) => {
         const exports = layouts.map((_2, i) => importName(i));
         const imports = layouts.reduce((imports2, layoutName2, i) => `
 					${imports2}
-					import ${importName(i)} from '${getLayoutPath(layoutName2)}';
+					import ${importName(i)} from '${resolveLayoutPath(layoutName2)}';
 				`, "").trim();
         debug.layout(`Resolved layouts "${layouts.join(", ")}":`, {
           sourceFile: id,

package/dist/index.d.ts

@@ -14,7 +14,7 @@ interface LayoutOptions {
     /** The directory in which layouts are stored. */
     directory?: string;
     /** Function that resolves the layout path given its name. */
-    resolve?: (layout: string) => string;
+    resolve?: (layout: string, domain?: string) => string;
 }
 interface RouterOptions {
     /** Path to the PHP executable. */

package/dist/index.mjs

@@ -17,14 +17,26 @@ const debug = {
   layout: makeDebugger(LAYOUT_PLUGIN_NAME)
 };
 
-const TEMPLATE_LAYOUT_REGEX = /<template +layout(?: *= *['"]((?:[\w\/-_,](?:,\ )?)+)['"] *)?>/;
+const TEMPLATE_LAYOUT_REGEX = /<template +layout(?: *= *['"]((?:[\w\/\-_,:](?:,\ )?)+)['"] *)?>/;
 const TYPESCRIPT_REGEX = /lang=['"]ts['"]/;
 const layout = (options = {}) => {
   const defaultLayoutName = options?.defaultLayoutName?.replace(".vue", "") ?? "default";
-  const base = options?.directory ?? path.resolve(process.cwd(), "resources", "views", "layouts");
+  const layoutsDirectory = options?.directory ?? path.resolve(process.cwd(), "resources", "views", "layouts");
   const templateRegExp = options?.templateRegExp ?? TEMPLATE_LAYOUT_REGEX;
-  const getLayoutPath = options?.resolve ?? ((layoutName) => normalizePath(path.resolve(base, `${layoutName}.vue`)).replaceAll("\\", "/"));
-  debug.layout("Registered layout path:", base);
+  const resolveLayoutPath = (layoutName) => {
+    const [domain, layout] = layoutName.includes(":") ? layoutName.split(":") : [void 0, layoutName];
+    const resolve = options?.resolve ?? ((layout2, domain2) => {
+      if (!domain2) {
+        return path.resolve(layoutsDirectory, `${layout2}.vue`);
+      }
+      return path.resolve(process.cwd(), "resources", "domains", domain2, "layouts", `${layout2}.vue`);
+    });
+    return normalizePath(resolve(layout, domain)).replaceAll("\\", "/");
+  };
+  debug.layout("Resolved options:", {
+    defaultLayoutName,
+    layoutsDirectory
+  });
   return {
     name: LAYOUT_PLUGIN_NAME,
     transform: (code, id) => {
@@ -38,7 +50,7 @@ const layout = (options = {}) => {
         const exports = layouts.map((_2, i) => importName(i));
         const imports = layouts.reduce((imports2, layoutName2, i) => `
 					${imports2}
-					import ${importName(i)} from '${getLayoutPath(layoutName2)}';
+					import ${importName(i)} from '${resolveLayoutPath(layoutName2)}';
 				`, "").trim();
         debug.layout(`Resolved layouts "${layouts.join(", ")}":`, {
           sourceFile: id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/vite",
-  "version": "0.0.1-alpha.11",
+  "version": "0.0.1-alpha.13",
   "description": "A solution to develop server-driven, client-rendered applications",
   "keywords": [
     "hybridly",
@@ -39,7 +39,7 @@
     "vue": "^3.2.33"
   },
   "dependencies": {
-    "@hybridly/core": "0.0.1-alpha.11",
+    "@hybridly/core": "0.0.1-alpha.13",
     "throttle-debounce": "^5.0.0"
   },
   "devDependencies": {