@openzeppelin/wizard 0.5.1 → 0.5.3

package/dist/zip-hardhat.js

@@ -92,22 +92,14 @@ const test = (c, opts) => {
             `describe("${c.name}", function () {`,
             [
                 'it("Test contract", async function () {',
-                (0, format_lines_1.spaceBetween)([
-                    `const ContractFactory = await ethers.getContractFactory("${c.name}");`,
-                ], getAddressVariables(args), [
-                    `const instance = await ${getDeploymentCall(c, args)};`,
-                    'await instance.waitForDeployment();'
-                ], getExpects()),
-                '});'
+                (0, format_lines_1.spaceBetween)([`const ContractFactory = await ethers.getContractFactory("${c.name}");`], getAddressVariables(args), [`const instance = await ${getDeploymentCall(c, args)};`, 'await instance.waitForDeployment();'], getExpects()),
+                '});',
             ],
             '});',
         ];
     }
     function getImports(c) {
-        return [
-            'import { expect } from "chai";',
-            `import { ${getHardhatPlugins(c).join(', ')} } from "hardhat";`,
-        ];
+        return ['import { expect } from "chai";', `import { ${getHardhatPlugins(c).join(', ')} } from "hardhat";`];
     }
     function getExpects() {
         if (opts !== undefined) {
@@ -144,7 +136,9 @@ function getAddressArgs(c) {
     return args;
 }
 function getDeploymentCall(c, args) {
-    return c.upgradeable ? `upgrades.deployProxy(ContractFactory, [${args.join(', ')}])` : `ContractFactory.deploy(${args.join(', ')})`;
+    return c.upgradeable
+        ? `upgrades.deployProxy(ContractFactory, [${args.join(', ')}])`
+        : `ContractFactory.deploy(${args.join(', ')})`;
 }
 const script = (c) => {
     const args = getAddressArgs(c);
@@ -195,7 +189,7 @@ npx hardhat run --network <network-name> scripts/deploy.ts
 \`\`\`
 `;
 function getHardhatPlugins(c) {
-    let plugins = ['ethers'];
+    const plugins = ['ethers'];
     if (c.upgradeable) {
         plugins.push('upgrades');
     }
@@ -203,9 +197,13 @@ function getHardhatPlugins(c) {
 }
 async function zipHardhat(c, opts) {
     const zip = new jszip_1.default();
-    const { default: packageJson } = c.upgradeable ? await Promise.resolve().then(() => __importStar(require("./environments/hardhat/upgradeable/package.json"))) : await Promise.resolve().then(() => __importStar(require("./environments/hardhat/package.json")));
+    const { default: packageJson } = c.upgradeable
+        ? await Promise.resolve().then(() => __importStar(require('./environments/hardhat/upgradeable/package.json')))
+        : await Promise.resolve().then(() => __importStar(require('./environments/hardhat/package.json')));
     packageJson.license = c.license;
-    const { default: packageLock } = c.upgradeable ? await Promise.resolve().then(() => __importStar(require("./environments/hardhat/upgradeable/package-lock.json"))) : await Promise.resolve().then(() => __importStar(require("./environments/hardhat/package-lock.json")));
+    const { default: packageLock } = c.upgradeable
+        ? await Promise.resolve().then(() => __importStar(require('./environments/hardhat/upgradeable/package-lock.json')))
+        : await Promise.resolve().then(() => __importStar(require('./environments/hardhat/package-lock.json')));
     packageLock.packages[''].license = c.license;
     zip.file(`contracts/${c.name}.sol`, (0, print_1.printContract)(c));
     zip.file('test/test.ts', test(c, opts));

package/dist/zip-hardhat.js.map

@@ -1 +1 @@
-{"version":3,"file":"zip-hardhat.js","sourceRoot":"","sources":["../src/zip-hardhat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zip-hardhat.js","sourceRoot":"","sources":["../src/zip-hardhat.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
@@ -17,8 +17,9 @@
     "prepare": "tsc && node dist/scripts/prepare.js",
     "prepublish": "rimraf dist *.tsbuildinfo && hardhat clean",
     "test": "ava",
+    "test:update-snapshots": "ava --update-snapshots",
     "test:watch": "ava --watch",
-    "version": "node ../../scripts/bump-changelog.js",
+    "version": "node ../../../scripts/bump-changelog.js",
     "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat && rm ./src/environments/hardhat/upgradeable/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat/upgradeable"
   },
   "devDependencies": {

package/src/add-pausable.ts

@@ -1,5 +1,6 @@
 import type { ContractBuilder, BaseFunction } from './contract';
-import { Access, requireAccessControl } from './set-access-control';
+import type { Access } from './set-access-control';
+import { requireAccessControl } from './set-access-control';
 import { defineFunctions } from './utils/define-functions';
 
 export function addPausable(c: ContractBuilder, access: Access, pausableFns: BaseFunction[]) {

package/src/api.ts

@@ -1,27 +1,57 @@
 import type { CommonOptions } from './common-options';
-import { printERC20, defaults as erc20defaults, isAccessControlRequired as erc20IsAccessControlRequired, ERC20Options } from './erc20';
-import { printERC721, defaults as erc721defaults, isAccessControlRequired as erc721IsAccessControlRequired, ERC721Options } from './erc721';
-import { printERC1155, defaults as erc1155defaults, isAccessControlRequired as erc1155IsAccessControlRequired, ERC1155Options } from './erc1155';
-import { printStablecoin, defaults as stablecoinDefaults, isAccessControlRequired as stablecoinIsAccessControlRequired, StablecoinOptions } from './stablecoin';
-import { printGovernor, defaults as governorDefaults, isAccessControlRequired as governorIsAccessControlRequired, GovernorOptions } from './governor';
-import { printCustom, defaults as customDefaults, isAccessControlRequired as customIsAccessControlRequired, CustomOptions } from './custom';
+import type { ERC20Options } from './erc20';
+import {
+  printERC20,
+  defaults as erc20defaults,
+  isAccessControlRequired as erc20IsAccessControlRequired,
+} from './erc20';
+import type { ERC721Options } from './erc721';
+import {
+  printERC721,
+  defaults as erc721defaults,
+  isAccessControlRequired as erc721IsAccessControlRequired,
+} from './erc721';
+import type { ERC1155Options } from './erc1155';
+import {
+  printERC1155,
+  defaults as erc1155defaults,
+  isAccessControlRequired as erc1155IsAccessControlRequired,
+} from './erc1155';
+import type { StablecoinOptions } from './stablecoin';
+import {
+  printStablecoin,
+  defaults as stablecoinDefaults,
+  isAccessControlRequired as stablecoinIsAccessControlRequired,
+} from './stablecoin';
+import type { GovernorOptions } from './governor';
+import {
+  printGovernor,
+  defaults as governorDefaults,
+  isAccessControlRequired as governorIsAccessControlRequired,
+} from './governor';
+import type { CustomOptions } from './custom';
+import {
+  printCustom,
+  defaults as customDefaults,
+  isAccessControlRequired as customIsAccessControlRequired,
+} from './custom';
 
 export interface WizardContractAPI<Options extends CommonOptions> {
   /**
    * Returns a string representation of a contract generated using the provided options. If opts is not provided, uses `defaults`.
    */
-  print: (opts?: Options) => string,
-  
+  print: (opts?: Options) => string;
+
   /**
    * The default options that are used for `print`.
    */
   defaults: Required<Options>;
 
   /**
-   * Whether any of the provided options require access control to be enabled. If this returns `true`, then calling `print` with the 
-   * same options would cause the `access` option to default to `'ownable'` if it was `undefined` or `false`. 
+   * Whether any of the provided options require access control to be enabled. If this returns `true`, then calling `print` with the
+   * same options would cause the `access` option to default to `'ownable'` if it was `undefined` or `false`.
    */
-  isAccessControlRequired: (opts: Partial<Options>) => boolean,
+  isAccessControlRequired: (opts: Partial<Options>) => boolean;
 }
 
 export type ERC20 = WizardContractAPI<ERC20Options>;
@@ -35,35 +65,35 @@ export type Custom = WizardContractAPI<CustomOptions>;
 export const erc20: ERC20 = {
   print: printERC20,
   defaults: erc20defaults,
-  isAccessControlRequired: erc20IsAccessControlRequired
-}
+  isAccessControlRequired: erc20IsAccessControlRequired,
+};
 export const erc721: ERC721 = {
   print: printERC721,
   defaults: erc721defaults,
-  isAccessControlRequired: erc721IsAccessControlRequired
-}
+  isAccessControlRequired: erc721IsAccessControlRequired,
+};
 export const erc1155: ERC1155 = {
   print: printERC1155,
   defaults: erc1155defaults,
-  isAccessControlRequired: erc1155IsAccessControlRequired
-}
+  isAccessControlRequired: erc1155IsAccessControlRequired,
+};
 export const stablecoin: Stablecoin = {
   print: printStablecoin,
   defaults: stablecoinDefaults,
-  isAccessControlRequired: stablecoinIsAccessControlRequired
-}
+  isAccessControlRequired: stablecoinIsAccessControlRequired,
+};
 export const realWorldAsset: RealWorldAsset = {
   print: printStablecoin,
   defaults: stablecoinDefaults,
-  isAccessControlRequired: stablecoinIsAccessControlRequired
-}
+  isAccessControlRequired: stablecoinIsAccessControlRequired,
+};
 export const governor: Governor = {
   print: printGovernor,
   defaults: governorDefaults,
-  isAccessControlRequired: governorIsAccessControlRequired
-}
+  isAccessControlRequired: governorIsAccessControlRequired,
+};
 export const custom: Custom = {
   print: printCustom,
   defaults: customDefaults,
-  isAccessControlRequired: customIsAccessControlRequired
-}
+  isAccessControlRequired: customIsAccessControlRequired,
+};

package/src/build-generic.ts

@@ -1,19 +1,25 @@
-import { CustomOptions, buildCustom } from './custom';
-import { ERC20Options, buildERC20 } from './erc20';
-import { ERC721Options, buildERC721 } from './erc721';
-import { ERC1155Options, buildERC1155 } from './erc1155';
-import { StablecoinOptions, buildStablecoin } from './stablecoin';
-import { GovernorOptions, buildGovernor } from './governor';
-import { Contract } from './contract';
+import type { CustomOptions } from './custom';
+import { buildCustom } from './custom';
+import type { ERC20Options } from './erc20';
+import { buildERC20 } from './erc20';
+import type { ERC721Options } from './erc721';
+import { buildERC721 } from './erc721';
+import type { ERC1155Options } from './erc1155';
+import { buildERC1155 } from './erc1155';
+import type { StablecoinOptions } from './stablecoin';
+import { buildStablecoin } from './stablecoin';
+import type { GovernorOptions } from './governor';
+import { buildGovernor } from './governor';
+import type { Contract } from './contract';
 
 export interface KindedOptions {
-  ERC20:    { kind: 'ERC20' }    & ERC20Options;
-  ERC721:   { kind: 'ERC721' }   & ERC721Options;
-  ERC1155:  { kind: 'ERC1155' }  & ERC1155Options;
-  Stablecoin:  { kind: 'Stablecoin' }  & StablecoinOptions;
-  RealWorldAsset:  { kind: 'RealWorldAsset' }  & StablecoinOptions;
+  ERC20: { kind: 'ERC20' } & ERC20Options;
+  ERC721: { kind: 'ERC721' } & ERC721Options;
+  ERC1155: { kind: 'ERC1155' } & ERC1155Options;
+  Stablecoin: { kind: 'Stablecoin' } & StablecoinOptions;
+  RealWorldAsset: { kind: 'RealWorldAsset' } & StablecoinOptions;
   Governor: { kind: 'Governor' } & GovernorOptions;
-  Custom:  { kind: 'Custom' }  & CustomOptions;
+  Custom: { kind: 'Custom' } & CustomOptions;
 }
 
 export type GenericOptions = KindedOptions[keyof KindedOptions];
@@ -41,8 +47,9 @@ export function buildGeneric(opts: GenericOptions): Contract {
     case 'Custom':
       return buildCustom(opts);
 
-    default:
+    default: {
       const _: never = opts;
       throw new Error('Unknown ERC');
+    }
   }
 }

package/src/common-functions.ts

@@ -3,9 +3,7 @@ import type { BaseFunction } from './contract';
 export const supportsInterface: BaseFunction = {
   name: 'supportsInterface',
   kind: 'public',
-  args: [
-    { name: 'interfaceId', type: 'bytes4' },
-  ],
+  args: [{ name: 'interfaceId', type: 'bytes4' }],
   returns: ['bool'],
   mutability: 'view',
 };

package/src/common-options.ts

@@ -1,7 +1,7 @@
-import type { Access } from "./set-access-control";
-import type { Info } from "./set-info";
-import { defaults as infoDefaults } from "./set-info";
-import type { Upgradeable } from "./set-upgradeable";
+import type { Access } from './set-access-control';
+import type { Info } from './set-info';
+import { defaults as infoDefaults } from './set-info';
+import type { Upgradeable } from './set-upgradeable';
 
 export const defaults: Required<CommonOptions> = {
   access: false,

package/src/contract.ts

@@ -13,7 +13,7 @@ export interface Contract {
   upgradeable: boolean;
 }
 
-export type Value = string | number | { lit: string } | { note: string, value: Value };
+export type Value = string | number | { lit: string } | { note: string; value: Value };
 
 export interface Parent {
   contract: ImportContract;
@@ -53,15 +53,13 @@ export interface ContractFunction extends BaseFunction {
 }
 
 export type FunctionKind = 'internal' | 'public';
-export type FunctionMutability = typeof mutabilityRank[number];
+export type FunctionMutability = (typeof mutabilityRank)[number];
 
 // Order is important
 const mutabilityRank = ['pure', 'view', 'nonpayable', 'payable'] as const;
 
 function maxMutability(a: FunctionMutability, b: FunctionMutability): FunctionMutability {
-  return mutabilityRank[
-    Math.max(mutabilityRank.indexOf(a), mutabilityRank.indexOf(b))
-  ]!;
+  return mutabilityRank[Math.max(mutabilityRank.indexOf(a), mutabilityRank.indexOf(b))]!;
 }
 
 export interface FunctionArgument {
@@ -94,22 +92,21 @@ export class ContractBuilder implements Contract {
   }
 
   get parents(): Parent[] {
-    return [...this.parentMap.values()].filter(p => !p.importOnly).sort((a, b) => {
-      if (a.contract.name === 'Initializable') {
-        return -1;
-      } else if (b.contract.name === 'Initializable') {
-        return 1;
-      } else {
-        return 0;
-      }
-    });
+    return [...this.parentMap.values()]
+      .filter(p => !p.importOnly)
+      .sort((a, b) => {
+        if (a.contract.name === 'Initializable') {
+          return -1;
+        } else if (b.contract.name === 'Initializable') {
+          return 1;
+        } else {
+          return 0;
+        }
+      });
   }
 
   get imports(): ImportContract[] {
-    return [
-      ...[...this.parentMap.values()].map(p => p.contract),
-      ...this.using.map(u => u.library),
-    ];
+    return [...[...this.parentMap.values()].map(p => p.contract), ...this.using.map(u => u.library)];
   }
 
   get functions(): ContractFunction[] {
@@ -128,7 +125,11 @@ export class ContractBuilder implements Contract {
 
   addImportOnly(contract: ImportContract): boolean {
     const present = this.parentMap.has(contract.name);
-    this.parentMap.set(contract.name, { contract, params: [], importOnly: true });
+    this.parentMap.set(contract.name, {
+      contract,
+      params: [],
+      importOnly: true,
+    });
     return !present;
   }
 
@@ -146,6 +147,7 @@ export class ContractBuilder implements Contract {
   }
 
   addNatspecTag(key: string, value: string) {
+    // eslint-disable-next-line no-useless-escape
     if (!/^(@custom:)?[a-z][a-z\-]*$/.exec(key)) throw new Error(`Invalid natspec key: ${key}`);
     this.natspecTags.push({ key, value });
   }

package/src/custom.ts

@@ -1,5 +1,7 @@
-import { Contract, ContractBuilder } from './contract';
-import { CommonOptions, withCommonDefaults, defaults as commonDefaults } from './common-options';
+import type { Contract } from './contract';
+import { ContractBuilder } from './contract';
+import type { CommonOptions } from './common-options';
+import { withCommonDefaults, defaults as commonDefaults } from './common-options';
 import { setUpgradeable } from './set-upgradeable';
 import { setInfo } from './set-info';
 import { setAccessControl } from './set-access-control';
@@ -52,4 +54,3 @@ export function buildCustom(opts: CustomOptions): Contract {
 
   return c;
 }
-