@stxt-lang/core 0.7.0 → 0.7.1

package/README.md

@@ -7,6 +7,7 @@ STXT is a plain-text format for writing structured, semantic documents: no brace
 - Website and language reference: <https://stxt.dev>
 - VSCode extension: [STXT - Semantic Text](https://marketplace.visualstudio.com/items?itemName=stxt-lang.stxt)
 - Java implementation: [`dev.stxt:stxt-core`](https://central.sonatype.com/artifact/dev.stxt/stxt-core) on Maven Central
+- Python implementation: [`stxt`](https://pypi.org/project/stxt/) on PyPI
 
 ## What STXT looks like
 
@@ -149,7 +150,7 @@ for (const error of result.getErrors()) {
 }
 ```
 
-Available value types: `INLINE`, `BLOCK`, `TEXT`, `BOOLEAN`, `INTEGER`, `NATURAL`, `NUMBER`, `DATE`, `TIMESTAMP`, `EMAIL`, `URL`, `HEXADECIMAL`, `BASE64`, `GROUP`, `ENUM`.
+Available value types: `INLINE`, `BLOCK`, `TEXT`, `MARKDOWN`, `BOOLEAN`, `INTEGER`, `NATURAL`, `NUMBER`, `DATE`, `TIME`, `TIMESTAMP`, `UUID`, `EMAIL`, `URL`, `HEXADECIMAL`, `BINARY`, `BASE64`, `GROUP`, `ENUM`.
 
 ## Finding the schemas: discovery
 

package/out/schema/type/EMAIL.d.ts

@@ -1,2 +1,8 @@
-/** `EMAIL` type: checks that the value looks like an e-mail address. */
+/**
+ * `EMAIL` type: checks that the value is an e-mail address, in either of the two forms of
+ * STXT-SCHEMA-SPEC 9.4: the bare address (`user@domain.tld`) or a display name followed by the
+ * address between angle brackets (`Joan Costa <joan@example.com>`). The display name is any
+ * non-empty text without `<` or `>` (quotes are not interpreted) and the space before `<` is
+ * optional; `<`/`>` without a name, unbalanced or followed by anything are rejected.
+ */
 export declare const EMAIL: import("../Type").Type;

package/out/schema/type/EMAIL.js

@@ -2,6 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EMAIL = void 0;
 const regexType_1 = require("./regexType");
-/** `EMAIL` type: checks that the value looks like an e-mail address. */
-exports.EMAIL = (0, regexType_1.regexType)("EMAIL", /^(?=.{1,256}$)(?=.{1,64}@.{1,255}$)(?=.{1,64}@.{1,63}\..{1,63}$)[A-Za-z0-9!#$%&'*+/=?^_`{|}~.-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/, "Invalid email");
+/**
+ * The address proper, `local@domain` with the usual length limits, as it reads when it ends the
+ * value (bare form)...
+ */
+const ADDRESS = "(?=.{1,256}$)(?=.{1,64}@.{1,255}$)(?=.{1,64}@.{1,63}\\..{1,63}$)"
+    + "[A-Za-z0-9!#$%&'*+/=?^_`{|}~.-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}";
+/** ...and the same address as it reads between `<` and `>` (the lookaheads stop at the `>`). */
+const BRACKETED = "(?=[^>]{1,256}>$)(?=[^>]{1,64}@[^>]{1,255}>$)(?=[^>]{1,64}@[^>]{1,63}\\.[^>]{1,63}>$)"
+    + "[A-Za-z0-9!#$%&'*+/=?^_`{|}~.-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}";
+/**
+ * `EMAIL` type: checks that the value is an e-mail address, in either of the two forms of
+ * STXT-SCHEMA-SPEC 9.4: the bare address (`user@domain.tld`) or a display name followed by the
+ * address between angle brackets (`Joan Costa <joan@example.com>`). The display name is any
+ * non-empty text without `<` or `>` (quotes are not interpreted) and the space before `<` is
+ * optional; `<`/`>` without a name, unbalanced or followed by anything are rejected.
+ */
+exports.EMAIL = (0, regexType_1.regexType)("EMAIL", new RegExp(`^(?:[^<>]*[^<>\\s]\\s*<${BRACKETED}>|${ADDRESS})$`), "Invalid email");
 //# sourceMappingURL=EMAIL.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stxt-lang/core",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Parser and schema validator for STXT, an indentation-based structured-text format.",
   "main": "out/all.js",
   "types": "out/all.d.ts",