sasat 0.19.18 → 0.19.20

package/lib/generatorv2/codegen/ts/generateAutoGeneratedDatasource.js

@@ -67,7 +67,7 @@ const makeDefaultValueMethod = (node) => {
     return tsg
         .method('getDefaultValueString', [], columns.length !== 0
         ? tsg.typeRef(node.name.name).pick(...columns.map(it => it.fieldName))
-        : tsg.typeRef('Record<string, never>'), [body])
+        : tsg.typeRef(node.name.name).partial(), [body])
         .modifiers(tsg.methodModifiers().protected());
 };
 const makeFindMethods = (node) => {

package/lib/index.d.ts

@@ -16,6 +16,7 @@ export type { TypeFieldDefinition } from './generatorv2/codegen/ts/scripts/typeD
 export type { SasatMigration } from './migration/front/migration.js';
 export type { CommandResponse, QueryResponse, } from './db/connectors/dbClient.js';
 export { QExpr } from './runtime/dsl/factory.js';
+export { QExpr as qe } from './runtime/dsl/factory.js';
 export { gqlResolveInfoToField } from './runtime/gqlResolveInfoToField.js';
 export { SasatDBDatasource, EntityResult, EntityType, ListQueryOption, QueryOptions, } from './runtime/sasatDBDatasource.js';
 export { getCurrentDateTimeString } from './util/dateUtil.js';

package/lib/index.js

@@ -3,6 +3,7 @@ export { Queries } from './migration/makeQuery.js';
 export { Mutations } from './migration/makeMutaion.js';
 export { Conditions } from './migration/makeCondition.js';
 export { QExpr } from './runtime/dsl/factory.js';
+export { QExpr as qe } from './runtime/dsl/factory.js';
 export { gqlResolveInfoToField } from './runtime/gqlResolveInfoToField.js';
 export { SasatDBDatasource, } from './runtime/sasatDBDatasource.js';
 export { getCurrentDateTimeString } from './util/dateUtil.js';

package/lib/migration/controller.js

@@ -10,6 +10,7 @@ export class MigrationController {
     async migrate(options) {
         const fileNames = await compileMigrationFiles();
         const currentMigration = await getCurrentMigration();
+        Console.log('--current migration--: ' + currentMigration);
         let store = await createCurrentMigrationDataStore(currentMigration);
         const target = getMigrationTargets(fileNames, currentMigration);
         for (const tsFileName of target.files) {

package/lib/migration/creators/createColumn.d.ts

@@ -0,0 +1,20 @@
+import { DateColumnBuilder, DecimalColumnBuilder, FloatColumnBuilder, IntegerColumnBuilder, StringColumnBuilder, TextColumnBuilder, TimeStampColumnBuilder } from './columnBuilder.js';
+export type CreateColumn = {
+    char: (length: number) => StringColumnBuilder;
+    varchar: (length: number) => StringColumnBuilder;
+    text: () => TextColumnBuilder;
+    tinyInt: (length?: number) => IntegerColumnBuilder;
+    smallInt: (length?: number) => IntegerColumnBuilder;
+    mediumInt: (length?: number) => IntegerColumnBuilder;
+    int: (length?: number) => IntegerColumnBuilder;
+    bigInt: (length?: number) => IntegerColumnBuilder;
+    float: (length?: number, scale?: number) => FloatColumnBuilder;
+    double: (length?: number, scale?: number) => FloatColumnBuilder;
+    decimal: (length?: number, scale?: number) => DecimalColumnBuilder;
+    year: () => DateColumnBuilder;
+    date: () => DateColumnBuilder;
+    time: () => DateColumnBuilder;
+    dateTime: () => TimeStampColumnBuilder;
+    timestamp: () => TimeStampColumnBuilder;
+};
+export declare const createColumn: (name: string) => CreateColumn;

package/lib/migration/creators/createColumn.js

@@ -0,0 +1,20 @@
+import { DateColumnBuilder, DecimalColumnBuilder, FloatColumnBuilder, IntegerColumnBuilder, StringColumnBuilder, TextColumnBuilder, TimeStampColumnBuilder, } from './columnBuilder.js';
+import { DBColumnTypes } from '../column/columnTypes.js';
+export const createColumn = (name) => ({
+    char: (length) => new StringColumnBuilder(name, DBColumnTypes.char, length),
+    varchar: (length) => new StringColumnBuilder(name, DBColumnTypes.varchar, length),
+    text: () => new TextColumnBuilder(name, DBColumnTypes.text),
+    tinyInt: (length) => new IntegerColumnBuilder(name, DBColumnTypes.tinyInt, length),
+    smallInt: (length) => new IntegerColumnBuilder(name, DBColumnTypes.smallInt, length),
+    mediumInt: (length) => new IntegerColumnBuilder(name, DBColumnTypes.mediumInt, length),
+    int: (length) => new IntegerColumnBuilder(name, DBColumnTypes.int, length),
+    bigInt: (length) => new IntegerColumnBuilder(name, DBColumnTypes.bigInt, length),
+    float: (length, scale) => new FloatColumnBuilder(name, DBColumnTypes.float, length, scale),
+    double: (length, scale) => new FloatColumnBuilder(name, DBColumnTypes.double, length, scale),
+    decimal: (length, scale) => new DecimalColumnBuilder(name, DBColumnTypes.decimal, length, scale),
+    year: () => new DateColumnBuilder(name, DBColumnTypes.year),
+    date: () => new DateColumnBuilder(name, DBColumnTypes.date),
+    time: () => new DateColumnBuilder(name, DBColumnTypes.time),
+    dateTime: () => new TimeStampColumnBuilder(name, DBColumnTypes.dateTime),
+    timestamp: () => new TimeStampColumnBuilder(name, DBColumnTypes.timestamp),
+});

package/lib/migration/exec/getCurrentMigration.js

@@ -28,11 +28,11 @@ export const getCurrentMigration = async () => {
         "direction enum('up', 'down') not null, migrated_at timestamp default current_timestamp)");
     const result = await client.rawQuery(`SELECT name, direction
      FROM ${migrationTable}
-     ORDER BY migrated_at ASC LIMIT 1`);
+     ORDER BY id ASC`);
     if (!result.length)
         return;
     const runs = calcRunMigrationFileNames(result);
-    if (runs.length)
+    if (runs.length === 0)
         return;
     runs.forEach((run, i) => {
         if (files[i] !== run)
@@ -41,6 +41,5 @@ Invalid migration order: Migration must be performed in the same order
 Found               : ${files[i]} 
 in migration history: ${run}`);
     });
-    console.log(runs[runs.length - 1]);
     return runs[runs.length - 1];
 };

package/lib/migration/front/tableMigrator.d.ts

@@ -6,10 +6,13 @@ import { BaseColumn } from '../serializable/column.js';
 import { SerializedTable } from '../serialized/serializedStore.js';
 import { DBType } from '../column/columnTypes.js';
 import { DBIndex } from '../data/index.js';
+import { CreateColumn } from '../creators/createColumn.js';
+import { ColumnBuilder } from '../creators/columnBuilder.js';
 export interface MigrationTable extends Table {
     addIndex(...columns: string[]): MigrationTable;
     removeIndex(...columns: string[]): MigrationTable;
-    addColumn(column: SerializedColumn): MigrationTable;
+    addColumn(name: string, create: (column: CreateColumn) => ColumnBuilder): MigrationTable;
+    _addColumn(column: SerializedColumn): MigrationTable;
     dropColumn(columnName: string): MigrationTable;
     addForeignKey(reference: Reference): MigrationTable;
     changeColumnType(columnName: string, type: DBType): MigrationTable;
@@ -32,7 +35,8 @@ export declare class TableMigrator implements MigrationTable {
     serialize(): SerializedTable;
     addIndex(...columns: string[]): MigrationTable;
     removeIndex(...columns: string[]): MigrationTable;
-    addColumn(column: SerializedNormalColumn): MigrationTable;
+    _addColumn(column: SerializedNormalColumn): MigrationTable;
+    addColumn(name: string, create: (column: CreateColumn) => ColumnBuilder): MigrationTable;
     dropColumn(columnName: string): MigrationTable;
     enableGQL(): MigrationTable;
     setGQLOption(option: GQLOption): MigrationTable;

package/lib/migration/front/tableMigrator.js

@@ -3,6 +3,7 @@ import { NormalColumn, } from '../serializable/column.js';
 import { SqlCreator } from '../../db/sql/sqlCreater.js';
 import { SqlString } from '../../runtime/sql/sqlString.js';
 import { DBIndex } from '../data/index.js';
+import { createColumn } from '../creators/createColumn.js';
 export class TableMigrator {
     constructor(table, store) {
         this.table = table;
@@ -41,11 +42,15 @@ export class TableMigrator {
         this.store.addQuery(new DBIndex(this.tableName, columns).dropSql());
         return this;
     }
-    addColumn(column) {
+    _addColumn(column) {
         this.table.addColumn(new NormalColumn(column, this.table));
         this.store.addQuery(SqlCreator.addColumn(this.tableName, column));
         return this;
     }
+    addColumn(name, create) {
+        const column = create(createColumn(name)).build();
+        return this._addColumn(column.data);
+    }
     dropColumn(columnName) {
         this.table.dropColumn(columnName);
         this.store.addQuery(SqlCreator.dropColumn(this.tableName, columnName));

package/lib/runtime/dsl/factory.d.ts

@@ -1,7 +1,43 @@
 import { BetweenExpression, BooleanValueExpression, ComparisonExpression, Field, Fn, InExpression, IsNullExpression, Join, JoinType, Literal, ParenthesisExpression, Query, QueryTable, Sort, SortDirection, Value } from './query/query.js';
 import { ComparisonOperators } from '../../db/sql/expression/comparison.js';
+type ValueType = string | boolean | number | null;
 export declare const QExpr: {
+    readonly field: (table: string, name: string, alias?: string) => Field;
+    readonly fn: (fnName: string, args: Value[]) => Fn;
+    readonly paren: (expression: BooleanValueExpression) => ParenthesisExpression;
+    readonly table: (name: string, joins: Join[], alias: string) => QueryTable;
+    readonly subQueryTable: (query: Query, joins: Join[], alias: string) => QueryTable;
+    readonly join: (table: QueryTable, conditions: BooleanValueExpression, type?: JoinType) => Join;
+    readonly value: (value: ValueType) => Literal;
+    readonly sort: (field: Field, direction: SortDirection) => Sort;
+    readonly order: (field: Field, direction: SortDirection) => Sort;
+    readonly simpleWhere: (tableNameOrAlias: string, where: {
+        [field: string]: ValueType | [ComparisonOperators, ValueType];
+    }, isOr?: boolean) => BooleanValueExpression;
+    readonly and: (...expr: Array<BooleanValueExpression | undefined | null>) => BooleanValueExpression;
+    readonly or: (...expr: Array<BooleanValueExpression | undefined | null>) => BooleanValueExpression;
+    readonly eq: (left: Value, right: Value) => ComparisonExpression;
+    readonly neq: (left: Value, right: Value) => ComparisonExpression;
+    readonly gt: (left: Value, right: Value) => ComparisonExpression;
+    readonly gte: (left: Value, right: Value) => ComparisonExpression;
+    readonly lt: (left: Value, right: Value) => ComparisonExpression;
+    readonly lte: (left: Value, right: Value) => ComparisonExpression;
+    readonly comparison: (left: Value, operator: ComparisonOperators, right: Value) => ComparisonExpression;
+    readonly contains: (left: Value, right: string) => BooleanValueExpression;
+    readonly notContains: (left: Value, right: string) => BooleanValueExpression;
+    readonly statsWiths: (left: Value, right: string) => BooleanValueExpression;
+    readonly notStatsWiths: (left: Value, right: string) => BooleanValueExpression;
+    readonly endsWiths: (left: Value, right: string) => BooleanValueExpression;
+    readonly notEndsWiths: (left: Value, right: string) => BooleanValueExpression;
+    readonly In: (left: Value, values: (string | number)[]) => InExpression;
+    readonly notIn: (left: Value, values: (string | number)[]) => InExpression;
+    readonly between: (left: Value, begin: Value, end: Value) => BetweenExpression;
+    readonly isNull: (expr: Value) => IsNullExpression;
+    readonly isNotNull: (expr: Value) => IsNullExpression;
     readonly conditions: {
+        simpleWhere: (tableNameOrAlias: string, where: {
+            [field: string]: ValueType | [ComparisonOperators, ValueType];
+        }, isOr?: boolean) => BooleanValueExpression;
         and: (...expr: Array<BooleanValueExpression | undefined | null>) => BooleanValueExpression;
         or: (...expr: Array<BooleanValueExpression | undefined | null>) => BooleanValueExpression;
         eq: (left: Value, right: Value) => ComparisonExpression;
@@ -23,13 +59,5 @@ export declare const QExpr: {
         isNull: (expr: Value) => IsNullExpression;
         isNotNull: (expr: Value) => IsNullExpression;
     };
-    readonly field: (table: string, name: string, alias?: string) => Field;
-    readonly fn: (fnName: string, args: Value[]) => Fn;
-    readonly paren: (expression: BooleanValueExpression) => ParenthesisExpression;
-    readonly table: (name: string, joins: Join[], alias: string) => QueryTable;
-    readonly subQueryTable: (query: Query, joins: Join[], alias: string) => QueryTable;
-    readonly join: (table: QueryTable, conditions: BooleanValueExpression, type?: JoinType) => Join;
-    readonly value: (value: string | boolean | number | null) => Literal;
-    readonly sort: (field: Field, direction: SortDirection) => Sort;
-    readonly order: (field: Field, direction: SortDirection) => Sort;
 };
+export {};

package/lib/runtime/dsl/factory.js

@@ -61,7 +61,17 @@ const isNull = (isNot) => (expr) => ({
     expr,
     isNot,
 });
+const simpleWhere = (tableNameOrAlias, where, isOr = false) => {
+    const compound = isOr ? or : and;
+    return compound(...Object.entries(where).map(([f, value]) => {
+        const fe = field(tableNameOrAlias, f);
+        if (Array.isArray(value))
+            return comparison(value[0])(fe, literal(value[1]));
+        return conditions.eq(fe, literal(value));
+    }));
+};
 const conditions = {
+    simpleWhere,
     and,
     or,
     eq: comparison('='),
@@ -114,6 +124,7 @@ const sort = (field, direction) => ({
 });
 export const QExpr = {
     conditions,
+    ...conditions,
     field,
     fn,
     paren,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.19.18",
+  "version": "0.19.20",
   "repository": "https://github.com/nin138/sasat.git",
   "author": "nin138 <ninian138@gmail.com>",
   "license": "MIT",