@flaredev/cli 0.7.3 → 0.8.1

package/dist/index.js

@@ -457,8 +457,26 @@ import pc6 from "picocolors";
 // src/generator/grammar.ts
 import { camelCase, FILE_CATEGORIES, STRING_FORMATS } from "@flaredev/core";
 var SIMPLE_KINDS = ["string", "text", "int", "float", "boolean", "date", "datetime"];
-var FORMAT_ALIASES = { phone: "tel" };
-var ALL_KINDS = [...SIMPLE_KINDS, ...STRING_FORMATS, "phone", "enum", "select", "radio", "multiselect", "file", "belongsTo", "hasMany"];
+var FORMAT_ALIASES = { phone: "tel", website: "url" };
+var NUMBER_SHORTHANDS = {
+  money: { kind: "float", format: "money" },
+  percent: { kind: "float", format: "percent" },
+  rating: { kind: "int", format: "rating" }
+};
+var ALL_KINDS = [
+  ...SIMPLE_KINDS,
+  ...STRING_FORMATS,
+  "phone",
+  "website",
+  ...Object.keys(NUMBER_SHORTHANDS),
+  "enum",
+  "select",
+  "radio",
+  "multiselect",
+  "file",
+  "belongsTo",
+  "hasMany"
+];
 var FieldGrammarError = class extends Error {
   constructor(message) {
     super(message);
@@ -543,6 +561,10 @@ function parseField(spec) {
   } else if (STRING_FORMATS.includes(type) || type in FORMAT_ALIASES) {
     field.kind = "string";
     field.format = FORMAT_ALIASES[type] ?? type;
+  } else if (type in NUMBER_SHORTHANDS) {
+    const shorthand = NUMBER_SHORTHANDS[type];
+    field.kind = shorthand.kind;
+    field.numberFormat = shorthand.format;
   } else if (match = /^(enum|select|radio|multiselect)\((.*)\)$/.exec(type)) {
     const choice = match[1];
     field.kind = choice === "multiselect" ? "multiselect" : "enum";
@@ -710,6 +732,7 @@ function options(field) {
   if (!field.required) opts.required = false;
   if (field.unique) opts.unique = true;
   if (field.format) opts.format = field.format;
+  if (field.numberFormat) opts.format = field.numberFormat;
   if (field.widget) opts.widget = field.widget;
   if (field.kind === "belongsTo" && !field.required) opts.onDelete = "set null";
   if (field.maxBytes !== void 0) opts.maxBytes = field.maxBytes;
@@ -4095,6 +4118,11 @@ Move what you want to keep, or pass --force to delete anyway.`);
 These seeds still use ${table}: ${seeds.map((s) => `seeds/${s}`).join(", ")}.`));
   }
   let migrations = [];
+  if (readStack(appRoot) === "next") {
+    if (entry) log2(`
+Next: ${pc15.bold("npx prisma migrate dev")} to drop the table.`);
+    return { removed, migrations };
+  }
   if (!options2.skipMigration && entry) {
     const result = await generateSchemaMigration(appRoot, `drop_${entry.resource.table}`);
     migrations = result.files;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flaredev/cli",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "description": "The flare command-line tool: create, generate, migrate, and deploy Flare apps",
   "license": "MIT",
   "author": "Muke Johnbaptist",
@@ -41,7 +41,7 @@
     "jiti": "^2.7.0",
     "jsonc-parser": "^3.3.1",
     "picocolors": "^1.1.1",
-    "@flaredev/core": "0.7.3"
+    "@flaredev/core": "0.8.1"
   },
   "engines": {
     "node": ">=22"

package/templates/app/app/dashboard/actions.ts

@@ -122,7 +122,9 @@ export async function exportRecordsAction(resourceName: string, query: string):
     const params = new URLSearchParams(query);
     params.set("page", String(page));
     params.set("perPage", String(EXPORT_PAGE));
-    const result = await store.list(params);
+    // A bigger page than a request from outside may ask for: this is the server
+    // paging through everything on purpose, and 500 round trips would be absurd.
+    const result = await store.list(params, { maxPerPage: EXPORT_PAGE });
     if (!result.ok) return result;
     rows.push(...result.data.data);
     if (page >= result.data.meta.totalPages) break;

package/templates/app/components/dashboard/fields/field-widget.tsx

@@ -59,7 +59,56 @@ export function FieldWidget(props: WidgetProps) {
       return <Textarea {...common} value={text} rows={4} onChange={(event) => onChange(event.target.value)} />;
 
     case "int":
-    case "float":
+    case "float": {
+      // A rating is a row of stars, not a number to type.
+      if (field.format === "rating") {
+        const most = field.max ?? 5;
+        const score = Number(text) || 0;
+        return (
+          <div className="flex items-center gap-1" role="radiogroup" aria-label={field.label}>
+            {Array.from({ length: most }, (_, index) => index + 1).map((star) => (
+              <button
+                key={star}
+                type="button"
+                role="radio"
+                aria-checked={score === star}
+                aria-label={`${star} of ${most}`}
+                disabled={disabled}
+                // Clicking the current score clears it, which is the only way to unset one.
+                onClick={() => onChange(score === star ? "" : String(star))}
+                className="rounded p-0.5 text-lg leading-none text-muted-foreground transition-colors hover:text-foreground disabled:opacity-50 data-[on=true]:text-foreground"
+                data-on={star <= score}
+              >
+                {star <= score ? "★" : "☆"}
+              </button>
+            ))}
+            {score > 0 && !disabled && (
+              <button type="button" onClick={() => onChange("")} className="ml-1 text-xs text-muted-foreground hover:text-foreground">
+                clear
+              </button>
+            )}
+          </div>
+        );
+      }
+
+      // Money and percent get their unit where the number is, so nobody has to guess.
+      if (field.format === "money" || field.format === "percent") {
+        return (
+          <InputGroup>
+            {field.format === "money" && <InputGroupAddon>{field.currency ?? "$"}</InputGroupAddon>}
+            <InputGroupInput
+              {...common}
+              type="text"
+              inputMode="decimal"
+              className="tabular-nums"
+              value={groupDigits(text)}
+              onChange={(event) => onChange(ungroup(event.target.value, true))}
+            />
+            {field.format === "percent" && <InputGroupAddon align="inline-end">%</InputGroupAddon>}
+          </InputGroup>
+        );
+      }
+
       // Shown grouped (2,000) and stored plain (2000), so a price can be read at a glance
       // and nothing downstream has to strip a comma back out.
       return (
@@ -72,6 +121,7 @@ export function FieldWidget(props: WidgetProps) {
           onChange={(event) => onChange(ungroup(event.target.value, field.kind === "float"))}
         />
       );
+    }
 
     case "boolean":
       return (
@@ -189,6 +239,37 @@ export function FieldWidget(props: WidgetProps) {
           return <Input {...common} type="email" autoComplete="email" value={text} onChange={(event) => onChange(event.target.value)} />;
         case "url":
           return <Input {...common} type="url" placeholder={field.placeholder ?? "https://"} value={text} onChange={(event) => onChange(event.target.value)} />;
+        case "username":
+          return (
+            <InputGroup>
+              <InputGroupAddon>@</InputGroupAddon>
+              <InputGroupInput {...common} autoCapitalize="none" spellCheck={false} placeholder={field.placeholder ?? "ada_lovelace"} value={text} onChange={(event) => onChange(event.target.value)} />
+            </InputGroup>
+          );
+        case "ip":
+          return <Input {...common} inputMode="numeric" spellCheck={false} className="font-mono" placeholder={field.placeholder ?? "192.168.1.1"} value={text} onChange={(event) => onChange(event.target.value)} />;
+        case "uuid":
+          return <Input {...common} spellCheck={false} className="font-mono" placeholder={field.placeholder ?? "3f2504e0-4f89-11d3-9a0c-0305e82c3301"} value={text} onChange={(event) => onChange(event.target.value)} />;
+        case "timezone":
+          // The browser knows every zone; no list to ship or keep current.
+          return (
+            <>
+              <Input {...common} list={`${common.id}-zones`} spellCheck={false} placeholder={field.placeholder ?? "Africa/Kampala"} value={text} onChange={(event) => onChange(event.target.value)} />
+              <datalist id={`${common.id}-zones`}>
+                {(Intl.supportedValuesOf?.("timeZone") ?? []).map((zone) => (
+                  <option key={zone} value={zone} />
+                ))}
+              </datalist>
+            </>
+          );
+        case "currency":
+          return (
+            <Input {...common} spellCheck={false} maxLength={3} className="font-mono uppercase" placeholder={field.placeholder ?? "UGX"} value={text} onChange={(event) => onChange(event.target.value.toUpperCase())} />
+          );
+        case "locale":
+          return <Input {...common} spellCheck={false} className="font-mono" placeholder={field.placeholder ?? "en-GB"} value={text} onChange={(event) => onChange(event.target.value)} />;
+        case "postcode":
+          return <Input {...common} autoCapitalize="characters" spellCheck={false} placeholder={field.placeholder ?? "SW1A 1AA"} value={text} onChange={(event) => onChange(event.target.value.toUpperCase())} />;
         default:
           return (
             <WithSuggestion suggest={suggest} disabled={disabled} onChange={onChange}>

package/templates/app/lib/resource/query.ts

@@ -93,7 +93,19 @@ function coerce(def: StoredField, raw: string): string | number | boolean | null
  * resource. Only fields the descriptor marks sortable/filterable/searchable are
  * accepted, so clients can't probe arbitrary columns.
  */
-export function parseListQuery(resource: Resource, params: URLSearchParams): { query: ListQuery } | { issues: QueryIssue[] } {
+export function parseListQuery(
+  resource: Resource,
+  params: URLSearchParams,
+  /**
+   * The largest page this caller may ask for.
+   *
+   * The cap exists to stop a request from the outside asking for ten thousand rows at
+   * once. Server-side callers that page through everything deliberately — the CSV
+   * export — pass their own, which is why this is an argument rather than a constant
+   * everything obeys.
+   */
+  options: { maxPerPage?: number } = {},
+): { query: ListQuery } | { issues: QueryIssue[] } {
   const issues: QueryIssue[] = [];
   const fields = new Map(storedFields(resource));
 
@@ -109,7 +121,7 @@ export function parseListQuery(resource: Resource, params: URLSearchParams): { q
   };
 
   const page = positiveInt("page", 1);
-  const perPage = positiveInt("perPage", resource.perPage, MAX_PER_PAGE);
+  const perPage = positiveInt("perPage", resource.perPage, options.maxPerPage ?? MAX_PER_PAGE);
 
   let sort = resource.defaultSort;
   const rawSort = params.get("sort");

package/templates/app/lib/resource/store.ts

@@ -206,8 +206,8 @@ export function createResourceStore(options: ResourceStoreOptions) {
     resource,
 
     /** `params`: page, perPage, sort, q, filter[field], cursor (as parsed by parseListQuery). */
-    async list(params: URLSearchParams): Promise<Result<ListResult>> {
-      const parsed = parseListQuery(resource, params);
+    async list(params: URLSearchParams, options: { maxPerPage?: number } = {}): Promise<Result<ListResult>> {
+      const parsed = parseListQuery(resource, params, options);
       if ("issues" in parsed) return fail(400, "Invalid query.", { queryIssues: parsed.issues });
       const { page, perPage, sort, q, filters, cursor } = parsed.query;
 

package/templates/next/app/dashboard/actions.ts

@@ -120,7 +120,9 @@ export async function exportRecordsAction(resourceName: string, query: string):
     const params = new URLSearchParams(query);
     params.set("page", String(page));
     params.set("perPage", String(EXPORT_PAGE));
-    const result = await store.list(params);
+    // A bigger page than a request from outside may ask for: this is the server
+    // paging through everything on purpose, and 500 round trips would be absurd.
+    const result = await store.list(params, { maxPerPage: EXPORT_PAGE });
     if (!result.ok) return result;
     rows.push(...result.data.data);
     if (page >= result.data.meta.totalPages) break;