cddl 0.9.0 → 0.11.0

package/build/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAA;AAE9B,OAAO,EAAE,KAAK,EAAU,MAAM,aAAa,CAAC;AAG5C,OAAO,EAE2C,UAAU,EAE3D,MAAM,UAAU,CAAA;AAoBjB,MAAM,CAAC,OAAO,OAAO,MAAM;;IAEvB,CAAC,EAAE,KAAK,CAAC;IAET,QAAQ,EAAE,KAAK,CAAa;IAC5B,SAAS,EAAE,KAAK,CAAa;gBAEhB,QAAQ,EAAE,MAAM;IAQ7B,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,gBAAgB;IA2CxB,OAAO,CAAC,oBAAoB;IAua5B,OAAO,CAAC,wBAAwB;IAahC;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IA8HzB,OAAO,CAAC,aAAa;IAgBrB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,kBAAkB;IAiD1B,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,YAAY;IAcpB,KAAK;IAaL,OAAO,CAAC,WAAW;CAKtB"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAA;AAE9B,OAAO,EAAE,KAAK,EAAU,MAAM,aAAa,CAAC;AAG5C,OAAO,EAE2C,UAAU,EAE3D,MAAM,UAAU,CAAA;AAoBjB,MAAM,CAAC,OAAO,OAAO,MAAM;;IAEvB,CAAC,EAAE,KAAK,CAAC;IAET,QAAQ,EAAE,KAAK,CAAa;IAC5B,SAAS,EAAE,KAAK,CAAa;gBAEhB,QAAQ,EAAE,MAAM;IAQ7B,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,gBAAgB;IA2CxB,OAAO,CAAC,oBAAoB;IAqb5B,OAAO,CAAC,wBAAwB;IAahC;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IAqJzB,OAAO,CAAC,aAAa;IAgBrB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,kBAAkB;IAuD1B,OAAO,CAAC,gBAAgB;IA4DxB;;OAEG;IACH,OAAO,CAAC,YAAY;IAcpB,KAAK;IAaL,OAAO,CAAC,WAAW;CAKtB"}

package/build/parser.js

@@ -142,9 +142,11 @@ export default class Parser {
          * parse operator assignments, e.g. `ip4 = (float .ge 0.0) .default 1.0`
          */
         if (closingTokens.length === 1 && this.peekToken.Type === Tokens.DOT) {
+            const propertyType = this.parsePropertyType();
+            const operator = this.isOperator() ? this.parseOperator() : undefined;
             const prop = {
-                Type: this.parsePropertyType(),
-                Operator: this.parseOperator()
+                Type: propertyType,
+                ...(operator ? { Operator: operator } : {})
             };
             this.nextToken(); // eat closing token
             if (groupName) {
@@ -315,6 +317,18 @@ export default class Parser {
              */
             const props = this.parseAssignmentValue();
             const operator = this.isOperator() ? this.parseOperator() : undefined;
+            if (!isChoice && this.curToken.Type === Tokens.SLASH) {
+                this.nextToken();
+                const nextType = this.parsePropertyType();
+                if (Array.isArray(props)) {
+                    /**
+                     * property has not yet been flagged as a choice, but is part
+                     * of one, e.g. `(float .ge 1.0) / null`
+                     */
+                    props.push(nextType);
+                    this.nextToken();
+                }
+            }
             if (Array.isArray(props)) {
                 /**
                  * property has multiple types (e.g. `float / tstr / int`)
@@ -609,6 +623,28 @@ export default class Parser {
                 },
                 Unwrapped: isUnwrapped
             };
+            if (!isGroupedRange && this.peekToken.Literal === Tokens.RPAREN) {
+                /**
+                 * If we are at the end of a grouped range, and this was called
+                 * on the first item of the range as opposed to the opening
+                 * parenthesis, isGroupedRange will not be set to true at this
+                 * point. We need to advance to the closing parenthesis, and if
+                 * the next token is an operator, we need to advance to the dot
+                 * so that parseOperator will work properly.
+                 * e.g.
+                 *
+                 * ```
+                 * (1.0..2.0) .default 1.5
+                 * ```
+                 *
+                 * This will be called on the `1.0` and then the `2.0` will be parsed
+                 * as a grouped range.
+                 */
+                this.nextToken();
+                if (this.peekToken.Type === Tokens.DOT) {
+                    isGroupedRange = true;
+                }
+            }
             if (isGroupedRange) {
                 this.nextToken(); // eat ")"
             }
@@ -661,7 +697,13 @@ export default class Parser {
         while (this.curToken.Type === Tokens.SLASH) {
             this.nextToken(); // eat `/`
             propertyTypes.push(this.parsePropertyType());
-            this.nextToken();
+            if (!this.isOperator()) {
+                /**
+                 * If we are not parsing an operator, we need to eat the next token;
+                 * otherwise, the operator will be parsed by the caller
+                 */
+                this.nextToken();
+            }
             /**
              * ensure we don't go into the next choice, e.g.:
              * ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cddl",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "Concise data definition language (RFC 8610) implementation and JSON validator in Node.js",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",