dtwo 3.0.0 → 3.1.0

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

@@ -1,4 +1,4 @@
-import { KeepAliveProps, TransitionProps, UnwrapRef } from 'kdu';
+import type { KeepAliveProps, TransitionProps, UnwrapRef } from 'kdu';
 import type { RouteLocationNormalized, RouteLocationNormalizedLoaded, RouteRecordRedirectOption } from 'kdu-router';
 import type { DtwoError } from '#app';
 export interface PageMeta {

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

@@ -1,12 +1,16 @@
-import type { DefineComponent } from 'kdu';
+import type { DefineComponent, KeepAliveProps, TransitionProps } from 'kdu';
 declare const _default: DefineComponent<{
     [key: string]: any;
     name?: string | undefined;
+    transition?: boolean | TransitionProps | undefined;
+    keepalive?: boolean | KeepAliveProps | undefined;
     route?: any;
     pageKey?: string | ((route: RouteLocationNormalizedLoaded) => string) | undefined;
 }, {}, {}, import("kdu").ComputedOptions, import("kdu").MethodOptions, import("kdu").ComponentOptionsMixin, import("kdu").ComponentOptionsMixin, {}, string, import("kdu").KNodeProps & import("kdu").AllowedComponentProps & import("kdu").ComponentCustomProps, Readonly<import("kdu").ExtractPropTypes<{
     [key: string]: any;
     name?: string | undefined;
+    transition?: boolean | TransitionProps | undefined;
+    keepalive?: boolean | KeepAliveProps | undefined;
     route?: any;
     pageKey?: string | ((route: RouteLocationNormalizedLoaded) => string) | undefined;
 }>>, {

package/dist/pages/runtime/page.mjs

@@ -36,7 +36,7 @@ export default defineComponent({
           if (!routeProps.Component) {
             return;
           }
-          const key = generateRouteKey(props.pageKey, routeProps);
+          const key = generateRouteKey(routeProps, props.pageKey);
           const done = dtwoApp.deferHydration();
           const hasTransition = !!(props.transition ?? routeProps.route.meta.pageTransition ?? defaultPageTransition);
           const transitionProps = hasTransition && _mergeTransitionProps([
@@ -57,7 +57,7 @@ export default defineComponent({
                 onResolve: () => {
                   nextTick(() => dtwoApp.callHook("page:finish", routeProps.Component).finally(done));
                 }
-              }, { default: () => h(Component, { key, routeProps, pageKey: key, hasTransition }) })
+              }, { default: () => h(RouteProvider, { key, routeProps, pageKey: key, hasTransition }) })
             )
           ).default();
         }
@@ -75,7 +75,10 @@ function _mergeTransitionProps(routeProps) {
   }));
   return defu(..._props);
 }
-const Component = defineComponent({
+const RouteProvider = defineComponent({
+  name: "RouteProvider",
+  // TODO: Type props
+  // eslint-disable-next-line kdu/require-prop-types
   props: ["routeProps", "pageKey", "hasTransition"],
   setup(props) {
     const previousKey = props.pageKey;

package/dist/pages/runtime/plugins/prefetch.client.mjs

@@ -0,0 +1,36 @@
+import { hasProtocol } from "ufo";
+import { defineDtwoPlugin, useDtwoApp, useRouter } from "#app";
+import layouts from "#build/layouts";
+import { namedMiddleware } from "#build/middleware";
+export default defineDtwoPlugin(() => {
+  const dtwoApp = useDtwoApp();
+  const router = useRouter();
+  dtwoApp.hooks.hook("app:mounted", () => {
+    router.beforeEach(async (to) => {
+      const layout = to?.meta?.layout;
+      if (layout && typeof layouts[layout] === "function") {
+        await layouts[layout]();
+      }
+    });
+  });
+  dtwoApp.hooks.hook("link:prefetch", (url) => {
+    if (hasProtocol(url)) {
+      return;
+    }
+    const route = router.resolve(url);
+    if (!route) {
+      return;
+    }
+    const layout = route?.meta?.layout;
+    let middleware = Array.isArray(route?.meta?.middleware) ? route?.meta?.middleware : [route?.meta?.middleware];
+    middleware = middleware.filter((m) => typeof m === "string");
+    for (const name of middleware) {
+      if (typeof namedMiddleware[name] === "function") {
+        namedMiddleware[name]();
+      }
+    }
+    if (layout && typeof layouts[layout] === "function") {
+      layouts[layout]();
+    }
+  });
+});

package/dist/pages/runtime/{router.d.ts → plugins/router.d.ts}

@@ -1,4 +1,4 @@
-import DtwoPage from './page';
+import type DtwoPage from '../page';
 declare module '@kdujs/runtime-core' {
     interface GlobalComponents {
         DtwoPage: typeof DtwoPage;

package/dist/pages/runtime/{router.mjs → plugins/router.mjs}

@@ -1,4 +1,4 @@
-import { computed, reactive, shallowRef } from "kdu";
+import { computed, isReadonly, reactive, shallowRef } from "kdu";
 import {
   createRouter,
   createWebHistory,
@@ -7,7 +7,7 @@ import {
 } from "kdu-router";
 import { createError } from "h3";
 import { withoutBase, isEqual } from "ufo";
-import { callWithDtwo, defineDtwoPlugin, useRuntimeConfig, showError, clearError, navigateTo, useError, useState } from "#app";
+import { callWithDtwo, defineDtwoPlugin, useRuntimeConfig, showError, clearError, navigateTo, useError, useState, useRequestEvent } from "#app";
 import _routes from "#build/routes";
 import routerOptions from "#build/router.options";
 import { globalMiddleware, namedMiddleware } from "#build/middleware";
@@ -72,13 +72,13 @@ export default defineDtwoPlugin(async (dtwoApp) => {
     }
     await router.isReady();
   } catch (error2) {
-    callWithDtwo(dtwoApp, showError, [error2]);
+    await callWithDtwo(dtwoApp, showError, [error2]);
   }
   const initialLayout = useState("_layout");
   router.beforeEach(async (to, from) => {
     to.meta = reactive(to.meta);
-    if (dtwoApp.isHydrating) {
-      to.meta.layout = initialLayout.value ?? to.meta.layout;
+    if (dtwoApp.isHydrating && initialLayout.value && !isReadonly(to.meta.layout)) {
+      to.meta.layout = initialLayout.value;
     }
     dtwoApp._processingMiddleware = true;
     const middlewareEntries = /* @__PURE__ */ new Set([...globalMiddleware, ...dtwoApp._middleware.global]);
@@ -125,7 +125,7 @@ export default defineDtwoPlugin(async (dtwoApp) => {
       await callWithDtwo(dtwoApp, clearError);
     }
     if (to.matched.length === 0) {
-      callWithDtwo(dtwoApp, showError, [createError({
+      await callWithDtwo(dtwoApp, showError, [createError({
         statusCode: 404,
         fatal: false,
         statusMessage: `Page not found: ${to.fullPath}`
@@ -133,7 +133,9 @@ export default defineDtwoPlugin(async (dtwoApp) => {
     } else if (process.server) {
       const currentURL = to.fullPath || "/";
       if (!isEqual(currentURL, initialURL)) {
-        await callWithDtwo(dtwoApp, navigateTo, [currentURL]);
+        const event = await callWithDtwo(dtwoApp, useRequestEvent);
+        const options = { redirectCode: event.node.res.statusCode !== 200 ? event.node.res.statusCode || 302 : 302 };
+        await callWithDtwo(dtwoApp, navigateTo, [currentURL, options]);
       }
     }
   });
@@ -142,10 +144,11 @@ export default defineDtwoPlugin(async (dtwoApp) => {
       await router.replace({
         ...router.resolve(initialURL),
         name: void 0,
+        // #4920, #$4982
         force: true
       });
     } catch (error2) {
-      callWithDtwo(dtwoApp, showError, [error2]);
+      await callWithDtwo(dtwoApp, showError, [error2]);
     }
   });
   return { provide: { router } };

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

@@ -2,7 +2,7 @@ import type { RouterView, RouteLocationNormalizedLoaded } from 'kdu-router';
 type InstanceOf<T> = T extends new (...args: any[]) => infer R ? R : never;
 type RouterViewSlot = Exclude<InstanceOf<typeof RouterView>['$slots']['default'], undefined>;
 export type RouterViewSlotProps = Parameters<RouterViewSlot>[0];
-export declare const generateRouteKey: (override: string | ((route: RouteLocationNormalizedLoaded) => string), routeProps: RouterViewSlotProps) => string;
+export declare const generateRouteKey: (routeProps: RouterViewSlotProps, override?: string | ((route: RouteLocationNormalizedLoaded) => string) | undefined) => any;
 export declare const wrapInKeepAlive: (props: any, children: any) => {
     default: () => any;
 };

package/dist/pages/runtime/utils.mjs

@@ -2,7 +2,7 @@ import { KeepAlive, h } from "kdu";
 const interpolatePath = (route, match) => {
   return match.path.replace(/(:\w+)\([^)]+\)/g, "$1").replace(/(:\w+)[?+*]/g, "$1").replace(/:\w+/g, (r) => route.params[r.slice(1)]?.toString() || "");
 };
-export const generateRouteKey = (override, routeProps) => {
+export const generateRouteKey = (routeProps, override) => {
   const matchedRoute = routeProps.route.matched.find((m) => m.components?.default === routeProps.Component.type);
   const source = override ?? matchedRoute?.meta.key ?? (matchedRoute && interpolatePath(routeProps.route, matchedRoute));
   return typeof source === "function" ? source(routeProps.route) : source;

package/dist/pages/runtime/validate.mjs

@@ -1,11 +1,11 @@
-import { createError, defineDtwoRouteMiddleware } from "#app";
+import { defineDtwoRouteMiddleware } from "#app";
 export default defineDtwoRouteMiddleware(async (to) => {
   if (!to.meta?.validate) {
     return;
   }
   const result = await Promise.resolve(to.meta.validate(to));
-  if (typeof result === "boolean") {
-    return result;
+  if (result === true) {
+    return;
   }
-  return createError(result);
+  return result;
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "dtwo",
-  "version": "3.0.0",
-  "repository": "d2js/framework",
+  "version": "3.1.0",
+  "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.mjs",
   "types": "./types.d.ts",
   "bin": {
-    "dcli": "./bin/dtwo.mjs",
+    "dtwc": "./bin/dtwo.mjs",
     "dtwo": "./bin/dtwo.mjs"
   },
   "exports": {
@@ -33,56 +33,56 @@
     "config.*"
   ],
   "dependencies": {
-    "@d2js/devalue": "^2.0.2",
-    "@dtwo/cli": "3.0.0",
-    "@dtwo/kit": "3.0.0",
-    "@dtwo/schema": "3.0.0",
-    "@dtwo/telemetry": "^2.1.8",
-    "@dtwo/ui-templates": "^1.0.0",
-    "@dtwo/unplugin": "^1.0.0",
-    "@dtwo/wite-builder": "3.0.0",
-    "@kdhead/ssr": "^1.0.0",
-    "@kdujs/reactivity": "^3.2.45",
-    "@kdujs/shared": "^3.2.45",
-    "@kduse/head": "^1.0.15",
-    "chokidar": "^3.5.3",
-    "cookie-es": "^0.5.0",
-    "defu": "^6.1.1",
-    "destr": "^1.2.1",
-    "escape-string-regexp": "^5.0.0",
-    "estree-walker": "^3.0.1",
-    "fs-extra": "^10.1.0",
-    "globby": "^13.1.2",
-    "h3": "^1.0.1",
-    "hash-sum": "^2.0.0",
-    "holepack": "^1.0.0",
-    "hookable": "^5.4.2",
-    "kdhead": "^1.0.0",
-    "kdimport": "^1.0.0",
-    "kdu": "^3.2.45",
-    "kdu-bundle-renderer": "^1.0.0",
-    "kdu-devtools-stub": "^0.1.0",
-    "kdu-router": "^4.1.6",
-    "knitwork": "^1.0.0",
-    "magic-string": "^0.26.7",
-    "mlly": "^1.0.0",
-    "ohash": "^1.0.0",
-    "ofetch": "^1.0.0",
-    "pathe": "^1.0.0",
-    "perfect-debounce": "^0.1.3",
-    "scule": "^1.0.0",
-    "strip-literal": "^1.0.0",
-    "ufo": "^1.0.0",
-    "ultrahtml": "^1.0.0",
-    "unctx": "^2.1.0",
-    "unenv": "^1.0.0",
-    "untyped": "^1.0.0"
+    "@d2js/devalue": "2.0.2",
+    "@dtwo/kit": "3.1.0",
+    "@dtwo/schema": "3.1.0",
+    "@dtwo/telemetry": "2.1.8",
+    "@dtwo/ui-templates": "1.1.0",
+    "@dtwo/unplugin": "1.0.0",
+    "@dtwo/wite-builder": "3.1.0",
+    "@kdhead/ssr": "1.0.19",
+    "@kdujs/reactivity": "3.2.45",
+    "@kdujs/shared": "3.2.45",
+    "@kduse/head": "1.0.15",
+    "chokidar": "3.5.3",
+    "cookie-es": "0.5.0",
+    "defu": "6.1.1",
+    "destr": "1.2.2",
+    "dtwc": "3.1.0",
+    "escape-string-regexp": "5.0.0",
+    "estree-walker": "3.0.3",
+    "fs-extra": "11.1.0",
+    "globby": "13.1.3",
+    "h3": "1.0.2",
+    "hash-sum": "2.0.0",
+    "holepack": "2.0.0",
+    "hookable": "5.4.2",
+    "jiti": "1.16.2",
+    "kdhead": "1.0.19",
+    "kdimport": "2.0.1",
+    "kdu": "3.2.45",
+    "kdu-bundle-renderer": "1.0.0",
+    "kdu-devtools-stub": "0.1.0",
+    "kdu-router": "4.1.6",
+    "knitwork": "1.0.0",
+    "magic-string": "0.27.0",
+    "mlly": "1.1.0",
+    "ofetch": "1.0.0",
+    "ohash": "1.0.0",
+    "pathe": "1.0.0",
+    "perfect-debounce": "0.1.3",
+    "scule": "1.0.0",
+    "strip-literal": "1.0.0",
+    "ufo": "1.0.1",
+    "ultrahtml": "1.2.0",
+    "unctx": "2.1.1",
+    "unenv": "1.0.1",
+    "untyped": "1.2.2"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "@types/hash-sum": "^1.0.0",
-    "kdu-meta": "next",
-    "unbuild": "latest"
+    "@types/fs-extra": "11.0.1",
+    "@types/hash-sum": "1.0.0",
+    "unbuild": "1.1.1"
   },
   "engines": {
     "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"

package/types.d.ts

@@ -1,8 +1,11 @@
 /// <reference types="holepack" />
 export * from './dist/index'
 
+import type { Schema, SchemaDefinition } from '@dtwo/schema'
+
 declare global {
   const defineDtwoConfig: typeof import('dtwo/config')['defineDtwoConfig']
+  const defineDtwoSchema: (schema: SchemaDefinition) => SchemaDefinition
 }
 
 declare module 'holepack' {

package/dist/head/runtime/lib/kdu-meta.plugin.mjs

@@ -1,31 +0,0 @@
-import { createApp } from "kdu";
-import { createMetaManager } from "kdu-meta";
-import { defineDtwoPlugin } from "#app";
-import { appHead } from "#build/dtwo.config.mjs";
-export default defineDtwoPlugin((dtwoApp) => {
-  const manager = createMetaManager(process.server);
-  manager.addMeta(appHead);
-  dtwoApp.kduApp.use(manager);
-  dtwoApp._useHead = (meta) => manager.addMeta(meta);
-  if (process.client) {
-    const teleportTarget = document.createElement("div");
-    teleportTarget.id = "head-target";
-    document.body.appendChild(teleportTarget);
-    createApp({ render: () => manager.render({}) }).mount("#head-target");
-  }
-  if (process.server) {
-    dtwoApp.ssrContext.renderMeta = async () => {
-      const { renderMetaToString } = await import("kdu-meta/ssr");
-      dtwoApp.ssrContext.teleports = dtwoApp.ssrContext.teleports || {};
-      await renderMetaToString(dtwoApp.app, dtwoApp.ssrContext);
-      return {
-        htmlAttrs: dtwoApp.ssrContext.teleports.htmlAttrs || "",
-        headAttrs: dtwoApp.ssrContext.teleports.headAttrs || "",
-        bodyAttrs: dtwoApp.ssrContext.teleports.bodyAttrs || "",
-        headTags: dtwoApp.ssrContext.teleports.head || "",
-        bodyScriptsPrepend: dtwoApp.ssrContext.teleports["body-prepend"] || "",
-        bodyScripts: dtwoApp.ssrContext.teleports.body || ""
-      };
-    };
-  }
-});