@pothos/plugin-drizzle 0.10.3 → 0.10.4
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/CHANGELOG.md +6 -0
- package/dts/model-loader.d.ts.map +1 -1
- package/esm/model-loader.d.ts.map +1 -1
- package/esm/model-loader.js +2 -2
- package/esm/model-loader.js.map +1 -1
- package/lib/model-loader.js +2 -2
- package/lib/model-loader.js.map +1 -1
- package/package.json +4 -4
- package/src/model-loader.ts +4 -2
package/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,qBAAqB,EAG3B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,KAAK,yBAAyB,EAA8B,MAAM,gBAAgB,CAAC;AAG5F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,cAAc,EAIpB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,iBAAiB,CAAC,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAChC;AACD,qBAAa,WAAW;IACtB,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEhD,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU;mBAAgC,cAAc;eAAS,YAAY;OAAM;IAEnF,MAAM;eACG,cAAc;gBACb,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;OACnE;IAEL,MAAM,EAAE,yBAAyB,CAAC;IAClC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC;gBAGtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,EAAE;IAmBpB,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAS,WAAW,EACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,OAAO,CAAC,EAAE,MAAM,EAAE;IAOpB,WAAW,CAAC,KAAK,EAAE,MAAM;IAazB,YAAY,CAAC,IAAI,EAAE,kBAAkB;mBA3DK,cAAc;eAAS,YAAY;;IAwE7E,oBAAoB,CAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM;mBAxErB,cAAc;eAAS,YAAY;;IA2FvE,aAAa,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM;IAgBrD,qBAAqB,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAYvF,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM;IAgBxE,QAAQ,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,qBAAqB,EAG3B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,KAAK,yBAAyB,EAA8B,MAAM,gBAAgB,CAAC;AAG5F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,cAAc,EAIpB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,iBAAiB,CAAC,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAChC;AACD,qBAAa,WAAW;IACtB,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEhD,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU;mBAAgC,cAAc;eAAS,YAAY;OAAM;IAEnF,MAAM;eACG,cAAc;gBACb,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;OACnE;IAEL,MAAM,EAAE,yBAAyB,CAAC;IAClC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC;gBAGtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,EAAE;IAmBpB,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAS,WAAW,EACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,OAAO,CAAC,EAAE,MAAM,EAAE;IAOpB,WAAW,CAAC,KAAK,EAAE,MAAM;IAazB,YAAY,CAAC,IAAI,EAAE,kBAAkB;mBA3DK,cAAc;eAAS,YAAY;;IAwE7E,oBAAoB,CAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM;mBAxErB,cAAc;eAAS,YAAY;;IA2FvE,aAAa,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM;IAgBrD,qBAAqB,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAYvF,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM;IAgBxE,QAAQ,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM;CAqElD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,qBAAqB,EAG3B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,KAAK,yBAAyB,EAA8B,MAAM,gBAAgB,CAAC;AAG5F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,cAAc,EAIpB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,iBAAiB,CAAC,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAChC;AACD,qBAAa,WAAW;IACtB,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEhD,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU;mBAAgC,cAAc;eAAS,YAAY;OAAM;IAEnF,MAAM;eACG,cAAc;gBACb,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;OACnE;IAEL,MAAM,EAAE,yBAAyB,CAAC;IAClC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC;gBAGtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,EAAE;IAmBpB,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAS,WAAW,EACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,OAAO,CAAC,EAAE,MAAM,EAAE;IAOpB,WAAW,CAAC,KAAK,EAAE,MAAM;IAazB,YAAY,CAAC,IAAI,EAAE,kBAAkB;mBA3DK,cAAc;eAAS,YAAY;;IAwE7E,oBAAoB,CAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM;mBAxErB,cAAc;eAAS,YAAY;;IA2FvE,aAAa,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM;IAgBrD,qBAAqB,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAYvF,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM;IAgBxE,QAAQ,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAsB,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,qBAAqB,EAG3B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,KAAK,yBAAyB,EAA8B,MAAM,gBAAgB,CAAC;AAG5F,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,cAAc,EAIpB,MAAM,oBAAoB,CAAC;AAE5B,UAAU,iBAAiB,CAAC,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAChC;AACD,qBAAa,WAAW;IACtB,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEhD,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU;mBAAgC,cAAc;eAAS,YAAY;OAAM;IAEnF,MAAM;eACG,cAAc;gBACb,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;OACnE;IAEL,MAAM,EAAE,yBAAyB,CAAC;IAClC,KAAK,EAAE,qBAAqB,CAAC;IAC7B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC;gBAGtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,EAAE;IAmBpB,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAS,WAAW,EACvC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,EAC/C,OAAO,CAAC,EAAE,MAAM,EAAE;IAOpB,WAAW,CAAC,KAAK,EAAE,MAAM;IAazB,YAAY,CAAC,IAAI,EAAE,kBAAkB;mBA3DK,cAAc;eAAS,YAAY;;IAwE7E,oBAAoB,CAAC,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM;mBAxErB,cAAc;eAAS,YAAY;;IA2FvE,aAAa,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM;IAgBrD,qBAAqB,CAAC,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAYvF,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM;IAgBxE,QAAQ,CAAC,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM;CAqElD"}
|
package/esm/model-loader.js
CHANGED
|
@@ -24,7 +24,7 @@ export class ModelLoader {
|
|
|
24
24
|
}
|
|
25
25
|
sqlForModel(model) {
|
|
26
26
|
const values = this.columns.map((key) => {
|
|
27
|
-
const columnName = key
|
|
27
|
+
const columnName = this.config.columnToTsName(key);
|
|
28
28
|
if (columnName in model) {
|
|
29
29
|
return model[columnName];
|
|
30
30
|
}
|
|
@@ -117,7 +117,7 @@ export class ModelLoader {
|
|
|
117
117
|
});
|
|
118
118
|
query.then((results) => {
|
|
119
119
|
for (const [model, promise] of entry.models.entries()) {
|
|
120
|
-
const result = results.find((row) => this.primaryKey.every((key) => row[key
|
|
120
|
+
const result = results.find((row) => this.primaryKey.every((key) => row[this.config.columnToTsName(key)] === model[this.config.columnToTsName(key)]));
|
|
121
121
|
if (result) {
|
|
122
122
|
promise.resolve(result !== null && result !== void 0 ? result : null);
|
|
123
123
|
}
|
package/esm/model-loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/model-loader.ts"],"names":["createContextCache","inArray","sql","getClient","getSchemaConfig","cacheKey","setLoaderMappings","selectionStateFromInfo","stateFromInfo","mergeSelection","selectionCompatible","selectionToQuery","ModelLoader","forModel","modelName","builder","columns","model","sqlForModel","values","map","key","columnName","
|
|
1
|
+
{"version":3,"sources":["../src/model-loader.ts"],"names":["createContextCache","inArray","sql","getClient","getSchemaConfig","cacheKey","setLoaderMappings","selectionStateFromInfo","stateFromInfo","mergeSelection","selectionCompatible","selectionToQuery","ModelLoader","forModel","modelName","builder","columns","model","sqlForModel","values","map","key","columnName","config","columnToTsName","Error","length","getSelection","info","parentType","name","path","queryCache","has","selection","context","set","query","get","getSelectionForField","typeName","loadSelection","result","stageQuery","mappings","loadSelectionForField","returnType","entry","staged","state","models","createResolvablePromise","promise","initLoad","Map","add","nextTick","client","then","delete","api","findMany","where","RAW","table","selectSQL","keys","results","entries","find","row","primaryKey","every","resolve","reject","err","catch","setTimeout","constructor","Set","relations","tablesConfig","getPrimaryKey","column","Object","tblColumn","join","getSQL","resolveFn","rejectFn","Promise"],"mappings":"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"}
|
package/lib/model-loader.js
CHANGED
|
@@ -33,7 +33,7 @@ class ModelLoader {
|
|
|
33
33
|
}
|
|
34
34
|
sqlForModel(model) {
|
|
35
35
|
const values = this.columns.map((key)=>{
|
|
36
|
-
const columnName = key
|
|
36
|
+
const columnName = this.config.columnToTsName(key);
|
|
37
37
|
if (columnName in model) {
|
|
38
38
|
return model[columnName];
|
|
39
39
|
}
|
|
@@ -126,7 +126,7 @@ class ModelLoader {
|
|
|
126
126
|
});
|
|
127
127
|
query.then((results)=>{
|
|
128
128
|
for (const [model, promise] of entry.models.entries()){
|
|
129
|
-
const result = results.find((row)=>this.primaryKey.every((key)=>row[key
|
|
129
|
+
const result = results.find((row)=>this.primaryKey.every((key)=>row[this.config.columnToTsName(key)] === model[this.config.columnToTsName(key)]));
|
|
130
130
|
if (result) {
|
|
131
131
|
promise.resolve(result !== null && result !== void 0 ? result : null);
|
|
132
132
|
} else {
|
package/lib/model-loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/model-loader.ts"],"names":["ModelLoader","forModel","modelName","builder","columns","createContextCache","model","sqlForModel","values","map","key","columnName","
|
|
1
|
+
{"version":3,"sources":["../src/model-loader.ts"],"names":["ModelLoader","forModel","modelName","builder","columns","createContextCache","model","sqlForModel","values","map","key","columnName","config","columnToTsName","Error","length","getSelection","info","cacheKey","parentType","name","path","queryCache","has","selection","selectionStateFromInfo","context","set","query","selectionToQuery","get","getSelectionForField","typeName","stateFromInfo","loadSelection","result","stageQuery","mappings","setLoaderMappings","loadSelectionForField","returnType","entry","staged","selectionCompatible","state","mergeSelection","models","createResolvablePromise","promise","initLoad","Map","add","nextTick","client","getClient","then","delete","api","findMany","where","RAW","table","inArray","selectSQL","keys","results","entries","find","row","primaryKey","every","resolve","reject","err","catch","setTimeout","constructor","Set","getSchemaConfig","relations","tablesConfig","getPrimaryKey","column","Object","tblColumn","sql","join","getSQL","resolveFn","rejectFn","Promise"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pothos/plugin-drizzle",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.4",
|
|
4
4
|
"description": "A Pothos plugin for drizzle",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./dts/index.d.ts",
|
|
@@ -46,13 +46,13 @@
|
|
|
46
46
|
"graphql-scalars": "^1.24.2",
|
|
47
47
|
"graphql-tag": "^2.12.6",
|
|
48
48
|
"postgres": "^3.4.5",
|
|
49
|
+
"@pothos/plugin-errors": "4.3.0",
|
|
49
50
|
"@pothos/core": "4.6.2",
|
|
50
51
|
"@pothos/plugin-add-graphql": "4.2.3",
|
|
51
52
|
"@pothos/plugin-relay": "4.4.2",
|
|
52
53
|
"@pothos/plugin-scope-auth": "4.1.3",
|
|
53
|
-
"@pothos/
|
|
54
|
-
"@pothos/plugin-with-input": "4.1.1"
|
|
55
|
-
"@pothos/test-utils": "2.1.1"
|
|
54
|
+
"@pothos/test-utils": "2.1.1",
|
|
55
|
+
"@pothos/plugin-with-input": "4.1.1"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"type": "tsc --project tsconfig.type.json",
|
package/src/model-loader.ts
CHANGED
|
@@ -79,7 +79,7 @@ export class ModelLoader {
|
|
|
79
79
|
|
|
80
80
|
sqlForModel(model: object) {
|
|
81
81
|
const values = this.columns.map((key) => {
|
|
82
|
-
const columnName = key
|
|
82
|
+
const columnName = this.config.columnToTsName(key) as keyof typeof model;
|
|
83
83
|
if (columnName in model) {
|
|
84
84
|
return model[columnName] as string | number;
|
|
85
85
|
}
|
|
@@ -203,7 +203,9 @@ export class ModelLoader {
|
|
|
203
203
|
for (const [model, promise] of entry.models.entries()) {
|
|
204
204
|
const result = results.find((row) =>
|
|
205
205
|
this.primaryKey.every(
|
|
206
|
-
(key) =>
|
|
206
|
+
(key) =>
|
|
207
|
+
row[this.config.columnToTsName(key) as keyof typeof row] ===
|
|
208
|
+
(model as Record<string, unknown>)[this.config.columnToTsName(key)],
|
|
207
209
|
),
|
|
208
210
|
);
|
|
209
211
|
|