@flaredev/core 0.7.2 → 0.8.0

package/dist/{chunk-VLHPSNQN.js → chunk-JYWV3AF6.js}

@@ -1,5 +1,21 @@
 // src/resource/fields.ts
-var STRING_FORMATS = ["email", "url", "tel", "domain", "country", "color", "slug"];
+var STRING_FORMATS = [
+  "email",
+  "url",
+  "tel",
+  "domain",
+  "country",
+  "color",
+  "slug",
+  "username",
+  "ip",
+  "uuid",
+  "timezone",
+  "locale",
+  "currency",
+  "postcode"
+];
+var NUMBER_FORMATS = ["money", "percent", "rating"];
 var FILE_CATEGORIES = {
   // For a field that holds whatever someone has: a drive, an attachment, a backup.
   // Nothing is checked beyond the size limit, so don't reach for it out of convenience.
@@ -259,6 +275,27 @@ var isSlug = (value) => /^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(value);
 function slugify(value) {
   return value.normalize("NFKD").replace(/[̀-ͯ]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
+var isIpAddress = (value) => /^(?:\d{1,3}\.){3}\d{1,3}$/.test(value) ? value.split(".").every((part) => Number(part) <= 255) : /^[0-9a-f:]+$/i.test(value) && value.includes(":") && value.split("::").length <= 2;
+var isUuid = (value) => /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
+function isTimezone(value) {
+  try {
+    new Intl.DateTimeFormat("en", { timeZone: value });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isLocale(value) {
+  if (!/^[A-Za-z]{2,3}(?:-[A-Za-z]{4})?(?:-(?:[A-Za-z]{2}|\d{3}))?$/.test(value)) return false;
+  try {
+    return new Intl.Locale(value).language.length >= 2;
+  } catch {
+    return false;
+  }
+}
+var isCurrencyCode = (value) => /^[A-Z]{3}$/.test(value);
+var isUsername = (value) => /^[A-Za-z0-9_][A-Za-z0-9_.]{1,31}$/.test(value);
+var isPostcode = (value) => /^[A-Za-z0-9][A-Za-z0-9 -]{0,10}[A-Za-z0-9]$/.test(value);
 
 // src/resource/validators.ts
 import { z } from "zod";
@@ -295,6 +332,20 @@ function fieldSchema(def) {
           return s.transform((value) => value.toLowerCase()).refine((value) => value === "" || isColor(value), "Enter a colour such as #f2541d");
         case "slug":
           return s.refine((value) => value === "" || isSlug(value), "Use lowercase letters, numbers and hyphens, e.g. my-first-post");
+        case "username":
+          return s.refine((value) => value === "" || isUsername(value), "2 to 32 characters: letters, digits, underscore and dot");
+        case "ip":
+          return s.refine((value) => value === "" || isIpAddress(value), "Enter an IP address, e.g. 192.168.1.1");
+        case "uuid":
+          return s.transform((value) => value.toLowerCase()).refine((value) => value === "" || isUuid(value), "Enter a UUID");
+        case "timezone":
+          return s.refine((value) => value === "" || isTimezone(value), "Choose a time zone, e.g. Africa/Kampala");
+        case "locale":
+          return s.refine((value) => value === "" || isLocale(value), "Enter a language tag, e.g. en-GB");
+        case "currency":
+          return s.transform((value) => value.toUpperCase()).refine((value) => value === "" || isCurrencyCode(value), "Enter a three-letter currency code, e.g. UGX");
+        case "postcode":
+          return s.transform((value) => value.toUpperCase()).refine((value) => value === "" || isPostcode(value), "Enter a postal code");
         default:
           return s;
       }
@@ -305,6 +356,10 @@ function fieldSchema(def) {
     case "float": {
       let s = z.number({ error: typeError("Enter a number") });
       if (def.kind === "int") s = s.int("Enter a whole number");
+      if (def.format === "rating") {
+        s = s.min(def.min ?? 0, `At least ${def.min ?? 0}`).max(def.max ?? 5, `At most ${def.max ?? 5}`);
+      }
+      if (def.format === "money" && def.min === void 0) s = s.min(0, "Cannot be negative");
       if (def.min !== void 0) s = s.min(def.min, `Must be at least ${def.min}`);
       if (def.max !== void 0) s = s.max(def.max, `Must be at most ${def.max}`);
       return s;
@@ -393,6 +448,7 @@ function allowedActions(policy, role) {
 
 export {
   STRING_FORMATS,
+  NUMBER_FORMATS,
   FILE_CATEGORIES,
   mimeTypesFor,
   DEFAULT_FILE_MAX_BYTES,

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-DaKcWZ5g.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, M as MultiSelectField, P as Policy, k as PolicyAction, l as PolicyConfig, m as PolicyError, n as RESERVED_FIELD_NAMES, o as RecordOf, p as ResourceConfig, q as ResourceDefinitionError, r as STRING_FORMATS, s as StringField, t as StringFormat, T as TextField, u as allowedActions, v as can, w as clientResource, x as columnName, y as defaultFieldLabel, z as definePolicy, A as defineResource, G as field, J as fileMaxBytes, K as mimeTypesFor, L as storedFields } from './policy-DaKcWZ5g.js';
+import { F as Field, C as CreateInput, U as UpdateInput, R as Resource, S as StoredField } from './policy-dc9NbbgZ.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, M as MultiSelectField, N as NUMBER_FORMATS, k as NumberFormat, P as Policy, l as PolicyAction, m as PolicyConfig, n as PolicyError, o as RESERVED_FIELD_NAMES, p as RecordOf, q as ResourceConfig, r as ResourceDefinitionError, s as STRING_FORMATS, t as StringField, u as StringFormat, T as TextField, v as allowedActions, w as can, x as clientResource, y as columnName, z as defaultFieldLabel, A as definePolicy, G as defineResource, J as field, K as fileMaxBytes, L as mimeTypesFor, O as storedFields } from './policy-dc9NbbgZ.js';
 import { z } from 'zod';
 
 /**
@@ -529,6 +529,6 @@ interface SeedContext {
 type Seed = (context: SeedContext) => void | Promise<void>;
 declare function defineSeed(seed: Seed): Seed;
 
-declare const FLARE_VERSION = "0.7.2";
+declare const FLARE_VERSION = "0.8.0";
 
 export { type BelongsToRelation, type Country, CreateInput, 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 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, currentPeriodEnd, defineSeed, fake, fieldSchema, fileKeyPrefix, flagEmoji, formValuesToInput, formatPhone, formatValue, grantsAccess, hashPassword, humanize, importSigningKey, initialFormValues, isColor, isCountryCode, isDomain, isLiveSubscription, isPhoneNumber, isSlug, issuesByField, kebabCase, matchesContentType, normalizeDomain, optionLabel, parseMultiValue, pascalCase, pluralize, randomLetters, relationGraph, renderTransactionalEmail, shouldApplySubscription, signToken, slugify, snakeCase, sniffMatches, splitPhone, statusTone, subscriptionPriceId, subscriptionState, toE164, toSubscriptionStatus, verifyPassword, verifyToken, words };

package/dist/index.js

@@ -1,6 +1,7 @@
 import {
   DEFAULT_FILE_MAX_BYTES,
   FILE_CATEGORIES,
+  NUMBER_FORMATS,
   PolicyError,
   RESERVED_FIELD_NAMES,
   ResourceDefinitionError,
@@ -39,7 +40,7 @@ import {
   storedFields,
   toE164,
   words
-} from "./chunk-VLHPSNQN.js";
+} from "./chunk-JYWV3AF6.js";
 
 // src/password.ts
 var ALGORITHM = "pbkdf2-sha256";
@@ -994,11 +995,12 @@ function createFake(seed = 20260101) {
 var fake = createFake();
 
 // src/index.ts
-var FLARE_VERSION = "0.7.2";
+var FLARE_VERSION = "0.8.0";
 export {
   DEFAULT_FILE_MAX_BYTES,
   FILE_CATEGORIES,
   FLARE_VERSION,
+  NUMBER_FORMATS,
   PBKDF2_ITERATIONS,
   PolicyError,
   RESERVED_FIELD_NAMES,

package/dist/{policy-DaKcWZ5g.d.ts → policy-dc9NbbgZ.d.ts}

@@ -34,8 +34,15 @@ interface CommonOptions<T> {
  * - country: an ISO 3166-1 alpha-2 code (`UG`), chosen from a searchable list
  * - color: a hex colour (`#f2541d`)
  * - slug: lowercase words joined by hyphens (`my-first-post`)
+ * - username: a handle (`ada_lovelace`), letters, digits, underscore and dot
+ * - ip: an IPv4 or IPv6 address
+ * - uuid: a UUID of any version
+ * - timezone: an IANA zone (`Africa/Kampala`), checked against the runtime's own list
+ * - locale: a BCP-47 tag (`en-GB`), chosen from a list
+ * - currency: an ISO 4217 code (`UGX`), chosen from a list
+ * - postcode: a postal code, stored upper case
  */
-type StringFormat = "email" | "url" | "tel" | "domain" | "country" | "color" | "slug";
+type StringFormat = "email" | "url" | "tel" | "domain" | "country" | "color" | "slug" | "username" | "ip" | "uuid" | "timezone" | "locale" | "currency" | "postcode";
 declare const STRING_FORMATS: readonly StringFormat[];
 interface StringOptions extends CommonOptions<string> {
     maxLength?: number;
@@ -47,9 +54,24 @@ interface TextOptions extends CommonOptions<string> {
     maxLength?: number;
     minLength?: number;
 }
+/**
+ * What a number means, which decides how it is shown and entered.
+ *
+ * The column is the same either way — a number is a number. The format changes the
+ * input's step and affixes, and how the value is rendered in a table.
+ *
+ * - money: an amount, grouped and shown to two decimal places
+ * - percent: shown with a % sign; stored as entered, so 20 means 20%
+ * - rating: a small whole number, entered as stars
+ */
+type NumberFormat = "money" | "percent" | "rating";
+declare const NUMBER_FORMATS: readonly NumberFormat[];
 interface NumberOptions extends CommonOptions<number> {
     min?: number;
     max?: number;
+    format?: NumberFormat;
+    /** money only: an ISO 4217 code for display, e.g. "UGX". Defaults to the app's. */
+    currency?: string;
 }
 type BooleanOptions = CommonOptions<boolean>;
 type DateOptions = CommonOptions<string>;
@@ -377,4 +399,4 @@ declare function can(policy: Policy | undefined | null, role: string | null | un
 /** 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 { defineResource as A, type BelongsToField as B, type CreateInput as C, DEFAULT_FILE_MAX_BYTES as D, type EnumField as E, type Field as F, field as G, type HasManyField as H, type IntField as I, fileMaxBytes as J, mimeTypesFor as K, storedFields as L, type MultiSelectField as M, type Policy as P, type Resource as R, type StoredField as S, type TextField as T, type UpdateInput as U, 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 PolicyAction as k, type PolicyConfig as l, PolicyError as m, RESERVED_FIELD_NAMES as n, type RecordOf as o, type ResourceConfig as p, ResourceDefinitionError as q, STRING_FORMATS as r, type StringField as s, type StringFormat as t, allowedActions as u, can as v, clientResource as w, columnName as x, defaultFieldLabel as y, definePolicy as z };
+export { definePolicy as A, type BelongsToField as B, type CreateInput as C, DEFAULT_FILE_MAX_BYTES as D, type EnumField as E, type Field as F, defineResource as G, type HasManyField as H, type IntField as I, field as J, fileMaxBytes as K, mimeTypesFor as L, type MultiSelectField as M, NUMBER_FORMATS as N, storedFields as O, type Policy as P, type Resource as R, type StoredField as S, type TextField as T, type UpdateInput as U, 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 NumberFormat as k, type PolicyAction as l, type PolicyConfig as m, PolicyError as n, RESERVED_FIELD_NAMES as o, type RecordOf as p, type ResourceConfig as q, ResourceDefinitionError as r, STRING_FORMATS as s, type StringField as t, type StringFormat as u, allowedActions as v, can as w, clientResource as x, columnName as y, defaultFieldLabel 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-DaKcWZ5g.js';
+import { S as StoredField, R as Resource, F as Field, P as Policy } from './policy-dc9NbbgZ.js';
 
 /**
  * The handful of things a resource store needs a database to do.
@@ -39,6 +39,14 @@ interface RowsQuery {
         value: unknown;
         id: string;
         greaterThan: boolean;
+        /**
+         * Whether the sort column holds a date.
+         *
+         * A cursor travels through a URL, so a Date arrives back as a number. SQLite stores
+         * dates as milliseconds and wants that number; Postgres wants a Date. Neither
+         * adapter can tell which a column is, and the store can — so it says.
+         */
+        isDate?: boolean;
     };
     limit: number;
     /** Offset paging, for the page-number case. Never combined with a cursor. */

package/dist/server.js

@@ -3,7 +3,7 @@ import {
   columnName,
   createValidators,
   storedFields
-} from "./chunk-VLHPSNQN.js";
+} from "./chunk-JYWV3AF6.js";
 
 // ../../node_modules/.pnpm/drizzle-orm@0.45.2_@cloudfl_21866ab18c10d2d988b916e06105fbce/node_modules/drizzle-orm/entity.js
 var entityKind = /* @__PURE__ */ Symbol.for("drizzle:entityKind");
@@ -1453,6 +1453,11 @@ function createResourceStore(options) {
       const parsed = parseListQuery(resource, params);
       if ("issues" in parsed) return fail(400, "Invalid query.", { queryIssues: parsed.issues });
       const { page, perPage, sort, q, filters, cursor } = parsed.query;
+      const isDateField = (key) => {
+        if (key === "createdAt" || key === "updatedAt") return true;
+        const def = fields.find(([name]) => name === key)?.[1];
+        return def?.kind === "date" || def?.kind === "datetime";
+      };
       const searchable = fields.filter(([, def]) => isSearchable(def)).map(([key]) => key);
       const matching = { search: q ? { term: q, fields: searchable } : void 0, filters };
       const backwards = cursor?.direction === "before";
@@ -1462,7 +1467,7 @@ function createResourceStore(options) {
         rows.find({
           ...matching,
           sort: { field: sort.field, direction: descending ? "desc" : "asc" },
-          cursor: cursor ? { field: sort.field, value: cursor.value, id: cursor.id, greaterThan: !descending } : void 0,
+          cursor: cursor ? { field: sort.field, value: cursor.value, id: cursor.id, greaterThan: !descending, isDate: isDateField(sort.field) } : void 0,
           limit: perPage + 1,
           offset: cursor ? void 0 : (page - 1) * perPage
         }),
@@ -1680,8 +1685,9 @@ function prismaRows(delegate, client) {
     async find(query) {
       const where = matching(query);
       if (query.cursor) {
-        const { field, value, id, greaterThan } = query.cursor;
+        const { field, id, greaterThan, isDate } = query.cursor;
         const op = greaterThan ? "gt" : "lt";
+        const value = isDate && (typeof query.cursor.value === "number" || typeof query.cursor.value === "string") ? new Date(query.cursor.value) : query.cursor.value;
         const keyset = [{ [field]: { [op]: value } }, { AND: [{ [field]: value }, { id: { [op]: id } }] }];
         where.AND = [...where.AND ?? [], { OR: keyset }];
       }

package/package.json

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