rado 0.1.17 → 0.1.19

package/dist/lib/Column.d.ts

@@ -1,4 +1,4 @@
-import { Expr, ExprData } from './Expr';
+import { EV, Expr, ExprData } from './Expr';
 export declare enum ColumnType {
     String = "String",
     Integer = "Integer",
@@ -10,7 +10,7 @@ interface PartialColumnData {
     type: ColumnType;
     name?: string;
     nullable?: boolean;
-    defaultValue?: any;
+    defaultValue?: ExprData;
     autoIncrement?: boolean;
     primaryKey?: boolean;
     unique?: boolean;
@@ -29,7 +29,7 @@ export declare class Column<T> {
     primaryKey<K extends string>(): Column<Column.IsPrimary<T, K>>;
     references(column: Expr<T>): Column<T>;
     unique(): Column<T>;
-    defaultValue(value: T): Column<Column.IsOptional<T>>;
+    defaultValue(value: EV<T>): Column<Column.IsOptional<T>>;
 }
 export type PrimaryKey<T, K> = string extends K ? T : T & {
     [Column.isPrimary]: K;

package/dist/lib/Column.js

@@ -31,7 +31,7 @@ var Column = class {
     return new Column({ ...this.data, unique: true });
   }
   defaultValue(value) {
-    return new Column({ ...this.data, defaultValue: value });
+    return new Column({ ...this.data, defaultValue: ExprData.create(value) });
   }
 };
 ((Column2) => {

package/dist/lib/Formatter.js

@@ -167,8 +167,13 @@ var Formatter = class {
   }
   formatColumn(column) {
     return identifier(column.name).add(this.formatType(column.type)).addIf(column.unique, "UNIQUE").addIf(column.autoIncrement, "AUTOINCREMENT").addIf(column.primaryKey, "PRIMARY KEY").addIf(!column.nullable, "NOT NULL").addIf(
-      column.defaultValue !== void 0,
-      raw("DEFAULT").add(this.formatInlineValue(column.defaultValue))
+      column.defaultValue,
+      () => raw("DEFAULT").addParenthesis(
+        this.formatExpr(column.defaultValue, {
+          formatAsJson: false,
+          forceInline: true
+        })
+      )
     ).addIf(column.references, () => {
       return this.formatContraintReference(column.references);
     });
@@ -205,8 +210,10 @@ var Formatter = class {
   }
   formatColumnValue(column, columnValue) {
     const isNull = columnValue === void 0 || columnValue === null;
-    const isOptional = column.nullable || column.autoIncrement || column.primaryKey || column.defaultValue !== void 0;
+    const isOptional = column.nullable || column.autoIncrement || column.primaryKey;
     if (isNull) {
+      if (column.defaultValue !== void 0)
+        return this.formatExpr(column.defaultValue, {});
       if (!isOptional)
         throw new TypeError(`Expected value for column ${column.name}`);
       return raw("NULL");
@@ -324,14 +331,15 @@ var Formatter = class {
             const column = expr.target.table.columns[field];
             switch (column?.type) {
               case ColumnType.Json:
-                return call("json", selection);
+                if (ctx.formatAsJson)
+                  return call("json", selection);
               default:
                 return selection;
             }
         }
       default:
         return this.formatAccess(
-          this.formatExpr(expr, { ...ctx, formatAsJson: true }),
+          this.formatExpr(expr, ctx),
           field,
           ctx.formatAsJson
         );

package/dist/lib/Schema.js

@@ -10,6 +10,9 @@ var Schema;
     return Query.Batch({ queries });
   }
   Schema2.create = create;
+  function removeLeadingWhitespace(str) {
+    return str.replace(/\n\s+/g, "\n");
+  }
   function upgrade(formatter, local, schema) {
     const columnNames = /* @__PURE__ */ new Set([
       ...Object.keys(local.columns),
@@ -25,7 +28,7 @@ var Schema;
         res.push(Query.AlterTable({ table: schema, dropColumn: columnName }));
       } else {
         const [instruction] = formatter.formatColumn({ ...schemaCol, references: void 0 }).compile(formatter);
-        if (localInstruction !== instruction) {
+        if (removeLeadingWhitespace(localInstruction) !== removeLeadingWhitespace(instruction)) {
           res.push(Query.AlterTable({ table: schema, alterColumn: schemaCol }));
         }
       }
@@ -45,7 +48,7 @@ var Schema;
         const [instruction] = formatter.formatCreateIndex(
           Query.CreateIndex({ table: schema, index: schemaIndex })
         ).compile(formatter);
-        if (localInstruction !== instruction) {
+        if (removeLeadingWhitespace(localInstruction) !== removeLeadingWhitespace(instruction)) {
           res.push(Query.DropIndex({ table: schema, name: indexName }));
           res.push(Query.CreateIndex({ table: schema, index: schemaIndex }));
         }

package/dist/lib/Statement.d.ts

@@ -16,6 +16,10 @@ declare class Token {
     static Identifier(data: string): Token;
     static Value(data: any): Token;
 }
+export interface CompileOptions {
+    formatInline?: boolean;
+    spaces?: number;
+}
 export declare class Statement {
     tokens: Array<Token>;
     constructor(tokens: Array<Token>);
@@ -30,7 +34,7 @@ export declare class Statement {
     addIf(condition: any, addition: string | Statement | (() => string | Statement)): Statement;
     indent(): Statement;
     dedent(): Statement;
-    newline(): Statement;
+    newline(ignore?: boolean): Statement;
     identifier(name: string): Statement;
     addIdentifier(name: string): Statement;
     value(value: any): Statement;

package/dist/lib/Statement.js

@@ -76,7 +76,9 @@ var Statement = class {
   dedent() {
     return this.concat(Token.Dedent());
   }
-  newline() {
+  newline(ignore = false) {
+    if (ignore)
+      return this;
     return this.raw(NEWLINE);
   }
   identifier(name) {

package/dist/sqlite/SqliteSchema.js

@@ -28,7 +28,7 @@ var SqliteSchema;
       column.name,
       identifier(column.name).add(column.type).addIf(column.pk === 1, "PRIMARY KEY").addIf(column.notnull === 1, "NOT NULL").addIf(
         column.dflt_value !== null,
-        raw("DEFAULT").add(column.dflt_value)
+        raw("DEFAULT").addParenthesis(column.dflt_value)
       ).compile(formatter)[0]
     ];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "license": "MIT",
   "type": "module",
   "exports": {