Merge pull request #114 from gnidan/udvt2

Rearchitect declaration internals to support UDVTs
gnidan · Jun 8, 2023 · 2d67027 · 2d67027
2 parents 1ed1bbf + 7b88a8f
commit 2d67027
Show file tree

Hide file tree

Showing 42 changed files with 3,558 additions and 1,166 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules/
+deps.pdf
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## vNext
 
+### New features
+
+- Rearchitect declaration internals to support UDVTs
+  ([#114](https://github.com/gnidan/abi-to-sol/pull/114) by
+  [@gnidan](https://github.com/gnidan))
+
 ### Project updates
 
 - Fix web UI deployment ([#112](https://github.com/gnidan/abi-to-sol/pull/112)

diff --git a/packages/abi-to-sol/.madgerc b/packages/abi-to-sol/.madgerc
@@ -0,0 +1,13 @@
+{
+  "excludeRegExp": [
+    "\\.test\\.ts$",
+    "\/test\/"
+  ],
+  "fileExtensions": ["js","ts"],
+  "detectiveOptions": {
+    "ts": {
+      "skipTypeImports": true
+    }
+  },
+  "tsConfig": "tsconfig.json"
+}
diff --git a/packages/abi-to-sol/README.md b/packages/abi-to-sol/README.md
@@ -98,10 +98,6 @@ interface ENS {
 
 ```
 
-## Currently unsupported (PRs welcome! :wink:)
-
-- [User defined value types](https://blog.soliditylang.org/2021/09/27/user-defined-value-types/)
-
 ## Is this project useful to you?
 
 Feel free to donate to

diff --git a/packages/abi-to-sol/bin/abi-to-sol.ts b/packages/abi-to-sol/bin/abi-to-sol.ts
@@ -1,13 +1,17 @@
 #!/usr/bin/env node
+import "source-map-support/register";
 
 const neodoc = require("neodoc");
 import {Abi as SchemaAbi} from "@truffle/contract-schema/spec";
 import * as abiSchema from "@truffle/contract-schema/spec/abi.spec.json";
 import betterAjvErrors from "better-ajv-errors";
 import Ajv from "ajv";
 
-import {generateSolidity, GenerateSolidityMode} from "../src";
-import * as defaults from "../src/defaults";
+import {
+  generateSolidity,
+  defaults,
+  GenerateSolidityMode
+} from "../src";
 
 const usage = `
 abi-to-sol

diff --git a/packages/abi-to-sol/package.json b/packages/abi-to-sol/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abi-to-sol",
-  "version": "0.7.1",
+  "version": "0.8.0-0",
   "description": "Compile ABI JSON to Solidity interface",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -15,6 +15,7 @@
   "scripts": {
     "abi-to-sol": "ts-node ./bin/abi-to-sol.ts",
     "prepare": "tsc",
+    "madge": "madge ./src --image deps.pdf",
     "test": "jest src/**",
     "test:test": "jest test/**",
     "test:dist": "yarn prepare && jest dist/src",
@@ -34,16 +35,17 @@
     "@types/semver": "^7.3.7",
     "change-case": "^4.1.1",
     "faker": "^5.1.0",
-    "fast-check": "^3.1.1",
+    "fast-check": "3.1.1",
     "husky": ">=4",
     "jest": "^26.4.2",
     "jest-fast-check": "^0.0.1",
     "jest-json-schema": "^2.1.0",
     "lint-staged": ">=10",
-    "solc": "^0.8.6",
+    "madge": "^5.0.2",
+    "solc": "^0.8.20",
     "ts-jest": "^26.4.0",
     "ts-node": "^9.0.0",
-    "typescript": "4.5.2"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
     "@truffle/abi-utils": "^1.0.0",

diff --git a/packages/abi-to-sol/src/declarations.test.ts b/packages/abi-to-sol/src/declarations.test.ts