@pkcprotocol/pkc-js 0.0.15 → 0.0.17

package/dist/browser/schema/schema-util.js

@@ -159,7 +159,7 @@ export function parseCreatePKCWsServerOptionsSchemaWithPKCErrorIfItFails(options
         return options;
 }
 export function parseCommentModerationChallengeRequestToEncryptSchemaWithPKCErrorIfItFails(toEncrypt) {
-    const parseRes = CommentModerationChallengeRequestToEncryptSchema.safeParse(toEncrypt);
+    const parseRes = CommentModerationChallengeRequestToEncryptSchema.loose().safeParse(toEncrypt);
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_COMMENT_MODERATION_CHALLENGE_REQUEST_TO_ENCRYPT_SCHEMA", {
             zodError: parseRes.error,
@@ -169,7 +169,7 @@ export function parseCommentModerationChallengeRequestToEncryptSchemaWithPKCErro
         return toEncrypt;
 }
 export function parseCommunityEditChallengeRequestToEncryptSchemaWithPKCErrorIfItFails(toEncrypt) {
-    const parseRes = CommunityEditPublicationChallengeRequestToEncryptSchema.safeParse(toEncrypt);
+    const parseRes = CommunityEditPublicationChallengeRequestToEncryptSchema.loose().safeParse(toEncrypt);
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_COMMUNITY_EDIT_CHALLENGE_REQUEST_TO_ENCRYPT_SCHEMA", {
             zodError: parseRes.error,
@@ -199,7 +199,7 @@ export function parseCommentChallengeRequestToEncryptSchemaWithPKCErrorIfItFails
         return toEncrypt;
 }
 export function parseVoteChallengeRequestToEncryptSchemaWithPKCErrorIfItFails(toEncrypt) {
-    const parseRes = VoteChallengeRequestToEncryptSchema.safeParse(toEncrypt);
+    const parseRes = VoteChallengeRequestToEncryptSchema.loose().safeParse(toEncrypt);
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_VOTE_CHALLENGE_REQUEST_TO_ENCRYPT_SCHEMA", {
             zodError: parseRes.error,
@@ -209,7 +209,7 @@ export function parseVoteChallengeRequestToEncryptSchemaWithPKCErrorIfItFails(to
         return toEncrypt;
 }
 export function parseCommentEditChallengeRequestToEncryptSchemaWithPKCErrorIfItFails(toEncrypt) {
-    const parseRes = CommentEditChallengeRequestToEncryptSchema.safeParse(toEncrypt);
+    const parseRes = CommentEditChallengeRequestToEncryptSchema.loose().safeParse(toEncrypt);
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_COMMENT_EDIT_CHALLENGE_REQUEST_TO_ENCRYPT_SCHEMA", {
             zodError: parseRes.error,

package/dist/browser/schema/schema-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-util.js","sourceRoot":"","sources":["../../../src/schema/schema-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema-util.js","sourceRoot":"","sources":["../../../src/schema/schema-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACH,sCAAsC,EACtC,iBAAiB,EAEjB,sDAAsD,EACtD,mBAAmB,EAEnB,wCAAwC,EAC3C,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EACH,8BAA8B,EAC9B,wBAAwB,EACxB,oCAAoC,EACvC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACH,wCAAwC,EACxC,2CAA2C,EAC3C,wCAAwC,EACxC,sCAAsC,EACtC,yCAAyC,EACzC,0BAA0B,EAC1B,mBAAmB,EACtB,MAAM,wBAAwB,CAAC;AAQhC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAC5G,OAAO,EAAE,8BAA8B,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAGvG,OAAO,EACH,gDAAgD,EAChD,+CAA+C,EAE/C,kDAAkD,EACrD,MAAM,8CAA8C,CAAC;AAEtD,OAAO,EAEH,yCAAyC,EACzC,mCAAmC,EACnC,kCAAkC,EACrC,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACH,0CAA0C,EAE1C,2DAA2D,EAE3D,4CAA4C,EAC/C,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAOpD,OAAO,EAEH,yDAAyD,EACzD,uDAAuD,EACvD,2CAA2C,EAC9C,MAAM,0CAA0C,CAAC;AAElD,MAAM,UAAU,4BAA4B,CAAC,CAAS;IAClD,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC;AACL,CAAC;AAED,MAAM,UAAU,wDAAwD,CACpE,aAAkD;IAElD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACtE,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,mCAAmC,EAAE;YACpD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,gBAAgB,EAAG,aAAyC,EAAE,OAAO;YACrE,aAAa,EAAE,aAAa;SAC/B,CAAC,CAAC;;QACF,OAAO,aAAa,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,2CAA2C,CAAC,eAAkD;IAC1G,MAAM,QAAQ,GAAG,iBAAiB,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IACtE,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,MAAM,IAAI,QAAQ,CAAC,iCAAiC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;;QACvH,OAAwB,eAAe,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,6CAA6C,CAAC,iBAAsD;IAChH,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC1E,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,MAAM,IAAI,QAAQ,CAAC,mCAAmC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;;QAC3H,OAAO,iBAAiB,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,wCAAwC,CAAC,YAA4C;IACjG,MAAM,QAAQ,GAAG,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,MAAM,IAAI,QAAQ,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;;QACjH,OAAO,YAAY,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,gDAAgD,CAAC,oBAA4D;IACzH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IACxE,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,MAAM,IAAI,QAAQ,CAAC,uCAAuC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;;QAClI,OAAO,oBAAoB,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,4CAA4C,CACxD,sBAAgE;IAEhE,MAAM,QAAQ,GAAG,wBAAwB,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACpF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,wCAAwC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,sBAAsB,EAAE,CAAC,CAAC;;QAClH,OAAO,sBAAsB,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,mCAAmC,CAC/C,kCAAwF;IAExF,MAAM,QAAQ,GAAG,oCAAoC,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,kCAAkC,CAAC,CAAC;IAC5G,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,qDAAqD,EAAE;YACtE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,kCAAkC;SACrC,CAAC,CAAC;;QACF,OAAO,kCAAkC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,uDAAuD,CAAC,kBAA2D;IAC/H,MAAM,QAAQ,GAAG,yCAAyC,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACjG,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,yCAAyC,EAAE;YAC1D,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,kBAAkB;SACrB,CAAC,CAAC;;QACF,OAAO,kBAAkB,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,yCAAyC,CAAC,SAA0C;IAChG,IAAI,CAAC;QACD,OAAO,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,IAAI,QAAQ,CAAC,+BAA+B,EAAE;YAChD,QAAQ,EAAE,CAAC;YACX,SAAS;SACZ,CAAC,CAAC;IACP,CAAC;AACL,CAAC;AAED,MAAM,UAAU,+CAA+C,CAC3D,YAA0D;IAE1D,MAAM,QAAQ,GAAG,4BAA4B,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACtE,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,uCAAuC,EAAE;YACxD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,YAAY;SACf,CAAC,CAAC;;QACF,OAAO,YAAY,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,yCAAyC,CACrD,YAAyD;IAEzD,MAAM,QAAQ,GAAG,2BAA2B,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACrE,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,gCAAgC,EAAE;YACjD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,YAAY;SACf,CAAC,CAAC;;QACF,OAAO,YAAY,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,qEAAqE,CAAC,IAA2C;IAC7H,MAAM,QAAQ,GAAG,2CAA2C,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,+CAA+C,EAAE;YAChE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,uCAAuC;SAChD,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,qEAAqE,CAAC,IAA2C;IAC7H,MAAM,QAAQ,GAAG,yDAAyD,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC3F,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,+CAA+C,EAAE;YAChE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,uCAAuC;SAChD,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AACD,MAAM,UAAU,kDAAkD,CAC9D,yBAAyE;IAEzE,MAAM,QAAQ,GAAG,8BAA8B,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;IACrF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,+BAA+B,EAAE;YAChD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,gBAAgB,EAAE,yBAAyB;SAC9C,CAAC,CAAC;;QACF,OAAO,yBAAyB,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,wDAAwD,CACpE,OAAuD;IAEvD,MAAM,QAAQ,GAAG,8BAA8B,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACnE,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,iDAAiD,EAAE;YAClE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,gBAAgB,EAAE,OAAO;SAC5B,CAAC,CAAC;;QACF,OAAO,OAAO,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,0EAA0E,CACtF,SAA2E;IAE3E,MAAM,QAAQ,GAAG,gDAAgD,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC/F,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,oEAAoE,EAAE;YACrF,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,SAAS;SACZ,CAAC,CAAC;;QACF,OAAO,SAAS,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,sEAAsE,CAClF,SAAkF;IAElF,MAAM,QAAQ,GAAG,uDAAuD,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACtG,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,gEAAgE,EAAE;YACjF,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,SAAS;SACZ,CAAC,CAAC;;QACF,OAAO,SAAS,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,oDAAoD,CAChE,WAAuD;IAEvD,MAAM,QAAQ,GAAG,0BAA0B,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACnE,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,mCAAmC,EAAE;YACpD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,WAAW;SACd,CAAC,CAAC;;QACF,OAAO,WAAW,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,gEAAgE,CAC5E,SAAiE;IAEjE,MAAM,QAAQ,GAAG,sCAAsC,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACrF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,yDAAyD,EAAE;YAC1E,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,SAAS;SACZ,CAAC,CAAC;;QACF,OAAO,SAAS,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,6DAA6D,CACzE,SAA8D;IAE9D,MAAM,QAAQ,GAAG,mCAAmC,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAClF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,sDAAsD,EAAE;YACvE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,SAAS;SACZ,CAAC,CAAC;;QACF,OAAO,SAAS,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,oEAAoE,CAChF,SAAqE;IAErE,MAAM,QAAQ,GAAG,0CAA0C,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACzF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,8DAA8D,EAAE;YAC/E,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,SAAS;SACZ,CAAC,CAAC;;QACF,OAAO,SAAS,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,kEAAkE,CAC9E,OAAiE;IAEjE,MAAM,QAAQ,GAAG,wCAAwC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,qDAAqD,EAAE;YACtE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,OAAO;SACV,CAAC,CAAC;;QACF,OAAO,OAAO,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,yDAAyD,CACrE,QAAyD;IAEzD,MAAM,QAAQ,GAAG,+BAA+B,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrE,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,2CAA2C,EAAE;YAC5D,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,QAAQ;SACX,CAAC,CAAC;;QACF,OAAO,QAAQ,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,8DAA8D,CAAC,IAA0D;IACrI,MAAM,QAAQ,GAAG,kDAAkD,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACpF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,mDAAmD,EAAE;YACpE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,gCAAgC;SACzC,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,yEAAyE,CACrF,IAAqE;IAErE,MAAM,QAAQ,GAAG,+CAA+C,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACzF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,mDAAmD,EAAE;YACpE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,2CAA2C;SACpD,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,qEAAqE,CACjF,IAAS;IAET,MAAM,QAAQ,GAAG,2CAA2C,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,iDAAiD,EAAE;YAClE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;SACP,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,iDAAiD,CAAC,IAAiD;IAC/G,MAAM,QAAQ,GAAG,yCAAyC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC3E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE;YACtD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,mBAAmB;SAC5B,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,4DAA4D,CAAC,IAAwD;IACjI,MAAM,QAAQ,GAAG,kCAAkC,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC5E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,qCAAqC,EAAE;YACtD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,8BAA8B;SACvC,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,wDAAwD,CAAC,IAAoD;IACzH,MAAM,QAAQ,GAAG,4CAA4C,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,6CAA6C,EAAE;YAC9D,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,0BAA0B;SACnC,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,mEAAmE,CAC/E,IAA+D;IAE/D,MAAM,QAAQ,GAAG,2DAA2D,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7F,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,6CAA6C,EAAE;YAC9D,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,qCAAqC;SAC9C,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,gEAAgE,CAC5E,IAA4D;IAE5D,MAAM,QAAQ,GAAG,sCAAsC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACxE,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,0CAA0C,EAAE;YAC3D,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;SACP,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,8CAA8C,CAAC,IAAS;IACpE,0HAA0H;IAC1H,MAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,oCAAoC,EAAE;YACrD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;SACP,CAAC,CAAC;;QACF,OAAO,QAAQ,CAAC,IAAI,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,kEAAkE,CAC9E,IAA8D;IAE9D,MAAM,QAAQ,GAAG,wCAAwC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,mDAAmD,EAAE;YACpE,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;SACP,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,yDAAyD,CAAC,IAA2D;IACjI,MAAM,QAAQ,GAAG,sDAAsD,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACxF,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,wCAAwC,EAAE;YACzD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,iCAAiC;SAC1C,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,oDAAoD,CAAC,IAAgD;IACjH,MAAM,QAAQ,GAAG,wCAAwC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1E,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,wCAAwC,EAAE;YACzD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;YACJ,IAAI,EAAE,sBAAsB;SAC/B,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,0CAA0C,CAAC,IAAY;IACnE,MAAM,QAAQ,GAAG,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,QAAQ,CAAC,OAAO;QACjB,MAAM,IAAI,QAAQ,CAAC,sCAAsC,EAAE;YACvD,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,IAAI;SACP,CAAC,CAAC;;QACF,OAAO,IAAI,CAAC;AACrB,CAAC;AAkBD,MAAM,UAAU,qBAAqB,CACjC,MAAc,EACd,UAAkC,EAAE;IAEpC,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAC1G,MAAM,YAAY,GAAG,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,KAAK,IAAI,OAAQ,MAAc,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,MAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7G,MAAM,KAAK,GAAG,MAAM,CAAC,KAAoB,CAAC;IAC1C,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAU,CAAC;IACnF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAU,CAAC;IAE/E,OAAO,CAAC,GAAG,EAAE,EAAE;QACX,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC1C,MAAM,IAAI,SAAS,CAAC,0CAA0C,OAAO,GAAG,EAAE,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,MAAM,GAAG,GAA8B,CAAC;QAC9C,MAAM,WAAW,GAAwB,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAwB,EAAE,CAAC;QAEvC,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACtD,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;gBAAE,SAAS;YACnD,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACzD,MAAM,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAC7G,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;;gBAC7C,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,CAAqB,CAAC;YACjE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC5B,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,WAA+B,EAAE,MAAM,EAAE,CAAC;IAC7D,CAAC,CAAC;AACN,CAAC;AAED,SAAS,cAAc,CACnB,KAAc,EACd,GAAW,EACX,WAAwB,EACxB,QAAqB,EACrB,cAAuB,EACvB,gBAAyB,EACzB,MAAe;IAEf,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC5D,IAAI,OAAO,GAAQ,KAAK,CAAC;IAEzB,IAAI,cAAc,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7E,IAAI,gBAAgB,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAEtF,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACjC,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAC9B,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAC7B,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC;QAC/B,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,IAAI,CAAC;QAC9B,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC9C,IAAI,UAAU,KAAK,GAAG;YAAE,OAAO,KAAK,CAAC;QACrC,IAAI,UAAU,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QACpC,IAAI,UAAU,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC;QACvC,IAAI,UAAU,KAAK,OAAO;YAAE,OAAO,KAAK,CAAC;IAC7C,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,UAAU,CAAC,KAAc,EAAE,GAAW,EAAE,MAAe;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACpC,KAAa,CAAC,OAAO,GAAG;gBACrB,GAAI,KAAa,CAAC,OAAO;gBACzB,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG;gBACrC,KAAK,EAAE,OAAO;aACjB,CAAC;QACN,CAAC;QACD,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAkB;IAC1C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,aAAa,CAAC,WAAW,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACtG,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,KAAkB;IACvC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,UAAU,CAAC,WAAW,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnG,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,MAAe;IAClC,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,GAAG,GAAQ,IAAI,EAAE,GAAG,CAAC;IAC3B,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACpC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,OAAO,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC;IAC9D,IAAI,IAAI,KAAK,OAAO;QAAE,OAAQ,GAAG,CAAC,OAAqB,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IACjG,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC1B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QAC5B,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,UAAU,CAAC,MAAe;IAC/B,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,GAAG,GAAQ,IAAI,EAAE,GAAG,CAAC;IAC3B,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACnB,MAAM,EAAE,OAAO,EAAE,GAAG,GAA6B,CAAC;QAClD,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,MAAe,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;QAC1B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QAC5B,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,IAAI,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACjC,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;AAEpF,SAAS,SAAS,CAAC,MAAe;IAC9B,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,GAAG,GAAQ,IAAI,EAAE,GAAG,CAAC;IAC3B,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC;IACtD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,YAAY,CAAC,MAAe,EAAE,OAAO,IAAI,GAAG,EAAW;IAC5D,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IACpC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjB,MAAM,GAAG,GAAQ,MAAM,EAAE,GAAG,CAAC;IAC7B,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IACrC,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACf,KAAK,UAAU,CAAC;QAChB,KAAK,UAAU,CAAC;QAChB,KAAK,SAAS,CAAC;QACf,KAAK,OAAO,CAAC;QACb,KAAK,UAAU;YACX,OAAO,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC7C,KAAK,SAAS;YACV,OAAO,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1C,KAAK,MAAM;YACP,OAAO,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5C,KAAK,MAAM;YACP,OAAO,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvC,KAAK,OAAO;YACR,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACxC;YACI,OAAO,MAAM,CAAC;IACtB,CAAC;AACL,CAAC"}

package/dist/browser/schema/schema.d.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+export declare const nonNegativeIntStringSchema: z.ZodString;
 export declare const CreateSignerSchema: z.ZodObject<{
     type: z.ZodEnum<{
         ed25519: "ed25519";

package/dist/browser/schema/schema.js

@@ -2,6 +2,12 @@ import { z } from "zod";
 import { CID } from "kubo-rpc-client";
 import { messages } from "../errors.js";
 import * as remeda from "remeda";
+export const nonNegativeIntStringSchema = z
+    .string()
+    .regex(/^\d+$/)
+    .refine((val) => parseInt(val) >= 0, {
+    message: "Must be a non-negative integer"
+});
 // TODO add validation for private key here
 export const CreateSignerSchema = z.object({ type: z.enum(["ed25519"]), privateKey: z.string() });
 export const SignerWithAddressPublicKeySchema = CreateSignerSchema.extend({

package/dist/browser/schema/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/schema/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/schema/schema.ts"],"names":[],"mappings":"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"}

package/dist/browser/schema.d.ts

@@ -1,34 +1,26 @@
 import { z } from "zod";
 import type { KuboRpcClientCreateOption } from "./util.js";
 export declare const ChainTickerSchema: z.ZodString;
-export declare const nonNegativeIntStringSchema: z.ZodString;
+export { nonNegativeIntStringSchema } from "./schema/schema.js";
 export declare const Uint8ArraySchema: z.ZodCustom<Uint8Array<ArrayBufferLike>, Uint8Array<ArrayBufferLike>>;
-export declare const NameResolverSchema: z.ZodObject<{
-    key: z.ZodString;
-    resolve: z.ZodCustom<(opts: {
-        name: string;
-        provider: string;
-        abortSignal?: AbortSignal;
-    }) => Promise<{
-        publicKey: string;
-        [key: string]: string;
-    } | undefined>, (opts: {
+export interface NameResolverInterface {
+    key: string;
+    provider: string;
+    dataPath?: string;
+    resolve: (opts: {
         name: string;
         provider: string;
         abortSignal?: AbortSignal;
     }) => Promise<{
         publicKey: string;
         [key: string]: string;
-    } | undefined>>;
-    canResolve: z.ZodCustom<(opts: {
-        name: string;
-    }) => boolean, (opts: {
+    } | undefined>;
+    canResolve: (opts: {
         name: string;
-    }) => boolean>;
-    provider: z.ZodString;
-    dataPath: z.ZodOptional<z.ZodString>;
-    destroy: z.ZodOptional<z.ZodCustom<() => Promise<void>, () => Promise<void>>>;
-}, z.core.$strip>;
+    }) => boolean;
+    destroy?: () => Promise<void>;
+}
+export declare const NameResolverSchema: z.ZodCustom<NameResolverInterface, NameResolverInterface>;
 export declare const NameResolverSerializedSchema: z.ZodObject<{
     key: z.ZodString;
     provider: z.ZodString;
@@ -42,32 +34,7 @@ export declare const PKCUserOptionBaseSchema: z.ZodObject<{
     pkcRpcClientsOptions: z.ZodOptional<z.ZodArray<z.ZodURL>>;
     dataPath: z.ZodOptional<z.ZodString>;
     resolveAuthorNames: z.ZodBoolean;
-    nameResolvers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        key: z.ZodString;
-        resolve: z.ZodCustom<(opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>, (opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>>;
-        canResolve: z.ZodCustom<(opts: {
-            name: string;
-        }) => boolean, (opts: {
-            name: string;
-        }) => boolean>;
-        provider: z.ZodString;
-        dataPath: z.ZodOptional<z.ZodString>;
-        destroy: z.ZodOptional<z.ZodCustom<() => Promise<void>, () => Promise<void>>>;
-    }, z.core.$strip>>>;
+    nameResolvers: z.ZodOptional<z.ZodArray<z.ZodCustom<NameResolverInterface, NameResolverInterface>>>;
     libp2pJsClientsOptions: z.ZodOptional<z.ZodArray<z.ZodObject<{
         key: z.ZodString;
         libp2pOptions: z.ZodDefault<z.ZodCustom<Partial<import("libp2p").Libp2pInit<import("helia").DefaultLibp2pServices> & {
@@ -308,32 +275,7 @@ export declare const PKCUserOptionsSchema: z.ZodPipe<z.ZodObject<{
     kuboRpcClientsOptions: z.ZodOptional<z.ZodPipe<z.ZodArray<z.ZodCustom<KuboRpcClientCreateOption, KuboRpcClientCreateOption>>, z.ZodTransform<import("kubo-rpc-client").Options[], KuboRpcClientCreateOption[]>>>;
     pkcRpcClientsOptions: z.ZodOptional<z.ZodArray<z.ZodURL>>;
     dataPath: z.ZodOptional<z.ZodString>;
-    nameResolvers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        key: z.ZodString;
-        resolve: z.ZodCustom<(opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>, (opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>>;
-        canResolve: z.ZodCustom<(opts: {
-            name: string;
-        }) => boolean, (opts: {
-            name: string;
-        }) => boolean>;
-        provider: z.ZodString;
-        dataPath: z.ZodOptional<z.ZodString>;
-        destroy: z.ZodOptional<z.ZodCustom<() => Promise<void>, () => Promise<void>>>;
-    }, z.core.$strip>>>;
+    nameResolvers: z.ZodOptional<z.ZodArray<z.ZodCustom<NameResolverInterface, NameResolverInterface>>>;
     libp2pJsClientsOptions: z.ZodOptional<z.ZodArray<z.ZodObject<{
         key: z.ZodString;
         libp2pOptions: z.ZodDefault<z.ZodCustom<Partial<import("libp2p").Libp2pInit<import("helia").DefaultLibp2pServices> & {
@@ -586,23 +528,7 @@ export declare const PKCUserOptionsSchema: z.ZodPipe<z.ZodObject<{
     kuboRpcClientsOptions?: import("kubo-rpc-client").Options[] | undefined;
     pkcRpcClientsOptions?: string[] | undefined;
     dataPath?: string | undefined;
-    nameResolvers?: {
-        key: string;
-        resolve: (opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>;
-        canResolve: (opts: {
-            name: string;
-        }) => boolean;
-        provider: string;
-        dataPath?: string | undefined;
-        destroy?: (() => Promise<void>) | undefined;
-    }[] | undefined;
+    nameResolvers?: NameResolverInterface[] | undefined;
     libp2pJsClientsOptions?: {
         key: string;
         libp2pOptions: Partial<import("libp2p").Libp2pInit<import("helia").DefaultLibp2pServices> & {
@@ -734,23 +660,7 @@ export declare const PKCUserOptionsSchema: z.ZodPipe<z.ZodObject<{
     kuboRpcClientsOptions?: import("kubo-rpc-client").Options[] | undefined;
     pkcRpcClientsOptions?: string[] | undefined;
     dataPath?: string | undefined;
-    nameResolvers?: {
-        key: string;
-        resolve: (opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>;
-        canResolve: (opts: {
-            name: string;
-        }) => boolean;
-        provider: string;
-        dataPath?: string | undefined;
-        destroy?: (() => Promise<void>) | undefined;
-    }[] | undefined;
+    nameResolvers?: NameResolverInterface[] | undefined;
     libp2pJsClientsOptions?: {
         key: string;
         libp2pOptions: Partial<import("libp2p").Libp2pInit<import("helia").DefaultLibp2pServices> & {
@@ -1113,30 +1023,5 @@ export declare const PKCParsedOptionsSchema: z.ZodObject<{
     }, z.core.$strict>>>>>;
     kuboRpcClientsOptions: z.ZodOptional<z.ZodCustom<import("kubo-rpc-client").Options[], import("kubo-rpc-client").Options[]>>;
     pubsubKuboRpcClientsOptions: z.ZodOptional<z.ZodCustom<import("kubo-rpc-client").Options[], import("kubo-rpc-client").Options[]>>;
-    nameResolvers: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        key: z.ZodString;
-        resolve: z.ZodCustom<(opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>, (opts: {
-            name: string;
-            provider: string;
-            abortSignal?: AbortSignal;
-        }) => Promise<{
-            publicKey: string;
-            [key: string]: string;
-        } | undefined>>;
-        canResolve: z.ZodCustom<(opts: {
-            name: string;
-        }) => boolean, (opts: {
-            name: string;
-        }) => boolean>;
-        provider: z.ZodString;
-        dataPath: z.ZodOptional<z.ZodString>;
-        destroy: z.ZodOptional<z.ZodCustom<() => Promise<void>, () => Promise<void>>>;
-    }, z.core.$strip>>>;
+    nameResolvers: z.ZodOptional<z.ZodArray<z.ZodCustom<NameResolverInterface, NameResolverInterface>>>;
 }, z.core.$strict>;

package/dist/browser/schema.js

@@ -4,35 +4,33 @@ import { UserAgentSchema } from "./schema/schema.js";
 import version from "./version.js";
 // This file will have misc schemas, as well as PKC class schema
 export const ChainTickerSchema = z.string().min(1);
-export const nonNegativeIntStringSchema = z
-    .string()
-    .regex(/^\d+$/)
-    .refine((val) => parseInt(val) >= 0, {
-    message: "Must be a non-negative integer"
-});
+export { nonNegativeIntStringSchema } from "./schema/schema.js";
 export const Uint8ArraySchema = z.custom((value) => value instanceof Uint8Array, { message: "Expected Uint8Array" });
 const IpfsGatewayUrlSchema = z.url().startsWith("http", "IPFS gateway URL must start with http:// or https://");
 const RpcUrlSchema = z.url().startsWith("ws", "PKC RPC URL must start with ws:// or wss://"); // Optional websocket URLs of PKC RPC servers, required to run a community from a browser/electron/webview
 const KuboRpcCreateClientOptionSchema = z.custom(); // Kubo-rpc-client library will do the validation for us
 const DirectoryPathSchema = z.string(); // TODO add validation for path
-export const NameResolverSchema = z.object({
+// z.custom() preserves the original object (including class instances) — z.object() would strip unknown keys and break class-based resolvers
+export const NameResolverSchema = z.custom((val) => {
+    if (val == null || typeof val !== "object")
+        return false;
+    const v = val;
+    return (typeof v.key === "string" &&
+        v.key.length > 0 &&
+        typeof v.resolve === "function" &&
+        typeof v.canResolve === "function" &&
+        typeof v.provider === "string" &&
+        v.provider.length > 0 &&
+        (v.destroy === undefined || typeof v.destroy === "function"));
+}, {
+    message: "Invalid name resolver: must have key (string), resolve (function), canResolve (function), provider (string), and optionally destroy (function)"
+});
+// Serialized variant without function props — for RPC transport where functions can't survive JSON serialization
+export const NameResolverSerializedSchema = z.object({
     key: z.string().min(1),
-    resolve: z.custom((val) => typeof val === "function", {
-        message: "resolve must be a function"
-    }),
-    canResolve: z.custom((val) => typeof val === "function", {
-        message: "canResolve must be a function"
-    }),
     provider: z.string().min(1),
-    dataPath: z.string().optional(), // Optional filesystem path for persistent cache storage. Resolvers can use this to store cached resolution results across restarts.
-    destroy: z
-        .custom((val) => typeof val === "function", {
-        message: "destroy must be a function"
-    })
-        .optional()
+    dataPath: z.string().optional()
 });
-// Serialized variant without function props — for RPC transport where functions can't survive JSON serialization
-export const NameResolverSerializedSchema = NameResolverSchema.omit({ resolve: true, canResolve: true, destroy: true });
 const TransformKuboRpcClientOptionsSchema = KuboRpcCreateClientOptionSchema.array().transform((options) => options.map(parseIpfsRawOptionToIpfsOptions));
 const ParsedKuboRpcClientOptionsSchema = z.custom();
 export const PKCUserOptionBaseSchema = z.object({

package/dist/browser/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"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"}

package/dist/browser/signer/signatures.d.ts

@@ -163,7 +163,8 @@ type ParentCommentForVerifyingPages = Pick<CommentIpfsWithCidPostCidDefined, "ci
     postCid: undefined;
 };
 type CommunityForVerifyingPages = {
-    address: string;
+    publicKey?: string;
+    name?: string;
     signature?: CommunityIpfsType["signature"];
 };
 export declare function verifyPageComment({ pageComment, community, parentComment, resolveAuthorNames, clientsManager, validatePages, validateUpdateSignature, abortSignal }: {

package/dist/browser/signer/signatures.js

@@ -3,9 +3,9 @@ import * as cborg from "cborg";
 import { toString as uint8ArrayToString } from "uint8arrays/to-string";
 import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
 import * as ed from "@noble/ed25519";
-import PeerId from "peer-id";
+import { peerIdFromString } from "@libp2p/peer-id";
 import { areEquivalentCommunityAddresses, isStringDomain, removeNullUndefinedEmptyObjectsValuesRecursively, timestamp } from "../util.js";
-import { getCommunityAddressFromRecord, getCommunityNameFromWire } from "../publications/publication-community.js";
+import { getCommunityNameFromWire, getCommunityPublicKeyFromWire } from "../publications/publication-community.js";
 import { PKCError } from "../pkc-error.js";
 import Logger from "../logger.js";
 import { messages } from "../errors.js";
@@ -329,9 +329,12 @@ export async function verifyCommunity({ community, communityIpnsName, resolveAut
     const cacheKey = sha256(community.signature.signature + validatePages + communityIpnsName);
     if (cacheIfValidWithDefault && clientsManager._pkc._memCaches.communityVerificationCache.get(cacheKey))
         return { valid: true };
-    // Derive address for page verification: name || publicKey || ipnsName
     const communityAddress = community.name || getPKCAddressFromPublicKeySync(community.signature.publicKey);
-    const communityForPages = { address: communityAddress, signature: community.signature };
+    const communityForPages = {
+        publicKey: getPKCAddressFromPublicKeySync(community.signature.publicKey),
+        name: community.name,
+        signature: community.signature
+    };
     if (community.posts?.pages && validatePages)
         for (const preloadedPageSortName of remeda.keys.strict(community.posts.pages)) {
             const pageCid = community.posts.pageCids?.[preloadedPageSortName];
@@ -355,8 +358,8 @@ export async function verifyCommunity({ community, communityIpnsName, resolveAut
                 return { valid: false, reason: messages.ERR_COMMUNITY_POSTS_INVALID };
             }
         }
-    const communityPeerId = PeerId.createFromB58String(communityIpnsName);
-    const signaturePeerId = await getPeerIdFromPublicKey(community.signature.publicKey);
+    const communityPeerId = peerIdFromString(communityIpnsName);
+    const signaturePeerId = getPeerIdFromPublicKey(community.signature.publicKey);
     if (!communityPeerId.equals(signaturePeerId))
         return { valid: false, reason: messages.ERR_COMMUNITY_IPNS_NAME_DOES_NOT_MATCH_SIGNATURE_PUBLIC_KEY };
     clientsManager._pkc._memCaches.communityVerificationCache.set(cacheKey, true);
@@ -390,7 +393,12 @@ export async function verifyCommentUpdate({ update, resolveAuthorNames, clientsM
         if (!jsonValidation.valid)
             return jsonValidation;
     }
-    const cacheKey = sha256(update.signature.signature + community.address + JSON.stringify(comment) + validatePages + validateUpdateSignature);
+    const cacheKey = sha256(update.signature.signature +
+        community.publicKey +
+        community.name +
+        JSON.stringify(comment) +
+        validatePages +
+        validateUpdateSignature);
     if (clientsManager._pkc._memCaches.commentUpdateVerificationCache.get(cacheKey))
         return { valid: true };
     if ("edit" in update && update.edit) {
@@ -440,7 +448,7 @@ function _maximumTimestamp() {
     return timestamp() + 5 * 60;
 }
 async function _validateChallengeRequestId(msg) {
-    const signaturePublicKeyPeerId = await getPeerIdFromPublicKeyBuffer(msg.signature.publicKey);
+    const signaturePublicKeyPeerId = getPeerIdFromPublicKeyBuffer(msg.signature.publicKey);
     if (!signaturePublicKeyPeerId.equals(msg.challengeRequestId))
         return { valid: false, reason: messages.ERR_CHALLENGE_REQUEST_ID_NOT_DERIVED_FROM_SIGNATURE };
     else
@@ -492,10 +500,6 @@ export async function verifyPageComment({ pageComment, community, parentComment,
     // another sceneario is with a flat page, where we don't have the parent comment cid or prop, but we do have its postCid
     // another sceneario is when we're veriifying a nested page and we have the parent comment cid and all its props
     // another sceneario is when we're verifying a mod queue page that has comments with different depths with different parentCids and not necessarily a shared postCid
-    // Handle both old format (subplebbitAddress) and new format (communityPublicKey/communityName)
-    const pageCommunityAddress = getCommunityAddressFromRecord(pageComment.comment);
-    if (pageCommunityAddress && !areEquivalentCommunityAddresses(pageCommunityAddress, community.address))
-        return { valid: false, reason: messages.ERR_COMMENT_IN_PAGE_BELONG_TO_DIFFERENT_COMMUNITY };
     if (pageComment.comment.depth === 0 && pageComment.comment.postCid)
         return { valid: false, reason: messages.ERR_PAGE_COMMENT_POST_HAS_POST_CID_DEFINED_WITH_DEPTH_0 };
     if (parentComment) {
@@ -508,12 +512,28 @@ export async function verifyPageComment({ pageComment, community, parentComment,
         if (pageComment.comment.postCid !== parentComment.postCid)
             return { valid: false, reason: messages.ERR_PAGE_COMMENT_POST_CID_IS_NOT_SAME_AS_POST_CID_OF_COMMENT_INSTANCE };
     }
+    // Check that the comment belongs to the same community as the page
+    const commentRecord = pageComment.comment;
+    if (community.name) {
+        // Domain-based community: only check name mismatch (key rotation is allowed)
+        const communityNameFromRecord = getCommunityNameFromWire(commentRecord);
+        if (communityNameFromRecord && !areEquivalentCommunityAddresses(communityNameFromRecord, community.name))
+            return { valid: false, reason: messages.ERR_COMMENT_IN_PAGE_BELONG_TO_DIFFERENT_COMMUNITY };
+    }
+    else if (community.publicKey) {
+        // Key-only community: check publicKey mismatch
+        const communityPublicKeyFromRecord = getCommunityPublicKeyFromWire(commentRecord);
+        if (communityPublicKeyFromRecord && !areEquivalentCommunityAddresses(communityPublicKeyFromRecord, community.publicKey))
+            return { valid: false, reason: messages.ERR_COMMENT_IN_PAGE_BELONG_TO_DIFFERENT_COMMUNITY };
+    }
     const calculatedCommentCid = await calculateIpfsHash(deterministicStringify(pageComment.comment));
     const commentSignatureValidity = await verifyCommentIpfs({
         comment: pageComment.comment,
         resolveAuthorNames,
         clientsManager,
         calculatedCommentCid,
+        communityNameFromInstance: community.name,
+        communityPublicKeyFromInstance: community.publicKey,
         abortSignal
     });
     if (!commentSignatureValidity.valid)
@@ -542,12 +562,7 @@ export async function verifyPageComment({ pageComment, community, parentComment,
 }
 export async function verifyPage({ pageCid, pageSortName, page, resolveAuthorNames, clientsManager, community, parentComment, validatePages, validateUpdateSignature, abortSignal }) {
     const cacheKey = pageCid &&
-        sha256(pageCid +
-            community.address +
-            community.signature?.publicKey +
-            JSON.stringify(parentComment) +
-            validatePages +
-            validateUpdateSignature);
+        sha256(pageCid + community.publicKey + community.name + JSON.stringify(parentComment) + validatePages + validateUpdateSignature);
     if (cacheKey)
         if (clientsManager._pkc._memCaches.pageVerificationCache.get(cacheKey))
             return { valid: true };
@@ -570,7 +585,7 @@ export async function verifyPage({ pageCid, pageSortName, page, resolveAuthorNam
     return { valid: true };
 }
 export async function verifyModQueuePage({ pageCid, page, resolveAuthorNames, clientsManager, community, validatePages, validateUpdateSignature, abortSignal }) {
-    const cacheKey = pageCid && sha256(pageCid + community.address + community.signature?.publicKey + validatePages + validateUpdateSignature);
+    const cacheKey = pageCid && sha256(pageCid + community.publicKey + community.name + validatePages + validateUpdateSignature);
     if (cacheKey)
         if (clientsManager._pkc._memCaches.pageVerificationCache.get(cacheKey))
             return { valid: true };