remult 0.19.0 → 0.19.2-exp.0

package/esm/live-query/data-provider-live-query-storage.d.ts

@@ -14,10 +14,9 @@ export declare class DataProviderLiveQueryStorage implements LiveQueryStorage, S
     }) => Promise<void>): Promise<void>;
     keepAliveAndReturnUnknownQueryIds(queryIds: string[]): Promise<string[]>;
 }
-declare class LiveQueryStorageEntity extends EntityBase {
+export declare class LiveQueryStorageEntity extends EntityBase {
     id: string;
     entityKey: string;
     data: any;
     lastUsedIso: string;
 }
-export {};

package/esm/live-query/data-provider-live-query-storage.js

@@ -53,7 +53,9 @@ export class DataProviderLiveQueryStorage {
         return queryIds;
     }
 }
-let LiveQueryStorageEntity = class LiveQueryStorageEntity extends EntityBase {
+let LiveQueryStorageEntity = 
+/*@internal */
+class LiveQueryStorageEntity extends EntityBase {
     constructor() {
         super(...arguments);
         this.id = '';
@@ -81,5 +83,7 @@ LiveQueryStorageEntity = __decorate([
     Entity(undefined, {
         dbName: 'remult_live_query_storage'
     })
+    /*@internal */
 ], LiveQueryStorageEntity);
+export { LiveQueryStorageEntity };
 allEntities.splice(allEntities.indexOf(LiveQueryStorageEntity), 1);

package/esm/postgres/postgres-data-provider.d.ts

@@ -11,6 +11,7 @@ export interface PostgresClient extends PostgresCommandSource {
 }
 export declare class PostgresDataProvider implements SqlImplementation {
     private pool;
+    supportsJsonColumnType: boolean;
     static getDb(remult?: Remult): ClientBase;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
     getLimitSqlSyntax(limit: number, offset: number): string;

package/esm/postgres/postgres-data-provider.js

@@ -5,6 +5,7 @@ import { SqlDatabase } from '../src/data-providers/sql-database';
 export class PostgresDataProvider {
     constructor(pool) {
         this.pool = pool;
+        this.supportsJsonColumnType = true;
     }
     static getDb(remult) {
         const sql = SqlDatabase.getDb(remult);

package/esm/remult-knex/index.d.ts

@@ -25,5 +25,5 @@ export declare class KnexSchemaBuilder {
     additionalWhere: string;
     constructor(knex: Knex);
 }
-export declare function buildColumn(x: FieldMetadata, dbName: string, b: Knex.CreateTableBuilder): void;
+export declare function buildColumn(x: FieldMetadata, dbName: string, b: Knex.CreateTableBuilder, supportsJson?: boolean): void;
 export declare function createKnexDataProvider(config: Knex.Config): Promise<KnexDataProvider>;

package/esm/remult-knex/index.js

@@ -17,6 +17,13 @@ export class KnexDataProvider {
         return r.knex;
     }
     getEntityDataProvider(entity) {
+        if (!supportsJson(this.knex))
+            for (const f of entity.fields.toArray()) {
+                if (f.valueConverter.fieldTypeInDb === "json") {
+                    //@ts-ignore
+                    f.valueConverter = { ...f.valueConverter, toDb: ValueConverters.JsonString.toDb, fromDb: ValueConverters.JsonString.fromDb };
+                }
+            }
         return new KnexEntityDataProvider(entity, this.knex);
     }
     async transaction(action) {
@@ -318,7 +325,7 @@ export class KnexSchemaBuilder {
                         if (isAutoIncrement(x))
                             b.increments(cols.get(x).name);
                         else {
-                            buildColumn(x, cols.get(x).name, b);
+                            buildColumn(x, cols.get(x).name, b, supportsJson(this.knex));
                             if (x == entity.idMetadata.field)
                                 b.primary([cols.get(x).name]);
                         }
@@ -335,7 +342,7 @@ export class KnexSchemaBuilder {
         let colName = e.$dbNameOf(col);
         if (!await this.knex.schema.hasColumn(e.$entityName, colName)) {
             await logSql(this.knex.schema.alterTable(e.$entityName, b => {
-                buildColumn(col, colName, b);
+                buildColumn(col, colName, b, supportsJson(this.knex));
             }));
         }
     }
@@ -355,7 +362,13 @@ export class KnexSchemaBuilder {
 }
 //@internal
 KnexSchemaBuilder.logToConsole = true;
-export function buildColumn(x, dbName, b) {
+function supportsJson(knex) {
+    const client = knex.client.config.client;
+    if (client?.includes("sqlite3") || client?.includes("mssql"))
+        return false;
+    return true;
+}
+export function buildColumn(x, dbName, b, supportsJson = true) {
     if (x.valueType == Number) {
         if (!x.valueConverter.fieldTypeInDb) {
             let c = b.decimal(dbName);
@@ -395,6 +408,11 @@ export function buildColumn(x, dbName, b) {
                 c.defaultTo(0).notNullable();
             }
         }
+        else if (x.valueConverter.fieldTypeInDb == "json")
+            if (supportsJson)
+                b.json(dbName);
+            else
+                b.text(dbName);
         else
             b.specificType(dbName, x.valueConverter.fieldTypeInDb);
     }

package/esm/src/data-providers/rest-data-provider.js

@@ -174,9 +174,9 @@ export class RestDataProviderHttpProviderUsingFetch {
         }));
     }
     myFetch(url, options) {
-        const headers = {
-            "Content-type": "application/json"
-        };
+        const headers = {};
+        if (options?.body)
+            headers["Content-type"] = "application/json";
         if (typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof (window.document.cookie !== 'undefined'))
             for (const cookie of window.document.cookie.split(';')) {
                 if (cookie.trim().startsWith('XSRF-TOKEN=')) {

package/esm/src/data-providers/sql-database.js

@@ -4,6 +4,7 @@ import { customDatabaseFilterToken, Filter } from '../filter/filter-interfaces';
 import { Sort } from '../sort';
 import { getRepository } from "../remult3";
 import { RemultProxy } from "../remult-proxy";
+import { ValueConverters } from "../valueConverters";
 // @dynamic
 export class SqlDatabase {
     constructor(sql) {
@@ -31,6 +32,14 @@ export class SqlDatabase {
             await this.sql.ensureSchema(entities);
     }
     getEntityDataProvider(entity) {
+        if (!this.sql.supportsJsonColumnType) {
+            for (const f of entity.fields.toArray()) {
+                if (f.valueConverter.fieldTypeInDb === "json") {
+                    //@ts-ignore
+                    f.valueConverter = { ...f.valueConverter, toDb: ValueConverters.JsonString.toDb, fromDb: ValueConverters.JsonString.fromDb };
+                }
+            }
+        }
         return new ActualSQLServerDataProvider(entity, this, async (dbName) => {
             if (this.createdEntities.indexOf(dbName.$entityName) < 0) {
                 this.createdEntities.push(dbName.$entityName);

package/esm/src/entity.d.ts

@@ -6,7 +6,11 @@ export interface EntityOptions<entityType = any> {
     caption?: string;
     /**
      * Determines if this Entity is available for get requests using Rest Api
-     * @see [allowed](http://remult.dev/docs/allowed.html)*/
+     * @description
+     * Determines if one has any access to the data of an entity.
+     * @see [allowed](http://remult.dev/docs/allowed.html)
+     * @see to restrict data based on a criteria, use [apiPrefilter](https://remult.dev/docs/ref_entity.html#apiprefilter)
+     * */
     allowApiRead?: Allowed;
     /**
      * Determines if this entity can be updated through the api.
@@ -21,10 +25,15 @@ export interface EntityOptions<entityType = any> {
     /** sets  the `allowApiUpdate`, `allowApiDelete` and `allowApiInsert` properties in a single set */
     allowApiCrud?: Allowed;
     /** A filter that determines which rows can be queries using the api.
+     * @description
+     * Use apiPrefilter in cases where you to restrict data based on user profile
     * @example
     * apiPrefilter: { archive:false }
     *
+    * @example
+    * apiPrefilter: ()=> remult.isAllowed("admin")?{}:{ archive:false }
     * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
+    *
     */
     apiPrefilter?: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>);
     /** A filter that will be used for all queries from this entity both from the API and from within the backend.

package/esm/src/remult3/RepositoryImplementation.d.ts

@@ -226,7 +226,11 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
 }
 export declare function FieldType<valueType = any>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any) => any;
 export declare class Fields {
+    /**
+     * Stored as a JSON.stringify - to store as json use Fields.json
+    */
     static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static json<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
     static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
     static date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
     static integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;

package/esm/src/remult3/RepositoryImplementation.js

@@ -1444,9 +1444,19 @@ export function FieldType(...options) {
     };
 }
 export class Fields {
+    /**
+     * Stored as a JSON.stringify - to store as json use Fields.json
+    */
     static object(...options) {
         return Field(undefined, ...options);
     }
+    static json(...options) {
+        return Field(undefined, {
+            valueConverter: {
+                fieldTypeInDb: "json"
+            }
+        }, ...options);
+    }
     static dateOnly(...options) {
         return Field(() => Date, {
             valueConverter: ValueConverters.DateOnly

package/esm/src/shared-tests/db-tests.db-tests.js

@@ -19,7 +19,7 @@ import { Validators } from "../validators";
 import { Status } from "../tests/testModel/models";
 import { IdEntity } from "../id-entity";
 import { describeClass } from "../remult3/DecoratorReplacer";
-import { DataProviderLiveQueryStorage } from "../../live-query/data-provider-live-query-storage";
+import { DataProviderLiveQueryStorage, LiveQueryStorageEntity } from "../../live-query/data-provider-live-query-storage";
 import { v4 as uuid } from 'uuid';
 testAll("what", async ({ remult, createEntity }) => {
     await (await createEntity(stam)).create({ id: 1, title: 'noam' }).save();
@@ -769,7 +769,8 @@ testAll("test date", async ({ createEntity }) => {
     let item = await r.findFirst();
     expect(item.d.getFullYear()).toBe(1976);
 }, false);
-testAll("test live query storage", async ({ db, remult }) => {
+testAll("test live query storage", async ({ db, remult, createEntity }) => {
+    await createEntity(LiveQueryStorageEntity);
     var x = new DataProviderLiveQueryStorage(db);
     if (db.ensureSchema)
         await x.ensureSchema();
@@ -801,6 +802,7 @@ testAll("test contains with names with casing", async ({ createEntity }) => {
     exclude: [TestDbs.mongo]
 });
 testAll("test live query storage", async (x) => {
+    await x.createEntity(LiveQueryStorageEntity);
     const s = new DataProviderLiveQueryStorage(x.db);
     await s.ensureSchema();
     const entityKey = "ek";
@@ -813,3 +815,79 @@ testAll("test live query storage", async (x) => {
     await s.remove(id);
     await s.remove(id);
 }, false, { exclude: [TestDbs.restDataProvider] });
+testAll("test json structure using object", async ({ createEntity }) => {
+    const e = class {
+        constructor() {
+            this.a = 0;
+        }
+    };
+    describeClass(e, Entity("testJsonStructure", { allowApiCrud: true }), {
+        a: Fields.number(),
+        person: Fields.object()
+    });
+    const r = await createEntity(e);
+    await r.insert({ a: 1, person: { firstName: "noam", lastName: "honig" } });
+    let item = await r.findFirst();
+    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+}, false);
+let testObject = class testObject {
+    constructor() {
+        this.id = 0;
+        this.person = { firstName: "noam", lastName: "honig" };
+    }
+};
+__decorate([
+    Fields.integer(),
+    __metadata("design:type", Object)
+], testObject.prototype, "id", void 0);
+__decorate([
+    Fields.object(),
+    __metadata("design:type", Object)
+], testObject.prototype, "person", void 0);
+testObject = __decorate([
+    Entity("testObject", { allowApiCrud: true })
+], testObject);
+testAll("test object entity", async ({ createEntity }) => {
+    const r = await createEntity(testObject);
+    await r.insert({ id: 1, person: { firstName: "noam", lastName: "honig" } });
+    let item = await r.findFirst();
+    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+}, false);
+let testObjectJson = class testObjectJson {
+    constructor() {
+        this.id = 0;
+        this.person = { firstName: "noam", lastName: "honig" };
+    }
+};
+__decorate([
+    Fields.integer(),
+    __metadata("design:type", Object)
+], testObjectJson.prototype, "id", void 0);
+__decorate([
+    Fields.json(),
+    __metadata("design:type", Object)
+], testObjectJson.prototype, "person", void 0);
+testObjectJson = __decorate([
+    Entity("testObjectJson", { allowApiCrud: true })
+], testObjectJson);
+testAll("test object entity", async ({ createEntity }) => {
+    const r = await createEntity(testObjectJson);
+    await r.insert({ id: 1, person: { firstName: "noam", lastName: "honig" } });
+    let item = await r.findFirst();
+    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+}, false);
+testAll("test json structure", async ({ createEntity }) => {
+    const e = class {
+        constructor() {
+            this.a = 0;
+        }
+    };
+    describeClass(e, Entity("testJsonFieldType", { allowApiCrud: true }), {
+        a: Fields.number(),
+        person: Fields.json()
+    });
+    const r = await createEntity(e);
+    await r.insert({ a: 1, person: { firstName: "noam", lastName: "honig" } });
+    let item = await r.findFirst();
+    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+}, false);

package/esm/src/sql-command.d.ts

@@ -5,6 +5,7 @@ export interface SqlImplementation {
     transaction(action: (sql: SqlImplementation) => Promise<void>): Promise<void>;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
     ensureSchema?(entities: EntityMetadata[]): Promise<void>;
+    supportsJsonColumnType?: boolean;
 }
 export interface SqlCommand extends SqlCommandWithParameters {
     execute(sql: string): Promise<SqlResult>;

package/live-query/data-provider-live-query-storage.d.ts

@@ -14,10 +14,9 @@ export declare class DataProviderLiveQueryStorage implements LiveQueryStorage, S
     }) => Promise<void>): Promise<void>;
     keepAliveAndReturnUnknownQueryIds(queryIds: string[]): Promise<string[]>;
 }
-declare class LiveQueryStorageEntity extends EntityBase {
+export declare class LiveQueryStorageEntity extends EntityBase {
     id: string;
     entityKey: string;
     data: any;
     lastUsedIso: string;
 }
-export {};

package/live-query/data-provider-live-query-storage.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataProviderLiveQueryStorage = void 0;
+exports.LiveQueryStorageEntity = exports.DataProviderLiveQueryStorage = void 0;
 var tslib_1 = require("tslib");
 var initDataProvider_1 = require("../server/initDataProvider");
 var context_1 = require("../src/context");
@@ -223,6 +223,7 @@ var DataProviderLiveQueryStorage = /** @class */ (function () {
 exports.DataProviderLiveQueryStorage = DataProviderLiveQueryStorage;
 var LiveQueryStorageEntity = /** @class */ (function (_super) {
     tslib_1.__extends(LiveQueryStorageEntity, _super);
+    /*@internal */
     function LiveQueryStorageEntity() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.id = '';
@@ -250,7 +251,9 @@ var LiveQueryStorageEntity = /** @class */ (function (_super) {
         remult3_1.Entity(undefined, {
             dbName: 'remult_live_query_storage'
         })
+        /*@internal */
     ], LiveQueryStorageEntity);
     return LiveQueryStorageEntity;
 }(remult3_1.EntityBase));
+exports.LiveQueryStorageEntity = LiveQueryStorageEntity;
 context_1.allEntities.splice(context_1.allEntities.indexOf(LiveQueryStorageEntity), 1);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.19.0",
+    "version": "0.19.2-exp.0",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/postgres/postgres-data-provider.d.ts

@@ -11,6 +11,7 @@ export interface PostgresClient extends PostgresCommandSource {
 }
 export declare class PostgresDataProvider implements SqlImplementation {
     private pool;
+    supportsJsonColumnType: boolean;
     static getDb(remult?: Remult): ClientBase;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
     getLimitSqlSyntax(limit: number, offset: number): string;

package/postgres/postgres-data-provider.js

@@ -9,6 +9,7 @@ var sql_database_1 = require("../src/data-providers/sql-database");
 var PostgresDataProvider = /** @class */ (function () {
     function PostgresDataProvider(pool) {
         this.pool = pool;
+        this.supportsJsonColumnType = true;
     }
     PostgresDataProvider.getDb = function (remult) {
         var sql = sql_database_1.SqlDatabase.getDb(remult);

package/remult-knex/index.d.ts

@@ -25,5 +25,5 @@ export declare class KnexSchemaBuilder {
     additionalWhere: string;
     constructor(knex: Knex);
 }
-export declare function buildColumn(x: FieldMetadata, dbName: string, b: Knex.CreateTableBuilder): void;
+export declare function buildColumn(x: FieldMetadata, dbName: string, b: Knex.CreateTableBuilder, supportsJson?: boolean): void;
 export declare function createKnexDataProvider(config: Knex.Config): Promise<KnexDataProvider>;

package/remult-knex/index.js

@@ -21,6 +21,24 @@ var KnexDataProvider = /** @class */ (function () {
         return r.knex;
     };
     KnexDataProvider.prototype.getEntityDataProvider = function (entity) {
+        var e_1, _a;
+        if (!supportsJson(this.knex))
+            try {
+                for (var _b = tslib_1.__values(entity.fields.toArray()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var f = _c.value;
+                    if (f.valueConverter.fieldTypeInDb === "json") {
+                        //@ts-ignore
+                        f.valueConverter = tslib_1.__assign(tslib_1.__assign({}, f.valueConverter), { toDb: valueConverters_1.ValueConverters.JsonString.toDb, fromDb: valueConverters_1.ValueConverters.JsonString.fromDb });
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
         return new KnexEntityDataProvider(entity, this.knex);
     };
     KnexDataProvider.prototype.transaction = function (action) {
@@ -139,7 +157,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
     KnexEntityDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, cols, colKeys, _a, _b, x, query, br, r_1, r;
-            var e_1, _c;
+            var e_2, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.init()];
@@ -158,12 +176,12 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_1) throw e_1.error; }
+                            finally { if (e_2) throw e_2.error; }
                         }
                         query = this.knex(e.$entityName).select(cols);
                         if (!(options === null || options === void 0 ? void 0 : options.where)) return [3 /*break*/, 3];
@@ -222,8 +240,8 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, f, resultFilter, updateObject, _a, _b, x, v, key, e_2_1, where;
-            var e_2, _c;
+            var e, f, resultFilter, updateObject, _a, _b, x, v, key, e_3_1, where;
+            var e_3, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.init()];
@@ -259,14 +277,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_2_1 = _d.sent();
-                        e_2 = { error: e_2_1 };
+                        e_3_1 = _d.sent();
+                        e_3 = { error: e_3_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 10: return [4 /*yield*/, f.resolveWhere()];
                     case 11:
@@ -302,8 +320,8 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, resultFilter, insertObject, _a, _b, x, v, key, e_3_1, insert, newId_1, result, result;
-            var e_3, _c;
+            var e, resultFilter, insertObject, _a, _b, x, v, key, e_4_1, insert, newId_1, result, result;
+            var e_4, _c;
             var _this = this;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -338,14 +356,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_3_1 = _d.sent();
-                        e_3 = { error: e_3_1 };
+                        e_4_1 = _d.sent();
+                        e_4 = { error: e_4_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_3) throw e_3.error; }
+                        finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         insert = this.knex(e.$entityName).insert(insertObject);
@@ -386,8 +404,8 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     }
     FilterConsumerBridgeToKnexRequest.prototype.resolveWhere = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var p, p_1, p_1_1, pr, e_4_1;
-            var e_4, _a;
+            var p, p_1, p_1_1, pr, e_5_1;
+            var e_5, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -397,7 +415,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 6, 7, 8]);
-                        p_1 = (e_4 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
+                        p_1 = (e_5 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
                         _b.label = 2;
                     case 2:
                         if (!!p_1_1.done) return [3 /*break*/, 5];
@@ -411,14 +429,14 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_4_1 = _b.sent();
-                        e_4 = { error: e_4_1 };
+                        e_5_1 = _b.sent();
+                        e_5 = { error: e_5_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (p_1_1 && !p_1_1.done && (_a = p_1.return)) _a.call(p_1);
                         }
-                        finally { if (e_4) throw e_4.error; }
+                        finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 0];
                     case 9: return [2 /*return*/, this.result];
@@ -432,8 +450,8 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     FilterConsumerBridgeToKnexRequest.prototype.or = function (orElements) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var result, _loop_1, this_1, orElements_1, orElements_1_1, element, state_1, e_5_1;
-            var e_5, _a;
+            var result, _loop_1, this_1, orElements_1, orElements_1_1, element, state_1, e_6_1;
+            var e_6, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -482,14 +500,14 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_5_1 = _b.sent();
-                        e_5 = { error: e_5_1 };
+                        e_6_1 = _b.sent();
+                        e_6 = { error: e_6_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (orElements_1_1 && !orElements_1_1.done && (_a = orElements_1.return)) _a.call(orElements_1);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (result.length > 0) {
@@ -584,8 +602,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
     };
     KnexSchemaBuilder.prototype.ensureSchema = function (entities) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var entities_1, entities_1_1, entity, e, err_2, e_6_1;
-            var e_6, _a;
+            var entities_1, entities_1_1, entity, e, err_2, e_7_1;
+            var e_7, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -620,14 +638,14 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_6_1 = _b.sent();
-                        e_6 = { error: e_6_1 };
+                        e_7_1 = _b.sent();
+                        e_7 = { error: e_7_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_7) throw e_7.error; }
                         return [7 /*endfinally*/];
                     case 12: return [2 /*return*/];
                 }
@@ -637,7 +655,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
     KnexSchemaBuilder.prototype.createIfNotExist = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, cols_1, _a, _b, f;
-            var e_7, _c;
+            var e_8, _c;
+            var _this = this;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(entity)];
@@ -656,15 +675,15 @@ var KnexSchemaBuilder = /** @class */ (function () {
                                 });
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                         return [4 /*yield*/, logSql(this.knex.schema.createTable(e.$entityName, function (b) {
-                                var e_8, _a;
+                                var e_9, _a;
                                 try {
                                     for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                                         var x = _c.value;
@@ -672,19 +691,19 @@ var KnexSchemaBuilder = /** @class */ (function () {
                                             if (remult3_1.isAutoIncrement(x))
                                                 b.increments(cols_1.get(x).name);
                                             else {
-                                                buildColumn(x, cols_1.get(x).name, b);
+                                                buildColumn(x, cols_1.get(x).name, b, supportsJson(_this.knex));
                                                 if (x == entity.idMetadata.field)
                                                     b.primary([cols_1.get(x).name]);
                                             }
                                         }
                                     }
                                 }
-                                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                                catch (e_9_1) { e_9 = { error: e_9_1 }; }
                                 finally {
                                     try {
                                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                                     }
-                                    finally { if (e_8) throw e_8.error; }
+                                    finally { if (e_9) throw e_9.error; }
                                 }
                             }))];
                     case 3:
@@ -698,6 +717,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
     KnexSchemaBuilder.prototype.addColumnIfNotExist = function (entity, c) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, col, colName;
+            var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(entity)];
@@ -711,7 +731,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     case 2:
                         if (!!(_a.sent())) return [3 /*break*/, 4];
                         return [4 /*yield*/, logSql(this.knex.schema.alterTable(e.$entityName, function (b) {
-                                buildColumn(col, colName, b);
+                                buildColumn(col, colName, b, supportsJson(_this.knex));
                             }))];
                     case 3:
                         _a.sent();
@@ -723,8 +743,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
     };
     KnexSchemaBuilder.prototype.verifyAllColumns = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _loop_2, this_2, _a, _b, col, e_9_1, err_3;
-            var e_9, _c;
+            var e, _loop_2, this_2, _a, _b, col, e_10_1, err_3;
+            var e_10, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(entity)];
@@ -764,14 +784,14 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_9_1 = _d.sent();
-                        e_9 = { error: e_9_1 };
+                        e_10_1 = _d.sent();
+                        e_10 = { error: e_10_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_9) throw e_9.error; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 10: return [3 /*break*/, 12];
                     case 11:
@@ -788,7 +808,14 @@ var KnexSchemaBuilder = /** @class */ (function () {
     return KnexSchemaBuilder;
 }());
 exports.KnexSchemaBuilder = KnexSchemaBuilder;
-function buildColumn(x, dbName, b) {
+function supportsJson(knex) {
+    var client = knex.client.config.client;
+    if ((client === null || client === void 0 ? void 0 : client.includes("sqlite3")) || (client === null || client === void 0 ? void 0 : client.includes("mssql")))
+        return false;
+    return true;
+}
+function buildColumn(x, dbName, b, supportsJson) {
+    if (supportsJson === void 0) { supportsJson = true; }
     if (x.valueType == Number) {
         if (!x.valueConverter.fieldTypeInDb) {
             var c = b.decimal(dbName);
@@ -828,6 +855,11 @@ function buildColumn(x, dbName, b) {
                 c.defaultTo(0).notNullable();
             }
         }
+        else if (x.valueConverter.fieldTypeInDb == "json")
+            if (supportsJson)
+                b.json(dbName);
+            else
+                b.text(dbName);
         else
             b.specificType(dbName, x.valueConverter.fieldTypeInDb);
     }

package/src/data-providers/rest-data-provider.js

@@ -273,9 +273,9 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
     RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url, options) {
         var e_5, _a;
         var _this = this;
-        var headers = {
-            "Content-type": "application/json"
-        };
+        var headers = {};
+        if (options === null || options === void 0 ? void 0 : options.body)
+            headers["Content-type"] = "application/json";
         if (typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof (window.document.cookie !== 'undefined'))
             try {
                 for (var _b = tslib_1.__values(window.document.cookie.split(';')), _c = _b.next(); !_c.done; _c = _b.next()) {

package/src/data-providers/sql-database.js

@@ -8,6 +8,7 @@ var filter_interfaces_1 = require("../filter/filter-interfaces");
 var sort_1 = require("../sort");
 var remult3_1 = require("../remult3");
 var remult_proxy_1 = require("../remult-proxy");
+var valueConverters_1 = require("../valueConverters");
 // @dynamic
 var SqlDatabase = /** @class */ (function () {
     function SqlDatabase(sql) {
@@ -53,7 +54,26 @@ var SqlDatabase = /** @class */ (function () {
         });
     };
     SqlDatabase.prototype.getEntityDataProvider = function (entity) {
+        var e_1, _a;
         var _this = this;
+        if (!this.sql.supportsJsonColumnType) {
+            try {
+                for (var _b = tslib_1.__values(entity.fields.toArray()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var f = _c.value;
+                    if (f.valueConverter.fieldTypeInDb === "json") {
+                        //@ts-ignore
+                        f.valueConverter = tslib_1.__assign(tslib_1.__assign({}, f.valueConverter), { toDb: valueConverters_1.ValueConverters.JsonString.toDb, fromDb: valueConverters_1.ValueConverters.JsonString.fromDb });
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }
         return new ActualSQLServerDataProvider(entity, this, function (dbName) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
@@ -240,7 +260,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
     ActualSQLServerDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, _a, colKeys, select, r, where, _b, first, segs, _loop_1, _c, _d, s, segs_1, segs_1_1, c, page;
-            var e_1, _e, e_2, _f;
+            var e_2, _e, e_3, _f;
             var _this = this;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
@@ -283,12 +303,12 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                                     _loop_1(s);
                                 }
                             }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
                             finally {
                                 try {
                                     if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
                                 }
-                                finally { if (e_1) throw e_1.error; }
+                                finally { if (e_2) throw e_2.error; }
                             }
                             try {
                                 for (segs_1 = tslib_1.__values(segs), segs_1_1 = segs_1.next(); !segs_1_1.done; segs_1_1 = segs_1.next()) {
@@ -304,12 +324,12 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                                         select += ' desc';
                                 }
                             }
-                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
                             finally {
                                 try {
                                     if (segs_1_1 && !segs_1_1.done && (_f = segs_1.return)) _f.call(segs_1);
                                 }
-                                finally { if (e_2) throw e_2.error; }
+                                finally { if (e_3) throw e_3.error; }
                             }
                         }
                         if (options.limit) {
@@ -344,7 +364,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
         return result;
     };
     ActualSQLServerDataProvider.prototype.buildSelect = function (e) {
-        var e_3, _a;
+        var e_4, _a;
         var select = '';
         var colKeys = [];
         try {
@@ -360,19 +380,19 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                 }
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         return { colKeys: colKeys, select: select };
     };
     ActualSQLServerDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, f, statement, added, _a, _b, x, v, _c, _d, colKeys, select;
-            var e_4, _e;
+            var e_5, _e;
             var _this = this;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
@@ -402,12 +422,12 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                             }
-                            finally { if (e_4) throw e_4.error; }
+                            finally { if (e_5) throw e_5.error; }
                         }
                         _c = statement;
                         return [4 /*yield*/, f.resolveWhere()];
@@ -446,7 +466,7 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
     ActualSQLServerDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, r, cols, vals, added, _a, _b, x, v, statement, _c, colKeys, select;
-            var e_5, _d;
+            var e_6, _d;
             var _this = this;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
@@ -476,12 +496,12 @@ var ActualSQLServerDataProvider = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                             }
-                            finally { if (e_5) throw e_5.error; }
+                            finally { if (e_6) throw e_6.error; }
                         }
                         statement = "insert into " + e.$entityName + " (" + cols + ") values (" + vals + ")";
                         _c = this.buildSelect(e), colKeys = _c.colKeys, select = _c.select;

package/src/entity.d.ts

@@ -6,7 +6,11 @@ export interface EntityOptions<entityType = any> {
     caption?: string;
     /**
      * Determines if this Entity is available for get requests using Rest Api
-     * @see [allowed](http://remult.dev/docs/allowed.html)*/
+     * @description
+     * Determines if one has any access to the data of an entity.
+     * @see [allowed](http://remult.dev/docs/allowed.html)
+     * @see to restrict data based on a criteria, use [apiPrefilter](https://remult.dev/docs/ref_entity.html#apiprefilter)
+     * */
     allowApiRead?: Allowed;
     /**
      * Determines if this entity can be updated through the api.
@@ -21,10 +25,15 @@ export interface EntityOptions<entityType = any> {
     /** sets  the `allowApiUpdate`, `allowApiDelete` and `allowApiInsert` properties in a single set */
     allowApiCrud?: Allowed;
     /** A filter that determines which rows can be queries using the api.
+     * @description
+     * Use apiPrefilter in cases where you to restrict data based on user profile
     * @example
     * apiPrefilter: { archive:false }
     *
+    * @example
+    * apiPrefilter: ()=> remult.isAllowed("admin")?{}:{ archive:false }
     * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
+    *
     */
     apiPrefilter?: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>);
     /** A filter that will be used for all queries from this entity both from the API and from within the backend.

package/src/remult3/RepositoryImplementation.d.ts

@@ -226,7 +226,11 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
 }
 export declare function FieldType<valueType = any>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any) => any;
 export declare class Fields {
+    /**
+     * Stored as a JSON.stringify - to store as json use Fields.json
+    */
     static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
+    static json<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
     static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
     static date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
     static integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;

package/src/remult3/RepositoryImplementation.js

@@ -2539,6 +2539,9 @@ exports.FieldType = FieldType;
 var Fields = /** @class */ (function () {
     function Fields() {
     }
+    /**
+     * Stored as a JSON.stringify - to store as json use Fields.json
+    */
     Fields.object = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
@@ -2546,6 +2549,17 @@ var Fields = /** @class */ (function () {
         }
         return Field.apply(void 0, tslib_1.__spread([undefined], options));
     };
+    Fields.json = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([undefined, {
+                valueConverter: {
+                    fieldTypeInDb: "json"
+                }
+            }], options));
+    };
     Fields.dateOnly = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {

package/src/shared-tests/db-tests.db-tests.js

@@ -1723,22 +1723,24 @@ db_tests_setup_1.testAll("test date", function (_a) {
     });
 }, false);
 db_tests_setup_1.testAll("test live query storage", function (_a) {
-    var db = _a.db, remult = _a.remult;
+    var db = _a.db, remult = _a.remult, createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var x, id, _b;
         return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
-                case 0:
-                    x = new data_provider_live_query_storage_1.DataProviderLiveQueryStorage(db);
-                    if (!db.ensureSchema) return [3 /*break*/, 2];
-                    return [4 /*yield*/, x.ensureSchema()];
+                case 0: return [4 /*yield*/, createEntity(data_provider_live_query_storage_1.LiveQueryStorageEntity)];
                 case 1:
                     _c.sent();
-                    _c.label = 2;
+                    x = new data_provider_live_query_storage_1.DataProviderLiveQueryStorage(db);
+                    if (!db.ensureSchema) return [3 /*break*/, 3];
+                    return [4 /*yield*/, x.ensureSchema()];
                 case 2:
+                    _c.sent();
+                    _c.label = 3;
+                case 3:
                     id = uuid_1.v4();
                     return [4 /*yield*/, x.add({ id: id, entityKey: 'x', data: "noam" })];
-                case 3:
+                case 4:
                     _c.sent();
                     return [4 /*yield*/, x.forEach("x", function (args) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
                             return tslib_1.__generator(this, function (_a) {
@@ -1746,11 +1748,11 @@ db_tests_setup_1.testAll("test live query storage", function (_a) {
                                 return [2 /*return*/];
                             });
                         }); })];
-                case 4:
+                case 5:
                     _c.sent();
                     _b = expect;
                     return [4 /*yield*/, x.keepAliveAndReturnUnknownQueryIds([id])];
-                case 5:
+                case 6:
                     _b.apply(void 0, [(_c.sent())]).toEqual([]);
                     return [2 /*return*/];
             }
@@ -1798,33 +1800,177 @@ db_tests_setup_1.testAll("test live query storage", function (x) { return tslib_
     var s, entityKey, id;
     return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
-            case 0:
+            case 0: return [4 /*yield*/, x.createEntity(data_provider_live_query_storage_1.LiveQueryStorageEntity)];
+            case 1:
+                _a.sent();
                 s = new data_provider_live_query_storage_1.DataProviderLiveQueryStorage(x.db);
                 return [4 /*yield*/, s.ensureSchema()];
-            case 1:
+            case 2:
                 _a.sent();
                 entityKey = "ek";
                 id = 'id';
                 return [4 /*yield*/, s.add({ id: id, entityKey: entityKey, data: {} })];
-            case 2:
-                _a.sent();
-                return [4 /*yield*/, s.add({ id: id, entityKey: entityKey, data: {} })];
             case 3:
                 _a.sent();
-                x.remult.clearAllCache();
                 return [4 /*yield*/, s.add({ id: id, entityKey: entityKey, data: {} })];
             case 4:
                 _a.sent();
-                return [4 /*yield*/, s.keepAliveAndReturnUnknownQueryIds([id])];
+                x.remult.clearAllCache();
+                return [4 /*yield*/, s.add({ id: id, entityKey: entityKey, data: {} })];
             case 5:
                 _a.sent();
-                return [4 /*yield*/, s.remove(id)];
+                return [4 /*yield*/, s.keepAliveAndReturnUnknownQueryIds([id])];
             case 6:
                 _a.sent();
                 return [4 /*yield*/, s.remove(id)];
             case 7:
+                _a.sent();
+                return [4 /*yield*/, s.remove(id)];
+            case 8:
                 _a.sent();
                 return [2 /*return*/];
         }
     });
 }); }, false, { exclude: [db_tests_setup_1.TestDbs.restDataProvider] });
+db_tests_setup_1.testAll("test json structure using object", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var e, r, item;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    e = /** @class */ (function () {
+                        function class_6() {
+                            this.a = 0;
+                        }
+                        return class_6;
+                    }());
+                    DecoratorReplacer_1.describeClass(e, remult3_1.Entity("testJsonStructure", { allowApiCrud: true }), {
+                        a: remult3_1.Fields.number(),
+                        person: remult3_1.Fields.object()
+                    });
+                    return [4 /*yield*/, createEntity(e)];
+                case 1:
+                    r = _b.sent();
+                    return [4 /*yield*/, r.insert({ a: 1, person: { firstName: "noam", lastName: "honig" } })];
+                case 2:
+                    _b.sent();
+                    return [4 /*yield*/, r.findFirst()];
+                case 3:
+                    item = _b.sent();
+                    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+var testObject = /** @class */ (function () {
+    function testObject() {
+        this.id = 0;
+        this.person = { firstName: "noam", lastName: "honig" };
+    }
+    tslib_1.__decorate([
+        remult3_1.Fields.integer(),
+        tslib_1.__metadata("design:type", Object)
+    ], testObject.prototype, "id", void 0);
+    tslib_1.__decorate([
+        remult3_1.Fields.object(),
+        tslib_1.__metadata("design:type", Object)
+    ], testObject.prototype, "person", void 0);
+    testObject = tslib_1.__decorate([
+        remult3_1.Entity("testObject", { allowApiCrud: true })
+    ], testObject);
+    return testObject;
+}());
+db_tests_setup_1.testAll("test object entity", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var r, item;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, createEntity(testObject)];
+                case 1:
+                    r = _b.sent();
+                    return [4 /*yield*/, r.insert({ id: 1, person: { firstName: "noam", lastName: "honig" } })];
+                case 2:
+                    _b.sent();
+                    return [4 /*yield*/, r.findFirst()];
+                case 3:
+                    item = _b.sent();
+                    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+var testObjectJson = /** @class */ (function () {
+    function testObjectJson() {
+        this.id = 0;
+        this.person = { firstName: "noam", lastName: "honig" };
+    }
+    tslib_1.__decorate([
+        remult3_1.Fields.integer(),
+        tslib_1.__metadata("design:type", Object)
+    ], testObjectJson.prototype, "id", void 0);
+    tslib_1.__decorate([
+        remult3_1.Fields.json(),
+        tslib_1.__metadata("design:type", Object)
+    ], testObjectJson.prototype, "person", void 0);
+    testObjectJson = tslib_1.__decorate([
+        remult3_1.Entity("testObjectJson", { allowApiCrud: true })
+    ], testObjectJson);
+    return testObjectJson;
+}());
+db_tests_setup_1.testAll("test object entity", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var r, item;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, createEntity(testObjectJson)];
+                case 1:
+                    r = _b.sent();
+                    return [4 /*yield*/, r.insert({ id: 1, person: { firstName: "noam", lastName: "honig" } })];
+                case 2:
+                    _b.sent();
+                    return [4 /*yield*/, r.findFirst()];
+                case 3:
+                    item = _b.sent();
+                    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+db_tests_setup_1.testAll("test json structure", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var e, r, item;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    e = /** @class */ (function () {
+                        function class_7() {
+                            this.a = 0;
+                        }
+                        return class_7;
+                    }());
+                    DecoratorReplacer_1.describeClass(e, remult3_1.Entity("testJsonFieldType", { allowApiCrud: true }), {
+                        a: remult3_1.Fields.number(),
+                        person: remult3_1.Fields.json()
+                    });
+                    return [4 /*yield*/, createEntity(e)];
+                case 1:
+                    r = _b.sent();
+                    return [4 /*yield*/, r.insert({ a: 1, person: { firstName: "noam", lastName: "honig" } })];
+                case 2:
+                    _b.sent();
+                    return [4 /*yield*/, r.findFirst()];
+                case 3:
+                    item = _b.sent();
+                    expect(item.person).toEqual({ firstName: "noam", lastName: "honig" });
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);

package/src/sql-command.d.ts

@@ -5,6 +5,7 @@ export interface SqlImplementation {
     transaction(action: (sql: SqlImplementation) => Promise<void>): Promise<void>;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
     ensureSchema?(entities: EntityMetadata[]): Promise<void>;
+    supportsJsonColumnType?: boolean;
 }
 export interface SqlCommand extends SqlCommandWithParameters {
     execute(sql: string): Promise<SqlResult>;