akanjs 3.1.0-rc.7 → 3.1.0-rc.8

package/client/href.ts

@@ -1,13 +1,23 @@
 export class Href {
   static readonly #blocked = new Set(["javascript:", "vbscript:", "data:"]);
 
+  static #parse(href: string, base?: string): URL | null {
+    try {
+      return new URL(href, base);
+    } catch {
+      return null;
+    }
+  }
+
   /** External is what the browser takes off-site: any absolute URL with a scheme, and `//`/`\\` network-path
-   * forms it resolves to another host. javascript:, vbscript: and data: never count. */
+   * forms that name a host. javascript:, vbscript: and data: never count. */
   static isExternal(href: string): boolean {
     
-    if (URL.canParse(href)) return !Href.#blocked.has(new URL(href).protocol);
+    const absolute = Href.#parse(href);
+    if (absolute) return !Href.#blocked.has(absolute.protocol);
 
-    return /^[\\/]{2}/.test(href.replace(/[\t\n\r]/g, "").replace(/^[\u0000-\u0020]+/, ""));
+    const value = href.replace(/[\t\n\r]/g, "").replace(/^[\u0000-\u0020]+/, "");
+    return /^[\\/]{2}/.test(value) && !!Href.#parse(value, "https://localhost")?.hostname;
   }
 
   /** An explicit http(s) scheme in any case; `//host` and `httpbin/x` do not qualify. */
@@ -15,10 +25,11 @@ export class Href {
     return /^https?:/i.test(href);
   }
 
-  /** Canonical absolute URL for an external href: scheme-relative and backslash hosts resolve against the page's
-   * http(s) origin, or https: when the page is a native `app://` shell. */
+  /** Canonical absolute URL for an external href: follows the browser on an http(s) document base; on a native
+   * `app://` base an absolute URL resolves as written and a network path resolves against https:. */
   static toExternalUrl(href: string, base: string): string {
-    const baseProtocol = URL.canParse(base) ? new URL(base).protocol : "";
-    return new URL(href, /^https?:$/.test(baseProtocol) ? base : "https://localhost").href;
+    const baseUrl = Href.#parse(base);
+    if (baseUrl && /^https?:$/.test(baseUrl.protocol)) return Href.#parse(href, baseUrl.href)?.href ?? href;
+    return (Href.#parse(href) ?? Href.#parse(href, "https://localhost"))?.href ?? href;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "3.1.0-rc.7",
+  "version": "3.1.0-rc.8",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/client/href.d.ts

@@ -1,11 +1,11 @@
 export declare class Href {
     #private;
     /** External is what the browser takes off-site: any absolute URL with a scheme, and `//`/`\\` network-path
-     * forms it resolves to another host. javascript:, vbscript: and data: never count. */
+     * forms that name a host. javascript:, vbscript: and data: never count. */
     static isExternal(href: string): boolean;
     /** An explicit http(s) scheme in any case; `//host` and `httpbin/x` do not qualify. */
     static hasWebScheme(href: string): boolean;
-    /** Canonical absolute URL for an external href: scheme-relative and backslash hosts resolve against the page's
-     * http(s) origin, or https: when the page is a native `app://` shell. */
+    /** Canonical absolute URL for an external href: follows the browser on an http(s) document base; on a native
+     * `app://` base an absolute URL resolves as written and a network path resolves against https:. */
     static toExternalUrl(href: string, base: string): string;
 }

package/ui/Clipboard.tsx

@@ -26,6 +26,7 @@ export const Clipboard = ({ text, className }: ClipboardProps): ReactElement =>
   };
   return (
     <button
+      type="button"
       onClick={async () => {
         await handleCopy();
       }}

package/ui/Data/Item.tsx

@@ -194,6 +194,7 @@ export const Action = <T extends string, M extends { id: string }, L extends { i
   };
   return action === "edit" ? (
     <button
+      type="button"
       className={buttonRecipe({ variant: outline ? "outline" : "ghost", size: "icon" }, [
         "m-1 size-8 text-center",
         outline && "border-dashed",
@@ -204,6 +205,7 @@ export const Action = <T extends string, M extends { id: string }, L extends { i
     </button>
   ) : action === "view" ? (
     <button
+      type="button"
       className={buttonRecipe({ variant: outline ? "outline" : "ghost", size: "icon" }, [
         "m-1 size-8 text-center",
         outline && "border-dashed",
@@ -219,6 +221,7 @@ export const Action = <T extends string, M extends { id: string }, L extends { i
       onConfirm={() => void storeDo[namesOfSlice.removeModel](model.id)}
     >
       <button
+        type="button"
         className={buttonRecipe({ variant: outline ? "outline" : "ghost", size: "icon" }, [
           "m-1 size-8 text-center",
           outline && "border-dashed",

package/ui/DraggableList.tsx

@@ -183,6 +183,7 @@ const Item = ({
       {children}
       {removable && (
         <button
+          type="button"
           className={recipe({ variant: "outline", size: "xs" }, [
             "size-6 border-destructive p-0 text-destructive hover:bg-destructive hover:text-destructive-foreground",
             removeClassName,

package/ui/Field/Collection.tsx

@@ -50,6 +50,7 @@ export const List = <Item,>({
               {renderItem(item, idx)}
               <div className="flex gap-2 border-border border-l pl-2">
                 <button
+                  type="button"
                   className={recipe(
                     { variant: "outline", size: "icon" },
                     "size-6 border-destructive p-0 text-destructive hover:bg-destructive hover:text-destructive-foreground",
@@ -66,6 +67,7 @@ export const List = <Item,>({
           </Fragment>
         ))}
         <button
+          type="button"
           className={recipe({ variant: "outline" })}
           onClick={() => {
             onAdd();
@@ -151,6 +153,7 @@ export const TextList = ({
                     disabled={disabled}
                   />
                   <button
+                    type="button"
                     className={recipe(
                       { variant: "outline", size: "icon" },
                       "size-6 border-destructive p-0 text-destructive hover:bg-destructive hover:text-destructive-foreground",
@@ -169,6 +172,7 @@ export const TextList = ({
         <div className="my-5 h-[0.5px] bg-foreground/20" />
         {texts.length < maxlength ? (
           <button
+            type="button"
             className={recipe({ variant: "outline" }, "w-full")}
             onClick={() => {
               onChange([...texts, ""]);

package/ui/Input.tsx

@@ -272,6 +272,7 @@ const DefaultPassword = ({
         />
         <div className="absolute top-1/2 right-2 flex -translate-y-1/2 items-center justify-center">
           <button
+            type="button"
             onClick={() => {
               setShowPassword(!showPassword);
             }}

package/ui/Layout/Sider.tsx

@@ -127,7 +127,7 @@ export const LeftSider = ({ className, children, open, width, close, onCancel }:
           }}
         >
           {close ?? (
-            <button className={buttonRecipe({ variant: "ghost", size: "icon" })}>
+            <button type="button" className={buttonRecipe({ variant: "ghost", size: "icon" })}>
               <BiX />
             </button>
           )}

package/ui/Link/Anchor.tsx

@@ -53,7 +53,7 @@ export const CsrLink = ({
         const isExternal = Href.isExternal(href);
         const url = href.startsWith("#") ? `${csrLocation.pathname}#${hash}` : href;
         if (isExternal) {
-          const target = Href.toExternalUrl(href, window.location.href);
+          const target = Href.toExternalUrl(href, document.baseURI);
           void openExternalUrl(target).catch(() => window.open(target, "_blank", "noopener,noreferrer"));
         } else if (replace) router.replace(url, { scrollToTop });
         else router.push(url, { scrollToTop });

package/ui/Model/Edit.tsx

@@ -24,7 +24,7 @@ export default function Edit({ trigger, children, slice, modelId, modal, renderT
     <>
       <EditWrapper className="contents" slice={slice} modelId={modelId} modal={modal} draft={draft}>
         {trigger ?? (
-          <button className={buttonRecipe({ variant: "primary" })}>
+          <button type="button" className={buttonRecipe({ variant: "primary" })}>
             <AiOutlineEdit /> {l("base.edit")}
           </button>
         )}

package/ui/Model/New.tsx

@@ -45,7 +45,7 @@ export default function New({
         draft={draft}
       >
         {trigger ?? (
-          <button className={buttonRecipe({ variant: "primary" })}>
+          <button type="button" className={buttonRecipe({ variant: "primary" })}>
             <AiOutlinePlus /> {l("base.new")}
           </button>
         )}

package/ui/Model/SureToRemove.tsx

@@ -89,6 +89,7 @@ export default function SureToRemove({
         bodyClassName="border-destructive"
         action={
           <button
+            type="button"
             className={buttonRecipe({ variant: "destructive" }, "w-full")}
             disabled={typeNameToRemove && repeatName !== name}
             onClick={async () => {

package/ui/Model/ViewEditModal.tsx

@@ -45,7 +45,12 @@ const EditAction = ({ modelName, label, onAct, closeView }: ActionProps) => {
     .desc(`Turn the open ${modelName} from its detail view into the edit form.`)
     .exec(onAct);
   return (
-    <button className={buttonRecipe({ variant: "primary" }, "w-full")} onClick={editModel} {...agentAttrs(editModel)}>
+    <button
+      type="button"
+      className={buttonRecipe({ variant: "primary" }, "w-full")}
+      onClick={editModel}
+      {...agentAttrs(editModel)}
+    >
       <AiOutlineEdit /> {label}
     </button>
   );
@@ -59,6 +64,7 @@ const SaveAction = ({ modelName, label, onAct, closeView }: ActionProps) => {
     .exec(onAct);
   return (
     <button
+      type="button"
       className={buttonRecipe({ variant: "primary" }, "w-full")}
       onClick={submitModel}
       {...agentAttrs(submitModel)}

package/ui/ObjectId.tsx

@@ -26,7 +26,11 @@ export const ObjectId = ({ id }: ObjectIdProps) => {
       <Tooltip content={id} variant="primary">
         <div className="font-semibold text-xs">{shortenedId}</div>
       </Tooltip>
-      <button className={recipe({ variant: "ghost", size: "icon" }, "size-6 rounded-full")} onClick={handleCopyClick}>
+      <button
+        type="button"
+        className={recipe({ variant: "ghost", size: "icon" }, "size-6 rounded-full")}
+        onClick={handleCopyClick}
+      >
         {isCopied ? <AiOutlineCheck /> : <AiOutlineCopy />}
       </button>
     </div>

package/ui/Signal/Doc.tsx

@@ -74,7 +74,10 @@ export const DocSetting = ({ fetch = runtimeFetch, search, onSearch }: DocSettin
     <Toolbar>
       <ToolbarField label={l.trans(signalText.baseUrl)}>
         <Copy text={fetch.origin}>
-          <button className={buttonRecipe({ variant: "ghost", size: "sm" }, "font-mono text-foreground/80")}>
+          <button
+            type="button"
+            className={buttonRecipe({ variant: "ghost", size: "sm" }, "font-mono text-foreground/80")}
+          >
             {fetch.origin}
             <AiOutlineCopy className="text-foreground/40" />
           </button>
@@ -173,6 +176,7 @@ export const DocAuthModal = ({ children }: DocAuthModalProps) => {
         title={l.trans(signalText.setJwtTitle)}
         action={
           <button
+            type="button"
             className={buttonRecipe({ variant: "primary" }, "w-full")}
             onClick={() => {
               st.set(

package/ui/ToggleSelect.tsx

@@ -70,6 +70,7 @@ const DefaultToggleSelect = <I extends string | number | boolean | null>({
           <Fragment key={idx}>{renderItem(option, { selected: isSelected, disabled: isDisabled, onToggle })}</Fragment>
         ) : (
           <button
+            type="button"
             key={idx}
             disabled={isDisabled}
             className={cn(toggleBtn, isSelected && selectedCls, isDisabled && "cursor-not-allowed", btnClassName)}
@@ -128,6 +129,7 @@ const DefaultMulti = ({
         const isDisabled = (disabled ?? false) || (option.disabled ?? false);
         return (
           <button
+            type="button"
             key={idx}
             disabled={isDisabled}
             className={cn(toggleBtn, isSelected && selectedCls, isDisabled && "cursor-not-allowed", btnClassName)}