typeorm-hasura 0.0.20 → 0.0.22

package/dist/src/decorators/Column.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Column = Column;
 exports.HasuraColumn = Column;
-exports.Column = Column;
-exports.HasuraColumn = Column;
 const internalStorage_1 = require("../internalStorage");
 function Column(options) {
     return function (object, propertyName) {

package/dist/src/decorators/Column.js.map

@@ -1 +1 @@
-{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../src/decorators/Column.ts"],"names":[],"mappings":";;AAGA,wBAIC;AAGa,8BAAY;AAP1B,wBAIC;AAGa,8BAAY;AAV1B,wDAAqD;AAGrD,SAAgB,MAAM,CAAC,OAAuB;IAC1C,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,iCAAe,CAAC,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"Column.js","sourceRoot":"","sources":["../../../src/decorators/Column.ts"],"names":[],"mappings":";;AAGA,wBAIC;AAGa,8BAAY;AAV1B,wDAAqD;AAGrD,SAAgB,MAAM,CAAC,OAAuB;IAC1C,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,iCAAe,CAAC,iBAAiB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC,CAAC;AACN,CAAC"}

package/dist/src/decorators/Entity.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = Entity;
 exports.HasuraEntity = Entity;
-exports.Entity = Entity;
-exports.HasuraEntity = Entity;
 const internalStorage_1 = require("../internalStorage");
 function Entity(options) {
     return (target) => {

package/dist/src/decorators/Entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../../src/decorators/Entity.ts"],"names":[],"mappings":";;AAGA,wBAIC;AAGa,8BAAY;AAP1B,wBAIC;AAGa,8BAAY;AAV1B,wDAAqD;AAGrD,SAAgB,MAAM,CAAwB,OAA8B;IACxE,OAAO,CAAC,MAAc,EAAE,EAAE;QACtB,iCAAe,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../../src/decorators/Entity.ts"],"names":[],"mappings":";;AAGA,wBAIC;AAGa,8BAAY;AAV1B,wDAAqD;AAGrD,SAAgB,MAAM,CAAwB,OAA8B;IACxE,OAAO,CAAC,MAAc,EAAE,EAAE;QACtB,iCAAe,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC;AACN,CAAC"}

package/dist/src/mappers/databaseUrl.spec.d.ts

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

package/dist/src/mappers/databaseUrl.spec.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const typeorm_1 = require("typeorm");
+const databaseUrl_1 = require("./databaseUrl");
+describe('mappers', () => {
+    describe('databaseUrl', () => {
+        it('should return postgres for postgres', () => {
+            const dataSource = new typeorm_1.DataSource({
+                type: 'postgres',
+                host: 'localhost',
+                port: 5432,
+                username: 'test-user',
+                password: 'test-password',
+                database: 'test-database',
+            });
+            expect((0, databaseUrl_1.getDatabaseUrl)({
+                name: 'default',
+                dataSource
+            })).toEqual('postgres://test-user:test-password@localhost:5432/test-database');
+        });
+        it('should throw for unsupported type', () => {
+            const dataSource = new typeorm_1.DataSource({
+                type: 'sqljs',
+                driver: {}
+            });
+            expect(() => (0, databaseUrl_1.getDatabaseUrl)({
+                name: 'default',
+                dataSource
+            })).toThrow();
+        });
+    });
+});
+//# sourceMappingURL=databaseUrl.spec.js.map

package/dist/src/mappers/databaseUrl.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"databaseUrl.spec.js","sourceRoot":"","sources":["../../../src/mappers/databaseUrl.spec.ts"],"names":[],"mappings":";;AACA,qCAAqC;AACrC,+CAA+C;AAE/C,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACrB,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC3C,MAAM,UAAU,GAAG,IAAI,oBAAU,CAAC;gBAC9B,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,WAAW;gBACrB,QAAQ,EAAE,eAAe;gBACzB,QAAQ,EAAE,eAAe;aAC5B,CAAC,CAAC;YACH,MAAM,CAAC,IAAA,4BAAc,EAAC;gBAClB,IAAI,EAAE,SAAS;gBACf,UAAU;aACb,CAAC,CAAC,CAAC,OAAO,CAAC,iEAAiE,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YACzC,MAAM,UAAU,GAAG,IAAI,oBAAU,CAAC;gBAC9B,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,EAAE;aACb,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,4BAAc,EAAC;gBACxB,IAAI,EAAE,SAAS;gBACf,UAAU;aACb,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAA"}

package/dist/src/mappers/graphql.spec.d.ts

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

package/dist/src/mappers/graphql.spec.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const graphql_tag_1 = require("graphql-tag");
+const graphql_1 = require("./graphql");
+describe("convert graphql document to hasura defs", () => {
+    it("Base case", () => expect((0, graphql_1.getGraphQLDefinitions)((0, graphql_tag_1.default) `
+        type Query {
+            currencyConverter(CurrencyInfo: ConvertCurrencyInputParams!): ConvertedCurrency
+        }
+
+        input ConvertCurrencyInputParams {
+            from: String
+            to: String
+            amt: Int
+        }
+
+        type ConvertedCurrency {
+            date: String
+            info: ConvertedCurrencyInfo
+            query: ConvertedCurrencyQuery
+            result: Float
+            success: Boolean
+        }
+            
+        type ConvertedCurrencyInfo {
+            rate: Float
+        }
+
+        type ConvertedCurrencyQuery {
+            amount: Int
+            from: String
+            to: String
+        }
+    `)).toEqual({
+        baseActions: [
+            {
+                name: "currencyConverter",
+                definition: {
+                    "type": "query",
+                    output_type: "ConvertedCurrency",
+                    "arguments": [
+                        {
+                            "name": "CurrencyInfo",
+                            "type": "ConvertCurrencyInputParams!"
+                        }
+                    ],
+                }
+            }
+        ],
+        "custom_types": {
+            "input_objects": [
+                {
+                    "name": "ConvertCurrencyInputParams",
+                    "fields": [
+                        {
+                            "name": "from",
+                            "type": "String"
+                        },
+                        {
+                            "name": "to",
+                            "type": "String"
+                        },
+                        {
+                            "name": "amt",
+                            "type": "Int"
+                        }
+                    ]
+                }
+            ],
+            "objects": [
+                {
+                    "name": "ConvertedCurrency",
+                    "fields": [
+                        {
+                            "name": "date",
+                            "type": "String"
+                        },
+                        {
+                            "name": "info",
+                            "type": "ConvertedCurrencyInfo"
+                        },
+                        {
+                            "name": "query",
+                            "type": "ConvertedCurrencyQuery"
+                        },
+                        {
+                            "name": "result",
+                            "type": "Float"
+                        },
+                        {
+                            "name": "success",
+                            "type": "Boolean"
+                        }
+                    ]
+                },
+                {
+                    "name": "ConvertedCurrencyInfo",
+                    "fields": [
+                        {
+                            "name": "rate",
+                            "type": "Float"
+                        }
+                    ]
+                },
+                {
+                    "name": "ConvertedCurrencyQuery",
+                    "fields": [
+                        {
+                            "name": "amount",
+                            "type": "Int"
+                        },
+                        {
+                            "name": "from",
+                            "type": "String"
+                        },
+                        {
+                            "name": "to",
+                            "type": "String"
+                        }
+                    ]
+                },
+            ],
+            "scalars": []
+        }
+    }));
+});
+//# sourceMappingURL=graphql.spec.js.map

package/dist/src/mappers/graphql.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql.spec.js","sourceRoot":"","sources":["../../../src/mappers/graphql.spec.ts"],"names":[],"mappings":";;AAAA,6CAA6B;AAC7B,uCAAiD;AAEjD,QAAQ,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACrD,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAA,+BAAqB,EAAC,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA4BrD,CAAC,CAAC,CAAC,OAAO,CAAC;QACR,WAAW,EAAE;YACT;gBACI,IAAI,EAAE,mBAAmB;gBACzB,UAAU,EAAE;oBACR,MAAM,EAAE,OAAO;oBACf,WAAW,EAAE,mBAAmB;oBAChC,WAAW,EAAE;wBACT;4BACI,MAAM,EAAE,cAAc;4BACtB,MAAM,EAAE,6BAA6B;yBACxC;qBACJ;iBACJ;aACJ;SACJ;QACD,cAAc,EAAE;YACZ,eAAe,EAAE;gBACb;oBACI,MAAM,EAAE,4BAA4B;oBACpC,QAAQ,EAAE;wBACN;4BACI,MAAM,EAAE,MAAM;4BACd,MAAM,EAAE,QAAQ;yBACnB;wBACD;4BACI,MAAM,EAAE,IAAI;4BACZ,MAAM,EAAE,QAAQ;yBACnB;wBACD;4BACI,MAAM,EAAE,KAAK;4BACb,MAAM,EAAE,KAAK;yBAChB;qBACJ;iBACJ;aACJ;YACD,SAAS,EAAE;gBACP;oBACI,MAAM,EAAE,mBAAmB;oBAC3B,QAAQ,EAAE;wBACN;4BACI,MAAM,EAAE,MAAM;4BACd,MAAM,EAAE,QAAQ;yBACnB;wBACD;4BACI,MAAM,EAAE,MAAM;4BACd,MAAM,EAAE,uBAAuB;yBAClC;wBACD;4BACI,MAAM,EAAE,OAAO;4BACf,MAAM,EAAE,wBAAwB;yBACnC;wBACD;4BACI,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAE,OAAO;yBAClB;wBACD;4BACI,MAAM,EAAE,SAAS;4BACjB,MAAM,EAAE,SAAS;yBACpB;qBACJ;iBACJ;gBACD;oBACI,MAAM,EAAE,uBAAuB;oBAC/B,QAAQ,EAAE;wBACN;4BACI,MAAM,EAAE,MAAM;4BACd,MAAM,EAAE,OAAO;yBAClB;qBACJ;iBACJ;gBACD;oBACI,MAAM,EAAE,wBAAwB;oBAChC,QAAQ,EAAE;wBACN;4BACI,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAE,KAAK;yBAChB;wBACD;4BACI,MAAM,EAAE,MAAM;4BACd,MAAM,EAAE,QAAQ;yBACnB;wBACD;4BACI,MAAM,EAAE,IAAI;4BACZ,MAAM,EAAE,QAAQ;yBACnB;qBACJ;iBACJ;aACJ;YACD,SAAS,EAAE,EAAE;SAChB;KACJ,CAAC,CAAC,CAAA;AACP,CAAC,CAAC,CAAA"}

package/dist/src/mappers/hasuraKind.spec.d.ts

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

package/dist/src/mappers/hasuraKind.spec.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hasuraKind_1 = require("./hasuraKind");
+describe('mappers', () => {
+    describe('hasuraKind', () => {
+        it('should return postgres for postgres', () => {
+            expect((0, hasuraKind_1.getHasuraKind)('postgres')).toEqual('postgres');
+        });
+        it('should throw for unsupported type', () => {
+            expect(() => (0, hasuraKind_1.getHasuraKind)('mysql')).toThrow();
+        });
+    });
+});
+//# sourceMappingURL=hasuraKind.spec.js.map

package/dist/src/mappers/hasuraKind.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hasuraKind.spec.js","sourceRoot":"","sources":["../../../src/mappers/hasuraKind.spec.ts"],"names":[],"mappings":";;AAAA,6CAA6C;AAE7C,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACrB,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC3C,MAAM,CAAC,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YACzC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,0BAAa,EAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAA"}

package/dist/src/mappers/permissions.spec.d.ts

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

package/dist/src/mappers/permissions.spec.js

@@ -0,0 +1,173 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const permissions_1 = require("./permissions");
+const dataSourceOptions = {};
+const table = {
+    columns: [
+        { databaseName: "id", type: 'uuid' },
+        { databaseName: "name", type: 'text' },
+        { databaseName: "orgId", type: 'uuid' },
+        { databaseName: "testJsonB", type: 'jsonb' }
+    ],
+    relations: [
+        {
+            propertyName: "org",
+            inverseEntityMetadata: {
+                columns: [
+                    { databaseName: "id", type: 'uuid' },
+                    { databaseName: "name", type: 'text' },
+                ],
+                relations: [{}]
+            }
+        },
+        {
+            propertyName: "products",
+            inverseEntityMetadata: {
+                columns: [
+                    { databaseName: "id", type: 'uuid' },
+                    { databaseName: "name", type: 'text' },
+                    { databaseName: "orgId", type: 'uuid' },
+                    { databaseName: "userId", type: 'uuid' },
+                ],
+                relations: [{}]
+            }
+        }
+    ]
+};
+let TestColumns = [
+    {
+        object: 1,
+        propertyName: "id",
+        options: {
+            permissions: {
+                user: ["select", "update"]
+            }
+        }
+    }
+];
+const cases = [
+    {
+        input: {
+            permissions: {
+                user: {
+                    where: {
+                        id: "1"
+                    },
+                    select: true,
+                }
+            }
+        },
+        output: {
+            insert_permissions: [],
+            select_permissions: [{
+                    role: "user",
+                    permission: {
+                        allow_aggregations: undefined,
+                        columns: ["id"],
+                        filter: {
+                            id: { _eq: "1" }
+                        },
+                        limit: undefined
+                    }
+                }],
+            update_permissions: [],
+            delete_permissions: [],
+        }
+    },
+    {
+        input: {
+            permissions: {
+                user: {
+                    where: {
+                        id: "1"
+                    },
+                    select: true,
+                    update: true,
+                }
+            }
+        },
+        output: {
+            insert_permissions: [],
+            select_permissions: [{
+                    role: "user",
+                    permission: {
+                        allow_aggregations: undefined,
+                        columns: ["id"],
+                        filter: {
+                            id: { _eq: "1" }
+                        },
+                        limit: undefined
+                    }
+                }],
+            update_permissions: [{
+                    role: "user",
+                    permission: {
+                        check: {},
+                        columns: ["id"],
+                        filter: {
+                            id: { _eq: "1" }
+                        },
+                        set: undefined
+                    }
+                }],
+            delete_permissions: [],
+        }
+    },
+    {
+        input: {
+            permissions: {
+                user: {
+                    where: {
+                        id: "1"
+                    },
+                    select: true,
+                    update: {
+                        where: {
+                            products: {
+                                id: "1"
+                            }
+                        },
+                    },
+                }
+            }
+        },
+        output: {
+            insert_permissions: [],
+            select_permissions: [{
+                    role: "user",
+                    permission: {
+                        allow_aggregations: undefined,
+                        columns: ["id"],
+                        filter: {
+                            id: { _eq: "1" }
+                        },
+                        limit: undefined
+                    }
+                }],
+            update_permissions: [{
+                    role: "user",
+                    permission: {
+                        check: {},
+                        columns: ["id"],
+                        filter: {
+                            _and: [
+                                { id: { _eq: "1" } },
+                                {
+                                    products: {
+                                        id: { _eq: "1" }
+                                    }
+                                }
+                            ]
+                        },
+                        set: undefined
+                    }
+                }],
+            delete_permissions: [],
+        }
+    }
+];
+describe("convert whereTypeorm to hasuraObj", () => {
+    cases.forEach(({ input, output }) => it("input to Equal output", () => expect((0, permissions_1.generatePermissions)(dataSourceOptions, table, { entityOptions: input, columnMetadata: TestColumns }))
+        .toEqual(output)));
+});
+//# sourceMappingURL=permissions.spec.js.map

package/dist/src/mappers/permissions.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"permissions.spec.js","sourceRoot":"","sources":["../../../src/mappers/permissions.spec.ts"],"names":[],"mappings":"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"}

package/dist/src/mappers/whereClause.spec.d.ts

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

package/dist/src/mappers/whereClause.spec.js

@@ -0,0 +1,192 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const typeorm_1 = require("typeorm");
+const whereClause_1 = require("./whereClause");
+const table = {
+    columns: [
+        { databaseName: "id", type: 'uuid' },
+        { databaseName: "name", type: 'text' },
+        { databaseName: "orgId", type: 'uuid' },
+        { databaseName: "testJsonB", type: 'jsonb' }
+    ],
+    relations: [
+        {
+            propertyName: "org",
+            inverseEntityMetadata: {
+                columns: [
+                    { databaseName: "id", type: 'uuid' },
+                    { databaseName: "name", type: 'text' },
+                ],
+                relations: [{}]
+            }
+        },
+        {
+            propertyName: "products",
+            inverseEntityMetadata: {
+                columns: [
+                    { databaseName: "id", type: 'uuid' },
+                    { databaseName: "name", type: 'text' },
+                    { databaseName: "orgId", type: 'uuid' },
+                    { databaseName: "userId", type: 'uuid' },
+                ],
+                relations: [{}]
+            }
+        }
+    ]
+};
+const cases = [
+    {
+        input: {
+            id: "1",
+        },
+        output: {
+            id: { _eq: "1" }
+        }
+    },
+    {
+        input: {
+            id: "1",
+            name: "test"
+        },
+        output: {
+            _and: [
+                { id: { _eq: "1" } },
+                { name: { _eq: "test" } }
+            ]
+        }
+    },
+    {
+        input: [
+            { id: "1", name: "test" },
+            { id: "2", name: "test" }
+        ],
+        output: {
+            _or: [
+                { _and: [{ id: { _eq: "1" } }, { name: { _eq: "test" } }] },
+                { _and: [{ id: { _eq: "2" } }, { name: { _eq: "test" } }] }
+            ]
+        }
+    },
+    {
+        input: {
+            id: (0, typeorm_1.Not)("1")
+        },
+        output: {
+            id: { _neq: "1" }
+        }
+    },
+    {
+        input: [
+            { id: (0, typeorm_1.Not)("1"), name: "test" },
+            { id: "2", name: (0, typeorm_1.In)(["test"]) }
+        ],
+        output: {
+            _or: [
+                { _and: [{ id: { _neq: "1" } }, { name: { _eq: "test" } }] },
+                { _and: [{ id: { _eq: "2" } }, { name: { _in: ["test"] } }] }
+            ],
+        },
+    },
+    {
+        input: {
+            products: {
+                id: "1"
+            }
+        },
+        output: {
+            products: {
+                id: { _eq: "1" },
+            }
+        }
+    },
+    {
+        input: {
+            products: [
+                {
+                    id: "1"
+                },
+                {
+                    id: "2"
+                }
+            ]
+        },
+        output: {
+            products: {
+                _or: [
+                    { id: { _eq: "1" } },
+                    { id: { _eq: "2" } }
+                ]
+            }
+        }
+    },
+    {
+        input: {
+            products: {
+                id: (0, typeorm_1.Not)((0, typeorm_1.IsNull)())
+            }
+        },
+        output: {
+            products: {
+                id: { _is_null: false },
+            }
+        }
+    },
+    {
+        input: {
+            products: {
+                id: (0, typeorm_1.Not)("test")
+            }
+        },
+        output: {
+            products: {
+                id: { _neq: "test" },
+            }
+        }
+    },
+    {
+        input: {
+            products: {
+                id: (0, typeorm_1.IsNull)()
+            }
+        },
+        output: {
+            products: {
+                id: { _is_null: true },
+            }
+        }
+    },
+    {
+        input: {
+            testJsonB: {
+                name: "test"
+            }
+        },
+        output: {
+            testJsonB: {
+                _contains: {
+                    name: "test"
+                }
+            }
+        }
+    },
+    {
+        input: {
+            testJsonB: (0, typeorm_1.Not)({
+                name: "test"
+            })
+        },
+        output: {
+            _not: {
+                testJsonB: {
+                    _contains: {
+                        name: "test"
+                    }
+                }
+            }
+        }
+    }
+];
+describe("convert whereTypeorm to hasuraObj", () => {
+    cases.forEach(({ input, output }) => it("input to Equal output", () => expect((0, whereClause_1.convertWhereClause)(table, input)).toEqual(output)));
+});
+//# sourceMappingURL=whereClause.spec.js.map

package/dist/src/mappers/whereClause.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"whereClause.spec.js","sourceRoot":"","sources":["../../../src/mappers/whereClause.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeorm-hasura",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "",
   "keywords": [
     "hasura",
@@ -24,10 +24,10 @@
     "url": "https://github.com/utyfua/typeorm-hasura/issues"
   },
   "scripts": {
-    "clean": "rimraf -g dist/*",
-    "prebuild": "run-s clean",
-    "build": "run-s build:tsc",
-    "build:tsc": "tsc --module commonjs",
+    "prepublish": "run-s build",
+    "prebuild": "rimraf -g dist/*",
+    "build": "tsc --module commonjs",
+    "pretest": "run-s build",
     "test": "jest",
     "test:watch": "jest --watch",
     "play:gen": "npx env-cmd --silent npx typeorm-ts-node-commonjs migration:generate ./dev-playground/migration/next -d ./dev-playground/data-source.ts",
@@ -52,7 +52,7 @@
     "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
     "graphql-tag": "^2.0.0",
     "hasura-metadata-types": "^2.22.1",
-    "typeorm": "^0.3.0"
+    "typeorm": "^0.3.0 || ^1.0.0 || >=1.0.0-nightly.0 <1.0.1"
   },
   "devDependencies": {
     "@types/jest": "^29.5.0",
@@ -66,6 +66,7 @@
     "rimraf": "^6.0.1",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
-    "typeorm": "^0.3.14"
+    "typeorm": "^0.3.14",
+    "typescript": "^5.9.3"
   }
 }

package/readme.md

@@ -16,7 +16,7 @@ making it easier to manage complex database schemas and permissions when using H
 > The library does not support ManyToMany relationships.
 
 > [!NOTE]
-> The library was tested with Hasura v2 and TypeORM v0.3 with PostgreSQL only.
+> The library was tested with Hasura v2 and TypeORM v0.3/v1-nightly.20260426 with PostgreSQL only.
 
 ## Installation
 

package/src/mappers/databaseUrl.spec.ts

@@ -1,32 +1,31 @@
 
+import { DataSource } from "typeorm";
 import { getDatabaseUrl } from "./databaseUrl";
 
 describe('mappers', () => {
     describe('databaseUrl', () => {
         it('should return postgres for postgres', () => {
+            const dataSource = new DataSource({
+                type: 'postgres',
+                host: 'localhost',
+                port: 5432,
+                username: 'test-user',
+                password: 'test-password',
+                database: 'test-database',
+            });
             expect(getDatabaseUrl({
-                dataSource: {
-                    name: 'default',
-                    // @ts-ignore
-                    type: 'postgres',
-                    options: {
-                        type: 'postgres',
-                        host: 'localhost',
-                        port: 5432,
-                        username: 'test-user',
-                        password: 'test-password',
-                        database: 'test-database',
-                    }
-                }
+                name: 'default',
+                dataSource
             })).toEqual('postgres://test-user:test-password@localhost:5432/test-database');
         });
         it('should throw for unsupported type', () => {
+            const dataSource = new DataSource({
+                type: 'sqljs',
+                driver: {}
+            });
             expect(() => getDatabaseUrl({
-                dataSource: {
-                    name: 'default',
-                    // @ts-ignore
-                    type: 'mysql',
-                }
+                name: 'default',
+                dataSource
             })).toThrow();
         });
     });