@atproto/xrpc 0.3.3 → 0.4.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atproto/xrpc
 
+## 0.4.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atproto/lexicon@0.3.1
+
+## 0.4.0
+
+### Minor Changes
+
+- [#1801](https://github.com/bluesky-social/atproto/pull/1801) [`ce49743d`](https://github.com/bluesky-social/atproto/commit/ce49743d7f8800d33116b88001d7b512553c2c89) Thanks [@gaearon](https://github.com/gaearon)! - Methods that accepts lexicons now take `LexiconDoc` type instead of `unknown`
+
+### Patch Changes
+
+- [#1788](https://github.com/bluesky-social/atproto/pull/1788) [`84e2d4d2`](https://github.com/bluesky-social/atproto/commit/84e2d4d2b6694f344d80c18672c78b650189d423) Thanks [@bnewbold](https://github.com/bnewbold)! - update license to "MIT or Apache2"
+
+- Updated dependencies [[`ce49743d`](https://github.com/bluesky-social/atproto/commit/ce49743d7f8800d33116b88001d7b512553c2c89), [`84e2d4d2`](https://github.com/bluesky-social/atproto/commit/84e2d4d2b6694f344d80c18672c78b650189d423)]:
+  - @atproto/lexicon@0.3.0
+
 ## 0.3.3
 
 ### Patch Changes

package/LICENSE.txt

@@ -0,0 +1,7 @@
+Dual MIT/Apache-2.0 License
+
+Copyright (c) 2022-2023 Bluesky PBC, and Contributors
+
+Except as otherwise noted in individual files, this software is licensed under the MIT license (<http://opensource.org/licenses/MIT>), or the Apache License, Version 2.0 (<http://www.apache.org/licenses/LICENSE-2.0>).
+
+Downstream projects and end users may chose either license individually, or both together, at their discretion. The motivation for this dual-licensing is the additional software patent assurance provided by Apache 2.0.

package/README.md

@@ -8,9 +8,10 @@ TypeScript client library for talking to [atproto](https://atproto.com) services
 ## Usage
 
 ```typescript
+import { LexiconDoc } from '@atproto/lexicon'
 import xrpc from '@atproto/xrpc'
 
-xrpc.addLexicon({
+const pingLexicon: LexiconDoc = {
   lexicon: 1,
   id: 'io.example.ping',
   defs: {
@@ -31,7 +32,8 @@ xrpc.addLexicon({
       },
     },
   },
-})
+}
+xrpc.addLexicon(pingLexicon)
 
 const res1 = await xrpc.call('https://example.com', 'io.example.ping', {
   message: 'hello world',
@@ -44,7 +46,7 @@ const res2 = await xrpc
 res2.encoding // => 'application/json'
 res2.body // => {message: 'hello world'}
 
-xrpc.addLexicon({
+const writeJsonLexicon: LexiconDoc = {
   lexicon: 1,
   id: 'io.example.writeJsonFile',
   defs: {
@@ -60,7 +62,8 @@ xrpc.addLexicon({
       },
     },
   },
-})
+}
+xrpc.addLexicon(writeJsonLexicon)
 
 const res3 = await xrpc.service('https://example.com').call(
   'io.example.writeJsonFile',
@@ -71,4 +74,9 @@ const res3 = await xrpc.service('https://example.com').call(
 
 ## License
 
-MIT
+This project is dual-licensed under MIT and Apache 2.0 terms:
+
+- MIT license ([LICENSE-MIT.txt](https://github.com/bluesky-social/atproto/blob/main/LICENSE-MIT.txt) or http://opensource.org/licenses/MIT)
+- Apache License, Version 2.0, ([LICENSE-APACHE.txt](https://github.com/bluesky-social/atproto/blob/main/LICENSE-APACHE.txt) or http://www.apache.org/licenses/LICENSE-2.0)
+
+Downstream projects and end users may chose either license individually, or both together, at their discretion. The motivation for this dual-licensing is the additional software patent assurance provided by Apache 2.0.

package/dist/client.d.ts

@@ -1,12 +1,12 @@
-import { Lexicons } from '@atproto/lexicon';
+import { LexiconDoc, Lexicons } from '@atproto/lexicon';
 import { FetchHandler, FetchHandlerResponse, Headers, CallOptions, QueryParams, XRPCResponse } from './types';
 export declare class Client {
     fetch: FetchHandler;
     lex: Lexicons;
     call(serviceUri: string | URL, methodNsid: string, params?: QueryParams, data?: unknown, opts?: CallOptions): Promise<XRPCResponse>;
     service(serviceUri: string | URL): ServiceClient;
-    addLexicon(doc: unknown): void;
-    addLexicons(docs: unknown[]): void;
+    addLexicon(doc: LexiconDoc): void;
+    addLexicons(docs: LexiconDoc[]): void;
     removeLexicon(uri: string): void;
 }
 export declare class ServiceClient {

package/dist/index.js

@@ -12688,13 +12688,13 @@ var ensureValidAtUri = (uri2) => {
     throw new Error("ATURI requires at least method and authority sections");
   }
   try {
-    ensureValidHandle(parts[2]);
-  } catch {
-    try {
+    if (parts[2].startsWith("did:")) {
       ensureValidDid(parts[2]);
-    } catch {
-      throw new Error("ATURI authority must be a valid handle or DID");
+    } else {
+      ensureValidHandle(parts[2]);
     }
+  } catch {
+    throw new Error("ATURI authority must be a valid handle or DID");
   }
   if (parts.length >= 4) {
     if (parts[3].length == 0) {
@@ -13989,7 +13989,7 @@ function datetime(path, value) {
   } catch {
     return {
       success: false,
-      error: new ValidationError(`${path} must be an iso8601 formatted datetime`)
+      error: new ValidationError(`${path} must be an valid atproto datetime (both RFC-3339 and ISO-8601)`)
     };
   }
   return { success: true, value };
@@ -14824,15 +14824,6 @@ var discriminatedObject = z.object({ $type: z.string() });
 function isDiscriminatedObject(value) {
   return discriminatedObject.safeParse(value).success;
 }
-var LexiconDocMalformedError = class extends Error {
-  constructor(message, schemaDef, issues) {
-    super(message);
-    this.schemaDef = schemaDef;
-    this.issues = issues;
-    this.schemaDef = schemaDef;
-    this.issues = issues;
-  }
-};
 var ValidationError = class extends Error {
 };
 var InvalidLexiconError = class extends Error {
@@ -14913,23 +14904,13 @@ var Lexicons = class {
     }
   }
   add(doc) {
-    try {
-      lexiconDoc.parse(doc);
-    } catch (e) {
-      if (e instanceof ZodError) {
-        throw new LexiconDocMalformedError(`Failed to parse schema definition ${doc.id}`, doc, e.issues);
-      } else {
-        throw e;
-      }
-    }
-    const validatedDoc = doc;
-    const uri2 = toLexUri(validatedDoc.id);
+    const uri2 = toLexUri(doc.id);
     if (this.docs.has(uri2)) {
       throw new Error(`${uri2} has already been registered`);
     }
-    resolveRefUris(validatedDoc, uri2);
-    this.docs.set(uri2, validatedDoc);
-    for (const [defUri, def2] of iterDefs(validatedDoc)) {
+    resolveRefUris(doc, uri2);
+    this.docs.set(uri2, doc);
+    for (const [defUri, def2] of iterDefs(doc)) {
       this.defs.set(defUri, def2);
     }
   }