@monkeyplus/flow 5.0.0-rc.9 → 5.0.0-rc.90

package/dist/pages/runtime/helpers/index.mjs

@@ -1,6 +1,9 @@
 import { joinURL, withTrailingSlash } from "ufo";
-const buildPages = (page) => (location, language) => {
-  const locales = Object.entries(page.locales);
+const buildPages = (page) => (location, language, _locales) => {
+  const locales = _locales.map((key) => {
+    const _page = page.locales[key];
+    return [key, _page];
+  }).filter((el) => !!el[1]);
   return locales.map(([locale, localePage]) => {
     const [_language, _location] = locale.split("-");
     const name = joinURL("/", _location, _language, page.name);

package/dist/pages/runtime/index.d.ts

@@ -1,3 +1,10 @@
-import type { DynamicPage, SimplePage } from '@monkeyplus/flow-schema';
-export declare function definePage(page: SimplePage): SimplePage;
-export declare function defineDinamycPage(page: DynamicPage): DynamicPage;
+import type { DynamicPage, PageCtx, SimplePage } from '@monkeyplus/flow-schema';
+export declare function definePage<T>(...pages: SimplePage<T>[]): SimplePage<T>[];
+export declare function defineDynamicPage<T>(...pages: DynamicPage<T>[]): DynamicPage<T>[];
+export interface SharedContext {
+    assign?: 'global' | 'local';
+    merge?: boolean;
+    setup: (cxt: PageCtx) => any;
+    locales?: Record<string, (ctx: PageCtx) => any>;
+}
+export declare function defineSharedContext(shared: SharedContext): SharedContext;

package/dist/pages/runtime/index.mjs

@@ -1,6 +1,13 @@
-export function definePage(page) {
-  return page;
+export function definePage(...pages) {
+  return pages;
 }
-export function defineDinamycPage(page) {
-  return page;
+export function defineDynamicPage(...pages) {
+  return pages.map((page) => {
+    if (!page.name.endsWith("/**"))
+      page.name = `${page.name}/**`;
+    return page;
+  });
+}
+export function defineSharedContext(shared) {
+  return shared;
 }

package/dist/pages/runtime/pages.mjs

@@ -0,0 +1,100 @@
+import { joinURL } from "ufo";
+import consola from "consola";
+import { definePage } from "./helpers/index.mjs";
+import { defineFlowPlugin, useRuntimeConfig } from "#app";
+import pages from "#build/pages";
+import contexts from "#build/pages.contexts";
+export default defineFlowPlugin(async (flow) => {
+  const { app } = useRuntimeConfig();
+  const allPages = [];
+  const basePages = Object.entries(pages);
+  consola.success("Parsed %i pages files", basePages.length);
+  basePages.forEach(([name, _pages]) => {
+    const __pages = Array.isArray(_pages) ? _pages : [_pages];
+    __pages.forEach((page) => {
+      const { getPages } = definePage({
+        name,
+        ...page
+      });
+      const _pages2 = getPages(
+        app.locale.location,
+        app.locale.language,
+        app.locale.locales
+      );
+      _pages2.forEach((page2) => {
+        flow.router.byUrl.insert(page2.url, page2.context);
+        flow.router.byName.insert(page2.name, page2.context);
+        allPages.push(page2.context);
+      });
+    });
+  });
+  const cache = {};
+  async function getUrl(namePage, localeCode) {
+    const code = localeCode || this?.getLocale()?.code;
+    const [lang, loc] = code.split("-");
+    const name = joinURL("/", loc, lang, namePage);
+    const { path, params, page } = flow.router.byName.lookup(name) || {};
+    if (params?._ && page.dynamic) {
+      if (!cache[path]) {
+        cache[path] = this.defineCachedFunction(async (_ctx) => {
+          return await page.dynamic.method(_ctx);
+        }, { maxAge: 8, getKey: () => path, swr: false });
+      }
+      const fn = cache[path];
+      const list = await fn({ utils: this, locale: this.getLocale() });
+      const dPage = list.find((el) => el.name === params._);
+      return dPage ? path.replace("**", dPage.url) : "/404";
+    }
+    return path || "/404";
+  }
+  async function getUrls(withLocale = false) {
+    const urls = [];
+    for (const page of allPages) {
+      if (page.path.includes("/**") && page.page.dynamic) {
+        const dPages = await page.page.dynamic.method({
+          locale: page.locale,
+          utils: Object.assign({ getLocale: () => page.locale }, flow.app.utils),
+          chunks: {},
+          page: {}
+        });
+        dPages.forEach((dPage) => {
+          const _path = joinURL(page.path.replace("/**", ""), dPage.url);
+          urls.push(withLocale ? { url: _path, locale: page.locale.code, name: joinURL(page.name, dPage.name) } : _path);
+        });
+      } else {
+        const url = page.path.replaceAll("*", "");
+        urls.push(withLocale ? { url, locale: page.locale.code, name: page.name } : url);
+      }
+    }
+    return urls.sort();
+  }
+  async function getSharedContext(ctx) {
+    const entries = Object.entries(contexts);
+    if (!entries.length)
+      return {};
+    const _contexts = await Promise.all(entries.map(async ([key, method]) => {
+      const data = await method.setup(ctx);
+      const setupLocal = method?.locales?.[ctx.locale.code];
+      let dataLocal = {};
+      if (setupLocal)
+        dataLocal = await setupLocal(ctx);
+      const obj = method.merge ? { ...data, ...dataLocal } : { [key]: { ...data, ...dataLocal } };
+      return obj;
+    }));
+    return _contexts.reduce((acc, curr) => {
+      return {
+        ...acc,
+        ...curr
+      };
+    }, {});
+  }
+  flow.setUtil("getUrl", getUrl);
+  flow.setUtil("getUrls", getUrls);
+  flow.setUtil("getPages", () => allPages);
+  flow.setUtil("getSharedContext", getSharedContext);
+  return {
+    provide: {
+      pages: { allPages }
+    }
+  };
+});

package/dist/vite-client/runtime/injectManifest.mjs

@@ -1,11 +1,12 @@
 import { joinURL } from "ufo";
 export const generateBundle = (config, bundle, _id) => {
-  const analyzedChunk = new Map();
-  const getImportedChunks = (chunk2, seen = new Set()) => {
+  const analyzedChunk = /* @__PURE__ */ new Map();
+  const getImportedChunks = (chunk2, seen = /* @__PURE__ */ new Set()) => {
     const chunks = [];
     chunk2.imports?.forEach((file) => {
       const importee = bundle[file];
-      if (file.startsWith("_") && !seen.has(file)) {
+      const isChunk = file.startsWith("_") || importee.isEntry;
+      if (isChunk && !seen.has(file)) {
         seen.add(file);
         chunks.push(...getImportedChunks(importee, seen));
         chunks.push(importee);
@@ -30,13 +31,13 @@ export const generateBundle = (config, bundle, _id) => {
       href: toPublicPath(chunk2.file, publicBase2)
     }
   });
-  const getCssTagsForChunk = (chunk2, publicBase2, seen = new Set()) => {
+  const getCssTagsForChunk = (chunk2, publicBase2, seen = /* @__PURE__ */ new Set()) => {
     const tags = [];
     if (!analyzedChunk.has(chunk2)) {
       analyzedChunk.set(chunk2, 1);
       chunk2.imports?.forEach((file) => {
         const importee = bundle[file];
-        if (file.startsWith("_"))
+        if (file.startsWith("_") || importee.isEntry)
           tags.push(...getCssTagsForChunk(importee, publicBase2, seen));
       });
     }
@@ -56,7 +57,9 @@ export const generateBundle = (config, bundle, _id) => {
   };
   const publicBase = config.baseURL || "/";
   const isAsync = false;
-  const chunk = Object.values(bundle).find((chunk2) => chunk2.isEntry && chunk2.src === _id);
+  const chunk = Object.values(bundle).find(
+    (chunk2) => chunk2.isEntry && chunk2.src === _id
+  );
   if (chunk) {
     const imports = getImportedChunks(chunk);
     const assetTags = [
@@ -71,14 +74,17 @@ export const generateBundle = (config, bundle, _id) => {
 export const externalRE = /^(https?:)?\/\//;
 export const isExternalUrl = (url) => externalRE.test(url);
 function toPublicPath(filename, publicBase) {
-  return isExternalUrl(filename) ? filename : joinURL(publicBase, filename.replace("scripts", "assets"));
+  return isExternalUrl(filename) ? filename : joinURL(publicBase, filename);
 }
-const unaryTags = new Set(["link", "meta", "base"]);
+const unaryTags = /* @__PURE__ */ new Set(["link", "meta", "base"]);
 function serializeTag({ tag, attrs, children }, indent = "") {
   if (unaryTags.has(tag)) {
     return `<${tag}${serializeAttrs(attrs)}>`;
   } else {
-    return `<${tag}${serializeAttrs(attrs)}>${serializeTags(children, incrementIndent(indent))}</${tag}>`;
+    return `<${tag}${serializeAttrs(attrs)}>${serializeTags(
+      children,
+      incrementIndent(indent)
+    )}</${tag}>`;
   }
 }
 function serializeTags(tags, indent = "") {

package/dist/vite-client/runtime/plugin.mjs

@@ -1,13 +1,14 @@
 import logger from "consola";
+import { joinURL } from "ufo";
 import { generateBundle } from "./injectManifest.mjs";
 import { defineFlowPlugin } from "#app";
 import manifest from "#viteManifest";
 export default defineFlowPlugin((flow) => {
   if (typeof manifest === "function") {
-    const _manifest = manifest();
     flow.hook("page:chunks", (bundle, chunks) => {
       try {
-        const chunk = generateBundle(flow.$config.app || {}, _manifest, `client/pages/${bundle}.ts`);
+        const data = manifest();
+        const chunk = generateBundle(flow.$config.app || {}, data.manifest, joinURL("/", data.base, `${bundle}.ts`).replace("/", ""));
         if (chunk) {
           chunks.head.push(chunk.head);
           chunks.body.push(chunk.body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "5.0.0-rc.9",
+  "version": "5.0.0-rc.90",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -25,52 +25,57 @@
     "dist"
   ],
   "dependencies": {
-    "@monkeyplus/flow-cli": "5.0.0-rc.9",
-    "@monkeyplus/flow-kit": "5.0.0-rc.9",
-    "@monkeyplus/flow-schema": "5.0.0-rc.9",
+    "@monkeyplus/flow-cli": "5.0.0-rc.90",
+    "@monkeyplus/flow-kit": "5.0.0-rc.90",
+    "@monkeyplus/flow-schema": "5.0.0-rc.90",
     "@rollup/plugin-replace": "^4.0.0",
     "@vueuse/head": "^0.7.6",
-    "c12": "^0.2.7",
+    "c12": "^0.2.8",
     "chokidar": "^3.5.3",
     "consola": "^2.15.3",
     "defu": "^6.0.0",
-    "esbuild": "^0.14.38",
+    "esbuild": "^0.14.49",
     "escape-string-regexp": "^5.0.0",
-    "esno": "^0.14.1",
+    "esno": "^0.16.3",
     "eta": "^1.12.3",
-    "externality": "^0.2.1",
+    "externality": "^0.2.2",
     "fs-extra": "^10.1.0",
     "get-port-please": "^2.5.0",
-    "globby": "^13.1.1",
-    "h3": "^0.7.4",
+    "globby": "^13.1.2",
+    "h3": "^0.7.16",
     "hookable": "^5.1.1",
-    "jiti": "^1.13.0",
-    "knitwork": "^0.1.1",
-    "listhen": "^0.2.10",
+    "jiti": "^1.14.0",
+    "ohash": "^0.1.5",
+    "knitwork": "^0.1.2",
+    "listhen": "^0.2.13",
     "magic-string": "^0.26.2",
-    "mlly": "^0.5.2",
+    "mlly": "^0.5.4",
     "mri": "^1.2.0",
-    "nitropack": "^0.4.4",
-    "pathe": "^0.2.0",
+    "nitropack": "^0.4.12",
+    "pathe": "^0.3.2",
     "perfect-debounce": "^0.1.3",
     "radix3": "^0.1.2",
     "unenv": "^0.5.2",
     "ohmyfetch": "^0.4.18",
-    "node-fetch-native": "^0.1.3",
-    "rollup": "^2.72.1",
-    "rollup-plugin-visualizer": "^5.6.0",
+    "node-fetch-native": "^0.1.4",
+    "rollup": "^2.77.0",
+    "rollup-plugin-visualizer": "^5.7.1",
     "scule": "^0.2.1",
-    "ufo": "^0.8.3",
-    "unctx": "^1.1.4",
-    "unimport": "^0.2.1",
-    "unplugin": "^0.6.3",
-    "untyped": "^0.4.4",
-    "vite": "^2.9.9",
-    "vue": "^3.2.33"
+    "ufo": "^0.8.5",
+    "unctx": "^2.0.1",
+    "unimport": "^0.4.5",
+    "unplugin": "^0.9.4",
+    "untyped": "^0.4.5",
+    "pkg-types": "^0.3.3",
+    "vite": "2.9.15",
+    "vite-node": "^0.22.1",
+    "vite-plugin-checker": "^0.4.9",
+    "vue-bundle-renderer": "^0.4.2",
+    "vue": "^3.2.37"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "vue-router": "^4.0.15"
+    "vue-router": "^4.1.2"
   },
   "engines": {
     "node": "^16.11.0 || ^17.0.0 || ^18.0.0"

package/dist/pages/runtime/plugin.mjs

@@ -1,56 +0,0 @@
-import { joinURL } from "ufo";
-import consola from "consola";
-import { definePage } from "./helpers/index.mjs";
-import { defineFlowPlugin, useRuntimeConfig } from "#app";
-import pages from "#pages";
-export default defineFlowPlugin(async (flow) => {
-  const { app } = useRuntimeConfig();
-  const allPages = [];
-  const basePages = Object.entries(pages);
-  consola.success("Parsed %i pages", basePages.length);
-  basePages.forEach(([name, page]) => {
-    const { getPages } = definePage({
-      name,
-      ...page
-    });
-    const _pages = getPages(app.locale.location, app.locale.language);
-    _pages.forEach((page2) => {
-      flow.router.byUrl.insert(page2.url, page2.context);
-      flow.router.byName.insert(page2.name, page2.context);
-      allPages.push(page2.context);
-    });
-  });
-  function getUrl(namePage, localeCode) {
-    const code = localeCode || this?.getLocale()?.code;
-    const [lang, loc] = code.split("-");
-    const name = joinURL("/", loc, lang, namePage);
-    const { path } = flow.router.byName.lookup(name) || {};
-    return path || "/404";
-  }
-  async function getUrls(withLocale = false) {
-    const urls = [];
-    for (const page of allPages) {
-      if (!page.path.includes("/**")) {
-        urls.push(withLocale ? { url: page.path, locale: page.locale.code, name: page.name } : page.path);
-      } else {
-        const dPages = await page.page.dynamic.method({
-          locale: page.locale,
-          utils: Object.assign({ getLocale: () => page.locale }, flow.app.utils)
-        });
-        dPages.forEach((dPage) => {
-          const _path = joinURL(page.path.replace("/**", ""), dPage.url);
-          urls.push(withLocale ? { url: _path, locale: page.locale.code, name: joinURL(page.name, dPage.name) } : _path);
-        });
-      }
-    }
-    return urls.sort();
-  }
-  flow.setUtil("getUrl", getUrl);
-  flow.setUtil("getUrls", getUrls);
-  flow.setUtil("getPages", () => allPages);
-  return {
-    provide: {
-      pages: { allPages }
-    }
-  };
-});