@agoric/ertp 0.16.3-u14.0 → 0.16.3-u16.1

package/exported.d.ts

@@ -0,0 +1,37 @@
+/** @file Ambient exports until https://github.com/Agoric/agoric-sdk/issues/6512 */
+/** @see {@link /docs/typescript.md} */
+/* eslint-disable -- doesn't understand .d.ts */
+
+import '@agoric/notifier/exported.js';
+
+import {
+  Amount as _Amount,
+  Brand as _Brand,
+  Issuer as _Issuer,
+  IssuerKit as _IssuerKit,
+  Mint as _Mint,
+  AssetKind as _AssetKind,
+  SetValue as _SetValue,
+  NatValue as _NatValue,
+  DisplayInfo as _DisplayInfo,
+  AdditionalDisplayInfo as _AdditionalDisplayInfo,
+  Payment as _Payment,
+  Purse as _Purse,
+} from './src/types.js';
+declare global {
+  // @ts-ignore TS2666: Exports and export assignments are not permitted in module augmentations.
+  export {
+    _Amount as Amount,
+    _Brand as Brand,
+    _Issuer as Issuer,
+    _IssuerKit as IssuerKit,
+    _Mint as Mint,
+    _AssetKind as AssetKind,
+    _SetValue as SetValue,
+    _NatValue as NatValue,
+    _DisplayInfo as DisplayInfo,
+    _AdditionalDisplayInfo as AdditionalDisplayInfo,
+    _Payment as Payment,
+    _Purse as Purse,
+  };
+}

package/exported.js

@@ -1 +1,2 @@
-import './src/types-ambient.js';
+// Dummy file for .d.ts twin to declare ambients
+export {};

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@agoric/ertp",
-  "version": "0.16.3-u14.0",
+  "version": "0.16.3-u16.1",
   "description": "Electronic Rights Transfer Protocol (ERTP). A smart contract framework for exchanging electronic rights",
   "type": "module",
   "main": "src/index.js",
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "scripts": {
     "build": "exit 0",
-    "prepack": "echo \"export {}; \" | cat - src/types-ambient.js > src/types.js && tsc --build jsconfig.build.json",
-    "postpack": "git clean -f '*.d.ts*' src/types.js",
+    "prepack": "tsc --build tsconfig.build.json",
+    "postpack": "git clean -f '*.d.ts*'",
     "test": "ava",
     "test:c8": "c8 $C8_OPTIONS ava",
     "test:xs": "yarn test:xs-unit && yarn test:xs-worker",
     "test:xs-unit": "ava-xs",
-    "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 'test/swingsetTests/**/test-*.js'",
+    "test:xs-worker": "SWINGSET_WORKER_TYPE=xs-worker ava -c 2 test/swingsetTests",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
     "lint:eslint": "eslint .",
-    "lint:types": "tsc -p jsconfig.json"
+    "lint:types": "tsc"
   },
   "repository": {
     "type": "git",
@@ -39,45 +39,54 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "^0.6.1-u11wf.0",
-    "@agoric/notifier": "^0.6.3-u14.0",
-    "@agoric/store": "^0.9.3-u14.0",
-    "@agoric/swingset-vat": "^0.32.3-u14.0",
-    "@agoric/vat-data": "^0.5.3-u14.0",
-    "@endo/eventual-send": "0.17.2",
-    "@endo/far": "0.2.18",
-    "@endo/marshal": "0.8.5",
-    "@endo/nat": "4.1.27",
-    "@endo/promise-kit": "0.2.56"
+    "@agoric/assert": "^0.6.1-u16.0",
+    "@agoric/notifier": "^0.7.0-u16.1",
+    "@agoric/store": "^0.9.3-u16.0",
+    "@agoric/vat-data": "^0.5.3-u16.1",
+    "@agoric/zone": "^0.3.0-u16.1",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/far": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/patterns": "^1.4.0",
+    "@endo/promise-kit": "^1.1.2"
   },
   "devDependencies": {
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@fast-check/ava": "^1.1.3",
-    "ava": "^5.2.0",
-    "tsd": "^0.28.1"
+    "@agoric/swingset-vat": "^0.33.0-u16.1",
+    "@endo/bundle-source": "^3.2.3",
+    "@fast-check/ava": "^1.1.5",
+    "ava": "^5.3.0",
+    "tsd": "^0.30.7"
   },
   "files": [
     "src",
     "NEWS.md",
-    "exported.js"
+    "exported.js",
+    "exported.d.ts"
   ],
   "ava-xs": {
     "exclude": [
       "swingsetTests",
       "# fast-check unsupported",
-      "test/unitTests/test-amountProperties.js",
-      "test/unitTests/test-inputValidation.js",
-      "test/unitTests/test-issuerObj.js"
+      "test/unitTests/amountProperties.test.js",
+      "test/unitTests/inputValidation.test.js",
+      "test/unitTests/issuerObj.test.js"
     ]
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "5m"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b3a6f3374cb3bddab39fc6d6f426429cae6c29c6"
+  "typeCoverage": {
+    "atLeast": 91.22
+  },
+  "gitHead": "2eaeab90b4015e355faea534c1c933351d25b1b9"
 }

package/src/amountMath.d.ts

@@ -1,46 +1,59 @@
-export function assertValueGetHelpers<V extends AmountValue>(value: V): MathHelpers<V>;
+export function assertValueGetHelpers<V>(value: V): MathHelpers<V>;
+import type { MathHelpers } from './types.js';
 export namespace AmountMath {
-    export function make<K extends AssetKind>(brand: Brand<K>, allegedValue: AssetValueForKind<K>): Amount<K>;
-    export function coerce<K extends AssetKind>(brand: Brand<K>, allegedAmount: Amount<K>): Amount<K>;
-    export function getValue<K extends AssetKind>(brand: Brand<K>, amount: Amount<K>): AssetValueForKind<K>;
-    export const makeEmpty: {
-        (brand: Brand<AssetKind>): Amount<"nat">;
-        <K extends AssetKind>(brand: Brand<AssetKind>, assetKind: K): Amount<K>;
+    export function make<B extends Brand, V extends NatValue | CopySet | CopyBag | SetValue>(brand: B, allegedValue: V): B extends Brand<"nat"> ? NatAmount : V extends NatValue ? NatAmount : V extends CopySet ? CopySetAmount<V["payload"][0]> : V extends CopyBag ? CopyBagAmount<V["payload"][0][0]> : V extends SetValue ? SetAmount<V[0]> : never;
+    export function coerce<A extends Amount>(brand: Brand, allegedAmount: A): A;
+    export function getValue<A extends Amount>(brand: Brand, amount: A): A["value"];
+    export let makeEmpty: {
+        (brand: Brand): Amount<"nat">;
+        <K extends AssetKind>(brand: Brand<K>, assetKind: K): Amount<K>;
     };
-    export function makeEmptyFromAmount<K extends AssetKind>(amount: Amount<K>): Amount<K>;
-    export function isEmpty(amount: Amount<AssetKind>, brand?: Brand<AssetKind> | undefined): boolean;
+    export function makeEmptyFromAmount<A extends Amount>(amount: A): A;
+    export function isEmpty(amount: Amount, brand?: Brand | undefined): boolean;
     export { isGTE };
-    export function isEqual<K extends AssetKind>(leftAmount: Amount<K>, rightAmount: Amount<K>, brand?: Brand<K> | undefined): boolean;
-    export function add<K extends AssetKind>(leftAmount: Amount<K>, rightAmount: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
-    export function subtract<K extends AssetKind>(leftAmount: Amount<K>, rightAmount: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
-    export function min<K extends AssetKind>(x: Amount<K>, y: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
-    export function max<K extends AssetKind>(x: Amount<K>, y: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
+    export function isEqual<A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand | undefined): boolean;
+    export function add<A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand | undefined): A;
+    export function subtract<L extends Amount, R extends Amount>(leftAmount: L, rightAmount: R, brand?: Brand | undefined): L extends R ? L : never;
+    export function min<A extends Amount>(x: A, y: A, brand?: Brand | undefined): A;
+    export function max<A extends Amount>(x: A, y: A, brand?: Brand | undefined): A;
 }
 /**
  * Constants for the kinds of assets we support.
  *
- * @type {{ NAT: 'nat', SET: 'set', COPY_SET: 'copySet', COPY_BAG: 'copyBag' }}
+ * @type {{
+ *   NAT: 'nat';
+ *   SET: 'set';
+ *   COPY_SET: 'copySet';
+ *   COPY_BAG: 'copyBag';
+ * }}
  */
 export const AssetKind: {
-    NAT: 'nat';
-    SET: 'set';
-    COPY_SET: 'copySet';
-    COPY_BAG: 'copyBag';
+    NAT: "nat";
+    SET: "set";
+    COPY_SET: "copySet";
+    COPY_BAG: "copyBag";
 };
-/**
- * @param {Amount} amount
- */
-export function getAssetKind(amount: Amount): AssetKindForValue<V>;
-/**
- * @param {AssetKind} allegedAK
- */
+import type { AssetKind } from './types.js';
+/** @param {Amount} amount */
+export function getAssetKind(amount: Amount): "copySet" | "set" | "nat" | "copyBag";
+/** @param {AssetKind} allegedAK */
 export function assertAssetKind(allegedAK: AssetKind): void;
+import type { Brand } from './types.js';
+import type { NatValue } from './types.js';
+import type { CopySet } from '@endo/patterns';
+import type { CopyBag } from '@endo/patterns';
+import type { SetValue } from './types.js';
+import type { NatAmount } from './types.js';
+import type { CopySetAmount } from './types.js';
+import type { CopyBagAmount } from './types.js';
+import type { SetAmount } from './types.js';
+import type { Amount } from './types.js';
 /**
- * Returns true if the leftAmount is greater than or equal to the
- * rightAmount. The notion of "greater than or equal to" depends
- * on the kind of amount, as defined by the MathHelpers. For example,
- * whether rectangle A is greater than rectangle B depends on whether rectangle
- * A includes rectangle B as defined by the logic in MathHelpers.
+ * Returns true if the leftAmount is greater than or equal to the rightAmount.
+ * The notion of "greater than or equal to" depends on the kind of amount, as
+ * defined by the MathHelpers. For example, whether rectangle A is greater than
+ * rectangle B depends on whether rectangle A includes rectangle B as defined by
+ * the logic in MathHelpers.
  *
  * @template {AssetKind} K
  * @param {Amount<K>} leftAmount

package/src/amountMath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"amountMath.d.ts","sourceRoot":"","sources":["amountMath.js"],"names":[],"mappings":"AAuHO,uFAEkC;;IAyFjC,0GAKL;IAUO,kGAQP;IASS,wGAAyD;;;;;IAwB9C,uFAOpB;IAQQ,kGAOR;;IAYQ,mIAGR;IAcI,iIAIJ;IAeS,sIAIT;IAUI,8GAMqC;IAUrC,8GAMqC;;AA1W5C;;;;GAIG;AACH,wBAFU;IAAE,GAAG,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,SAAS,CAAA;CAAE,CAO3E;AAoWH;;GAEG;AACH,qCAFW,MAAM,wBAOhB;AAzWD;;GAEG;AACH,2CAFW,SAAS,QAKnB;AAgJD;;;;;;;;;;;;GAYG;AACH,0HAFa,OAAO,CAKnB"}
+{"version":3,"file":"amountMath.d.ts","sourceRoot":"","sources":["amountMath.js"],"names":[],"mappings":"AAmHO,sCAJM,CAAC,SACH,CAAC,GACC,YAAY,CAAC,CAAC,CAIc;iCA3G0I,YAAY;;IAiNvL,qBAhBe,CAAC,SAAT,KAAO,EACmC,CAAC,SAA1C,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,QAAS,SAC3C,CAAC,gBACD,CAAC,GACC,CAAC,SAAS,MAAM,KAAK,CAAC,GAC1B,SAAS,GACT,CAAC,SAAS,QAAQ,GAChB,SAAS,GACT,CAAC,SAAS,OAAO,GACf,cAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAC9B,CAAC,SAAS,OAAO,GACf,cAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACjC,CAAC,SAAS,QAAQ,GAChB,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GACf,KAAK,CAQrB;IAUO,uBALc,CAAC,SAAV,MAAQ,SACV,KAAK,iBACL,CAAC,GACC,CAAC,CAWb;IASS,yBALY,CAAC,SAAV,MAAQ,SACV,KAAK,UACL,CAAC,GACC,CAAC,CAAC,OAAO,CAAC,CAE4C;0BAKzD;QACT,CAAK,KAAK,EAAE,KAAK,GAAG,OAAO,KAAK,CAAC,CAAC;QAClC,CAAK,CAAmB,SAAT,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;KACjE;IAiBiB,oCAJC,CAAC,SAAV,MAAQ,UACV,CAAC,GACC,CAAC,CAQb;IAQQ,gCAJE,MAAM,8BAEJ,OAAO,CASnB;;IAYQ,wBANa,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,8BAEC,OAAO,CAKnB;IAcI,oBANiB,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,8BAEC,CAAC,CAOb;IAeS,yBAPY,CAAC,SAAV,MAAQ,EACC,CAAC,SAAV,MAAQ,cACV,CAAC,eACD,CAAC,8BAEC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAOnC;IAUI,oBANiB,CAAC,SAAV,MAAQ,KACV,CAAC,KACD,CAAC,8BAEC,CAAC,CAQ8B;IAUvC,oBANiB,CAAC,SAAV,MAAQ,KACV,CAAC,KACD,CAAC,8BAEC,CAAC,CAQ8B;;AAlX9C;;;;;;;;;GASG;AACH,wBAPU;IACT,GAAO,EAAE,KAAK,CAAC;IACf,GAAO,EAAE,KAAK,CAAC;IACf,QAAY,EAAE,SAAS,CAAC;IACxB,QAAY,EAAE,SAAS,CAAC;CACrB,CAOD;+BApBgL,YAAY;AA2X/L,6BAA6B;AAC7B,qCADY,MAAM,yCAKjB;AAzWD,mCAAmC;AACnC,2CADY,SAAS,QAIpB;2BA3BkL,YAAY;8BAAZ,YAAY;6BAD5J,gBAAgB;6BAAhB,gBAAgB;8BACgI,YAAY;+BAAZ,YAAY;mCAAZ,YAAY;mCAAZ,YAAY;+BAAZ,YAAY;4BAAZ,YAAY;AA+J/L;;;;;;;;;;;;GAYG;AACH,uBANyB,CAAC,SAAZ,SAAU,cACb,OAAO,CAAC,CAAC,eACT,OAAO,CAAC,CAAC,iCAEP,OAAO,CAKnB"}