Kk/naming fix

packages/target-truffle-v4-test/types/truffle-contracts/Name12Mangling.d.ts → packages/target-truffle-v4-test/types/truffle-contracts/NAME12mangling.d.ts

@@ -4,13 +4,13 @@
 
 import { BigNumber } from "bignumber.js";
 
-export interface Name12ManglingContract
-  extends Truffle.Contract<Name12ManglingInstance> {
-  "new"(meta?: Truffle.TransactionDetails): Promise<Name12ManglingInstance>;
+export interface NAME12manglingContract
+  extends Truffle.Contract<NAME12manglingInstance> {
+  "new"(meta?: Truffle.TransactionDetails): Promise<NAME12manglingInstance>;
 }
 
 type AllEvents = never;
 
-export interface Name12ManglingInstance extends Truffle.ContractInstance {
+export interface NAME12manglingInstance extends Truffle.ContractInstance {
   works(txDetails?: Truffle.TransactionDetails): Promise<boolean>;
 }

packages/target-truffle-v4-test/types/truffle-contracts/index.d.ts

@@ -6,7 +6,7 @@ import { DataTypesInputContract } from "./DataTypesInput";
 import { DataTypesPureContract } from "./DataTypesPure";
 import { DataTypesViewContract } from "./DataTypesView";
 import { EventsContract } from "./Events";
-import { Name12ManglingContract } from "./Name12Mangling";
+import { NAME12manglingContract } from "./NAME12mangling";
 import { OverloadsContract } from "./Overloads";
 import { PayableContract } from "./Payable";
 
@@ -17,7 +17,7 @@ declare global {
       require(name: "DataTypesPure"): DataTypesPureContract;
       require(name: "DataTypesView"): DataTypesViewContract;
       require(name: "Events"): EventsContract;
-      require(name: "NAME12mangling"): Name12ManglingContract;
+      require(name: "NAME12mangling"): NAME12manglingContract;
       require(name: "Overloads"): OverloadsContract;
       require(name: "Payable"): PayableContract;
     }
@@ -32,8 +32,8 @@ export { DataTypesPureContract, DataTypesPureInstance } from "./DataTypesPure";
 export { DataTypesViewContract, DataTypesViewInstance } from "./DataTypesView";
 export { EventsContract, EventsInstance } from "./Events";
 export {
-  Name12ManglingContract,
-  Name12ManglingInstance,
-} from "./Name12Mangling";
+  NAME12manglingContract,
+  NAME12manglingInstance,
+} from "./NAME12mangling";
 export { OverloadsContract, OverloadsInstance } from "./Overloads";
 export { PayableContract, PayableInstance } from "./Payable";

packages/target-truffle-v5-test/types/truffle-contracts/Name12Mangling.d.ts → packages/target-truffle-v5-test/types/truffle-contracts/NAME12mangling.d.ts

@@ -5,14 +5,14 @@
 import BN from "bn.js";
 import { EventData, PastEventOptions } from "web3-eth-contract";
 
-export interface Name12ManglingContract
-  extends Truffle.Contract<Name12ManglingInstance> {
-  "new"(meta?: Truffle.TransactionDetails): Promise<Name12ManglingInstance>;
+export interface NAME12manglingContract
+  extends Truffle.Contract<NAME12manglingInstance> {
+  "new"(meta?: Truffle.TransactionDetails): Promise<NAME12manglingInstance>;
 }
 
 type AllEvents = never;
 
-export interface Name12ManglingInstance extends Truffle.ContractInstance {
+export interface NAME12manglingInstance extends Truffle.ContractInstance {
   works(txDetails?: Truffle.TransactionDetails): Promise<boolean>;
 
   methods: {

packages/target-truffle-v5-test/types/truffle-contracts/index.d.ts

@@ -8,7 +8,7 @@ import { DataTypesViewContract } from "./DataTypesView";
 import { EventsContract } from "./Events";
 import { LibContract } from "./Lib";
 import { LibraryConsumerContract } from "./LibraryConsumer";
-import { Name12ManglingContract } from "./Name12Mangling";
+import { NAME12manglingContract } from "./NAME12mangling";
 import { OverloadsContract } from "./Overloads";
 import { PayableContract } from "./Payable";
 
@@ -21,7 +21,7 @@ declare global {
       require(name: "Events"): EventsContract;
       require(name: "Lib"): LibContract;
       require(name: "LibraryConsumer"): LibraryConsumerContract;
-      require(name: "NAME12mangling"): Name12ManglingContract;
+      require(name: "NAME12mangling"): NAME12manglingContract;
       require(name: "Overloads"): OverloadsContract;
       require(name: "Payable"): PayableContract;
     }
@@ -41,8 +41,8 @@ export {
   LibraryConsumerInstance,
 } from "./LibraryConsumer";
 export {
-  Name12ManglingContract,
-  Name12ManglingInstance,
-} from "./Name12Mangling";
+  NAME12manglingContract,
+  NAME12manglingInstance,
+} from "./NAME12mangling";
 export { OverloadsContract, OverloadsInstance } from "./Overloads";
 export { PayableContract, PayableInstance } from "./Payable";

packages/typechain/src/parser/normalizeName.ts

@@ -1,16 +1,24 @@
-import { upperFirst, camelCase } from 'lodash'
+import { upperFirst } from 'lodash'
 
 /**
  * Converts valid file names to valid javascript symbols and does best effort to make them readable. Example: ds-token.test becomes DsTokenTest
  */
 export function normalizeName(rawName: string): string {
-  const t1 = rawName.split(' ').join('-') // spaces to - so later we can automatically convert them
-  const t2 = t1.replace(/^\d+/, '') // removes leading digits
-  const result = upperFirst(camelCase(t2))
+  const transformations: ((s: string) => string)[] = [
+    (s) => s.replace(/\s+/g, '-'), // spaces to - so later we can automatically convert them
+    (s) => s.replace(/\./g, '-'), // replace "."
+    (s) => s.replace(/_/g, '-'), // replace "_"
+    (s) => s.replace(/-[a-z]/g, (match) => match.substr(-1).toUpperCase()), // delete '-' and capitalize the letter after them
+    (s) => s.replace(/-/g, ''), // delete any '-' left
+    (s) => s.replace(/^\d+/, ''), // removes leading digits
+    (s) => upperFirst(s),
+  ]
 
-  if (result === '') {
+  const finalName = transformations.reduce((s, t) => t(s), rawName)
+
+  if (finalName === '') {
     throw new Error(`Can't guess class name, please rename file: ${rawName}`)
   }
 
-  return result
+  return finalName
 }

packages/typechain/src/parser/parseEvmType.ts

@@ -90,7 +90,7 @@ export function parseEvmType(rawType: string, components?: EvmSymbol[], internal
   }
 
   if (internalType?.startsWith('enum')) {
-    return parseEvmType('uint8')
+    return parseEvmType('uint8') // this is a best effort approach. Sometimes enums can be uint16 too. Read more: https://github.com/ethereum-ts/TypeChain/pull/281#discussion_r513303099
   }
 
   throw new Error('Unknown type: ' + rawType)

packages/typechain/test/parser/normalizeName.test.ts

@@ -11,5 +11,6 @@ describe('name normalizer', () => {
     expect(normalizeName('ds token')).to.be.eq('DsToken')
     expect(normalizeName('name.abi')).to.be.eq('NameAbi')
     expect(normalizeName('1234name.abi')).to.be.eq('NameAbi')
+    expect(normalizeName('ERC20.abi')).to.be.eq('ERC20Abi')
   })
 })