Skip to content

Fix cadence-parser's esm package #2815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix cadence-parser's esm package #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3155ca2
fix unit test
wfalcon0x Sep 24, 2023
54fe090
fix dual packaging so esm modules can be used from nodejs
wfalcon0x Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions npm-packages/cadence-parser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"scripts": {
"build": "npm run build:types && npm run build:esm && npm run build:cjs && GOARCH=wasm GOOS=js go build -o ./dist/cadence-parser.wasm ../../runtime/cmd/parse",
"build:types": "tsc --emitDeclarationOnly --module system --outDir dist/types",
"build:esm": "tsc --module es6 --target es6 --outDir dist/esm --declaration false",
"build:cjs": "tsc --module commonjs --target es6 --outDir dist/cjs --declaration false",
"build:esm": "tsc -p tsconfig.json --declaration false",
"build:cjs": "tsc -p tsconfig-cjs.json --declaration false && tsconfig-to-dual-package",
"test": "jest"
},
"license": "Apache-2.0",
Expand All @@ -31,6 +31,7 @@
"jest": "^28.1.2",
"node-fetch": "^2.6.1",
"ts-jest": "^28.0.5",
"tsconfig-to-dual-package": "^1.2.0",
"typescript": "^4.7.4"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion npm-packages/cadence-parser/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

import { go } from './go'
import { go } from './go.js'
import WebAssemblyInstantiatedSource = WebAssembly.WebAssemblyInstantiatedSource

declare global {
Expand Down
133 changes: 49 additions & 84 deletions npm-packages/cadence-parser/tests/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,114 +8,79 @@ test("parse simple", async () => {
expect(res).toEqual({
"program": {
"Type": "Program",
"Declarations": [
{
"Access": "AccessPublic",
"DocString": "",
"EndPos": {
"Column": 16,
"Line": 1,
"Offset": 16,
"Declarations": [
{
"TypeParameterList": null,
"ParameterList": {
"Parameters": null,
"StartPos": {
"Offset": 12,
"Line": 1,
"Column": 12
},
"EndPos": {
"Offset": 13,
"Line": 1,
"Column": 13
}
},
"ReturnTypeAnnotation": null,
"FunctionBlock": {
"Block": {
"EndPos": {
"Column": 16,
"Statements": null,
"StartPos": {
"Offset": 15,
"Line": 1,
"Offset": 16,
"Column": 15
},
"StartPos": {
"Column": 15,
"EndPos": {
"Offset": 16,
"Line": 1,
"Offset": 15,
"Column": 16
},
"Statements": null,
"Type": "Block",
},
"EndPos": {
"Column": 16,
"Line": 1,
"Offset": 16,
"Type": "Block"
},
"Type": "FunctionBlock",
"StartPos": {
"Column": 15,
"Line": 1,
"Offset": 15,
"Line": 1,
"Column": 15
},
"Type": "FunctionBlock",
},
"Identifier": {
"EndPos": {
"Column": 11,
"Offset": 16,
"Line": 1,
"Offset": 11,
},
"Column": 16
}
},
"DocString": "",
"Identifier": {
"Identifier": "main",
"StartPos": {
"Column": 8,
"Line": 1,
"Offset": 8,
},
},
"ParameterList": {
"EndPos": {
"Column": 13,
"Line": 1,
"Offset": 13,
},
"Parameters": null,
"StartPos": {
"Column": 12,
"Line": 1,
"Offset": 12,
},
},
"ReturnTypeAnnotation": {
"AnnotatedType": {
"EndPos": {
"Column": 12,
"Line": 1,
"Offset": 12,
},
"Identifier": {
"EndPos": {
"Column": 12,
"Line": 1,
"Offset": 12,
},
"Identifier": "",
"StartPos": {
"Column": 13,
"Line": 1,
"Offset": 13,
},
},
"StartPos": {
"Column": 13,
"Line": 1,
"Offset": 13,
},
"Type": "NominalType",
"Column": 8
},
"EndPos": {
"Column": 12,
"Line": 1,
"Offset": 12,
},
"IsResource": false,
"StartPos": {
"Column": 13,
"Offset": 11,
"Line": 1,
"Offset": 13,
},
"Column": 11
}
},
"Access": "AccessPublic",
"Type": "FunctionDeclaration",
"StartPos": {
"Column": 0,
"Line": 1,
"Offset": 0,
"Line": 1,
"Column": 0
},
"Type": "FunctionDeclaration",
},
"EndPos": {
"Offset": 16,
"Line": 1,
"Column": 16
},
"IsStatic": false,
"IsNative": false
}
],
},
})
Expand Down
7 changes: 7 additions & 0 deletions npm-packages/cadence-parser/tsconfig-cjs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"module": "commonjs",
"outDir": "./dist/cjs"
},
}
2 changes: 1 addition & 1 deletion npm-packages/cadence-parser/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
],
"declaration": true,
"noImplicitAny": false,
"outDir": "./dist"
"outDir": "./dist/esm"
},
"exclude": [
"node_modules",
Expand Down