Skip to content
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

Jump to bottom

cosmic-proto export patterns #9310

Merged
merged 2 commits into from
May 2, 2024
Merged

cosmic-proto export patterns #9310

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
3c59ca0
build: use subpath patterns
turadg Apr 30, 2024
2c3b233
build: manual exports until https://github.com/endojs/endo/issues/2265
turadg May 2, 2024
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
2 changes: 1 addition & 1 deletion packages/boot/test/bootstrapTests/test-vat-orchestration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
MsgDelegate,
MsgDelegateResponse,
} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
import type { ChainAccount, OrchestrationService } from '@agoric/orchestration';
import { decodeBase64 } from '@endo/base64';
import { M, matches } from '@endo/patterns';
Expand Down
40 changes: 20 additions & 20 deletions packages/cosmic-proto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,34 @@
"default": "./dist/vatsafe.js"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should ./vatsafe get the same treatment?

"./vatsafe/*.js": {
  "types": "./dist/codegen/vatsafe/*.d.ts",
  "default": "./dist/codegen/vatsafe/*.js"
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's meant to be one module

},
"./package.json": "./package.json",
"./cosmos": {
"types": "./dist/codegen/cosmos/bundle.d.ts",
"default": "./dist/codegen/cosmos/bundle.js"
"./agoric/*.js": {
"types": "./dist/codegen/agoric/*.d.ts",
"default": "./dist/codegen/agoric/*.js"
},
"./cosmos/staking/v1beta1/tx": {
"./cosmos/*.js": {
turadg marked this conversation as resolved.
Show resolved Hide resolved
"types": "./dist/codegen/cosmos/*.d.ts",
"default": "./dist/codegen/cosmos/*.js"
},
"./cosmos/tx/v1beta1/tx.js": {
"types": "./dist/codegen/cosmos/tx/v1beta1/tx.d.ts",
"default": "./dist/codegen/cosmos/tx/v1beta1/tx.js"
},
"./cosmos/staking/v1beta1/tx.js": {
"types": "./dist/codegen/cosmos/staking/v1beta1/tx.d.ts",
"default": "./dist/codegen/cosmos/staking/v1beta1/tx.js"
},
"./ibc/applications/transfer/v1/tx.js": {
"types": "./dist/codegen/ibc/applications/transfer/v1/tx.d.ts",
"default": "./dist/codegen/ibc/applications/transfer/v1/tx.js"
"./google/*.js": {
"types": "./dist/codegen/google/*.d.ts",
"default": "./dist/codegen/google/*.js"
},
"./google/protobuf/any": {
"./google/protobuf/any.js": {
"types": "./dist/codegen/google/protobuf/any.d.ts",
"default": "./dist/codegen/google/protobuf/any.js"
},
"./ibc/*.js": {
"types": "./dist/codegen/ibc/*.d.ts",
"default": "./dist/codegen/ibc/*.js"
},
"./swingset/msgs.js": {
"types": "./dist/codegen/agoric/swingset/msgs.d.ts",
"default": "./dist/codegen/agoric/swingset/msgs.js"
Expand All @@ -55,18 +67,6 @@
"./vstorage/query.js": {
"types": "./dist/codegen/agoric/vstorage/query.d.ts",
"default": "./dist/codegen/agoric/vstorage/query.js"
},
"./cosmos/tx/v1beta1/tx.js": {
"types": "./dist/codegen/cosmos/tx/v1beta1/tx.d.ts",
"default": "./dist/codegen/cosmos/tx/v1beta1/tx.js"
},
"./cosmos/staking/v1beta1/staking.js": {
"types": "./dist/codegen/cosmos/staking/v1beta1/staking.d.ts",
"default": "./dist/codegen/cosmos/staking/v1beta1/staking.js"
},
"./cosmos/staking/v1beta1/tx.js": {
"types": "./dist/codegen/cosmos/staking/v1beta1/tx.d.ts",
"default": "./dist/codegen/cosmos/staking/v1beta1/tx.js"
}
},
"main": "dist/index.js",
Expand Down
5 changes: 5 additions & 0 deletions packages/cosmic-proto/package.json.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Notes about this package.json

The `exports` field uses [subpath patterns](https://nodejs.org/docs/latest-v18.x/api/packages.html#subpath-patterns) but Endo's bundler doesn't yet support those: https://github.com/endojs/endo/issues/2265

Meanwhile, we explicitly export whatever paths are needed by modules that end up in Endo bundles.
2 changes: 1 addition & 1 deletion packages/cosmic-proto/test/test-vatsafe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import test from '@endo/ses-ava/prepare-endo.js';
import { cosmos } from '@agoric/cosmic-proto';

import { MsgDelegate } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx';
import { MsgDelegate } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';

// @ts-expect-error
cosmos.staking.v1beta1.MsgDelegate.missing;
Expand Down
2 changes: 1 addition & 1 deletion packages/orchestration/src/exos/stakingAccountKit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { M, prepareExoClassKit } from '@agoric/vat-data';
import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
import { decodeBase64 } from '@endo/base64';
import { E } from '@endo/far';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';

/**
* @import { ChainAccount, ChainAddress } from '../types.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/orchestration/src/utils/tx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-check
import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
import { encodeBase64 } from '@endo/base64';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';

/**
* Makes an IBC packet from an array of messages. Expects the `value` of each message
Expand Down
2 changes: 1 addition & 1 deletion packages/orchestration/test/utils/tx.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import test from '@endo/ses-ava/prepare-endo.js';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
import { makeTxPacket, parsePacketAck } from '../../src/utils/tx.js';

test('makeTxPacket', t => {
Expand Down
Loading