cddl2py 0.1.2 → 0.2.0

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,UAAU,EAGlB,MAAM,MAAM,CAAA;AAKb,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACrB;AAkBD,wBAAgB,SAAS,CAAE,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAuBxF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,UAAU,EAGlB,MAAM,MAAM,CAAA;AAKb,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACrB;AAkBD,wBAAgB,SAAS,CAAE,WAAW,EAAE,UAAU,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAuBxF"}

package/build/index.js

@@ -1,4 +1,4 @@
-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 { snakeCase } from './utils.js';
 import { pkg, NATIVE_TYPE_MAP } from './constants.js';
 const STRING_RECORD_KEY_TYPES = new Set(['str', 'text', 'tstr']);
@@ -416,6 +416,59 @@ function getExtraItemsType(props, ctx) {
     ctx.typingImports.add('Union');
     return `Union[${uniqueTypes.join(', ')}]`;
 }
+function stringifyPythonLiteral(value) {
+    return JSON.stringify(value);
+}
+function getTemplateAnnotatedPattern(regexpPattern) {
+    const wildcard = '.+';
+    if (!regexpPattern.includes(wildcard) || /[\\()[\]{}|?*^$]/.test(regexpPattern.replaceAll(wildcard, ''))) {
+        return;
+    }
+    const segments = regexpPattern.split(wildcard);
+    const parts = [];
+    for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i];
+        if (segment.length > 0) {
+            parts.push(stringifyPythonLiteral(segment));
+        }
+        if (i < segments.length - 1) {
+            parts.push('str');
+        }
+    }
+    if (parts.length === 0 || !parts.includes('str')) {
+        return;
+    }
+    return `Annotated[str, ${parts.join(' + ')}]`;
+}
+function resolveNativeTypeWithOperator(t, ctx) {
+    if (typeof t.Type !== 'string') {
+        return;
+    }
+    const mapped = NATIVE_TYPE_MAP[t.Type];
+    if (!mapped) {
+        return;
+    }
+    const regexpPattern = getRegexpPattern(t);
+    if (!regexpPattern) {
+        if (mapped === 'Any') {
+            ctx.typingImports.add('Any');
+        }
+        return mapped;
+    }
+    const templateAnnotatedPattern = getTemplateAnnotatedPattern(regexpPattern);
+    if (!templateAnnotatedPattern) {
+        if (mapped === 'Any') {
+            ctx.typingImports.add('Any');
+        }
+        return mapped;
+    }
+    ctx.typingImports.add('Annotated');
+    if (ctx.pydantic) {
+        ctx.pydanticImports.add('StringConstraints');
+        return `Annotated[${mapped}, StringConstraints(pattern=${JSON.stringify(regexpPattern)})]`;
+    }
+    return templateAnnotatedPattern;
+}
 // ---------------------------------------------------------------------------
 // Type resolution
 // ---------------------------------------------------------------------------
@@ -430,6 +483,13 @@ function resolveType(t, ctx, options = {}) {
         }
         throw new Error(`Unknown native type: "${t}"`);
     }
+    if (isNativeTypeWithOperator(t) && typeof t.Type === 'string') {
+        const resolved = resolveNativeTypeWithOperator(t, ctx);
+        if (resolved) {
+            return resolved;
+        }
+        throw new Error(`Unknown native type with operator: ${JSON.stringify(t)}`);
+    }
     if (t.Type && typeof t.Type === 'string' && NATIVE_TYPE_MAP[t.Type]) {
         const mapped = NATIVE_TYPE_MAP[t.Type];
         if (mapped === 'Any') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cddl2py",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "A Node.js package that can generate Python type definitions (with optional Pydantic support) based on a CDDL file",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "yargs": "^18.0.0",
-    "cddl": "0.19.2"
+    "cddl": "0.20.0"
   },
   "scripts": {
     "release": "release-it --config .release-it.ts --VV",