dn-react-router-toolkit 0.9.12 → 0.10.0

package/dist/api/default_api_handler.d.mts

@@ -1,3 +1,4 @@
+import * as react_router from 'react-router';
 import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 import { AuthService, PasswordRecoveryService, AuthProvider, JWTManager, ThirdpartyAuthPayload } from 'gw-auth/server';
 import { FileService } from 'gw-file/server';
@@ -8,6 +9,6 @@ declare const defaultAPIHandler: <TFile>({ authService, fileService, passwordRec
     passwordRecoveryService: PasswordRecoveryService;
     authProviders: AuthProvider[];
     signupTokenManager: JWTManager<ThirdpartyAuthPayload>;
-}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<(({ request }: LoaderFunctionArgs<any> | ActionFunctionArgs<any>) => Promise<Response>) | Response>;
+}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<(({ request }: LoaderFunctionArgs<Readonly<react_router.RouterContextProvider>> | ActionFunctionArgs<Readonly<react_router.RouterContextProvider>>) => Promise<Response>) | Response>;
 
 export { defaultAPIHandler };

package/dist/api/default_api_handler.d.ts

@@ -1,3 +1,4 @@
+import * as react_router from 'react-router';
 import { LoaderFunctionArgs, ActionFunctionArgs } from 'react-router';
 import { AuthService, PasswordRecoveryService, AuthProvider, JWTManager, ThirdpartyAuthPayload } from 'gw-auth/server';
 import { FileService } from 'gw-file/server';
@@ -8,6 +9,6 @@ declare const defaultAPIHandler: <TFile>({ authService, fileService, passwordRec
     passwordRecoveryService: PasswordRecoveryService;
     authProviders: AuthProvider[];
     signupTokenManager: JWTManager<ThirdpartyAuthPayload>;
-}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<(({ request }: LoaderFunctionArgs<any> | ActionFunctionArgs<any>) => Promise<Response>) | Response>;
+}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<(({ request }: LoaderFunctionArgs<Readonly<react_router.RouterContextProvider>> | ActionFunctionArgs<Readonly<react_router.RouterContextProvider>>) => Promise<Response>) | Response>;
 
 export { defaultAPIHandler };

package/dist/api/index.js

@@ -340,30 +340,9 @@ var FormLabel = createComponent("label", {
 });
 
 // src/crud/crud_form.tsx
-var import_react_store_input3 = require("react-store-input");
-
-// src/client/env_loader.tsx
-var import_react_router3 = require("react-router");
-var import_jsx_runtime3 = require("react/jsx-runtime");
-
-// src/client/file_input.tsx
-var import_react3 = require("react");
-var import_jsx_runtime4 = require("react/jsx-runtime");
-
-// src/client/use_user_agent.tsx
-var import_react_router4 = require("react-router");
-
-// src/client/store_text_editor.tsx
-var import_gw_react_text_editor = require("gw-react-text-editor");
 var import_react_store_input2 = require("react-store-input");
-var import_react4 = require("react");
-var import_jsx_runtime5 = require("react/jsx-runtime");
-
-// src/client/editor.tsx
-var import_client = require("gw-file/client");
-
-// src/crud/crud_form.tsx
-var import_jsx_runtime6 = require("react/jsx-runtime");
+var import_text_editor = require("react-store-input/text-editor");
+var import_jsx_runtime3 = require("react/jsx-runtime");
 
 // src/api/put_resource_handler.ts
 var import_drizzle_orm = require("drizzle-orm");

package/dist/api/index.mjs

@@ -252,10 +252,7 @@ import {
 // src/crud/crud_form_provider.tsx
 import { useNavigate } from "react-router";
 import { useStore } from "react-store-input";
-import {
-  createContext,
-  useContext
-} from "react";
+import { createContext, useContext } from "react";
 
 // src/crud/serialize.ts
 function deserialize(data) {
@@ -331,33 +328,8 @@ var FormLabel = createComponent("label", {
 
 // src/crud/crud_form.tsx
 import { useStoreComponent } from "react-store-input";
-
-// src/client/env_loader.tsx
-import { useRouteLoaderData } from "react-router";
-import { jsx as jsx3 } from "react/jsx-runtime";
-
-// src/client/file_input.tsx
-import {
-  useRef
-} from "react";
-import { Fragment, jsx as jsx4, jsxs } from "react/jsx-runtime";
-
-// src/client/use_user_agent.tsx
-import { useRouteLoaderData as useRouteLoaderData2 } from "react-router";
-
-// src/client/store_text_editor.tsx
-import {
-  TextEditor
-} from "gw-react-text-editor";
-import { useStoreController } from "react-store-input";
-import { useImperativeHandle, useRef as useRef2 } from "react";
-import { jsx as jsx5 } from "react/jsx-runtime";
-
-// src/client/editor.tsx
-import { generateMetadata } from "gw-file/client";
-
-// src/crud/crud_form.tsx
-import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs2 } from "react/jsx-runtime";
+import { TextEditor } from "react-store-input/text-editor";
+import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
 
 // src/api/put_resource_handler.ts
 import {

package/dist/api/patch_resource_handler.js

@@ -113,30 +113,9 @@ var FormLabel = createComponent("label", {
 });
 
 // src/crud/crud_form.tsx
-var import_react_store_input3 = require("react-store-input");
-
-// src/client/env_loader.tsx
-var import_react_router2 = require("react-router");
-var import_jsx_runtime3 = require("react/jsx-runtime");
-
-// src/client/file_input.tsx
-var import_react3 = require("react");
-var import_jsx_runtime4 = require("react/jsx-runtime");
-
-// src/client/use_user_agent.tsx
-var import_react_router3 = require("react-router");
-
-// src/client/store_text_editor.tsx
-var import_gw_react_text_editor = require("gw-react-text-editor");
 var import_react_store_input2 = require("react-store-input");
-var import_react4 = require("react");
-var import_jsx_runtime5 = require("react/jsx-runtime");
-
-// src/client/editor.tsx
-var import_client = require("gw-file/client");
-
-// src/crud/crud_form.tsx
-var import_jsx_runtime6 = require("react/jsx-runtime");
+var import_text_editor = require("react-store-input/text-editor");
+var import_jsx_runtime3 = require("react/jsx-runtime");
 
 // src/api/patch_resource_handler.ts
 var import_drizzle_orm = require("drizzle-orm");

package/dist/api/patch_resource_handler.mjs

@@ -4,10 +4,7 @@ import { httpBadRequest, httpCreated } from "gw-response";
 // src/crud/crud_form_provider.tsx
 import { useNavigate } from "react-router";
 import { useStore } from "react-store-input";
-import {
-  createContext,
-  useContext
-} from "react";
+import { createContext, useContext } from "react";
 
 // src/crud/serialize.ts
 function deserialize(data) {
@@ -83,33 +80,8 @@ var FormLabel = createComponent("label", {
 
 // src/crud/crud_form.tsx
 import { useStoreComponent } from "react-store-input";
-
-// src/client/env_loader.tsx
-import { useRouteLoaderData } from "react-router";
-import { jsx as jsx3 } from "react/jsx-runtime";
-
-// src/client/file_input.tsx
-import {
-  useRef
-} from "react";
-import { Fragment, jsx as jsx4, jsxs } from "react/jsx-runtime";
-
-// src/client/use_user_agent.tsx
-import { useRouteLoaderData as useRouteLoaderData2 } from "react-router";
-
-// src/client/store_text_editor.tsx
-import {
-  TextEditor
-} from "gw-react-text-editor";
-import { useStoreController } from "react-store-input";
-import { useImperativeHandle, useRef as useRef2 } from "react";
-import { jsx as jsx5 } from "react/jsx-runtime";
-
-// src/client/editor.tsx
-import { generateMetadata } from "gw-file/client";
-
-// src/crud/crud_form.tsx
-import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs2 } from "react/jsx-runtime";
+import { TextEditor } from "react-store-input/text-editor";
+import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
 
 // src/api/patch_resource_handler.ts
 import "drizzle-orm";

package/dist/api/put_resource_handler.js

@@ -113,30 +113,9 @@ var FormLabel = createComponent("label", {
 });
 
 // src/crud/crud_form.tsx
-var import_react_store_input3 = require("react-store-input");
-
-// src/client/env_loader.tsx
-var import_react_router2 = require("react-router");
-var import_jsx_runtime3 = require("react/jsx-runtime");
-
-// src/client/file_input.tsx
-var import_react3 = require("react");
-var import_jsx_runtime4 = require("react/jsx-runtime");
-
-// src/client/use_user_agent.tsx
-var import_react_router3 = require("react-router");
-
-// src/client/store_text_editor.tsx
-var import_gw_react_text_editor = require("gw-react-text-editor");
 var import_react_store_input2 = require("react-store-input");
-var import_react4 = require("react");
-var import_jsx_runtime5 = require("react/jsx-runtime");
-
-// src/client/editor.tsx
-var import_client = require("gw-file/client");
-
-// src/crud/crud_form.tsx
-var import_jsx_runtime6 = require("react/jsx-runtime");
+var import_text_editor = require("react-store-input/text-editor");
+var import_jsx_runtime3 = require("react/jsx-runtime");
 
 // src/api/put_resource_handler.ts
 var import_drizzle_orm = require("drizzle-orm");

package/dist/api/put_resource_handler.mjs

@@ -10,10 +10,7 @@ import {
 // src/crud/crud_form_provider.tsx
 import { useNavigate } from "react-router";
 import { useStore } from "react-store-input";
-import {
-  createContext,
-  useContext
-} from "react";
+import { createContext, useContext } from "react";
 
 // src/crud/serialize.ts
 function deserialize(data) {
@@ -89,33 +86,8 @@ var FormLabel = createComponent("label", {
 
 // src/crud/crud_form.tsx
 import { useStoreComponent } from "react-store-input";
-
-// src/client/env_loader.tsx
-import { useRouteLoaderData } from "react-router";
-import { jsx as jsx3 } from "react/jsx-runtime";
-
-// src/client/file_input.tsx
-import {
-  useRef
-} from "react";
-import { Fragment, jsx as jsx4, jsxs } from "react/jsx-runtime";
-
-// src/client/use_user_agent.tsx
-import { useRouteLoaderData as useRouteLoaderData2 } from "react-router";
-
-// src/client/store_text_editor.tsx
-import {
-  TextEditor
-} from "gw-react-text-editor";
-import { useStoreController } from "react-store-input";
-import { useImperativeHandle, useRef as useRef2 } from "react";
-import { jsx as jsx5 } from "react/jsx-runtime";
-
-// src/client/editor.tsx
-import { generateMetadata } from "gw-file/client";
-
-// src/crud/crud_form.tsx
-import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs2 } from "react/jsx-runtime";
+import { TextEditor } from "react-store-input/text-editor";
+import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
 
 // src/api/put_resource_handler.ts
 import {

package/dist/api/resource_handler.d.mts

@@ -1,5 +1,6 @@
-import * as gw_result from 'gw-result';
+import * as react_router from 'react-router';
 import { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
+import * as gw_result from 'gw-result';
 import { TableRepository } from '../table/repository.mjs';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
 import { WithAuthHandler } from '../auth/with_auth.mjs';
@@ -21,7 +22,7 @@ type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey e
 };
 declare function resourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, isOwnedBy, primaryKey, }: APIHandlerOptions<T, TSelect, TPrimaryKey>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<gw_result.Ok<{}>>;
-    action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
+    action: (arg: ActionFunctionArgs<Readonly<react_router.RouterContextProvider>>) => Promise<unknown> | unknown;
 };
 
 export { type APIHandlerOptions, resourceHandler };

package/dist/api/resource_handler.d.ts

@@ -1,5 +1,6 @@
-import * as gw_result from 'gw-result';
+import * as react_router from 'react-router';
 import { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
+import * as gw_result from 'gw-result';
 import { TableRepository } from '../table/repository.js';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
 import { WithAuthHandler } from '../auth/with_auth.js';
@@ -21,7 +22,7 @@ type APIHandlerOptions<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey e
 };
 declare function resourceHandler<T extends PgTableWithColumns<any>, TSelect, TPrimaryKey extends keyof TSelect = "id" extends keyof TSelect ? "id" : never>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, isOwnedBy, primaryKey, }: APIHandlerOptions<T, TSelect, TPrimaryKey>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<gw_result.Ok<{}>>;
-    action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
+    action: (arg: ActionFunctionArgs<Readonly<react_router.RouterContextProvider>>) => Promise<unknown> | unknown;
 };
 
 export { type APIHandlerOptions, resourceHandler };

package/dist/api/resource_handler.js

@@ -117,30 +117,9 @@ var FormLabel = createComponent("label", {
 });
 
 // src/crud/crud_form.tsx
-var import_react_store_input3 = require("react-store-input");
-
-// src/client/env_loader.tsx
-var import_react_router2 = require("react-router");
-var import_jsx_runtime3 = require("react/jsx-runtime");
-
-// src/client/file_input.tsx
-var import_react3 = require("react");
-var import_jsx_runtime4 = require("react/jsx-runtime");
-
-// src/client/use_user_agent.tsx
-var import_react_router3 = require("react-router");
-
-// src/client/store_text_editor.tsx
-var import_gw_react_text_editor = require("gw-react-text-editor");
 var import_react_store_input2 = require("react-store-input");
-var import_react4 = require("react");
-var import_jsx_runtime5 = require("react/jsx-runtime");
-
-// src/client/editor.tsx
-var import_client = require("gw-file/client");
-
-// src/crud/crud_form.tsx
-var import_jsx_runtime6 = require("react/jsx-runtime");
+var import_text_editor = require("react-store-input/text-editor");
+var import_jsx_runtime3 = require("react/jsx-runtime");
 
 // src/api/put_resource_handler.ts
 var import_drizzle_orm = require("drizzle-orm");

package/dist/api/resource_handler.mjs

@@ -19,10 +19,7 @@ import {
 // src/crud/crud_form_provider.tsx
 import { useNavigate } from "react-router";
 import { useStore } from "react-store-input";
-import {
-  createContext,
-  useContext
-} from "react";
+import { createContext, useContext } from "react";
 
 // src/crud/serialize.ts
 function deserialize(data) {
@@ -98,33 +95,8 @@ var FormLabel = createComponent("label", {
 
 // src/crud/crud_form.tsx
 import { useStoreComponent } from "react-store-input";
-
-// src/client/env_loader.tsx
-import { useRouteLoaderData } from "react-router";
-import { jsx as jsx3 } from "react/jsx-runtime";
-
-// src/client/file_input.tsx
-import {
-  useRef
-} from "react";
-import { Fragment, jsx as jsx4, jsxs } from "react/jsx-runtime";
-
-// src/client/use_user_agent.tsx
-import { useRouteLoaderData as useRouteLoaderData2 } from "react-router";
-
-// src/client/store_text_editor.tsx
-import {
-  TextEditor
-} from "gw-react-text-editor";
-import { useStoreController } from "react-store-input";
-import { useImperativeHandle, useRef as useRef2 } from "react";
-import { jsx as jsx5 } from "react/jsx-runtime";
-
-// src/client/editor.tsx
-import { generateMetadata } from "gw-file/client";
-
-// src/crud/crud_form.tsx
-import { Fragment as Fragment2, jsx as jsx6, jsxs as jsxs2 } from "react/jsx-runtime";
+import { TextEditor } from "react-store-input/text-editor";
+import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
 
 // src/api/put_resource_handler.ts
 import {

package/dist/client/env_loader.d.mts

@@ -1,7 +1,7 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 
 declare function EnvLoader({ dataKey }: {
     dataKey?: string;
-}): react_jsx_runtime.JSX.Element | undefined;
+}): react.JSX.Element | undefined;
 
 export { EnvLoader };

package/dist/client/env_loader.d.ts

@@ -1,7 +1,7 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 
 declare function EnvLoader({ dataKey }: {
     dataKey?: string;
-}): react_jsx_runtime.JSX.Element | undefined;
+}): react.JSX.Element | undefined;
 
 export { EnvLoader };

package/dist/client/file_input.d.mts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 import { DetailedHTMLProps, InputHTMLAttributes, Ref, ChangeEvent } from 'react';
 
 type Props = Omit<DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "onChange"> & {
@@ -6,6 +6,6 @@ type Props = Omit<DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLI
 } & {
     onChange?: (event: ChangeEvent<HTMLInputElement>) => void | Promise<void>;
 };
-declare function FileInput({ buttonRef, className, ref, children, onClick, onChange, ...props }: Props): react_jsx_runtime.JSX.Element;
+declare function FileInput({ buttonRef, className, ref, children, onClick, onChange, ...props }: Props): react.JSX.Element;
 
 export { FileInput };

package/dist/client/file_input.d.ts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime from 'react/jsx-runtime';
+import * as react from 'react';
 import { DetailedHTMLProps, InputHTMLAttributes, Ref, ChangeEvent } from 'react';
 
 type Props = Omit<DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "onChange"> & {
@@ -6,6 +6,6 @@ type Props = Omit<DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLI
 } & {
     onChange?: (event: ChangeEvent<HTMLInputElement>) => void | Promise<void>;
 };
-declare function FileInput({ buttonRef, className, ref, children, onClick, onChange, ...props }: Props): react_jsx_runtime.JSX.Element;
+declare function FileInput({ buttonRef, className, ref, children, onClick, onChange, ...props }: Props): react.JSX.Element;
 
 export { FileInput };

package/dist/client/index.d.mts

@@ -2,11 +2,4 @@ export { env } from './env.mjs';
 export { EnvLoader } from './env_loader.mjs';
 export { FileInput } from './file_input.mjs';
 export { useUserAgent } from './use_user_agent.mjs';
-export { StoreTextEditor } from './store_text_editor.mjs';
-export { createAttachFileOptions } from './editor.mjs';
-import 'react/jsx-runtime';
 import 'react';
-import 'gw-react-text-editor';
-import 'react-store-input';
-import 'gw-file/client';
-import 'gw-file';

package/dist/client/index.d.ts

@@ -2,11 +2,4 @@ export { env } from './env.js';
 export { EnvLoader } from './env_loader.js';
 export { FileInput } from './file_input.js';
 export { useUserAgent } from './use_user_agent.js';
-export { StoreTextEditor } from './store_text_editor.js';
-export { createAttachFileOptions } from './editor.js';
-import 'react/jsx-runtime';
 import 'react';
-import 'gw-react-text-editor';
-import 'react-store-input';
-import 'gw-file/client';
-import 'gw-file';

package/dist/client/index.js

@@ -22,8 +22,6 @@ var client_exports = {};
 __export(client_exports, {
   EnvLoader: () => EnvLoader,
   FileInput: () => FileInput,
-  StoreTextEditor: () => StoreTextEditor,
-  createAttachFileOptions: () => createAttachFileOptions,
   env: () => env,
   useUserAgent: () => useUserAgent
 });
@@ -111,125 +109,10 @@ function useUserAgent() {
   const isDesktop = !isMobile && !isTablet;
   return { userAgent, isMobile, isTablet, isDesktop };
 }
-
-// src/client/store_text_editor.tsx
-var import_gw_react_text_editor = require("gw-react-text-editor");
-var import_react_store_input = require("react-store-input");
-var import_react2 = require("react");
-var import_jsx_runtime3 = require("react/jsx-runtime");
-function StoreTextEditor({
-  store,
-  name,
-  getter,
-  setter,
-  defaultValue,
-  ref,
-  ...props
-}) {
-  const controllerRef = (0, import_react2.useRef)(null);
-  (0, import_react2.useImperativeHandle)(
-    ref,
-    () => controllerRef.current,
-    []
-  );
-  const { dispatch } = (0, import_react_store_input.useStoreController)(store, {
-    onSubscribe: (state) => {
-      const controller = controllerRef.current;
-      if (!controller) {
-        return;
-      }
-      const getResult = () => {
-        if (getter) {
-          return getter(state) || "";
-        }
-        if (name) {
-          return state[name] || "";
-        }
-        return "";
-      };
-      const result = getResult();
-      if (controller.value !== result) {
-        controller.value = result;
-      }
-    },
-    onDispatch: (state) => {
-      const controller = controllerRef.current;
-      if (!controller) {
-        return;
-      }
-      if (setter) {
-        setter(state, controller.value);
-        return;
-      }
-      if (name) {
-        state[name] = controller.value;
-      }
-    }
-  });
-  const getDefaultValue = () => {
-    if (getter) {
-      return getter(store.state);
-    }
-    if (name) {
-      return store.state[name];
-    }
-    return void 0;
-  };
-  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-    import_gw_react_text_editor.TextEditor,
-    {
-      ...props,
-      ref: controllerRef,
-      defaultValue: defaultValue ?? getDefaultValue(),
-      onChange: (e) => {
-        dispatch();
-        props.onChange?.(e);
-      }
-    }
-  );
-}
-
-// src/client/editor.tsx
-var import_client = require("gw-file/client");
-function createAttachFileOptions({
-  cdn,
-  fileUploader
-}) {
-  return {
-    uploadFile: async (file) => {
-      const result = await fileUploader.uploadFile(file, {
-        convertToWebp: true
-      });
-      if (result.isErr) {
-        throw new Error(result.error.message);
-      }
-      return {
-        alt: file.name,
-        src: cdn(result.value.key)
-      };
-    },
-    generateMetadata: (file) => (0, import_client.generateMetadata)(file, {
-      uploadBlob: async (blob) => {
-        const result = await fileUploader.uploadBlob(blob, "file", {
-          convertToWebp: true
-        });
-        if (result.isErr) {
-          throw new Error(result.error.message);
-        }
-        return {
-          alt: file.name,
-          src: cdn(result.value.key)
-        };
-      }
-    })
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   EnvLoader,
   FileInput,
-  StoreTextEditor,
-  createAttachFileOptions,
   env,
   useUserAgent
 });