cddl2ts 0.7.2 → 0.9.0

package/README.md

@@ -23,6 +23,12 @@ This package exposes a CLI as well as a programmatic interface for transforming
 npx cddl2ts ./path/to/interface.cddl &> ./path/to/interface.ts
 ```
 
+Generated interface fields default to `camelCase`. Pass `--field-case snake` to emit `snake_case` fields while keeping exported interface and type names unchanged.
+
+```sh
+npx cddl2ts ./path/to/interface.cddl --field-case snake &> ./path/to/interface.ts
+```
+
 ### Programmatic Interface
 
 The module exports a `transform` method that takes a CDDL AST object and returns a TypeScript definition as `string`, e.g.:
@@ -41,16 +47,16 @@ import { parse, transform } from 'cddl'
  * };
  */
 const ast = parse('./spec.cddl')
-const ts = transform(ast)
+const ts = transform(ast, { fieldCase: 'snake' })
 console.log(ts)
 /**
  * outputs:
  *
  * interface SessionCapabilityRequest {
- *   acceptInsecureCerts?: boolean,
- *   browserName?: string,
- *   browserVersion?: string,
- *   platformName?: string,
+ *   accept_insecure_certs?: boolean,
+ *   browser_name?: string,
+ *   browser_version?: string,
+ *   platform_name?: string,
  * }
  */
 ```

package/build/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AASA,wBAA8B,GAAG,CAAE,IAAI,WAAwB,sBAgC9D"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAWA,wBAA8B,GAAG,CAAE,IAAI,WAAwB,sBAyC9D"}

package/build/cli.js

@@ -4,6 +4,7 @@ import yargs from 'yargs';
 import { parse } from 'cddl';
 import { transform } from './index.js';
 import { pkg } from './constants.js';
+const FIELD_CASE_CHOICES = ['camel', 'snake'];
 export default async function cli(argv = process.argv.slice(2)) {
     const parser = yargs(argv)
         .usage(`${pkg.name}\n${pkg.description}\n\nUsage:\nrunme2ts ./path/to/spec.cddl &> ./path/to/interface.ts`)
@@ -14,6 +15,12 @@ export default async function cli(argv = process.argv.slice(2)) {
         type: 'boolean',
         description: 'Use unknown instead of any',
         default: false
+    })
+        .option('field-case', {
+        choices: FIELD_CASE_CHOICES,
+        type: 'string',
+        description: 'Case for generated interface fields',
+        default: 'camel'
     })
         .help('help')
         .alias('h', 'help')
@@ -30,5 +37,8 @@ export default async function cli(argv = process.argv.slice(2)) {
         return process.exit(1);
     }
     const ast = parse(absoluteFilePath);
-    console.log(transform(ast, { useUnknown: args.u }));
+    console.log(transform(ast, {
+        useUnknown: args.u,
+        fieldCase: args.fieldCase
+    }));
 }

package/build/index.d.ts

@@ -1,6 +1,8 @@
 import { type Assignment } from 'cddl';
+export type FieldCase = 'camel' | 'snake';
 export interface TransformOptions {
     useUnknown?: boolean;
+    fieldCase?: FieldCase;
 }
 export declare function transform(assignments: Assignment[], options?: TransformOptions): string;
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAWH,KAAK,UAAU,EAMlB,MAAM,MAAM,CAAA;AAyCb,MAAM,WAAW,gBAAgB;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,wBAAgB,SAAS,CAAE,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,UAwB/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAYH,KAAK,UAAU,EAOlB,MAAM,MAAM,CAAA;AAwCb,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;AAIzC,MAAM,WAAW,gBAAgB;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,SAAS,CAAC,EAAE,SAAS,CAAA;CACxB;AAED,wBAAgB,SAAS,CAAE,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,UA8B/E"}

package/build/index.js

@@ -1,7 +1,7 @@
 import camelcase from 'camelcase';
 import { parse, print, types } from 'recast';
 import typescriptParser from 'recast/parsers/typescript.js';
-import { isCDDLArray, isGroup, isNamedGroupReference, isLiteralWithValue, isNativeTypeWithOperator, isUnNamedProperty, isPropertyReference, isRange, isVariable, pascalCase } from 'cddl';
+import { getRegexpPattern, isCDDLArray, isGroup, isNamedGroupReference, isLiteralWithValue, isNativeTypeWithOperator, isUnNamedProperty, isPropertyReference, isRange, isVariable, pascalCase } from 'cddl';
 import { pkg } from './constants.js';
 const b = types.builders;
 const NATIVE_TYPES = {
@@ -36,8 +36,14 @@ const RECORD_KEY_TYPES = new Set([
     'float', 'float16', 'float32', 'float64', 'float16-32', 'float32-64',
     'str', 'text', 'tstr'
 ]);
+const IDENTIFIER_PATTERN = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
 export function transform(assignments, options) {
-    if (options?.useUnknown) {
+    const transformOptions = {
+        useUnknown: false,
+        fieldCase: 'camel',
+        ...options
+    };
+    if (transformOptions.useUnknown) {
         NATIVE_TYPES.any = b.tsUnknownKeyword();
     }
     else {
@@ -49,7 +55,7 @@ export function transform(assignments, options) {
         sourceRoot: process.cwd()
     });
     for (const assignment of assignments) {
-        const statement = parseAssignment(assignment);
+        const statement = parseAssignment(assignment, transformOptions);
         if (!statement) {
             continue;
         }
@@ -72,7 +78,27 @@ function isExtensibleRecordProperty(prop) {
         !prop.HasCut &&
         RECORD_KEY_TYPES.has(prop.Name);
 }
-function parseAssignment(assignment) {
+function toSnakeCase(name) {
+    return name
+        .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
+        .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2')
+        .replace(/[^A-Za-z0-9_$]+/g, '_')
+        .replace(/_+/g, '_')
+        .replace(/^_+|_+$/g, '')
+        .toLowerCase();
+}
+function formatFieldName(name, fieldCase) {
+    return fieldCase === 'snake'
+        ? toSnakeCase(name)
+        : camelcase(name);
+}
+function createPropertyKey(name, options) {
+    const fieldName = formatFieldName(name, options.fieldCase);
+    return IDENTIFIER_PATTERN.test(fieldName)
+        ? b.identifier(fieldName)
+        : b.stringLiteral(fieldName);
+}
+function parseAssignment(assignment, options) {
     if (isVariable(assignment)) {
         const propType = Array.isArray(assignment.PropertyType)
             ? assignment.PropertyType
@@ -84,7 +110,7 @@ function parseAssignment(assignment) {
             typeParameters = b.tsNumberKeyword();
         }
         else {
-            typeParameters = b.tsUnionType(propType.map(parseUnionType));
+            typeParameters = b.tsUnionType(propType.map((prop) => parseUnionType(prop, options)));
         }
         const expr = b.tsTypeAliasDeclaration(id, typeParameters);
         expr.comments = getAssignmentComments(assignment);
@@ -114,7 +140,7 @@ function parseAssignment(assignment) {
                         choiceOptions.push(nextProp);
                         i++; // Skip next property
                     }
-                    const options = choiceOptions.map(p => {
+                    const choiceTypes = choiceOptions.map(p => {
                         // If p is a group reference (Name ''), it's a TypeReference
                         // e.g. SessionAutodetectProxyConfiguration // SessionDirectProxyConfiguration
                         // The parser sometimes wraps it in an array, sometimes not (if inside a choice)
@@ -125,12 +151,12 @@ function parseAssignment(assignment) {
                             if (isNamedGroupReference(typeVal)) {
                                 return b.tsTypeReference(b.identifier(pascalCase(typeVal.Value || typeVal.Type)));
                             }
-                            return parseUnionType(typeVal);
+                            return parseUnionType(typeVal, options);
                         }
                         // Otherwise it is an object literal with this property
-                        return b.tsTypeLiteral(parseObjectType([p]));
+                        return b.tsTypeLiteral(parseObjectType([p], options));
                     });
-                    intersections.push(b.tsUnionType(options));
+                    intersections.push(b.tsUnionType(choiceTypes));
                 }
                 else {
                     staticProps.push(prop);
@@ -141,12 +167,12 @@ function parseAssignment(assignment) {
                 const mixins = staticProps.filter(isUnNamedProperty);
                 const ownProps = staticProps.filter(p => !isUnNamedProperty(p));
                 if (ownProps.length > 0) {
-                    intersections.unshift(b.tsTypeLiteral(parseObjectType(ownProps)));
+                    intersections.unshift(b.tsTypeLiteral(parseObjectType(ownProps, options)));
                 }
                 for (const mixin of mixins) {
                     if (Array.isArray(mixin.Type) && mixin.Type.length > 1) {
-                        const options = mixin.Type.map(parseUnionType);
-                        intersections.push(b.tsUnionType(options));
+                        const choices = mixin.Type.map((type) => parseUnionType(type, options));
+                        intersections.push(b.tsUnionType(choices));
                     }
                     else {
                         const typeVal = Array.isArray(mixin.Type) ? mixin.Type[0] : mixin.Type;
@@ -180,7 +206,7 @@ function parseAssignment(assignment) {
             const prop = props[0];
             const propType = Array.isArray(prop.Type) ? prop.Type : [prop.Type];
             if (propType.length === 1 && RECORD_KEY_TYPES.has(prop.Name)) {
-                const value = parseUnionType(assignment);
+                const value = parseUnionType(assignment, options);
                 const expr = b.tsTypeAliasDeclaration(id, value);
                 expr.comments = getAssignmentComments(assignment);
                 return exportWithComments(expr);
@@ -225,10 +251,10 @@ function parseAssignment(assignment) {
                     const choices = [];
                     for (const prop of group.Properties) {
                         // Choices are wrapped in arrays in the properties
-                        const options = Array.isArray(prop) ? prop : [prop];
-                        if (options.length > 1) { // It's a choice within the mixin group
+                        const choiceProps = Array.isArray(prop) ? prop : [prop];
+                        if (choiceProps.length > 1) { // It's a choice within the mixin group
                             const unionOptions = [];
-                            for (const option of options) {
+                            for (const option of choiceProps) {
                                 let refName;
                                 const type = option.Type;
                                 if (typeof type === 'string')
@@ -260,7 +286,7 @@ function parseAssignment(assignment) {
                                 continue;
                             }
                         }
-                        for (const option of options) {
+                        for (const option of choiceProps) {
                             let refName;
                             const type = option.Type;
                             if (typeof type === 'string') {
@@ -355,7 +381,7 @@ function parseAssignment(assignment) {
                             }
                             else if (type && typeof type === 'object') {
                                 if (isGroup(type) && Array.isArray(type.Properties)) {
-                                    choices.push(b.tsTypeLiteral(parseObjectType(type.Properties)));
+                                    choices.push(b.tsTypeLiteral(parseObjectType(type.Properties, options)));
                                     continue;
                                 }
                                 refName = isNamedGroupReference(type)
@@ -390,7 +416,7 @@ function parseAssignment(assignment) {
             }
             const ownProps = props.filter(p => !isUnNamedProperty(p));
             if (ownProps.length > 0) {
-                intersections.push(b.tsTypeLiteral(parseObjectType(ownProps)));
+                intersections.push(b.tsTypeLiteral(parseObjectType(ownProps, options)));
             }
             let value;
             if (intersections.length === 1) {
@@ -404,7 +430,7 @@ function parseAssignment(assignment) {
             return exportWithComments(expr);
         }
         // Fallback to interface if no mixins (pure object)
-        const objectType = parseObjectType(props);
+        const objectType = parseObjectType(props, options);
         const expr = b.tsInterfaceDeclaration(id, b.tsInterfaceBody(objectType));
         expr.comments = getAssignmentComments(assignment);
         return exportWithComments(expr);
@@ -419,7 +445,7 @@ function parseAssignment(assignment) {
             // We need to parse each choice.
             const obj = assignmentValues.map((prop) => {
                 const t = Array.isArray(prop.Type) ? prop.Type[0] : prop.Type;
-                return parseUnionType(t);
+                return parseUnionType(t, options);
             });
             const value = b.tsArrayType(b.tsParenthesizedType(b.tsUnionType(obj)));
             const expr = b.tsTypeAliasDeclaration(id, value);
@@ -429,10 +455,10 @@ function parseAssignment(assignment) {
         // Standard array
         const firstType = assignmentValues.Type;
         const obj = Array.isArray(firstType)
-            ? firstType.map(parseUnionType)
+            ? firstType.map((type) => parseUnionType(type, options))
             : isCDDLArray(firstType)
-                ? firstType.Values.map((val) => parseUnionType(Array.isArray(val.Type) ? val.Type[0] : val.Type))
-                : [parseUnionType(firstType)];
+                ? firstType.Values.map((val) => parseUnionType(Array.isArray(val.Type) ? val.Type[0] : val.Type, options))
+                : [parseUnionType(firstType, options)];
         const value = b.tsArrayType(obj.length === 1
             ? obj[0]
             : b.tsParenthesizedType(b.tsUnionType(obj)));
@@ -442,7 +468,7 @@ function parseAssignment(assignment) {
     }
     throw new Error(`Unknown assignment type "${assignment.Type}"`);
 }
-function parseObjectType(props) {
+function parseObjectType(props, options) {
     const propItems = [];
     for (const prop of props) {
         /**
@@ -465,7 +491,7 @@ function parseObjectType(props) {
             const keyIdentifier = b.identifier('key');
             keyIdentifier.typeAnnotation = b.tsTypeAnnotation(NATIVE_TYPES[prop.Name]);
             const indexSignature = b.tsIndexSignature([keyIdentifier], b.tsTypeAnnotation(b.tsUnionType([
-                ...cddlType.map((t) => parseUnionType(t)),
+                ...cddlType.map((t) => parseUnionType(t, options)),
                 b.tsUndefinedKeyword()
             ])));
             indexSignature.comments = comments.length
@@ -474,14 +500,14 @@ function parseObjectType(props) {
             propItems.push(indexSignature);
             continue;
         }
-        const id = b.identifier(camelcase(prop.Name));
+        const id = createPropertyKey(prop.Name, options);
         if (prop.Operator && prop.Operator.Type === 'default') {
             const defaultValue = parseDefaultValue(prop.Operator);
             defaultValue && comments.length && comments.push(''); // add empty line if we have previous comments
             defaultValue && comments.push(` @default ${defaultValue}`);
         }
         const type = cddlType.map((t) => {
-            const unionType = parseUnionType(t);
+            const unionType = parseUnionType(t, options);
             if (unionType) {
                 const defaultValue = parseDefaultValue(t.Operator);
                 defaultValue && comments.length && comments.push(''); // add empty line if we have previous comments
@@ -498,13 +524,62 @@ function parseObjectType(props) {
     }
     return propItems;
 }
-function parseUnionType(t) {
+function parseTemplateLiteralType(template) {
+    const ast = parse(`type __CDDLTemplate = ${template};`, {
+        parser: typescriptParser,
+        sourceFileName: 'cddl2Ts.ts',
+        sourceRoot: process.cwd()
+    });
+    return ast.program.body[0].typeAnnotation;
+}
+function escapeTemplateLiteralSegment(segment) {
+    return segment
+        .replace(/\\/g, '\\\\')
+        .replace(/`/g, '\\`')
+        .replace(/\$\{/g, '\\${');
+}
+function regexpPatternToTemplateLiteral(pattern) {
+    const normalized = pattern.startsWith('^') && pattern.endsWith('$')
+        ? pattern.slice(1, -1)
+        : pattern;
+    if (!normalized.includes('.+')) {
+        return;
+    }
+    const wildcardOnlyPattern = normalized.replace(/(\.\+)+/g, '');
+    if (wildcardOnlyPattern.includes('(') || wildcardOnlyPattern.includes('[') || wildcardOnlyPattern.includes('\\')) {
+        return;
+    }
+    const segments = normalized.split(/(?:\.\+)+/g);
+    if (segments.length <= 1) {
+        return;
+    }
+    return `\`${segments.map(escapeTemplateLiteralSegment).join('${string}')}\``;
+}
+function parseNativeTypeWithOperator(t) {
+    if (typeof t.Type !== 'string') {
+        return;
+    }
+    const regexpPattern = getRegexpPattern(t);
+    const templateLiteral = regexpPattern && regexpPatternToTemplateLiteral(regexpPattern);
+    if (templateLiteral) {
+        return parseTemplateLiteralType(templateLiteral);
+    }
+    return NATIVE_TYPES[t.Type];
+}
+function parseUnionType(t, options) {
     if (typeof t === 'string') {
         if (!NATIVE_TYPES[t]) {
             throw new Error(`Unknown native type: "${t}`);
         }
         return NATIVE_TYPES[t];
     }
+    else if (isNativeTypeWithOperator(t) && typeof t.Type === 'string') {
+        const nativeType = parseNativeTypeWithOperator(t);
+        if (!nativeType) {
+            throw new Error(`Unknown native type with operator: ${JSON.stringify(t)}`);
+        }
+        return nativeType;
+    }
     else if (t.Type && typeof t.Type === 'string' && NATIVE_TYPES[t.Type]) {
         return NATIVE_TYPES[t.Type];
     }
@@ -524,31 +599,31 @@ function parseUnionType(t) {
              * Check if we have choices in the group (arrays of Properties)
              */
             if (prop.some(p => Array.isArray(p))) {
-                const options = [];
+                const choices = [];
                 for (const choice of prop) {
                     const subProps = Array.isArray(choice) ? choice : [choice];
                     if (subProps.length === 1 && isUnNamedProperty(subProps[0])) {
                         const first = subProps[0];
                         const subType = Array.isArray(first.Type) ? first.Type[0] : first.Type;
-                        options.push(parseUnionType(subType));
+                        choices.push(parseUnionType(subType, options));
                         continue;
                     }
                     if (subProps.every(isUnNamedProperty)) {
                         const tupleItems = subProps.map((p) => {
                             const subType = Array.isArray(p.Type) ? p.Type[0] : p.Type;
-                            return parseUnionType(subType);
+                            return parseUnionType(subType, options);
                         });
-                        options.push(b.tsTupleType(tupleItems));
+                        choices.push(b.tsTupleType(tupleItems));
                         continue;
                     }
-                    options.push(b.tsTypeLiteral(parseObjectType(subProps)));
+                    choices.push(b.tsTypeLiteral(parseObjectType(subProps, options)));
                 }
-                return b.tsUnionType(options);
+                return b.tsUnionType(choices);
             }
             if (prop.every(isUnNamedProperty)) {
                 const items = prop.map(p => {
                     const t = Array.isArray(p.Type) ? p.Type[0] : p.Type;
-                    return parseUnionType(t);
+                    return parseUnionType(t, options);
                 });
                 if (items.length === 1)
                     return items[0];
@@ -560,13 +635,13 @@ function parseUnionType(t) {
             if (prop.length === 1 && RECORD_KEY_TYPES.has(prop[0].Name)) {
                 return b.tsTypeReference(b.identifier('Record'), b.tsTypeParameterInstantiation([
                     NATIVE_TYPES[prop[0].Name],
-                    parseUnionType(prop[0].Type[0])
+                    parseUnionType(prop[0].Type[0], options)
                 ]));
             }
             /**
              * e.g. ?attributes: {*foo => text},
              */
-            return b.tsTypeLiteral(parseObjectType(t.Properties));
+            return b.tsTypeLiteral(parseObjectType(t.Properties, options));
         }
         else if (isNamedGroupReference(t)) {
             return b.tsTypeReference(b.identifier(pascalCase(t.Value)));

package/cli-examples/remote.ts

@@ -385,9 +385,9 @@ export interface BrowsingContextPrintParameters {
   shrinkToFit?: boolean;
 }
 
-export // Minimum size is 1pt x 1pt. Conversion follows from
+// Minimum size is 1pt x 1pt. Conversion follows from
 // https://www.w3.org/TR/css3-values/#absolute-lengths
-interface BrowsingContextPrintMarginParameters {
+export interface BrowsingContextPrintMarginParameters {
   /**
    * @default 1
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cddl2ts",
-  "version": "0.7.2",
+  "version": "0.9.0",
   "description": "A Node.js package that can generate a TypeScript definition based on a CDDL file",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -32,7 +32,7 @@
     "camelcase": "^9.0.0",
     "recast": "^0.23.11",
     "yargs": "^18.0.0",
-    "cddl": "0.19.2"
+    "cddl": "0.20.0"
   },
   "scripts": {
     "release": "release-it --config .release-it.ts --VV",

package/src/cli.ts

@@ -4,9 +4,11 @@ import yargs from 'yargs'
 
 import { parse } from 'cddl'
 
-import { transform } from './index.js'
+import { transform, type FieldCase } from './index.js'
 import { pkg } from './constants.js'
 
+const FIELD_CASE_CHOICES = ['camel', 'snake'] as const satisfies readonly FieldCase[]
+
 export default async function cli (argv = process.argv.slice(2)) {
     const parser = yargs(argv)
         .usage(`${pkg.name}\n${pkg.description}\n\nUsage:\nrunme2ts ./path/to/spec.cddl &> ./path/to/interface.ts`)
@@ -18,6 +20,12 @@ export default async function cli (argv = process.argv.slice(2)) {
             description: 'Use unknown instead of any',
             default: false
         })
+        .option('field-case', {
+            choices: FIELD_CASE_CHOICES,
+            type: 'string',
+            description: 'Case for generated interface fields',
+            default: 'camel'
+        })
         .help('help')
         .alias('h', 'help')
         .alias('v', 'version')
@@ -38,5 +46,8 @@ export default async function cli (argv = process.argv.slice(2)) {
     }
 
     const ast = parse(absoluteFilePath)
-    console.log(transform(ast, { useUnknown: args.u as boolean }))
+    console.log(transform(ast, {
+        useUnknown: args.u as boolean,
+        fieldCase: args.fieldCase as FieldCase
+    }))
 }

package/src/index.ts

@@ -3,6 +3,7 @@ import { parse, print, types } from 'recast'
 import typescriptParser from 'recast/parsers/typescript.js'
 
 import {
+    getRegexpPattern,
     isCDDLArray,
     isGroup,
     isNamedGroupReference,
@@ -14,6 +15,7 @@ import {
     isVariable,
     pascalCase,
     type Assignment,
+    type NativeTypeWithOperator,
     type PropertyType,
     type PropertyReference,
     type Property,
@@ -59,13 +61,23 @@ const RECORD_KEY_TYPES = new Set([
 type ObjectEntry = types.namedTypes.TSCallSignatureDeclaration | types.namedTypes.TSConstructSignatureDeclaration | types.namedTypes.TSIndexSignature | types.namedTypes.TSMethodSignature | types.namedTypes.TSPropertySignature
 type ObjectBody = ObjectEntry[]
 type TSTypeKind = types.namedTypes.TSAsExpression['typeAnnotation']
+export type FieldCase = 'camel' | 'snake'
+type TransformSettings = Required<TransformOptions>
+const IDENTIFIER_PATTERN = /^[A-Za-z_$][A-Za-z0-9_$]*$/
 
 export interface TransformOptions {
     useUnknown?: boolean
+    fieldCase?: FieldCase
 }
 
 export function transform (assignments: Assignment[], options?: TransformOptions) {
-    if (options?.useUnknown) {
+    const transformOptions: TransformSettings = {
+        useUnknown: false,
+        fieldCase: 'camel',
+        ...options
+    }
+
+    if (transformOptions.useUnknown) {
         NATIVE_TYPES.any = b.tsUnknownKeyword()
     } else {
         NATIVE_TYPES.any = b.tsAnyKeyword()
@@ -81,7 +93,7 @@ export function transform (assignments: Assignment[], options?: TransformOptions
     ) satisfies types.namedTypes.File
 
     for (const assignment of assignments) {
-        const statement = parseAssignment(assignment)
+        const statement = parseAssignment(assignment, transformOptions)
         if (!statement) {
             continue
         }
@@ -111,7 +123,30 @@ function isExtensibleRecordProperty (prop: Property) {
         RECORD_KEY_TYPES.has(prop.Name)
 }
 
-function parseAssignment (assignment: Assignment) {
+function toSnakeCase (name: string) {
+    return name
+        .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
+        .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2')
+        .replace(/[^A-Za-z0-9_$]+/g, '_')
+        .replace(/_+/g, '_')
+        .replace(/^_+|_+$/g, '')
+        .toLowerCase()
+}
+
+function formatFieldName (name: string, fieldCase: FieldCase) {
+    return fieldCase === 'snake'
+        ? toSnakeCase(name)
+        : camelcase(name)
+}
+
+function createPropertyKey (name: string, options: TransformSettings) {
+    const fieldName = formatFieldName(name, options.fieldCase)
+    return IDENTIFIER_PATTERN.test(fieldName)
+        ? b.identifier(fieldName)
+        : b.stringLiteral(fieldName)
+}
+
+function parseAssignment (assignment: Assignment, options: TransformSettings) {
     if (isVariable(assignment)) {
         const propType = Array.isArray(assignment.PropertyType)
             ? assignment.PropertyType
@@ -124,7 +159,7 @@ function parseAssignment (assignment: Assignment) {
         if (propType.length === 1 && propType[0].Type === 'range') {
             typeParameters = b.tsNumberKeyword()
         } else {
-            typeParameters = b.tsUnionType(propType.map(parseUnionType))
+            typeParameters = b.tsUnionType(propType.map((prop) => parseUnionType(prop, options)))
         }
 
         const expr = b.tsTypeAliasDeclaration(id, typeParameters)
@@ -161,7 +196,7 @@ function parseAssignment (assignment: Assignment) {
                         i++ // Skip next property
                     }
 
-                    const options = choiceOptions.map(p => {
+                    const choiceTypes = choiceOptions.map(p => {
                         // If p is a group reference (Name ''), it's a TypeReference
                         // e.g. SessionAutodetectProxyConfiguration // SessionDirectProxyConfiguration
                         // The parser sometimes wraps it in an array, sometimes not (if inside a choice)
@@ -175,12 +210,12 @@ function parseAssignment (assignment: Assignment) {
                                    b.identifier(pascalCase(typeVal.Value || typeVal.Type))
                                )
                             }
-                            return parseUnionType(typeVal);
+                            return parseUnionType(typeVal, options)
                        }
                         // Otherwise it is an object literal with this property
-                        return b.tsTypeLiteral(parseObjectType([p]))
+                        return b.tsTypeLiteral(parseObjectType([p], options))
                     })
-                    intersections.push(b.tsUnionType(options))
+                    intersections.push(b.tsUnionType(choiceTypes))
                 } else {
                     staticProps.push(prop)
                 }
@@ -192,13 +227,13 @@ function parseAssignment (assignment: Assignment) {
                 const ownProps = staticProps.filter(p => !isUnNamedProperty(p))
 
                 if (ownProps.length > 0) {
-                    intersections.unshift(b.tsTypeLiteral(parseObjectType(ownProps)))
+                    intersections.unshift(b.tsTypeLiteral(parseObjectType(ownProps, options)))
                 }
 
                 for (const mixin of mixins) {
                     if (Array.isArray(mixin.Type) && mixin.Type.length > 1) {
-                         const options = mixin.Type.map(parseUnionType)
-                         intersections.push(b.tsUnionType(options))
+                         const choices = mixin.Type.map((type) => parseUnionType(type, options))
+                         intersections.push(b.tsUnionType(choices))
                     } else {
                         const typeVal = Array.isArray(mixin.Type) ? mixin.Type[0] : mixin.Type
                         if (isNamedGroupReference(typeVal)) {
@@ -235,7 +270,7 @@ function parseAssignment (assignment: Assignment) {
             const prop = props[0]
             const propType = Array.isArray(prop.Type) ? prop.Type : [prop.Type]
             if (propType.length === 1 && RECORD_KEY_TYPES.has(prop.Name)) {
-                const value = parseUnionType(assignment)
+                const value = parseUnionType(assignment, options)
                 const expr = b.tsTypeAliasDeclaration(id, value)
                 expr.comments = getAssignmentComments(assignment)
                 return exportWithComments(expr)
@@ -284,10 +319,10 @@ function parseAssignment (assignment: Assignment) {
 
                     for (const prop of group.Properties) {
                         // Choices are wrapped in arrays in the properties
-                        const options = Array.isArray(prop) ? prop : [prop]
-                        if (options.length > 1) { // It's a choice within the mixin group
+                        const choiceProps = Array.isArray(prop) ? prop : [prop]
+                        if (choiceProps.length > 1) { // It's a choice within the mixin group
                             const unionOptions: any[] = []
-                            for (const option of options) {
+                            for (const option of choiceProps) {
                                 let refName: string | undefined
                                 const type = option.Type
                                 if (typeof type === 'string') refName = type
@@ -314,7 +349,7 @@ function parseAssignment (assignment: Assignment) {
                             }
                         }
 
-                        for (const option of options) {
+                        for (const option of choiceProps) {
                             let refName: string | undefined
                             const type = option.Type
 
@@ -395,7 +430,7 @@ function parseAssignment (assignment: Assignment) {
                                 }
                             } else if (type && typeof type === 'object') {
                                 if (isGroup(type) && Array.isArray(type.Properties)) {
-                                    choices.push(b.tsTypeLiteral(parseObjectType(type.Properties as Property[])))
+                                    choices.push(b.tsTypeLiteral(parseObjectType(type.Properties as Property[], options)))
                                     continue
                                 }
                                 refName = isNamedGroupReference(type)
@@ -441,7 +476,7 @@ function parseAssignment (assignment: Assignment) {
 
             const ownProps = props.filter(p => !isUnNamedProperty(p))
             if (ownProps.length > 0) {
-                 intersections.push(b.tsTypeLiteral(parseObjectType(ownProps)))
+                 intersections.push(b.tsTypeLiteral(parseObjectType(ownProps, options)))
             }
 
             let value: any
@@ -457,7 +492,7 @@ function parseAssignment (assignment: Assignment) {
         }
 
         // Fallback to interface if no mixins (pure object)
-        const objectType = parseObjectType(props)
+        const objectType = parseObjectType(props, options)
 
         const expr = b.tsInterfaceDeclaration(id, b.tsInterfaceBody(objectType))
         expr.comments = getAssignmentComments(assignment)
@@ -476,7 +511,7 @@ function parseAssignment (assignment: Assignment) {
             // We need to parse each choice.
             const obj = assignmentValues.map((prop) => {
                  const t = Array.isArray(prop.Type) ? prop.Type[0] : prop.Type
-                 return parseUnionType(t)
+                 return parseUnionType(t, options)
             })
             const value = b.tsArrayType(b.tsParenthesizedType(b.tsUnionType(obj)))
             const expr = b.tsTypeAliasDeclaration(id, value)
@@ -487,10 +522,10 @@ function parseAssignment (assignment: Assignment) {
         // Standard array
         const firstType = assignmentValues.Type
         const obj = Array.isArray(firstType)
-            ? firstType.map(parseUnionType)
+            ? firstType.map((type) => parseUnionType(type, options))
             : isCDDLArray(firstType)
-                ? firstType.Values.map((val: any) => parseUnionType(Array.isArray(val.Type) ? val.Type[0] : val.Type))
-                : [parseUnionType(firstType)]
+                ? firstType.Values.map((val: any) => parseUnionType(Array.isArray(val.Type) ? val.Type[0] : val.Type, options))
+                : [parseUnionType(firstType, options)]
 
         const value = b.tsArrayType(
             obj.length === 1
@@ -505,7 +540,7 @@ function parseAssignment (assignment: Assignment) {
     throw new Error(`Unknown assignment type "${(assignment as any).Type}"`)
 }
 
-function parseObjectType (props: Property[]): ObjectBody {
+function parseObjectType (props: Property[], options: TransformSettings): ObjectBody {
     const propItems: ObjectBody = []
     for (const prop of props) {
         /**
@@ -534,7 +569,7 @@ function parseObjectType (props: Property[]): ObjectBody {
                 [keyIdentifier],
                 b.tsTypeAnnotation(
                     b.tsUnionType([
-                        ...cddlType.map((t) => parseUnionType(t)),
+                        ...cddlType.map((t) => parseUnionType(t, options)),
                         b.tsUndefinedKeyword()
                     ])
                 )
@@ -546,7 +581,7 @@ function parseObjectType (props: Property[]): ObjectBody {
             continue
         }
 
-        const id = b.identifier(camelcase(prop.Name))
+        const id = createPropertyKey(prop.Name, options)
 
         if (prop.Operator && prop.Operator.Type === 'default') {
             const defaultValue = parseDefaultValue(prop.Operator)
@@ -555,7 +590,7 @@ function parseObjectType (props: Property[]): ObjectBody {
         }
 
         const type = cddlType.map((t) => {
-            const unionType = parseUnionType(t)
+            const unionType = parseUnionType(t, options)
             if (unionType) {
                 const defaultValue = parseDefaultValue((t as PropertyReference).Operator)
                 defaultValue && comments.length && comments.push('') // add empty line if we have previous comments
@@ -577,12 +612,70 @@ function parseObjectType (props: Property[]): ObjectBody {
     return propItems
 }
 
-function parseUnionType (t: PropertyType | Assignment): TSTypeKind {
+function parseTemplateLiteralType (template: string): TSTypeKind {
+    const ast = parse(`type __CDDLTemplate = ${template};`, {
+        parser: typescriptParser,
+        sourceFileName: 'cddl2Ts.ts',
+        sourceRoot: process.cwd()
+    }) satisfies types.namedTypes.File
+    return (ast.program.body[0] as types.namedTypes.TSTypeAliasDeclaration).typeAnnotation
+}
+
+function escapeTemplateLiteralSegment (segment: string): string {
+    return segment
+        .replace(/\\/g, '\\\\')
+        .replace(/`/g, '\\`')
+        .replace(/\$\{/g, '\\${')
+}
+
+function regexpPatternToTemplateLiteral (pattern: string): string | undefined {
+    const normalized = pattern.startsWith('^') && pattern.endsWith('$')
+        ? pattern.slice(1, -1)
+        : pattern
+
+    if (!normalized.includes('.+')) {
+        return
+    }
+
+    const wildcardOnlyPattern = normalized.replace(/(\.\+)+/g, '')
+    if (wildcardOnlyPattern.includes('(') || wildcardOnlyPattern.includes('[') || wildcardOnlyPattern.includes('\\')) {
+        return
+    }
+
+    const segments = normalized.split(/(?:\.\+)+/g)
+    if (segments.length <= 1) {
+        return
+    }
+
+    return `\`${segments.map(escapeTemplateLiteralSegment).join('${string}')}\``
+}
+
+function parseNativeTypeWithOperator (t: NativeTypeWithOperator): TSTypeKind | undefined {
+    if (typeof t.Type !== 'string') {
+        return
+    }
+
+    const regexpPattern = getRegexpPattern(t)
+    const templateLiteral = regexpPattern && regexpPatternToTemplateLiteral(regexpPattern)
+    if (templateLiteral) {
+        return parseTemplateLiteralType(templateLiteral)
+    }
+
+    return NATIVE_TYPES[t.Type]
+}
+
+function parseUnionType (t: PropertyType | Assignment, options: TransformSettings): TSTypeKind {
     if (typeof t === 'string') {
         if (!NATIVE_TYPES[t]) {
             throw new Error(`Unknown native type: "${t}`)
         }
         return NATIVE_TYPES[t]
+    } else if (isNativeTypeWithOperator(t) && typeof t.Type === 'string') {
+        const nativeType = parseNativeTypeWithOperator(t)
+        if (!nativeType) {
+            throw new Error(`Unknown native type with operator: ${JSON.stringify(t)}`)
+        }
+        return nativeType
     } else if ((t as any).Type && typeof (t as any).Type === 'string' && NATIVE_TYPES[(t as any).Type]) {
         return NATIVE_TYPES[(t as any).Type]
     } else if (isNativeTypeWithOperator(t) && NATIVE_TYPES[(t.Type as any).Type]) {
@@ -600,35 +693,35 @@ function parseUnionType (t: PropertyType | Assignment): TSTypeKind {
              * Check if we have choices in the group (arrays of Properties)
              */
             if (prop.some(p => Array.isArray(p))) {
-                const options: TSTypeKind[] = []
+                const choices: TSTypeKind[] = []
                 for (const choice of prop) {
                     const subProps = Array.isArray(choice) ? choice : [choice]
 
                     if (subProps.length === 1 && isUnNamedProperty(subProps[0])) {
                         const first = subProps[0]
                         const subType = Array.isArray(first.Type) ? first.Type[0] : first.Type
-                        options.push(parseUnionType(subType as PropertyType))
+                        choices.push(parseUnionType(subType as PropertyType, options))
                         continue
                     }
 
                     if (subProps.every(isUnNamedProperty)) {
                         const tupleItems = subProps.map((p) => {
                             const subType = Array.isArray(p.Type) ? p.Type[0] : p.Type
-                            return parseUnionType(subType as PropertyType)
+                            return parseUnionType(subType as PropertyType, options)
                         })
-                        options.push(b.tsTupleType(tupleItems))
+                        choices.push(b.tsTupleType(tupleItems))
                         continue
                     }
 
-                    options.push(b.tsTypeLiteral(parseObjectType(subProps)))
+                    choices.push(b.tsTypeLiteral(parseObjectType(subProps, options)))
                 }
-                return b.tsUnionType(options)
+                return b.tsUnionType(choices)
             }
 
             if ((prop as Property[]).every(isUnNamedProperty)) {
                  const items = (prop as Property[]).map(p => {
                        const t = Array.isArray(p.Type) ? p.Type[0] : p.Type
-                       return parseUnionType(t as PropertyType)
+                       return parseUnionType(t as PropertyType, options)
                  })
 
                  if (items.length === 1) return items[0];
@@ -643,7 +736,7 @@ function parseUnionType (t: PropertyType | Assignment): TSTypeKind {
                     b.identifier('Record'),
                     b.tsTypeParameterInstantiation([
                         NATIVE_TYPES[(prop[0] as Property).Name],
-                        parseUnionType(((prop[0] as Property).Type as PropertyType[])[0])
+                        parseUnionType(((prop[0] as Property).Type as PropertyType[])[0], options)
                     ])
                 )
             }
@@ -651,7 +744,7 @@ function parseUnionType (t: PropertyType | Assignment): TSTypeKind {
             /**
              * e.g. ?attributes: {*foo => text},
              */
-            return b.tsTypeLiteral(parseObjectType(t.Properties as Property[]))
+            return b.tsTypeLiteral(parseObjectType(t.Properties as Property[], options))
         } else if (isNamedGroupReference(t)) {
             return b.tsTypeReference(
                 b.identifier(pascalCase(t.Value))

package/tests/mod.test.ts

@@ -66,6 +66,23 @@ describe('cddl2ts', () => {
         expect(process.exit).toHaveBeenCalledTimes(0)
     })
 
+    it('should allow configuring snake_case fields from the CLI', async () => {
+        await cli([
+            path.join(__dirname, '..', '..', '..', 'examples', 'commons', 'test.cddl'),
+            '--field-case',
+            'snake'
+        ])
+
+        expect(console.log).toHaveBeenCalledTimes(1)
+        const output = vi.mocked(console.log).mock.calls[0]?.[0] as string
+        expect(output).toContain('export interface SessionCapabilitiesRequest {')
+        expect(output).toContain('always_match?: SessionCapabilityRequest;')
+        expect(output).toContain('first_match?: SessionCapabilityRequest[];')
+        expect(output).toContain('pointer_type?: InputPointerType;')
+        expect(output).not.toContain('alwaysMatch?: SessionCapabilityRequest;')
+        expect(process.exit).toHaveBeenCalledTimes(0)
+    })
+
     afterEach(() => {
         process.exit = exitOrig
         console.log = logOrig

package/tests/transform_edge_cases.test.ts

@@ -123,6 +123,91 @@ describe('transform edge cases', () => {
         expect(output).toContain('export type MaybeValue = unknown;')
     })
 
+    it('should map simple wildcard regexp strings to template literal types', () => {
+        const output = transform([
+            variable('channel', {
+                Type: 'tstr',
+                Operator: {
+                    Type: 'regexp',
+                    Value: literal('custom:.+')
+                }
+            } as any),
+            group('event-envelope', [
+                property('channel', {
+                    Type: 'tstr',
+                    Operator: {
+                        Type: 'regexp',
+                        Value: literal('custom:.+')
+                    }
+                } as any)
+            ]),
+            variable('email-address', {
+                Type: 'tstr',
+                Operator: {
+                    Type: 'regexp',
+                    Value: literal('[^@]+@[^@]+')
+                }
+            } as any),
+            variable('prefixed-name', {
+                Type: 'tstr',
+                Operator: {
+                    Type: 'regexp',
+                    Value: literal('foo_.+')
+                }
+            } as any),
+            variable('wrapped-name', {
+                Type: 'tstr',
+                Operator: {
+                    Type: 'regexp',
+                    Value: literal('some_.+_name')
+                }
+            } as any),
+            variable('double-wildcard', {
+                Type: 'tstr',
+                Operator: {
+                    Type: 'regexp',
+                    Value: literal('some_.+_middle_.+')
+                }
+            } as any)
+        ])
+
+        expect(output).toContain('export type Channel = `custom:${string}`;')
+        expect(output).toContain('channel: `custom:${string}`;')
+        expect(output).toContain('export type EmailAddress = string;')
+        expect(output).toContain('export type PrefixedName = `foo_${string}`;')
+        expect(output).toContain('export type WrappedName = `some_${string}_name`;')
+        expect(output).toContain('export type DoubleWildcard = `some_${string}_middle_${string}`;')
+    })
+
+    it('should keep camelCase fields by default', () => {
+        const output = transform([
+            group('session-capability-request', [
+                property('page_ranges', 'tstr')
+            ])
+        ])
+
+        expect(output).toContain('export interface SessionCapabilityRequest {')
+        expect(output).toContain('pageRanges: string;')
+    })
+
+    it('should support snake_case fields without changing exported type names', () => {
+        const output = transform([
+            group('session-capability-request', [
+                property('acceptInsecureCerts', 'bool'),
+                property('pageRanges', 'tstr'),
+                property('nestedConfig', group('', [
+                    property('requestId', 'uint')
+                ]))
+            ])
+        ], { fieldCase: 'snake' })
+
+        expect(output).toContain('export interface SessionCapabilityRequest {')
+        expect(output).toContain('accept_insecure_certs: boolean;')
+        expect(output).toContain('page_ranges: string;')
+        expect(output).toContain('nested_config: {')
+        expect(output).toContain('request_id: number;')
+    })
+
     it('should generate intersections for choices with static props and mixins', () => {
         const output = transform([
             group('combined', [