cddl2ts 0.9.1 → 0.10.0

package/build/index.js

@@ -586,7 +586,8 @@ function parseUnionType(t, options) {
     else if (isNativeTypeWithOperator(t) && NATIVE_TYPES[t.Type.Type]) {
         return NATIVE_TYPES[t.Type.Type];
     }
-    else if (isPropertyReference(t) && t.Value === 'null') {
+    else if (isPropertyReference(t) && t.Value === 'null' && !isLiteralWithValue(t)) {
+        // a bare `null` reference is the null type; a quoted "null" is a string literal
         return b.tsNullKeyword();
     }
     else if (isGroup(t)) {

package/cli-examples/local.ts

@@ -635,7 +635,7 @@ export interface ScriptUndefinedValue {
 }
 
 export interface ScriptNullValue {
-  type: null;
+  type: "null";
 }
 
 export interface ScriptStringValue {

package/cli-examples/remote.ts

@@ -968,7 +968,7 @@ export interface ScriptUndefinedValue {
 }
 
 export interface ScriptNullValue {
-  type: null;
+  type: "null";
 }
 
 export interface ScriptStringValue {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cddl2ts",
-  "version": "0.9.1",
+  "version": "0.10.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",
@@ -25,14 +25,14 @@
   },
   "devDependencies": {
     "@types/yargs": "^17.0.35",
-    "@types/node": "^25.5.0"
+    "@types/node": "^26.0.1"
   },
   "dependencies": {
     "@babel/parser": "^7.29.0",
     "camelcase": "^9.0.0",
     "recast": "^0.23.11",
     "yargs": "^18.0.0",
-    "cddl": "0.20.1"
+    "cddl": "0.21.0"
   },
   "scripts": {
     "release": "release-it --config .release-it.ts --VV",

package/src/index.ts

@@ -680,7 +680,8 @@ function parseUnionType (t: PropertyType | Assignment, options: TransformSetting
         return NATIVE_TYPES[(t as any).Type]
     } else if (isNativeTypeWithOperator(t) && NATIVE_TYPES[(t.Type as any).Type]) {
         return NATIVE_TYPES[(t.Type as any).Type]
-    } else if (isPropertyReference(t) && t.Value === 'null') {
+    } else if (isPropertyReference(t) && t.Value === 'null' && !isLiteralWithValue(t)) {
+        // a bare `null` reference is the null type; a quoted "null" is a string literal
         return b.tsNullKeyword()
     } else if (isGroup(t)) {
         /**

package/tests/__snapshots__/mod.test.ts.snap

@@ -24,7 +24,7 @@ export interface UndefinedValue {
 }
 
 export interface NullValue {
-  type: null;
+  type: "null";
 }
 
 export interface StringValue {

package/tests/__snapshots__/webdriver_local.test.ts.snap

@@ -638,7 +638,7 @@ export interface ScriptUndefinedValue {
 }
 
 export interface ScriptNullValue {
-  type: null;
+  type: "null";
 }
 
 export interface ScriptStringValue {

package/tests/__snapshots__/webdriver_remote.test.ts.snap

@@ -971,7 +971,7 @@ export interface ScriptUndefinedValue {
 }
 
 export interface ScriptNullValue {
-  type: null;
+  type: "null";
 }
 
 export interface ScriptStringValue {

package/tests/transform_edge_cases.test.ts

@@ -285,7 +285,8 @@ describe('transform edge cases', () => {
                 Operator: { Type: 'default', Value: literal('mouse') }
             }),
             variable('bool-literal', literal(true)),
-            variable('null-literal', literal(null))
+            variable('null-literal', literal(null)),
+            variable('null-string-literal', literal('null'))
         ])
 
         expect(output).toContain('export type TupleType = [number, string];')
@@ -297,6 +298,8 @@ describe('transform edge cases', () => {
         expect(output).toContain('export type PointerType = PointerValue;')
         expect(output).toContain('export type BoolLiteral = true;')
         expect(output).toContain('export type NullLiteral = null;')
+        // a quoted "null" is a string literal, not the null type
+        expect(output).toContain('export type NullStringLiteral = "null";')
     })
 
     it('should include optional properties and default tags in object docs', () => {