@flaredev/core 0.10.0 → 0.11.0

package/dist/{chunk-TB53VHXY.js → chunk-62JI5DCR.js}

@@ -266,6 +266,26 @@ function storedFields(resource) {
 }
 var columnName = (key) => snakeCase(key);
 
+// src/resource/conditions.ts
+function conditionHolds(condition, values) {
+  if (!condition) return true;
+  const actual = values[condition.field];
+  const text = actual === null || actual === void 0 ? "" : String(actual);
+  switch (condition.op) {
+    case "eq":
+      return text === String(condition.value);
+    case "ne":
+      return text !== String(condition.value);
+    case "in":
+      return (Array.isArray(condition.value) ? condition.value : [condition.value]).some((option) => String(option) === text);
+  }
+}
+function describeCondition(condition) {
+  const values = Array.isArray(condition.value) ? condition.value : [condition.value];
+  if (condition.op === "in") return `${condition.field} is one of ${values.join(", ")}`;
+  return `${condition.field} ${condition.op === "eq" ? "is" : "is not"} ${values[0]}`;
+}
+
 // src/resource/formats.ts
 import {
   getCountries,
@@ -480,15 +500,30 @@ function createValidators(resource) {
         "This file wasn't uploaded for this field"
       );
     }
-    const value = def.required ? base : base.nullable();
+    const conditional2 = def.showWhen !== void 0;
+    const value = def.required && !conditional2 ? base : base.nullable();
     update[key] = value.optional();
     const hasDefault = "default" in def && def.default !== void 0;
-    create[key] = def.required && !hasDefault ? value : value.optional();
+    create[key] = def.required && !conditional2 && !hasDefault ? value : value.optional();
   }
+  const conditional = [...storedFields(resource)].flatMap(
+    ([key, def]) => def.showWhen ? [{ key, condition: def.showWhen, required: def.required !== false }] : []
+  );
+  const checkConditions = (partial) => (values, ctx) => {
+    for (const { key, condition, required } of conditional) {
+      if (!required) continue;
+      if (partial && !(condition.field in values) && !(key in values)) continue;
+      if (!conditionHolds(condition, values)) continue;
+      const supplied = values[key];
+      if (supplied === void 0 || supplied === null || supplied === "") {
+        ctx.addIssue({ code: "custom", path: [key], message: `Required when ${describeCondition(condition)}` });
+      }
+    }
+  };
   const unknownKeys = { error: (issue) => issue.code === "unrecognized_keys" ? `Unknown field(s): ${issue.keys?.join(", ")}` : void 0 };
   return {
-    create: z.strictObject(create, unknownKeys),
-    update: z.strictObject(update, unknownKeys)
+    create: z.strictObject(create, unknownKeys).superRefine(checkConditions(false)),
+    update: z.strictObject(update, unknownKeys).superRefine(checkConditions(true))
   };
 }
 
@@ -581,6 +616,8 @@ export {
   defineResource,
   storedFields,
   columnName,
+  conditionHolds,
+  describeCondition,
   flagEmoji,
   countryName,
   countries,

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { F as Field, C as CreateInput, U as UpdateInput, R as Resource, S as StoredField } from './policy-DFimkxdx.js';
-export { B as BelongsToField, a as BooleanField, b as ClientResource, D as DEFAULT_FILE_MAX_BYTES, c as DateField, d as DateTimeField, E as EnumField, e as FILE_CATEGORIES, f as FieldKind, g as FieldValue, h as FileCategory, i as FileField, j as FloatField, H as HasManyField, I as IntField, J as JsonField, k as JsonOptions, M as MultiSelectField, N as NUMBER_FORMATS, l as NumberFormat, P as Policy, m as PolicyAction, n as PolicyConfig, o as PolicyError, p as PolicyOwnership, q as RESERVED_FIELD_NAMES, r as RecordOf, s as ResourceConfig, t as ResourceDefinitionError, u as STRING_FORMATS, v as StringField, w as StringFormat, T as TEXT_FORMATS, x as TagsField, y as TagsOptions, z as TextField, A as TextFormat, G as allowedActions, K as can, L as clientResource, O as columnName, Q as defaultFieldLabel, V as definePolicy, W as defineResource, X as field, Y as fileMaxBytes, Z as mimeTypesFor, _ as ownershipFilter, $ as storedFields } from './policy-DFimkxdx.js';
+import { F as Field, C as CreateInput, U as UpdateInput, R as Resource, S as StoredField } from './policy-DaK3dWQ_.js';
+export { B as BelongsToField, a as BooleanField, b as ClientResource, D as DEFAULT_FILE_MAX_BYTES, c as DateField, d as DateTimeField, E as EnumField, e as FILE_CATEGORIES, f as FieldCondition, g as FieldKind, h as FieldValue, i as FileCategory, j as FileField, k as FloatField, H as HasManyField, I as IntField, J as JsonField, l as JsonOptions, M as MultiSelectField, N as NUMBER_FORMATS, m as NumberFormat, P as Policy, n as PolicyAction, o as PolicyConfig, p as PolicyError, q as PolicyOwnership, r as RESERVED_FIELD_NAMES, s as RecordOf, t as ResourceConfig, u as ResourceDefinitionError, v as STRING_FORMATS, w as StringField, x as StringFormat, T as TEXT_FORMATS, y as TagsField, z as TagsOptions, A as TextField, G as TextFormat, K as allowedActions, L as can, O as clientResource, Q as columnName, V as conditionHolds, W as defaultFieldLabel, X as definePolicy, Y as defineResource, Z as describeCondition, _ as field, $ as fileMaxBytes, a0 as mimeTypesFor, a1 as ownershipFilter, a2 as storedFields } from './policy-DaK3dWQ_.js';
 import { z } from 'zod';
 
 /**
@@ -626,6 +626,6 @@ type SeedUser = (user: SeedUserInput) => Promise<CredentialUserRows["user"]>;
 type Seed = (context: SeedContext) => void | Promise<void>;
 declare function defineSeed(seed: Seed): Seed;
 
-declare const FLARE_VERSION = "0.10.0";
+declare const FLARE_VERSION = "0.11.0";
 
 export { type BelongsToRelation, type Country, CreateInput, type CredentialUserRows, DEFAULT_MONEY_EXPONENT, FLARE_VERSION, type Fake, Field, type FormValues, type FormatOptions, type HasManyRelation, type InsertMany, type MailMessage, type MailResult, type Mailer, type MailerOptions, PBKDF2_ITERATIONS, type ReadUrlOptions, RelationError, type RelationGraph, Resource, type ResourceRelations, type ResourceValidators, SNIFF_BYTES, SUBSCRIPTION_STATUSES, type Seed, type SeedContext, type SeedUser, type SeedUserInput, type Storage, type StorageBucket, type StorageOptions, StoredField, type SubscriptionLike, type SubscriptionState, type SubscriptionStatus, type Tone, type TransactionalEmail, UpdateInput, type UploadUrlOptions, camelCase, checkoutPaid, countries, countryName, createFake, createMailer, createObjectKey, createStorage, createValidators, credentialUserRows, currentPeriodEnd, defineSeed, fake, fieldSchema, fileKeyPrefix, flagEmoji, formValuesToInput, formatPhone, formatValue, fromMinorUnits, grantsAccess, hasTooManyPlaces, hashPassword, humanize, importSigningKey, initialFormValues, isColor, isCountryCode, isDomain, isLiveSubscription, isPhoneNumber, isSlug, issuesByField, kebabCase, matchesContentType, moneyExponent, normalizeDomain, optionLabel, parseMultiValue, pascalCase, pluralize, randomLetters, relationGraph, renderTransactionalEmail, shouldApplySubscription, signToken, slugify, snakeCase, sniffMatches, splitPhone, statusTone, subscriptionPriceId, subscriptionState, toE164, toMinorUnits, toSubscriptionStatus, verifyPassword, verifyToken, words };

package/dist/index.js

@@ -13,12 +13,14 @@ import {
   can,
   clientResource,
   columnName,
+  conditionHolds,
   countries,
   countryName,
   createValidators,
   defaultFieldLabel,
   definePolicy,
   defineResource,
+  describeCondition,
   field,
   fieldSchema,
   fileKeyPrefix,
@@ -47,7 +49,7 @@ import {
   toE164,
   toMinorUnits,
   words
-} from "./chunk-TB53VHXY.js";
+} from "./chunk-62JI5DCR.js";
 
 // src/password.ts
 var ALGORITHM = "pbkdf2-sha256";
@@ -1052,7 +1054,7 @@ function createFake(seed = 20260101) {
 var fake = createFake();
 
 // src/index.ts
-var FLARE_VERSION = "0.10.0";
+var FLARE_VERSION = "0.11.0";
 export {
   DEFAULT_FILE_MAX_BYTES,
   DEFAULT_MONEY_EXPONENT,
@@ -1074,6 +1076,7 @@ export {
   checkoutPaid,
   clientResource,
   columnName,
+  conditionHolds,
   countries,
   countryName,
   createFake,
@@ -1087,6 +1090,7 @@ export {
   definePolicy,
   defineResource,
   defineSeed,
+  describeCondition,
   fake,
   field,
   fieldSchema,

package/dist/{policy-DFimkxdx.d.ts → policy-DaK3dWQ_.d.ts}

@@ -1,3 +1,43 @@
+/**
+ * Fields that only apply sometimes.
+ *
+ * A billing cycle is required on a recurring project and meaningless on a one-off one.
+ * The usual way that gets built is an effect in the admin form that hides the input, and
+ * then the API happily accepts a cycle on a one-off project because nothing told it not
+ * to. The rule ends up in two or three places that disagree the first time somebody
+ * changes it.
+ *
+ * So the condition is declared on the field instead, once:
+ *
+ *   billingCycle: field.enum(["monthly", "annually"], {
+ *     showWhen: { field: "kind", op: "eq", value: "recurring" },
+ *   })
+ *
+ * and everything that needs it reads the same object: the validator makes it required
+ * only when the condition holds, the store clears it when it doesn't, and the form shows
+ * the input only while it applies.
+ */
+interface FieldCondition {
+    /** The field this one depends on. Must be a field of the same resource. */
+    field: string;
+    op: "eq" | "ne" | "in";
+    /** A single value for eq/ne, a list for `in`. */
+    value: string | string[];
+}
+/**
+ * Whether a conditional field applies, given the record it sits in.
+ *
+ * Compared as text, because the controlling field is an enum, a boolean or a number
+ * depending on who wrote the descriptor, and a form sends every one of them as a string.
+ * `true` and `"true"` have to answer the same here or the form and the API disagree.
+ *
+ * A field with no condition always applies, which is what makes this safe to call on
+ * every field without asking first.
+ */
+declare function conditionHolds(condition: FieldCondition | undefined, values: Record<string, unknown>): boolean;
+/** "kind == recurring" — for an error message, a form hint or a generated comment. */
+declare function describeCondition(condition: FieldCondition): string;
+
 /**
  * Field builders for resource descriptors.
  *
@@ -6,6 +46,7 @@
  * rule in a descriptor takes effect without re-running the generator. Only
  * storage-level changes (kind, nullability, uniqueness, relations) need a migration.
  */
+
 type FieldKind = "string" | "text" | "int" | "float" | "boolean" | "date" | "datetime" | "enum" | "multiselect" | "tags" | "json" | "file" | "belongsTo" | "hasMany";
 /** Options shared by every stored (non-hasMany) field. */
 interface CommonOptions<T> {
@@ -23,6 +64,14 @@ interface CommonOptions<T> {
     filterable?: boolean;
     /** Included in free-text search. Default true for string fields. */
     searchable?: boolean;
+    /**
+     * Only applies when another field says so, e.g. a billing cycle on a recurring project:
+     * `showWhen: { field: "kind", op: "eq", value: "recurring" }`.
+     *
+     * The column is always nullable, because the field is genuinely absent the rest of the
+     * time. `required` then means "required *when it applies*" rather than "never null".
+     */
+    showWhen?: FieldCondition;
 }
 /**
  * What a string holds. Each format is still a text column; the format decides
@@ -508,4 +557,4 @@ declare function ownershipFilter(policy: Policy | undefined | null, user: {
 /** Actions `role` may perform, for hiding UI it can't use. */
 declare function allowedActions(policy: Policy | undefined | null, role: string | null | undefined): Record<Exclude<PolicyAction, "list">, boolean>;
 
-export { storedFields as $, type TextFormat as A, type BelongsToField as B, type CreateInput as C, DEFAULT_FILE_MAX_BYTES as D, type EnumField as E, type Field as F, allowedActions as G, type HasManyField as H, type IntField as I, type JsonField as J, can as K, clientResource as L, type MultiSelectField as M, NUMBER_FORMATS as N, columnName as O, type Policy as P, defaultFieldLabel as Q, type Resource as R, type StoredField as S, TEXT_FORMATS as T, type UpdateInput as U, definePolicy as V, defineResource as W, field as X, fileMaxBytes as Y, mimeTypesFor as Z, ownershipFilter as _, type BooleanField as a, type ClientResource as b, type DateField as c, type DateTimeField as d, FILE_CATEGORIES as e, type FieldKind as f, type FieldValue as g, type FileCategory as h, type FileField as i, type FloatField as j, type JsonOptions as k, type NumberFormat as l, type PolicyAction as m, type PolicyConfig as n, PolicyError as o, type PolicyOwnership as p, RESERVED_FIELD_NAMES as q, type RecordOf as r, type ResourceConfig as s, ResourceDefinitionError as t, STRING_FORMATS as u, type StringField as v, type StringFormat as w, type TagsField as x, type TagsOptions as y, type TextField as z };
+export { fileMaxBytes as $, type TextField as A, type BelongsToField as B, type CreateInput as C, DEFAULT_FILE_MAX_BYTES as D, type EnumField as E, type Field as F, type TextFormat as G, type HasManyField as H, type IntField as I, type JsonField as J, allowedActions as K, can as L, type MultiSelectField as M, NUMBER_FORMATS as N, clientResource as O, type Policy as P, columnName as Q, type Resource as R, type StoredField as S, TEXT_FORMATS as T, type UpdateInput as U, conditionHolds as V, defaultFieldLabel as W, definePolicy as X, defineResource as Y, describeCondition as Z, field as _, type BooleanField as a, mimeTypesFor as a0, ownershipFilter as a1, storedFields as a2, type ClientResource as b, type DateField as c, type DateTimeField as d, FILE_CATEGORIES as e, type FieldCondition as f, type FieldKind as g, type FieldValue as h, type FileCategory as i, type FileField as j, type FloatField as k, type JsonOptions as l, type NumberFormat as m, type PolicyAction as n, type PolicyConfig as o, PolicyError as p, type PolicyOwnership as q, RESERVED_FIELD_NAMES as r, type RecordOf as s, type ResourceConfig as t, ResourceDefinitionError as u, STRING_FORMATS as v, type StringField as w, type StringFormat as x, type TagsField as y, type TagsOptions as z };

package/dist/server.d.ts

@@ -1,6 +1,6 @@
 import * as drizzle_orm_sqlite_core from 'drizzle-orm/sqlite-core';
 import { BaseSQLiteDatabase, SQLiteTable, SQLiteColumn } from 'drizzle-orm/sqlite-core';
-import { S as StoredField, R as Resource, F as Field, P as Policy } from './policy-DFimkxdx.js';
+import { S as StoredField, R as Resource, F as Field, P as Policy } from './policy-DaK3dWQ_.js';
 
 /**
  * The handful of things a resource store needs a database to do.

package/dist/server.js

@@ -4,7 +4,7 @@ import {
   createValidators,
   moneyExponent,
   storedFields
-} from "./chunk-TB53VHXY.js";
+} from "./chunk-62JI5DCR.js";
 
 // ../../node_modules/.pnpm/drizzle-orm@0.45.2_@cloudfl_21866ab18c10d2d988b916e06105fbce/node_modules/drizzle-orm/entity.js
 var entityKind = /* @__PURE__ */ Symbol.for("drizzle:entityKind");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flaredev/core",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Flare runtime: resource descriptors, field grammar, and Cloudflare-native helpers",
   "license": "MIT",
   "author": "Muke Johnbaptist",