@atproto/lexicon 0.2.2 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atproto/lexicon
 
+## 0.3.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 [[`84e2d4d2`](https://github.com/bluesky-social/atproto/commit/84e2d4d2b6694f344d80c18672c78b650189d423)]:
+  - @atproto/common-web@0.2.3
+  - @atproto/syntax@0.1.4
+
+## 0.2.3
+
+### Patch Changes
+
+- Updated dependencies [[`35d108ce`](https://github.com/bluesky-social/atproto/commit/35d108ce94866ce1b3d147cd0620a0ba1c4ebcd7)]:
+  - @atproto/common-web@0.2.2
+  - @atproto/syntax@0.1.3
+
 ## 0.2.2
 
 ### 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

@@ -31,4 +31,9 @@ lex.assertValidXrpcOutput('com.example.query', {...})
 
 ## 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/index.js

@@ -8872,7 +8872,6 @@ __export(src_exports2, {
   BlobRef: () => BlobRef,
   InvalidLexiconError: () => InvalidLexiconError,
   LexiconDefNotFoundError: () => LexiconDefNotFoundError,
-  LexiconDocMalformedError: () => LexiconDocMalformedError,
   Lexicons: () => Lexicons,
   ValidationError: () => ValidationError,
   discriminatedObject: () => discriminatedObject,
@@ -8913,6 +8912,7 @@ __export(src_exports2, {
   lexXrpcSubscription: () => lexXrpcSubscription,
   lexXrpcSubscriptionMessage: () => lexXrpcSubscriptionMessage,
   lexiconDoc: () => lexiconDoc,
+  parseLexiconDoc: () => parseLexiconDoc,
   stringifyLex: () => stringifyLex,
   typedJsonBlobRef: () => typedJsonBlobRef,
   untypedJsonBlobRef: () => untypedJsonBlobRef
@@ -13916,6 +13916,25 @@ var validateLanguage = (langTag) => {
 };
 var bcp47Regexp = /^((?<grandfathered>(en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang))|((?<language>([A-Za-z]{2,3}(-(?<extlang>[A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-(?<script>[A-Za-z]{4}))?(-(?<region>[A-Za-z]{2}|[0-9]{3}))?(-(?<variant>[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-(?<extension>[0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(?<privateUseA>x(-[A-Za-z0-9]{1,8})+))?)|(?<privateUseB>x(-[A-Za-z0-9]{1,8})+))$/;
 
+// ../common-web/src/did-doc.ts
+var verificationMethod = z.object({
+  id: z.string(),
+  type: z.string(),
+  controller: z.string(),
+  publicKeyMultibase: z.string().optional()
+});
+var service = z.object({
+  id: z.string(),
+  type: z.string(),
+  serviceEndpoint: z.union([z.string(), z.record(z.unknown())])
+});
+var didDocument = z.object({
+  id: z.string(),
+  alsoKnownAs: z.array(z.string()).optional(),
+  verificationMethod: z.array(verificationMethod).optional(),
+  service: z.array(service).optional()
+});
+
 // src/validators/formats.ts
 var import_iso_datestring_validator = __toESM(require_dist());
 function datetime(path, value) {
@@ -14764,15 +14783,10 @@ 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;
-  }
-};
+function parseLexiconDoc(v) {
+  lexiconDoc.parse(v);
+  return v;
+}
 var ValidationError = class extends Error {
 };
 var InvalidLexiconError = class extends Error {
@@ -14853,23 +14867,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);
     }
   }
@@ -15046,7 +15050,6 @@ var jsonStringToLex = (val) => {
   BlobRef,
   InvalidLexiconError,
   LexiconDefNotFoundError,
-  LexiconDocMalformedError,
   Lexicons,
   ValidationError,
   discriminatedObject,
@@ -15087,6 +15090,7 @@ var jsonStringToLex = (val) => {
   lexXrpcSubscription,
   lexXrpcSubscriptionMessage,
   lexiconDoc,
+  parseLexiconDoc,
   stringifyLex,
   typedJsonBlobRef,
   untypedJsonBlobRef