cddl 0.13.0 → 0.14.0

package/.release-it.json

@@ -0,0 +1,12 @@
+{
+  "plugins": {
+    "release-it-pnpm": {}
+  },
+  "git": {
+    "requireCleanWorkingDir": false,
+    "addUntrackedFiles": true,
+    "tagName": "cddl-v${version}",
+    "commitMessage": "chore(cddl): release v${version}",
+    "changelog": "git log --pretty=format:\"* %s (%h)\" ${latestTag ? latestTag + '..HEAD' : ''} -- . ../../tsconfig.json"
+  }
+}

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Christian Bromann
+Copyright (c) 2026 Christian Bromann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,4 +1,4 @@
-CDDL [![Test](https://github.com/christian-bromann/cddl/actions/workflows/test.yml/badge.svg)](https://github.com/christian-bromann/cddl/actions/workflows/test.yml)
+CDDL
 ====
 
 > Concise data definition language ([RFC 8610](https://tools.ietf.org/html/rfc8610)) implementation and JSON validator in Node.js.
@@ -10,7 +10,7 @@ There are also CDDL parsers for other languages:
 
 The package is currently mostly used to help generate typed interfaces for the WebDriver Bidi specification in the following projects:
 - [WebdriverIO](https://webdriver.io) - via the [`cddl2ts`](https://www.npmjs.com/package/cddl2ts) package and [this script](https://github.com/webdriverio/webdriverio/blob/a2ae35332f9b3fc9490136df1ac3d2e14c1e35b6/scripts/bidi/index.ts)
-- [Selenium](https://selenium.dev) - via the [`cddl2java`](https://github.com/christian-bromann/cddl2java) package
+- [Selenium](https://selenium.dev) - via the [`cddl2java`](https://github.com/webdriverio/cddl2java) package
 
 __Note:__ this is __work in progress__, feel free to have a look at the code or contribute but don't use this for anything yet!
 
@@ -66,8 +66,8 @@ console.log(ast)
  */
 ```
 
-Read the full documentation on this AST in the [`/docs`](/docs/README.md) directory.
+Read the full documentation on this AST in the [`docs`](./docs/README.md) directory.
 
 ---
 
-If you are interested in this project, please feel free to contribute ideas or code patches. Have a look at our [contributing guidelines](https://github.com/christian-bromann/cddl/blob/master/CONTRIBUTING.md) to get started.
+If you are interested in this project, please feel free to contribute ideas or code patches. Have a look at our [contributing guidelines](https://github.com/webdriverio/cddl/blob/master/CONTRIBUTING.md) to get started.

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,23 +1,19 @@
 {
   "name": "cddl",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Concise data definition language (RFC 8610) implementation and JSON validator in Node.js",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
-  "homepage": "https://github.com/christian-bromann/cddl#readme",
+  "homepage": "https://github.com/webdriverio/cddl#readme",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/christian-bromann/cddl.git"
+    "url": "git+ssh://git@github.com/webdriverio/cddl.git"
   },
   "keywords": [
     "cddl"
   ],
-  "engines": {
-    "node": ">=20.0.0",
-    "npm": ">=9.0.0"
-  },
   "bugs": {
-    "url": "https://github.com/christian-bromann/cddl/issues"
+    "url": "https://github.com/webdriverio/cddl/issues"
   },
   "type": "module",
   "exports": "./build/index.js",
@@ -25,29 +21,19 @@
   "bin": {
     "cddl": "./bin/cddl.js"
   },
-  "scripts": {
-    "build": "run-s clean compile",
-    "clean": "rm -rf ./build ./coverage",
-    "compile": "tsc -p ./tsconfig.json",
-    "release": "release-it --github.release",
-    "release:ci": "npm run release -- --ci --npm.skipChecks --no-git.requireCleanWorkingDir",
-    "release:patch": "npm run release -- patch",
-    "release:minor": "npm run release -- minor",
-    "release:major": "npm run release -- major",
-    "test": "vitest run",
-    "checks:all": "npm run compile && npm run test",
-    "watch": "tsc --watch"
-  },
   "devDependencies": {
-    "@types/node": "^24.12.0",
+    "@types/node": "^25.5.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.9.3",
+    "npm-run-all2": "^8.0.4",
+    "typescript": "^6.0.2",
     "vitest": "^4.1.0"
   },
   "dependencies": {
     "yargs": "^18.0.0"
+  },
+  "scripts": {
+    "release": "release-it --github.release",
+    "release:ci": "pnpm release --ci --npm.skipChecks"
   }
-}
+}

package/src/ast.ts

@@ -0,0 +1,180 @@
+/**
+ * a group definition
+ * ```
+ * person = {
+ *     age: int,
+ *     name: tstr,
+ *     employer: tstr,
+ * }
+ * ```
+ */
+export type Group = {
+    Type: 'group'
+    Name: string
+    IsChoiceAddition: boolean
+    Properties: (Property|Property[])[]
+    Comments: Comment[]
+}
+
+/**
+ * an array definition
+ * ```
+ * Geography = [
+ *     city: tstr
+ * ]
+ * ```
+ */
+export type Array = {
+    Type: 'array'
+    Name: string
+    Values: (Property|Property[])[]
+    Comments: Comment[]
+}
+
+/**
+ * a tag definition
+ * ```
+ * #6.32(tstr)
+ * ```
+ */
+export type Tag = {
+    NumericPart: number
+    TypePart: string
+}
+
+/**
+ * a variable assignment
+ * ```
+ * device-address = byte
+ * ```
+ */
+export type Variable = {
+    Type: 'variable'
+    Name: string
+    IsChoiceAddition: boolean
+    PropertyType: PropertyType | PropertyType[]
+    Operator?: Operator
+    Comments: Comment[]
+}
+
+/**
+ * a comment statement
+ * ```
+ * ; This is a comment
+ * ```
+ */
+export type Comment = {
+    Type: 'comment'
+    Content: string
+    Leading: boolean
+}
+
+export type Occurrence = {
+    n: number
+    m: number
+}
+
+export type Property = {
+    HasCut: boolean
+    Occurrence: Occurrence
+    Name: PropertyName
+    Type: PropertyType | PropertyType[]
+    Comments: Comment[]
+    Operator?: Operator
+}
+
+export enum Type {
+    /**
+     * any types
+     */
+    ANY = 'any',
+
+    /**
+     * boolean types
+     */
+    // Boolean value (major type 7, additional information 20 or 21).
+    BOOL = 'bool',
+
+    /**
+     * numeric types
+     */
+    // An unsigned integer or a negative integer.
+    INT = 'int',
+    // An unsigned integer (major type 0).
+    UINT = 'uint',
+    // A negative integer (major type 1).
+    NINT = 'nint',
+    // One of float16, float32, or float64.
+    FLOAT = 'float',
+    // A number representable as an IEEE 754 half-precision float
+    FLOAT16 = 'float16',
+    // A number representable as an IEEE 754 single-precision
+    FLOAT32 = 'float32',
+    // A number representable as an IEEE 754 double-precision
+    FLOAT64 = 'float64',
+
+    /**
+     * string types
+     */
+    // A byte string (major type 2).
+    BSTR = 'bstr',
+    // A byte string (major type 2).
+    BYTES = 'bytes',
+    // Text string (major type 3)
+    TSTR = 'tstr',
+    // Text string (major type 3)
+    TEXT = 'text',
+
+    /**
+     * null types
+     */
+    NIL = 'nil',
+    NULL = 'null'
+}
+
+/**
+ * can be a number, e.g. "foo = 0..10"
+ * ```
+ * {
+ *   Type: "int",
+ *   Value: 6
+ * }
+ * ```
+ * or a literal, e.g. "foo = 0..max-byte"
+ * ```
+ * {
+ *   Type: "literal",
+ *   Value: "max-byte"
+ * }
+ * ```
+ */
+export type RangePropertyReference = number | string
+
+export type Range = {
+    Min: RangePropertyReference
+    Max: RangePropertyReference
+    Inclusive: boolean
+}
+
+export type OperatorType = 'default' | 'size' | 'regexp' | 'bits' | 'and' | 'within' | 'eq' | 'ne' | 'lt' | 'le' | 'gt' | 'ge'
+export interface Operator {
+    Type: OperatorType
+    Value: PropertyType
+}
+
+export type PropertyReferenceType = 'literal' | 'group' | 'group_array' | 'array' | 'range' | 'tag'
+export type PropertyReference = {
+    Type: PropertyReferenceType
+    Value: string | number | boolean | Group | Array | Range | Tag
+    Unwrapped: boolean
+    Operator?: Operator
+}
+
+export interface NativeTypeWithOperator {
+    Type: Type | PropertyReference
+    Operator?: Operator
+}
+
+export type Assignment = Group | Array | Variable
+export type PropertyType = Assignment | Array | PropertyReference | string | NativeTypeWithOperator
+export type PropertyName = string

package/src/cli/commands/repl.ts

@@ -0,0 +1,33 @@
+import repl from 'node:repl'
+import type { Argv } from 'yargs'
+
+import { CLI_EPILOGUE } from '../constants.js'
+import Lexer from '../../lexer.js'
+import { Tokens } from '../../tokens.js'
+
+export const command = 'repl'
+export const desc = 'Run CDDL repl'
+export const builder = (yargs: Argv<{}>) => {
+    return yargs
+        .epilogue(CLI_EPILOGUE)
+        .help()
+}
+
+export const handler = () => {
+    repl.start({
+        prompt: '> ',
+        eval: evaluate
+    })
+}
+
+export function evaluate (evalCmd: string, _: any, _file: string, callback: (err: Error | null, result: any) => void) {
+    if (!evalCmd) {
+        return callback(new Error('No input'), null)
+    }
+
+    const l = new Lexer(evalCmd)
+    for (let tok = l.nextToken(); tok.Type !== Tokens.EOF; tok = l.nextToken()) {
+        console.log(tok)
+    }
+    return callback(null, null)
+}

package/src/cli/commands/validate.ts

@@ -0,0 +1,44 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import type { Argv, ArgumentsCamelCase } from 'yargs'
+
+import { CLI_EPILOGUE } from '../constants.js'
+import { parse } from '../../index.js'
+
+interface ValidateArguments {
+    filePath: string
+}
+
+export const command = 'validate <filePath>'
+export const desc = 'Validate a *.cddl file'
+export const builder = (yargs: Argv<{}>) => {
+    return yargs
+        .epilogue(CLI_EPILOGUE)
+        .help()
+}
+
+export const handler = (argv: ArgumentsCamelCase<ValidateArguments>) => {
+    const filePath = argv.filePath.startsWith('/')
+        ? argv.filePath
+        : path.resolve(process.cwd(), argv.filePath)
+
+    if (!fs.existsSync(filePath)) {
+        console.error(`Couldn't find CDDL file at ${filePath}`)
+        return process.exit(1)
+    }
+
+    try {
+        parse(filePath)
+
+
+        /**
+         * ToDo check for
+         *  - missing group declarations
+         */
+
+        console.log('✅ Valid CDDL file!')
+    } catch (err: unknown) {
+        console.error(`⚠️  Invalid CDDL file (${filePath})\n\n${(err as Error).stack}`)
+        process.exit(1)
+    }
+}

package/src/cli/constants.ts

@@ -0,0 +1 @@
+export const CLI_EPILOGUE = `Copyright 2023 - Christian Bromann`

package/src/cli/index.ts

@@ -0,0 +1,18 @@
+import yargs from 'yargs/yargs'
+import { hideBin } from 'yargs/helpers'
+
+import * as replCommand from './commands/repl.js'
+import * as validateCommand from './commands/validate.js'
+import { CLI_EPILOGUE } from './constants.js'
+
+export default async function () {
+    const argv = yargs(hideBin(process.argv))
+        .command(replCommand)
+        .command(validateCommand as any)
+        .example('$0 repl', 'Start CDDL repl')
+        .epilogue(CLI_EPILOGUE)
+        .demandCommand()
+        .help()
+
+    return argv.argv
+}

package/src/constants.ts

@@ -0,0 +1,16 @@
+export const WHITESPACE_CHARACTERS = [' ', '\t', '\n', '\r']
+export const BOOLEAN_LITERALS = ['true', 'false']
+
+/**
+ * as defined in Appendix D
+ * https://tools.ietf.org/html/draft-ietf-cbor-cddl-08#appendix-D
+ */
+export const PREDEFINED_IDENTIFIER = [
+    'any', 'uint', 'nint', 'int', 'bstr', 'bytes', 'tstr', 'text',
+    'tdate', 'time', 'number', 'biguint', 'bignint', 'bigint',
+    'integer', 'unsigned', 'decfrac', 'bigfloat', 'eb64url',
+    'eb64legacy', 'eb16', 'encoded-cbor', 'uri', 'b64url',
+    'b64legacy', 'regexp', 'mime-message', 'cbor-any', 'float16',
+    'float32', 'float64', 'float16-32', 'float32-64', 'float',
+    'false', 'true', 'bool', 'nil', 'null', 'undefined'
+]

package/src/index.ts

@@ -0,0 +1,11 @@
+import Lexer from './lexer.js'
+import Parser from './parser.js'
+
+export function parse (filePath: string) {
+    const parser = new Parser(filePath)
+    return parser.parse()
+}
+
+export default { parse }
+export { Lexer, Parser }
+export * from './ast.js'