nesoi 3.0.9 → 3.0.10

package/lib/adapters/postgres/src/postgres.nql.js

@@ -1,123 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PostgresNQLRunner = void 0;
-const nql_engine_1 = require("../../../elements/entities/bucket/query/nql_engine");
-const trx_1 = require("../../../engine/transaction/trx");
-const postgres_bucket_adapter_1 = require("./postgres.bucket_adapter");
-const log_1 = require("../../../engine/util/log");
-class PostgresNQLRunner extends nql_engine_1.NQLRunner {
-    constructor() {
-        super();
-    }
-    async run(trx, part, params, pagination) {
-        const sql = trx_1.Trx.get(trx, 'sql');
-        const { tableName, meta } = postgres_bucket_adapter_1.PostgresBucketAdapter.getTableMeta(trx, part.union.meta);
-        const sql_params = [];
-        const _sql = (part) => {
-            let where = _union(part.union);
-            if (where) {
-                where = 'WHERE ' + where;
-            }
-            const sql_str = `FROM ${tableName} ${where}`;
-            return sql_str;
-        };
-        const _union = (union) => {
-            const inters = union.inters.map(i => _inter(i)).filter(r => !!r).join(' OR ');
-            if (!inters)
-                return '';
-            return `(${inters})`;
-        };
-        const _inter = (inter) => {
-            const rules = inter.rules.map(r => (('value' in r) ? _rule(r) : _union(r))).filter(r => !!r).join(' AND ');
-            if (!rules)
-                return '';
-            return `(${rules})`;
-        };
-        const _rule = (rule) => {
-            // Replace '.' of fieldpath with '->' (JSONB compatible)
-            let column = rule.fieldpath.replace(/\./g, '->');
-            // TODO: handle '.#'
-            // Special case: "present" operation
-            if (rule.op === 'present') {
-                if (rule.not) {
-                    return `"${column}" IS NULL`;
-                }
-                else {
-                    return `"${column}" IS NOT NULL`;
-                }
-            }
-            // Fetch value
-            let value;
-            if ('static' in rule.value) {
-                value = rule.value.static;
-            }
-            else if ('param' in rule.value) {
-                value = params[rule.value.param]; // TODO: deal with param[]
-            }
-            else {
-                throw new Error('Sub-queries not implemented yet.'); // TODO: subquery
-            }
-            // Don't add condition if value is null
-            if (value === undefined) {
-                return '';
-            }
-            // Translate operation
-            let op = {
-                '==': '=',
-                '<': '<',
-                '>': '>',
-                '<=': '<=',
-                '>=': '>=',
-                'in': 'IN',
-                'contains': 'LIKE',
-                'contains_any': '' // TODO
-            }[rule.op];
-            // Apply case insensitive modifier
-            if (rule.case_i) {
-                if (rule.op === '==') {
-                    column = `LOWER(${column})`;
-                }
-                else if (rule.op === 'contains') {
-                    op = 'ILIKE';
-                }
-            }
-            // Special case: "contains" operation
-            if (rule.op === 'contains') {
-                value = `%${value}%`;
-            }
-            sql_params.push(value);
-            return `${rule.not ? 'NOT ' : ''} "${column}" ${op} $${sql_params.length}`;
-        };
-        // Debug
-        // const str = await _sql(part).describe().catch(e => {
-        //     Log.error('postgres' as any, 'nql', e.query, e);
-        // })
-        // console.log((str as any).string);
-        // End of Debug
-        const sql_str = await _sql(part);
-        const order = part.union.order;
-        const order_str = `ORDER BY ${order?.by || meta.updated_at} ${order?.dir === 'asc' ? 'ASC' : 'DESC'}`;
-        let limit_str = '';
-        if (pagination?.page || pagination?.perPage) {
-            const limit = pagination.perPage || 10;
-            const offset = ((pagination.page || 1) - 1) * limit;
-            limit_str = `OFFSET ${offset} LIMIT ${limit}`;
-        }
-        let count = undefined;
-        if (pagination?.count) {
-            const res_count = await sql.unsafe(`SELECT count(*) ${sql_str}`, sql_params);
-            count = parseInt(res_count[0].count);
-        }
-        const data = await sql.unsafe(`SELECT * ${sql_str} ${order_str} ${limit_str}`, sql_params).catch(e => {
-            log_1.Log.error('bucket', 'postgres', e.toString(), e);
-            throw new Error('Database error.');
-        });
-        return {
-            data,
-            count,
-            page: pagination?.page,
-            perPage: pagination?.perPage,
-        };
-    }
-}
-exports.PostgresNQLRunner = PostgresNQLRunner;

package/lib/adapters/postgres/src/postgres.provider.d.ts

@@ -1,18 +0,0 @@
-import postgres from 'postgres';
-import { PostgresNQLRunner } from './postgres.nql';
-import { AnyTrx } from "../../../engine/transaction/trx";
-import { TrxEngineWrapFn } from "../../../engine/transaction/trx_engine.config";
-import { PostgresConfig } from './postgres.config';
-export declare class PostgresProvider {
-    config?: PostgresConfig | undefined;
-    static make<Name extends string>(name: Name, config?: PostgresConfig): {
-        name: Name;
-        libPaths: string[];
-        up: () => PostgresProvider;
-        down: () => void;
-    };
-    sql: postgres.Sql<any>;
-    nql: PostgresNQLRunner;
-    private constructor();
-    static wrap(provider: string): (trx: AnyTrx, fn: TrxEngineWrapFn<any, any>, providers: Record<string, any>) => Promise<import("../../../engine/transaction/trx_node").TrxNodeStatus>;
-}

package/lib/adapters/postgres/src/postgres.provider.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PostgresProvider = void 0;
-const log_1 = require("../../../engine/util/log");
-const date_1 = require("../../../engine/data/date");
-const datetime_1 = require("../../../engine/data/datetime");
-const decimal_1 = require("../../../engine/data/decimal");
-const postgres_nql_1 = require("./postgres.nql");
-const trx_1 = require("../../../engine/transaction/trx");
-const database_1 = require("./migrator/database");
-class PostgresProvider {
-    static make(name, config) {
-        return {
-            name: name,
-            libPaths: [
-                'modules/*/migrations'
-            ],
-            up: () => new PostgresProvider(config),
-            down: () => { }
-        };
-    }
-    constructor(config) {
-        this.config = config;
-        log_1.Log.info('postgres', 'provider', 'Connecting to Postgres database');
-        this.sql = database_1.Database.connect({
-            ...(config?.connection || {}),
-            debug: true,
-            types: {
-                char: {
-                    to: 1042,
-                    from: [1042],
-                    serialize: (val) => val?.trim?.(),
-                    parse: (val) => val?.trim?.()
-                },
-                date: {
-                    to: 1082,
-                    from: [1082],
-                    serialize: (val) => val?.toISO(),
-                    parse: (val) => val ? date_1.NesoiDate.fromISO(val) : undefined
-                },
-                datetime: {
-                    to: 1114,
-                    from: [1114],
-                    serialize: (val) => typeof val === 'string'
-                        ? val
-                        : val?.toISO(),
-                    parse: (val) => datetime_1.NesoiDatetime.fromISO(val?.replace(' ', 'T') + 'Z')
-                },
-                datetime_z: {
-                    to: 1184,
-                    from: [1184],
-                    serialize: (val) => typeof val === 'string'
-                        ? val
-                        : val?.toISO(),
-                    parse: (val) => datetime_1.NesoiDatetime.fromISO(val?.replace(' ', 'T') + 'Z')
-                },
-                decimal: {
-                    to: 1700,
-                    from: [1700],
-                    serialize: (val) => val?.toString(),
-                    parse: (val) => val ? new decimal_1.NesoiDecimal(val) : undefined
-                }
-            }
-        });
-        this.nql = new postgres_nql_1.PostgresNQLRunner();
-    }
-    static wrap(provider) {
-        return (trx, fn, providers) => {
-            const postgres = providers[provider].sql;
-            return postgres.begin(sql => {
-                trx_1.Trx.set(trx.root, 'sql', sql);
-                return fn(trx.root);
-            });
-        };
-    }
-}
-exports.PostgresProvider = PostgresProvider;

package/lib/adapters/postgres/test/postgres.bucket_adapter.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/adapters/postgres/test/postgres.bucket_adapter.test.js

@@ -1,210 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const mock_1 = require("../../../../tools/joaquin/mock");
-const bucket_builder_1 = require("../../../elements/entities/bucket/bucket.builder");
-const log_1 = require("../../../engine/util/log");
-const inline_app_1 = require("../../../engine/apps/inline.app");
-const postgres_provider_1 = require("../src/postgres.provider");
-const postgres_bucket_adapter_1 = require("../src/postgres.bucket_adapter");
-const datetime_1 = require("../../../engine/data/datetime");
-const provider_1 = require("../src/migrator/generator/provider");
-const runner_1 = require("../src/migrator/runner/runner");
-log_1.Log.level = 'warn';
-// TODO: read this from env
-const PostgresConfig = {
-    meta: {
-        created_at: 'created_at',
-        created_by: 'created_by',
-        updated_at: 'updated_at',
-        updated_by: 'updated_by',
-    },
-    connection: {
-        host: 'localhost',
-        port: 5432,
-        user: 'postgres',
-        pass: 'postgres',
-        db: 'NESOI_TEST',
-    }
-};
-let daemon;
-async function setup() {
-    if (daemon) {
-        return daemon;
-    }
-    // Build bucket used for test
-    const bucket = new bucket_builder_1.BucketBuilder('MODULE', 'BUCKET')
-        .model($ => ({
-        id: $.int,
-        p_boolean: $.boolean,
-        p_date: $.date,
-        p_datetime: $.datetime,
-        p_decimal: $.decimal(),
-        p_enum: $.enum(['a', 'b', 'c']),
-        p_int: $.int,
-        p_float: $.float,
-        p_string: $.string,
-        p_obj: $.obj({
-            a: $.int,
-            b: $.string
-        }),
-        p_dict: $.dict($.boolean)
-    }));
-    // Build test app
-    const app = new inline_app_1.InlineApp('RUNTIME', [
-        bucket
-    ])
-        .provider(postgres_provider_1.PostgresProvider.make('pg', PostgresConfig))
-        .config.buckets({
-        'MODULE': {
-            'BUCKET': {
-                adapter: ($, { pg }) => new postgres_bucket_adapter_1.PostgresBucketAdapter($, pg, 'nesoi_test_table')
-            }
-        }
-    })
-        .config.trx({
-        'MODULE': {
-            wrap: postgres_provider_1.PostgresProvider.wrap('pg')
-        }
-    });
-    // Run test daemon
-    daemon = await app.daemon();
-    // Prepare database using daemon
-    // TODO: encapsulate this
-    // await Database.createDatabase('NESOI_TEST', PostgresConfig.connection, { if_exists: 'delete' });
-    const pg = postgres_provider_1.PostgresProvider.make('pg', PostgresConfig).up();
-    const migrator = await provider_1.MigrationProvider.create(daemon, pg.sql);
-    const migration = await migrator.generateForBucket('MODULE', 'BUCKET', 'nesoi_test_table');
-    if (migration) {
-        migration.name = 'postgres.bucket_adapter.test';
-        await runner_1.MigrationRunner.fromSchema.up(daemon, pg.sql, migration);
-    }
-    // migration?.save();
-    // await MigrationRunner.up(daemon, 'one', PostgresConfig);
-    return daemon;
-}
-const mock = new mock_1.Mock();
-beforeAll(async () => {
-    await setup();
-}, 30000);
-describe('Postgres Bucket Adapter', () => {
-    // it ('!', () => {
-    //     expect(1+1).toEqual(2);
-    // })
-    describe('CRUD', () => {
-        it('create should return unmodified object', async () => {
-            const response = await daemon.trx('MODULE').run(async (trx) => {
-                // given
-                const BUCKET = trx.bucket('BUCKET');
-                const input = mock.bucket('MODULE', 'BUCKET')
-                    .obj({ id: undefined }).raw(daemon);
-                // when
-                const created = await BUCKET.create(input);
-                return { input, created };
-            });
-            const { input, created: { id, ...obj } } = response.output;
-            // then
-            expect(id).toBeTruthy();
-            expect(obj).toEqual({
-                ...input,
-                created_at: expect.any(datetime_1.NesoiDatetime),
-                updated_at: expect.any(datetime_1.NesoiDatetime),
-                created_by: null,
-                updated_by: null
-            });
-        });
-        it('read should return unmodified object after create', async () => {
-            const response = await daemon.trx('MODULE').run(async (trx) => {
-                // given
-                const BUCKET = trx.bucket('BUCKET');
-                const input = mock.bucket('MODULE', 'BUCKET')
-                    .obj({ id: undefined }).raw(daemon);
-                // when
-                const created = await BUCKET.create(input);
-                const updated = await BUCKET.readOneOrFail(created.id);
-                return { input, updated };
-            });
-            const { input, updated: { id, ...obj } } = response.output;
-            // then
-            expect(id).toBeTruthy();
-            expect(obj).toEqual({
-                ...input,
-                created_at: expect.any(datetime_1.NesoiDatetime),
-                updated_at: expect.any(datetime_1.NesoiDatetime),
-                created_by: null,
-                updated_by: null
-            });
-        });
-        it('update should modify object after insert', async () => {
-            const response = await daemon.trx('MODULE').run(async (trx) => {
-                // given
-                const BUCKET = trx.bucket('BUCKET');
-                const input1 = mock.bucket('MODULE', 'BUCKET')
-                    .obj({ id: undefined }).raw(daemon);
-                const input2 = mock.bucket('MODULE', 'BUCKET')
-                    .obj({ id: undefined }).raw(daemon);
-                // when
-                const created = await BUCKET.create(input1);
-                const updated = await BUCKET.patch({
-                    ...input2,
-                    id: created.id
-                });
-                return { input1, input2, created, updated };
-            });
-            const { input1, input2, created: { id: id_create, ...created }, updated: { id: id_update, ...updated }, } = response.output;
-            // then
-            expect(id_create).toBeTruthy();
-            expect(id_update).toEqual(id_create);
-            expect(created).toEqual({
-                ...input1,
-                created_at: expect.any(datetime_1.NesoiDatetime),
-                updated_at: expect.any(datetime_1.NesoiDatetime),
-                created_by: null,
-                updated_by: null
-            });
-            expect(updated).toEqual({
-                ...input2,
-                created_at: expect.any(datetime_1.NesoiDatetime),
-                updated_at: expect.any(datetime_1.NesoiDatetime),
-                created_by: null,
-                updated_by: null
-            });
-        });
-        it('delete should remove object from database', async () => {
-            const response = await daemon.trx('MODULE').run(async (trx) => {
-                // given
-                const BUCKET = trx.bucket('BUCKET');
-                const input = mock.bucket('MODULE', 'BUCKET')
-                    .obj({ id: undefined }).raw(daemon);
-                // when
-                const created = await BUCKET.create(input);
-                const read = await BUCKET.readOneOrFail(created.id);
-                await BUCKET.delete(read.id);
-                const read2 = await BUCKET.readOne(read.id);
-                return { read2 };
-            });
-            const { read2 } = response.output;
-            // then
-            expect(read2).toBeUndefined();
-        });
-    });
-    describe('Query', () => {
-        it('query first by existing id should return object', async () => {
-            const response = await daemon.trx('MODULE').run(async (trx) => {
-                // given
-                const BUCKET = trx.bucket('BUCKET');
-                const input = mock.bucket('MODULE', 'BUCKET')
-                    .obj({ id: undefined }).raw(daemon);
-                // when
-                const created = await BUCKET.create(input);
-                const queried = await BUCKET.query({
-                    'id': created.id
-                }).all();
-                return { queried, created };
-            });
-            const { queried, created } = response.output;
-            // then
-            expect(queried.length).toEqual(1);
-            expect(queried[0].id).toEqual(created.id);
-        });
-    });
-});