sasat 0.19.15 → 0.19.17

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

@@ -28,7 +28,7 @@ ${new ImportDeclaration(['relationMap', 'tableInfo'], './__generated__/relationM
 export abstract class BaseDBDataSource<
   Entity extends EntityType,
   Identifiable extends object,
-  Creatable,
+  Creatable extends EntityType,
   Updatable extends Identifiable,
   EntityFields extends Fields<Entity>,
   QueryResult extends Partial<Entity> & Identifiable,

package/lib/runtime/createTypeDef.js

@@ -10,7 +10,11 @@ const makeTypedefString = (typeName, typedef, type) => {
     return `\
 ${type} ${typeName} {
 ${entries
-        .map(([field, value]) => `  ${field}${makeArgs(value.args)}: ${value.return}`)
+        .map(([field, value]) => {
+        if (!value.return)
+            throw new Error(`Return type required: ${typeName}.${field}`);
+        return `  ${field}${makeArgs(value.args)}: ${value.return}`;
+    })
         .join('\n')}
 }
 `;

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

@@ -8,6 +8,7 @@ type ValueSet = {
 export type Create = {
     table: string;
     values: ValueSet[];
+    upsert?: string[];
 };
 export type Update = {
     table: string;

package/lib/runtime/dsl/mutation/mutation.js

@@ -2,9 +2,18 @@ import { SqlString } from '../../sql/sqlString.js';
 import { Sql } from '../query/sql/nodeToSql.js';
 const escape = SqlString.escape;
 const escapeId = SqlString.escapeId;
+const onDuplicateKeyUpdate = (columns) => {
+    if (!columns || columns.length === 0)
+        return '';
+    return (' ON DUPLICATE KEY UPDATE ' +
+        columns
+            .map(escapeId)
+            .map(it => `${it} = VALUES(${it})`)
+            .join(','));
+};
 export const createToSql = (dsl, tableInfo) => {
     const map = tableInfo[dsl.table].columnMap;
-    return `INSERT INTO ${escapeId(dsl.table)}(${dsl.values.map(it => escapeId(map[it.field]))}) VALUES(${dsl.values.map(it => escape(it.value))})`;
+    return `INSERT INTO ${escapeId(dsl.table)}(${dsl.values.map(it => escapeId(map[it.field]))}) VALUES(${dsl.values.map(it => escape(it.value))})${onDuplicateKeyUpdate(dsl.upsert)}`;
 };
 export const updateToSql = (dsl, tableInfo) => {
     const map = tableInfo[dsl.table].columnMap;

package/lib/runtime/sasatDBDatasource.d.ts

@@ -23,7 +23,7 @@ export type QueryOptions = {
     offset?: number;
     lock?: LockMode;
 };
-export declare abstract class SasatDBDatasource<Entity extends EntityType, Identifiable extends object, Creatable, Updatable extends Identifiable, EntityFields extends Fields<Entity>, QueryResult extends Partial<Entity> & Identifiable> implements Repository<Entity, Identifiable, Creatable, Updatable> {
+export declare abstract class SasatDBDatasource<Entity extends EntityType, Identifiable extends object, Creatable extends EntityType, Updatable extends Identifiable, EntityFields extends Fields<Entity>, QueryResult extends Partial<Entity> & Identifiable> implements Repository<Entity, Identifiable, Creatable, Updatable> {
     protected client: SQLExecutor;
     protected abstract relationMap: RelationMap<any>;
     protected abstract tableInfo: TableInfo;
@@ -33,11 +33,15 @@ export declare abstract class SasatDBDatasource<Entity extends EntityType, Ident
     protected abstract readonly identifyFields: string[];
     protected abstract readonly autoIncrementColumn?: string;
     protected queryLogger: (sql: string) => void;
+    protected commandLogger: (sql: string) => void;
     constructor(client?: SQLExecutor);
     protected abstract getDefaultValueString(): Partial<{
         [P in keyof Entity]: Entity[P] | string | null;
     }>;
-    create(entity: Creatable): Promise<Entity>;
+    create(entity: Creatable, upsert?: {
+        updateColumns: string[];
+    }): Promise<Entity>;
+    upsert<T extends Creatable & Partial<Entity>>(entity: T, updateFields?: (keyof T)[]): Promise<Entity>;
     update(entity: Updatable): Promise<CommandResponse>;
     delete(entity: Identifiable): Promise<CommandResponse>;
     first(fields?: EntityFields, option?: Omit<QueryOptions, 'limit' | 'offset'>, context?: unknown): Promise<QueryResult | null>;
@@ -53,5 +57,6 @@ export declare abstract class SasatDBDatasource<Entity extends EntityType, Ident
     getRelationMap(): {
         [to: string]: import("./dsl/query/createQueryResolveInfo.js").RelationInfo<any>;
     };
+    protected fieldToColumn(fields: string[]): string[];
 }
 export {};

package/lib/runtime/sasatDBDatasource.js

@@ -8,8 +8,9 @@ export class SasatDBDatasource {
     constructor(client = getDbClient()) {
         this.client = client;
         this.queryLogger = noop;
+        this.commandLogger = noop;
     }
-    async create(entity) {
+    async create(entity, upsert) {
         const obj = {
             ...this.getDefaultValueString(),
             ...entity,
@@ -20,8 +21,11 @@ export class SasatDBDatasource {
                 field: column,
                 value,
             })),
+            upsert: upsert?.updateColumns,
         };
-        const response = await this.client.rawCommand(createToSql(dsl, this.tableInfo));
+        const sql = createToSql(dsl, this.tableInfo);
+        this.commandLogger(sql);
+        const response = await this.client.rawCommand(sql);
         if (!this.autoIncrementColumn)
             return obj;
         return {
@@ -29,6 +33,11 @@ export class SasatDBDatasource {
             [this.autoIncrementColumn]: response.insertId,
         };
     }
+    async upsert(entity, updateFields = this.primaryKeys) {
+        return this.create(entity, {
+            updateColumns: this.fieldToColumn(updateFields),
+        });
+    }
     update(entity) {
         const dsl = {
             table: this.tableName,
@@ -38,14 +47,18 @@ export class SasatDBDatasource {
             })),
             where: this.createIdentifiableExpression(entity),
         };
-        return this.client.rawCommand(updateToSql(dsl, this.tableInfo));
+        const sql = updateToSql(dsl, this.tableInfo);
+        this.commandLogger(sql);
+        return this.client.rawCommand(sql);
     }
     async delete(entity) {
         const dsl = {
             table: this.tableName,
             where: this.createIdentifiableExpression(entity),
         };
-        return this.client.rawCommand(deleteToSql(dsl));
+        const sql = deleteToSql(dsl);
+        this.commandLogger(sql);
+        return this.client.rawCommand(sql);
     }
     async first(fields, option, context) {
         const result = await this.find(fields, option, context);
@@ -88,5 +101,8 @@ export class SasatDBDatasource {
     getRelationMap() {
         return this.relationMap[this.tableName];
     }
+    fieldToColumn(fields) {
+        return fields.map(it => this.tableInfo[this.tableName].columnMap[it] || it);
+    }
 }
 const noop = () => { };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.19.15",
+  "version": "0.19.17",
   "repository": "https://github.com/nin138/sasat.git",
   "author": "nin138 <ninian138@gmail.com>",
   "license": "MIT",
@@ -44,22 +44,22 @@
   "devDependencies": {
     "@apollo/server": "^4.3.0",
     "@types/fs-extra": "11.0.1",
-    "@types/jest": "29.4.0",
+    "@types/jest": "29.5.2",
     "@types/js-yaml": "4.0.5",
-    "@types/node": "18.13.0",
+    "@types/node": "18.16.18",
     "@types/pluralize": "0.0.29",
-    "@types/prettier": "2.7.2",
+    "@types/prettier": "2.7.3",
     "@types/sqlstring": "2.3.0",
-    "@typescript-eslint/eslint-plugin": "5.51.0",
-    "@typescript-eslint/parser": "5.51.0",
+    "@typescript-eslint/eslint-plugin": "5.59.11",
+    "@typescript-eslint/parser": "5.59.11",
     "env-cmd": "10.1.0",
-    "eslint": "8.33.0",
-    "eslint-config-prettier": "8.6.0",
+    "eslint": "8.42.0",
+    "eslint-config-prettier": "8.8.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
-    "jest": "29.4.2",
-    "lint-staged": "13.1.1",
+    "jest": "29.5.0",
+    "lint-staged": "13.2.2",
     "sasat": "link:./lib",
     "ts-jest": "29.0.5",
     "ts-node": "10.9.1",