skittles 0.4.0 → 0.4.2

package/README.md

@@ -37,7 +37,7 @@ yarn add skittles
 Here's a simple example of a Skittles smart contract:
 
 ```typescript
-import { address, SkittlesEvent } from "skittles/types/core-types";
+import { address, msg, SkittlesEvent } from "skittles/lib/types/core-types";
 
 interface TransferEvent {
   from: address;
@@ -64,7 +64,7 @@ export class Token {
     this.Transfer.emit({
       from: msg.sender,
       to,
-      amount
+      amount,
     });
 
     return true;
@@ -88,7 +88,7 @@ export class Token {
 Create a `skittles.config.ts` file in your project root:
 
 ```typescript
-import { SkittlesConfig } from "skittles/types/core-types";
+import { SkittlesConfig } from "skittles/lib/types/core-types";
 
 const config: SkittlesConfig = {
   optimizer: {
@@ -101,6 +101,7 @@ export default config;
 ```
 
 The configuration options include:
+
 - `optimizer.enabled`: Enable/disable the optimizer
 - `optimizer.runs`: Number of runs for the optimizer (default: 200)
 

package/lib/compiler/skittles-compiler.js

@@ -10,6 +10,7 @@ const get_bytecode_1 = __importDefault(require("../bytecode/get-bytecode"));
 const file_helper_1 = require("../helpers/file-helper");
 const get_yul_1 = __importDefault(require("../yul/get-yul"));
 const get_file_data_1 = __importDefault(require("./get-file-data"));
+const path_1 = __importDefault(require("path"));
 const doTask = (task, fn) => {
     const spinner = (0, ora_1.default)(task).start();
     const response = fn();
@@ -18,7 +19,7 @@ const doTask = (task, fn) => {
 };
 const getConfig = () => {
     try {
-        return require("../../skittles.config.ts");
+        return require(`${process.cwd()}/skittles.config.ts`);
     }
     catch {
         throw new Error("No skittles.config.ts file found");
@@ -26,7 +27,7 @@ const getConfig = () => {
 };
 const skittlesCompile = () => {
     // Loading cache and config
-    const cache = JSON.parse((0, file_helper_1.readFile)("build/cache.json"));
+    const cache = JSON.parse((0, file_helper_1.readFile)(path_1.default.join(process.cwd(), "build/cache.json")));
     const config = getConfig();
     // Getting file data
     const fileData = doTask("Processing Files", () => (0, get_file_data_1.default)(cache));

package/lib/helpers/file-helper.js

@@ -7,7 +7,7 @@ exports.relativePathToAbsolute = exports.getContractName = exports.clearDirector
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const constants_1 = require("../data/constants");
-const CONTRCT_PATH = "./contracts";
+const CONTRCT_PATH = path_1.default.join(process.cwd(), "contracts");
 const getAllFilesInDirectory = (dir) => {
     const files = [];
     fs_1.default.readdirSync(dir).forEach((file) => {

package/lib/testing/get-skittles-factory.js

@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const getFileString = (fileName) => {
     return fs_1.default.readFileSync(fileName, { encoding: "utf8" });
 };
 const getSkittlesFactory = async (signer, contract) => {
-    const abi = JSON.parse(getFileString(`./build/abi/${contract}.abi`));
-    const bytecode = getFileString(`./build/bytecode/${contract}.bytecode`);
+    const abi = JSON.parse(getFileString(path_1.default.join(process.cwd(), `build/abi/${contract}.abi`)));
+    const bytecode = getFileString(path_1.default.join(process.cwd(), `build/bytecode/${contract}.bytecode`));
     return new ethers_1.ContractFactory(abi, bytecode, signer);
 };
 exports.default = getSkittlesFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skittles",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "TypeScript Smart Contract Language for the EVM",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -34,14 +34,20 @@
     "ora": "^5.0.0",
     "solc": "^0.8.16",
     "typescript": "^4.7.4",
-    "yargs": "^17.5.1"
-  },
-  "devDependencies": {
+    "yargs": "^17.5.1",
     "@nomiclabs/hardhat-ethers": "^2.1.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "@typechain/ethers-v5": "^7.2.0",
     "@typechain/hardhat": "^2.3.1",
+    "ts-node": "^10.9.1",
+    "dotenv": "^16.0.1",
+    "typechain": "^5.2.0",
+    "ethereum-waffle": "^3.4.4",
+    "hardhat": "^2.10.2",
+    "hardhat-gas-reporter": "^1.0.8"
+  },
+  "devDependencies": {
     "@types/chai": "^4.3.3",
     "@types/listr": "^0.14.4",
     "@types/mocha": "^9.1.1",
@@ -50,7 +56,6 @@
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "chai": "^4.3.6",
-    "dotenv": "^16.0.1",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^16.0.3",
@@ -58,15 +63,10 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-promise": "^5.2.0",
-    "ethereum-waffle": "^3.4.4",
-    "hardhat": "^2.10.2",
-    "hardhat-gas-reporter": "^1.0.8",
     "prettier": "^2.7.1",
     "prettier-plugin-solidity": "^1.0.0-beta.13",
     "solhint": "^3.3.7",
-    "solidity-coverage": "^0.7.21",
-    "ts-node": "^10.9.1",
-    "typechain": "^5.2.0"
+    "solidity-coverage": "^0.7.21"
   },
   "prettier": {
     "printWidth": 100