prostgles-server 4.2.343 → 4.2.344
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,QAAQ,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,WAAW,EACX,QAAQ,EAKR,UAAU,EACV,YAAY,EACZ,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAmC,MAAM,yBAAyB,CAAC;AACtF,OAAO,EACL,mBAAmB,EAEnB,gBAAgB,EAChB,eAAe,EACf,KAAK,aAAa,EACnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAsC,EAAE,EAAE,MAAM,8BAA8B,CAAC;AAEtF,eAAO,MAAM,WAAW,eAAgB,UAAU,KAAG,MA8FpD,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AAC/C,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjD,MAAM,MAAM,yBAAyB,CAAC,MAAM,GAAG,IAAI,IACjD,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACtD,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC1D,GACD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,oBAAoB,CAC9B,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAChD,gBAAgB,GAAG,IAAI,IACrB;IACF,GAAG,EAAE,UAAU,CAAC;CACjB,GAAG,OAAO,CAAC,WAAW,CAAC,GACtB,CAAC,gBAAgB,SAAS,IAAI,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAE3E,MAAM,MAAM,aAAa,CACvB,MAAM,GAAG,IAAI,EACb,gBAAgB,GAAG,IAAI,IACrB,yBAAyB,CAAC,MAAM,CAAC,GACnC,oBAAoB,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE5E,MAAM,MAAM,iBAAiB,CAAC,MAAM,GAAG,IAAI,IACzC,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACvC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;CAC7D,GACD,aAAa,CAAC"}
|
package/dist/DBSchemaBuilder.js
CHANGED
|
@@ -42,11 +42,22 @@ const getDBSchema = (dboBuilder) => {
|
|
|
42
42
|
if (!colConf.enum)
|
|
43
43
|
throw "colConf.enum missing";
|
|
44
44
|
addEnumTypes(colConf.enum, !!colConf.nullable);
|
|
45
|
+
/** When referencing a isLookupTable table we add the isLookupTable.values as enums */
|
|
45
46
|
}
|
|
46
|
-
else if ("references" in colConf && colConf.references) {
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
else if (("references" in colConf && colConf.references) || c.references?.length) {
|
|
48
|
+
const { tableConfigurator } = dboBuilder.prostgles;
|
|
49
|
+
const lookupTableConfig = colConf.references ?
|
|
50
|
+
tableConfigurator?.config[colConf.references.tableName]
|
|
51
|
+
: c.references
|
|
52
|
+
?.map((ref) => {
|
|
53
|
+
const refTableConfig = tableConfigurator?.config[ref.ftable];
|
|
54
|
+
if (refTableConfig && "isLookupTable" in refTableConfig) {
|
|
55
|
+
return refTableConfig;
|
|
56
|
+
}
|
|
57
|
+
})
|
|
58
|
+
.find(prostgles_types_1.isDefined);
|
|
59
|
+
if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
|
|
60
|
+
const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
|
|
50
61
|
addEnumTypes(enumValus, !!colConf.nullable);
|
|
51
62
|
}
|
|
52
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../lib/DBSchemaBuilder.ts"],"names":[],"mappings":"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"}
|
package/lib/DBSchemaBuilder.ts
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
DbJoinMaker,
|
|
4
4
|
DBSchema,
|
|
5
5
|
getJSONBSchemaTSTypes,
|
|
6
|
+
isDefined,
|
|
6
7
|
isObject,
|
|
7
8
|
JSONB,
|
|
8
9
|
SQLHandler,
|
|
@@ -68,11 +69,22 @@ export const getDBSchema = (dboBuilder: DboBuilder): string => {
|
|
|
68
69
|
if ("enum" in colConf) {
|
|
69
70
|
if (!colConf.enum) throw "colConf.enum missing";
|
|
70
71
|
addEnumTypes(colConf.enum, !!colConf.nullable);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
72
|
+
/** When referencing a isLookupTable table we add the isLookupTable.values as enums */
|
|
73
|
+
} else if (("references" in colConf && colConf.references) || c.references?.length) {
|
|
74
|
+
const { tableConfigurator } = dboBuilder.prostgles;
|
|
75
|
+
const lookupTableConfig =
|
|
76
|
+
colConf.references ?
|
|
77
|
+
tableConfigurator?.config[colConf.references.tableName]
|
|
78
|
+
: c.references
|
|
79
|
+
?.map((ref) => {
|
|
80
|
+
const refTableConfig = tableConfigurator?.config[ref.ftable];
|
|
81
|
+
if (refTableConfig && "isLookupTable" in refTableConfig) {
|
|
82
|
+
return refTableConfig;
|
|
83
|
+
}
|
|
84
|
+
})
|
|
85
|
+
.find(isDefined);
|
|
86
|
+
if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
|
|
87
|
+
const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
|
|
76
88
|
addEnumTypes(enumValus, !!colConf.nullable);
|
|
77
89
|
}
|
|
78
90
|
}
|