rado 0.3.3 → 0.3.5

package/dist/define/Table.d.ts

@@ -1,6 +1,6 @@
 import { Callable } from '../util/Callable.js';
 import { Column, ColumnData, OptionalColumn, PrimaryColumn } from './Column.js';
-import { EV, Expr } from './Expr.js';
+import { EV, Expr, ExprData } from './Expr.js';
 import type { Fields } from './Fields.js';
 import { Index, IndexData } from './Index.js';
 import { SelectFirst, TableSelect } from './Query.js';
@@ -11,6 +11,7 @@ export declare class TableData {
     definition: {};
     columns: Record<string, ColumnData>;
     meta: () => {
+        primaryKey?: Array<ExprData>;
         indexes: Record<string, IndexData>;
     };
     constructor(data: TableData);
@@ -42,6 +43,7 @@ type UpdateOf<Definition> = Partial<{
 export declare namespace Table {
     export const Data: unique symbol;
     export const Indexes: unique symbol;
+    export const PrimaryKey: unique symbol;
     export type Of<Row> = TableOf<Row>;
     export type Select<Definition> = RowOf<Definition>;
     export type Update<Definition> = UpdateOf<Definition>;
@@ -64,8 +66,10 @@ export declare function createTable<Definition>(data: TableData): Table<Definiti
 export declare function table<T extends {}, Indexes extends Record<string, Index>>(define: {
     [key: string]: T | Define<T>;
     [Table.Indexes]?: (this: T) => Indexes;
+    [Table.PrimaryKey]?: (this: T) => Array<Column<any>>;
 }): {} extends Indexes ? Table<T> : IndexedTable<T, keyof Indexes>;
 export declare namespace table {
     const indexes: typeof Table.Indexes;
+    const primaryKey: typeof Table.PrimaryKey;
 }
 export {};

package/dist/define/Table.js

@@ -24,6 +24,7 @@ var Table;
 ((Table2) => {
   Table2.Data = Symbol("Table.Data");
   Table2.Indexes = Symbol("Table.Indexes");
+  Table2.PrimaryKey = Symbol("Table.PrimaryKey");
 })(Table || (Table = {}));
 function createTable(data) {
   const target = new Target.Table(data);
@@ -109,7 +110,10 @@ function table(define) {
       meta() {
         const createIndexes = define[Table.Indexes];
         const indexes = createIndexes ? createIndexes.apply(res) : {};
+        const createPrimaryKey = define[Table.PrimaryKey];
+        const primaryKey = createPrimaryKey ? createPrimaryKey.apply(res).map(ExprData.create) : void 0;
         return {
+          primaryKey,
           indexes: fromEntries(
             entries(indexes || {}).map(([key, index]) => {
               const indexName = `${name}.${key}`;
@@ -124,6 +128,7 @@ function table(define) {
 }
 ((table2) => {
   table2.indexes = Table.Indexes;
+  table2.primaryKey = Table.PrimaryKey;
 })(table || (table = {}));
 export {
   Table,

package/dist/lib/Formatter.js

@@ -201,10 +201,24 @@ class Formatter {
     stmt.add("CREATE TABLE");
     if (query.ifNotExists)
       stmt.add("IF NOT EXISTS");
-    stmt.addIdentifier(query.table.name);
-    for (const column of stmt.call(Object.values(query.table.columns))) {
+    stmt.addIdentifier(query.table.name).space();
+    stmt.openParenthesis();
+    for (const column of stmt.separate(Object.values(query.table.columns))) {
       this.formatColumn(ctx, column);
     }
+    const meta = query.table.meta();
+    if (meta.primaryKey) {
+      stmt.raw(",").newline().raw("PRIMARY KEY").space();
+      for (const expr of stmt.call(meta.primaryKey))
+        switch (expr.type) {
+          case ExprType.Field:
+            stmt.identifier(expr.field);
+            continue;
+          default:
+            throw new Error(`Cannot format index of type ${expr.type}`);
+        }
+    }
+    stmt.closeParenthesis();
     return stmt;
   }
   formatCreateIndex(ctx, query) {
@@ -475,11 +489,11 @@ class Formatter {
     return stmt;
   }
   formatLimit(ctx, { limit, offset, singleResult }) {
-    const { stmt, forceInline } = ctx;
+    const { stmt } = ctx;
     if (!limit && !offset && !singleResult)
       return stmt;
     stmt.addLine("LIMIT").space();
-    this.formatValue(ctx, singleResult ? 1 : limit);
+    this.formatValue(ctx, (singleResult ? 1 : limit) || -1);
     if (offset && offset > 0) {
       stmt.add("OFFSET").space();
       this.formatValue(ctx, offset);
@@ -593,7 +607,7 @@ class Formatter {
       case UnOpType.IsNull:
         return this.formatExprValue(ctx, expr.expr).add("IS NULL");
       case UnOpType.Not:
-        stmt.raw("NOT").openParenthesis();
+        stmt.raw("NOT").space().openParenthesis();
         this.formatExprValue(ctx, expr.expr);
         return stmt.closeParenthesis();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",