cddl 0.12.1 → 0.13.1

package/build/cli/commands/repl.d.ts

@@ -3,5 +3,5 @@ export declare const command = "repl";
 export declare const desc = "Run CDDL repl";
 export declare const builder: (yargs: Argv<{}>) => Argv<{}>;
 export declare const handler: () => void;
-export declare function evaluate(evalCmd: string, _: any, file: string, callback: (err: Error | null, result: any) => void): void;
+export declare function evaluate(evalCmd: string, _: any, _file: string, callback: (err: Error | null, result: any) => void): void;
 //# sourceMappingURL=repl.d.ts.map

package/build/cli/commands/repl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repl.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/repl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAMjC,eAAO,MAAM,OAAO,SAAS,CAAA;AAC7B,eAAO,MAAM,IAAI,kBAAkB,CAAA;AACnC,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI,CAAC,EAAE,CAAC,aAItC,CAAA;AAED,eAAO,MAAM,OAAO,YAKnB,CAAA;AAED,wBAAgB,QAAQ,CAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,QAUlH"}
+{"version":3,"file":"repl.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/repl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAMjC,eAAO,MAAM,OAAO,SAAS,CAAA;AAC7B,eAAO,MAAM,IAAI,kBAAkB,CAAA;AACnC,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI,CAAC,EAAE,CAAC,aAItC,CAAA;AAED,eAAO,MAAM,OAAO,YAKnB,CAAA;AAED,wBAAgB,QAAQ,CAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,IAAI,QAUnH"}

package/build/cli/commands/repl.js

@@ -10,12 +10,12 @@ export const builder = (yargs) => {
         .help();
 };
 export const handler = () => {
-    const r = repl.start({
+    repl.start({
         prompt: '> ',
         eval: evaluate
     });
 };
-export function evaluate(evalCmd, _, file, callback) {
+export function evaluate(evalCmd, _, _file, callback) {
     if (!evalCmd) {
         return callback(new Error('No input'), null);
     }

package/build/lexer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lexer.d.ts","sourceRoot":"","sources":["../src/lexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,MAAM,aAAa,CAAC;AAI5C,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAI;IACpB,YAAY,EAAE,MAAM,CAAI;IACxB,EAAE,EAAE,MAAM,CAAI;gBAED,MAAM,EAAE,MAAM;IAM3B,OAAO,CAAC,QAAQ;IAUhB,WAAW;;;;IAqBX,OAAO,CAAE,UAAU,EAAE,MAAM;IAI3B,eAAe;IASf,SAAS,IAAK,KAAK;IA+FnB,OAAO,CAAC,cAAc;IA2BtB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,iBAAiB;IA8BzB,OAAO,CAAC,cAAc;CAKzB"}
+{"version":3,"file":"lexer.d.ts","sourceRoot":"","sources":["../src/lexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,MAAM,aAAa,CAAC;AAI5C,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAI;IACpB,YAAY,EAAE,MAAM,CAAI;IACxB,EAAE,EAAE,MAAM,CAAI;gBAED,MAAM,EAAE,MAAM;IAM3B,OAAO,CAAC,QAAQ;IAUhB,WAAW;;;;IAoBX,OAAO,CAAE,UAAU,EAAE,MAAM;IAI3B,eAAe;IASf,SAAS,IAAK,KAAK;IA+FnB,OAAO,CAAC,cAAc;IA2BtB,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,UAAU;IAWlB,OAAO,CAAC,iBAAiB;IA8BzB,OAAO,CAAC,cAAc;CAKzB"}

package/build/lexer.js

@@ -27,7 +27,6 @@ export default class Lexer {
         let i = 0;
         for (const [line, lineLength] of Object.entries(sourceLineLength)) {
             i += lineLength + 1;
-            const lineBegin = i - lineLength;
             if (i > position) {
                 const lineBegin = i - lineLength;
                 return {

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;IAC7B,cAAc,EAAE,KAAK,CAAa;gBAErB,QAAQ,EAAE,MAAM;IAS7B,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,gBAAgB;IA2CxB,OAAO,CAAC,oBAAoB;IA8d5B,OAAO,CAAC,wBAAwB;IAahC;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IAqKzB,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"}
+{"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;IAC7B,cAAc,EAAE,KAAK,CAAa;gBAErB,QAAQ,EAAE,MAAM;IAS7B,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,gBAAgB;IA2CxB,OAAO,CAAC,oBAAoB;IAue5B,OAAO,CAAC,wBAAwB;IAahC;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,iBAAiB;IAqKzB,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

@@ -120,7 +120,7 @@ export default class Parser {
             const propertyType = [];
             while (!closingTokens.includes(this.curToken.Type)) {
                 propertyType.push(...this.parsePropertyTypes());
-                if (this.curToken.Type === Tokens.RPAREN) {
+                if (closingTokens.includes(this.curToken.Type)) {
                     this.nextToken();
                     break;
                 }
@@ -239,6 +239,14 @@ export default class Parser {
                     this.nextToken();
                     isChoice = false;
                 }
+                if (this.curToken.Type === Tokens.SLASH && this.peekToken.Type !== Tokens.SLASH) {
+                    if (!isChoice) {
+                        const last = valuesOrProperties.pop();
+                        valuesOrProperties.push([last]);
+                        isChoice = true;
+                    }
+                    this.nextToken();
+                }
                 continue;
             }
             /**
@@ -727,8 +735,8 @@ export default class Parser {
                 Operator: this.parseOperator()
             };
         }
-        else {
-            this.nextToken(); // eat `/`
+        else if (this.curToken.Type !== Tokens.SLASH) {
+            this.nextToken(); // eat Property if not already consumed (e.g. by Group parsing)
         }
         propertyTypes.push(prop);
         /**
@@ -747,7 +755,7 @@ export default class Parser {
         while (this.curToken.Type === Tokens.SLASH) {
             this.nextToken(); // eat `/`
             propertyTypes.push(this.parsePropertyType());
-            if (!this.isOperator()) {
+            if (!this.isOperator() && this.curToken.Type !== Tokens.SLASH) {
                 /**
                  * If we are not parsing an operator, we need to eat the next token;
                  * otherwise, the operator will be parsed by the caller

package/docs/cddl-cheatsheet.md

@@ -193,4 +193,39 @@ LiteralTest = {
   is_active: true,
   deleted_at: null
 }
+
+---
+
+## 6. Groups as Maps
+
+Wrap a **Group** in curly braces `{}` to treat it as a **Map**.
+
+```cddl
+; A reusable Group of fields
+DateFields = ( year: int, month: int, day: int )
+
+; 1. Mix it into a Map
+Appointment = {
+  description: tstr,
+  DateFields
+}
+
+; 2. Standalone Map
+DateObject = { DateFields }
+```
+
+### Choices with Groups and Maps
+
+You can mix explicit Maps and Groups-as-Maps in type choices:
+
+```cddl
+ArrayMap = { type: "array", values: [...] }
+DateGroup = ( type: "date", value: tstr )
+
+; Matches either map structure
+MixedValue = (
+  ArrayMap /      ; Map defined elsewhere
+  { DateGroup }   ; Group wrapped in Map
+)
+```
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cddl",
-  "version": "0.12.1",
+  "version": "0.13.1",
   "description": "Concise data definition language (RFC 8610) implementation and JSON validator in Node.js",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -12,6 +12,10 @@
   "keywords": [
     "cddl"
   ],
+  "engines": {
+    "node": ">=20.0.0",
+    "npm": ">=9.0.0"
+  },
   "bugs": {
     "url": "https://github.com/christian-bromann/cddl/issues"
   },
@@ -35,15 +39,15 @@
     "watch": "tsc --watch"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "@types/node": "^22.15.3",
-    "@vitest/coverage-v8": "^3.1.2",
+    "@types/node": "^24.12.0",
+    "@types/yargs": "^17.0.35",
+    "@vitest/coverage-v8": "^4.1.0",
     "npm-run-all": "^4.1.5",
     "release-it": "^19.2.4",
-    "typescript": "^5.8.3",
-    "vitest": "^3.1.2"
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.0"
   },
   "dependencies": {
-    "yargs": "^17.7.2"
+    "yargs": "^18.0.0"
   }
 }