@agoric/swingset-vat 0.32.3-dev-f8abc2e.0 → 0.32.3-dev-59738aa.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-f8abc2e.0+f8abc2e",
+  "version": "0.32.3-dev-59738aa.0+59738aa",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,17 +27,17 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-f8abc2e.0+f8abc2e",
-    "@agoric/internal": "0.3.3-dev-f8abc2e.0+f8abc2e",
-    "@agoric/kmarshal": "0.1.1-dev-f8abc2e.0+f8abc2e",
-    "@agoric/store": "0.9.3-dev-f8abc2e.0+f8abc2e",
-    "@agoric/swing-store": "0.9.2-dev-f8abc2e.0+f8abc2e",
-    "@agoric/swingset-liveslots": "0.10.3-dev-f8abc2e.0+f8abc2e",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-f8abc2e.0+f8abc2e",
-    "@agoric/time": "0.3.3-dev-f8abc2e.0+f8abc2e",
-    "@agoric/vat-data": "0.5.3-dev-f8abc2e.0+f8abc2e",
-    "@agoric/xsnap": "0.14.3-dev-f8abc2e.0+f8abc2e",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-f8abc2e.0+f8abc2e",
+    "@agoric/assert": "0.6.1-dev-59738aa.0+59738aa",
+    "@agoric/internal": "0.3.3-dev-59738aa.0+59738aa",
+    "@agoric/kmarshal": "0.1.1-dev-59738aa.0+59738aa",
+    "@agoric/store": "0.9.3-dev-59738aa.0+59738aa",
+    "@agoric/swing-store": "0.9.2-dev-59738aa.0+59738aa",
+    "@agoric/swingset-liveslots": "0.10.3-dev-59738aa.0+59738aa",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-59738aa.0+59738aa",
+    "@agoric/time": "0.3.3-dev-59738aa.0+59738aa",
+    "@agoric/vat-data": "0.5.3-dev-59738aa.0+59738aa",
+    "@agoric/xsnap": "0.14.3-dev-59738aa.0+59738aa",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-59738aa.0+59738aa",
     "@endo/base64": "^1.0.3",
     "@endo/bundle-source": "^3.2.1",
     "@endo/captp": "^4.1.0",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 75.02
   },
-  "gitHead": "f8abc2e75c2aa612a24abb86e982367b7ba964f8"
+  "gitHead": "59738aa5d0eafdb105b63400631eb49644d555cf"
 }

package/src/kernel/state/kernelKeeper.js

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
 import { Nat, isNat } from '@endo/nat';
 import { assert, Fail } from '@agoric/assert';
 import { initializeVatState, makeVatKeeper } from './vatKeeper.js';
@@ -179,7 +178,7 @@ export default function makeKernelKeeper(kernelStorage, kernelSlog) {
    */
   function getRequired(key) {
     kvStore.has(key) || Fail`storage lacks required key ${key}`;
-    // @ts-ignore already checked .has()
+    // @ts-expect-error already checked .has()
     return kvStore.get(key);
   }
 

package/src/kernel/state/vatKeeper.js

@@ -21,8 +21,8 @@ import { enumeratePrefixedKeys } from './storageHelper.js';
  * @typedef { import('../../types-internal.js').VatManager } VatManager
  * @typedef { import('../../types-internal.js').RecordedVatOptions } RecordedVatOptions
  * @typedef { import('../../types-internal.js').TranscriptEntry } TranscriptEntry
- * @typedef {import('../../types-internal.js').TranscriptDeliverySaveSnapshot} TDSaveSnapshot
- * @typedef {import('../../types-internal.js').TranscriptDeliveryLoadSnapshot} TDLoadSnapshot
+ * @import {TranscriptDeliverySaveSnapshot} from '../../types-internal.js'
+ * @import {TranscriptDeliveryLoadSnapshot} from '../../types-internal.js'
  */
 
 // makeVatKeeper is a pure function: all state is kept in the argument object

package/src/kernel/vat-loader/manager-helper.js

@@ -6,12 +6,12 @@ import {
 } from '../../lib/message.js';
 
 /**
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryObject} VatDeliveryObject
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryResult} VatDeliveryResult
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallObject} VatSyscallObject
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallResult} VatSyscallResult
- * @typedef {import('../../types-internal.js').VatManager} VatManager
- * @typedef {import('../../types-internal.js').MakeSnapshot} MakeSnapshot
+ * @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryResult} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallObject} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallResult} from '@agoric/swingset-liveslots'
+ * @import {VatManager} from '../../types-internal.js'
+ * @import {MakeSnapshot} from '../../types-internal.js'
  */
 
 // We use vat-centric terminology here, so "inbound" means "into a vat",

package/src/kernel/vat-loader/manager-subprocess-xsnap.js

@@ -11,12 +11,12 @@ import {
 /// <reference path="../../types-ambient.js" />
 
 /**
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryObject} VatDeliveryObject
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryResult} VatDeliveryResult
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallObject} VatSyscallObject
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallResult} VatSyscallResult
- * @typedef {import('@agoric/swingset-liveslots').LiveSlotsOptions} LiveSlotsOptions
- * @typedef {import('../../types-internal.js').VatManagerFactory} VatManagerFactory
+ * @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryResult} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallObject} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallResult} from '@agoric/swingset-liveslots'
+ * @import {LiveSlotsOptions} from '@agoric/swingset-liveslots'
+ * @import {VatManagerFactory} from '../../types-internal.js'
  */
 
 // eslint-disable-next-line no-unused-vars
@@ -214,8 +214,8 @@ export function makeXsSubprocessFactory({
       parentLog(vatID, `deliverDone`, result.reply[0], result.reply.length);
       // Attach the meterUsage to the deliver result.
       /** @type { VatDeliveryResult } */
-      // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
-      // @ts-ignore I don't know how to appease tsc
+
+      // @ts-expect-error I don't know how to appease tsc
       const deliverResult = harden([
         result.reply[0], // 'ok' or 'error'
         result.reply[1] || null, // results or problem or null

package/src/kernel/vat-loader/vat-loader.js

@@ -15,7 +15,7 @@ export function makeVatLoader(stuff) {
     kernelKeeper,
   } = stuff;
 
-  /** @typedef {import('../../types-internal.js').VatManager} VatManager */
+  /** @import {VatManager} from '../../types-internal.js' */
 
   const allowedOptions = [
     'name',

package/src/kernel/vat-warehouse.js

@@ -5,19 +5,19 @@ import { insistVatDeliveryResult } from '../lib/message.js';
 import djson from '../lib/djson.js';
 
 /**
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryObject} VatDeliveryObject
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryResult} VatDeliveryResult
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallObject} VatSyscallObject
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallResult} VatSyscallResult
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallHandler} VatSyscallHandler
- * @typedef {import('../types-external.js').KernelDeliveryObject} KernelDeliveryObject
- * @typedef {import('../types-internal.js').VatManager} VatManager
- * @typedef {import('../types-internal.js').VatID} VatID
- * @typedef {import('../types-internal.js').TranscriptDeliveryInitializeWorkerOptions} TDInitializeWorkerOptions
- * @typedef {import('../types-internal.js').TranscriptDeliveryInitializeWorker} TDInitializeWorker
- * @typedef {import('../types-internal.js').TranscriptDeliveryShutdownWorker} TDShutdownWorker
- * @typedef {import('../types-internal.js').TranscriptDeliveryResults} TranscriptDeliveryResults
- * @typedef {import('../types-internal.js').TranscriptEntry} TranscriptEntry
+ * @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryResult} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallObject} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallResult} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallHandler} from '@agoric/swingset-liveslots'
+ * @import {KernelDeliveryObject} from '../types-external.js'
+ * @import {VatManager} from '../types-internal.js'
+ * @import {VatID} from '../types-internal.js'
+ * @import {TranscriptDeliveryInitializeWorkerOptions} from '../types-internal.js'
+ * @import {TranscriptDeliveryInitializeWorker} from '../types-internal.js'
+ * @import {TranscriptDeliveryShutdownWorker} from '../types-internal.js'
+ * @import {TranscriptDeliveryResults} from '../types-internal.js'
+ * @import {TranscriptEntry} from '../types-internal.js'
  * @typedef {{ body: string, slots: unknown[] }} Capdata
  * @typedef { [unknown, ...unknown[]] } Tagged
  * @typedef { { moduleFormat: string }} Bundle
@@ -344,7 +344,7 @@ export function makeVatWarehouse({
     // initialize-worker event, to represent the vatLoader.create()
     // we're about to do
     if (options.useTranscript && vatKeeper.transcriptSize() === 0) {
-      /** @type { TDInitializeWorkerOptions } */
+      /** @type { TranscriptDeliveryInitializeWorkerOptions } */
       const initOpts = { source: {}, workerOptions: options.workerOptions };
       // if the vat is somehow using a full bundle, we don't want that
       // in the transcript: we only record bundleIDs

package/src/kernel/vatTranslator.js

@@ -14,18 +14,18 @@ export function assertValidVatstoreKey(key) {
 }
 
 /**
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryObject} VatDeliveryObject
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryMessage} VatDeliveryMessage
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryNotify} VatDeliveryNotify
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryDropExports} VatDeliveryDropExports
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryRetireExports} VatDeliveryRetireExports
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryRetireImports} VatDeliveryRetireImports
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryChangeVatOptions} VatDeliveryChangeVatOptions
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryStartVat} VatDeliveryStartVat
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryStopVat} VatDeliveryStopVat
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryBringOutYourDead} VatDeliveryBringOutYourDead
+ * @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryMessage} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryNotify} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryDropExports} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryRetireExports} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryRetireImports} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryChangeVatOptions} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryStartVat} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryStopVat} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryBringOutYourDead} from '@agoric/swingset-liveslots'
  *
- * @typedef {import('@agoric/swingset-liveslots').VatOneResolution} VatOneResolution
+ * @import {VatOneResolution} from '@agoric/swingset-liveslots'
  *
  */
 
@@ -262,9 +262,9 @@ function makeTranslateKernelDeliveryToVatDelivery(vatID, kernelKeeper) {
   return kernelDeliveryToVatDelivery;
 }
 /**
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallObject} VatSyscallObject
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallResult} VatSyscallResult
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallResultOk} VatSyscallResultOk
+ * @import {VatSyscallObject} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallResult} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallResultOk} from '@agoric/swingset-liveslots'
  */
 
 /**

package/src/supervisors/supervisor-helper.js

@@ -5,10 +5,10 @@ import {
 import '../types-ambient.js';
 
 /**
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryObject} VatDeliveryObject
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryResult} VatDeliveryResult
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallObject} VatSyscallObject
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallHandler} VatSyscallHandler
+ * @import {VatDeliveryObject} from '@agoric/swingset-liveslots'
+ * @import {VatDeliveryResult} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallObject} from '@agoric/swingset-liveslots'
+ * @import {VatSyscallHandler} from '@agoric/swingset-liveslots'
  * @typedef {import('@endo/marshal').CapData<string>} SwingSetCapData
  * @typedef { (delivery: VatDeliveryObject) => (VatDeliveryResult | Promise<VatDeliveryResult>) } VatDispatcherSyncAsync
  * @typedef { (delivery: VatDeliveryObject) => Promise<VatDeliveryResult> } VatDispatcher

package/src/types-ambient.js

@@ -1,123 +1,87 @@
 /**
- * @typedef { import('./types-external.js').BundleFormat } BundleFormat
+ * @import {
+ * Bundle,
+ * BundleCap,
+ * BundleFormat,
+ * BundleID,
+ * BundleRef,
+ * BundleSpec,
+ * DeviceInvocation,
+ * DeviceInvocationResult,
+ * DeviceInvocationResultError,
+ * DeviceInvocationResultOk,
+ * EndoZipBase64Bundle,
+ * GetExportBundle,
+ * KernelDeliveryBringOutYourDead,
+ * KernelDeliveryChangeVatOptions,
+ * KernelDeliveryDropExports,
+ * KernelDeliveryMessage,
+ * KernelDeliveryNotify,
+ * KernelDeliveryObject,
+ * KernelDeliveryOneNotify,
+ * KernelDeliveryRetireExports,
+ * KernelDeliveryRetireImports,
+ * KernelDeliveryStartVat,
+ * KernelKeeper,
+ * KernelOneResolution,
+ * KernelOptions,
+ * KernelSlog,
+ * KernelSyscallDropImports,
+ * KernelSyscallExit,
+ * KernelSyscallInvoke,
+ * KernelSyscallObject,
+ * KernelSyscallResolve,
+ * KernelSyscallResult,
+ * KernelSyscallResultError,
+ * KernelSyscallResultOk,
+ * KernelSyscallRetireExports,
+ * KernelSyscallRetireImports,
+ * KernelSyscallSend,
+ * KernelSyscallSubscribe,
+ * KernelSyscallVatstoreDelete,
+ * KernelSyscallVatstoreGet,
+ * KernelSyscallVatstoreGetNextKey,
+ * KernelSyscallVatstoreSet,
+ * ManagerType,
+ * Message,
+ * MeteringVatPowers,
+ * NestedEvaluateBundle,
+ * PolicyInput,
+ * PolicyInputCrankComplete,
+ * PolicyInputCrankFailed,
+ * PolicyInputCreateVat,
+ * PolicyInputNone,
+ * PolicyOutput,
+ * ResolutionPolicy,
+ * RunPolicy,
+ * SlogFinishDelivery,
+ * SlogFinishSyscall,
+ * SnapshotResult,
+ * SnapStore,
+ * SourceOfBundle,
+ * SourceSpec,
+ * StaticVatPowers,
+ * SwingSetCapData,
+ * SwingSetConfig,
+ * SwingSetConfigDescriptor,
+ * SwingSetConfigProperties,
+ * SwingSetKernelConfig,
+ * TerminationVatPowers,
+ * VatKeeper,
+ * VatPowers,
+ * VatSlog,
+ * VatStats,
+ * WaitUntilQuiescent,
+ * XSnap,
+ * } from './types-external.js')
  */
 
 /**
- * @typedef { import('@endo/marshal').CapData<string> } SwingSetCapData
- */
-
-/** @typedef { import('./types-external.js').BundleID } BundleID */
-/** @typedef { import('./types-external.js').BundleCap } BundleCap */
-/** @typedef { import('./types-external.js').EndoZipBase64Bundle } EndoZipBase64Bundle */
-
-/**
- * @typedef { import('./types-external.js').GetExportBundle } GetExportBundle
- * @typedef { import('./types-external.js').NestedEvaluateBundle } NestedEvaluateBundle
- * @typedef { import('./types-external.js').Bundle } Bundle
- *
- * @typedef { import('./types-external.js').ManagerType } ManagerType
- * @typedef { import('./types-external.js').KernelOptions } KernelOptions
- */
-
-/**
- * See ../docs/static-vats.md#vatpowers
- *
- * @typedef { import('./types-external.js').VatPowers } VatPowers
- * @typedef { import('./types-external.js').StaticVatPowers } StaticVatPowers
- * @typedef { import('./types-external.js').MeteringVatPowers } MeteringVatPowers
- *
- * @typedef { import('./types-external.js').TerminationVatPowers } TerminationVatPowers
- */
-
-/**
- * @typedef { import('./types-external.js').Message } Message
- *
- * @typedef { import('./types-external.js').ResolutionPolicy } ResolutionPolicy
- *
- * @typedef { import('./types-external.js').KernelDeliveryMessage } KernelDeliveryMessage
- * @typedef { import('./types-external.js').KernelDeliveryOneNotify } KernelDeliveryOneNotify
- * @typedef { import('./types-external.js').KernelDeliveryNotify } KernelDeliveryNotify
- * @typedef { import('./types-external.js').KernelDeliveryDropExports } KernelDeliveryDropExports
- * @typedef { import('./types-external.js').KernelDeliveryRetireExports } KernelDeliveryRetireExports
- * @typedef { import('./types-external.js').KernelDeliveryRetireImports } KernelDeliveryRetireImports
- * @typedef { import('./types-external.js').KernelDeliveryStartVat } KernelDeliveryStartVat
- * @typedef { import('./types-external.js').KernelDeliveryChangeVatOptions } KernelDeliveryChangeVatOptions
- * @typedef { import('./types-external.js').KernelDeliveryBringOutYourDead } KernelDeliveryBringOutYourDead
- * @typedef { import('./types-external.js').KernelDeliveryObject } KernelDeliveryObject
- * @typedef { import('./types-external.js').KernelSyscallSend } KernelSyscallSend
- * @typedef { import('./types-external.js').KernelSyscallInvoke } KernelSyscallInvoke
- * @typedef { import('./types-external.js').KernelSyscallSubscribe } KernelSyscallSubscribe
- * @typedef { import('./types-external.js').KernelOneResolution } KernelOneResolution
- * @typedef { import('./types-external.js').KernelSyscallResolve } KernelSyscallResolve
- * @typedef { import('./types-external.js').KernelSyscallExit } KernelSyscallExit
- * @typedef { import('./types-external.js').KernelSyscallVatstoreGet } KernelSyscallVatstoreGet
- * @typedef { import('./types-external.js').KernelSyscallVatstoreGetNextKey } KernelSyscallVatstoreGetNextKey
- * @typedef { import('./types-external.js').KernelSyscallVatstoreSet } KernelSyscallVatstoreSet
- * @typedef { import('./types-external.js').KernelSyscallVatstoreDelete } KernelSyscallVatstoreDelete
- * @typedef { import('./types-external.js').KernelSyscallDropImports } KernelSyscallDropImports
- * @typedef { import('./types-external.js').KernelSyscallRetireImports } KernelSyscallRetireImports
- * @typedef { import('./types-external.js').KernelSyscallRetireExports } KernelSyscallRetireExports
- *
- * @typedef { import('./types-external.js').KernelSyscallObject } KernelSyscallObject
- * @typedef { import('./types-external.js').KernelSyscallResultOk } KernelSyscallResultOk
- * @typedef { import('./types-external.js').KernelSyscallResultError } KernelSyscallResultError
- * @typedef { import('./types-external.js').KernelSyscallResult } KernelSyscallResult
- *
- * @typedef { import('./types-external.js').DeviceInvocation } DeviceInvocation
- * @typedef { import('./types-external.js').DeviceInvocationResultOk } DeviceInvocationResultOk
- * @typedef { import('./types-external.js').DeviceInvocationResultError } DeviceInvocationResultError
- * @typedef { import('./types-external.js').DeviceInvocationResult } DeviceInvocationResult
- *
- * @typedef { import('./types-external.js').VatStats } VatStats
- * @typedef { import('./types-external.js').VatKeeper } VatKeeper
- * @typedef { import('./types-external.js').KernelKeeper } KernelKeeper
- * @typedef { import('./types-external.js').XSnap } XSnap
- * @typedef { import('./types-external.js').SlogFinishDelivery } SlogFinishDelivery
- * @typedef { import('./types-external.js').SlogFinishSyscall } SlogFinishSyscall
- * @typedef { import('./types-external.js').KernelSlog } KernelSlog
- * @typedef { import('./types-external.js').VatSlog } VatSlog
- *
- * @typedef { import('./types-external.js').SnapStore } SnapStore
- * @typedef { import('./types-external.js').SnapshotResult } SnapshotResult
- * @typedef { import('./types-external.js').WaitUntilQuiescent } WaitUntilQuiescent
- */
-
-/**
- * @typedef { import('./types-external.js').SourceSpec } SourceSpec
- * @typedef { import('./types-external.js').BundleSpec } BundleSpec
- * @typedef { import('./types-external.js').BundleRef } BundleRef
- * @typedef { import('./types-external.js').SwingSetConfigProperties } SwingSetConfigProperties
- */
-
-/**
- * @typedef { import('./types-external.js').SwingSetConfigDescriptor } SwingSetConfigDescriptor
- */
-
-/**
- * @typedef { import('./types-external.js').SwingSetConfig } SwingSetConfig
- */
-
-/**
- * @typedef { import('./types-external.js').SwingSetKernelConfig } SwingSetKernelConfig
- */
-
-/**
- * @typedef { import('./types-external.js').SourceOfBundle } SourceOfBundle
- */
-/**
- * @typedef { import('@agoric/swing-store').KVStore } KVStore
- * @typedef { import('@agoric/swing-store').TranscriptStore } TranscriptStore
- * @typedef { import('@agoric/swing-store').SwingStore } SwingStore
- * @typedef { import('@agoric/swing-store').SwingStoreKernelStorage } SwingStoreKernelStorage
- * @typedef { import('@agoric/swing-store').SwingStoreHostStorage } SwingStoreHostStorage
- */
-
-/**
- * @typedef { import('./types-external.js').PolicyInputNone } PolicyInputNone
- * @typedef { import('./types-external.js').PolicyInputCreateVat } PolicyInputCreateVat
- * @typedef { import('./types-external.js').PolicyInputCrankComplete } PolicyInputCrankComplete
- * @typedef { import('./types-external.js').PolicyInputCrankFailed } PolicyInputCrankFailed
- * @typedef { import('./types-external.js').PolicyInput } PolicyInput
- * @typedef { import('./types-external.js').PolicyOutput } PolicyOutput
- * @typedef { import('./types-external.js').RunPolicy } RunPolicy
+ * @import {
+ * KVStore,
+ * TranscriptStore,
+ * SwingStore,
+ * SwingStoreKernelStorage,
+ * SwingStoreHostStorage,
+ * } from '@agoric/swing-store'
  */

package/src/vats/timer/vat-timer.js

@@ -20,12 +20,12 @@ import { TimeMath } from '@agoric/time';
 // client). Everything else should remain in the DB.
 
 /**
- * @typedef {import('@agoric/time').Timestamp} Timestamp
- * @typedef {import('@agoric/time').TimestampRecord} TimestampRecord
- * @typedef {import('@agoric/time').TimestampValue} TimestampValue
- * @typedef {import('@agoric/time').RelativeTime} RelativeTime
- * @typedef {import('@agoric/time').RelativeTimeValue} RelativeTimeValue
- * @typedef {import('@agoric/time').TimerService} TimerService
+ * @import {Timestamp} from '@agoric/time'
+ * @import {TimestampRecord} from '@agoric/time'
+ * @import {TimestampValue} from '@agoric/time'
+ * @import {RelativeTime} from '@agoric/time'
+ * @import {RelativeTimeValue} from '@agoric/time'
+ * @import {TimerService} from '@agoric/time'
  *
  * @typedef {object} Handler
  * Handler is a user-provided Far object with .wake(time) used for callbacks

package/tools/manual-timer.js

@@ -6,9 +6,9 @@ import { TimeMath } from '@agoric/time';
 import { buildRootObject } from '../src/vats/timer/vat-timer.js';
 
 /**
- * @typedef {import('@agoric/time').Timestamp} Timestamp
- * @typedef {import('@agoric/time').TimerService} TimerService
- * @typedef {import('../src/devices/timer/device-timer.js').Waker} Waker
+ * @import {Timestamp} from '@agoric/time'
+ * @import {TimerService} from '@agoric/time'
+ * @import {Waker} from '../src/devices/timer/device-timer.js'
  *
  * @typedef {object} ManualTimerCallbacks
  * @property {(newTime: bigint, msg?: string) => void} [advanceTo]