@robbeverhelst/do 1.393.0 → 1.394.0

package/dist/do.js

@@ -14420,7 +14420,7 @@ var configError = (message) => new CliError("config", message, EXIT.CONFIG);
 
 // src/meta.ts
 var CLI_NAME = "do";
-var VERSION = "1.393.0";
+var VERSION = "1.394.0";
 var API_PREFIX = "/api/v1";
 var DEFAULT_API_URL = "http://localhost:3001";
 
@@ -20637,6 +20637,25 @@ var files = pgTable("files", {
   index("files_owner_idx").on(t.ownerNodeId, t.createdAt)
 ]);
 
+// ../../packages/schema/src/db/inventory.ts
+var inventoryItems = pgTable("inventory_items", {
+  ...leafColumns(),
+  productId: text("product_id").references(() => products.id),
+  quantity: doublePrecision("quantity").notNull().default(0),
+  unit: text("unit"),
+  category: text("category"),
+  location: text("location"),
+  lowStockThreshold: doublePrecision("low_stock_threshold"),
+  expiresAt: timestamp("expires_at", { withTimezone: true }),
+  notes: text("notes"),
+  facet: jsonb("facet").$type(),
+  placeId: text("place_id").references(() => places.id, { onDelete: "set null" })
+}, (t) => [
+  index("inventory_items_tenant_place_idx").on(t.tenantId, t.placeId),
+  index("inventory_items_tenant_idx").on(t.tenantId),
+  index("inventory_items_product_idx").on(t.productId)
+]);
+
 // ../../packages/schema/src/db/periods.ts
 var periodKind = pgEnum("period_kind", [
   "hibernation",
@@ -20801,6 +20820,21 @@ var animalHandoverNotes = pgTable("animal_handover_notes", {
   photoFileId: text("photo_file_id").references(() => files.id, { onDelete: "set null" }),
   createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow()
 }, (t) => [index("animal_handover_notes_period_idx").on(t.tenantId, t.periodId)]);
+var animalFeedings = pgTable("animal_feedings", {
+  id: text("id").primaryKey(),
+  tenantId: text("tenant_id").notNull().references(() => tenants.id),
+  animalId: text("animal_id").notNull().references(() => animals.id, { onDelete: "cascade" }),
+  supplyId: text("supply_id").notNull().references(() => inventoryItems.id, { onDelete: "cascade" }),
+  what: text("what"),
+  amount: text("amount"),
+  times: text("times"),
+  note: text("note"),
+  createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow(),
+  updatedAt: timestamp("updated_at", { withTimezone: true }).notNull().defaultNow()
+}, (t) => [
+  unique("animal_feedings_animal_supply_uniq").on(t.tenantId, t.animalId, t.supplyId),
+  index("animal_feedings_supply_idx").on(t.tenantId, t.supplyId)
+]);
 var animalMedicineEveryUnit = pgEnum("animal_medicine_every_unit", [
   "day",
   "week",
@@ -21253,6 +21287,21 @@ var animalHabitSchema = nodeRefSchema.extend({
   routine: string2().nullable().optional(),
   animalIds: array(ulidSchema).default([])
 });
+var animalFeedingSchema = object({
+  animalId: ulidSchema,
+  supplyId: ulidSchema,
+  what: string2().nullable(),
+  amount: string2().nullable(),
+  times: string2().nullable(),
+  note: string2().nullable()
+});
+var feedingText = (max) => string2().trim().min(1).max(max).nullish();
+var animalFeedingInputSchema = object({
+  what: feedingText(120),
+  amount: feedingText(60),
+  times: feedingText(80),
+  note: feedingText(200)
+}).strict();
 var animalSupplySchema = nodeRefSchema.extend({
   quantity: number2(),
   unit: string2().nullable(),
@@ -21262,7 +21311,8 @@ var animalSupplySchema = nodeRefSchema.extend({
   daysLeft: number2().int().nullable(),
   full: number2().nullable(),
   onList: string2().nullable(),
-  animalIds: array(ulidSchema).optional()
+  animalIds: array(ulidSchema).optional(),
+  feedings: array(animalFeedingSchema).optional()
 });
 var animalDayCountSchema = object({ day: string2(), count: number2().int() });
 var animalWeightPointSchema = object({
@@ -22124,6 +22174,29 @@ var animalOperations = defineOperations({
     response: { description: "The timeline entries." },
     errors: { 404: true }
   },
+  setFeeding: {
+    method: "put",
+    path: "/animals/{id}/feeding/{supplyId}",
+    scopes: WRITE,
+    tag: "Animals",
+    summary: "Say how an animal is fed from a supply",
+    description: "What it gets (`what`, when it's more than the supply's name), how much (`amount`, \"2 \xD7 110 g\"), when (`times`, \"07:30 and 18:00\") and a line for whoever feeds it (`note`), each as written. A field left out stays; `null` clears it. Links the supply (a Household item) to the animal when it doesn't feed it yet. Read back on the animal's and the overview's supplies, as `feedings`.",
+    body: animalFeedingInputSchema,
+    status: 200,
+    response: { description: "The feeding." },
+    errors: { 400: true, 404: true }
+  },
+  removeFeeding: {
+    method: "delete",
+    path: "/animals/{id}/feeding/{supplyId}",
+    scopes: WRITE,
+    tag: "Animals",
+    summary: "Take an animal's feeding off a supply",
+    description: "The supply still feeds it; only what was said about how is gone.",
+    status: 204,
+    response: { description: "Gone." },
+    errors: { 404: true }
+  },
   lostCard: {
     method: "get",
     path: "/animals/{id}/lost-card",
@@ -24174,6 +24247,163 @@ var collectionEntryKindValues = [
 ];
 var collectionEntryKindSchema = _enum2(collectionEntryKindValues);
 
+// ../../packages/schema/src/contracts/collection-kinds.ts
+var collectionKindFieldTypeValues = [
+  "text",
+  "number",
+  "choice",
+  "year",
+  "date",
+  "yesno"
+];
+var collectionKindFieldTypeSchema = _enum2(collectionKindFieldTypeValues);
+var collectionKindIconValues = [
+  "disc",
+  "dice",
+  "brick",
+  "book",
+  "pad",
+  "sprout",
+  "paw",
+  "tag"
+];
+var collectionKindIconSchema = _enum2(collectionKindIconValues);
+var collectionKindPresetValues = ["lego", "vinyl", "board", "custom"];
+var collectionKindPresetSchema = _enum2(collectionKindPresetValues);
+var slug = string2().min(1).max(40).regex(/^[a-z0-9]+(-[a-z0-9]+)*$/, "lowercase letters and digits, dashes between");
+var collectionKindKeySchema = slug.refine((k) => !collectionTypeValues.includes(k), "that's a built-in kind");
+var collectionKindFieldSchema = object({
+  key: slug,
+  label: string2().trim().min(1).max(40),
+  type: collectionKindFieldTypeSchema,
+  choices: array(string2().trim().min(1).max(40)).max(30).optional()
+}).strict().refine((f) => f.type === "choice" || f.choices === undefined, {
+  message: "only a choice field has choices",
+  path: ["choices"]
+});
+var collectionKindFieldsSchema = array(collectionKindFieldSchema).max(12).refine((fs) => new Set(fs.map((f) => f.key)).size === fs.length, "each field key once");
+var word = string2().trim().min(1).max(30);
+var collectionKindStatusWordsSchema = object({ want: word, have: word, doing: word, done: word, dropped: word }).strict();
+var collectionKindSchema = object({
+  id: ulidSchema,
+  key: string2(),
+  name: string2(),
+  one: string2(),
+  many: string2(),
+  icon: string2(),
+  preset: string2().nullable(),
+  fields: array(object({
+    key: string2(),
+    label: string2(),
+    type: string2(),
+    choices: array(string2()).optional()
+  })),
+  statusWords: collectionKindStatusWordsSchema,
+  view: string2(),
+  itemCount: number2().int(),
+  createdAt: exports_coerce.date(),
+  updatedAt: exports_coerce.date()
+});
+var name2 = string2().trim().min(1).max(40);
+var createCollectionKindInputSchema = object({
+  id: ulidSchema,
+  name: name2,
+  key: collectionKindKeySchema.optional(),
+  one: name2.optional(),
+  many: name2.optional(),
+  icon: collectionKindIconSchema.optional(),
+  preset: collectionKindPresetSchema.optional(),
+  fields: collectionKindFieldsSchema.optional(),
+  statusWords: collectionKindStatusWordsSchema.optional()
+}).strict();
+var updateCollectionKindInputSchema = object({
+  name: name2.optional(),
+  one: name2.optional(),
+  many: name2.optional(),
+  icon: collectionKindIconSchema.optional(),
+  fields: collectionKindFieldsSchema.optional(),
+  statusWords: collectionKindStatusWordsSchema.optional()
+}).strict();
+var f = (label, type) => ({
+  key: kindSlug(label),
+  label,
+  type
+});
+var COLLECTION_KIND_PRESETS = {
+  lego: {
+    name: "LEGO",
+    one: "set",
+    icon: "brick",
+    fields: [
+      f("Set number", "text"),
+      f("Pieces", "number"),
+      f("Theme", "choice"),
+      f("Bags", "number"),
+      f("Minifigures", "number"),
+      f("Released", "year")
+    ],
+    statusWords: {
+      want: "Want",
+      have: "In the box",
+      doing: "Building",
+      done: "Built",
+      dropped: "Parted out"
+    }
+  },
+  vinyl: {
+    name: "Vinyl",
+    one: "record",
+    icon: "disc",
+    fields: [
+      f("Artist", "text"),
+      f("Label", "choice"),
+      f("Pressing", "text"),
+      f("Speed", "number"),
+      f("Condition", "choice"),
+      f("Released", "year")
+    ],
+    statusWords: {
+      want: "Want",
+      have: "Have",
+      doing: "On rotation",
+      done: "Played out",
+      dropped: "Sold"
+    }
+  },
+  board: {
+    name: "Board games",
+    one: "board game",
+    icon: "dice",
+    fields: [
+      f("Players", "number"),
+      f("Play time", "text"),
+      f("Designer", "text"),
+      f("Expansions", "text"),
+      f("Plays", "number"),
+      f("Released", "year")
+    ],
+    statusWords: {
+      want: "Want",
+      have: "Have",
+      doing: "Learning",
+      done: "Played",
+      dropped: "Gave away"
+    }
+  },
+  custom: {
+    name: "",
+    one: "",
+    icon: "tag",
+    fields: [f("Maker", "text"), f("Year", "year"), f("Condition", "choice")],
+    statusWords: { want: "Want", have: "Have", doing: "Using", done: "Done", dropped: "Gone" }
+  }
+};
+function kindSlug(name) {
+  const s = name.toLowerCase().normalize("NFKD").replace(/[\u0300-\u036F]/g, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40).replace(/-+$/, "");
+  return s || "kind";
+}
+var kindCoverUrl = string2().url().max(2048);
+
 // ../../packages/schema/src/contracts/collection.ts
 var collectionRatingSchema = number2().min(0.5).max(5).step(0.5, "must be a whole or half star (0.5 steps)");
 var collectionFacetSchema = record(string2(), unknown());
@@ -24197,7 +24427,7 @@ var collectionItemSchema = createSelectSchema(collectionItems, {
 });
 var createCollectionItemInputSchema = createInsertSchema(collectionItems, {
   id: ulidSchema,
-  type: collectionTypeSchema,
+  type: union([collectionTypeSchema, collectionKindKeySchema]),
   status: collectionStatusSchema.optional(),
   quantity: number2().min(0).nullish(),
   areaId: ulidSchema.nullish(),
@@ -26346,162 +26576,6 @@ var circleOperations = defineOperations({
   })
 });
 
-// ../../packages/schema/src/contracts/collection-kinds.ts
-var collectionKindFieldTypeValues = [
-  "text",
-  "number",
-  "choice",
-  "year",
-  "date",
-  "yesno"
-];
-var collectionKindFieldTypeSchema = _enum2(collectionKindFieldTypeValues);
-var collectionKindIconValues = [
-  "disc",
-  "dice",
-  "brick",
-  "book",
-  "pad",
-  "sprout",
-  "paw",
-  "tag"
-];
-var collectionKindIconSchema = _enum2(collectionKindIconValues);
-var collectionKindPresetValues = ["lego", "vinyl", "board", "custom"];
-var collectionKindPresetSchema = _enum2(collectionKindPresetValues);
-var slug = string2().min(1).max(40).regex(/^[a-z0-9]+(-[a-z0-9]+)*$/, "lowercase letters and digits, dashes between");
-var collectionKindKeySchema = slug.refine((k) => !collectionTypeValues.includes(k), "that's a built-in kind");
-var collectionKindFieldSchema = object({
-  key: slug,
-  label: string2().trim().min(1).max(40),
-  type: collectionKindFieldTypeSchema,
-  choices: array(string2().trim().min(1).max(40)).max(30).optional()
-}).strict().refine((f) => f.type === "choice" || f.choices === undefined, {
-  message: "only a choice field has choices",
-  path: ["choices"]
-});
-var collectionKindFieldsSchema = array(collectionKindFieldSchema).max(12).refine((fs) => new Set(fs.map((f) => f.key)).size === fs.length, "each field key once");
-var word = string2().trim().min(1).max(30);
-var collectionKindStatusWordsSchema = object({ want: word, have: word, doing: word, done: word, dropped: word }).strict();
-var collectionKindSchema = object({
-  id: ulidSchema,
-  key: string2(),
-  name: string2(),
-  one: string2(),
-  many: string2(),
-  icon: string2(),
-  preset: string2().nullable(),
-  fields: array(object({
-    key: string2(),
-    label: string2(),
-    type: string2(),
-    choices: array(string2()).optional()
-  })),
-  statusWords: collectionKindStatusWordsSchema,
-  view: string2(),
-  itemCount: number2().int(),
-  createdAt: exports_coerce.date(),
-  updatedAt: exports_coerce.date()
-});
-var name2 = string2().trim().min(1).max(40);
-var createCollectionKindInputSchema = object({
-  id: ulidSchema,
-  name: name2,
-  key: collectionKindKeySchema.optional(),
-  one: name2.optional(),
-  many: name2.optional(),
-  icon: collectionKindIconSchema.optional(),
-  preset: collectionKindPresetSchema.optional(),
-  fields: collectionKindFieldsSchema.optional(),
-  statusWords: collectionKindStatusWordsSchema.optional()
-}).strict();
-var updateCollectionKindInputSchema = object({
-  name: name2.optional(),
-  one: name2.optional(),
-  many: name2.optional(),
-  icon: collectionKindIconSchema.optional(),
-  fields: collectionKindFieldsSchema.optional(),
-  statusWords: collectionKindStatusWordsSchema.optional()
-}).strict();
-var f = (label, type) => ({
-  key: kindSlug(label),
-  label,
-  type
-});
-var COLLECTION_KIND_PRESETS = {
-  lego: {
-    name: "LEGO",
-    one: "set",
-    icon: "brick",
-    fields: [
-      f("Set number", "text"),
-      f("Pieces", "number"),
-      f("Theme", "choice"),
-      f("Bags", "number"),
-      f("Minifigures", "number"),
-      f("Released", "year")
-    ],
-    statusWords: {
-      want: "Want",
-      have: "In the box",
-      doing: "Building",
-      done: "Built",
-      dropped: "Parted out"
-    }
-  },
-  vinyl: {
-    name: "Vinyl",
-    one: "record",
-    icon: "disc",
-    fields: [
-      f("Artist", "text"),
-      f("Label", "choice"),
-      f("Pressing", "text"),
-      f("Speed", "number"),
-      f("Condition", "choice"),
-      f("Released", "year")
-    ],
-    statusWords: {
-      want: "Want",
-      have: "Have",
-      doing: "On rotation",
-      done: "Played out",
-      dropped: "Sold"
-    }
-  },
-  board: {
-    name: "Board games",
-    one: "board game",
-    icon: "dice",
-    fields: [
-      f("Players", "number"),
-      f("Play time", "text"),
-      f("Designer", "text"),
-      f("Expansions", "text"),
-      f("Plays", "number"),
-      f("Released", "year")
-    ],
-    statusWords: {
-      want: "Want",
-      have: "Have",
-      doing: "Learning",
-      done: "Played",
-      dropped: "Gave away"
-    }
-  },
-  custom: {
-    name: "",
-    one: "",
-    icon: "tag",
-    fields: [f("Maker", "text"), f("Year", "year"), f("Condition", "choice")],
-    statusWords: { want: "Want", have: "Have", doing: "Using", done: "Done", dropped: "Gone" }
-  }
-};
-function kindSlug(name) {
-  const s = name.toLowerCase().normalize("NFKD").replace(/[\u0300-\u036F]/g, "").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40).replace(/-+$/, "");
-  return s || "kind";
-}
-
 // ../../packages/schema/src/contracts/pagination.ts
 var paginationQuerySchema = object({
   limit: exports_coerce.number().int().positive().optional(),
@@ -34368,25 +34442,6 @@ var incidentOperations = defineOperations({
   })
 });
 
-// ../../packages/schema/src/db/inventory.ts
-var inventoryItems = pgTable("inventory_items", {
-  ...leafColumns(),
-  productId: text("product_id").references(() => products.id),
-  quantity: doublePrecision("quantity").notNull().default(0),
-  unit: text("unit"),
-  category: text("category"),
-  location: text("location"),
-  lowStockThreshold: doublePrecision("low_stock_threshold"),
-  expiresAt: timestamp("expires_at", { withTimezone: true }),
-  notes: text("notes"),
-  facet: jsonb("facet").$type(),
-  placeId: text("place_id").references(() => places.id, { onDelete: "set null" })
-}, (t) => [
-  index("inventory_items_tenant_place_idx").on(t.tenantId, t.placeId),
-  index("inventory_items_tenant_idx").on(t.tenantId),
-  index("inventory_items_product_idx").on(t.productId)
-]);
-
 // ../../packages/schema/src/presets/facets.ts
 var PANTRY_DISPLAY_KIND = "pantry";
 var MEDS_DISPLAY_KIND = "meds";
@@ -46653,6 +46708,55 @@ var commands2 = [
       };
     }
   },
+  {
+    spec: {
+      path: ["animals", "feeding-set"],
+      summary: "Say how an animal is fed from a supply: what, how much, when, a note.",
+      args: [
+        { name: "id", required: true, description: "Animal ULID." },
+        { name: "supplyId", required: true, description: "Supply (Household item) ULID." }
+      ],
+      flags: [
+        {
+          name: "data",
+          type: "string",
+          description: 'JSON: `{ "amount": "2 \xD7 110 g", "times": "07:30 and 18:00", "what": "\u2026", "note": "\u2026" }`; null clears a field.'
+        }
+      ],
+      scopes: [...animalOperations.setFeeding.scopes],
+      returns: "AnimalFeeding",
+      notes: `${routeOf(animalOperations.setFeeding)}. Each field as written; one left out stays. Links the supply to the animal when it doesn't feed it yet. Read back as \`feedings\` on the animal's supplies.`
+    },
+    run: async ({ args, flags, requireClient }) => {
+      const id = requireArg(args, 0, "animal id");
+      const supplyId = requireArg(args, 1, "supply id");
+      const body = parseInput(animalFeedingInputSchema, readDataFlag(flags));
+      return {
+        data: await requireClient().put(pathOf(animalOperations.setFeeding, { id, supplyId }), body),
+        render: renderRecord
+      };
+    }
+  },
+  {
+    spec: {
+      path: ["animals", "feeding-off"],
+      summary: "Take an animal's feeding off a supply (the supply still feeds it).",
+      args: [
+        { name: "id", required: true, description: "Animal ULID." },
+        { name: "supplyId", required: true, description: "Supply (Household item) ULID." }
+      ],
+      flags: [],
+      scopes: [...animalOperations.removeFeeding.scopes],
+      returns: "void",
+      notes: `${routeOf(animalOperations.removeFeeding)}. Only what was said about how it's fed goes; the link stays.`
+    },
+    run: async ({ args, requireClient }) => {
+      const id = requireArg(args, 0, "animal id");
+      const supplyId = requireArg(args, 1, "supply id");
+      await requireClient().delete(pathOf(animalOperations.removeFeeding, { id, supplyId }));
+      return { data: { ok: true, animalId: id, supplyId }, render: renderRecord };
+    }
+  },
   {
     spec: {
       path: ["animals", "acquisition"],
@@ -47877,12 +47981,12 @@ var commands9 = [
         {
           name: "type",
           type: "string",
-          description: "Type (book|film|game|music|place|wine|wardrobe|hobby)."
+          description: "Type (book|film|game|music|place|wine|wardrobe|hobby), or a kind's key (`do collection kinds`)."
         },
         {
           name: "status",
           type: "string",
-          description: "Initial status; defaults to the Type's first."
+          description: "Initial status; defaults to the Type's first (a kind's: want)."
         }
       ],
       scopes: [...collectionOperations.create.scopes],
@@ -47890,13 +47994,13 @@ var commands9 = [
       grammar: {
         "#tag": "Adds a tag. Repeatable: '#scifi #2024'."
       },
-      notes: '--type is required; the per-Type facet rides --data (validated server-side against the Type), e.g. `do collection add "Castle" --type hobby --status doing --data \'{"facet":{"kind":"LEGO","progress":{"done":7,"total":12,"unit":"bag"}}}\'`.'
+      notes: `--type is required; the per-Type facet rides --data (validated server-side against the Type), e.g. \`do collection add "Castle" --type hobby --status doing --data '{"facet":{"kind":"LEGO","progress":{"done":7,"total":12,"unit":"bag"}}}'\`. An Item of one of the Space's own kinds takes its key as --type and answers its fields in the facet: \`do collection add "Harbour" --type vinyl --data '{"facet":{"artist":"Juniper"}}'\`.`
     },
     run: async ({ args, flags, requireClient }) => {
       const { title, tags } = parseTitleTags(args);
       if (title.length === 0)
         throw usageError('collection add needs a title, e.g. `do collection add "Dune" --type book`');
-      const type = requireFlag(flags, "type", "collection add needs --type <book|film|game|music|place|wine|wardrobe|hobby>");
+      const type = requireFlag(flags, "type", "collection add needs --type <book|film|game|music|place|wine|wardrobe|hobby|a kind's key>");
       const body = parseInput(createCollectionItemInputSchema, {
         id: ulid3(),
         ...readDataFlag(flags),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robbeverhelst/do",
-  "version": "1.393.0",
+  "version": "1.394.0",
   "private": false,
   "description": "do — the agent-drivable CLI over the public /api/v1 surface",
   "homepage": "https://github.com/robbeverhelst/do/tree/main/apps/cli",