cddl2ts 0.3.1 → 0.4.1

package/cli-examples/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "noEmit": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "*.ts"
+  ]
+}

package/package.json

@@ -1,23 +1,21 @@
 {
   "name": "cddl2ts",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "A Node.js package that can generate a TypeScript definition based on a CDDL file",
   "author": "Christian Bromann <mail@bromann.dev>",
   "license": "MIT",
-  "homepage": "https://github.com/christian-bromann/cddl2ts#readme",
+  "homepage": "https://github.com/webdriverio/cddl/blob/main/packages/cddl2ts/README.md",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/christian-bromann/cddl2ts.git"
+    "url": "git+ssh://git@github.com/webdriverio/cddl.git"
   },
   "keywords": [
-    "cddl"
+    "cddl",
+    "typescript",
+    "javascript"
   ],
-  "engines": {
-    "node": ">=20.0.0",
-    "npm": ">=9.0.0"
-  },
   "bugs": {
-    "url": "https://github.com/christian-bromann/cddl2ts/issues"
+    "url": "https://github.com/webdriverio/cddl/issues"
   },
   "type": "module",
   "exports": "./build/index.js",
@@ -25,36 +23,22 @@
   "bin": {
     "cddl2ts": "./bin/cddl2ts.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",
-    "generate:local": "npm run compile && node ./bin/cddl2ts.js ./examples/webdriver/local.cddl --unknown-as-any > ./examples/webdriver/local.ts && tsc -p ./examples/webdriver/tsconfig.json",
-    "generate:remote": "npm run compile && node ./bin/cddl2ts.js ./examples/webdriver/remote.cddl --unknown-as-any > ./examples/webdriver/remote.ts && tsc -p ./examples/webdriver/tsconfig.json",
-    "generate:examples": "npm run generate:local && npm run generate:remote",
-    "test": "vitest run",
-    "watch": "tsc --watch",
-    "checks:all": "npm run compile && npm run test && npm run generate:examples"
-  },
   "devDependencies": {
     "@types/yargs": "^17.0.35",
-    "@types/node": "^24.12.0",
-    "@vitest/coverage-v8": "^4.1.0",
-    "npm-run-all": "^4.1.5",
-    "release-it": "^19.2.4",
-    "typescript": "^5.9.3",
-    "vitest": "^4.1.0"
+    "@types/node": "^25.5.0"
   },
   "dependencies": {
     "@babel/parser": "^7.29.0",
     "camelcase": "^9.0.0",
-    "cddl": "^0.13.1",
     "recast": "^0.23.11",
-    "yargs": "^18.0.0"
+    "yargs": "^18.0.0",
+    "cddl": "0.14.5"
+  },
+  "scripts": {
+    "release": "release-it --config .release-it.ts",
+    "release:ci": "pnpm release --ci --npm.skipChecks",
+    "cli-examples": "run-p cli-examples:*",
+    "cli-examples:local": "pnpm run compile && node ./bin/cddl2ts.js ../../examples/webdriver/local.cddl --unknown-as-any > ./cli-examples/local.ts && tsc -p ./cli-examples/tsconfig.json",
+    "cli-examples:remote": "pnpm run compile && node ./bin/cddl2ts.js ../../examples/webdriver/remote.cddl --unknown-as-any > ./cli-examples/remote.ts && tsc -p ./cli-examples/tsconfig.json"
   }
-}
+}

package/src/cli.ts

@@ -0,0 +1,42 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import yargs from 'yargs'
+
+import { parse } from 'cddl'
+
+import { transform } from './index.js'
+import { pkg } from './constants.js'
+
+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`)
+        .epilog(`v${pkg.version}\nCopyright ${(new Date()).getFullYear()} ${pkg.author}`)
+        .version(pkg.version)
+        .option('u', {
+            alias: 'unknown-as-any',
+            type: 'boolean',
+            description: 'Use unknown instead of any',
+            default: false
+        })
+        .help('help')
+        .alias('h', 'help')
+        .alias('v', 'version')
+
+    const args = await parser.argv
+
+    if (args._.length === 0) {
+        parser.showHelp()
+        return process.exit(0)
+    }
+
+    const absoluteFilePath = path.resolve(process.cwd(), args._[0] as string)
+    const hasAccess = await fs.access(absoluteFilePath).then(() => true, () => false)
+
+    if (!hasAccess) {
+        console.error(`Couldn't find or access source CDDL file at "${absoluteFilePath}"`)
+        return process.exit(1)
+    }
+
+    const ast = parse(absoluteFilePath)
+    console.log(transform(ast, { useUnknown: args.u as boolean }))
+}

package/src/constants.ts

@@ -0,0 +1,6 @@
+import fs from 'node:fs/promises'
+import url from 'node:url'
+import path from 'node:path'
+
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
+export const pkg = JSON.parse(await fs.readFile(path.join(__dirname, '..', 'package.json'), 'utf-8'))