applesauce-accounts 0.0.0-next-20250128154531 → 0.0.0-next-20250128164720

package/dist/account.d.ts

@@ -23,6 +23,8 @@ export declare class BaseAccount<Signer extends Nip07Interface, SignerData, Meta
     } | undefined;
     constructor(pubkey: string, signer: Signer);
     toJSON(): SerializedAccount<SignerData, Metadata>;
+    /** Sets an accounts id and metadata. NOTE: This should only be used in fromJSON methods */
+    static loadCommonFields<T extends IAccount<any, any, any>>(account: T, json: SerializedAccount<any, any>): T;
     /** Gets the pubkey from the signer */
     getPublicKey(): string | Promise<string>;
     /** sign the event and make sure its signed with the correct pubkey */

package/dist/account.js

@@ -68,6 +68,14 @@ export class BaseAccount {
     toJSON() {
         throw new Error("Not implemented");
     }
+    /** Sets an accounts id and metadata. NOTE: This should only be used in fromJSON methods */
+    static loadCommonFields(account, json) {
+        if (json.id)
+            account.id = json.id;
+        if (json.metadata)
+            account.metadata = json.metadata;
+        return account;
+    }
     /** Gets the pubkey from the signer */
     getPublicKey() {
         const result = this.signer.getPublicKey();

package/dist/accounts/amber-clipboard-account.d.ts

@@ -5,5 +5,5 @@ import { SerializedAccount } from "../types.js";
 export declare class AmberClipboardAccount<Metadata extends unknown> extends BaseAccount<AmberClipboardSigner, void, Metadata> {
     static type: string;
     toJSON(): SerializedAccount<void, Metadata>;
-    static fromJSON<MD extends unknown>(json: SerializedAccount<void, MD>): AmberClipboardAccount<MD>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<void, Metadata>): AmberClipboardAccount<Metadata>;
 }

package/dist/accounts/amber-clipboard-account.js

@@ -13,6 +13,7 @@ export class AmberClipboardAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new AmberClipboardAccount(json.pubkey, new AmberClipboardSigner());
+        const account = new AmberClipboardAccount(json.pubkey, new AmberClipboardSigner());
+        return super.loadCommonFields(account, json);
     }
 }

package/dist/accounts/extension-account.d.ts

@@ -12,5 +12,5 @@ export declare class ExtensionAccount<Metadata extends unknown> extends BaseAcco
         metadata: Metadata | undefined;
         signer: undefined;
     };
-    static fromJSON<MD extends unknown>(json: SerializedAccount<void, MD>): ExtensionAccount<unknown>;
+    static fromJSON<Metadata extends unknown>(json: SerializedAccount<void, Metadata>): ExtensionAccount<Metadata>;
 }

package/dist/accounts/extension-account.js

@@ -17,6 +17,7 @@ export class ExtensionAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new ExtensionAccount(json.pubkey, new ExtensionSigner());
+        const account = new ExtensionAccount(json.pubkey, new ExtensionSigner());
+        return super.loadCommonFields(account, json);
     }
 }

package/dist/accounts/nostr-connect-account.js

@@ -27,6 +27,7 @@ export class NostrConnectAccount extends BaseAccount {
             remote: json.signer.remote,
             signer: new SimpleSigner(hexToBytes(json.signer.clientKey)),
         });
-        return new NostrConnectAccount(json.pubkey, signer);
+        const account = new NostrConnectAccount(json.pubkey, signer);
+        return super.loadCommonFields(account, json);
     }
 }

package/dist/accounts/password-account.js

@@ -31,7 +31,8 @@ export class PasswordAccount extends BaseAccount {
     static fromJSON(json) {
         const signer = new PasswordSigner();
         signer.ncryptsec = json.signer.ncryptsec;
-        return new PasswordAccount(json.pubkey, signer);
+        const account = new PasswordAccount(json.pubkey, signer);
+        return super.loadCommonFields(account, json);
     }
     /** Creates a new PasswordAccount from a ncryptsec string */
     static fromNcryptsec(pubkey, ncryptsec) {

package/dist/accounts/readonly-account.js

@@ -13,6 +13,7 @@ export class ReadonlyAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new ReadonlyAccount(json.pubkey, new ReadonlySigner(json.pubkey));
+        const account = new ReadonlyAccount(json.pubkey, new ReadonlySigner(json.pubkey));
+        return super.loadCommonFields(account, json);
     }
 }

package/dist/accounts/serial-port-account.js

@@ -24,6 +24,8 @@ export class SerialPortAccount extends BaseAccount {
         };
     }
     static fromJSON(json) {
-        return new SerialPortAccount(json.pubkey, new SerialPortSigner());
+        const signer = new SerialPortSigner();
+        const account = new SerialPortAccount(json.pubkey, signer);
+        return super.loadCommonFields(account, json);
     }
 }

package/dist/accounts/simple-account.js

@@ -15,7 +15,8 @@ export class SimpleAccount extends BaseAccount {
     }
     static fromJSON(json) {
         const key = hexToBytes(json.signer.key);
-        return new SimpleAccount(json.pubkey, new SimpleSigner(key));
+        const account = new SimpleAccount(json.pubkey, new SimpleSigner(key));
+        return super.loadCommonFields(account, json);
     }
     static fromKey(key) {
         if (typeof key === "string")

package/dist/types.d.ts

@@ -10,8 +10,6 @@ export type SerializedAccount<SignerData, Metadata extends unknown> = {
     id: string;
     /** account type */
     type: string;
-    /** local name of the account */
-    name?: string;
     /** pubkey of the account */
     pubkey: string;
     /** Signer data */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-accounts",
-  "version": "0.0.0-next-20250128154531",
+  "version": "0.0.0-next-20250128164720",
   "description": "A simple nostr account management system",
   "type": "module",
   "main": "dist/index.js",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.5.0",
-    "applesauce-signers": "0.0.0-next-20250128154531",
+    "applesauce-signers": "0.0.0-next-20250128164720",
     "nanoid": "^5.0.9",
     "nostr-tools": "^2.10.3",
     "rxjs": "^7.8.1"