build: fix typescript build step

it should output js and d.ts to root, not dist

Author: jtakalai

dist/index.d.ts

@@ -1,22 +1,39 @@
-import { Signer } from "@ethersproject/abstract-signer";
-import { Provider } from "@ethersproject/providers";
-import type { DATAv2 } from "./typechain/DATAv2";
+import { Provider, Signer } from "ethers";
+import type { DATAv2 } from "./typechain/contracts/DATAv2";
 export declare const abi: ({
+    inputs: never[];
+    stateMutability: string;
     type: string;
+    anonymous?: undefined;
+    name?: undefined;
+    outputs?: undefined;
+} | {
+    anonymous: boolean;
     inputs: {
-        indexed?: boolean; // events
+        indexed: boolean;
         internalType: string;
         name: string;
         type: string;
     }[];
-    name?: string; // constructor doesn't have name
-    stateMutability?: string;
-    anonymous?: boolean; // events
-    outputs?: {
+    name: string;
+    type: string;
+    stateMutability?: undefined;
+    outputs?: undefined;
+} | {
+    inputs: {
         internalType: string;
         name: string;
         type: string;
     }[];
+    name: string;
+    outputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+    anonymous?: undefined;
 })[], bytecode: string;
 export type { DATAv2 };
 export declare function getTokenAt(address: string, signerOrProvider: Provider | Signer): DATAv2;

dist/index.js

@@ -1,62 +1,40 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployToken = exports.getTokenAt = exports.bytecode = exports.abi = void 0;
-var contracts_1 = require("@ethersproject/contracts");
-var dataV2json = require("./artifacts/contracts/DATAv2.sol/DATAv2.json");
+const ethers_1 = require("ethers");
+const dataV2json = __importStar(require("./artifacts/contracts/DATAv2.sol/DATAv2.json"));
 exports.abi = dataV2json.abi, exports.bytecode = dataV2json.bytecode;
 function getTokenAt(address, signerOrProvider) {
-    return new contracts_1.Contract(address, exports.abi, signerOrProvider);
+    return new ethers_1.Contract(address, exports.abi, signerOrProvider);
 }
 exports.getTokenAt = getTokenAt;
-function deployToken(signer) {
-    return __awaiter(this, void 0, void 0, function () {
-        var factory, contract;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    factory = new contracts_1.ContractFactory(exports.abi, exports.bytecode, signer);
-                    return [4 /*yield*/, factory.deploy()];
-                case 1:
-                    contract = _a.sent();
-                    return [2 /*return*/, contract.waitForDeployment()];
-            }
-        });
-    });
+async function deployToken(signer) {
+    const factory = new ethers_1.ContractFactory(exports.abi, exports.bytecode, signer);
+    const contract = await factory.deploy();
+    await contract.waitForDeployment();
+    return contract;
 }
 exports.deployToken = deployToken;

index.d.ts

@@ -10,7 +10,7 @@
   ],
   "scripts": {
     "lint": "eslint",
-    "clean": "rm -rf cache artifacts coverage typechain",
+    "clean": "rm -rf cache artifacts coverage typechain index.js index.d.ts",
     "test": "hardhat test",
     "build": "hardhat compile && tsc -p tsconfig.build.json",
     "cov": "hardhat coverage"

index.js

@@ -11,8 +11,7 @@
         "skipLibCheck": true,
         "forceConsistentCasingInFileNames": true,
         "resolveJsonModule": true,
-        "declaration": true,
-        "outDir": "dist"
+        "declaration": true
     },
     "include": ["./index.ts"]
-}
+}