@celljs/typeorm 3.9.0 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cell.yml +8 -31
- package/lib/node/default-config.spec.d.ts +2 -0
- package/lib/node/default-config.spec.d.ts.map +1 -0
- package/lib/node/default-config.spec.js +37 -0
- package/lib/node/default-config.spec.js.map +1 -0
- package/package.json +37 -12
- package/src/node/default-config.spec.ts +40 -0
- package/cell-fc.yml +0 -10
package/cell.yml
CHANGED
|
@@ -1,34 +1,11 @@
|
|
|
1
1
|
cell:
|
|
2
|
-
webpack:
|
|
3
|
-
filterWarningsPlugin:
|
|
4
|
-
typeorm:
|
|
5
|
-
- typeorm-aurora-data-api-driver
|
|
6
|
-
- mongodb
|
|
7
|
-
- mssql
|
|
8
|
-
- mysql
|
|
9
|
-
- mysql2
|
|
10
|
-
- oracledb
|
|
11
|
-
- pg
|
|
12
|
-
- pg-native
|
|
13
|
-
- pg-query-stream
|
|
14
|
-
- sql.js
|
|
15
|
-
- redis
|
|
16
|
-
- sqlite3
|
|
17
|
-
- react-native-sqlite-storage
|
|
18
|
-
- cli-highlight
|
|
19
|
-
- Critical dependency
|
|
20
|
-
- '@sap/hdbext'
|
|
21
|
-
- '@sap/hana-client'
|
|
22
|
-
- hdb-pool
|
|
23
|
-
- ioredis
|
|
24
|
-
- better-sqlite3
|
|
25
|
-
- '@google-cloud/spanner'
|
|
26
2
|
typeorm:
|
|
27
3
|
ormConfig:
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
#
|
|
34
|
-
|
|
4
|
+
# Environment variables are text: convert them, so that DB_PORT=5432 is a number and DB_SYNC=false is false.
|
|
5
|
+
- type: "${ env.DB_TYPE ?: 'mysql' }"
|
|
6
|
+
host: "${ env.DB_HOST ?: 'localhost' }"
|
|
7
|
+
port: "${ (env.DB_PORT ?: 3306) * 1 }"
|
|
8
|
+
synchronize: "${ (env.DB_SYNC ?: 'true') == 'true' }"
|
|
9
|
+
# username: "${ env.DB_USERNAME ?: 'root' }"
|
|
10
|
+
# password: "${ env.DB_PASSWORD ?: 'root' }"
|
|
11
|
+
database: "${ env.DB_DATABASE ?: 'test' }"
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"default-config.spec.d.ts","sourceRoot":"","sources":["../../src/node/default-config.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const fs_1 = require("fs");
|
|
5
|
+
const js_yaml_1 = require("js-yaml");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const expression_compiler_1 = require("@celljs/core/lib/common/el/expression-compiler");
|
|
8
|
+
const jexl_engine_provider_1 = require("@celljs/core/lib/common/el/jexl-engine-provider");
|
|
9
|
+
/** The default ormConfig of cell.yml, evaluated the way the server does with `env` as the environment. */
|
|
10
|
+
function defaults(env) {
|
|
11
|
+
const compiler = new expression_compiler_1.ExpressionCompilerImpl();
|
|
12
|
+
Object.defineProperty(compiler, 'jexlEngineProvider', { value: new jexl_engine_provider_1.JexlEngineProviderImpl() });
|
|
13
|
+
const config = (0, js_yaml_1.load)((0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', '..', 'cell.yml'), 'utf8'));
|
|
14
|
+
const [options] = config.cell.typeorm.ormConfig;
|
|
15
|
+
return Object.fromEntries(Object.entries(options).map(([key, text]) => {
|
|
16
|
+
const [section] = compiler.compileSections(text, {});
|
|
17
|
+
return [key, typeof section === 'string' ? section : section.evalSync({ env })];
|
|
18
|
+
}));
|
|
19
|
+
}
|
|
20
|
+
(0, bun_test_1.describe)('typeorm default configuration', () => {
|
|
21
|
+
(0, bun_test_1.it)('connects to a local MySQL database without environment variables', () => {
|
|
22
|
+
(0, bun_test_1.expect)(defaults({})).toEqual({ type: 'mysql', host: 'localhost', port: 3306, synchronize: true, database: 'test' });
|
|
23
|
+
});
|
|
24
|
+
(0, bun_test_1.it)('takes DB_* variables with the types typeorm expects', () => {
|
|
25
|
+
const env = { DB_TYPE: 'postgres', DB_HOST: 'db.internal', DB_PORT: '5432', DB_SYNC: 'false', DB_DATABASE: 'app' };
|
|
26
|
+
(0, bun_test_1.expect)(defaults(env)).toEqual({ type: 'postgres', host: 'db.internal', port: 5432, synchronize: false, database: 'app' });
|
|
27
|
+
});
|
|
28
|
+
(0, bun_test_1.it)('synchronizes the schema only when DB_SYNC is true', () => {
|
|
29
|
+
for (const value of ['false', 'FALSE', '0', 'no']) {
|
|
30
|
+
(0, bun_test_1.expect)(defaults({ DB_SYNC: value }).synchronize).toBe(false);
|
|
31
|
+
}
|
|
32
|
+
(0, bun_test_1.expect)(defaults({ DB_SYNC: 'true' }).synchronize).toBe(true);
|
|
33
|
+
// An empty variable counts as unset, like everywhere else with `?:`.
|
|
34
|
+
(0, bun_test_1.expect)(defaults({ DB_SYNC: '' }).synchronize).toBe(true);
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
//# sourceMappingURL=default-config.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"default-config.spec.js","sourceRoot":"","sources":["../../src/node/default-config.spec.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2BAAkC;AAClC,qCAA+B;AAC/B,+BAA4B;AAC5B,wFAAwF;AACxF,0FAAyF;AAEzF,0GAA0G;AAC1G,SAAS,QAAQ,CAAC,GAA2B;IACzC,MAAM,QAAQ,GAAG,IAAI,4CAAsB,EAAE,CAAC;IAC9C,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,oBAAoB,EAAE,EAAE,KAAK,EAAE,IAAI,6CAAsB,EAAE,EAAE,CAAC,CAAC;IAC/F,MAAM,MAAM,GAAG,IAAA,cAAI,EAAC,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAQ,CAAC;IAC1F,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAChD,OAAO,MAAM,CAAC,WAAW,CACrB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QACxC,MAAM,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAc,EAAE,EAAE,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,IAAA,mBAAQ,EAAC,+BAA+B,EAAE,GAAG,EAAE;IAC3C,IAAA,aAAE,EAAC,kEAAkE,EAAE,GAAG,EAAE;QACxE,IAAA,iBAAM,EAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACxH,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,qDAAqD,EAAE,GAAG,EAAE;QAC3D,MAAM,GAAG,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QACnH,IAAA,iBAAM,EAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9H,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,mDAAmD,EAAE,GAAG,EAAE;QACzD,KAAK,MAAM,KAAK,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;YAChD,IAAA,iBAAM,EAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjE,CAAC;QACD,IAAA,iBAAM,EAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7D,qEAAqE;QACrE,IAAA,iBAAM,EAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/typeorm",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -20,8 +20,7 @@
|
|
|
20
20
|
"lib",
|
|
21
21
|
"esm",
|
|
22
22
|
"src",
|
|
23
|
-
"cell.yml"
|
|
24
|
-
"cell-fc.yml"
|
|
23
|
+
"cell.yml"
|
|
25
24
|
],
|
|
26
25
|
"scripts": {
|
|
27
26
|
"build": "tsc -b && bun ../../scripts/build-esm.ts",
|
|
@@ -30,54 +29,80 @@
|
|
|
30
29
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
31
30
|
},
|
|
32
31
|
"dependencies": {
|
|
33
|
-
"@celljs/core": "
|
|
32
|
+
"@celljs/core": "4.0.0",
|
|
34
33
|
"mysql2": "^2.3.3",
|
|
35
34
|
"tslib": "^2.8.0",
|
|
36
35
|
"typeorm": "^0.3.7"
|
|
37
36
|
},
|
|
38
37
|
"devDependencies": {
|
|
39
|
-
"@
|
|
38
|
+
"@types/js-yaml": "^4.0.9",
|
|
39
|
+
"js-yaml": "^4.1.0"
|
|
40
40
|
},
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
44
|
"exports": {
|
|
45
45
|
".": {
|
|
46
|
-
"webpack": "./lib/common/index.js",
|
|
47
46
|
"import": "./esm/common/index.js",
|
|
48
47
|
"default": "./lib/common/index.js"
|
|
49
48
|
},
|
|
50
49
|
"./package.json": "./package.json",
|
|
51
50
|
"./lib/common": {
|
|
52
|
-
"webpack": "./lib/common/index.js",
|
|
53
51
|
"import": "./esm/common/index.js",
|
|
54
52
|
"default": "./lib/common/index.js"
|
|
55
53
|
},
|
|
56
54
|
"./lib/node": {
|
|
57
|
-
"webpack": "./lib/node/index.js",
|
|
58
55
|
"import": "./esm/node/index.js",
|
|
59
56
|
"default": "./lib/node/index.js"
|
|
60
57
|
},
|
|
61
58
|
"./lib/node/annotation": {
|
|
62
|
-
"webpack": "./lib/node/annotation/index.js",
|
|
63
59
|
"import": "./esm/node/annotation/index.js",
|
|
64
60
|
"default": "./lib/node/annotation/index.js"
|
|
65
61
|
},
|
|
66
62
|
"./lib/node/context": {
|
|
67
|
-
"webpack": "./lib/node/context/index.js",
|
|
68
63
|
"import": "./esm/node/context/index.js",
|
|
69
64
|
"default": "./lib/node/context/index.js"
|
|
70
65
|
},
|
|
71
66
|
"./lib/*.js": {
|
|
72
|
-
"webpack": "./lib/*.js",
|
|
73
67
|
"import": "./esm/*.js",
|
|
74
68
|
"default": "./lib/*.js"
|
|
75
69
|
},
|
|
76
70
|
"./lib/*": {
|
|
77
|
-
"webpack": "./lib/*.js",
|
|
78
71
|
"import": "./esm/*.js",
|
|
79
72
|
"default": "./lib/*.js"
|
|
80
73
|
},
|
|
81
74
|
"./*": "./*"
|
|
75
|
+
},
|
|
76
|
+
"cell": {
|
|
77
|
+
"modules": {
|
|
78
|
+
"frontend": [
|
|
79
|
+
"lib/browser/module"
|
|
80
|
+
],
|
|
81
|
+
"backend": [
|
|
82
|
+
"lib/node/module"
|
|
83
|
+
]
|
|
84
|
+
},
|
|
85
|
+
"optionalDependencies": [
|
|
86
|
+
"typeorm-aurora-data-api-driver",
|
|
87
|
+
"mongodb",
|
|
88
|
+
"mssql",
|
|
89
|
+
"mysql",
|
|
90
|
+
"mysql2",
|
|
91
|
+
"oracledb",
|
|
92
|
+
"pg",
|
|
93
|
+
"pg-native",
|
|
94
|
+
"pg-query-stream",
|
|
95
|
+
"sql.js",
|
|
96
|
+
"redis",
|
|
97
|
+
"sqlite3",
|
|
98
|
+
"react-native-sqlite-storage",
|
|
99
|
+
"cli-highlight",
|
|
100
|
+
"@sap/hdbext",
|
|
101
|
+
"@sap/hana-client",
|
|
102
|
+
"hdb-pool",
|
|
103
|
+
"ioredis",
|
|
104
|
+
"better-sqlite3",
|
|
105
|
+
"@google-cloud/spanner"
|
|
106
|
+
]
|
|
82
107
|
}
|
|
83
108
|
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { describe, expect, it } from 'bun:test';
|
|
2
|
+
import { readFileSync } from 'fs';
|
|
3
|
+
import { load } from 'js-yaml';
|
|
4
|
+
import { join } from 'path';
|
|
5
|
+
import { ExpressionCompilerImpl } from '@celljs/core/lib/common/el/expression-compiler';
|
|
6
|
+
import { JexlEngineProviderImpl } from '@celljs/core/lib/common/el/jexl-engine-provider';
|
|
7
|
+
|
|
8
|
+
/** The default ormConfig of cell.yml, evaluated the way the server does with `env` as the environment. */
|
|
9
|
+
function defaults(env: Record<string, string>): Record<string, unknown> {
|
|
10
|
+
const compiler = new ExpressionCompilerImpl();
|
|
11
|
+
Object.defineProperty(compiler, 'jexlEngineProvider', { value: new JexlEngineProviderImpl() });
|
|
12
|
+
const config = load(readFileSync(join(__dirname, '..', '..', 'cell.yml'), 'utf8')) as any;
|
|
13
|
+
const [options] = config.cell.typeorm.ormConfig;
|
|
14
|
+
return Object.fromEntries(
|
|
15
|
+
Object.entries(options).map(([key, text]) => {
|
|
16
|
+
const [section] = compiler.compileSections(text as string, {});
|
|
17
|
+
return [key, typeof section === 'string' ? section : section.evalSync({ env })];
|
|
18
|
+
}),
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
describe('typeorm default configuration', () => {
|
|
23
|
+
it('connects to a local MySQL database without environment variables', () => {
|
|
24
|
+
expect(defaults({})).toEqual({ type: 'mysql', host: 'localhost', port: 3306, synchronize: true, database: 'test' });
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it('takes DB_* variables with the types typeorm expects', () => {
|
|
28
|
+
const env = { DB_TYPE: 'postgres', DB_HOST: 'db.internal', DB_PORT: '5432', DB_SYNC: 'false', DB_DATABASE: 'app' };
|
|
29
|
+
expect(defaults(env)).toEqual({ type: 'postgres', host: 'db.internal', port: 5432, synchronize: false, database: 'app' });
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it('synchronizes the schema only when DB_SYNC is true', () => {
|
|
33
|
+
for (const value of ['false', 'FALSE', '0', 'no']) {
|
|
34
|
+
expect(defaults({ DB_SYNC: value }).synchronize).toBe(false);
|
|
35
|
+
}
|
|
36
|
+
expect(defaults({ DB_SYNC: 'true' }).synchronize).toBe(true);
|
|
37
|
+
// An empty variable counts as unset, like everywhere else with `?:`.
|
|
38
|
+
expect(defaults({ DB_SYNC: '' }).synchronize).toBe(true);
|
|
39
|
+
});
|
|
40
|
+
});
|
package/cell-fc.yml
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
cell:
|
|
2
|
-
cloud:
|
|
3
|
-
layer:
|
|
4
|
-
name: "${cell.cloud.function.runtime == 'custom' ? 'node-v16-14-2-linux-x64' : ''}"
|
|
5
|
-
compatibleRuntime:
|
|
6
|
-
- custom
|
|
7
|
-
codeUri: https://nodejs.org/dist/v16.14.2/node-v16.14.2-linux-x64.tar.gz
|
|
8
|
-
function:
|
|
9
|
-
env: "${cell.cloud.function.runtime == 'custom' ? { PATH: '/opt/node-v16.14.2-linux-x64/bin:$PATH' } : {}}"
|
|
10
|
-
layers: "${cell.cloud.function.runtime == 'custom' ? [ 'node-v16-14-2-linux-x64'] : []}"
|