diff --git a/package.json b/package.json index 2bc5b29..c2c61b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tezwell/michelson-sdk", - "version": "0.4.0", + "version": "0.4.1", "description": "Michelson SDK is a framework for generating Michelson values and types from Javascript.", "keywords": [ "Tezos", @@ -26,17 +26,13 @@ "require": "./converter/index.cjs", "import": "./converter/index.mjs" }, - "./core": { - "require": "./core/index.cjs", - "import": "./core/index.mjs" - }, "./literal": { - "require": "./core/literal.cjs", - "import": "./core/literal.mjs" + "require": "./literal.cjs", + "import": "./literal.mjs" }, "./type": { - "require": "./core/type.cjs", - "import": "./core/type.mjs" + "require": "./type.cjs", + "import": "./type.mjs" } }, "scripts": { @@ -49,11 +45,11 @@ }, "devDependencies": { "@types/jest": "27.4.0", - "@typescript-eslint/eslint-plugin": "5.10.0", - "@typescript-eslint/parser": "5.10.0", + "@typescript-eslint/eslint-plugin": "5.10.1", + "@typescript-eslint/parser": "5.10.1", "coveralls": "3.1.1", - "esbuild": "0.14.11", - "eslint": "8.7.0", + "esbuild": "0.14.14", + "eslint": "8.8.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-prettier": "4.0.0", "jest": "27.4.7", @@ -61,7 +57,7 @@ "jest-junit": "13.0.0", "prettier": "2.5.1", "ts-jest": "27.1.3", - "typescript": "4.5.4" + "typescript": "4.5.5" }, "jest-junit": { "suiteName": "jest tests", diff --git a/scripts/build.js b/scripts/build.js index 78e0aa2..84cb658 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -5,13 +5,7 @@ const DIST_FOLDER = './dist'; // Build steps cleanUP(); -generateBundle([ - './src/index.ts', - './src/converter/index.ts', - './src/core/index.ts', - './src/core/type.ts', - './src/core/literal.ts', -]); +generateBundle(['./src/index.ts', './src/converter/index.ts', './src/type.ts', './src/literal.ts']); /** * Produces the js bundle diff --git a/src/converter/json.ts b/src/converter/json.ts index b8b7be4..6a5c63b 100644 --- a/src/converter/json.ts +++ b/src/converter/json.ts @@ -1,4 +1,4 @@ -import { Prim } from '../core/enums/prim'; +import { Prim } from '../enums/prim'; import Guards from '../misc/guards'; import { MichelsonJSON, MichelsonJSON_Prim, MichelsonMicheline } from '../typings'; diff --git a/src/core/index.ts b/src/core/index.ts deleted file mode 100644 index c1d4728..0000000 --- a/src/core/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './type'; -export * from './literal'; - -export * as Type from './type'; -export * as Literal from './literal'; diff --git a/src/core/enums/prim.ts b/src/enums/prim.ts similarity index 100% rename from src/core/enums/prim.ts rename to src/enums/prim.ts diff --git a/src/index.ts b/src/index.ts index 4b0e041..1db224a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1 +1,2 @@ -export * from './core'; +export * from './literal'; +export * from './type'; diff --git a/src/core/literal.ts b/src/literal.ts similarity index 98% rename from src/core/literal.ts rename to src/literal.ts index 1b71468..6e63b39 100644 --- a/src/core/literal.ts +++ b/src/literal.ts @@ -1,13 +1,13 @@ import type { IRecordVariant } from './type'; -import type { MichelsonJSON, MichelsonMicheline, PairsOfKeys, PrimValue, IValue } from '../typings'; +import type { MichelsonJSON, MichelsonMicheline, PairsOfKeys, PrimValue, IValue } from './typings'; import { TOr, // buildRecordVariantType, } from './type'; import { Prim } from './enums/prim'; -import Utils, { composeRightCombLayout, curlyBrackets, parenthesis } from '../misc/utils'; -import Converter from '../converter'; +import Utils, { composeRightCombLayout, curlyBrackets, parenthesis } from './misc/utils'; +import Converter from './converter'; export class Michelson_Literal implements IValue { private prim: PrimValue; diff --git a/src/misc/utils.ts b/src/misc/utils.ts index 35b1d78..9f425ce 100644 --- a/src/misc/utils.ts +++ b/src/misc/utils.ts @@ -1,5 +1,5 @@ import type { PairsOfKeys } from '../typings'; -import { Prim } from '../core/enums/prim'; +import { Prim } from '../enums/prim'; export const parenthesis = (str: string) => `(${str})`; export const curlyBrackets = (str: string) => `{ ${str} }`; diff --git a/src/core/type.ts b/src/type.ts similarity index 98% rename from src/core/type.ts rename to src/type.ts index b53a615..6982cb9 100644 --- a/src/core/type.ts +++ b/src/type.ts @@ -1,5 +1,5 @@ -import type { MichelsonJSON, MichelsonMicheline, PairsOfKeys, IType, PrimType } from '../typings'; -import { composeRightCombLayout, parenthesis } from '../misc/utils'; +import type { MichelsonJSON, MichelsonMicheline, PairsOfKeys, IType, PrimType } from './typings'; +import { composeRightCombLayout, parenthesis } from './misc/utils'; import { Prim } from './enums/prim'; export class Michelson_Type implements IType { diff --git a/src/typings/index.ts b/src/typings/index.ts index ceebcc6..d1ecfdc 100644 --- a/src/typings/index.ts +++ b/src/typings/index.ts @@ -1,4 +1,4 @@ -import { Prim } from '../core/enums/prim'; +import { Prim } from '../enums/prim'; export type MichelsonJSON_Prim = { prim: keyof typeof Prim; diff --git a/src/typings/literal.ts b/src/typings/literal.ts index f07723d..d558079 100644 --- a/src/typings/literal.ts +++ b/src/typings/literal.ts @@ -1,4 +1,4 @@ -import { Prim } from '../core/enums/prim'; +import { Prim } from '../enums/prim'; /** * @see https://tezos.gitlab.io/alpha/michelson.html#full-grammar diff --git a/src/typings/type.ts b/src/typings/type.ts index 89586e4..785a35b 100644 --- a/src/typings/type.ts +++ b/src/typings/type.ts @@ -1,4 +1,4 @@ -import { Prim } from '../core/enums/prim'; +import { Prim } from '../enums/prim'; /** * @see https://tezos.gitlab.io/alpha/michelson.html#full-grammar diff --git a/tests/e2e/validate_michelson.ts b/tests/e2e/validate_michelson.ts index bccb929..57ef2b1 100644 --- a/tests/e2e/validate_michelson.ts +++ b/tests/e2e/validate_michelson.ts @@ -28,7 +28,7 @@ import { Left, Right, Lambda, -} from '../../src/core/literal'; +} from '../../src/literal'; import { TAddress, TBig_map, @@ -56,7 +56,7 @@ import { TTimestamp, TUnit, TVariant, -} from '../../src/core/type'; +} from '../../src/type'; import { buildTesterContract, convertContractToJSON, convertMichelsonToJSON } from './utils'; const verifyLiteral = (testName: string, lit: IValue, type: IType) => { diff --git a/tests/e2e/validate_types.ts b/tests/e2e/validate_types.ts index 7c09801..3224264 100644 --- a/tests/e2e/validate_types.ts +++ b/tests/e2e/validate_types.ts @@ -18,7 +18,7 @@ import { TTicket, TUnit, TVariant, -} from '../../src/core/type'; +} from '../../src/type'; import { buildTypeTesterContract, convertContractToJSON } from './utils'; const verifyType = (testName: string, type: IType) => {