skittles 0.1.8 → 0.3.0

package/lib/abi/get-abi.d.ts

@@ -0,0 +1,4 @@
+import { Abi } from "../types/abi-types";
+import SkittlesClass from "../types/skittles-class";
+declare const getAbi: (skittlesClass: SkittlesClass) => Abi;
+export default getAbi;

package/lib/abi/get-abi.js

@@ -1,37 +1,94 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const skittles_class_1 = require("../types/skittles-class");
+const getTypeString = (type) => {
+    return type.kind;
+};
 const getConstructorAbi = (constructor) => {
     if (!constructor)
         return [];
     return [
         {
             type: "constructor",
-            inputs: constructor.parameters.map((i) => ({
-                name: i.name,
-                type: i.type,
-            })),
+            inputs: constructor.parameters.map((i) => {
+                return {
+                    name: i.name,
+                    type: getTypeString(i.type),
+                };
+            }),
             stateMutability: "nonpayable",
         },
     ];
 };
 const getPropertyAbi = (property) => {
+    if (property.type.kind === skittles_class_1.SkittlesTypeKind.Mapping) {
+        return {
+            type: "function",
+            name: property.name,
+            inputs: property.type.inputs.map((i) => {
+                return {
+                    name: "",
+                    type: getTypeString(i),
+                };
+            }),
+            outputs: [{ name: "", type: getTypeString(property.type.output) }],
+            stateMutability: "view",
+        };
+    }
+    if (property.type.kind === skittles_class_1.SkittlesTypeKind.Array) {
+        return {
+            type: "function",
+            name: property.name,
+            inputs: [
+                {
+                    name: "index",
+                    type: "uint256",
+                },
+            ],
+            outputs: [{ name: "", type: getTypeString(property.type.itemType) }],
+            stateMutability: "view",
+        };
+    }
     return {
         type: "function",
         name: property.name,
         inputs: [],
-        outputs: [{ name: "", type: property.type }],
+        outputs: [{ name: "", type: getTypeString(property.type) }],
         stateMutability: "view",
     };
 };
 const getMethodAbi = (method) => {
+    const outputs = () => {
+        const { returns } = method;
+        if (returns.kind === skittles_class_1.SkittlesTypeKind.Void)
+            return [];
+        if (returns.kind === skittles_class_1.SkittlesTypeKind.Interface) {
+            return [
+                ...returns.interface.elements.map((e) => {
+                    return {
+                        name: e.name,
+                        type: getTypeString(e.type),
+                    };
+                }),
+            ];
+        }
+        return [
+            {
+                name: "",
+                type: getTypeString(returns),
+            },
+        ];
+    };
     return {
         type: "function",
         name: method.name,
-        inputs: method.parameters.map((i) => ({
-            name: i.name,
-            type: i.type,
-        })),
-        outputs: [{ name: "", type: method.returns }],
+        inputs: method.parameters.map((i) => {
+            return {
+                name: i.name,
+                type: getTypeString(i.type),
+            };
+        }),
+        outputs: outputs(),
         stateMutability: method.view ? "view" : "payable",
     };
 };

package/lib/ast/get-ast.d.ts

@@ -0,0 +1,3 @@
+import { SourceFile } from "typescript";
+declare const getAst: (file: string) => SourceFile;
+export default getAst;

package/lib/bytecode/get-bytecode.d.ts

@@ -0,0 +1,2 @@
+declare const getBytecode: (className: string, content: string) => any;
+export default getBytecode;

package/lib/compiler/skittles-compiler.d.ts

@@ -0,0 +1,2 @@
+declare const skittlesCompile: () => void;
+export default skittlesCompile;

package/lib/compiler/skittles-compiler.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ora_1 = __importDefault(require("ora"));
+const get_abi_1 = __importDefault(require("../abi/get-abi"));
+const get_bytecode_1 = __importDefault(require("../bytecode/get-bytecode"));
+const add_dependencies_1 = __importDefault(require("../dependencies/add-dependencies"));
+const file_helper_1 = require("../helpers/file-helper");
+const get_skittles_class_1 = __importDefault(require("../skittles-class/get-skittles-class"));
+const get_yul_1 = __importDefault(require("../yul/get-yul"));
+const doTask = (task, fn) => {
+    const spinner = (0, ora_1.default)(task).start();
+    const response = fn();
+    spinner.succeed();
+    return response;
+};
+const skittlesCompile = () => {
+    const files = doTask("Loading Contracts", () => (0, file_helper_1.getAllContractFiles)());
+    const classes = doTask("Processing", () => files.map(get_skittles_class_1.default));
+    classes.forEach((skittlesClass) => {
+        const { name } = skittlesClass;
+        doTask(`Compiling ${name}`, () => {
+            const newClass = (0, add_dependencies_1.default)(skittlesClass, classes);
+            const abi = (0, get_abi_1.default)(newClass);
+            (0, file_helper_1.writeFile)("abi", name, JSON.stringify(abi, null, 2));
+            const yul = (0, get_yul_1.default)(newClass, abi);
+            (0, file_helper_1.writeFile)("yul", name, yul);
+            const bytecode = (0, get_bytecode_1.default)(name, yul);
+            (0, file_helper_1.writeFile)("bytecode", name, bytecode);
+        });
+    });
+};
+exports.default = skittlesCompile;

package/lib/data/constants.d.ts

@@ -0,0 +1 @@
+export declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";

package/lib/data/constants.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZERO_ADDRESS = void 0;
+exports.ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";

package/lib/data/yul-template.d.ts

@@ -0,0 +1,12 @@
+export declare enum YulSection {
+    Constructor = "constructor",
+    Dispatchers = "dispatchers",
+    Functions = "functions",
+    ConstructorFunctions = "constructor functions",
+    StorageLayout = "storage layout",
+    ConstructorStorageLayout = "constructor storage layout",
+    StorageAccess = "storage access",
+    ConstructorStorageAccess = "constructor storage access"
+}
+declare const yulTemplate: string[];
+export default yulTemplate;

package/lib/data/yul-template.js

@@ -6,6 +6,7 @@ var YulSection;
     YulSection["Constructor"] = "constructor";
     YulSection["Dispatchers"] = "dispatchers";
     YulSection["Functions"] = "functions";
+    YulSection["ConstructorFunctions"] = "constructor functions";
     YulSection["StorageLayout"] = "storage layout";
     YulSection["ConstructorStorageLayout"] = "constructor storage layout";
     YulSection["StorageAccess"] = "storage access";
@@ -54,6 +55,9 @@ const yulTemplate = [
     `/* ---------- constructor ----------- */`,
     ``,
     ``,
+    `/* ---------- constructor functions ----------- */`,
+    ``,
+    ``,
     `/* -------- constructor storage layout ---------- */`,
     ``,
     ``,
@@ -108,6 +112,9 @@ const yulTemplate = [
     `mstore(64, v)`,
     `return(0x00, 0x60)`,
     `}`,
+    `function returnArray(v) {`,
+    `return(0, v)`,
+    `}`,
     `function returnBoolean(v) {`,
     `switch v`,
     `case true {`,

package/lib/dependencies/add-dependencies.d.ts

@@ -0,0 +1,3 @@
+import SkittlesClass from "../types/skittles-class";
+declare const addDependencies: (skittlesClass: SkittlesClass, classes: SkittlesClass[]) => SkittlesClass;
+export default addDependencies;

package/lib/dependencies/add-dependencies.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const addDependencies = (skittlesClass, classes) => {
+    const dependencyClasses = classes.filter((c) => {
+        return skittlesClass.classExtensions.includes(c.name);
+    });
+    if (dependencyClasses.length === 0)
+        return skittlesClass;
+    const { name, constructor, methods, interfaces, variables, classExtensions } = skittlesClass;
+    dependencyClasses.forEach((dependencyClass) => {
+        const { methods: dependencyMethods, interfaces: dependencyInterfaces, variables: dependencyVariables, classExtensions: dependencyClassExtensions, } = dependencyClass;
+        Object.entries(dependencyInterfaces).forEach(([key, value]) => {
+            if (!interfaces[key])
+                interfaces[key] = value;
+        });
+        methods.push(...dependencyMethods);
+        variables.push(...dependencyVariables);
+        classExtensions.push(...dependencyClassExtensions);
+    });
+    return {
+        classExtensions,
+        name,
+        constructor,
+        methods,
+        interfaces,
+        variables,
+    };
+};
+exports.default = addDependencies;

package/lib/helpers/ast-helper.d.ts

@@ -0,0 +1,13 @@
+import { BinaryExpression, ClassDeclaration, Node, PropertyDeclaration } from "typescript";
+export declare const getClassNode: (node: Node) => ClassDeclaration;
+export declare const getNodeName: (node: Node) => string;
+export declare const isPlusEquals: (expression: BinaryExpression) => boolean;
+export declare const isEquals: (expression: BinaryExpression) => boolean;
+export declare const isMinusEquals: (expression: BinaryExpression) => boolean;
+export declare const isTrueKeyword: (node: Node) => boolean;
+export declare const isFalseKeyword: (node: Node) => boolean;
+export declare const isNodePrivate: (node: Node) => boolean;
+export declare const isNodeImmutable: (node: Node) => boolean;
+export declare const isPropertyArrowFunction: (node: PropertyDeclaration) => boolean;
+export declare const isVariable: (property: PropertyDeclaration) => boolean;
+export declare const isExpression: (node: Node) => boolean;

package/lib/helpers/ast-helper.js

@@ -48,7 +48,8 @@ exports.isFalseKeyword = isFalseKeyword;
 const isNodePrivate = (node) => {
     let isPrivate = false;
     (0, typescript_1.forEachChild)(node, (node) => {
-        if (node.kind === typescript_1.SyntaxKind.PrivateKeyword) {
+        if (node.kind === typescript_1.SyntaxKind.PrivateKeyword ||
+            node.kind === typescript_1.SyntaxKind.ProtectedKeyword) {
             isPrivate = true;
         }
     });

package/lib/helpers/console-helper.d.ts

@@ -0,0 +1 @@
+export declare const logSkittles: () => void;

package/lib/helpers/console-helper.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logSkittles = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const lines = [
+    `         888      d8b 888    888    888                   `,
+    `         888      Y8P 888    888    888                   `,
+    `         888          888    888    888                   `,
+    `.d8888b  888  888 888 888888 888888 888  .d88b.  .d8888b  `,
+    `88K      888 .88P 888 888    888    888 d8P  Y8b 88K      `,
+    `"Y8888b. 888888K  888 888    888    888 88888888 "Y8888b. `,
+    `     X88 888 "88b 888 Y88b.  Y88b.  888 Y8b.          X88 `,
+    ` 88888P' 888  888 888  "Y888  "Y888 888  "Y8888   88888P' `,
+];
+const letterBreakpoints = [9, 17, 21, 28, 35, 39, 48];
+const logSkittles = () => {
+    console.log("");
+    lines.forEach((line) => {
+        console.log(chalk_1.default.hex("#de3c3c")(line.substring(0, letterBreakpoints[0])) +
+            chalk_1.default.hex("#deb53c")(line.substring(letterBreakpoints[0], letterBreakpoints[1])) +
+            chalk_1.default.hex("#8dde3c")(line.substring(letterBreakpoints[1], letterBreakpoints[2])) +
+            chalk_1.default.hex("#3cde64")(line.substring(letterBreakpoints[2], letterBreakpoints[3])) +
+            chalk_1.default.hex("#3cdede")(line.substring(letterBreakpoints[3], letterBreakpoints[4])) +
+            chalk_1.default.hex("#3c64de")(line.substring(letterBreakpoints[4], letterBreakpoints[5])) +
+            chalk_1.default.hex("#8d3cde")(line.substring(letterBreakpoints[5], letterBreakpoints[6])) +
+            chalk_1.default.hex("#de3cb5")(line.substring(letterBreakpoints[6])));
+    });
+    console.log("");
+};
+exports.logSkittles = logSkittles;

package/lib/helpers/file-helper.d.ts

@@ -0,0 +1,5 @@
+export declare const getAllFilesInDirectory: (dir: string) => string[];
+export declare const getAllContractFiles: () => string[];
+export declare const writeFile: (type: string, fileName: string, content: string) => void;
+export declare const clearDirectory: (directory: string) => void;
+export declare const getContractName: (fileName: string) => string;

package/lib/helpers/file-helper.js

@@ -3,21 +3,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeFile = exports.getAllContractFiles = void 0;
+exports.getContractName = exports.clearDirectory = exports.writeFile = exports.getAllContractFiles = exports.getAllFilesInDirectory = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const CONTRCT_PATH = "./contracts";
+const getAllFilesInDirectory = (dir) => {
+    const files = [];
+    fs_1.default.readdirSync(dir).forEach((file) => {
+        const filePath = path_1.default.join(dir, file);
+        if (fs_1.default.statSync(filePath).isDirectory()) {
+            files.push(...(0, exports.getAllFilesInDirectory)(filePath));
+        }
+        else {
+            files.push(filePath);
+        }
+    });
+    return files;
+};
+exports.getAllFilesInDirectory = getAllFilesInDirectory;
 const getAllContractFiles = () => {
-    return fs_1.default
-        .readdirSync(CONTRCT_PATH)
+    return (0, exports.getAllFilesInDirectory)(CONTRCT_PATH)
         .filter((file) => {
-        return fs_1.default.statSync(path_1.default.join(CONTRCT_PATH, file)).isFile();
-    })
-        .map((file) => {
-        return path_1.default.join(CONTRCT_PATH, file);
+        return fs_1.default.statSync(file).isFile();
     })
         .filter((file) => {
-        return file.endsWith(".ts") || file.endsWith(".js");
+        return (file.endsWith(".ts") &&
+            !file.endsWith(".d.ts") &&
+            !file.endsWith(".spec.ts"));
     });
 };
 exports.getAllContractFiles = getAllContractFiles;
@@ -28,3 +40,26 @@ const writeFile = (type, fileName, content) => {
     fs_1.default.writeFileSync(`${directory}/${fileName}.${type}`, content);
 };
 exports.writeFile = writeFile;
+// Delete all files and directories in the given directory
+const clearDirectory = (directory) => {
+    const files = fs_1.default.readdirSync(directory);
+    for (const file of files) {
+        const filePath = path_1.default.join(directory, file);
+        if (fs_1.default.statSync(filePath).isFile()) {
+            fs_1.default.unlinkSync(filePath);
+        }
+        else {
+            (0, exports.clearDirectory)(filePath);
+        }
+    }
+    fs_1.default.rmdirSync(directory);
+};
+exports.clearDirectory = clearDirectory;
+const getContractName = (fileName) => {
+    const file = fs_1.default.readFileSync(fileName, { encoding: "utf8" });
+    const contractIndex = file.indexOf("class");
+    if (contractIndex === -1)
+        throw new Error(`No contract in file ${file}`);
+    return file.substring(contractIndex + 6, file.indexOf(" ", contractIndex + 6));
+};
+exports.getContractName = getContractName;

package/lib/helpers/selector-helper.d.ts

@@ -0,0 +1,2 @@
+declare const getSelector: (abi: any[], func: string) => string;
+export default getSelector;

package/lib/helpers/string-helper.d.ts

@@ -0,0 +1,2 @@
+export declare const subStringCount: (str: string, subString: string) => number;
+export declare const getVariables: (n: number) => string;

package/lib/helpers/yul-helper.d.ts

@@ -0,0 +1,3 @@
+import { YulSection } from "../data/yul-template";
+export declare const addToSection: (yul: string[], section: YulSection, lines: string[]) => string[];
+export declare const getBaseYul: (name: string) => string[];

package/lib/index.d.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import { address, self, block, chain, msg, tx } from "./types/core-types";
+import getSkittlesFactory from "./testing/get-skittles-factory";
+import { ZERO_ADDRESS } from "./data/constants";
+export { address, self, block, chain, msg, tx, getSkittlesFactory, ZERO_ADDRESS, };

package/lib/index.js

@@ -13,56 +13,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tx = exports.msg = exports.chain = exports.block = exports.self = void 0;
-// import chalk from "chalk";
-// import clear from "clear";
-// import figlet from "figlet";
-// import path from "path";
-const commander_1 = require("commander");
-const get_abi_1 = __importDefault(require("./abi/get-abi"));
-const get_bytecode_1 = __importDefault(require("./bytecode/get-bytecode"));
+exports.ZERO_ADDRESS = exports.getSkittlesFactory = exports.tx = exports.msg = exports.chain = exports.block = exports.self = void 0;
+const yargs_1 = __importDefault(require("yargs"));
 const file_helper_1 = require("./helpers/file-helper");
-const get_skittles_class_1 = __importDefault(require("./skittles-class/get-skittles-class"));
-const get_yul_1 = __importDefault(require("./yul/get-yul"));
 const core_types_1 = require("./types/core-types");
 Object.defineProperty(exports, "self", { enumerable: true, get: function () { return core_types_1.self; } });
 Object.defineProperty(exports, "block", { enumerable: true, get: function () { return core_types_1.block; } });
 Object.defineProperty(exports, "chain", { enumerable: true, get: function () { return core_types_1.chain; } });
 Object.defineProperty(exports, "msg", { enumerable: true, get: function () { return core_types_1.msg; } });
 Object.defineProperty(exports, "tx", { enumerable: true, get: function () { return core_types_1.tx; } });
-const skittlesCompile = () => __awaiter(void 0, void 0, void 0, function* () {
-    const files = (0, file_helper_1.getAllContractFiles)();
-    const promises = files.map((file) => __awaiter(void 0, void 0, void 0, function* () {
-        const skittlesClass = (0, get_skittles_class_1.default)(file);
-        const abi = (0, get_abi_1.default)(skittlesClass);
-        const { name } = skittlesClass;
-        (0, file_helper_1.writeFile)("abi", name, JSON.stringify(abi, null, 2));
-        const yul = (0, get_yul_1.default)(skittlesClass, abi);
-        (0, file_helper_1.writeFile)("yul", name, yul);
-        const bytecode = (0, get_bytecode_1.default)(name, yul);
-        (0, file_helper_1.writeFile)("bytecode", name, bytecode);
-    }));
-    yield Promise.all(promises);
-});
-// clear();
-// console.log(
-//   chalk.red(figlet.textSync("skittles-cli", { horizontalLayout: "full" }))
-// );
-commander_1.program
-    .name("skittles")
-    .description("CLI for the Skittles compiler")
-    .version("0.1.0");
-// program
-//   .command("compile")
-//   .description("Compile TypeScript file")
-//   .argument("<string>", "file name")
-//   .action(async (str, options) => {
-//     console.log(await compileTypeScriptToBytecode(str));
-//   });
-commander_1.program
-    .command("compile")
-    .description("Compile all TypeScript file")
-    .action(() => __awaiter(void 0, void 0, void 0, function* () {
-    yield skittlesCompile();
-}));
-commander_1.program.parse();
+const get_skittles_factory_1 = __importDefault(require("./testing/get-skittles-factory"));
+exports.getSkittlesFactory = get_skittles_factory_1.default;
+const console_helper_1 = require("./helpers/console-helper");
+const skittles_compiler_1 = __importDefault(require("./compiler/skittles-compiler"));
+const constants_1 = require("./data/constants");
+Object.defineProperty(exports, "ZERO_ADDRESS", { enumerable: true, get: function () { return constants_1.ZERO_ADDRESS; } });
+yargs_1.default
+    .command("compile", "Compile all TypeScript files", () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, console_helper_1.logSkittles)();
+    (0, skittles_compiler_1.default)();
+}))
+    .command("clean", "Clears the cache and deletes all builds", () => {
+    (0, file_helper_1.clearDirectory)("./build");
+})
+    .parse();

package/lib/skittles-class/get-skittles-class.d.ts

@@ -0,0 +1,3 @@
+import SkittlesClass from "../types/skittles-class";
+declare const getSkittlesClass: (file: string) => SkittlesClass;
+export default getSkittlesClass;

package/lib/skittles-class/get-skittles-class.js

@@ -7,12 +7,14 @@ const typescript_1 = require("typescript");
 const get_ast_1 = __importDefault(require("../ast/get-ast"));
 const ast_helper_1 = require("../helpers/ast-helper");
 const get_skittles_constructor_1 = __importDefault(require("./get-skittles-constructor"));
+const get_skittles_interfaces_1 = __importDefault(require("./get-skittles-interfaces"));
 const get_skittles_method_1 = __importDefault(require("./get-skittles-method"));
 const get_skittles_property_1 = __importDefault(require("./get-skittles-property"));
 const get_skittles_state_mutability_1 = __importDefault(require("./get-skittles-state-mutability"));
 const getSkittlesClass = (file) => {
     const ast = (0, get_ast_1.default)(file);
     const classNode = (0, ast_helper_1.getClassNode)(ast);
+    const interfaces = (0, get_skittles_interfaces_1.default)(ast);
     const astVariables = classNode.members
         .filter(typescript_1.isPropertyDeclaration)
         .filter(ast_helper_1.isVariable);
@@ -21,15 +23,26 @@ const getSkittlesClass = (file) => {
         .filter(typescript_1.isPropertyDeclaration)
         .filter(ast_helper_1.isPropertyArrowFunction);
     const astConstructor = classNode.members.find(typescript_1.isConstructorDeclaration);
+    const classExtensions = [];
+    const { heritageClauses } = classNode;
+    if (heritageClauses) {
+        heritageClauses.forEach((heritageClause) => {
+            heritageClause.types.forEach((type) => {
+                classExtensions.push((0, ast_helper_1.getNodeName)(type.expression));
+            });
+        });
+    }
     const skittlesClass = {
+        classExtensions,
+        interfaces,
         name: (0, ast_helper_1.getNodeName)(classNode),
         constructor: astConstructor
-            ? (0, get_skittles_constructor_1.default)(astConstructor)
+            ? (0, get_skittles_constructor_1.default)(astConstructor, interfaces)
             : undefined,
-        variables: astVariables.map(get_skittles_property_1.default),
+        variables: astVariables.map((v) => (0, get_skittles_property_1.default)(v, interfaces)),
         methods: [
-            ...astMethods.map(get_skittles_method_1.default),
-            ...astArrowFunctions.map(get_skittles_method_1.default),
+            ...astMethods.map((m) => (0, get_skittles_method_1.default)(m, interfaces)),
+            ...astArrowFunctions.map((f) => (0, get_skittles_method_1.default)(f, interfaces)),
         ],
     };
     return (0, get_skittles_state_mutability_1.default)(skittlesClass);

package/lib/skittles-class/get-skittles-constructor.d.ts

@@ -0,0 +1,4 @@
+import { ConstructorDeclaration } from "typescript";
+import { SkittlesConstructor, SkittlesInterfaces } from "../types/skittles-class";
+declare const getSkittlesConstructor: (astConstructor: ConstructorDeclaration, interfaces: SkittlesInterfaces) => SkittlesConstructor;
+export default getSkittlesConstructor;

package/lib/skittles-class/get-skittles-constructor.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ast_helper_1 = require("../helpers/ast-helper");
 const get_skittles_statements_1 = __importDefault(require("./get-skittles-statements"));
 const get_skittles_type_1 = __importDefault(require("./get-skittles-type"));
-const getSkittlesConstructor = (astConstructor) => {
+const getSkittlesConstructor = (astConstructor, interfaces) => {
     return {
         parameters: astConstructor.parameters.map((parameter) => {
             return {
                 name: (0, ast_helper_1.getNodeName)(parameter),
-                type: (0, get_skittles_type_1.default)(parameter.type),
+                type: (0, get_skittles_type_1.default)(parameter.type, interfaces),
             };
         }),
-        statements: (0, get_skittles_statements_1.default)(astConstructor.body, (0, get_skittles_type_1.default)(astConstructor.type)),
+        statements: (0, get_skittles_statements_1.default)(astConstructor.body, (0, get_skittles_type_1.default)(astConstructor.type, interfaces), interfaces),
     };
 };
 exports.default = getSkittlesConstructor;

package/lib/skittles-class/get-skittles-expression.d.ts

@@ -0,0 +1,4 @@
+import { Expression } from "typescript";
+import { SkittlesExpression, SkittlesInterfaces } from "../types/skittles-class";
+declare const getSkittlesExpression: (expression: Expression, interfaces: SkittlesInterfaces) => SkittlesExpression;
+export default getSkittlesExpression;