@shipload/sdk 1.0.0-next.14 → 1.0.0-next.16

package/src/data/kind-registry.ts

@@ -66,6 +66,10 @@ const KIND_META: Map<string, KindMeta> = (() => {
     return m
 })()
 
+export const ALL_ENTITY_TYPES: readonly EntityTypeName[] = Object.freeze([
+    ...KIND_META.keys(),
+] as EntityTypeName[])
+
 const TEMPLATE_BY_ITEM_ID: Map<number, TemplateMeta> = (() => {
     const m = new Map<number, TemplateMeta>()
     for (const r of kindRegistryJson.templates as RawTemplateEntry[]) {

package/src/index-module.ts

@@ -200,6 +200,7 @@ export {
     getKindMeta,
     getTemplateMeta,
     kindCan,
+    ALL_ENTITY_TYPES,
     CAP_WRAP,
     CAP_UNDEPLOY,
     CAP_DEMOLISH,
@@ -379,7 +380,7 @@ export {
 
 export {formatMass, formatMassDelta, formatMassScaled, formatLocation} from './format'
 
-export {displayName, displayNameWithTier, describeItem} from './resolution/display-name'
+export {displayName, describeItem} from './resolution/display-name'
 export type {DescribeOptions} from './resolution/display-name'
 
 export * from './subscriptions'

package/src/managers/actions.ts

@@ -187,13 +187,15 @@ export class ActionsManager extends BaseManager {
         owner: NameType,
         entityId: UInt64Type,
         nexusId: UInt64Type,
-        items: ServerContract.ActionParams.Type.cargo_item[]
+        cargoId: UInt64Type,
+        quantity: UInt64Type
     ): Action {
         return this.server.action('wrap', {
             owner: Name.from(owner),
             entity_id: UInt64.from(entityId),
             nexus_id: UInt64.from(nexusId),
-            items,
+            cargo_id: UInt64.from(cargoId),
+            quantity: UInt64.from(quantity),
         })
     }
 
@@ -211,6 +213,24 @@ export class ActionsManager extends BaseManager {
         })
     }
 
+    deploynft(owner: NameType, assetId: UInt64Type, targetNexusId: UInt64Type): Action {
+        const params: ServerContract.ActionParams.deploynft = {
+            owner: Name.from(owner),
+            asset_id: UInt64.from(assetId),
+            target_nexus_id: UInt64.from(targetNexusId),
+        }
+        return this.server.action('deploynft', params)
+    }
+
+    unwrapnft(owner: NameType, assetId: UInt64Type, hostId: UInt64Type): Action {
+        const params: ServerContract.ActionParams.unwrapnft = {
+            owner: Name.from(owner),
+            asset_id: UInt64.from(assetId),
+            host_id: UInt64.from(hostId),
+        }
+        return this.server.action('unwrapnft', params)
+    }
+
     demolish(entityId: UInt64Type): Action {
         return this.server.action('demolish', {
             entity_id: UInt64.from(entityId),

package/src/resolution/display-name.ts

@@ -1,26 +1,44 @@
 import type {ResolvedItem} from './resolve-item'
 import type {ResourceCategory} from '../types'
-import {CATEGORY_LABELS, TIER_ADJECTIVES} from '../types'
+import {
+    CATEGORY_LABELS,
+    RESOURCE_TIER_ADJECTIVES,
+    COMPONENT_TIER_PREFIXES,
+    MODULE_TIER_PREFIXES,
+} from '../types'
 import {formatMass as defaultFormatMass} from '../format'
 
-export interface DisplayNameInput {
-    itemType: 'resource' | 'component' | 'module' | 'entity' | string
+interface DisplayNameInputCommon {
     tier: number
     category?: ResourceCategory
     name: string
 }
 
-export function displayName(resolved: DisplayNameInput): string {
-    if (resolved.itemType === 'resource') {
-        const adj = TIER_ADJECTIVES[resolved.tier] ?? 'Unknown'
-        const cat = resolved.category ? CATEGORY_LABELS[resolved.category] : 'Resource'
-        return `${adj} ${cat}`
-    }
-    return resolved.name
+export type DisplayNameInput =
+    | (DisplayNameInputCommon & {itemType: 'resource' | 'component' | 'module' | 'entity' | string})
+    | (DisplayNameInputCommon & {type: string})
+
+function itemTypeOf(item: DisplayNameInput): string {
+    return 'itemType' in item ? item.itemType : item.type
+}
+
+function tierPrefix(item: DisplayNameInput): string | null {
+    const t = itemTypeOf(item)
+    if (t === 'resource') return RESOURCE_TIER_ADJECTIVES[item.tier] ?? null
+    if (t === 'component') return COMPONENT_TIER_PREFIXES[item.tier] ?? null
+    if (t === 'module') return MODULE_TIER_PREFIXES[item.tier] ?? null
+    return null
+}
+
+function baseName(item: DisplayNameInput): string {
+    if (itemTypeOf(item) !== 'resource') return item.name
+    return item.category ? CATEGORY_LABELS[item.category] : 'Resource'
 }
 
-export function displayNameWithTier(resolved: DisplayNameInput): string {
-    return `${displayName(resolved)} (T${resolved.tier})`
+export function displayName(item: DisplayNameInput): string {
+    const prefix = tierPrefix(item)
+    const head = prefix ? `${prefix} ${baseName(item)}` : baseName(item)
+    return `${head} (T${item.tier})`
 }
 
 export interface DescribeOptions {

package/src/scheduling/projection.ts

@@ -255,7 +255,6 @@ function applyTask(projected: ProjectedEntity, task: ServerContract.Types.task):
             applyAddCargoTask(projected, task)
             break
         case TaskType.UNLOAD:
-        case TaskType.WRAP:
             applyRemoveCargoTask(projected, task)
             break
         case TaskType.GATHER:
@@ -268,7 +267,6 @@ function applyTask(projected: ProjectedEntity, task: ServerContract.Types.task):
             applyDeployTask(projected, task)
             break
         case TaskType.UNDEPLOY:
-        case TaskType.WRAP_ENTITY:
         case TaskType.DEMOLISH:
             break
     }
@@ -440,7 +438,6 @@ export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity
                 if (taskComplete) applyAddCargoTask(projected, task)
                 break
             case TaskType.UNLOAD:
-            case TaskType.WRAP:
                 if (taskComplete) applyRemoveCargoTask(projected, task)
                 break
             case TaskType.GATHER:
@@ -453,7 +450,6 @@ export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity
                 if (taskComplete) applyDeployTask(projected, task)
                 break
             case TaskType.UNDEPLOY:
-            case TaskType.WRAP_ENTITY:
             case TaskType.DEMOLISH:
                 break
         }

package/src/scheduling/task-cargo.ts

@@ -34,7 +34,6 @@ export function taskCargoChanges(task: ServerContract.Types.task): TaskCargoChan
         case TaskType.GATHER:
             return task.entitytarget ? [] : items.map((i) => toChange(i, 'in'))
         case TaskType.UNLOAD:
-        case TaskType.WRAP:
             return items.map((i) => toChange(i, 'out'))
         case TaskType.CRAFT:
             return [

package/src/types.ts

@@ -50,10 +50,8 @@ export enum TaskType {
     WARP = 6,
     CRAFT = 7,
     DEPLOY = 8,
-    WRAP = 9,
     UNWRAP = 10,
     UNDEPLOY = 11,
-    WRAP_ENTITY = 12,
     DEMOLISH = 13,
 }
 
@@ -120,7 +118,7 @@ export type ModuleType =
     | 'storage'
     | 'hauler'
 
-export const TIER_ADJECTIVES: Record<number, string> = {
+export const RESOURCE_TIER_ADJECTIVES: Record<number, string> = {
     1: 'Crude',
     2: 'Dense',
     3: 'Pure',
@@ -133,6 +131,9 @@ export const TIER_ADJECTIVES: Record<number, string> = {
     10: 'Ascendant',
 }
 
+export const COMPONENT_TIER_PREFIXES: Record<number, string> = {}
+export const MODULE_TIER_PREFIXES: Record<number, string> = {}
+
 export const CATEGORY_LABELS: Record<ResourceCategory, string> = {
     ore: 'Ore',
     crystal: 'Crystal',
@@ -158,5 +159,5 @@ export function formatTier(tier: number): string {
 }
 
 export function tierAdjective(tier: number): string {
-    return TIER_ADJECTIVES[tier] ?? `T${tier}`
+    return RESOURCE_TIER_ADJECTIVES[tier] ?? `T${tier}`
 }