@alstar/studio 0.0.0-beta.5 → 0.0.0-beta.6

package/queries/getBlocks.ts

@@ -0,0 +1,214 @@
+import { DatabaseSync } from "node:sqlite";
+import { sql } from "../utils/sql.ts";
+
+// --- Field & block definitions ---
+type FieldType = 'text' | 'slug' | 'markdown' | 'blocks' | 'image';
+
+interface BaseField {
+  label: string;
+  type: FieldType;
+}
+
+interface TextField extends BaseField {
+  type: 'text' | 'slug' | 'markdown';
+}
+
+interface ImageField extends BaseField {
+  type: 'image';
+}
+
+interface BlocksField extends BaseField {
+  type: 'blocks';
+  children: Record<string, BlockDef>;
+}
+
+type FieldDef = TextField | ImageField | BlocksField;
+
+interface BlockDef {
+  label: string;
+  type: string;
+  fields: Record<string, FieldDef>;
+}
+
+// --- Identity helpers (preserve literal types) ---
+export function defineField<T extends FieldDef>(field: T) {
+  return field;
+}
+
+export function defineBlock<T extends BlockDef>(block: T) {
+  return block;
+}
+
+export function defineStructure<T extends Record<string, BlockDef>>(structure: T) {
+  return structure;
+}
+
+// --- Type mapping from structure to data ---
+type FieldToType<F extends FieldDef> =
+  F['type'] extends 'text' | 'slug' | 'markdown' ? string :
+  F['type'] extends 'image' ? string :
+  F['type'] extends 'blocks'
+    ? {
+        [K in keyof F['children']]: {
+          type: K;
+          data: BlockData<F['children'][K]>;
+        }
+      }[keyof F['children']][]
+    : never;
+
+type BlockData<B extends BlockDef> = {
+  [K in keyof B['fields']]: FieldToType<B['fields'][K]>;
+};
+
+type StructureData<S extends Record<string, BlockDef>> = {
+  [K in keyof S]: BlockData<S[K]>;
+};
+
+// This will be inferred after you define your structure
+export type CMSData<S extends Record<string, BlockDef>> = StructureData<S>;
+
+
+interface DBBase {
+  id: number;
+  created_at: string;
+  updated_at: string;
+  name: string;
+  label: string;
+  type: string;
+  sort_order: number;
+  value: string | null;
+  options: any;
+  status: string;
+  parent_id: number | null;
+}
+
+export function buildTypedForest<
+  S extends Record<string, BlockDef>,
+  K extends keyof S
+>(
+  rows: DBBase[],
+  rootDef: S[K]
+): CMSData<S>[K][] {
+  const map = new Map<number, DBBase & { children: DBBase[] }>();
+
+  // Initialize with children arrays
+  for (const r of rows) {
+    map.set(r.id, { ...r, children: [] });
+  }
+
+  // Link children to parents
+  const roots: (DBBase & { children: DBBase[] })[] = [];
+  for (const r of rows) {
+    const node = map.get(r.id)!;
+    if (r.parent_id === null) {
+      roots.push(node);
+    } else {
+      const parent = map.get(r.parent_id);
+      if (parent) parent.children.push(node);
+    }
+  }
+
+  // Recursive transformer: maps a DB row into typed data
+  function transformNode<D extends FieldDef | BlockDef>(
+    node: DBBase & DBBase['type'] extends 'blocks' ? { children: DBBase[] } : {},
+    def: D
+  ): any {
+    if ('fields' in def) {
+      // It's a BlockDef
+      const result: any = {};
+      for (const key in def.fields) {
+        const fieldDef = def.fields[key];
+        const childNode = node.children.find(c => c.name === key);
+        result[key] = childNode
+          ? transformNode(childNode, fieldDef)
+          : getDefaultValue(fieldDef);
+      }
+      return result;
+    } else {
+      // It's a FieldDef
+      if (def.type === 'text' || def.type === 'slug' || def.type === 'markdown') {
+        return node.value ?? '';
+      }
+      if (def.type === 'image') {
+        return node.value ?? '';
+      }
+      if (def.type === 'blocks') {
+        return node.children.map(child => {
+          const childDef = def.children[child.name as keyof typeof def.children];
+          return {
+            type: child.name as keyof typeof def.children,
+            data: transformNode(child, childDef)
+          };
+        });
+      }
+    }
+  }
+
+  // Provide safe defaults for missing fields
+  function getDefaultValue(fieldDef: FieldDef): any {
+    if (fieldDef.type === 'blocks') return [];
+    return '';
+  }
+
+  // Map all root nodes into typed data
+  return roots.map(root => transformNode(root, rootDef));
+}
+
+
+function rootQuery(filterSql: string, depthLimit?: number) {
+  const depthLimitClause =
+    depthLimit !== undefined ? `WHERE d.depth + 1 <= ${depthLimit}` : '';
+
+  return sql`
+    with recursive
+      ancestors as (
+        select
+          id, created_at, updated_at, name, label, type, sort_order, value, options, status, parent_id,
+          0 as depth
+        from blocks
+        where ${filterSql}
+        union all
+        select
+          b.id, b.created_at, b.updated_at, b.name, b.label, b.type, b.sort_order, b.value, b.options, b.status, b.parent_id,
+          a.depth + 1
+        from blocks b
+        inner join ancestors a on b.id = a.parent_id
+      ),
+      roots as (
+        select * from ancestors where parent_id is null
+      ),
+      descendants as (
+        select * from roots
+        union all
+        select
+          b.id, b.created_at, b.updated_at, b.name, b.label, b.type, b.sort_order, b.value, b.options, b.status, b.parent_id,
+          d.depth + 1
+        from blocks b
+        inner join descendants d on b.parent_id = d.id ${depthLimitClause}
+      )
+    select * from descendants
+    order by parent_id, sort_order
+  `;
+}
+
+export function queryTypedRoot<
+  S extends Record<string, BlockDef>,
+  K extends keyof S
+>(
+  db: DatabaseSync,
+  structure: S,
+  blockType: K,
+  opts: { id?: number; depthLimit?: number }
+): CMSData<S>[K][] {
+  let filterSql: string;
+  if (opts.id !== undefined) {
+    filterSql = `id = ${opts.id}`;
+  } else {
+    filterSql = `type = '${String(structure[blockType].type)}'`;
+  }
+
+  const sql = rootQuery(filterSql, opts.depthLimit);
+  const rows = db.prepare(sql).all() as unknown as DBBase[];
+
+  return buildTypedForest(rows, structure[blockType]);
+}

package/queries/index.ts

@@ -1 +1,2 @@
 export * as query from './block.ts'
+export { getBlockTrees } from './getBlockTrees.ts'

package/queries/structure-types.ts

@@ -0,0 +1,97 @@
+// structure-types.ts
+import { type DBBase } from "./db-types.ts";
+
+/**
+ * Extract helpers
+ */
+type ArrayElement<T> = T extends readonly (infer U)[] ? U : never;
+
+/**
+ * Field definition shape inferred from defineField(...) (the runtime helper)
+ * We keep it generic as "any" shape but with the important properties present
+ */
+type FieldDef = {
+  readonly name: string;
+  readonly type: string;
+  readonly fields?: readonly any[]; // only present when type === 'blocks'
+};
+
+/**
+ * Block definition shape inferred from defineBlock(...) (the runtime helper)
+ */
+type BlockDef = {
+  readonly name: string;
+  readonly type: string;
+  readonly fields?: readonly FieldDef[];
+};
+
+/**
+ * Primitive field node (non-'blocks'): DBBase + kept fields but no children
+ */
+type PrimitiveFieldNode<TField extends FieldDef> =
+  DBBase & {
+    readonly name: TField["name"];
+    readonly type: TField["type"];
+    // no children (leaf), no nested fields
+    readonly children?: [];
+    readonly fields?: {}; // empty object for leaf
+  };
+
+/**
+ * For 'blocks' typed field, we need:
+ * - the block node representing the 'blocks' wrapper (has DBBase props)
+ * - its 'children' are an array of BlockNodes corresponding to nested block defs supplied in the field's 'fields' array
+ * - its 'fields' property is the mapping of its own child-field names (can be empty)
+ */
+type BlocksFieldNode<
+  TField extends FieldDef,
+  TFieldDefs extends readonly BlockDef[]
+> = DBBase & {
+  readonly name: TField["name"];      // e.g. "blocks" or "images"
+  readonly type: "blocks";            // literally 'blocks'
+  readonly children: BlockNodeFromBlockDefs<TFieldDefs>[]; // children are instances of the nested blocks
+  readonly fields: FieldsFromFieldDefs<TFieldDefs[number]["fields"]>; // the blocks-wrapper's own fields mapping (if any)
+};
+
+/**
+ * Build the 'fields' object for a set of FieldDef[].
+ * Maps each field name -> either PrimitiveFieldNode or BlocksFieldNode recursively.
+ */
+type FieldsFromFieldDefs<TDefs> =
+  // If no fields
+  TDefs extends readonly any[]
+    ? {
+        // For each field F in TDefs, map F['name'] -> node type
+        [F in ArrayElement<TDefs> as F extends { name: infer N extends string } ? N : never]:
+          F extends { type: "blocks"; fields: readonly BlockDef[] }
+            ? BlocksFieldNode<F, F["fields"]>
+            : PrimitiveFieldNode<F>;
+      }
+    : {};
+
+/**
+ * A Block node type for a particular BlockDef.
+ * - fields: mapping derived from the block's declared fields
+ * - children: by default [], because in our final shape all immediate children are placed under 'fields' of the parent.
+ *   BUT for nodes that are themselves 'blocks' wrappers (i.e. appear as a Block instance of a nested block def),
+ *   their 'children' will contain actual child blocks (these are handled via BlocksFieldNode above).
+ */
+export type BlockNode<T extends BlockDef> = DBBase & {
+  readonly name: T["name"];
+  readonly type: T["type"];
+  readonly fields: FieldsFromFieldDefs<T["fields"]>;
+  // for regular block nodes, children will usually be [] (top-level parent's children moved into fields)
+  readonly children: [];
+};
+
+/**
+ * Construct BlockNode unions for a set of block defs (used when blocks field has multiple block subdefs)
+ */
+type BlockNodeFromBlockDefs<TDefs extends readonly BlockDef[]> =
+  ArrayElement<TDefs> extends infer B ? (B extends BlockDef ? BlockNode<B> : never) : never;
+
+/**
+ * The top-level forest return type when you pass a structure: it's an array of BlockNode of any top-level BlockDef
+ */
+export type BlockTreeFromStructure<TStructure extends readonly BlockDef[]> =
+  BlockNodeFromBlockDefs<TStructure>;

package/schemas.ts

@@ -7,11 +7,22 @@ export const blocksTable = {
     name TEXT not null,
     label TEXT not null,
     type TEXT not null,
-    sort_order INTEGER not null default 0,
     value TEXT,
     options JSON,
     status TEXT default 'enabled',
-    parent_block_id INTEGER,
-    foreign key (parent_block_id) references blocks (id)
+    sort_order INTEGER not null default 0,
+    _depth INTEGER,
+    parent_id INTEGER,
+    foreign key (parent_id) references blocks (id)
+  `,
+}
+
+// -- API keys
+export const apiKeysTable = {
+  tableName: 'api_keys',
+  columns: sql`
+    name TEXT not null,
+    value TEXT,
+    hint TEXT
   `,
 }

package/types.ts

@@ -3,14 +3,92 @@ import { type Context } from 'hono'
 import { type HonoOptions } from 'hono/hono-base'
 import { type BlankInput, type BlankEnv } from 'hono/types'
 
+export type PrimitiveField = {
+  name: string
+  label: string
+  type: 'text' | 'slug' | 'markdown' | 'image'
+}
+
+export type BlockField = {
+  name: string
+  label: string
+  type: 'blocks'
+  children: Record<string, Field | Block>
+}
+
+export type Field = PrimitiveField | BlockField
+
 export type Block = {
   name: string
   label: string
   type: string
-  fields?: Block[]
+  fields: Record<string, Field | Block>
 }
 
-export type Structure = Block[]
+export type Structure = Record<string, BlockDef>
+
+// --- Field & block definitions ---
+type FieldType = 'text' | 'slug' | 'markdown' | 'blocks' | 'image';
+
+interface BaseField {
+  label: string;
+  type: FieldType;
+  description?: string
+}
+
+interface TextField extends BaseField {
+  type: 'text' | 'slug' | 'markdown';
+}
+
+interface ImageField extends BaseField {
+  type: 'image';
+}
+
+export interface BlocksField extends BaseField {
+  type: 'blocks';
+  children: Record<string, BlockDef | FieldDef>;
+}
+
+export type FieldDef = TextField | ImageField | BlocksField;
+
+export interface BlockDef {
+  label: string;
+  type: string;
+  fields: Record<string, FieldDef>;
+  description?: string
+}
+
+type DBDefaults = {
+  id: number
+  created_at: string
+  updated_at: string
+  name: string
+  label: string
+  // type: string
+  sort_order: number
+  value: string
+  options: string | null
+  status: 'enabled' | 'disabled'
+  parent_id: number | null
+  depth: number
+}
+
+export type DBBlockResult = {
+  id: number
+  created_at: string
+  updated_at: string
+  name: string
+  label: string
+  type: string
+  sort_order: number
+  value: string | null
+  options: any
+  status: string
+  parent_id: number | null
+  depth: number
+  children?: DBBlockResult[]
+  fields?: Record<string, DBBlockResult>
+}
 
 export type DBBlock = Block & {
   id: number
@@ -18,17 +96,18 @@ export type DBBlock = Block & {
   updated_at: string
   value: string | null
   sort_order: number | null
-  parent_block_id: number | null
+  parent_id: number | null
   options: number | null
 }
 
+export type BlockStatus = 'enabled' | 'disabled'
+
 export type StudioConfig = {
   siteName: string
   honoConfig?: HonoOptions<BlankEnv>
+  structure: Structure
 }
 
-export type BlockStatus = 'enabled' | 'disabled'
-
 export type RequestContext = Context<
   { Bindings: HttpBindings },
   string,

package/utils/buildBlocksTree.ts

@@ -6,7 +6,7 @@ type Block = {
   sort_order: number
   value: string | null
   options: any // JSON-parsed if necessary
-  parent_block_id: number | null
+  parent_id: number | null
   depth: number
   // ... you can add other fields if needed
 }
@@ -26,13 +26,13 @@ export function buildBlockTree(blocks: Block[]): BlockWithChildren {
   for (const block of blocks) {
     const current = blockMap.get(block.id)!
 
-    if (block.parent_block_id != null) {
-      const parent = blockMap.get(block.parent_block_id)
+    if (block.parent_id != null) {
+      const parent = blockMap.get(block.parent_id)
       if (parent) {
         parent.fields.push(current)
       } else {
         console.warn(
-          `Parent with id ${block.parent_block_id} not found for block ${block.id}`,
+          `Parent with id ${block.parent_id} not found for block ${block.id}`,
         )
       }
     } else {

package/utils/define.ts

@@ -1,15 +1,29 @@
-import { type Context } from 'hono'
 import * as types from '../types.ts'
-import { type HttpBindings } from '@hono/node-server'
-import { type BlankInput } from 'hono/types'
 import { type HtmlEscapedString } from './html.ts'
 
 export const defineConfig = (config: types.StudioConfig) => config
 
-export const defineStructure = (structure: types.Structure) => structure
+// export const defineStructure = (structure: types.Block[]) => structure
+// export const defineField = (field: types.Field) => field
+// export const defineBlock = (block: types.Block) => block
 
 export const defineEntry = (
   fn: (
     c: types.RequestContext,
   ) => HtmlEscapedString | Promise<HtmlEscapedString>,
 ) => fn
+
+// --- Identity helpers (preserve literal types) ---
+export function defineField(field: types.FieldDef) {
+  return field
+}
+
+export function defineBlock(block: types.BlockDef) {
+  return block
+}
+
+export function defineStructure(
+  structure: Record<string, types.BlockDef>,
+) {
+  return structure
+}

package/utils/get-or-create-row.ts

@@ -0,0 +1,28 @@
+import { db } from '@alstar/db'
+import { query } from '../queries/index.ts'
+import type { Block, FieldDef } from '../types.ts'
+
+export function getOrCreateRow(
+  parentId: string | number,
+  name: string,
+  field: Block | FieldDef,
+  sortOrder: number,
+) {
+  const data = query.block({
+    parent_id: parentId?.toString() || null,
+    name: name,
+    sort_order: sortOrder.toString(),
+  })
+
+  if (data) return data
+
+  const change = db.insertInto('blocks', {
+    name: name?.toString(),
+    label: field.label?.toString(),
+    type: field.type?.toString(),
+    sort_order: sortOrder,
+    parent_id: parentId,
+  })
+
+  return query.block({ id: change.lastInsertRowid.toString() })
+}

package/utils/startup-log.ts

@@ -0,0 +1,9 @@
+import packageJSON from '../package.json' with { type: 'json' }
+
+export default () => {
+  console.log('\x1b[32m%s\x1b[0m', '╭───────────────────────╮')
+  console.log('\x1b[32m%s\x1b[0m', '│ Alstar Studio         │')
+  console.log('\x1b[32m%s\x1b[0m', `│ ${packageJSON.version}${' '.repeat(22 - packageJSON.version.length)}│`)
+  console.log('\x1b[32m%s\x1b[0m', `│ http://localhost:${3000} │`)
+  console.log('\x1b[32m%s\x1b[0m', '╰───────────────────────╯')
+}

package/components/AdminPanel/AdminPanel.css

@@ -1,78 +0,0 @@
-.admin-panel {
-  /* background: hsla(0, 0%, 0%, 0.1); */
-  padding: 40px;
-
-  height: 100%;
-  min-height: inherit;
-
-  min-width: 250px;
-
-  > h1 {
-    padding-bottom: 1rem;
-
-    a {
-      display: flex;
-    }
-
-    svg {
-      height: 1.6rem;
-    }
-  }
-
-  form {
-    padding-bottom: 1rem;
-
-    button {
-      margin: 10px 0px 20px;
-    }
-  }
-
-  #entries ul {
-    padding: 0;
-    margin-inline: -1rem;
-
-    form {
-      display: flex;
-      padding-bottom: 0;
-
-      button {
-        margin: 0;
-      }
-    }
-
-    > li {
-      margin-bottom: 0px;
-      border-radius: 8px;
-      display: flex;
-      justify-content: space-between;
-      align-items: stretch;
-      list-style: none;
-
-      a {
-        text-decoration: none;
-        width: 100%;
-        padding: 0.5rem 1rem;
-      }
-
-      button {
-        border-radius: 7px;
-        opacity: 0;
-        transition: opacity 100px;
-
-        svg {
-          margin: 0.5rem 1rem;
-        }
-      }
-    }
-  }
-}
-
-#entries ul {
-  > li:hover {
-    background-color: var(--pico-form-element-background-color);
-
-    button {
-      opacity: 1;
-    }
-  }
-}