@indietabletop/appkit 5.0.0-4 → 5.0.0-5

package/lib/client.ts

@@ -1,12 +1,12 @@
+import type { SpaceGits } from "@indietabletop/types";
 import { type Infer, mask, object, string, Struct, unknown } from "superstruct";
 import { Failure, Success } from "./async-op.js";
 import { currentUser, redeemedPledge, sessionInfo } from "./structs.js";
 import type { CurrentUser, FailurePayload, SessionInfo } from "./types.js";
-import type { GangData, GangTombstone } from "./types/spacegits.ts";
 
 export type UserGameData = {
   spacegits?: {
-    gangs?: (GangData | GangTombstone)[];
+    gangs?: (SpaceGits.GangData | SpaceGits.GangTombstone)[];
   };
 };
 

package/lib/index.ts

@@ -63,9 +63,6 @@ export * from "./unique.ts";
 export * from "./utm.ts";
 export * from "./validations.ts";
 
-// Structs
-export * from "./types/spacegits.ts";
-
 // Other
 export * from "./ModernIDB/index.ts";
 export * from "./store/index.tsx";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indietabletop/appkit",
-  "version": "5.0.0-4",
+  "version": "5.0.0-5",
   "description": "A collection of modules used in apps built by Indie Tabletop Club",
   "private": false,
   "type": "module",
@@ -44,6 +44,7 @@
   "dependencies": {
     "@ariakit/react": "^0.4.17",
     "@indietabletop/tooling": "^5.0.0",
+    "@indietabletop/types": "^1.0.0-3",
     "@vanilla-extract/css": "^1.17.2",
     "@vanilla-extract/dynamic": "^2.1.3",
     "@vanilla-extract/recipes": "^0.5.7",

package/lib/types/spacegits.ts

@@ -1,112 +0,0 @@
-import {
-  array,
-  assign,
-  enums,
-  literal,
-  nullable,
-  number,
-  object,
-  omit,
-  string,
-  type Infer,
-} from "superstruct";
-
-export type Ref = Infer<ReturnType<typeof ref>>;
-
-export type VehicleWeaponRef = Infer<ReturnType<typeof vehicleWeaponRef>>;
-
-export type TreatmentRef = Infer<ReturnType<typeof treatmentRef>>;
-
-export type RepairRef = Infer<ReturnType<typeof repairRef>>;
-
-export type VehicleData = Infer<ReturnType<typeof vehicleData>>;
-
-export type GitData = Infer<ReturnType<typeof gitData>>;
-
-export type GangTombstone = Infer<ReturnType<typeof gangTombstone>>;
-
-export type GangData = Infer<ReturnType<typeof gangData>>;
-
-export type GangSnapshotData = Infer<ReturnType<typeof gangSnapshotData>>;
-
-export function ref() {
-  return object({ id: string() });
-}
-
-export function weaponRef() {
-  return assign(ref(), object({ count: number() }));
-}
-
-export function treatmentRef() {
-  return assign(ref(), object({ locationId: string() }));
-}
-
-export function vehicleWeaponRef() {
-  return assign(
-    weaponRef(),
-    object({ placement: enums(["FIXED", "PINTLE_MOUNTED"]) }),
-  );
-}
-
-export function repairRef() {
-  return assign(ref(), object({ locationId: string() }));
-}
-
-export function gitData() {
-  return object({
-    id: string(),
-    type: ref(),
-    name: string(),
-    weapons: array(weaponRef()),
-    gear: array(ref()),
-    offenses: array(ref()),
-    treatments: array(treatmentRef()),
-  });
-}
-
-export function vehicleData() {
-  return object({
-    id: string(),
-    type: ref(),
-    name: string(),
-    mods: array(ref()),
-    repairs: array(repairRef()),
-    weapons: array(vehicleWeaponRef()),
-  });
-}
-
-export function gangTombstone() {
-  return object({
-    id: string(),
-    name: string(),
-    updatedTs: number(),
-    deleted: literal(true),
-  });
-}
-
-export function gangData() {
-  return object({
-    id: string(),
-    name: string(),
-    description: string(),
-    gits: array(gitData()),
-    vehicles: array(vehicleData()),
-    buildMode: enums([
-      "A_LA_CARTE",
-      "CHEFS_RECOMMENDATION",
-      "CHAOS_MODE",
-      "SANDBOX",
-    ]),
-    snapshotId: nullable(string()),
-    faction: nullable(ref()),
-    stash: number(),
-    createdTs: number(),
-    updatedTs: number(),
-    rulesetVersion: string(),
-    deleted: literal(false),
-  });
-}
-
-export function gangSnapshotData() {
-  return omit(gangData(), ["snapshotId", "deleted"]);
-}