@primate/core 0.8.0 → 0.8.2

package/lib/private/build/client/plugin/routes.js

@@ -7,7 +7,7 @@ export default function plugin_client_routes(app) {
             build.onResolve({ filter: /.*/ }, async (args) => {
                 if (args.pluginData === "primate-client-route-inner")
                     return null;
-                if (intercept(args, app.path.views))
+                if (intercept(args, app.root))
                     return null;
                 const result = await build.resolve(args.path, {
                     resolveDir: args.resolveDir,

package/lib/private/build/shared/intercept.d.ts

@@ -1,4 +1,4 @@
 import type { FileRef } from "@rcompat/fs";
 import type { OnResolveArgs } from "esbuild";
-export default function intercept(args: OnResolveArgs, views: FileRef): boolean;
+export default function intercept(args: OnResolveArgs, root: FileRef): boolean;
 //# sourceMappingURL=intercept.d.ts.map

package/lib/private/build/shared/intercept.js

@@ -17,8 +17,10 @@ function is_npm_package(path, resolve_dir) {
         return false;
     }
 }
-export default function intercept(args, views) {
-    if (!args.resolveDir.startsWith(views.path))
+export default function intercept(args, root) {
+    if (!args.resolveDir.startsWith(root.path))
+        return true;
+    if (args.resolveDir.includes("node_modules"))
         return true;
     if (is_bare(args.path))
         return true;

package/lib/private/client/create-form.d.ts

@@ -22,6 +22,7 @@ export type MethodMeta = {
 export type ClientMethod<Values extends Dict = Dict, Path extends Dict = Dict, Result = unknown> = MethodMeta & ((args: {
     body: Values;
     path: Path;
+    headers?: HeadersInit;
 }) => Promise<Response>);
 export type FormInit = {
     id?: string;
@@ -31,6 +32,7 @@ export type FormInit = {
     action?: (args: {
         body: unknown;
         path?: Dict<string>;
+        headers?: HeadersInit;
     }) => Promise<Response>;
     contentType?: string;
     path?: Dict<string>;

package/lib/private/client/create-form.js

@@ -1,5 +1,9 @@
 import extract_issues from "#client/extract-issues";
+import root from "#client/root";
+import storage from "#client/storage";
 import submit from "#client/submit";
+import transport from "#client/transport";
+import http from "@rcompat/http";
 import is from "@rcompat/is";
 function decode_pointer_segment(segment) {
     // decode JSON Pointer: ~1 -> /, ~0 -> ~
@@ -37,6 +41,25 @@ function form_data_body(form_data) {
     }
     return new URLSearchParams(form_data);
 }
+async function redirect(response) {
+    if (!response.redirected)
+        return false;
+    if (!transport.is_json(response)) {
+        globalThis.location.assign(response.url);
+        return true;
+    }
+    const { location, document, history } = globalThis;
+    const scrollTop = document.scrollingElement?.scrollTop ?? 0;
+    root.update(await response.json());
+    storage.new({
+        hash: location.hash,
+        pathname: location.pathname,
+        scrollTop,
+    });
+    const url = new URL(response.url);
+    history.pushState({}, "", url.pathname + url.search);
+    return true;
+}
 function createForm(init) {
     const id = init.id ?? `form-${crypto.randomUUID()}`;
     let snapshot = {
@@ -104,8 +127,14 @@ function createForm(init) {
                 ? init.action({
                     body: content_type_body(init.contentType, form_data),
                     path: init.path,
+                    headers: {
+                        Accept: http.MIME.APPLICATION_JSON,
+                        ...(init.headers ?? {}),
+                    },
                 })
                 : submit(url, form_data_body(form_data), method));
+            if (await redirect(response))
+                return;
             if (response.ok) {
                 // on success: clear errors, let the app decide what to do next
                 // (redirect/reload)

package/lib/private/errors.js

@@ -151,7 +151,7 @@ function session_id_string() {
     return t `session store session_id must be a string type`;
 }
 function session_id_data() {
-    return t `"both ${"id"} and ${"data"} must be defined or undefined`;
+    return t `both ${"id"} and ${"data"} must be defined or undefined`;
 }
 function session_handle_unavailable() {
     return t `session handle not available in this context`;

package/lib/private/route.client.d.ts

@@ -16,21 +16,24 @@ type Path<O extends RouteOptions> = O extends {
 type MethodMeta = {
     contentType?: string;
 };
+type RequestMeta = {
+    headers?: HeadersInit;
+};
 type ClientMethod<O extends RouteOptions, R = unknown> = MethodMeta & {
     _result?: R;
-} & (Body<O> extends never ? Path<O> extends never ? () => Promise<Response> : (args: {
+} & (Body<O> extends never ? Path<O> extends never ? (args?: RequestMeta) => Promise<Response> : (args: {
     path: Path<O>;
-}) => Promise<Response> : Path<O> extends never ? (args: {
+} & RequestMeta) => Promise<Response> : Path<O> extends never ? (args: {
     body: Body<O>;
-}) => Promise<Response> : (args: {
+} & RequestMeta) => Promise<Response> : (args: {
     body: Body<O>;
     path: Path<O>;
-}) => Promise<Response>);
+} & RequestMeta) => Promise<Response>);
 type ClientRoute<R> = {
     [K in keyof R]: R[K] extends {
         options: infer O extends RouteOptions;
         result?: infer Result;
-    } ? ClientMethod<O, Result> : () => Promise<Response>;
+    } ? ClientMethod<O, Result> : (args?: RequestMeta) => Promise<Response>;
 };
 type WithResult<O extends RouteOptions, R = unknown> = {
     handler: RouteHandler<O>;

package/lib/private/route.client.js

@@ -38,7 +38,10 @@ function route(handlers) {
                         : path;
                     return fetch(resolved, {
                         method: method.toUpperCase(),
-                        headers: headers(contentType),
+                        headers: {
+                            ...headers(contentType),
+                            ...(args.headers ?? {}),
+                        },
                         body: serialize_body(contentType, args.body),
                     });
                 };

package/lib/private/session/module.js

@@ -53,7 +53,7 @@ export default function session_module(config) {
                     db_id = _id;
                 }
                 const session_type = p.omit(store.schema, "id", "session_id");
-                const session = new SessionHandle(sid, data, session_type);
+                const session = new SessionHandle(exists ? sid : undefined, data, session_type);
                 const response = await new Promise((resolve, reject) => {
                     storage().run(session, async () => {
                         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",